Merge pull request #243 from spartan-protocol/issue-#242

issue #242
spartan-protocol · Nov 14, 2020 · 102646e · 102646e
2 parents 196e274 + 50b8218
commit 102646e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/assets/scss/custom/components/_forms.scss b/src/assets/scss/custom/components/_forms.scss
@@ -53,6 +53,10 @@
     border-radius: 10px;
   }
 
+  .slider:focus {
+    outline:none;
+  }
+
   .slider::-webkit-slider-thumb {
     -webkit-appearance: none;
     appearance: none;

diff --git a/src/pages/Swap.js b/src/pages/Swap.js
@@ -31,6 +31,8 @@ import {manageBodyClass} from "../components/common";
 
 const NewSwap = (props) => {
 
+    const context = useContext(Context);
+
     const [activeTab, setActiveTab] = useState('1');
     const [notifyMessage, setNotifyMessage] = useState("");
     const [notifyType, setNotifyType] = useState("dark");
@@ -40,7 +42,6 @@ const NewSwap = (props) => {
         else {setActiveTab('1')}
     }
 
-    const context = useContext(Context)
     const [poolURL, setPoolURL] = useState('')
     const [pool, setPool] = useState({
         'symbol': 'XXX',
@@ -101,29 +102,36 @@ const NewSwap = (props) => {
     const [startTx, setStartTx] = useState(false)
     const [endTx, setEndTx] = useState(false)
 
+    const pause = (ms) => new Promise(resolve => setTimeout(resolve, ms))
+
     useEffect(() => {
         checkPoolReady()
     // eslint-disable-next-line
-    }, []);
+    }, [context.poolsData])
 
     useEffect(() => {
         if (context.poolsDataComplete === true) {
             getData()
         }
     // eslint-disable-next-line
-    }, [context.walletData]);
+    }, [context.walletData])
 
     const checkPoolReady = async () => {
         let params = queryString.parse(props.location.search)
-        if (context.poolsData && context.poolsDataLoading !== true) {
+        if (context.poolsData) {
             var existsInPoolsData = await context.poolsData.some(e => (e.address === params.pool))
             if (existsInPoolsData === true) {
-                await getData()
+                getData()
             }
             else {
-                await checkPoolReady()
+                await pause(3000)
+                checkPoolReady()
             }
         }
+        else {
+            await pause(3000)
+            checkPoolReady()
+        }
     }
 
     const getData = async () => {