Use push notification ID instead of accountID

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
           key: ${{ runner.os }}-jest
 
       - name: Jest tests
-        run: npx jest --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
+        run: npx jest --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
 
   shellTests:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}

src/ONYXKEYS.js

@@ -79,6 +79,8 @@ export default {
     // Contains the users's block expiration (if they have one)
     NVP_BLOCKED_FROM_CONCIERGE: 'private_blockedFromConcierge',
 
+    NVP_PRIVATE_PUSH_NOTIFICATION_ID: 'private_pushNotificationID',
+
     // Plaid data (access tokens, bank accounts ...)
     PLAID_DATA: 'plaidData',
 

src/libs/actions/Session/index.js

@@ -29,23 +29,15 @@ Onyx.connect({
  * On Android, AuthScreens unmounts when the app is closed with the back button so we manage the
  * push subscription when the session changes here.
  */
-let previousAccountID;
 Onyx.connect({
-    key: ONYXKEYS.SESSION,
-    callback: (session) => {
-        const accountID = lodashGet(session, 'accountID');
-        if (previousAccountID === accountID) {
-            return;
-        }
-
-        if (accountID) {
-            PushNotification.register(accountID);
+    key: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
+    callback: (notificationID) => {
+        if (notificationID) {
+            PushNotification.register(notificationID);
         } else {
             PushNotification.deregister();
             PushNotification.clearNotifications();
         }
-
-        previousAccountID = accountID;
     },
 });
 

tests/unit/NetworkTest.js

@@ -681,10 +681,14 @@ describe('NetworkTests', () => {
 
                 // Third command should be the call to Authenticate
                 const [thirdCommand] = xhr.mock.calls[2];
-                expect(thirdCommand).toBe('Authenticate');
+                expect(thirdCommand).toBe('Log');
 
+                // Third command should be the call to Authenticate
                 const [fourthCommand] = xhr.mock.calls[3];
-                expect(fourthCommand).toBe('MockCommand');
+                expect(fourthCommand).toBe('Authenticate');
+
+                const [fifthCommand] = xhr.mock.calls[4];
+                expect(fifthCommand).toBe('MockCommand');
 
                 // We are using the new authToken
                 expect(NetworkStore.getAuthToken()).toBe('newToken');

tests/utils/TestHelper.js

@@ -108,6 +108,11 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
                             key: ONYXKEYS.BETAS,
                             value: ['all'],
                         },
+                        {
+                            onyxMethod: CONST.ONYX.METHOD.MERGE,
+                            key: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
+                            value: 'randomID',
+                        },
                     ],
                     jsonCode: 200,
                 });