update

Author: georgeburduhos

src/components/widgets/components/price-update/price-update.tsx

@@ -60,7 +60,7 @@ class PriceUpdateModuleComponent extends React.Component<IReduxProps & IExternal
                     JSON.stringify(this.props[key]) !== JSON.stringify(prevProps[key])
                 ) {
                     this.fetchDataTimeout && clearTimeout(this.fetchDataTimeout);
-                    this.fetchDataTimeout = setTimeout(() => this.fetchData(), 200);
+                    this.fetchDataTimeout = setTimeout(() => this.fetchData(), 300);
                 }
             }
         }

src/core/wallet/hw-wallet/ledger/apps/zil.ts

@@ -2,6 +2,7 @@ import ZilApp from './zil-interface';
 import * as zcrypto from '@zilliqa-js/crypto';
 import { IBlockchainTransaction } from '../../../../blockchain/types';
 import BigNumber from 'bignumber.js';
+import { isBech32 } from '@zilliqa-js/util/dist/validation';
 // import Long from 'long';
 // import * as ZilliqaJsAccountUtil from '@zilliqa-js/account/dist/util';
 
@@ -31,14 +32,18 @@ export class Zil {
         path: string,
         tx: IBlockchainTransaction
     ): Promise<any> => {
+        const toAddr = isBech32(tx.toAddress)
+            ? zcrypto
+                  .fromBech32Address(tx.toAddress)
+                  .replace('0x', '')
+                  .toLowerCase()
+            : tx.toAddress.toLowerCase();
+
         const transaction: any = {
             // tslint:disable-next-line: no-bitwise
             version: (Number(tx.chainId) << 16) + 1,
             nonce: tx.nonce,
-            toAddr: zcrypto
-                .fromBech32Address(tx.toAddress)
-                .replace('0x', '')
-                .toLowerCase(),
+            toAddr,
             amount: tx.amount ? new BigNumber(tx.amount).toFixed() : '0',
             pubKey: tx.publicKey,
             gasPrice: new BigNumber(tx.feeOptions.gasPrice).toString(),
@@ -48,13 +53,15 @@ export class Zil {
             data: tx.data ? tx.data.raw : '',
             priority: true
         };
+
         const signed = await this.app.signTxn(index, transaction);
 
         transaction.signature = signed.sig;
         transaction.amount = transaction.amount.toString();
         transaction.gasLimit = transaction.gasLimit.toString();
         transaction.gasPrice = transaction.gasPrice.toString();
         transaction.toAddr = zcrypto.toChecksumAddress(transaction.toAddr).replace('0x', '');
+
         return transaction;
     };
 

src/redux/wallets/selectors.ts

@@ -124,6 +124,7 @@ export const getSelectedAccountTransactions = (state: IReduxState): IBlockchainT
                     tx2.date?.created - tx1.date?.created
             );
     }
+    return [];
 };
 
 export const getAccounts = (state: IReduxState, blockchain: Blockchain): IAccountState[] => {

src/screens/token/components/default-token/default-token.tsx

@@ -132,6 +132,9 @@ export class DefaultTokenScreenComponent extends React.Component<
                                                 step: 'SwapEnterAmount',
                                                 key: 'swap-enter-amount'
                                             },
+                                            navigationOptions: {
+                                                title: translate('App.labels.swap')
+                                            },
                                             newFlow: true
                                         })
                                     }

src/screens/token/components/delegate-token/components/tabs/account-tab/account-tab.tsx

@@ -149,6 +149,9 @@ export class AccountTabComponent extends React.Component<
                                                 step: 'SwapEnterAmount',
                                                 key: 'swap-enter-amount'
                                             },
+                                            navigationOptions: {
+                                                title: translate('App.labels.swap')
+                                            },
                                             newFlow: true
                                         })
                                     }