Skip to content

Commit 04dfcff

Browse files
committed
fix: update full withdrawal tx modal text
1 parent 8876423 commit 04dfcff

5 files changed

Lines changed: 10 additions & 3 deletions

File tree

features/validators/modals/withdraw-to-vault-modal/content/form/form.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ export const WithdrawToVaultModalForm: FC<FormProps> = ({
8282
index,
8383
pubkey,
8484
validatorWithdrawalFee,
85+
balance,
8586
},
8687
disabled:
8788
!isDappActive ||
@@ -104,8 +105,9 @@ export const WithdrawToVaultModalForm: FC<FormProps> = ({
104105
index,
105106
pubkey,
106107
validatorWithdrawalFee,
108+
balance,
107109
});
108-
}, [index, isPartial, pubkey, reset, validatorWithdrawalFee]);
110+
}, [index, isPartial, pubkey, reset, validatorWithdrawalFee, balance]);
109111

110112
const onSubmit = useCallback(
111113
async (formData: WithdrawalFormValidatedValues) => {

features/validators/modals/withdraw-to-vault-modal/hooks/use-withdrawal-to-vault.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export const useWithdrawalToVault = () => {
3434
index,
3535
pubkey,
3636
validatorWithdrawalFee,
37+
balance,
3738
}: WithdrawalFormValidatedValues) => {
3839
invariant(activeVault, '[useWithdrawalToVault] activeVault is undefined');
3940
invariant(
@@ -46,9 +47,10 @@ export const useWithdrawalToVault = () => {
4647
);
4748

4849
const amountInGwei = amount / WEI_PER_GWEI;
50+
const withdrawalAmount = amount > 0n ? amount : balance;
4951

50-
const mainActionLoadingText = loadingText(index, amount);
51-
const mainActionCompleteText = mainCompleteText(index, amount);
52+
const mainActionLoadingText = loadingText(index, withdrawalAmount);
53+
const mainActionCompleteText = mainCompleteText(index, withdrawalAmount);
5254

5355
const prepareTransactions = async () => {
5456
const calls: TransactionEntry[] = [...prepareReportCalls()];

features/validators/modals/withdraw-to-vault-modal/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ export type WithdrawalFormFieldValues = {
1616
index: WithdrawalFormValidatedValues['index'];
1717
pubkey: WithdrawalFormValidatedValues['pubkey'];
1818
validatorWithdrawalFee: WithdrawalFormValidatedValues['validatorWithdrawalFee'];
19+
balance: WithdrawalFormValidatedValues['balance'];
1920
};

features/validators/modals/withdraw-to-vault-modal/validation.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export const withdrawalFormSchema = ({
3434
index: z.number(),
3535
pubkey: pubkeySchema,
3636
validatorWithdrawalFee: z.bigint(),
37+
balance: z.bigint(),
3738
});
3839
};
3940

features/validators/shared/components/validator-info/validator-info.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export const ValidatorInfo: FC<PropsWithChildren<ValidatorInfoProps>> = ({
3737
<PubKeyWrapper>
3838
<Text size="xs" strong>
3939
<Address
40+
as="span"
4041
address={pubKey}
4142
symbols={4}
4243
style={{ fontWeight: 700 }}

0 commit comments

Comments
 (0)