Loading List

EthereansOS · Jul 12, 2021 · faff795 · faff795
1 parent 7b6749c
commit faff795
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/assets/scripts/script.js b/assets/scripts/script.js
@@ -1642,7 +1642,7 @@ window.loadUniswapPairs = async function loadUniswapPairs(view, address, secondT
     } else {
         uniswapPairs = uniswapPairs.filter(it => myToken.indexOf(window.web3.eth.abi.encodeParameter('address', it.token0.address)) !== -1 || myToken.indexOf(window.web3.eth.abi.encodeParameter('address', it.token1.address)) !== -1);
     }!subArrays && secondToken && myToken.push(window.web3.eth.abi.encodeParameter('address', secondToken));
-    view && view.enqueue(() => view.setState({ uniswapPairs }));
+    view && view.enqueue(() => view.setState({ loadingUniswapPairs: uniswapPairs.length == 0, uniswapPairs }));
     while (myToken) {
         for (var tranche of blockSearchTranches) {
             var logArgs = {
@@ -1695,15 +1695,15 @@ window.loadUniswapPairs = async function loadUniswapPairs(view, address, secondT
                     pairToken.isUniswapPair = true;
                     uniswapPairs.push(window.loadedUniswapPairs[pairTokenAddress] = pairToken);
                     pairToken.symbol = pairToken.token0.symbol + '/' + pairToken.token1.symbol;
-                    view && view.enqueue(() => view.setState({ uniswapPairs }));
+                    view && view.enqueue(() => view.setState({ loadingUniswapPairs: uniswapPairs.length == 0, uniswapPairs }));
                 } catch (e) {
                     console.error(e);
                 }
             }
         }
         myToken = subArrays && subArrays.length > 0 ? subArrays.splice(0, 1)[0] : undefined;
     }
-    uniswapPairs.length === 0 && view && view.enqueue(() => view.setState({ uniswapPairs }));
+    view && view.enqueue(() => view.setState({ loadingUniswapPairs: false, uniswapPairs }));
     return uniswapPairs;
 };
 

diff --git a/spa/tokenPicker/view.jsx b/spa/tokenPicker/view.jsx
@@ -54,16 +54,21 @@ var TokenPicker = React.createClass({
         var _this = this;
         this.props.element && window.loadWallets(_this.props.element, uniswapPairs => _this.setState({uniswapPairs}), true);
     },
+    cloneToken(source) {
+        var copy = {};
+        Object.entries(source).forEach(it => it[0] !== 'token' && (copy[it[0]] = it[1]));
+        return JSON.stringify(copy);
+    },
     renderSelection() {
         var list = this.getList();
         return (<section className="PikaPikaYaYa" tabindex="-1" onBlur={this.toggle}>
             <section className="PikaPikaSearch">
                 <input onFocus={this.toggle} ref={ref => (this.input = ref) && (ref.value = (this.state && this.state.search) || '')} type="text" placeholder="Search Name/Address" onKeyUp={this.onType} onChange={this.onType}/>
             </section>
             <section className="PikaPikaFind">
-                {!list && <h4>Loading tokens...</h4>}
-                {list && list.length === 0 && <h4>No results found</h4>}
-                {list && list.map(it => <a className="PikaPikaFindaaaaaaaaa" key={it.address} onClick={this.toggle} href="javascript:;" data-item={JSON.stringify(it)}>
+                {!list || (list.length == 0 && this.state?.loadingUniswapPairs) && <h4>Loading tokens...</h4>}
+                {list && list.length === 0 && !this.state?.loadingUniswapPairs && <h4>No results found</h4>}
+                {list && list.map(it => <a className="PikaPikaFindaaaaaaaaa" key={it.address} onClick={this.toggle} href="javascript:;" data-item={this.cloneToken(it)}>
                     <img src={it.logo}/>
                     <p>{it.name} ({it.symbol})</p>
                 </a>)}