From 0b8fc269089dc08d14111bff5eab5372d1040aef Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 27 Apr 2022 11:29:30 -0700
Subject: [PATCH 1/2] Merge pull request #8806 from
 Expensify/version-BUILD-def3fa6f6d9e45a6b6e911d2244c65043ea3a74d

Update version to 1.1.57-4 on main

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5c34ee97f158..59650deb2c98 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001015700
-        versionName "1.1.57-0"
+        versionCode 1001015704
+        versionName "1.1.57-4"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index b76ff2a265ac..70b23a90565c 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.0</string>
+	<string>1.1.57.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index e5f8811153c2..b7f44820fc22 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.1.57.0</string>
+	<string>1.1.57.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 2608a08499cb..d95c2f51e4c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-0",
+  "version": "1.1.57-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 43f0ead72655..d4a0cff84e00 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-0",
+  "version": "1.1.57-4",
   "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 ee272cdd5edd6d5c4d4a6835aee888781e138779 Mon Sep 17 00:00:00 2001
From: Neil Marcellini <neil@expensify.com>
Date: Wed, 27 Apr 2022 11:18:37 -0700
Subject: [PATCH 2/2] Merge pull request #8803 from Expensify/jack-deployToFile

Adjust webpack type to apple-app-site-association

(cherry picked from commit def3fa6f6d9e45a6b6e911d2244c65043ea3a74d)
---
 config/webpack/webpack.common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
index 1b856a3039c7..99cc83dfc5b9 100644
--- a/config/webpack/webpack.common.js
+++ b/config/webpack/webpack.common.js
@@ -56,7 +56,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
                 {from: 'assets/css', to: 'css'},
                 {from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'},
                 {from: 'assets/images/shadow.png', to: 'images/shadow.png'},
-                {from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association'},
+                {from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association', toType: 'file'},
 
                 // These files are copied over as per instructions here
                 // https://github.com/wojtekmaj/react-pdf#copying-cmaps