Merge pull request #3489 from LiskHQ/3488-fix-voters

config/webpack.config.analyze.js

@@ -4,7 +4,7 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
 const baseConfig = require('./webpack.config');
 const reactConfig = require('./webpack.config.react');
 
-module.exports = merge(baseConfig, reactConfig, {
+const config = {
   output: {
     path: resolve(__dirname, '../dist'),
     filename: 'bundle.[name].js',
@@ -13,4 +13,6 @@ module.exports = merge(baseConfig, reactConfig, {
   plugins: [
     new BundleAnalyzerPlugin(),
   ],
-});
+};
+
+module.exports = merge(baseConfig, reactConfig, config);

config/webpack.config.dev.js

@@ -7,7 +7,7 @@ const baseConfig = require('./webpack.config');
 const reactConfig = require('./webpack.config.react');
 const version = require('../package.json').version;
 
-module.exports = merge(baseConfig, reactConfig, {
+const config = {
   mode: 'development',
   output: {
     path: resolve(__dirname, '../app', '../dist'),
@@ -31,4 +31,6 @@ module.exports = merge(baseConfig, reactConfig, {
       VERSION: JSON.stringify(version),
     }),
   ],
-});
+};
+
+module.exports = merge(baseConfig, reactConfig, config);

config/webpack.config.electron.js

@@ -2,7 +2,7 @@ const { resolve } = require('path');
 const merge = require('webpack-merge');
 const baseConfig = require('./webpack.config');
 
-module.exports = merge(baseConfig, {
+const config = {
   mode: 'production',
   entry: {
     main: ['babel-polyfill', `${resolve(__dirname, '../app/src')}/main.js`],
@@ -25,4 +25,6 @@ module.exports = merge(baseConfig, {
       },
     ],
   },
-});
+};
+
+module.exports = merge(baseConfig, config);

config/webpack.config.js

@@ -2,7 +2,7 @@ const webpack = require('webpack');
 const { resolve } = require('path');
 const { ProvidePlugin } = require('webpack');
 
-module.exports = {
+const config = {
   mode: 'development',
   resolve: {
     alias: {
@@ -97,3 +97,5 @@ module.exports = {
     }),
   ],
 };
+
+module.exports = config;

config/webpack.config.prod.js

@@ -6,7 +6,7 @@ const baseConfig = require('./webpack.config');
 const reactConfig = require('./webpack.config.react');
 const version = require('../package.json').version;
 
-module.exports = merge(baseConfig, reactConfig, {
+const config = {
   output: {
     path: resolve(__dirname, '../app', '../app/build'),
     filename: 'bundle.[name].[contenthash].js',
@@ -32,4 +32,6 @@ module.exports = merge(baseConfig, reactConfig, {
       VERSION: JSON.stringify(version),
     }),
   ],
-});
+};
+
+module.exports = merge(baseConfig, reactConfig, config);

config/webpack.config.react.js

@@ -85,7 +85,7 @@ const postCssLoader = {
   },
 };
 
-module.exports = {
+const config = {
   mode: 'development',
   entry: {
     app: `${resolve(__dirname, '../src')}/main.js`,
@@ -151,3 +151,5 @@ module.exports = {
     ],
   },
 };
+
+module.exports = config;

config/webpack.config.storybook.js

@@ -1,6 +1,6 @@
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
-module.exports = {
+const config = {
   plugins: [
     new MiniCssExtractPlugin({
       filename: 'styles.css',
@@ -82,3 +82,5 @@ module.exports = {
     ],
   },
 };
+
+module.exports = config;

src/components/screens/wallet/delegateProfile/voterRow.js

@@ -3,15 +3,18 @@ import React from 'react';
 import AccountVisual from '@toolbox/accountVisual';
 import styles from './delegateProfile.css';
 
-const VoterRow = props => (
-  <div className={styles.voteItem} key={props.data}>
-    <AccountVisual
-      className={styles.accountVisual}
-      address={props.data}
-      size={40}
-    />
-    <span className={styles.address}>{props.data}</span>
-  </div>
-);
+const VoterRow = ({ data = {} }) => {
+  const { address, username } = data;
+  return (
+    <div className={styles.voteItem}>
+      <AccountVisual
+        className={styles.accountVisual}
+        address={address}
+        size={40}
+      />
+      <span className={styles.address}>{username || address}</span>
+    </div>
+  );
+};
 
 export default VoterRow;

src/components/screens/wallet/explorer.js

@@ -17,17 +17,17 @@ import Transactions from './transactions';
 const Wallet = ({
   t, account, history,
 }) => {
-  if (!account || !account.data || isEmpty(account.data)) return (<div />);
-
   const activeToken = useSelector(selectActiveToken);
   const { discreetMode } = useSelector(selectSettings);
-  const isDelegate = account.data.summary?.isDelegate;
   const address = selectSearchParamValue(history.location.search, 'address');
 
   useEffect(() => {
     account.loadData();
-  }, [history.location.search]);
+  }, [address]);
 
+  if (!account || !account.data || isEmpty(account.data)) return (<div />);
+
+  const isDelegate = account.data.summary?.isDelegate;
 
   return (
     <section>

src/utils/account.js

@@ -1,5 +1,5 @@
 import { passphrase as LiskPassphrase, cryptography } from '@liskhq/lisk-client';
-import { tokenMap, regex, balanceNeededForInitialization } from '@constants';
+import { tokenMap, regex, account as accountConst } from '@constants';
 
 /**
  * Extracts Lisk PublicKey from a given valid Mnemonic passphrase
@@ -180,4 +180,4 @@ export const isAccountInitialized = account => account
   && !!account.info.LSK.serverPublicKey;
 
 export const hasEnoughBalanceForInitialization = (balance = 0) =>
-  Number(balance) >= balanceNeededForInitialization;
+  Number(balance) >= accountConst.balanceNeededForInitialization;