Merge pull request #3376 from Expensify/main

Expensify · Jun 4, 2021 · 16c50e4 · 16c50e4
2 parents 2374c79 + 3ce1f41
commit 16c50e4
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 35 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 1001006206
-        versionName "1.0.62-6"
+        versionCode 1001006207
+        versionName "1.0.62-7"
     }
     splits {
         abi {

diff --git a/desktop/main.js b/desktop/main.js
@@ -130,7 +130,6 @@ const mainWindow = (() => {
                 width: 1200,
                 height: 900,
                 webPreferences: {
-                    enableRemoteModule: true,
                     nodeIntegration: true,
                 },
                 titleBarStyle: 'hidden',
@@ -229,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.isFocused();
+                event.returnValue = browserWindow && browserWindow.isFocused();
             });
 
             // This allows the renderer process to bring the app

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

diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.62.6</string>
+	<string>1.0.62.7</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": "expensify.cash",
-  "version": "1.0.62-6",
+  "version": "1.0.62-7",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -130,7 +130,7 @@
     "copy-webpack-plugin": "^6.0.3",
     "detox": "^17.8.3",
     "diff-so-fancy": "^1.3.0",
-    "electron": "^9.2.0",
+    "electron": "^11.4.8",
     "electron-builder": "^22.8.0",
     "electron-notarize": "^1.0.0",
     "electron-reloader": "^1.2.0",