Merge pull request #10858 from Expensify/OSBotify-cherry-pick-staging…

…-10856 🍒 Cherry pick PR #10856 to staging 🍒
Expensify · Sep 7, 2022 · 0973ee1 · 0973ee1
2 parents e599558 + a5b5d58
commit 0973ee1
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/.github/actions/javascript/getPullRequestDetails/getPullRequestDetails.js b/.github/actions/javascript/getPullRequestDetails/getPullRequestDetails.js
@@ -87,9 +87,13 @@ if (pullRequestNumber) {
         ...DEFAULT_PAYLOAD,
         state: 'all',
     })
+        .then(({data}) => _.find(data, PR => PR.user.login === user && titleRegex.test(PR.title)).number)
+        .then(matchingPRNum => GithubUtils.octokit.pulls.get({
+            ...DEFAULT_PAYLOAD,
+            pull_number: matchingPRNum,
+        }))
         .then(({data}) => {
-            const matchingPR = _.find(data, PR => PR.user.login === user && titleRegex.test(PR.title));
-            outputMergeCommitHash(matchingPR);
-            outputMergeActor(matchingPR);
+            outputMergeCommitHash(data);
+            outputMergeActor(data);
         });
 }
diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -97,10 +97,14 @@ if (pullRequestNumber) {
         ...DEFAULT_PAYLOAD,
         state: 'all',
     })
+        .then(({data}) => _.find(data, PR => PR.user.login === user && titleRegex.test(PR.title)).number)
+        .then(matchingPRNum => GithubUtils.octokit.pulls.get({
+            ...DEFAULT_PAYLOAD,
+            pull_number: matchingPRNum,
+        }))
         .then(({data}) => {
-            const matchingPR = _.find(data, PR => PR.user.login === user && titleRegex.test(PR.title));
-            outputMergeCommitHash(matchingPR);
-            outputMergeActor(matchingPR);
+            outputMergeCommitHash(data);
+            outputMergeActor(data);
         });
 }
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001019702
-        versionName "1.1.97-2"
+        versionCode 1001019706
+        versionName "1.1.97-6"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.97.2</string>
+	<string>1.1.97.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.97.2</string>
+	<string>1.1.97.6</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.97-2",
+  "version": "1.1.97-6",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",