Merge pull request #9384 from Expensify/OSBotify-cherry-pick-staging-9381

🍒 Cherry pick PR #9381 to staging 🍒

Author: OSBotify

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001017500
-        versionName "1.1.75-0"
+        versionCode 1001017501
+        versionName "1.1.75-1"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.75.0</string>
+	<string>1.1.75.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.75.0</string>
+	<string>1.1.75.1</string>
 </dict>
 </plist>

package-lock.json

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

package.json

@@ -10,9 +10,8 @@ import CONST from '../CONST';
  * @param {String} eventName
  * @param {String} accountID
  * @param {Function} onEvent
- * @param {Boolean} isChunked
  */
-function subscribeToPrivateUserChannelEvent(eventName, accountID, onEvent, isChunked = false) {
+function subscribeToPrivateUserChannelEvent(eventName, accountID, onEvent) {
     const pusherChannelName = `${CONST.PUSHER.PRIVATE_USER_CHANNEL_PREFIX}${accountID}${CONFIG.PUSHER.SUFFIX}`;
 
     /**
@@ -40,7 +39,7 @@ function subscribeToPrivateUserChannelEvent(eventName, accountID, onEvent, isChu
     function onSubscriptionFailed(error) {
         Log.hmmm('Failed to subscribe to Pusher channel', false, {error, pusherChannelName, eventName});
     }
-    Pusher.subscribe(pusherChannelName, eventName, onEventPush, isChunked, onPusherResubscribeToPrivateUserChannel)
+    Pusher.subscribe(pusherChannelName, eventName, onEventPush, onPusherResubscribeToPrivateUserChannel)
         .catch(onSubscriptionFailed);
 }
 

src/libs/PusherUtils.js

@@ -618,7 +618,6 @@ function subscribeToUserEvents() {
         Pusher.TYPE.REPORT_COMMENT_CHUNK,
         currentUserAccountID,
         pushJSON => updateReportWithNewAction(pushJSON.reportID, pushJSON.reportAction, pushJSON.notificationPreference),
-        true,
     );
 
     // Live-update a report's actions when an 'edit comment' event is received.
@@ -631,7 +630,6 @@ function subscribeToUserEvents() {
         Pusher.TYPE.REPORT_COMMENT_EDIT_CHUNK,
         currentUserAccountID,
         pushJSON => updateReportActionMessage(pushJSON.reportID, pushJSON.sequenceNumber, pushJSON.message),
-        true,
     );
 }
 

src/libs/actions/Report.js

@@ -314,7 +314,7 @@ function subscribeToUserEvents() {
         SequentialQueue.getCurrentRequest().then(() => {
             Onyx.update(pushJSON.onyxData);
         });
-    }, true);
+    });
 
     // Live-update an user's preferred locale
     Pusher.subscribe(pusherChannelName, Pusher.TYPE.PREFERRED_LOCALE, (pushJSON) => {