Merge pull request #2740 from synapsecns/master

FE Release 06-18-2024
synapsecns · Jun 18, 2024 · e278abc · e278abc
2 parents a289482 + 1710a84
commit e278abc
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/packages/synapse-interface/CHANGELOG.md b/packages/synapse-interface/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.26.2](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-06-18)
+
+
+### Bug Fixes
+
+* **synapse-interface:** disable input pending wallet ([#2738](https://github.com/synapsecns/sanguine/issues/2738)) ([667a90e](https://github.com/synapsecns/sanguine/commit/667a90e76c0f958c37b6b760af4228657df0332d))
+
+
+
+
+
 ## [0.26.1](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-06-18)
 
 **Note:** Version bump only for package @synapsecns/synapse-interface

diff --git a/packages/synapse-interface/components/StateManagedBridge/InputContainer.tsx b/packages/synapse-interface/components/StateManagedBridge/InputContainer.tsx
@@ -37,8 +37,14 @@ export const InputContainer = () => {
   const dispatch = useAppDispatch()
   const { chain, isConnected } = useAccount()
   const { balances } = usePortfolioState()
-  const { fromChainId, toChainId, fromToken, toToken, fromValue } =
-    useBridgeState()
+  const {
+    fromChainId,
+    toChainId,
+    fromToken,
+    toToken,
+    fromValue,
+    isWalletPending,
+  } = useBridgeState()
   const [showValue, setShowValue] = useState('')
   const [hasMounted, setHasMounted] = useState(false)
 
@@ -152,6 +158,7 @@ export const InputContainer = () => {
             inputRef={inputRef}
             showValue={showValue}
             handleFromValueChange={handleFromValueChange}
+            disabled={isWalletPending}
           />
           <AvailableBalance
             balance={formattedBalance}

diff --git a/packages/synapse-interface/package.json b/packages/synapse-interface/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@synapsecns/synapse-interface",
-  "version": "0.26.1",
+  "version": "0.26.2",
   "private": true,
   "engines": {
     "node": ">=18.18.0"

diff --git a/packages/synapse-interface/pages/state-managed-bridge/index.tsx b/packages/synapse-interface/pages/state-managed-bridge/index.tsx
@@ -34,11 +34,10 @@ import {
   setFromToken,
   setToChainId,
   setToToken,
-} from '@/slices/bridge/reducer'
-import {
   updateFromValue,
   setBridgeQuote,
   setIsLoading,
+  setIsWalletPending,
   setDestinationAddress,
 } from '@/slices/bridge/reducer'
 import {
@@ -94,12 +93,12 @@ const StateManagedBridge = () => {
     debouncedFromValue,
     destinationAddress,
     isLoading: isQuoteLoading,
+    isWalletPending,
   }: BridgeState = useBridgeState()
   const { showSettingsSlideOver, showDestinationAddress } = useSelector(
     (state: RootState) => state.bridgeDisplay
   )
 
-  const [isWalletPending, setIsWalletPending] = useState<boolean>(false)
   const [isApproved, setIsApproved] = useState<boolean>(false)
 
   const dispatch = useAppDispatch()
@@ -327,6 +326,7 @@ const StateManagedBridge = () => {
 
   const approveTxn = async () => {
     try {
+      dispatch(setIsWalletPending(true))
       const tx = approveToken(
         bridgeQuote?.routerAddress,
         fromChainId,
@@ -338,6 +338,8 @@ const StateManagedBridge = () => {
       getAndSetBridgeQuote()
     } catch (error) {
       return txErrorHandler(error)
+    } finally {
+      dispatch(setIsWalletPending(false))
     }
   }
 
@@ -377,7 +379,7 @@ const StateManagedBridge = () => {
       })
     )
     try {
-      setIsWalletPending(true)
+      dispatch(setIsWalletPending(true))
       const wallet = await getWalletClient(wagmiConfig, {
         chainId: fromChainId,
       })
@@ -524,7 +526,7 @@ const StateManagedBridge = () => {
 
       return txErrorHandler(error)
     } finally {
-      setIsWalletPending(false)
+      dispatch(setIsWalletPending(false))
     }
   }
 

diff --git a/packages/synapse-interface/slices/bridge/reducer.ts b/packages/synapse-interface/slices/bridge/reducer.ts
@@ -34,6 +34,7 @@ export interface BridgeState {
   toTokensBridgeQuotes: BridgeQuoteResponse[]
   toTokensBridgeQuotesStatus: FetchState
   isLoading: boolean
+  isWalletPending: boolean
   deadlineMinutes: number | null
   destinationAddress: Address | null
 }
@@ -71,6 +72,7 @@ export const initialState: BridgeState = {
   toTokensBridgeQuotes: [],
   toTokensBridgeQuotesStatus: FetchState.IDLE,
   isLoading: false,
+  isWalletPending: false,
   deadlineMinutes: null,
   destinationAddress: null,
 }
@@ -82,6 +84,9 @@ export const bridgeSlice = createSlice({
     setIsLoading: (state, action: PayloadAction<boolean>) => {
       state.isLoading = action.payload
     },
+    setIsWalletPending: (state, action: PayloadAction<boolean>) => {
+      state.isWalletPending = action.payload
+    },
     setFromChainId: (state, action: PayloadAction<number>) => {
       const incomingFromChainId = action.payload
 
@@ -509,6 +514,7 @@ export const {
   setDeadlineMinutes,
   setDestinationAddress,
   setIsLoading,
+  setIsWalletPending,
   resetBridgeInputs,
   clearDestinationAddress,
   resetFetchedBridgeQuotes,