fix: merge with master

EYBlockchain · Nov 22, 2021 · eae9a68 · eae9a68
2 parents 6e882eb + b432486
commit eae9a68
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 31 deletions.
diff --git a/common-files/classes/transaction.mjs b/common-files/classes/transaction.mjs
@@ -18,7 +18,7 @@ function keccak(preimage) {
   // compute the solidity hash, using suitable type conversions
   return web3.utils.soliditySha3(
     { t: 'uint64', v: preimage.value },
-    ...preimage.historicRootBlockNumberL2.map(hi => ({ t: 'uint64', v: hi })),
+    ...preimage.historicRootBlockNumberL2.map(hi => ({ t: 'uint256', v: hi })),
     { t: 'uint8', v: preimage.transactionType },
     { t: 'uint8', v: preimage.tokenType },
     { t: 'bytes32', v: preimage.publicInputHash },

diff --git a/wallet/src/constants.js b/wallet/src/constants.js
@@ -23,6 +23,7 @@ const METAMASK_MESSAGE =
 
 const TRANSACTION_MAX_RETRIES = 10;
 const TRANSACTION_RETRY_PERIOD = 10000; // 10s
+const BALANCE_INTERVAL = 30000;
 
 export {
   DEFAULT_NF_ADDRESS_INDEX,
@@ -37,4 +38,5 @@ export {
   METAMASK_MESSAGE,
   TRANSACTION_MAX_RETRIES,
   TRANSACTION_RETRY_PERIOD,
+  BALANCE_INTERVAL,
 };
diff --git a/wallet/src/views/login/login.view.jsx b/wallet/src/views/login/login.view.jsx
@@ -110,7 +110,7 @@ function Login({ login, settings, onLoadWallet, onDeleteWallet }) {
       }
     } catch (err) {
       // TODO
-      console.log('ERROR');
+      console.log('ERROR', err);
     }
   };
 

diff --git a/wallet/src/views/transactions/components/wallet-info/wallet-info.view.jsx b/wallet/src/views/transactions/components/wallet-info/wallet-info.view.jsx
@@ -11,6 +11,7 @@ import {
 } from '../../../../store/token/token.actions';
 import { TokenAddModal } from './token-add.view.jsx';
 import * as Storage from '../../../../utils/lib/local-storage';
+import * as Constant from '../../../../constants';
 
 function WalletInfo({ login, token, onAddToken, onSelectToken, onUnselectToken, onDeleteToken }) {
   const [modalTokenAddEnable, setModalTokenAddEnable] = React.useState(false);
@@ -117,6 +118,10 @@ function WalletInfo({ login, token, onAddToken, onSelectToken, onUnselectToken,
 
   React.useEffect(() => {
     reload();
+    const retrieveBalance = setInterval(() => {
+      reload();
+    }, Constant.BALANCE_INTERVAL);
+    return () => clearInterval(retrieveBalance);
   }, []);
 
   const handleOnTokenAddSubmit = (tokenName, tokenType, tokenAddress) => {
@@ -142,40 +147,40 @@ function WalletInfo({ login, token, onAddToken, onSelectToken, onUnselectToken,
 
   return (
     <Container>
-      <Table padded>
+      <Table padded fixed selectable>
         <Table.Header>
           <Table.Row>
-            <Table.HeaderCell colSpan="4" textAlign="left">
+            <Table.HeaderCell colSpan="4">
               <Table.Cell>Account Address:</Table.Cell>
               <Table.Cell id="wallet-info-cell-ethaddress"> {importedWallet()} </Table.Cell>
             </Table.HeaderCell>
-            <Table.HeaderCell textAlign="right">
-              <Button
-                onClick={reload}
-                id="wallet-info-cell-reload"
-                disabled={token.activeTokenRowId === ''}
-              >
-                <Icon name="sync" />
-                Reload
-              </Button>
-            </Table.HeaderCell>
-            <Table.HeaderCell textAlign="right">
-              <Button onClick={toggleModalTokenAdd} id="wallet-info-cell-add-token">
-                <Icon name="plus" />
-                Add Token
-              </Button>
-            </Table.HeaderCell>
-            <Table.HeaderCell textAlign="right">
-              <Button
-                toggle
-                onClick={removeToken}
-                id="wallet-info-cell-remove-token"
-                active={removeTokenEnable && token.tokenPool.length}
-                disabled={token.tokenPool.length === 0}
-              >
-                {' '}
-                <Icon name="minus" /> Remove Token{' '}
-              </Button>
+            <Table.HeaderCell colSpan="3">
+              <Table.Cell />
+              <Table.Cell />
+              <Table.Cell>
+                <Button
+                  icon
+                  labelPosition="left"
+                  onClick={toggleModalTokenAdd}
+                  id="wallet-info-cell-add-token"
+                >
+                  <Icon name="plus" />
+                  Add Token
+                </Button>
+              </Table.Cell>
+              <Table.Cell>
+                <Button
+                  icon
+                  labelPosition="left"
+                  id="wallet-info-cell-remove-token"
+                  toggle
+                  onClick={removeToken}
+                  active={removeTokenEnable && token.tokenPool.length}
+                  disabled={token.tokenPool.length === 0}
+                >
+                  <Icon name="minus" /> Remove Token
+                </Button>
+              </Table.Cell>
             </Table.HeaderCell>
           </Table.Row>
         </Table.Header>