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.

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

Jump to bottom

Add rewards today tooltip #150

Merged
merged 6 commits into from
Jun 3, 2024
Merged

Add rewards today tooltip #150

merged 6 commits into from
Jun 3, 2024

Conversation

Tanya-atatakai
Copy link
Collaborator

@Tanya-atatakai Tanya-atatakai commented May 28, 2024 •
edited
Loading

what's changed:

  1. "Staking Rewards Today" changed to "Staking Rewards This Work Period," with a tooltip providing further explanation.
  2. The staked amount block removed.
  3. A breakdown of the balance added.
  4. The "Start agent" button now has the "& stake" postfix, If it is the agent's first run. After first run the modal is shown and notification text is updated
Full view Rewards tooltip Balance breakdown b/ staking After staking Modal
image Screenshot 2024-06-03 at 10 05 58 Screenshot 2024-06-03 at 10 06 04 Screenshot 2024-06-03 at 10 37 22 image

@Tanya-atatakai Tanya-atatakai changed the title Add rewards today tooltip [WIP] Add rewards today tooltip May 28, 2024
Tanya-atatakai
Tanya-atatakai commented Jun 3, 2024
View reviewed changes
frontend/components/Main/MainOlasBalance.tsx
},
{
title: 'Unclaimed rewards',
value: balanceFormat(accruedServiceStakingRewards ?? 0, 2),
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

hope this is the correct value for "Unclaimed rewards"

Copy link
Collaborator

Choose a reason for hiding this comment

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

yeah it is, these are the rewards in contract that have not yet been claimed

@Tanya-atatakai Tanya-atatakai marked this pull request as ready for review June 3, 2024 07:11
oaksprout
oaksprout approved these changes Jun 3, 2024
View reviewed changes
Copy link
Collaborator

@oaksprout oaksprout left a comment

Choose a reason for hiding this comment

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

lgtm. Would be good if Josh reviews the balance calculation logic carefully, if that code is not simple.

mohandast52
mohandast52 approved these changes Jun 3, 2024
View reviewed changes
frontend/components/Main/MainHeader.tsx Outdated Show resolved Hide resolved
frontend/components/Main/MainOlasBalance.tsx Outdated Show resolved Hide resolved
frontend/components/Main/MainOlasBalance.tsx Outdated Show resolved Hide resolved
frontend/components/Main/MainOlasBalance.tsx Outdated Show resolved Hide resolved
frontend/components/Main/MainOlasBalance.tsx Show resolved Hide resolved
electron/main.js Show resolved Hide resolved
@Tanya-atatakai Tanya-atatakai changed the title [WIP] Add rewards today tooltip Add rewards today tooltip Jun 3, 2024
@Tanya-atatakai Tanya-atatakai merged commit c588be8 into main Jun 3, 2024
2 of 4 checks passed
@Tanya-atatakai Tanya-atatakai deleted the tanya/rewards-today branch June 3, 2024 13:57
truemiller added a commit that referenced this pull request Jun 12, 2024
@truemiller
Add rewards today tooltip (#150)
3adfab8 
Release demo, bumping versions and releasing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mohandast52 mohandast52 mohandast52 approved these changes

@truemiller truemiller truemiller approved these changes

@oaksprout oaksprout oaksprout approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Tanya-atatakai @mohandast52 @truemiller @oaksprout