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

UI: Make Deposit step #21

Merged
merged 27 commits into from
Feb 19, 2024
Merged

UI: Make Deposit step #21

merged 27 commits into from
Feb 19, 2024

Conversation

kpyszkowski
Copy link
Contributor

@kpyszkowski kpyszkowski commented Jan 8, 2024

Ref: #4
Depends on: #12

This pull request introduces redesigned Make Deposit minting flow step.

image

Additional changes:

  • GenerateNewDepositAddress modal redesign:
    localhost_3000_tBTC_mint

Note: Changes currently doesn't fulfill designs requirements completely. It requires additional finetunes after #20 is merged - can be done with separate PR

This commit is cherry picked from the `ui/initiate-minting-step` branch for
consistency between changes.

Moved ModalHeader rendering to higher order component with additional
label parameter. Restyled Spinner component. Added onError callback when
deposit transaction is failed with storing error data (entry point for
Toast component rendering).
`Toast` component will be introduced with `ui/initiate-minting-step`
branch. It's reverted from this branch.

This reverts commit b14b805.
Copy link
Contributor

@michalsmiarowski michalsmiarowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments to look at before the merge

src/components/MintDurationTiers/MintDurationTiers.tsx Outdated Show resolved Hide resolved
</BodyMd>
</VStack>
<Flex as={Badge} align="center">
{/* TODO: Adjust styles when Badge changes are merged. */}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you tell me in wchich PR the Badge changes are addressed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it's LabeledBadge introduced in this PR.
I will complete this TODO in separate PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I will leave this conversation open then

src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Outdated Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Show resolved Hide resolved
src/components/CopyToClipboard/index.tsx Show resolved Hide resolved
src/components/Modal/withBaseModal.tsx Outdated Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Outdated Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Show resolved Hide resolved
Copy link
Contributor Author

@kpyszkowski kpyszkowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed review comments

src/components/CopyToClipboard/index.tsx Show resolved Hide resolved
src/components/MintDurationTiers/MintDurationTiers.tsx Outdated Show resolved Hide resolved
</BodyMd>
</VStack>
<Flex as={Badge} align="center">
{/* TODO: Adjust styles when Badge changes are merged. */}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it's LabeledBadge introduced in this PR.
I will complete this TODO in separate PR.

src/components/Modal/withBaseModal.tsx Outdated Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Outdated Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Outdated Show resolved Hide resolved
Copy link
Contributor

@michalsmiarowski michalsmiarowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left two small comments.

Overall looking good 🔥

src/components/CopyToClipboard/index.tsx Show resolved Hide resolved
src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Outdated Show resolved Hide resolved
Copy link
Contributor

@michalsmiarowski michalsmiarowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two additional comments:

src/pages/tBTC/Bridge/Minting/MakeDeposit.tsx Outdated Show resolved Hide resolved
Copy link
Contributor

@michalsmiarowski michalsmiarowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🔥

@michalsmiarowski michalsmiarowski merged commit 30ad747 into main Feb 19, 2024
3 checks passed
@michalsmiarowski michalsmiarowski deleted the ui/make-deposit-step branch February 19, 2024 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants