Merge pull request #9261 from Expensify/update-staging-from-main

Update version to 1.1.70-1 on staging

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001017000
-        versionName "1.1.70-0"
+        versionCode 1001017001
+        versionName "1.1.70-1"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.70.0</string>
+	<string>1.1.70.1</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.70.0</string>
+	<string>1.1.70.1</string>
 </dict>
 </plist>

package.json

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

src/libs/API.js

@@ -0,0 +1,61 @@
+import _ from 'underscore';
+import Onyx from 'react-native-onyx';
+import * as Request from './Request';
+import * as SequentialQueue from './Network/SequentialQueue';
+import {version} from '../../package.json';
+
+function write(command, apiCommandParameters = {}, onyxData = {}) {
+    // Optimistically update Onyx
+    if (onyxData.optimisticData) {
+        Onyx.update(onyxData.optimisticData);
+    }
+
+    // Assemble the data we'll send to the API
+    const data = {
+        ...apiCommandParameters,
+        appversion: version,
+    };
+
+    // Assemble all the request data we'll be storing in the queue
+    const request = {
+        command,
+        data,
+        ..._.omit(onyxData, 'optimisticData'),
+    };
+
+    // Write commands can be saved and retried, so push it to the SequentialQueue
+    SequentialQueue.push(request);
+}
+
+function makeRequestWithSideEffects(command, apiCommandParameters = {}, onyxData = {}) {
+    // Optimistically update Onyx
+    if (onyxData.optimisticData) {
+        Onyx.update(onyxData.optimisticData);
+    }
+
+    // Assemble the data we'll send to the API
+    const data = {
+        ...apiCommandParameters,
+        appversion: version,
+    };
+
+    // Assemble all the request data we'll be storing
+    const request = {
+        command,
+        data,
+        ..._.omit(onyxData, 'optimisticData'),
+    };
+
+    // Return a promise containing the response from HTTPS
+    return Request.processWithMiddleware(request);
+}
+
+function read(command, apiCommandParameters, onyxData) {
+    makeRequestWithSideEffects(command, apiCommandParameters, onyxData);
+}
+
+export {
+    write,
+    makeRequestWithSideEffects,
+    read,
+};

src/libs/Middleware/Reauthentication.js

@@ -39,7 +39,9 @@ function Reauthentication(response, request, isFromSequentialQueue) {
                         return data;
                     }
 
-                    request.resolve(data);
+                    if (request.resolve) {
+                        request.resolve(data);
+                    }
                     return;
                 }
 
@@ -81,7 +83,9 @@ function Reauthentication(response, request, isFromSequentialQueue) {
                 return data;
             }
 
-            request.resolve(data);
+            if (request.resolve) {
+                request.resolve(data);
+            }
 
             // Return response data so we can chain the response with the following middlewares.
             return data;

src/libs/Middleware/Retry.js

@@ -32,7 +32,9 @@ function Retry(response, request, isFromSequentialQueue) {
                 console.debug('[Network] There was an error in the Log API command, unable to log to server!', error);
             }
 
-            request.resolve({jsonCode: CONST.JSON_CODE.UNABLE_TO_RETRY});
+            if (request.resolve) {
+                request.resolve({jsonCode: CONST.JSON_CODE.UNABLE_TO_RETRY});
+            }
         });
 }
 

src/libs/Middleware/SaveResponseInOnyx.js

@@ -11,17 +11,16 @@ function SaveResponseInOnyx(response, request) {
         .then((responseData) => {
             // We'll only save the onyxData, successData and failureData for the refactored commands
             if (_.has(responseData, 'onyxData')) {
-                let data;
+                const data = [];
                 if (responseData.jsonCode === 200) {
-                    data = [
-                        ...request.successData,
-                        ...responseData.onyxData,
-                    ];
-                } else {
-                    data = [
-                        ...request.failureData,
-                        ...responseData.onyxData,
-                    ];
+                    if (request.successData) {
+                        data.push(...request.successData);
+                    }
+                } else if (request.failureData) {
+                    data.push(...request.failureData);
+                }
+                if (responseData.onyxData) {
+                    data.push(...responseData.onyxData);
                 }
                 Onyx.update(data);
             }