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

[DDW-569] Move ITN redemption to Daedalus application menu #2401

Conversation

topseniors
Copy link
Contributor

@topseniors topseniors commented Feb 24, 2021

This PR moved ITN redemption to Daedalus application menu
Jira Ticket

Todos

  • Move ITN redemption to Daedalus application menu

Test Cases

Scenario 1 - Validate "Redeem ITN rewards" option is visible on the menu

Given that Daedalus is synced
When I access to the menu "Daedalus"
Then I can see the option "Redeem ITN rewards" is displayed 

Scenario 2 - Access to "Redeem ITN rewards" screen

Given that Daedalus is synced
When I access to "Daedalus" - "Redeem ITN rewards"
Then I can see the "Redeem ITN rewards" screen is displyed

Testing Checklist

App

  • Click on menu item Daedalus => Redeem ITN rewards and make sure ITN redemption dialog is shown.

Screenshots

English

image

Japanese

image

Test Cases

Scenario 1 - Button greyed out and inactive before I accept terms and conditions
Given that I have Daedalus installed
And I launch Daedalus
When I am yet to agree to the Terms and Conditions
Then the Daedalus menu item for its rewards is greyed out and not active

Scenario 2 - Button active after I accept terms and conditions
Given that I launched Daedalus 
And I have accepted the Terms and Conditions
When I open the Daedalus menu items
Then I see that the button is active
And when I click on it I get brought to the itn rewards redemption screen

Review Checklist

Basics

  • PR has been assigned and has appropriate labels (feature/bug/chore, release-x.x.x)
  • PR is updated to the most recent version of the target branch (and there are no conflicts)
  • PR has a good description that summarizes all changes and shows some screenshots or animated GIFs of important UI changes
  • CHANGELOG entry has been added to the top of the appropriate section (Features, Fixes, Chores) and is linked to the correct PR on GitHub
  • Automated tests: All acceptance and unit tests are passing (yarn test)
  • Manual tests (minimum tests should cover newly added feature/fix): App works correctly in development build (yarn dev)
  • Manual tests (minimum tests should cover newly added feature/fix): App works correctly in production build (yarn package / CI builds)
  • There are no flow errors or warnings (yarn flow:test)
  • There are no lint errors or warnings (yarn lint)
  • There are no prettier errors or warnings (yarn prettier:check)
  • There are no missing translations (running yarn manage:translations produces no changes)
  • Text changes are proofread and approved (Jane Wild / Amy Reeve)
  • Japanese text changes are proofread and approved (Junko Oda)
  • UI changes look good in all themes (Alexander Rukin)
  • Storybook works and no stories are broken (yarn storybook)
  • In case of dependency changes yarn.lock file is updated

Code Quality

  • Important parts of the code are properly commented and documented
  • Code is properly typed with flow
  • React components are split-up enough to avoid unnecessary re-renderings
  • Any code that only works in main process is neatly separated from components

Testing

  • New feature/change is covered by acceptance tests
  • New feature/change is manually tested and approved by QA team
  • All existing acceptance tests are still up-to-date
  • New feature/change is covered by Daedalus Testing scenario
  • All existing Daedalus Testing scenarios are still up-to-date

After Review

  • Merge the PR
  • Delete the source branch
  • Move the ticket to done column on the YouTrack board
  • Update Slack QA thread by marking it with a green checkmark

@ManusMcCole
Copy link

Hi @yakovkaravelov. Tested on build Mainnet 16676. Functionality works well although I found if the user changes the language to Japanese the button reverts back to being greyed out and inactive. See video. If Daedalus is closed and reopened the button is active again

@nikolaglumac
Copy link
Contributor

Hi @yakovkaravelov. Tested on build Mainnet 16676. Functionality works well although I found if the user changes the language to Japanese the button reverts back to being greyed out and inactive. See video. If Daedalus is closed and reopened the button is active again

Good catch @ManusMcCole! This is obviously a bug that most likely affects develop and production builds too.
It affects ALL the links as far as I can see...
@yakovkaravelov please fix this 🙏

@nikolaglumac
Copy link
Contributor

@yakovkaravelov please merge latest develop.

@topseniors
Copy link
Contributor Author

topseniors commented Feb 26, 2021

Hi @yakovkaravelov. Tested on build Mainnet 16676. Functionality works well although I found if the user changes the language to Japanese the button reverts back to being greyed out and inactive. See video. If Daedalus is closed and reopened the button is active again

Good catch @ManusMcCole! This is obviously a bug that most likely affects develop and production builds too.
It affects ALL the links as far as I can see...
@yakovkaravelov please fix this 🙏

This bug was not introduced by this PR actually. It is already existing in develop branch as well, anyway, will fix it.
CC @nikolaglumac @ManusMcCole

@nikolaglumac
Copy link
Contributor

@yakovkaravelov please fix it regardless of it's origin.

@topseniors
Copy link
Contributor Author

@tomislavhoracek @nikolaglumac @daniloprates @miorsufianiohk @ManusMcCole Please review/test, thanks.

@topseniors topseniors removed the WIP label Feb 26, 2021
Copy link
Contributor

@tomislavhoracek tomislavhoracek left a comment

Choose a reason for hiding this comment

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

@yakovkaravelov I left one comment. Can you please take a look?
And one more question. Why you removed isUpdateAvailable checks?

CHANGELOG.md Outdated Show resolved Hide resolved
Copy link

@ManusMcCole ManusMcCole left a comment

Choose a reason for hiding this comment

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

Looks good @yakovkaravelov

Copy link

@miorsufianiohk miorsufianiohk left a comment

Choose a reason for hiding this comment

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

Looks good to me. Tested on 16833. Good job @yakovkaravelov 👍

@darko-mijic
Copy link
Contributor

Reviewing this now

@darko-mijic darko-mijic self-requested a review February 26, 2021 15:06
Copy link

@gabriela-ponce gabriela-ponce left a comment

Choose a reason for hiding this comment

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

@yakovkaravelov The screen can be accessed while Daedalus is loading and it looks like it hasn't any wallet. It changes after the loading is complete, but I think it looks odd. Can this be improved? For reference, the settings and wallet settings screens can't be accessed in that state.

@nikolaglumac
Copy link
Contributor

@yakovkaravelov The screen can be accessed while Daedalus is loading and it looks like it hasn't any wallet. It changes after the loading is complete, but I think it looks odd. Can this be improved? For reference, the settings and wallet settings screens can't be accessed in that state.

Good point @gabriela-ponce - I have modified the logic so that we show the "syncing" status message instead of no-wallets in case Daedalus is not fully synced.

Screenshot 2021-02-27 at 14 50 11

Copy link
Contributor

@nikolaglumac nikolaglumac left a comment

Choose a reason for hiding this comment

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

Looks good!

@nikolaglumac nikolaglumac merged commit d884d45 into develop Feb 27, 2021
@iohk-bors iohk-bors bot deleted the chore/ddw-569-move-itn-redemption-to-daedalus-application-menu branch February 27, 2021 13:53
@nikolaglumac nikolaglumac added release-4.0.0-RC1 Daedalus Testnet release-4.0.0-FC1 Daedalus Flight release-4.0.0 Daedalus Mainnet and removed ⏳release-vNext labels Feb 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore release-4.0.0-FC1 Daedalus Flight release-4.0.0-RC1 Daedalus Testnet release-4.0.0 Daedalus Mainnet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants