ci(release): publish latest release

Uniswap · Oct 16, 2024 · e4e4547 · e4e4547
1 parent 993a9c6
commit e4e4547
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 28 deletions.
diff --git a/RELEASE b/RELEASE
@@ -1,6 +1,6 @@
 IPFS hash of the deployment:
-- CIDv0: `QmRCNHQbxqepJmwKTbTjue67sfn3LqusjoTaeJ1WsBUzmv`
-- CIDv1: `bafybeibkoplw7hlmdmxl7shx3c7w47twsz42qpmm3bss54r2wdk5mvyrre`
+- CIDv0: `QmWVe33WD9yQ38iTfGMAT3s8eejpztReHAdc5Nd356uaMs`
+- CIDv1: `bafybeidzfl3a6qljvfeawwzdyywlfgia3fuanjegwpgczxnctmq764h5zy`
 
 The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).
 
@@ -10,15 +10,10 @@ You can also access the Uniswap Interface from an IPFS gateway.
 Your Uniswap settings are never remembered across different URLs.
 
 IPFS gateways:
-- https://bafybeibkoplw7hlmdmxl7shx3c7w47twsz42qpmm3bss54r2wdk5mvyrre.ipfs.dweb.link/
-- https://bafybeibkoplw7hlmdmxl7shx3c7w47twsz42qpmm3bss54r2wdk5mvyrre.ipfs.cf-ipfs.com/
-- [ipfs://QmRCNHQbxqepJmwKTbTjue67sfn3LqusjoTaeJ1WsBUzmv/](ipfs://QmRCNHQbxqepJmwKTbTjue67sfn3LqusjoTaeJ1WsBUzmv/)
+- https://bafybeidzfl3a6qljvfeawwzdyywlfgia3fuanjegwpgczxnctmq764h5zy.ipfs.dweb.link/
+- https://bafybeidzfl3a6qljvfeawwzdyywlfgia3fuanjegwpgczxnctmq764h5zy.ipfs.cf-ipfs.com/
+- [ipfs://QmWVe33WD9yQ38iTfGMAT3s8eejpztReHAdc5Nd356uaMs/](ipfs://QmWVe33WD9yQ38iTfGMAT3s8eejpztReHAdc5Nd356uaMs/)
 
-### 5.53.2 (2024-10-16)
-
-
-### Bug Fixes
-
-* **web:** Only poll for bridging status updates if pending txs - prod (#13069) 694cac0
+### 5.53.3 (2024-10-16)
 
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-web/5.53.2
+web/5.53.3
diff --git a/apps/web/src/components/SearchModal/CurrencySearch.tsx b/apps/web/src/components/SearchModal/CurrencySearch.tsx
@@ -53,7 +53,7 @@ export function CurrencySearch({ currencyField, onCurrencySelect, onDismiss }: C
       return
     }
 
-    showSwapNetworkNotification(chainId, prevChainId)
+    showSwapNetworkNotification({ chainId, prevChainId })
   }, [currentTab, chainId, prevChainId, multichainUXEnabled, showSwapNetworkNotification])
 
   return (

diff --git a/apps/web/src/hooks/useShowSwapNetworkNotification.ts b/apps/web/src/hooks/useShowSwapNetworkNotification.ts
@@ -3,28 +3,34 @@ import { useAddPopup, useRemovePopup } from 'state/application/hooks'
 import { PopupType } from 'state/application/reducer'
 import { SwapTab } from 'uniswap/src/types/screens/interface'
 
+type SwapNetworkNotificationCallbackType = {
+  chainId?: number // The chainId to show notif for, can be input or output chain
+  prevChainId?: number // The previous chainId the user was swapping on, not used for bridging notifications
+  outputChainId?: number // The output chainId the user is swapping to
+}
+
 export function useShowSwapNetworkNotification() {
   const addPopup = useAddPopup()
   const removePopup = useRemovePopup()
 
   return useCallback(
-    (chainId?: number, prevChainId?: number) => {
-      if (!chainId || chainId === prevChainId) {
+    ({ chainId, prevChainId, outputChainId }: SwapNetworkNotificationCallbackType) => {
+      if (!chainId || chainId === prevChainId || chainId === outputChainId) {
         return
       }
-      const isBridgeNotification = chainId && prevChainId
+      const isBridgeNotification = chainId && outputChainId
       removePopup(`switchNetwork-${prevChainId}`)
       if (isBridgeNotification) {
         addPopup(
           {
             type: PopupType.Bridge,
             inputChainId: chainId,
-            outputChainId: prevChainId,
+            outputChainId,
           },
-          `bridge-${chainId}-to-${prevChainId}`,
+          `bridge-${chainId}-to-${outputChainId}`,
           3000,
         )
-      } else {
+      } else if (prevChainId) {
         addPopup(
           {
             type: PopupType.SwitchNetwork,

diff --git a/packages/uniswap/src/contexts/UniswapContext.tsx b/packages/uniswap/src/contexts/UniswapContext.tsx
@@ -12,7 +12,11 @@ interface UniswapContext {
   connector?: Connector
   navigateToBuyOrReceiveWithEmptyWallet?: () => void
   navigateToFiatOnRamp: (args: { prefilledCurrency?: FiatOnRampCurrency }) => void
-  onSwapChainsChanged: (inputChainId: UniverseChainId, outputChainId?: UniverseChainId) => void
+  onSwapChainsChanged: (args: {
+    chainId: UniverseChainId
+    prevChainId?: UniverseChainId
+    outputChainId?: UniverseChainId
+  }) => void
   swapInputChainId?: UniverseChainId
   signer: Signer | undefined
   useProviderHook: (chainId: number) => JsonRpcProvider | undefined
@@ -44,9 +48,17 @@ export function UniswapProvider({
       account,
       connector,
       navigateToBuyOrReceiveWithEmptyWallet,
-      onSwapChainsChanged: (inputChainId: UniverseChainId, outputChanId?: UniverseChainId): void => {
-        onSwapChainsChanged(inputChainId, outputChanId)
-        setSwapInputChainId(inputChainId)
+      onSwapChainsChanged: ({
+        chainId,
+        prevChainId,
+        outputChainId,
+      }: {
+        chainId: UniverseChainId
+        prevChainId?: UniverseChainId
+        outputChainId?: UniverseChainId
+      }): void => {
+        onSwapChainsChanged({ chainId, prevChainId, outputChainId })
+        setSwapInputChainId(chainId)
       },
       signer,
       useProviderHook,

diff --git a/packages/uniswap/src/features/transactions/swap/hooks/useSwapNetworkNotification.ts b/packages/uniswap/src/features/transactions/swap/hooks/useSwapNetworkNotification.ts
@@ -22,6 +22,7 @@ export function useSwapNetworkNotification({
 
   useEffect(() => {
     const { inputChainId: lastInputChainId, outputChainId: lastOutputChainId } = lastNetworkNotification.current
+    const prevChainId = lastInputChainId ?? lastOutputChainId
 
     // Set initial values but don't fire notification for first network selection
     if (!lastInputChainId && !lastOutputChainId) {
@@ -40,9 +41,14 @@ export function useSwapNetworkNotification({
 
     // Determine notification type and trigger
     if (inputChainId && outputChainId && inputChainId !== outputChainId) {
-      onSwapChainsChanged(inputChainId, outputChainId) // Bridging notification
-    } else if (inputChainId && (hasInputChanged || (hasOutputChanged && inputChainId === outputChainId))) {
-      onSwapChainsChanged(inputChainId) // Non-bridging notification
+      onSwapChainsChanged({ chainId: inputChainId, outputChainId }) // Bridging notification
+    } else if (inputChainId || (outputChainId && prevChainId)) {
+      const chainId = inputChainId ?? outputChainId
+      // User is swapping on the same chain, don't show notification
+      if (!chainId || chainId === prevChainId) {
+        return
+      }
+      onSwapChainsChanged({ chainId, prevChainId }) // Non-bridging notification
     }
 
     // Update last notification state

diff --git a/packages/wallet/src/features/transactions/swap/hooks/useShowSwapNetworkNotification.ts b/packages/wallet/src/features/transactions/swap/hooks/useShowSwapNetworkNotification.ts
@@ -11,10 +11,16 @@ const HIDE_DELAY = ONE_SECOND_MS * 2
  * Shows a network notification for a swap.
  * Depending on chain inputs passed, shows a bridging or non-bridging notification.
  */
-export function useShowSwapNetworkNotification(): (chainId: UniverseChainId, outputChainId?: UniverseChainId) => void {
+export function useShowSwapNetworkNotification(): ({
+  chainId,
+  outputChainId,
+}: {
+  chainId: UniverseChainId
+  outputChainId?: UniverseChainId
+}) => void {
   const appDispatch = useDispatch()
   return useCallback(
-    (chainId: UniverseChainId, outputChainId?: UniverseChainId) => {
+    ({ chainId, outputChainId }: { chainId: UniverseChainId; outputChainId?: UniverseChainId }) => {
       // Output chain should only be passed when bridging
       if (outputChainId && chainId !== outputChainId) {
         appDispatch(