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

Show estimated duration for new transactions #697

Merged
merged 21 commits into from
Aug 21, 2024
Merged

Conversation

kkosiorowska
Copy link
Contributor

@kkosiorowska kkosiorowska commented Aug 9, 2024

Closes #684

This PR adds the estimated duration for new transactions. All transactions will be displayed in the history table. However, notifications will only show completed ones and the list of activity notifications will be shown at the top.

What has been done:

  • Displayed the estimated duration in the staking and unstaking tiles.
  • Implemented the UI changes in the middle column components (pending transactions, position, transactions history).
  • Fixed activity sorting in the history table. - 362c27e
  • Added custom styles for a symbol in the CurrencyBalance component. -32fe952
  • Added additional dots for the CurrencyBalance component. - d62c97d

During the implementation of the UI changes for the middle column, the padding was changed. This change also affected the pagination buttons for the activity table. These components should be separate and should not affect each other. In addition, it was noted that when we add some new element under the PaginationPage or Pagination tag, the list of activities will overlap it when we switch pages. For this purpose, the PaginationFooter component was created as a temporary solution. We should resolve this in a separate PR. Created an issue - #705

UI

Screenshot 2024-08-14 at 12 13 43 Screenshot 2024-08-14 at 13 51 24

Testing

Make sure we display the correct estimated duration:

  • Staking
  • < 0.1 BTC ~1 hour
  • >= 0.1 BTC < 1 BTC ~2 hours
  • >= 1 BTC ~3 hours
  • Unstaking
  • We display 6 hours, regardless of the amount.

- show only the latest completed activities
- show notifications top of the card
@kkosiorowska kkosiorowska added the 🎨 dApp dApp label Aug 9, 2024
@kkosiorowska kkosiorowska self-assigned this Aug 9, 2024
Copy link

netlify bot commented Aug 9, 2024

Deploy Preview for acre-dapp-testnet ready!

Name Link
🔨 Latest commit e5cd707
🔍 Latest deploy log https://app.netlify.com/sites/acre-dapp-testnet/deploys/66c5ddf0cc355e0008cd1e3b
😎 Deploy Preview https://deploy-preview-697--acre-dapp-testnet.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

netlify bot commented Aug 9, 2024

Deploy Preview for acre-dapp ready!

Name Link
🔨 Latest commit e5cd707
🔍 Latest deploy log https://app.netlify.com/sites/acre-dapp/deploys/66c5ddf0b0e2a0000891f668
😎 Deploy Preview https://deploy-preview-697--acre-dapp.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@kkosiorowska kkosiorowska marked this pull request as ready for review August 16, 2024 07:45
dapp/src/utils/activities.ts Outdated Show resolved Hide resolved
pt={6}
bgGradient="linear(to-b, transparent, gold.200 20%)"
zIndex={2}
// TODO: Temporary solution - Animation should be fixed in such a way
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you give an example of the issue or elaborate some more? I don't understand the issue to be honest.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You can find more details in #705. There is an example video of issue.

Copy link
Contributor

Choose a reason for hiding this comment

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

Conceptually this component was supposed to be headless to make composition easier, hence the need to add styles separately is reasonable.
But leaving that aside, the animation bug is there and needs to be addressed sooner or later.

Co-authored-by: Jakub Nowakowski <[email protected]>
Copy link
Contributor

@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.

LGTM

@kpyszkowski kpyszkowski enabled auto-merge August 21, 2024 12:30
@kpyszkowski kpyszkowski merged commit 6815f2f into main Aug 21, 2024
27 of 28 checks passed
@kpyszkowski kpyszkowski deleted the estimated-duration branch August 21, 2024 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show estimated duration in pending Staking/Unstaking tiles
3 participants