Merge remote-tracking branch 'upstream/master' into devtools

Author: firstred

app/images/bunq-mastercard-metal.png

@@ -163,7 +163,7 @@
         "@babel/plugin-transform-runtime": "^7.7.4",
         "@babel/preset-env": "^7.7.7",
         "@babel/preset-react": "^7.7.4",
-        "@bunq-community/bunq-js-client": "^0.40.2",
+        "@bunq-community/bunq-js-client": "^1.0.3",
         "@bunq-community/bunqdesktop-templates": "^1.2.0",
         "@fortawesome/fontawesome-free": "^5.2.0",
         "@material-ui/core": "^3.9.2",
@@ -213,7 +213,7 @@
         "mocha": "^5.2.0",
         "natives": "1.1.6",
         "node-forge": "^0.7.5",
-        "node-sass": "^4.13.0",
+        "node-sass": "^4.13.1",
         "prettier": "^1.14.2",
         "prop-types": "^15.6.2",
         "qrcode.react": "^0.8.0",

package.json

@@ -90,7 +90,7 @@ log.transports.file.file = `${userDataPath}${path.sep}bunqDesktop.${env.name}.lo
 // hot reloading
 if (process.env.NODE_ENV === "development") {
     require("electron-reload")(path.join(__dirname, `..${path.sep}app${path.sep}**`), {
-        electron: path.join(__dirname, "../node_modules/electron"),
+        electron: path.join(__dirname, "../node_modules/electron")
     });
 }
 

src/background.js

@@ -2,8 +2,8 @@ import BunqErrorHandler from "../Functions/BunqErrorHandler";
 import { openSnackbar } from "./snackbar";
 import { paymentInfoUpdate } from "./payments";
 import { accountsUpdate } from "./accounts";
-import { shareInviteBankInquiriesInfoUpdate } from "./share_invite_bank_inquiries";
-import { shareInviteBankResponsesInfoUpdate } from "./share_invite_bank_responses";
+import { shareInviteMonetaryAccountInquiriesInfoUpdate } from "./share_invite_monetary_account_inquiries";
+import { shareInviteMonetaryAccountResponsesInfoUpdate } from "./share_invite_monetary_account_responses";
 
 export function paySend(BunqJSClient, userId, accountId, description, amount, targets, draft = false) {
     const failedMessage = window.t("We received the following error while sending your payment");
@@ -34,7 +34,7 @@ export function paySend(BunqJSClient, userId, accountId, description, amount, ta
                 dispatch(openSnackbar(notification));
 
                 // update the payments, accounts and share list
-                dispatch(shareInviteBankResponsesInfoUpdate(BunqJSClient, userId));
+                dispatch(shareInviteMonetaryAccountResponsesInfoUpdate(BunqJSClient, userId));
                 dispatch(accountsUpdate(BunqJSClient, userId));
 
                 dispatch(payNotLoading());
@@ -79,8 +79,8 @@ export function paySchedule(BunqJSClient, userId, accountId, description, amount
 
                 // update the payments, accounts and share list
                 dispatch(paymentInfoUpdate(BunqJSClient, userId, accountId));
-                dispatch(shareInviteBankInquiriesInfoUpdate(BunqJSClient, userId, accountId));
-                dispatch(shareInviteBankResponsesInfoUpdate(BunqJSClient, userId));
+                dispatch(shareInviteMonetaryAccountInquiriesInfoUpdate(BunqJSClient, userId, accountId));
+                dispatch(shareInviteMonetaryAccountResponsesInfoUpdate(BunqJSClient, userId));
                 dispatch(accountsUpdate(BunqJSClient, userId));
 
                 dispatch(payNotLoading());

src/react/Actions/pay.js

@@ -9,8 +9,8 @@ import { loadStoredRequestInquiries } from "./request_inquiries";
 import { loadStoredrequestInquiryBatches } from "./request_inquiry_batches";
 import { loadStoredRequestResponses } from "./request_responses";
 import { loadStoredContacts } from "./contacts";
-import { loadStoredShareInviteBankResponses } from "./share_invite_bank_responses";
-import { loadStoredShareInviteBankInquiries } from "./share_invite_bank_inquiries";
+import { loadStoredShareInviteMonetaryAccountResponses } from "./share_invite_monetary_account_responses";
+import { loadStoredShareInviteBankInquiries } from "./share_invite_monetary_account_inquiries";
 import { loadPendingPayments } from "./pending_payments";
 import { openSnackbar } from "./snackbar";
 
@@ -367,7 +367,7 @@ export function registrationLoadStoredData() {
         dispatch(loadStoredRequestInquiries(BunqJSClient));
         dispatch(loadStoredrequestInquiryBatches(BunqJSClient));
         dispatch(loadStoredRequestResponses(BunqJSClient));
-        dispatch(loadStoredShareInviteBankResponses(BunqJSClient));
+        dispatch(loadStoredShareInviteMonetaryAccountResponses(BunqJSClient));
         dispatch(loadStoredShareInviteBankInquiries(BunqJSClient));
     };
 }

src/react/Actions/registration.js

@@ -24,14 +24,14 @@ export const setSavingsGoal = savings_goal => {
 
 /**
  * @param {any[]} accounts
- * @param {any[]} shareInviteBankResponses
+ * @param {any[]} shareInviteMonetaryAccountResponses
  */
-export const updateStatisticsSavingsGoals = (accounts, shareInviteBankResponses) => {
+export const updateStatisticsSavingsGoals = (accounts, shareInviteMonetaryAccountResponses) => {
     return {
         type: "SAVINGS_GOALS_UPDATE_STATISTICS",
         payload: {
             accounts: accounts,
-            shareInviteBankResponses: shareInviteBankResponses
+            shareInviteMonetaryAccountResponses: shareInviteMonetaryAccountResponses
         }
     };
 };

src/react/Actions/savings_goals.js

@@ -1,14 +1,18 @@
 import BunqErrorHandler from "../Functions/BunqErrorHandler";
 
-export const STORED_SHARE_INVITE_BANK_INQUIRIES = "BUNQDESKTOP_SHARE_INVITE_BANK_INQUIRIES";
+export const STORED_SHARE_INVITE_MONETARY_ACCOUNT_INQUIRIES = "BUNQDESKTOP_SHARE_INVITE_MONETARY_ACCOUNT_INQUIRIES";
 
-export function shareInviteBankInquiriesSetInfo(share_invite_bank_inquiries, account_id, BunqJSClient = false) {
+export function shareInviteBankInquiriesSetInfo(
+    share_invite_monetary_account_inquiries,
+    account_id,
+    BunqJSClient = false
+) {
     return {
         type: "SHARE_INVITE_INQUIRIES_SET_INFO",
         payload: {
             BunqJSClient: BunqJSClient,
             account_id: account_id,
-            share_invite_bank_inquiries: share_invite_bank_inquiries
+            share_invite_monetary_account_inquiries: share_invite_monetary_account_inquiries
         }
     };
 }
@@ -17,7 +21,7 @@ export function loadStoredShareInviteBankInquiries(BunqJSClient) {
     return dispatch => {
         dispatch(shareInviteBankInquiriesLoading());
         const BunqDesktopClient = window.BunqDesktopClient;
-        BunqDesktopClient.storeDecrypt(STORED_SHARE_INVITE_BANK_INQUIRIES)
+        BunqDesktopClient.storeDecrypt(STORED_SHARE_INVITE_MONETARY_ACCOUNT_INQUIRIES)
             .then(data => {
                 if (data && data.items) {
                     dispatch(shareInviteBankInquiriesSetInfo(data.items, data.account_id));
@@ -30,7 +34,7 @@ export function loadStoredShareInviteBankInquiries(BunqJSClient) {
     };
 }
 
-export function shareInviteBankInquiriesInfoUpdate(
+export function shareInviteMonetaryAccountInquiriesInfoUpdate(
     BunqJSClient,
     user_id,
     account_id,
@@ -45,7 +49,7 @@ export function shareInviteBankInquiriesInfoUpdate(
     return dispatch => {
         dispatch(shareInviteBankInquiriesLoading());
 
-        BunqJSClient.api.shareInviteBankInquiry
+        BunqJSClient.api.shareInviteMonetaryAccountInquiry
             .list(user_id, account_id, options)
             .then(shareInviteBankInquiries => {
                 dispatch(shareInviteBankInquiriesSetInfo(shareInviteBankInquiries, account_id, BunqJSClient));