Merge pull request #27299 from Expensify/arosiclair-distance-edit-not…

…ifications

Notifications for editing money requests

android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java

@@ -106,7 +106,8 @@ protected NotificationCompat.Builder onExtendBuilder(@NonNull Context context, @
                 if (payload.containsKey(ONYX_DATA_KEY)) {
                     Objects.requireNonNull(payload.get(ONYX_DATA_KEY)).isNull();
                     Log.d(TAG, "payload contains onxyData");
-                    applyMessageStyle(context, builder, payload, arguments.getNotificationId());
+                    String alert = message.getExtra(PushMessage.EXTRA_ALERT);
+                    applyMessageStyle(context, builder, payload, arguments.getNotificationId(), alert);
                 }
             } catch (Exception e) {
                 Log.e(TAG, "Failed to parse conversation, falling back to default notification style. SendID=" + message.getSendId(), e);
@@ -163,7 +164,7 @@ public Bitmap getCroppedBitmap(Bitmap bitmap) {
      * @param payload Notification payload, which contains all the data we need to build the notifications.
      * @param notificationID Current notification ID
      */
-    private void applyMessageStyle(@NonNull Context context, NotificationCompat.Builder builder, JsonMap payload, int notificationID) {
+    private void applyMessageStyle(@NonNull Context context, NotificationCompat.Builder builder, JsonMap payload, int notificationID, String alert) {
         long reportID = payload.get("reportID").getLong(-1);
         if (reportID == -1) {
             return;
@@ -181,7 +182,9 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil
             String name = messageData.get("person").getList().get(0).getMap().get("text").getString();
             String avatar = messageData.get("avatar").getString();
             String accountID = Integer.toString(messageData.get("actorAccountID").getInt(-1));
-            String message = messageData.get("message").getList().get(0).getMap().get("text").getString();
+
+            // Use the formatted alert message from the backend. Otherwise fallback on the message in the Onyx data.
+            String message = alert != null ? alert : messageData.get("message").getList().get(0).getMap().get("text").getString();
             String conversationName = payload.get("roomName") == null ? "" : payload.get("roomName").getString("");
 
             // Retrieve or create the Person object who sent the latest report comment

src/libs/Notification/LocalNotification/BrowserNotifications.js

@@ -128,6 +128,16 @@ export default {
         });
     },
 
+    pushModifiedExpenseNotification({reportAction, onClick}, usesIcon = false) {
+        push({
+            title: _.map(reportAction.person, (f) => f.text).join(', '),
+            body: ReportUtils.getModifiedExpenseMessage(reportAction),
+            delay: 0,
+            onClick,
+            icon: usesIcon ? EXPENSIFY_ICON_URL : '',
+        });
+    },
+
     /**
      * Create a notification to indicate that an update is available.
      */

src/libs/Notification/LocalNotification/index.desktop.js

@@ -1,5 +1,11 @@
 import BrowserNotifications from './BrowserNotifications';
 
+/**
+ * @param {Object} options
+ * @param {Object} options.report
+ * @param {Object} options.reportAction
+ * @param {Function} options.onClick
+ */
 function showCommentNotification({report, reportAction, onClick}) {
     BrowserNotifications.pushReportCommentNotification({report, reportAction, onClick});
 }
@@ -8,7 +14,18 @@ function showUpdateAvailableNotification() {
     BrowserNotifications.pushUpdateAvailableNotification();
 }
 
+/**
+ * @param {Object} options
+ * @param {Object} options.report
+ * @param {Object} options.reportAction
+ * @param {Function} options.onClick
+ */
+function showModifiedExpenseNotification({report, reportAction, onClick}) {
+    BrowserNotifications.pushModifiedExpenseNotification({report, reportAction, onClick});
+}
+
 export default {
     showCommentNotification,
     showUpdateAvailableNotification,
+    showModifiedExpenseNotification,
 };

src/libs/Notification/LocalNotification/index.native.js

@@ -2,4 +2,5 @@
 export default {
     showCommentNotification: () => {},
     showUpdateAvailableNotification: () => {},
+    showModifiedExpenseNotification: () => {},
 };

src/libs/Notification/LocalNotification/index.website.js

@@ -1,5 +1,11 @@
 import BrowserNotifications from './BrowserNotifications';
 
+/**
+ * @param {Object} options
+ * @param {Object} options.report
+ * @param {Object} options.reportAction
+ * @param {Function} options.onClick
+ */
 function showCommentNotification({report, reportAction, onClick}) {
     BrowserNotifications.pushReportCommentNotification({report, reportAction, onClick}, true);
 }
@@ -8,7 +14,18 @@ function showUpdateAvailableNotification() {
     BrowserNotifications.pushUpdateAvailableNotification();
 }
 
+/**
+ * @param {Object} options
+ * @param {Object} options.report
+ * @param {Object} options.reportAction
+ * @param {Function} options.onClick
+ */
+function showModifiedExpenseNotification({report, reportAction, onClick}) {
+    BrowserNotifications.pushModifiedExpenseNotification({report, reportAction, onClick}, true);
+}
+
 export default {
     showCommentNotification,
     showUpdateAvailableNotification,
+    showModifiedExpenseNotification,
 };

src/libs/ReportActionsUtils.js

@@ -652,6 +652,11 @@ function isReportActionAttachment(reportAction) {
     return _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : isReportMessageAttachment(message);
 }
 
+// eslint-disable-next-line rulesdir/no-negated-variables
+function isNotifiableReportAction(reportAction) {
+    return reportAction && _.contains([CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT, CONST.REPORT.ACTIONS.TYPE.IOU, CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE], reportAction.actionName);
+}
+
 export {
     getSortedReportActions,
     getLastVisibleAction,
@@ -690,4 +695,5 @@ export {
     isTaskAction,
     getAllReportActions,
     isReportActionAttachment,
+    isNotifiableReportAction,
 };

src/libs/ReportUtils.js

@@ -1554,6 +1554,9 @@ function getProperSchemaForModifiedExpenseMessage(newValue, oldValue, valueName,
 /**
  * Get the report action message when expense has been modified.
  *
+ * ModifiedExpense::getNewDotComment in Web-Expensify should match this.
+ * If we change this function be sure to update the backend as well.
+ *
  * @param {Object} reportAction
  * @returns {String}
  */

src/libs/actions/Report.js

@@ -1627,9 +1627,9 @@ function shouldShowReportActionNotification(reportID, action = null, isRemote =
         return false;
     }
 
-    // Don't show a notification if no comment exists
-    if (action && !_.some(action.message, (f) => f.type === 'COMMENT')) {
-        Log.info(`${tag} No notification because no comments exist for the current action`);
+    // Only show notifications for supported types of report actions
+    if (!ReportActionsUtils.isNotifiableReportAction(action)) {
+        Log.info(`${tag} No notification because this action type is not supported`, false, {actionName: action.actionName});
         return false;
     }
 
@@ -1638,23 +1638,28 @@ function shouldShowReportActionNotification(reportID, action = null, isRemote =
 
 /**
  * @param {String} reportID
- * @param {Object} action
+ * @param {Object} reportAction
  */
-function showReportActionNotification(reportID, action) {
-    if (!shouldShowReportActionNotification(reportID, action)) {
+function showReportActionNotification(reportID, reportAction) {
+    if (!shouldShowReportActionNotification(reportID, reportAction)) {
         return;
     }
 
     Log.info('[LocalNotification] Creating notification');
-    LocalNotification.showCommentNotification({
-        report: allReports[reportID],
-        reportAction: action,
-        onClick: () => {
-            // Navigate to this report onClick
-            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
-        },
-    });
-    notifyNewAction(reportID, action.actorAccountID, action.reportActionID);
+    const report = allReports[reportID];
+
+    const notificationParams = {
+        report,
+        reportAction,
+        onClick: () => Navigation.navigate(ROUTES.getReportRoute(reportID)),
+    };
+    if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE) {
+        LocalNotification.showModifiedExpenseNotification(notificationParams);
+    } else {
+        LocalNotification.showCommentNotification(notificationParams);
+    }
+
+    notifyNewAction(reportID, reportAction.actorAccountID, reportAction.reportActionID);
 }
 
 /**

src/libs/actions/User.js

@@ -471,8 +471,10 @@ function triggerNotifications(onyxUpdates) {
 
         const reportID = update.key.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '');
         const reportActions = _.values(update.value);
-        const sortedReportActions = ReportActionsUtils.getSortedReportActions(reportActions);
-        Report.showReportActionNotification(reportID, _.last(sortedReportActions));
+
+        // eslint-disable-next-line rulesdir/no-negated-variables
+        const notifiableActions = _.filter(reportActions, (action) => ReportActionsUtils.isNotifiableReportAction(action));
+        _.each(notifiableActions, (action) => Report.showReportActionNotification(reportID, action));
     });
 }
 

tests/actions/ReportTest.js

@@ -503,7 +503,9 @@ describe('actions/Report', () => {
     it('should show a notification for report action updates with shouldNotify', () => {
         const TEST_USER_ACCOUNT_ID = 1;
         const REPORT_ID = '1';
-        const REPORT_ACTION = {};
+        const REPORT_ACTION = {
+            actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+        };
 
         // Setup user and pusher listeners
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID)