Merge 2344c53 into cd75683

synapsecns · Sep 5, 2024 · f9061af · f9061af
2 parents cd75683 + 2344c53
commit f9061af
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/packages/synapse-interface/components/StateManagedBridge/BridgeTransactionButton.tsx b/packages/synapse-interface/components/StateManagedBridge/BridgeTransactionButton.tsx
@@ -50,6 +50,7 @@ export const BridgeTransactionButton = ({
   } = useBridgeState()
   const { bridgeQuote, isLoading } = useBridgeQuoteState()
   const {
+    hasSameSelectionsAsPreviousQuote,
     hasQuoteOutputChanged,
     hasUserConfirmedChange,
     handleUserAcceptChange,
@@ -59,6 +60,11 @@ export const BridgeTransactionButton = ({
   const { showDestinationWarning, isDestinationWarningAccepted } =
     useBridgeDisplayState()
 
+  console.log(
+    'hasSameSelectionsAsPreviousQuote: ',
+    hasSameSelectionsAsPreviousQuote
+  )
+
   const {
     hasValidInput,
     hasValidQuote,
@@ -103,6 +109,16 @@ export const BridgeTransactionButton = ({
       label: `Please select an Origin token`,
       onClick: null,
     }
+  } else if (isConnected && !hasSufficientBalance) {
+    buttonProperties = {
+      label: 'Insufficient balance',
+      onClick: null,
+    }
+  } else if (isLoading && hasSameSelectionsAsPreviousQuote) {
+    buttonProperties = {
+      label: 'Updating quote',
+      onClick: null,
+    }
   } else if (isLoading) {
     buttonProperties = {
       label: `Bridge ${fromToken?.symbol}`,
@@ -150,11 +166,6 @@ export const BridgeTransactionButton = ({
       label: 'Invalid bridge quote',
       onClick: null,
     }
-  } else if (!isLoading && isConnected && !hasSufficientBalance) {
-    buttonProperties = {
-      label: 'Insufficient balance',
-      onClick: null,
-    }
   } else if (destinationAddress && !isAddress(destinationAddress)) {
     buttonProperties = {
       label: 'Invalid Destination address',

diff --git a/packages/synapse-interface/components/StateManagedBridge/hooks/useConfirmNewBridgePrice.ts b/packages/synapse-interface/components/StateManagedBridge/hooks/useConfirmNewBridgePrice.ts
@@ -35,6 +35,11 @@ export const useConfirmNewBridgePrice = () => {
     [previousBridgeQuote, createBridgeSelections]
   )
 
+  const hasSameSelectionsAsPreviousQuote = useMemo(
+    () => currentBridgeQuoteSelections === previousBridgeQuoteSelections,
+    [currentBridgeQuoteSelections, previousBridgeQuoteSelections]
+  )
+
   const calculateOutputRelativeDifference = useCallback((quoteA, quoteB) => {
     if (!quoteA?.outputAmountString || !quoteB?.outputAmountString) return null
 
@@ -48,8 +53,8 @@ export const useConfirmNewBridgePrice = () => {
     if (!hasQuoteOutputChanged && !hasUserConfirmedChange) {
       quoteRef.current = previousQuote
       setHasQuoteOutputChanged(true)
-      setHasUserConfirmedChange(false)
     }
+    setHasUserConfirmedChange(false)
   }
 
   const handleUserAcceptChange = () => {
@@ -110,6 +115,7 @@ export const useConfirmNewBridgePrice = () => {
   ])
 
   return {
+    hasSameSelectionsAsPreviousQuote,
     hasQuoteOutputChanged,
     hasUserConfirmedChange,
     handleUserAcceptChange,