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

Fix ac amount react page android #7411

Merged
merged 5 commits into from
Dec 12, 2020
Merged

Conversation

deeppandya
Copy link
Contributor

@deeppandya deeppandya commented Dec 11, 2020

Resolves brave/brave-browser#13148 brave/brave-browser#13150 brave/brave-browser#13158 brave/brave-browser#13160 brave/brave-browser#13161 brave/brave-browser#13166

Submitter Checklist:

  • There is a ticket for my issue.
  • Used Github auto-closing keywords in the commit message.
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed).
  • Requested a security/privacy review as needed.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@deeppandya deeppandya added CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS labels Dec 11, 2020
@deeppandya deeppandya added this to the 1.18.x - Release milestone Dec 11, 2020
@deeppandya deeppandya requested a review from a team as a code owner December 11, 2020 05:23
@deeppandya deeppandya requested a review from marshall December 11, 2020 05:23
@deeppandya deeppandya self-assigned this Dec 11, 2020
Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

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

++

Copy link
Collaborator

@zenparsing zenparsing left a comment

Choose a reason for hiding this comment

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

React app changes look good.

FIx debug error

Update NTP banner behaviour
Copy link
Contributor

@samartnik samartnik left a comment

Choose a reason for hiding this comment

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

lgtm

@deeppandya
Copy link
Contributor Author

Based on the conversation here : https://bravesoftware.slack.com/archives/C8ZJB9F9B/p1607744941053300 merging above PR.

@GeetaSarvadnya
Copy link

GeetaSarvadnya commented Dec 14, 2020

Issue 1: brave/brave-browser#13148
Verification passed on Samsung Galaxy J3 version 5.1.1 running Bravearm 1.20.26

  • Verified that AC budget is set correctly from onboarding settings
Setup AC budget in the Onboarding flow AC budget in brave rewards
image image

Issue 2: brave/brave-browser#13150
Verification passed on Samsung Galaxy J3 version 5.1.1 running Bravearm 1.20.26

  • Verified that there is no crash after claiming UGP grants
UGP Claim after claiming UGP
image image

Issue 3: brave/brave-browser#13158
Verification passed on Samsung Galaxy J3 version 5.1.1 running Bravearm 1.20.26

  • Verified that payout date is the same everywhere in the onboarding flow
payout date in slide A payout date in slide B
image image

Issue 4: brave/brave-browser#13160
Verification passed on Samsung Galaxy J3 version 5.1.1 running Bravearm 1.20.26
Note: (Opt-in REwards via NTP SI is not tested as bg images are not supported in the low-end device, @deeppandya helped in testing the NTP-SI rewards opt-in scenarios)

  • Verified the below scenarios all the scenarios are working as expected
  1. Launch brave>Tap on BAT logo>close the main modal by tapping on x icon >again tap on x icon in small modal I'm In! popup >remove the app from memory and set the system date to 4 days ahead>Relaunch brave -----> when brave is relaunched, rewards panel with main onboarding modal is not launched automatically, tap on BR panel shows I'm In! modal popup
  2. Launch brave>Tap on BAT logo>Tap on Start Brave rewards and skip the onboarding flow>Remove app from memory>Set system date 4 days ahead>Relaunch brave----->when brave is relaunched, rewards panel with main onboarding modal is not launched automatically.
  3. Launch brave>Tap on BAT logo>close the main modal by tapping on x icon >again tap on x icon in small modal I'm In! popup >remove the app from memory and set the system date to 1 day ahead>Relaunch brave>Tap on BR panel and interact with rewards by clicking on I'm In! modal>close brave and remove the app from memory>set system date ahead to 3 days>Relaunch app on 4th day----> Tap on BR panel should not show onboarding modal as the user has already interacted with rewards on 2nd day

Issue 5: brave/brave-browser#13166
Verification passed on Samsung Galaxy J3 version 5.1.1 running Bravearm 1.20.26
Verified the STR from brave/brave-browser#13166 (comment)

  • Installed 1.17.x nightly and upgraded to 1.20.26 nightly without enabling rewards in 1.17.x ensured that onboarding modal is not shown on brave://rewards and BR panel
  • Installed 1.18.x nightly and upgraded to 1.20.26 nightly without enabling rewards in 1.18.x ensured that onboarding modal is not shown on brave://rewards and BR panel
  • Installed 1.19.x nightly and upgraded to 1.20.26 nightly without enabling rewards in 1.19.x ensured that onboarding modal is not shown on brave://rewards and BR panel
  • Installed 1.18.x nightly and upgraded to 1.20.26 nightly without enabling rewards in 1.18.x. Opened a bunch of NTP's in 1.20.x and ensured there is no opt-in Brave rewards banner in NTP SI ( verified this particular scenario on Samsung Tab)

Issue 6: brave/brave-browser#13161
Verification passed on Samsung Tab version 10 running Bravemonoarm64.apk 1.20.26

Clean profile scenarios

  1. Verified that, If the user has not interacted with Brave Rewards, then tap on NTP SI rewards banner is opens up the onboarding modal, close the main onboarding modal and small I'm In! modal by clicking on x icons and open a new NTP and navigate back to already opened NTP SI tab is NOT showing up any opt-in rewards links in the NTP SI tab (as expected)

  2. Verified that the user is NOT presented with an opt-in Brave rewards banner in NTP SI, If the user has already seen onboarding (via BR panel or Brave Rewards hamburger menu).

  3. Verified that the user is NOT presented with an opt-in Brave rewards banner in NTP SI, If the user has already seen onboarding (via BR panel or Brave Rewards hamburger menu) and hasn't enabled Ads.

  4. Verified that the user is NOT presented with an opt-in Brave rewards banner in NTP SI, If the user has already seen onboarding (via BR panel or Brave Rewards hamburger menu) and hasn't enabled AC.

  5. Verified that the user is presented with the Brave Rewards instructional page for viewing the SI, when onboarding flow is dismissed via BR panel by tapping on x on main onboarding modal and x on smaller I'm IN! modal popup and Ads has been enabled.

Upgrade scenario:

  1. Installed 1.18.x nightly and upgraded to 1.20.26 nightly without enabling rewards in 1.18.x. Opened a bunch of NTP's in 1.20.x and ensured there is no opt-in Brave rewards banner in NTP SI (onboarding flow should not be shown in upgraded profile from any of the entry points BR panel/Brave Rewards hamburger menu/ NTP SI confirmed with @deeppandya)

  2. Installed 1.18.x nightly and enabled rewards and upgraded profile to 1.20.26 and ensured that onboarding flow isn't shown in BR panel or brave://rewards page. Also ensured that there is no opt-in Brave rewards banner in NTP SI instead it shows Brave Rewards instructional page for viewing the SI.
    image

  3. Installed 1.18.x nightly, enable rewards and disable Ads, upgrade profile to 1.20.26and ensured that onboarding flow isn't shown in BR panel or brave://rewards page. Also ensured that there is no opt-in Brave rewards banner in NTP SI.

  4. Installed 1.18.x nightly, enable rewards and disable AC, upgrade profile to 1.20.26and ensured that onboarding flow isn't shown in BR panel or brave://rewards page. Also ensured that there is no opt-in Brave rewards banner in NTP SI.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Android] AC budget not set correctly from onboarding settings slide
5 participants