Merge pull request #250 from forbole/dev

fix ledger add account to wallet issue

Author: calvinkei

components/AddAccountButton/index.tsx

@@ -2,6 +2,7 @@
 import { Dialog, IconButton, useTheme } from '@material-ui/core'
 import useTranslation from 'next-translate/useTranslation'
 import React from 'react'
+import get from 'lodash/get'
 import useStyles from './styles'
 import { useWalletsContext } from '../../contexts/WalletsContext'
 import useIconProps from '../../misc/useIconProps'
@@ -71,6 +72,7 @@ const AddAccountButton: React.FC<AddAccountButtonProps> = ({ walletId }) => {
 
   React.useEffect(() => {
     if (dialogOpen) {
+      setCrypto('')
       setSecurityPassword('')
       setStage(wallet.type === 'ledger' ? Stage.ConnectLedger : Stage.SecurityPassword, true)
     }
@@ -93,10 +95,14 @@ const AddAccountButton: React.FC<AddAccountButtonProps> = ({ walletId }) => {
         {stage === Stage.ConnectLedger ? (
           <ConnectLedgerDialogContent
             onConnect={(transport) => {
-              ledgerTransport = transport
-              setStage(Stage.SelectNetwork)
+              if (!crypto) {
+                setStage(Stage.SelectNetwork)
+              } else {
+                ledgerTransport = transport
+                setStage(Stage.SelectAddresses)
+              }
             }}
-            ledgerAppName={cryptocurrencies[crypto].ledgerAppName}
+            ledgerAppName={get(cryptocurrencies[crypto], 'ledgerAppName')}
           />
         ) : null}
         {stage === Stage.SecurityPassword ? (
@@ -113,7 +119,7 @@ const AddAccountButton: React.FC<AddAccountButtonProps> = ({ walletId }) => {
           <SelectNetworkContent
             onSelect={(c) => {
               setCrypto(c)
-              setStage(Stage.SelectAddresses)
+              setStage(wallet.type === 'ledger' ? Stage.ConnectLedger : Stage.SelectAddresses)
             }}
           />
         ) : null}

components/AssetDistributionChart/ValidatorPopover.tsx

@@ -61,7 +61,7 @@ const ValidatorPopover: React.FC<ValidatorPopoverProps> = ({
       </Box>
       <Box p={2} pt={0}>
         <Typography variant="body2" color="textSecondary">
-          {t('total delegated amount')}
+          {t('total delegation amount')}
         </Typography>
         <Typography>{formatCurrency(getTokenAmountBalance(balance), currency, lang)}</Typography>
       </Box>

components/DelegationDialog/SelectAmount.tsx

@@ -39,7 +39,7 @@ const SelectAmount: React.FC<SelectAmountProps> = ({ account, onConfirm, availab
               {formatTokenAmount(availableAmount, account.crypto, lang, ', ')}
             </b>
           </Typography>
-          <Typography>{t('total delegated amount')}</Typography>
+          <Typography>{t('total delegation amount')}</Typography>
           <TokenAmountInput
             value={amount}
             denom={denom || ''}

components/DelegationDialog/SelectValidators.tsx

@@ -108,7 +108,7 @@ const SelectValidators: React.FC<SelectValidatorsProps> = ({
       <DialogContent className={classes.dialogContent}>
         <Box ml={4} minHeight={360} maxHeight={600}>
           <Typography className={classes.marginBottom}>
-            {t('total delegated amount')}{' '}
+            {t('total delegation amount')}{' '}
             <b className={classes.marginLeft}>{formatCrypto(amount, denom, lang)}</b>
           </Typography>
           <Grid container spacing={4}>

components/RedelegateDialog/SelectAmount.tsx

@@ -54,7 +54,7 @@ const SelectAmount: React.FC<SelectAmountProps> = ({
       <DialogContent className={classes.dialogContent}>
         <Box ml={4} minHeight={360} maxHeight={600}>
           <Typography className={classes.marginBottom}>
-            {t('total delegated amount')}{' '}
+            {t('total delegation amount')}{' '}
             <b className={classes.marginLeft}>
               {formatTokenAmount(availableAmount, account.crypto, lang, ', ')}
             </b>

components/RedelegateDialog/SelectValidators.tsx

@@ -60,7 +60,7 @@ const SelectValidators: React.FC<SelectValidatorsProps> = ({
       <DialogContent className={classes.dialogContent}>
         <Box ml={4} minHeight={360} maxHeight={600}>
           <Typography className={classes.marginBottom}>
-            {t('total delegated amount')}{' '}
+            {t('total delegation amount')}{' '}
             <b className={classes.marginLeft}>{formatCrypto(amount, denom, lang)}</b>
           </Typography>
           <Grid container spacing={4}>

components/UndelegateDialog/SelectValidators.tsx

@@ -54,7 +54,7 @@ const SelectValidators: React.FC<SelectValidatorsProps> = ({
       <DialogContent className={classes.dialogContent}>
         <Box ml={4} minHeight={360} maxHeight={600}>
           <Typography className={classes.marginBottom}>
-            {t('total delegated amount')}{' '}
+            {t('total delegation amount')}{' '}
             <b className={classes.marginLeft}>
               {formatTokenAmount(availableAmount, denom, lang, ', ')}
             </b>

locales/en/common.json

@@ -158,7 +158,7 @@
   "fundActivity": "funded",
   "toCommunityPool": "to community pool",
   "available amount": "Available amount",
-  "total delegated amount": "Total Delegated Amount",
+  "total delegation amount": "Total Delegation Amount",
   "delegate to": "Delegate to",
   "select validator": "Select validator",
   "amount": "Amount",

locales/zh/common.json

@@ -156,7 +156,7 @@
   "fundActivity": "[zh] funded",
   "toCommunityPool": "[zh] to community pool",
   "available amount": "[zh] Available amount",
-  "total delegated amount": "[zh] Total Delegated Amount",
+  "total delegation amount": "[zh] total delegation amount",
   "delegate to": "[zh] Delegate to",
   "select validator": "[zh] Select validator",
   "amount": "[zh] Amount",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "forbole-x",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "private": true,
   "scripts": {
     "dev": "next dev",