From 367be52f689e4f0accce2109497c96c0831053df Mon Sep 17 00:00:00 2001 From: Uniswap Labs Service Account Date: Wed, 9 Oct 2024 19:15:22 +0000 Subject: [PATCH] ci(release): publish latest release --- RELEASE | 17 ++++++----------- VERSION | 2 +- .../requestContent/EthSend/EthSend.tsx | 5 ++++- .../dappRequests/requestContent/WrapContent.tsx | 14 +++++++++----- packages/uniswap/src/features/gas/hooks.ts | 7 ++++++- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/RELEASE b/RELEASE index f7e8905950f..f30b3071872 100644 --- a/RELEASE +++ b/RELEASE @@ -1,6 +1,6 @@ IPFS hash of the deployment: -- CIDv0: `QmSSKD7h4Q9E4bEtFW5zqeBJQ419v7BGHUushs7Myz2WQQ` -- CIDv1: `bafybeib44ixryspegordbiauzjcek6nvu4kqbdgucj6dgvwiv4jad6owde` +- CIDv0: `QmbrVRA32CDwC4dhB4NStnreoYJ2xEaX3SoMW8kU5TuE7s` +- CIDv1: `bafybeigiztmprfce7w24v25bv65hos5sz464njnrahj37irfxp255e434i` 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://bafybeib44ixryspegordbiauzjcek6nvu4kqbdgucj6dgvwiv4jad6owde.ipfs.dweb.link/ -- https://bafybeib44ixryspegordbiauzjcek6nvu4kqbdgucj6dgvwiv4jad6owde.ipfs.cf-ipfs.com/ -- [ipfs://QmSSKD7h4Q9E4bEtFW5zqeBJQ419v7BGHUushs7Myz2WQQ/](ipfs://QmSSKD7h4Q9E4bEtFW5zqeBJQ419v7BGHUushs7Myz2WQQ/) +- https://bafybeigiztmprfce7w24v25bv65hos5sz464njnrahj37irfxp255e434i.ipfs.dweb.link/ +- https://bafybeigiztmprfce7w24v25bv65hos5sz464njnrahj37irfxp255e434i.ipfs.cf-ipfs.com/ +- [ipfs://QmbrVRA32CDwC4dhB4NStnreoYJ2xEaX3SoMW8kU5TuE7s/](ipfs://QmbrVRA32CDwC4dhB4NStnreoYJ2xEaX3SoMW8kU5TuE7s/) -### 5.50.2 (2024-10-09) - - -### Bug Fixes - -* **web:** log step and original error on web (#12826) 5d4bd4f +### 5.50.3 (2024-10-09) diff --git a/VERSION b/VERSION index 9a5d2a51a78..cb153c56447 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -web/5.50.2 \ No newline at end of file +web/5.50.3 \ No newline at end of file diff --git a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/EthSend.tsx b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/EthSend.tsx index 9354078d2d9..30c70ef308d 100644 --- a/apps/extension/src/app/features/dappRequests/requestContent/EthSend/EthSend.tsx +++ b/apps/extension/src/app/features/dappRequests/requestContent/EthSend/EthSend.tsx @@ -24,7 +24,10 @@ export function EthSendRequestContent({ request }: EthSendRequestContentProps): const chainId = useDappLastChainId(dappUrl) // Gas service requires a chain id - const formattedTxnForGasQuery = { ...dappRequest.transaction, chainId } + const formattedTxnForGasQuery = useMemo( + () => ({ ...dappRequest.transaction, chainId }), + [dappRequest.transaction, chainId], + ) const transactionGasFeeResult = useTransactionGasFee( formattedTxnForGasQuery, diff --git a/apps/extension/src/app/features/dappRequests/requestContent/WrapContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/WrapContent.tsx index 50e083a6aea..8c5b908ccec 100644 --- a/apps/extension/src/app/features/dappRequests/requestContent/WrapContent.tsx +++ b/apps/extension/src/app/features/dappRequests/requestContent/WrapContent.tsx @@ -1,3 +1,4 @@ +import { useMemo } from 'react' import { useTranslation } from 'react-i18next' import { useDappLastChainId } from 'src/app/features/dapp/hooks' import { DappRequestStoreItem } from 'src/app/features/dappRequests/slice' @@ -25,11 +26,14 @@ export const WrapTransactionDetails = ({ const chainId = useDappLastChainId(dappUrl) || UniverseChainId.Mainnet - const networkFee = useTransactionGasFee({ - chainId, - ...sendTransactionRequest.transaction, - }).value - const gasFeeUSD = useUSDValue(chainId, networkFee) + const txRequest = useMemo( + () => ({ ...sendTransactionRequest.transaction, chainId }), + [sendTransactionRequest, chainId], + ) + + const networkFee = useTransactionGasFee(txRequest) + + const gasFeeUSD = useUSDValue(chainId, networkFee.value) return ( diff --git a/packages/uniswap/src/features/gas/hooks.ts b/packages/uniswap/src/features/gas/hooks.ts index 35c0108ae02..e70de87e44b 100644 --- a/packages/uniswap/src/features/gas/hooks.ts +++ b/packages/uniswap/src/features/gas/hooks.ts @@ -114,8 +114,13 @@ export function useTransactionGasFee( const activeGasStrategy = useActiveGasStrategy(tx?.chainId, 'general') const shadowGasStrategies = useShadowGasStrategies(tx?.chainId, 'general') + const txWithGasStrategies = useMemo( + () => ({ ...tx, gasStrategies: [activeGasStrategy, ...(shadowGasStrategies ?? [])] }), + [tx, activeGasStrategy, shadowGasStrategies], + ) + const { data, error, isLoading } = useGasFeeQuery({ - params: skip || !tx ? undefined : { ...tx, gasStrategies: [activeGasStrategy, ...(shadowGasStrategies ?? [])] }, + params: skip || !tx ? undefined : txWithGasStrategies, refetchInterval, staleTime: pollingIntervalForChain, immediateGcTime: pollingIntervalForChain + 15 * ONE_SECOND_MS,