Merge branch 'develop' into feature/theme-support

app/containers/settings.js

@@ -1,14 +1,46 @@
 // @flow
-
+import eres from 'eres';
 import { connect } from 'react-redux';
 
 import { SettingsView } from '../views/settings';
 
-import type { AppState } from '../types/app-state';
+import { loadAddressesSuccess, loadAddressesError } from '../redux/modules/receive';
 
-const mapStateToProps = ({ walletSummary }: AppState) => ({
-  addresses: walletSummary.addresses,
+import rpc from '../../services/api';
+
+import type { AppState } from '../types/app-state';
+import type { Dispatch } from '../types/redux';
+
+export type MapStateToProps = {|
+  addresses: string[],
+|};
+
+const mapStateToProps = ({ receive }: AppState): MapStateToProps => ({
+  addresses: receive.addresses,
+});
+
+export type MapDispatchToProps = {|
+  loadAddresses: () => Promise<void>,
+|};
+
+const mapDispatchToProps = (dispatch: Dispatch): MapDispatchToProps => ({
+  loadAddresses: async () => {
+    const [zAddressesErr, zAddresses] = await eres(rpc.z_listaddresses());
+
+    const [tAddressesErr, transparentAddresses] = await eres(rpc.getaddressesbyaccount(''));
+
+    if (zAddressesErr || tAddressesErr) return dispatch(loadAddressesError({ error: 'Something went wrong!' }));
+
+    dispatch(
+      loadAddressesSuccess({
+        addresses: [...zAddresses, ...transparentAddresses],
+      }),
+    );
+  },
 });
 
 // $FlowFixMe
-export const SettingsContainer = connect(mapStateToProps)(SettingsView);
+export const SettingsContainer = connect(
+  mapStateToProps,
+  mapDispatchToProps,
+)(SettingsView);

app/views/settings.js

@@ -24,6 +24,8 @@ import { DARK, LIGHT, THEME_MODE } from '../constants/themes';
 import electronStore from '../../config/electron-store';
 import { openExternal } from '../utils/open-external';
 
+import type { MapDispatchToProps, MapStateToProps } from '../containers/settings';
+
 const HOME_DIR = electron.remote.app.getPath('home');
 
 const EXPORT_VIEW_KEYS_TITLE = 'Export View Keys';
@@ -131,9 +133,8 @@ type Key = {
   key: string,
 };
 
-type Props = {
-  addresses: string[],
-};
+type Props = MapDispatchToProps & MapStateToProps;
+
 type State = {
   viewKeys: Key[],
   privateKeys: Key[],
@@ -157,6 +158,12 @@ export class SettingsView extends PureComponent<Props, State> {
     error: null,
   };
 
+  componentDidMount() {
+    const { loadAddresses } = this.props;
+
+    loadAddresses();
+  }
+
   exportViewKeys = () => {
     const { addresses } = this.props;
 

package.json

@@ -5,7 +5,7 @@
   "main": "config/main.js",
   "license": "MIT",
   "scripts": {
-    "start": "concurrently \"cross-env BROWSER=none yarn dev\" \"wait-on http://0.0.0.0:8080 && yarn electron:dev\"",
+    "start": "yarn check --integrity && concurrently \"cross-env BROWSER=none yarn dev\" \"wait-on http://0.0.0.0:8080 && yarn electron:dev\"",
     "dev": "webpack-dev-server --config config/webpack-dev.config.js --mode development --open --hot",
     "build": "rm -rf build && webpack --config config/webpack-prod.config.js --mode production --env.NODE_ENV=production",
     "lint:precommit": "eslint ./app/",