Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/cacti images svg #460

Merged
merged 2 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
NEXT_PUBLIC_ENV_TAG=local

ARBITRUM_FORK_URL='https://rpc.tenderly.co/fork/f3bc2f6a-3a0f-455e-9cf7-b0e0b567b3a2'
4 changes: 2 additions & 2 deletions src/components/current/CactiImages/Cactus1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ const Cactus1 = (props: any) => (
width="364.07"
height="404.81"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"
colorInterpolationFilters="sRGB"
>
<feFlood flood-opacity="0" result="BackgroundImageFix" />
<feFlood floodOpacity="0" result="BackgroundImageFix" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
Expand Down
4 changes: 2 additions & 2 deletions src/components/current/CactiImages/Cactus2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ const Cactus2 = (props: any) => (
width="371.031"
height="408.16"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"
colorInterpolationFilters="sRGB"
>
<feFlood flood-opacity="0" result="BackgroundImageFix" />
<feFlood floodOpacity="0" result="BackgroundImageFix" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
Expand Down
4 changes: 2 additions & 2 deletions src/components/current/CactiImages/Cactus3.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ const Cactus3 = (props: any) => (
width="375.457"
height="417.935"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"
colorInterpolationFilters="sRGB"
>
<feFlood flood-opacity="0" result="BackgroundImageFix" />
<feFlood floodOpacity="0" result="BackgroundImageFix" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
Expand Down
6 changes: 3 additions & 3 deletions src/components/current/WelcomeMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const WelcomeMessage = () => {
<div className="mx-auto w-full max-w-4xl space-y-20">
<div className="flex w-full justify-center">
<div className="w-[50%]">
<Image src={cactiImage} alt="CactiChat" className="mx-auto" />
<Image src={cactiImage} alt="CactiChat" className="mx-auto" priority />
</div>
</div>

Expand All @@ -59,7 +59,7 @@ const WelcomeMessage = () => {
</WelcomeColumn>

<WelcomeColumn>
<div className="w-[20%] sm:w-[40%] ">
<div className="w-[20%] sm:w-[40%] ">
<Cactus2 className="h-16" />
</div>
<WelcomeBoxSubtitle>Interact with protocols</WelcomeBoxSubtitle>
Expand All @@ -77,7 +77,7 @@ const WelcomeMessage = () => {
</WelcomeColumn>

<WelcomeColumn>
<div className="w-[20%] sm:w-[40%] ">
<div className="w-[20%] sm:w-[40%] ">
<Cactus3 className="h-16" />
</div>
{/* <ExclamationTriangleIcon className="mt-3 h-12 text-gray-300" /> */}
Expand Down
1 change: 0 additions & 1 deletion src/components/current/widgets/nft/NftAsset.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export const NftAsset = ({
price,
attributes,
}: NftAssetProps) => {

const backendUrl = getBackendApiUrl();

return (
Expand Down
12 changes: 9 additions & 3 deletions src/components/current/widgets/uniswap/Uniswap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions src/contexts/ConnectionWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -124,9 +123,8 @@ const ConnectionWrapper = ({ children, useSiwe = true }: any) => {
const Disclaimer: DisclaimerComponent = ({ Text, Link }) => (
<Text>
By connecting my wallet, I agree to the{' '}
<Link href="https://cacti.finance/terms/">Terms of Service</Link> and acknowledge I have
read and understand the protocol{' '}
<Link href="https://cacti.finance/privacy/">Privacy Policy</Link>.
<Link href="https://cacti.finance/terms/">Terms of Service</Link> and acknowledge I have read
and understand the protocol <Link href="https://cacti.finance/privacy/">Privacy Policy</Link>.
</Text>
);

Expand Down