From 527ae2776a0ba4b3f54300215e347ee1064dd47d Mon Sep 17 00:00:00 2001 From: brucedonovan Date: Wed, 27 Sep 2023 09:06:59 +0100 Subject: [PATCH 1/2] reformatting --- .env.example | 4 +++- src/components/current/WelcomeMessage.tsx | 4 ++-- src/components/current/widgets/nft/NftAsset.tsx | 1 - src/components/current/widgets/uniswap/Uniswap.tsx | 12 +++++++++--- src/contexts/ConnectionWrapper.tsx | 6 ++---- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.env.example b/.env.example index b3179231..2b5544a7 100644 --- a/.env.example +++ b/.env.example @@ -18,4 +18,6 @@ NEXT_PUBLIC_PG_DATABASE=chatdb_auth NEXT_PUBLIC_PG_USER=chatdb NEXT_PUBLIC_PG_PASSWORD=postgres -NEXT_PUBLIC_ENV_TAG=local \ No newline at end of file +NEXT_PUBLIC_ENV_TAG=local + +ARBITRUM_FORK_URL='https://rpc.tenderly.co/fork/f3bc2f6a-3a0f-455e-9cf7-b0e0b567b3a2' \ No newline at end of file diff --git a/src/components/current/WelcomeMessage.tsx b/src/components/current/WelcomeMessage.tsx index df6e7ae6..0f2229c5 100644 --- a/src/components/current/WelcomeMessage.tsx +++ b/src/components/current/WelcomeMessage.tsx @@ -59,7 +59,7 @@ const WelcomeMessage = () => { -
+
Interact with protocols @@ -77,7 +77,7 @@ const WelcomeMessage = () => { -
+
{/* */} diff --git a/src/components/current/widgets/nft/NftAsset.tsx b/src/components/current/widgets/nft/NftAsset.tsx index 552e2fa9..5fb61a84 100644 --- a/src/components/current/widgets/nft/NftAsset.tsx +++ b/src/components/current/widgets/nft/NftAsset.tsx @@ -40,7 +40,6 @@ export const NftAsset = ({ price, attributes, }: NftAssetProps) => { - const backendUrl = getBackendApiUrl(); return ( diff --git a/src/components/current/widgets/uniswap/Uniswap.tsx b/src/components/current/widgets/uniswap/Uniswap.tsx index 40232b84..fe69c5e4 100644 --- a/src/components/current/widgets/uniswap/Uniswap.tsx +++ b/src/components/current/widgets/uniswap/Uniswap.tsx @@ -29,7 +29,13 @@ interface UniswapProps { transactionKeyword: 'BUYAMOUNT' | 'SELLAMOUNT'; } -const Uniswap = ({ tokenInSymbol, tokenOutSymbol, inputAmount, slippage, transactionKeyword }: UniswapProps) => { +const Uniswap = ({ + tokenInSymbol, + tokenOutSymbol, + inputAmount, + slippage, + transactionKeyword, +}: UniswapProps) => { const chainId = useChainId(); const isBuying = transactionKeyword === 'BUYAMOUNT'; @@ -39,9 +45,9 @@ const Uniswap = ({ tokenInSymbol, tokenOutSymbol, inputAmount, slippage, transac const { data: tokenInChecked } = useToken(tokenInIsETH ? 'WETH' : tokenInSymbol); const { data: tokenOutChecked } = useToken(tokenOutIsETH ? 'WETH' : tokenOutSymbol); const input = useInput(inputAmount, tokenInChecked?.symbol!); - + const slippage_ = +slippage || 0.5; // in percentage terms - + const getSlippageAdjustedAmount = (amount: BigNumber) => BigNumber.from(amount) .mul(10000 - slippage_ * 100) diff --git a/src/contexts/ConnectionWrapper.tsx b/src/contexts/ConnectionWrapper.tsx index 4b0ef525..cf5a198e 100644 --- a/src/contexts/ConnectionWrapper.tsx +++ b/src/contexts/ConnectionWrapper.tsx @@ -11,7 +11,6 @@ import { lightTheme, } from '@rainbow-me/rainbowkit'; import axios from 'axios'; - import { Chain, WagmiConfig, configureChains, createClient, useEnsAvatar } from 'wagmi'; import { arbitrum, goerli, zkSyncTestnet } from 'wagmi/chains'; import { jsonRpcProvider } from 'wagmi/providers/jsonRpc'; @@ -124,9 +123,8 @@ const ConnectionWrapper = ({ children, useSiwe = true }: any) => { const Disclaimer: DisclaimerComponent = ({ Text, Link }) => ( By connecting my wallet, I agree to the{' '} - Terms of Service and acknowledge I have - read and understand the protocol{' '} - Privacy Policy. + Terms of Service and acknowledge I have read + and understand the protocol Privacy Policy. ); From 599abfaa2a0e8a7a436cbfe007e3b6607182125c Mon Sep 17 00:00:00 2001 From: brucedonovan Date: Wed, 27 Sep 2023 09:16:47 +0100 Subject: [PATCH 2/2] bugfix/cactiImages --- src/components/current/CactiImages/Cactus1.tsx | 4 ++-- src/components/current/CactiImages/Cactus2.tsx | 4 ++-- src/components/current/CactiImages/Cactus3.tsx | 4 ++-- src/components/current/WelcomeMessage.tsx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/current/CactiImages/Cactus1.tsx b/src/components/current/CactiImages/Cactus1.tsx index fdbb69b0..52870d0a 100644 --- a/src/components/current/CactiImages/Cactus1.tsx +++ b/src/components/current/CactiImages/Cactus1.tsx @@ -22,9 +22,9 @@ const Cactus1 = (props: any) => ( width="364.07" height="404.81" filterUnits="userSpaceOnUse" - color-interpolation-filters="sRGB" + colorInterpolationFilters="sRGB" > - + ( width="371.031" height="408.16" filterUnits="userSpaceOnUse" - color-interpolation-filters="sRGB" + colorInterpolationFilters="sRGB" > - + ( width="375.457" height="417.935" filterUnits="userSpaceOnUse" - color-interpolation-filters="sRGB" + colorInterpolationFilters="sRGB" > - + {
- CactiChat + CactiChat