fix: TransactionList loading

rabetofficial · Aug 19, 2021 · 0657e5c · 0657e5c
1 parent 894f6fe
commit 0657e5c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/popup-src/src/pageComponents/TransactionList/index.jsx b/popup-src/src/pageComponents/TransactionList/index.jsx
@@ -60,12 +60,15 @@ const TransactionList = ({ maxHeight }) => {
 
   useEffect(() => {
     (async () => {
-      const transactions = await getTransactions(activeAccount.publicKey);
-      const operations = await getOperations(transactions);
+      if (isLoading) {
+        console.log('bam');
+        const transactions = await getTransactions(activeAccount.publicKey);
+        const operations = await getOperations(transactions);
 
-      setOperationList(operations);
-      setTransactionList(transactions);
-      setIsLoading(false);
+        setOperationList(operations);
+        setTransactionList(transactions);
+        setIsLoading(false);
+      }
     })();
   });
 
@@ -78,14 +81,13 @@ const TransactionList = ({ maxHeight }) => {
       {operationList && operationList.length > 0 ? (
         <ul className={classNames(styles.list, 'hidden-scroll')} style={{ maxHeight: `${maxHeight}px` }}>
           {operationList.map((item, index) => (
-            <Fragment key={shortid.generate()}>
-              <Item
-                item={item}
-                index={index}
-                operationList={operationList}
-                transactionList={transactionList}
-              />
-            </Fragment>
+            <Item
+              key={item.id}
+              item={item}
+              index={index}
+              operationList={operationList}
+              transactionList={transactionList}
+            />
           ))}
         </ul>
       )

diff --git a/popup-src/src/pages/Setting/index.jsx b/popup-src/src/pages/Setting/index.jsx
@@ -276,6 +276,7 @@ class Setting extends Component {
 
         <p className={styles.version}>
           Version
+          {' '}
           {config.VERSION}
         </p>
       </div>