Skip to content

Sd 34 adapt shielder to new designs #24

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.

Sign up for GitHub

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

Merged
rAskVAL merged 6 commits into from
Apr 9, 2025
Merged

Sd 34 adapt shielder to new designs #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79272bc
SD-34: Rework shielder ui
rAskVAL Apr 6, 2025
5c07d49
SD-34: Update tokens, networks and shielder sdk
rAskVAL Apr 8, 2025
0c8cfe5
SD-34: Polish UI, display correct fees
rAskVAL Apr 9, 2025
7911188
SD-34: Add confirm step to both flows
rAskVAL Apr 9, 2025
6254f95
SD-34: Update metadata
rAskVAL Apr 9, 2025
54c5cb1
SD-34: Make adjustments based on feedback
rAskVAL Apr 9, 2025
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
3 changes: 3 additions & 0 deletions envVarsSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import * as z from 'zod';

const url = z.string().url();

export default z.object({
PUBLIC_VAR_REOWN_PROJECT_ID: z.string(),
PUBLIC_VAR_OG_IMAGE_URL: url,
});
16 changes: 13 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
<!doctype html>
<html lang="en">
<head>
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Shielding dApp</title>
<meta name="description" content="Privacy for all crypto.">
<link rel="icon" type="image/svg+xm" href="/favicon.svg">
<title>Common Web App</title>

<meta property="og:title" content="Common Web App" />
<meta property="og:description" content="Privacy for all crypto." />
<meta property="og:image" content="%PUBLIC_VAR_OG_IMAGE_URL%" />

<meta name="twitter:title" content="Common Web App">
<meta name="twitter:description" content="Privacy for all crypto.">
<meta name="twitter:image" content="%PUBLIC_VAR_OG_IMAGE_URL%">

</head>
<body>
<div id="root"></div>
Expand Down
55 changes: 51 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"generate-icons": "tsx scripts/generateIcons.ts"
},
"dependencies": {
"@cardinal-cryptography/shielder-sdk": "0.2.0-beta.4",
"@cardinal-cryptography/shielder-sdk": "0.2.0-beta.5",
"@cardinal-cryptography/shielder-sdk-crypto": "0.2.0-beta.2",
"@cardinal-cryptography/shielder-sdk-crypto-wasm": "0.2.0-beta.2",
"@number-flow/react": "^0.5.7",
Expand All @@ -36,6 +36,8 @@
"motion": "^12.4.12",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-merge-refs": "^2.1.1",
"rooks": "^8.0.0",
"sonner": "^2.0.2",
"styled-components": "^6.1.15",
"styled-reset": "^4.5.2",
Expand Down
3 changes: 3 additions & 0 deletions public/favicon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/og.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion public/vite.svg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Layout from 'src/domains/misc/components/Layout';
import Providers from 'src/domains/misc/components/Providers';
import Redirect from 'src/domains/routing/components/Redirect';
import router from 'src/domains/routing/utils/router';
import ShielderView from 'src/domains/shielder/components/ShielderView.tsx';
import ShielderView from 'src/domains/shielder/components/ShielderView';

const App = () => {
const route = router.useRoute(['Shield']);
Expand Down
33 changes: 33 additions & 0 deletions src/domains/chains/components/ChainIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import styled from 'styled-components';

import getChainConfigById from 'src/domains/chains/utils/getChainConfigById';
import vars from 'src/domains/styling/utils/vars.ts';

type Props = {
chainId: number | string,
size?: number,
className?: string,
};
const ChainIcon = ({ chainId, size = 16, className }: Props) => {
const { ChainIcon } = getChainConfigById(chainId);

return (
<Container style={{ height: size, width: size, borderRadius: size * 0.25 }} className={className}>
<ChainIcon />
</Container>
);
};

export default ChainIcon;

const Container = styled.div`
display: grid;
place-items: center;
border: 1px solid ${vars('--color-neutral-foreground-1-rest')};
color: ${vars('--color-neutral-foreground-1-rest')};

svg {
height: 100%;
width: 100%
}
`;
20 changes: 8 additions & 12 deletions src/domains/chains/utils/definitions/chains/alephZero/alephZero.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import SpringIcon from '../../commonTokensIcons/spring.svg?react';
import UsdcIcon from '../../commonTokensIcons/usdc.svg?react';
import UsdtIcon from '../../commonTokensIcons/usdt.svg?react';
import WAzeroIcon from '../../commonTokensIcons/wAzero.svg?react';
import WBtcIcon from '../../commonTokensIcons/wBtc.svg?react';
import WEthIcon from '../../commonTokensIcons/wBtc.svg?react';
import WEthIcon from '../../commonTokensIcons/wEth.svg?react';
import { ChainConfig } from '../../definitions';

import ChainIcon from './alephZeroEvm.svg?react';
Expand Down Expand Up @@ -42,19 +43,17 @@ const config: ChainConfig = {
'0x5be9D19Ed24c8C31f4b1FA78A555a97eD462582D': { icon: WBtcIcon },
'0xB3f0eE446723f4258862D949B4c9688e7e7d35d3': { icon: WEthIcon },
'0x18d25B4e18165c97e1285212e5d1f80eDD6d3Aa7': { icon: UsdcIcon },
'0xD648529D4803d3467bA8850577BEd4e4b8Ae583C': { icon: UsdtIcon },
'0x27a1Bb249A2973D01264e8e43Ee9be2424F1a52B': { icon: UsdtIcon },
},
},
testnet: {
name: 'Aleph Zero',
name: 'Aleph Zero EVM Testnet',
ChainIcon,
NativeTokenIcon,
id: 2039,
shielderConfig: {
shielderContractAddress: '0x7126761c7E18915C891c215a23100739492B78a1',
// TODO(SD-31): Replace the placeholder relayer URL with chain-specific URLs once provided.
// https://cardinal-cryptography.atlassian.net/browse/SD-31
relayerUrl: 'https://shielder-relayer-dev.test.azero.dev',
shielderContractAddress: '0x0037A4AAE611b931d626887Bd53028a2a7051A7e',
relayerUrl: 'https://shielder-relayer-v2.dev.azero.dev/azero-testnet',
},
nativeCurrency: {
decimals: 18,
Expand All @@ -80,11 +79,8 @@ const config: ChainConfig = {
},
},
whitelistedTokens: {
'0xcC1141eEd15EB519b08cA38A2Ee75AB8025F0DA9': { icon: WAzeroIcon },
'0x50Cb1A86F64E065F1763E9c5B3a8FA321dad9402': { icon: WBtcIcon },
'0x189d0D5409F244B78C86cdcF9331B276363bDDa1': { icon: WEthIcon },
'0xc1947a75696731548651dD40CcB22D23fEA71AF3': { icon: UsdcIcon },
'0x8fceA92b10b7ee07fc625Cd3441Bbe65E9F472f2': { icon: UsdtIcon },
'0x1C66D6187B318f10Eb1A8BD986451DF02BE3DbAC': { icon: SpringIcon },
'0x27a1Bb249A2973D01264e8e43Ee9be2424F1a52B': { icon: UsdtIcon },
},
},
};
Expand Down
22 changes: 4 additions & 18 deletions src/domains/chains/utils/definitions/chains/alephZero/alephZeroEvm.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 2 additions & 11 deletions src/domains/chains/utils/definitions/chains/alephZero/nativeToken.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading