Merge branch 'main' into fix/20946

Expensify · Jul 10, 2023 · 1efdf15 · 1efdf15
2 parents 6410748 + ab37414
commit 1efdf15
Show file tree

Hide file tree

Showing 130 changed files with 14,798 additions and 3,309 deletions.
diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
@@ -139,11 +139,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -177,11 +177,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -144,11 +144,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -386,11 +386,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -320,11 +320,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -189,11 +189,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/getReleaseBody/index.js b/.github/actions/javascript/getReleaseBody/index.js
@@ -131,11 +131,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/isStagingDeployLocked/index.js b/.github/actions/javascript/isStagingDeployLocked/index.js
@@ -95,11 +95,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -272,11 +272,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/postTestBuildComment/index.js b/.github/actions/javascript/postTestBuildComment/index.js
@@ -139,11 +139,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js
@@ -108,11 +108,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
@@ -174,11 +174,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/triggerWorkflowAndWait/index.js b/.github/actions/javascript/triggerWorkflowAndWait/index.js
@@ -273,11 +273,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js
@@ -97,11 +97,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/libs/GithubUtils.js b/.github/libs/GithubUtils.js
@@ -32,11 +32,12 @@ class GithubUtils {
         this.internalOctokit = new Octokit(
             getOctokitOptions(token, {
                 throttle: {
+                    retryAfterBaseValue: 2000,
                     onRateLimit: (retryAfter, options) => {
                         console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
 
-                        // Retry once after hitting a rate limit error, then give up
-                        if (options.request.retryCount <= 1) {
+                        // Retry five times when hitting a rate limit error, then give up
+                        if (options.request.retryCount <= 5) {
                             console.log(`Retrying after ${retryAfter} seconds!`);
                             return true;
                         }

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -165,7 +165,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 5
-          command: cd ios && pod install
+          command: cd ios && bundle exec pod install
 
       - name: Decrypt profile
         run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output chat_expensify_appstore.mobileprovision chat_expensify_appstore.mobileprovision.gpg

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -148,7 +148,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 5
-          command: cd ios && pod install
+          command: cd ios && bundle exec pod install
 
       - name: Decrypt profile
         run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output chat_expensify_adhoc.mobileprovision chat_expensify_adhoc.mobileprovision.gpg

diff --git a/README.md b/README.md
@@ -47,7 +47,10 @@ In order to have more consistent builds, we use a strict `node` and `npm` versio
 ## Running the iOS app 📱
 For an M1 Mac, read this [SO](https://stackoverflow.com/c/expensify/questions/11580) for installing cocoapods.
 
-* To install the iOS dependencies, run: `npm install && cd ios/ && pod install && cd ..`
+* Install project gems, including cocoapods, using bundler to ensure everyone uses the same versions. In the project root, run: `bundle install`
+    * If you get the error `Could not find 'bundler'`, install the bundler gem first: `gem install bundler` and try again.
+    * If you are using MacOS and get the error `Gem::FilePermissionError` when trying to install the bundler gem, you're likely using system Ruby, which requires administrator permission to modify. To get around this, install another version of Ruby with a version manager like [rbenv](https://github.com/rbenv/rbenv#installation).
+* To install the iOS dependencies, run: `npm install && npm run pod-install`
 * If you are an Expensify employee and want to point the emulator to your local VM, follow [this](https://stackoverflow.com/c/expensify/questions/7699)
 * To run a on a **Development Simulator**: `npm run ios`
 * Changes applied to Javascript will be applied automatically, any changes to native code will require a recompile

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001033706
-        versionName "1.3.37-6"
+        versionCode 1001033804
+        versionName "1.3.38-4"
     }
 
     splits {