Merge branch 'main' into 27603-remove-second-back-icon-in-room-page-w…

…hen-no-workspace

.github/ISSUE_TEMPLATE/Accessibility.md

@@ -34,7 +34,7 @@ What can we do to fix the issue?
 <!--- 
 Check off any platforms that are affected by this issue
 --->
-Which of our officially supported platforms is this issue occurring on?
+Which of our officially supported platforms is this issue occurring on? Please only tick the box if you have provided a screen-recording in the thread for each platform:
 - [ ] Android / native
 - [ ] Android / Chrome
 - [ ] iOS / native

.github/workflows/deployExpensifyHelp.yml

@@ -2,6 +2,10 @@
 name: Deploy ExpensifyHelp
 
 on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["main"]
+
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 

.gitignore

@@ -107,3 +107,7 @@ tsconfig.tsbuildinfo
 
 # Workflow test logs
 /workflow_tests/logs/
+
+# Yalc
+.yalc
+yalc.lock

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001037209
-        versionName "1.3.72-9"
+        versionCode 1001037402
+        versionName "1.3.74-2"
     }
 
     flavorDimensions "default"

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

contributingGuides/CONTRIBUTING.md

@@ -47,7 +47,7 @@ Note: if you are hired for an Upwork job and have any job-specific questions, pl
 If you've found a vulnerability, please email security@expensify.com with the subject `Vulnerability Report` instead of creating an issue.
 
 ## Payment for Contributions
-We hire and pay external contributors via Upwork.com. If you'd like to be paid for contributing or reporting a bug, please create an Upwork account, apply for an available job in [GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22), and finally apply for the job in Upwork once your proposal gets selected in GitHub. PLease make sure your Upwork profile is **fully verified** before applying, otherwise you run the risk of not being paid. If you think your compensation should be increased for a specific job, you can request a reevaluation by commenting in the Github issue where the Upwork job was posted. 
+We hire and pay external contributors via Upwork.com. If you'd like to be paid for contributing or reporting a bug, please create an Upwork account, apply for an available job in [GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22), and finally apply for the job in Upwork once your proposal gets selected in GitHub. Please make sure your Upwork profile is **fully verified** before applying, otherwise you run the risk of not being paid. If you think your compensation should be increased for a specific job, you can request a reevaluation by commenting in the Github issue where the Upwork job was posted. 
 
 Payment for your contributions and bug reports will be made no less than 7 days after the pull request is deployed to production to allow for [regression](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions) testing. If you have not received payment after 8 days of the PR being deployed to production, and there are no [regressions](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions), please add a comment to the issue mentioning the BugZero team member (Look for the melvin-bot "Triggered auto assignment to... (`Bug`)" to see who this is).