Skip to content

Commit

Permalink
Checked empty image url in expense
Browse files Browse the repository at this point in the history
  • Loading branch information
cp-nirali-s committed Dec 2, 2024
1 parent a2ecee7 commit 731bc96
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct ExpenseDetailsView: View {

ExpenseInfoView(viewModel: viewModel)

if let imageUrl = viewModel.expense?.imageUrl {
if let imageUrl = viewModel.expense?.imageUrl, !imageUrl.isEmpty {
VStack(spacing: 8) {
Text("Attachment:")
.font(.subTitle3())
Expand Down
1 change: 1 addition & 0 deletions functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"scripts": {
"lint": "eslint --ext .js,.ts .",
"build": "tsc",
"clean": "rm -rf lib && rm -rf node_modules",
"build:watch": "tsc --watch",
"serve": "npm run build && firebase emulators:start --only functions",
"shell": "npm run build && firebase functions:shell",
Expand Down
9 changes: 6 additions & 3 deletions functions/src/notifications_service/notifications_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ export const onActivityCreate = onDocumentCreated(
return;
}

logger.info('Activity Data:', activityData);

const userId = event.params.userId;
const activityMessage = generateNotificationMessage(activityData);

Expand All @@ -82,7 +80,7 @@ function generateNotificationMessage(activityData: ActivityData) {
const amountMessage = generateAmountMessage(amount);
const expenseName = activityData.expense_name ?? messages.unknown;
const actionUserName = activityData.action_user_name;
const payerName = activityData.payer_name ?? messages.someone;
const payerName = capitalizeFirstLetter(activityData.payer_name ?? messages.someone);
const receiverName = activityData.receiver_name ?? messages.someone;
const paymentReason = activityData.payment_reason;
const groupName = activityData.group_name;
Expand Down Expand Up @@ -158,6 +156,11 @@ function generateNotificationMessage(activityData: ActivityData) {
}
}

function capitalizeFirstLetter(name: string): string {
if (!name) return '';
return name.charAt(0).toUpperCase() + name.slice(1).toLowerCase();
}

// Helper function to generate notification amount message based on owedAmount
function generateAmountMessage(owedAmount: number): string {
if (owedAmount < 0) {
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"dependencies": {
"firebase-admin": "^12.0.0"
"firebase-admin": "^13.0.1",
"firebase-functions": "^6.1.1"
}
}

0 comments on commit 731bc96

Please sign in to comment.