Merge remote-tracking branch 'origin/main' into brtqkr/standardize-wr…

…appers

.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts

@@ -8,6 +8,7 @@ import {promiseDoWhile} from '@github/libs/promiseWhile';
 type CurrentStagingDeploys = Awaited<ReturnType<typeof GitHubUtils.octokit.actions.listWorkflowRuns>>['data']['workflow_runs'];
 
 function run() {
+    console.info('[awaitStagingDeploys] POLL RATE', CONST.POLL_RATE);
     console.info('[awaitStagingDeploys] run()');
     console.info('[awaitStagingDeploys] getStringInput', getStringInput);
     console.info('[awaitStagingDeploys] GitHubUtils', GitHubUtils);

.github/actions/javascript/awaitStagingDeploys/index.js

@@ -12131,6 +12131,7 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
 const promiseWhile_1 = __nccwpck_require__(9438);
 function run() {
+    console.info('[awaitStagingDeploys] POLL RATE', CONST_1.default.POLL_RATE);
     console.info('[awaitStagingDeploys] run()');
     console.info('[awaitStagingDeploys] getStringInput', ActionUtils_1.getStringInput);
     console.info('[awaitStagingDeploys] GitHubUtils', GithubUtils_1.default);
@@ -12742,7 +12743,12 @@ function promiseWhile(condition, action) {
                     resolve();
                     return;
                 }
-                Promise.resolve(actionResult).then(loop).catch(reject);
+                Promise.resolve(actionResult)
+                    .then(() => {
+                    // Set a timeout to delay the next loop iteration
+                    setTimeout(loop, 1000); // 1000 ms delay
+                })
+                    .catch(reject);
             }
         };
         loop();

.github/libs/promiseWhile.ts

@@ -19,7 +19,12 @@ function promiseWhile(condition: () => boolean, action: (() => Promise<void>) |
                     return;
                 }
 
-                Promise.resolve(actionResult).then(loop).catch(reject);
+                Promise.resolve(actionResult)
+                    .then(() => {
+                        // Set a timeout to delay the next loop iteration
+                        setTimeout(loop, 1000); // 1000 ms delay
+                    })
+                    .catch(reject);
             }
         };
         loop();

.github/workflows/platformDeploy.yml

@@ -87,12 +87,11 @@ jobs:
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
-      # Note: Android production deploys are temporarily disabled until https://github.com/Expensify/App/issues/40108 is resolved
-      #      - name: Run Fastlane production
-      #        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-      #        run: bundle exec fastlane android production
-      #        env:
-      #          VERSION: ${{ env.VERSION_CODE }}
+      - name: Run Fastlane production
+        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        run: bundle exec fastlane android production
+        env:
+          VERSION: ${{ env.VERSION_CODE }}
 
       - name: Archive Android sourcemaps
         uses: actions/upload-artifact@v3

README.md

@@ -11,7 +11,7 @@
 
 #### Table of Contents
 * [Local Development](#local-development)
-* [Testing on browsers on simulators and emulators](#testing-on-browsers-on-simulators-and-emulators)
+* [Testing on browsers in simulators and emulators](#testing-on-browsers-in-simulators-and-emulators)
 * [Running The Tests](#running-the-tests)
 * [Debugging](#debugging)
 * [App Structure and Conventions](#app-structure-and-conventions)

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001046505
-        versionName "1.4.65-5"
+        versionCode 1001046700
+        versionName "1.4.67-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

config/webpack/webpack.dev.ts

@@ -21,16 +21,12 @@ const getConfiguration = (environment: Environment): Promise<Configuration> =>
             process.env.USE_WEB_PROXY === 'false'
                 ? {}
                 : {
-                      proxy: {
-                          // eslint-disable-next-line @typescript-eslint/naming-convention
-                          '/api': 'http://[::1]:9000',
-                          // eslint-disable-next-line @typescript-eslint/naming-convention
-                          '/staging': 'http://[::1]:9000',
-                          // eslint-disable-next-line @typescript-eslint/naming-convention
-                          '/chat-attachments': 'http://[::1]:9000',
-                          // eslint-disable-next-line @typescript-eslint/naming-convention
-                          '/receipts': 'http://[::1]:9000',
-                      },
+                      proxy: [
+                          {
+                              context: ['/api', '/staging', '/chat-attachments', '/receipts'],
+                              target: 'http://[::1]:9000',
+                          },
+                      ],
                   };
 
         const baseConfig = getCommonConfiguration(environment);