fix conflicts

Expensify · Jun 8, 2021 · c0046a2 · c0046a2
2 parents a4dbd43 + 7745c8a
commit c0046a2
Show file tree

Hide file tree

Showing 26 changed files with 1,513 additions and 644 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001006406
-        versionName "1.0.64-6"
+        versionCode 1001006503
+        versionName "1.0.65-3"
     }
     splits {
         abi {

diff --git a/babel.config.js b/babel.config.js
@@ -26,7 +26,9 @@ const webpack = {
 
 const metro = {
     presets: [require('metro-react-native-babel-preset')],
-    plugins: [],
+    plugins: [
+        'react-native-reanimated/plugin',
+    ],
 };
 
 module.exports = ({caller}) => {

diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -13,6 +13,7 @@ const platformExclude = platform === 'web' ? new RegExp(/\.desktop\.js$/) : new
 
 const includeModules = [
     'react-native-animatable',
+    'react-native-reanimated',
     'react-native-picker-select',
     'react-native-web',
     '@react-native-picker',

diff --git a/desktop/main.js b/desktop/main.js
@@ -228,7 +228,7 @@ const mainWindow = (() => {
             ipcMain.on(ELECTRON_EVENTS.REQUEST_VISIBILITY, (event) => {
                 // This is how synchronous messages work in Electron
                 // eslint-disable-next-line no-param-reassign
-                event.returnValue = browserWindow && browserWindow.isFocused();
+                event.returnValue = browserWindow && !browserWindow.isDestroyed() && browserWindow.isFocused();
             });
 
             // This allows the renderer process to bring the app

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -55,7 +55,7 @@ platform :android do
     upload_to_play_store(
       package_name: "com.expensify.chat",
       json_key: './android/app/android-fastlane-json-key.json',
-      version_code: ENV["VERSION_CODE"].to_i,
+      version_code: ENV["VERSION"].to_i,
       track: 'internal',
       track_promote_to: 'production',
       rollout: '1.0',

diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.64</string>
+	<string>1.0.65</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.64.6</string>
+	<string>1.0.65.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.64</string>
+	<string>1.0.65</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.64.6</string>
+	<string>1.0.65.3</string>
 </dict>
 </plist>