Merge branch 'main' into fix-19810-moment-timezones-migration

Expensify · Sep 12, 2023 · 1c0b43b · 1c0b43b
2 parents 00e0c86 + 5a153a3
commit 1c0b43b
Show file tree

Hide file tree

Showing 105 changed files with 940 additions and 1,956 deletions.
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -32,14 +32,15 @@ jobs:
   deployChecklist:
     name: Create or update deploy checklist
     runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'release' }}
     needs: validateActor
     steps:
       - uses: actions/checkout@v3
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Set version
         id: getVersion
-        run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
+        run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_OUTPUT"
 
       - name: Create or update staging deploy
         uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001036702
-        versionName "1.3.67-2"
+        versionCode 1001036812
+        versionName "1.3.68-12"
     }
 
     flavorDimensions "default"

diff --git a/android/app/src/development/assets/airshipconfig.properties b/android/app/src/development/assets/airshipconfig.properties
@@ -5,4 +5,4 @@ developmentLogLevel = VERBOSE
 
 # Notification Customization
 notificationIcon = ic_notification
-notificationAccentColor = #03D47C
+notificationAccentColor = #2EAAE2
diff --git a/android/app/src/main/assets/airshipconfig.properties b/android/app/src/main/assets/airshipconfig.properties
@@ -4,4 +4,4 @@ inProduction = true
 
 # Notification Customization
 notificationIcon = ic_notification
-notificationAccentColor = #03D47C
+notificationAccentColor = #2EAAE2
diff --git a/android/app/src/main/res/drawable-hdpi/ic_notification.png b/android/app/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/android/app/src/main/res/drawable-mdpi/ic_notification.png b/android/app/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_notification.png b/android/app/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_notification.png b/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png b/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
diff --git a/assets/animations/Safe.json b/assets/animations/Safe.json
diff --git a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md b/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
@@ -1,5 +1,7 @@
 # Expensify PropTypes Conversion Table
 
+This is a reference to help you convert PropTypes to TypeScript types. 
+
 ## Table of Contents
 
 - [Important Considerations](#important-considerations)

diff --git a/desktop/main.js b/desktop/main.js
@@ -12,7 +12,7 @@ const CONST = require('../src/CONST').default;
 const Localize = require('../src/libs/Localize');
 
 const port = process.env.PORT || 8082;
-const {DESKTOP_SHORTCUT_ACCELERATOR} = CONST;
+const {DESKTOP_SHORTCUT_ACCELERATOR, LOCALES} = CONST;
 
 app.setName('New Expensify');
 
@@ -36,25 +36,40 @@ function pasteAsPlainText(browserWindow) {
     browserWindow.webContents.insertText(text);
 }
 
-// Initialize the right click menu
-// See https://github.com/sindresorhus/electron-context-menu
-// Add the Paste and Match Style command to the context menu
-contextMenu({
-    append: (defaultActions, parameters, browserWindow) => [
-        new MenuItem({
-            // Only enable the menu item for Editable context which supports paste
-            visible: parameters.isEditable && parameters.editFlags.canPaste,
-            role: 'pasteAndMatchStyle',
-            accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AND_MATCH_STYLE,
-        }),
-        new MenuItem({
-            label: Localize.translate(CONST.LOCALES.DEFAULT, 'desktopApplicationMenu.pasteAsPlainText'),
-            visible: parameters.isEditable && parameters.editFlags.canPaste && clipboard.readText().length > 0,
-            accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AS_PLAIN_TEXT,
-            click: () => pasteAsPlainText(browserWindow),
-        }),
-    ],
-});
+/**
+ * Initialize the right-click menu
+ * See https://github.com/sindresorhus/electron-context-menu
+ *
+ * @param {String} preferredLocale - The current user language to be used for translating menu labels.
+ * @returns {Function} A dispose function to clean up the created context menu.
+ */
+
+function createContextMenu(preferredLocale = LOCALES.DEFAULT) {
+    return contextMenu({
+        labels: {
+            cut: Localize.translate(preferredLocale, 'desktopApplicationMenu.cut'),
+            paste: Localize.translate(preferredLocale, 'desktopApplicationMenu.paste'),
+            copy: Localize.translate(preferredLocale, 'desktopApplicationMenu.copy'),
+        },
+        append: (defaultActions, parameters, browserWindow) => [
+            new MenuItem({
+                // Only enable the menu item for Editable context which supports paste
+                visible: parameters.isEditable && parameters.editFlags.canPaste,
+                role: 'pasteAndMatchStyle',
+                accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AND_MATCH_STYLE,
+                label: Localize.translate(preferredLocale, 'desktopApplicationMenu.pasteAndMatchStyle'),
+            }),
+            new MenuItem({
+                label: Localize.translate(preferredLocale, 'desktopApplicationMenu.pasteAsPlainText'),
+                visible: parameters.isEditable && parameters.editFlags.canPaste && clipboard.readText().length > 0,
+                accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AS_PLAIN_TEXT,
+                click: () => pasteAsPlainText(browserWindow),
+            }),
+        ],
+    });
+}
+
+let disposeContextMenu = createContextMenu();
 
 // Send all autoUpdater logs to a log file: ~/Library/Logs/new.expensify.desktop/main.log
 // See https://www.npmjs.com/package/electron-log
@@ -522,6 +537,8 @@ const mainWindow = () => {
 
                 ipcMain.on(ELECTRON_EVENTS.LOCALE_UPDATED, (event, updatedLocale) => {
                     Menu.setApplicationMenu(Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, updatedLocale)));
+                    disposeContextMenu();
+                    disposeContextMenu = createContextMenu(updatedLocale);
                 });
 
                 ipcMain.on(ELECTRON_EVENTS.REQUEST_VISIBILITY, (event) => {

diff --git a/...r/Card-Rev-Share-for-Approved-Partners.md → ...-Share-for-ExpensifyApproved!-Partners.md b/...r/Card-Rev-Share-for-Approved-Partners.md → ...-Share-for-ExpensifyApproved!-Partners.md
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.67</string>
+	<string>1.3.68</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.67.2</string>
+	<string>1.3.68.12</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.67</string>
+	<string>1.3.68</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.67.2</string>
+	<string>1.3.68.12</string>
 </dict>
 </plist>