Merge pull request #7416 from Expensify/OSBotify-cherry-pick-staging-7414

Author: OSBotify

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001013301
-        versionName "1.1.33-1"
+        versionCode 1001013302
+        versionName "1.1.33-2"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.33.1</string>
+	<string>1.1.33.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.33.1</string>
+	<string>1.1.33.2</string>
 </dict>
 </plist>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.33-1",
+  "version": "1.1.33-2",
   "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.",

package.json

@@ -56,7 +56,7 @@ class ImageWithSizeCalculation extends PureComponent {
     getImageSize(url) {
         return new Promise((resolve, reject) => {
             Image.getSize(url, (width, height) => {
-                resolve(width, height);
+                resolve({width, height});
             }, (error) => {
                 reject(error);
             });
@@ -70,7 +70,7 @@ class ImageWithSizeCalculation extends PureComponent {
 
         this.getImageSizePromise = makeCancellablePromise(this.getImageSize(this.props.url));
         this.getImageSizePromise.promise
-            .then((width, height) => {
+            .then(({width, height}) => {
                 if (!width || !height) {
                     // Image didn't load properly
                     return;