From 99334f4d743a757bff23886293a67716b2c9e448 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Mon, 26 Oct 2020 18:13:12 +0100
Subject: [PATCH] refactor pool data flow

---
 .../organisms/AssetActions/Pool/index.tsx     | 23 +++++++------------
 src/utils/checkPreviousOrder.ts               |  2 ++
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/components/organisms/AssetActions/Pool/index.tsx b/src/components/organisms/AssetActions/Pool/index.tsx
index 5e59b49f6..dada2f442 100644
--- a/src/components/organisms/AssetActions/Pool/index.tsx
+++ b/src/components/organisms/AssetActions/Pool/index.tsx
@@ -54,7 +54,6 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
 
   const [showAdd, setShowAdd] = useState(false)
   const [showRemove, setShowRemove] = useState(false)
-  const [isLoading, setIsLoading] = useState(true)
 
   // TODO: put all these variables behind some useEffect
   // to prevent unneccessary updating on every render
@@ -76,8 +75,6 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
     if (!ocean || !accountId || !price || !price.value) return
 
     async function init() {
-      setIsLoading(true)
-
       try {
         //
         // Get everything which is in the pool
@@ -116,8 +113,6 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
         setSwapFee(`${Number(swapFee) * 100}`)
       } catch (error) {
         Logger.error(error.message)
-      } finally {
-        setIsLoading(false)
       }
     }
     init()
@@ -125,9 +120,7 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
 
   return (
     <>
-      {isLoading && !userLiquidity ? (
-        <Loader message="Retrieving pools..." />
-      ) : showAdd ? (
+      {showAdd ? (
         <Add
           setShowAdd={setShowAdd}
           poolAddress={price.address}
@@ -148,13 +141,13 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
         <>
           <div className={styles.dataToken}>
             <PriceUnit price="1" symbol={dtSymbol} /> ={' '}
-            <PriceUnit price={`${price.value}`} />
-            <Conversion price={`${price.value}`} />
+            <PriceUnit price={`${price?.value}`} />
+            <Conversion price={`${price?.value}`} />
             <Tooltip content={content.tooltips.price} />
             <div className={styles.dataTokenLinks}>
               <EtherscanLink
                 networkId={networkId}
-                path={`address/${price.address}`}
+                path={`address/${price?.address}`}
               >
                 Pool
               </EtherscanLink>
@@ -174,8 +167,8 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
                 <Tooltip content={content.tooltips.liquidity} />
               </>
             }
-            ocean={`${userLiquidity.ocean}`}
-            dt={`${userLiquidity.datatoken}`}
+            ocean={`${userLiquidity?.ocean}` || '0'}
+            dt={`${userLiquidity?.datatoken}` || '0'}
             dtSymbol={dtSymbol}
             poolShares={poolTokens}
             conversion={totalUserLiquidityInOcean}
@@ -186,8 +179,8 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
 
           <TokenList
             title="Pool Statistics"
-            ocean={`${price.ocean}`}
-            dt={`${price.datatoken}`}
+            ocean={`${price?.ocean}`}
+            dt={`${price?.datatoken}`}
             dtSymbol={dtSymbol}
             poolShares={totalPoolTokens}
             conversion={totalLiquidityInOcean}
diff --git a/src/utils/checkPreviousOrder.ts b/src/utils/checkPreviousOrder.ts
index 6a7559f57..9adc87f11 100644
--- a/src/utils/checkPreviousOrder.ts
+++ b/src/utils/checkPreviousOrder.ts
@@ -6,6 +6,8 @@ export default async function checkPreviousOrder(
   ddo: DDO,
   serviceType: ServiceType
 ) {
+  if (!ocean) return
+
   const service = ddo.findServiceByType(serviceType)
   // apparenlty cost and timeout are not found, even though they are there...
   const previousOrder = await ocean.datatokens.getPreviousValidOrders(