fix: tests + TypeScript types

Author: firstred

dist/.gitkeep

@@ -101,7 +101,7 @@
     "jest": {
         "globals": {
             "ts-jest": {
-                "useBabelrc": true
+                "babelConfig": true
             }
         },
         "modulePathIgnorePatterns": [
@@ -120,18 +120,19 @@
             "^.+\\.tsx?$": "ts-jest"
         },
         "moduleFileExtensions": [
-            "ts",
-            "tsx",
             "js",
-            "jsx",
             "json",
-            "node"
-        ]
+            "jsx",
+            "node",
+            "ts",
+            "tsx"
+        ],
+        "preset": "ts-jest/presets/js-with-babel",
+        "testMatch": null
     },
     "dependencies": {
         "@manaflair/redux-batch": "^1.0.0",
         "@reduxjs/toolkit": "^1.2.3",
-        "@types/lodash": "^4.14.149",
         "electron-localshortcut": "^3.2.1",
         "electron-log": "^2.2.9",
         "electron-settings": "^3.1.3",
@@ -176,9 +177,12 @@
         "@material-ui/lab": "^3.0.0-alpha.30",
         "@rollup/plugin-typescript": "^2.1.0",
         "@types/jest": "^24.0.25",
+        "@types/lodash": "^4.14.149",
         "@types/moxios": "^0.4.9",
         "@types/node": "^13.1.4",
         "@types/react-i18next": "^8.1.0",
+        "@types/react-router": "^5.1.4",
+        "@types/react-router-dom": "^5.1.3",
         "animate.css": "^3.7.2",
         "awaiting": "^3.0.0",
         "axios": "0.18.1",
@@ -236,8 +240,8 @@
         "react-map-gl": "^3.3.5",
         "react-number-format": "^4.0.7",
         "react-redux": "^5.0.7",
-        "react-router": "^4.3.1",
-        "react-router-dom": "^4.3.1",
+        "react-router": "^5.1.2",
+        "react-router-dom": "^5.1.2",
         "react-spring": "^3.1.0",
         "react-sticky-box": "^0.6.1",
         "react-test-renderer": "^16.3.1",
@@ -257,7 +261,7 @@
         "ts-jest": "^24.3.0",
         "ts-loader": "^6.2.1",
         "typeface-roboto": "^0.0.54",
-        "typescript": "^3.0.1",
+        "typescript": "^3.7.5",
         "uglifyjs-webpack-plugin": "^1.3.0",
         "universal-analytics": "^0.4.15",
         "vcf": "^2.0.1",

package.json

@@ -1,5 +1,11 @@
 import "~helpers/context_menu";
 import "~helpers/external_links";
 import BunqDesktopClient from "~components/BunqDesktopClient";
+import { CryptoWorkerQueue } from "~functions/Crypto/CryptoWorkerWrapper";
 
-export type AppWindow = Window & { BunqDesktopClient?: BunqDesktopClient; t: Function; BUNQDESKTOP_LANGUAGE_SETTING: string };
+export type AppWindow = Window & {
+    BunqDesktopClient?: BunqDesktopClient;
+    t: Function;
+    BUNQDESKTOP_LANGUAGE_SETTING: string;
+    cryptoWorkerQueue: CryptoWorkerQueue;
+};

src/app.ts

@@ -44,9 +44,11 @@ const styles = {
 };
 
 interface IState {
+    [key: string]: any;
 }
 
 interface IProps {
+    [key: string]: any;
 }
 
 class AccountCard extends React.Component<ReturnType<typeof mapStateToProps> & ReturnType<typeof mapDispatchToProps> & IProps> {

src/components/AccountCard.tsx

@@ -14,6 +14,7 @@ const styles = {
 };
 
 interface IState {
+    [key: string]: any;
 }
 
 interface IProps {
@@ -77,6 +78,7 @@ const AccountAvatarCircularProgress = ({ account, theme, selected = false, style
 
 const mapStateToProps = (state: ReduxState) => {
     return {
+        // @ts-ignore
         theme: state.options.theme,
     };
 };

src/components/AccountList/AccountAvatarCircularProgress.tsx

@@ -49,11 +49,13 @@ interface IState {
     totalBalance: number;
     fetchedAccounts: any;
     accountTotalSelectionMode: any;
+    [key: string]: any;
 }
 
 interface IProps {
     t: AppWindow["t"];
     BunqJSClient: BunqJSClient;
+    [key: string]: any;
 }
 
 class AccountList extends React.Component<ReturnType<typeof mapStateToProps> & ReturnType<typeof mapDispatchToProps> & IProps> {
@@ -313,10 +315,13 @@ const mapStateToProps = (state: ReduxState) => {
     return {
         user: state.user.user,
         userType: state.user.user_type,
+
+        // @ts-ignore
         limitedPermissions: state.user.limited_permissions,
 
         applicationLastAutoUpdate: state.application.last_auto_update,
 
+        // @ts-ignore
         hideBalance: state.options.hide_balance,
 
         registrationIsLoading: state.registration.loading,

src/components/AccountList/AccountList.tsx

@@ -1,9 +1,8 @@
-import BunqJSClient from "@bunq-community/bunq-js-client";
 import React, { CSSProperties } from "react";
 import { translate } from "react-i18next";
 import { connect } from "react-redux";
 import Avatar from "@material-ui/core/Avatar";
-import IconButton from "@material-ui/core/IconButton";
+import OriginalIconButton from "@material-ui/core/IconButton";
 import ListItem from "@material-ui/core/ListItem";
 import ListItemSecondaryAction from "@material-ui/core/ListItemSecondaryAction";
 import ListItemText from "@material-ui/core/ListItemText";
@@ -24,6 +23,8 @@ import AccountAvatarCircularProgress from "./AccountAvatarCircularProgress";
 
 import { actions as accountsActions } from "~store/accounts";
 
+const IconButton: any = OriginalIconButton;
+
 const styles = {
     bigAvatar: {
         width: 60,
@@ -44,10 +45,11 @@ const styles = {
 };
 
 interface IState {
+    [key: string]: any;
 }
 
 interface IProps {
-    BunqJSClient: BunqJSClient;
+    [key: string]: any;
 }
 
 class AccountListItem extends React.Component<ReturnType<typeof mapStateToProps> & ReturnType<typeof mapDispatchToProps> & IProps> {
@@ -181,16 +183,18 @@ class AccountListItem extends React.Component<ReturnType<typeof mapStateToProps>
 const mapStateToProps = (state: ReduxState) => {
     return {
         user: state.user.user,
+        // @ts-ignore
         theme: state.options.theme,
         paymentsLoading: state.payments.loading,
+        // @ts-ignore
         hideBalance: state.options.hide_balance,
 
         selectedAccountIds: state.accountIdFilter.selectedAccountIds,
         toggleAccountIds: state.accountIdFilter.toggle,
     };
 };
 
-const mapDispatchToProps = (dispatch: AppDispatch, ownProps: IProps) => {
+const mapDispatchToProps = (dispatch: AppDispatch) => {
     return {
         selectAccount: accountId => dispatch(accountsActions.selectAccount(accountId)),
 

src/components/AccountList/AccountListItem.tsx

@@ -14,7 +14,7 @@ export default props => {
         onDelete
     } = props;
 
-    const chipProps = {
+    const chipProps: any = {
         style: style,
         label: account.description
     };

src/components/AccountList/AccountListItemChip.tsx

@@ -1,21 +1,33 @@
 import React from "react";
 import { connect } from "react-redux";
-import ListItem from "@material-ui/core/ListItem";
+import OriginalListItem from "@material-ui/core/ListItem";
 import ListItemText from "@material-ui/core/ListItemText";
 import Avatar from "@material-ui/core/Avatar";
 import AddBoxIcon from "@material-ui/icons/AddBox";
 
 import NavLink from "~components/Routing/NavLink";
 import { translate } from "react-i18next";
 
+const ListItem: any = OriginalListItem;
+
 const styles = {
     bigAvatar: {
         width: 60,
         height: 60
     }
 };
 
-class AddAccount extends React.Component {
+interface IState {
+    [key: string]: any;
+}
+
+interface IProps {
+    [key: string]: any;
+}
+
+class AddAccount extends React.Component<IProps> {
+    state: IState;
+
     constructor(props, context) {
         super(props, context);
         this.state = {};

src/components/AccountList/AddAccount.tsx

@@ -1,4 +1,3 @@
-import BunqJSClient from "@bunq-community/bunq-js-client";
 import React from "react";
 import { Provider } from "react-redux";
 import { HashRouter } from "react-router-dom";
@@ -14,8 +13,7 @@ import store from "~store/index";
 import "./i18n";
 
 export interface IProps {
-    analytics: boolean;
-    BunqJSClient: BunqJSClient;
+    [key: string]: any;
 }
 
 export default class App extends React.Component<IProps> {
@@ -30,10 +28,7 @@ export default class App extends React.Component<IProps> {
                 <MuiPickersUtilsProvider utils={DateFnsUtils}>
                     <Provider store={store}>
                         <HashRouter>
-                            <Layout
-                                routesComponent={Routes}
-                                analytics={this.props.analytics}
-                            />
+                            <Layout routesComponent={Routes} />
                         </HashRouter>
                     </Provider>
                 </MuiPickersUtilsProvider>