Fixed edge case where contacts weren't loaded

Author: Crecket

src/react/Actions/contacts.js

@@ -8,11 +8,10 @@ import fs from "../ImportWrappers/fs";
 
 export const STORED_CONTACTS = "BUNQDESKTOP_STORED_CONTACTS";
 
-export function contactsSetInfoType(contacts, type, BunqJSClient = false) {
+export function contactsSetInfoType(contacts, type) {
     return {
         type: "CONTACTS_SET_INFO_TYPE",
         payload: {
-            BunqJSClient,
             type: type,
             contacts: contacts
         }
@@ -122,7 +121,7 @@ export function contactInfoUpdateGoogle(BunqJSClient, accessToken) {
                 }
 
                 // set the contacts
-                dispatch(contactsSetInfoType(collectedEntries, "GoogleContacts", BunqJSClient));
+                dispatch(contactsSetInfoType(collectedEntries, "GoogleContacts"));
                 dispatch(contactsNotLoading());
             })
             .catch(error => {
@@ -202,7 +201,7 @@ export function contactInfoUpdateOffice365(BunqJSClient, accessToken) {
                 }
 
                 // set the contacts
-                dispatch(contactsSetInfoType(collectedEntries, "Office365", BunqJSClient));
+                dispatch(contactsSetInfoType(collectedEntries, "Office365"));
                 dispatch(contactsNotLoading());
             })
             .catch(error => {
@@ -284,7 +283,7 @@ export function contactInfoUpdateApple(BunqJSClient, files) {
         });
 
         // set the contacts
-        dispatch(contactsSetInfoType(collectedEntries, "AppleContacts", BunqJSClient));
+        dispatch(contactsSetInfoType(collectedEntries, "AppleContacts"));
         dispatch(contactsNotLoading());
     };
 }

src/react/Pages/Contacts/Contacts.jsx

@@ -203,7 +203,7 @@ const mapDispatchToProps = (dispatch, props) => {
         contactInfoUpdateGoogle: accessToken => dispatch(contactInfoUpdateGoogle(BunqJSClient, accessToken)),
         contactInfoUpdateApple: filePaths => dispatch(contactInfoUpdateApple(BunqJSClient, filePaths)),
         contactInfoUpdateOffice365: accessToken => dispatch(contactInfoUpdateOffice365(BunqJSClient, accessToken)),
-        contactsSetInfoType: (contacts, type) => dispatch(contactsSetInfoType(contacts, type, BunqJSClient)),
+        contactsSetInfoType: (contacts, type) => dispatch(contactsSetInfoType(contacts, type)),
         clearContacts: (type = false) => dispatch(contactsClear(BunqJSClient, type)),
         openSnackbar: message => dispatch(openSnackbar(message))
     };

src/react/Reducers/contacts.js

@@ -12,10 +12,12 @@ const uniqueArray = a => {
 
 export default function reducer(state = defaultState, action) {
     switch (action.type) {
-        case "CONTACTS_SET_INFO_TYPE":
+        case "CONTACTS_SET_INFO_TYPE": {
+            const currentContactState = { ...state.contacts };
             const contacts = action.payload.contacts;
-            const stateContacts = state.contacts[action.payload.type];
-            const currentContacts = stateContacts ? [...stateContacts] : [];
+            const contactType = action.payload.type;
+
+            const currentContacts = currentContactState[contactType] ? currentContactState[contactType] : [];
 
             // go through all contacts and combine theme
             contacts.map(newContact => {
@@ -50,42 +52,37 @@ export default function reducer(state = defaultState, action) {
             });
 
             // set the new combined contacts for this type
-            stateContacts[action.payload.type] = sortedCombinedContacts;
-
-            // store the data if we have access to the bunqjsclient
-            if (action.payload.BunqJSClient) {
-                const BunqDesktopClient = window.BunqDesktopClient;
-                BunqDesktopClient.storeEncrypt(
-                    {
-                        items: stateContacts
-                    },
-                    STORED_CONTACTS
-                )
-                    .then(() => {})
-                    .catch(() => {});
-            }
+            currentContactState[action.payload.type] = sortedCombinedContacts;
+
+            const BunqDesktopClient = window.BunqDesktopClient;
+            BunqDesktopClient.storeEncrypt(
+                {
+                    items: currentContactState
+                },
+                STORED_CONTACTS
+            )
+                .then(() => {})
+                .catch(() => {});
 
             return {
                 ...state,
                 last_update: new Date().getTime(),
-                contacts: stateContacts
+                contacts: currentContactState
             };
+        }
 
         case "CONTACTS_SET_INFO": {
             const contacts2 = action.payload.contacts;
 
-            // store the data if we have access to the bunqjsclient
-            if (action.payload.BunqJSClient) {
-                const BunqDesktopClient = window.BunqDesktopClient;
-                BunqDesktopClient.storeEncrypt(
-                    {
-                        items: contacts2
-                    },
-                    STORED_CONTACTS
-                )
-                    .then(() => {})
-                    .catch(() => {});
-            }
+            const BunqDesktopClient = window.BunqDesktopClient;
+            BunqDesktopClient.storeEncrypt(
+                {
+                    items: contacts2
+                },
+                STORED_CONTACTS
+            )
+                .then(() => {})
+                .catch(() => {});
 
             return {
                 ...state,