fix: dont show progress bar until a valid result is received from tho…

…rnode
shapeshift · Sep 1, 2023 · eba708a · eba708a
1 parent 5ada9c1
commit eba708a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/MultiHopTrade/components/TradeConfirm/TradeConfirm.tsx b/src/components/MultiHopTrade/components/TradeConfirm/TradeConfirm.tsx
@@ -480,7 +480,7 @@ export const TradeConfirm = () => {
               isSubmitting={isSubmitting}
               px={4}
             />
-            {isThorStreamingSwap && (
+            {status !== TxStatus.Unknown && isThorStreamingSwap && (
               <Stack px={4}>
                 <Row>
                   <Row.Label>{translate('trade.streamStatus')}</Row.Label>

diff --git a/src/components/MultiHopTrade/hooks/useThorStreamingProgress/useThorStreamingProgress.tsx b/src/components/MultiHopTrade/hooks/useThorStreamingProgress/useThorStreamingProgress.tsx
@@ -60,12 +60,12 @@ export const useThorStreamingProgress = (
     poll({
       fn: async () => {
         const updatedStreamingSwapData = await getThorchainStreamingSwap(txHash)
-        if (!updatedStreamingSwapData) return
+        if (!updatedStreamingSwapData || !updatedStreamingSwapData.quantity) return
         setStreamingSwapData(updatedStreamingSwapData)
         return updatedStreamingSwapData
       },
       validate: streamingSwapData => {
-        if (!streamingSwapData) return false
+        if (!streamingSwapData || !streamingSwapData.quantity) return false
         return streamingSwapData.count === streamingSwapData.quantity
       },
       interval: POLL_INTERVAL_MILLISECONDS,