Skip to content

Commit 2ca3a6a

Browse files
committed
fix: update button text capitalization and improve modal navigation logic
1 parent 04c09ac commit 2ca3a6a

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

features/create-vault/create-vault-form/submit-modal/submit-modal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ export const SubmitModal: FC<ModalProps> = () => {
105105
tx && <TxLinkEtherscan txHash={tx} />}
106106

107107
{step === SubmitStepEnum.reject && (
108-
<ButtonLink onClick={retryFire}>retry</ButtonLink>
108+
<ButtonLink onClick={retryFire}>Retry</ButtonLink>
109109
)}
110110

111111
{step === SubmitStepEnum.error && (
112-
<ButtonLink onClick={handleCancelSubmit}>close</ButtonLink>
112+
<ButtonLink onClick={handleCancelSubmit}>Close</ButtonLink>
113113
)}
114114
</Content>
115115
</Modal>

shared/components/submit-modal/submit-modal.tsx

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { Address } from 'viem';
2727
const getIconComponent = (step: SubmitStep) => {
2828
switch (step) {
2929
case SubmitStepEnum.success:
30+
case SubmitStepEnum.overview:
3031
return <Success fill="var(--lido-color-success)" />;
3132
case SubmitStepEnum.reject:
3233
return <Error />;
@@ -40,6 +41,7 @@ const getIconComponent = (step: SubmitStep) => {
4041
const getModalTitle = (step: SubmitStep) => {
4142
switch (step) {
4243
case SubmitStepEnum.success:
44+
case SubmitStepEnum.overview:
4345
return 'Transaction was finished successfully';
4446
case SubmitStepEnum.reject:
4547
return 'Wallet tx signature';
@@ -92,7 +94,7 @@ export const SubmitModal: FC<SubmitModalProps> = ({
9294
const subtitle = getModalSubTitle(step);
9395

9496
const handleNavigateToVault = () => {
95-
void router.push(`/${activeVault?.address}/${AppPaths.overview}`);
97+
void router.push(`/${activeVault?.address}${AppPaths.overview}`);
9698
};
9799

98100
const handleCloseModal = () => {
@@ -107,6 +109,12 @@ export const SubmitModal: FC<SubmitModalProps> = ({
107109
setModalState({ step: SubmitStepEnum.edit });
108110
};
109111

112+
const isShowTxLink =
113+
(SubmitStepEnum.success === step ||
114+
SubmitStepEnum.submitting === step ||
115+
SubmitStepEnum.overview === step) &&
116+
tx;
117+
110118
return (
111119
<Modal
112120
center
@@ -141,16 +149,14 @@ export const SubmitModal: FC<SubmitModalProps> = ({
141149
</Button>
142150
)}
143151

144-
{(SubmitStepEnum.success === step ||
145-
SubmitStepEnum.submitting === step) &&
146-
tx && <TxLinkEtherscan txHash={tx} />}
152+
{isShowTxLink && <TxLinkEtherscan txHash={tx} />}
147153

148154
{step === SubmitStepEnum.reject && (
149-
<ButtonLink onClick={retryFire}>retry</ButtonLink>
155+
<ButtonLink onClick={retryFire}>Retry</ButtonLink>
150156
)}
151157

152158
{step === SubmitStepEnum.error && (
153-
<ButtonLink onClick={handleCloseModal}>close</ButtonLink>
159+
<ButtonLink onClick={handleCloseModal}>Close</ButtonLink>
154160
)}
155161
</Content>
156162
</Modal>

0 commit comments

Comments
 (0)