From eb85eb2814d9446edbd0c778880294b3a0a608ab Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 8 May 2023 20:39:44 -0400
Subject: [PATCH 1/2] Merge pull request #18621 from
 Expensify/version-BUILD-B0D59021-2BED-42D3-8471-067636DBD7A1

Update version to 1.3.11-5 on main

(cherry picked from commit d0f79558a2fd4f4d684e7c2e4ad24a7e08663a29)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 545a27d88bc1..488aa01f5843 100644
--- 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 1001031104
-        versionName "1.3.11-4"
+        versionCode 1001031105
+        versionName "1.3.11-5"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2d49dea438e8..b01f42b749b2 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.11.4</string>
+	<string>1.3.11.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 7038ffc51647..d02795c3a346 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.11.4</string>
+	<string>1.3.11.5</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 583a99ebeeed..101d90ef881e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.11-4",
+  "version": "1.3.11-5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.11-4",
+      "version": "1.3.11-5",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 19eed228fcc3..f498877e6a88 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.11-4",
+  "version": "1.3.11-5",
   "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.",

From 2113f7a8bcc2ae40a7da1056cab982f217db8f07 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Mon, 8 May 2023 17:30:36 -0700
Subject: [PATCH 2/2] Merge pull request #18619 from Expensify/Rory-FixBadMerge

[CP Stg] Fix bad merge

(cherry picked from commit 1013d9f2cc3000ae58a4c24dccd4780ab25fe51e)
---
 src/libs/actions/Session/index.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index f351c4961305..82be9822b4d2 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -652,7 +652,7 @@ function authenticatePusher(socketID, channelName, callback) {
  */
 function requestUnlinkValidationLink() {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: true,
@@ -661,7 +661,7 @@ function requestUnlinkValidationLink() {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
@@ -669,7 +669,7 @@ function requestUnlinkValidationLink() {
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
@@ -681,7 +681,7 @@ function requestUnlinkValidationLink() {
 
 function unlinkLogin(accountID, validateCode) {
     const optimisticData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             ...CONST.DEFAULT_ACCOUNT_DATA,
@@ -689,7 +689,7 @@ function unlinkLogin(accountID, validateCode) {
         },
     }];
     const successData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,
@@ -697,14 +697,14 @@ function unlinkLogin(accountID, validateCode) {
         },
     },
     {
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.CREDENTIALS,
         value: {
             login: '',
         },
     }];
     const failureData = [{
-        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        onyxMethod: Onyx.METHOD.MERGE,
         key: ONYXKEYS.ACCOUNT,
         value: {
             isLoading: false,