Skip to content

Add missing commits from main to the rebrand branch #103

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
jalooc merged 6 commits into from
Jul 21, 2025
Merged

Add missing commits from main to the rebrand branch #103

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
8e46e93
SD-102: Fix allowance fee not shown in pending transaction
rAskVAL Jun 30, 2025
f4544e5
SD-102: Keep selected amount after fee modal opened
rAskVAL Jul 1, 2025
8ed66be
SD-102: Fix ESC key handling to only close top modal
rAskVAL Jul 1, 2025
fa9be6e
SD-102: Fix loading states to only show for correct account type
rAskVAL Jul 1, 2025
11d8898
SD-102: Temporarily hide fee documentation link in fee breakdown modal
rAskVAL Jul 1, 2025
f167cd9
Merge pull request #92 from Cardinal-Cryptography/sd-102-fees-improve…
rAskVAL Jul 16, 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
4 changes: 2 additions & 2 deletions src/domains/misc/components/Modal/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ const Modal = ({

useEffect(() => {
const handleEsc = (e: KeyboardEvent) => {
if (e.key === 'Escape' && !nonDismissible) {
if (e.key === 'Escape' && !nonDismissible && isTopModal) {
triggerClose();
}
};
document.addEventListener('keydown', handleEsc);
return () => void document.removeEventListener('keydown', handleEsc);
}, [nonDismissible, triggerClose]);
}, [nonDismissible, triggerClose, isTopModal]);

const pages = Array.isArray(config) ? config : [config];

Expand Down
10 changes: 6 additions & 4 deletions src/domains/shielder/components/TokenList/Modals/SendModal/SelectAmountPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,18 @@ type Props = {
},
onContinue: (amount: bigint) => void,
hasInsufficientFees: boolean,
value: string,
onValueChange: (value: string) => void,
};

const SelectAmountPage = ({ onContinue, token, hasInsufficientFees }: Props) => {
const SelectAmountPage = ({ onContinue, token, hasInsufficientFees, value, onValueChange }: Props) => {
const { address } = useWallet();
const chainConfig = useChain();

const [value, setValue] = useState('');
const [isExceedingBalance, setIsExceedingBalance] = useState(false);

const amount = token.decimals ? fromDecimals(value, token.decimals) : 0n;

const { fees, totalFee, isLoading } = useShielderFees({ token, operation: 'send' });

const {
Expand All @@ -56,7 +59,6 @@ const SelectAmountPage = ({ onContinue, token, hasInsufficientFees }: Props) =>
return result > 0n ? result : 0n;
}, [token, totalFee]);

const amount = token.decimals ? fromDecimals(value, token.decimals) : 0n;
const hasNotSelectedAmount = amount <= 0n;
const isButtonDisabled = hasNotSelectedAmount || isExceedingBalance || hasInsufficientFees;

Expand All @@ -80,7 +82,7 @@ const SelectAmountPage = ({ onContinue, token, hasInsufficientFees }: Props) =>
maxAmount={maxAmountToSend}
token={token}
effectiveAssetValue={value}
onAssetValueChange={setValue}
onAssetValueChange={onValueChange}
accountAddress={address}
onAssetBalanceExceeded={setIsExceedingBalance}
/>
Expand Down
90 changes: 44 additions & 46 deletions src/domains/shielder/components/TokenList/Modals/SendModal/SendModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const SendModal = ({ token }: Props) => {
const { address } = useWallet();
const [addressTo, setAddressTo] = useState('');
const [amount, setAmount] = useState(0n);
const [inputValue, setInputValue] = useState('');
const { withdraw, isWithdrawing } = useWithdraw();
const [page, setPage] = useState(0);
const { close } = useModalControls();
Expand Down Expand Up @@ -63,52 +64,49 @@ const SendModal = ({ token }: Props) => {
return (
<Modal
page={page}
config={
[
{
title: 'Send',
content: (
<SelectAccountPage
key="select-account"
addressTo={addressTo}
setAddressTo={setAddressTo}
onConfirmClick={onConfirm}
/>
),
},
{
title: 'Send',
content: (
<SelectAmountPage
key="select-amount"
token={token}
onContinue={handleSelectAmount}
hasInsufficientFees={hasInsufficientFees}
/>
),
},
{
title: 'Send',
content: (
<ConfirmPage
key="confirmation"
amount={amount}
token={token}
addressTo={validatedAddressTo}
onConfirm={handleWithdraw}
isLoading={isWithdrawing}
buttonLabel={
hasInsufficientFees ?
`Insufficient ${token.symbol} Balance` :
isWithdrawing ? 'Sending privately' : 'Confirm'
}
addressFrom={address}
hasInsufficientFees={hasInsufficientFees}
/>
),
},
]
}
config={[
{
title: 'Send',
content: (
<SelectAccountPage
addressTo={addressTo}
setAddressTo={setAddressTo}
onConfirmClick={onConfirm}
/>
),
},
{
title: 'Send',
content: (
<SelectAmountPage
token={token}
onContinue={handleSelectAmount}
hasInsufficientFees={hasInsufficientFees}
value={inputValue}
onValueChange={setInputValue}
/>
),
},
{
title: 'Send',
content: (
<ConfirmPage
amount={amount}
token={token}
addressTo={validatedAddressTo}
onConfirm={handleWithdraw}
isLoading={isWithdrawing}
buttonLabel={
hasInsufficientFees ?
`Insufficient ${token.symbol} Balance` :
isWithdrawing ? 'Sending privately' : 'Confirm'
}
addressFrom={address}
hasInsufficientFees={hasInsufficientFees}
/>
),
},
]}
/>
);
};
Expand Down
7 changes: 4 additions & 3 deletions src/domains/shielder/components/TokenList/Modals/ShieldModal/SelectAmountPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@ type Props = {
},
onContinue: (amount: bigint) => void,
hasInsufficientFees: boolean,
value: string,
onValueChange: (value: string) => void,
};

const SelectAmountPage = ({ onContinue, token, hasInsufficientFees }: Props) => {
const SelectAmountPage = ({ onContinue, token, hasInsufficientFees, value, onValueChange }: Props) => {
const { address } = useWallet();
const chainConfig = useChain();

const [value, setValue] = useState('');
const [isExceedingBalance, setIsExceedingBalance] = useState(false);

const amount = token.decimals ? fromDecimals(value, token.decimals) : 0n;
Expand Down Expand Up @@ -85,7 +86,7 @@ const SelectAmountPage = ({ onContinue, token, hasInsufficientFees }: Props) =>
maxAmount={maxAmountToShield}
token={token}
effectiveAssetValue={value}
onAssetValueChange={setValue}
onAssetValueChange={onValueChange}
accountAddress={address}
onAssetBalanceExceeded={setIsExceedingBalance}
/>
Expand Down
67 changes: 33 additions & 34 deletions src/domains/shielder/components/TokenList/Modals/ShieldModal/ShieldModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const ShieldModal = ({ token }: Props) => {
const { address } = useWallet();
const { close } = useModalControls();
const [amount, setAmount] = useState(0n);
const [inputValue, setInputValue] = useState('');
const chainConfig = useChain();
const { shield, isShielding, reset } = useShield();
const [page, setPage] = useState(0);
Expand Down Expand Up @@ -63,40 +64,38 @@ const ShieldModal = ({ token }: Props) => {
<Modal
page={page}
onClose={handleReset}
config={
[
{
title: 'Shield',
content: (
<SelectAmountPage
key="select-amount"
token={token}
onContinue={handleSelectAmount}
hasInsufficientFees={hasInsufficientFees}
/>
),
},
{
title: 'Shield',
content: (
<ConfirmPage
key="confirmation"
amount={amount}
token={token}
onConfirm={() => void handleShield()}
isLoading={isShielding}
buttonLabel={
hasInsufficientFees ?
`Insufficient ${chainConfig?.nativeCurrency.symbol} Balance` :
isShielding ? 'Shielding' : 'Confirm'
}
addressFrom={address}
hasInsufficientFees={hasInsufficientFees}
/>
),
},
]
}
config={[
{
title: 'Shield',
content: (
<SelectAmountPage
token={token}
onContinue={handleSelectAmount}
hasInsufficientFees={hasInsufficientFees}
value={inputValue}
onValueChange={setInputValue}
/>
),
},
{
title: 'Shield',
content: (
<ConfirmPage
amount={amount}
token={token}
onConfirm={() => void handleShield()}
isLoading={isShielding}
buttonLabel={
hasInsufficientFees ?
`Insufficient ${chainConfig?.nativeCurrency.symbol} Balance` :
isShielding ? 'Shielding' : 'Confirm'
}
addressFrom={address}
hasInsufficientFees={hasInsufficientFees}
/>
),
},
]}
/>
);
};
Expand Down
4 changes: 2 additions & 2 deletions src/domains/shielder/components/TokenList/TokenListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const TokenListItem = ({ token }: Props) => {
variables.token.address === token.address &&
variables.token.isNative === token.isNative;
},
});
}) && selectedAccountType === 'public';

const isWithdrawing = !!useIsMutating({
predicate: mutation => {
Expand All @@ -60,7 +60,7 @@ const TokenListItem = ({ token }: Props) => {
variables.token.address === token.address &&
variables.token.isNative === token.isNative;
},
});
}) && selectedAccountType === 'shielded';

const isProcessing = isShielding || isWithdrawing;
const processingText = isShielding ? 'Shielding' : isWithdrawing ? 'Sending privately' : undefined;
Expand Down
1 change: 1 addition & 0 deletions src/domains/shielder/components/TransactionDetailsModal/ActivityDetailsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const ActivityDetailsModal = (props: Props) => {
{ isNative: true as const };

const operation = transaction?.type === 'Withdraw' ? 'send' : 'shield';

const { fees, totalFee: estimatedTotalFee } = useShielderFees({
token,
operation,
Expand Down
11 changes: 7 additions & 4 deletions src/domains/shielder/components/TransactionDetailsModal/Title.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,13 @@ const Container = styled.div`
display: flex;
justify-content: center;
flex-direction: column;
${typography.decorative.subtitle2};

& > p {
& > :first-of-type {
${typography.decorative.subtitle2};
};

& > :last-of-type {
${typography.web.caption2};
color:${vars('--color-neutral-foreground-3-rest')}
}
color:${vars('--color-neutral-foreground-3-rest')}
};
`;
Loading
Loading