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 login uphold android #8645

Merged
merged 5 commits into from
Apr 28, 2021
Merged

Add login uphold android #8645

merged 5 commits into from
Apr 28, 2021

Conversation

deeppandya
Copy link
Contributor

Resolves brave/brave-browser#13220
Resolves brave/brave-browser#15196

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • 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)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • 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 this to the 1.25.x - Nightly milestone Apr 26, 2021
@deeppandya deeppandya self-assigned this Apr 26, 2021
samartnik
samartnik approved these changes Apr 26, 2021
View reviewed changes
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

@SergeyZhukovsky
Copy link
Member

++

tmancey
tmancey approved these changes Apr 27, 2021
View reviewed changes
Copy link
Collaborator

@tmancey tmancey left a comment

Choose a reason for hiding this comment

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

LGTM

@zenparsing zenparsing requested a review from emerick April 27, 2021 15:10
@deeppandya deeppandya requested review from zenparsing and removed request for emerick April 27, 2021 15:11
tmancey
tmancey reviewed Apr 27, 2021
View reviewed changes
components/brave_rewards/browser/rewards_service.h Outdated
@@ -312,6 +312,8 @@ class RewardsService : public KeyedService {

virtual void GetExternalWallet(GetExternalWalletCallback callback) = 0;

virtual std::string GetExternalWalletType() const = 0;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need to make this public as calling GetExternalWallet returns the type in the data structure

@deeppandya deeppandya added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Apr 27, 2021
@deeppandya deeppandya requested a review from a team as a code owner April 27, 2021 18:18
@deeppandya deeppandya requested a review from jumde April 27, 2021 18:18
tmancey
tmancey reviewed Apr 27, 2021
View reviewed changes
components/brave_rewards/browser/rewards_service_impl.h Outdated
@@ -374,6 +372,8 @@ class RewardsServiceImpl : public RewardsService,

void EnableGreaseLion();

std::string GetExternalWalletType() const;
Copy link
Collaborator

Choose a reason for hiding this comment

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

not needed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tmancey it was already added as private function.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i just reverted the change to keep as it was before.

zenparsing
zenparsing reviewed Apr 27, 2021
View reviewed changes
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.

CC changes look good. Be sure to squash down the commits where you add/revert changes to rewards service code.

@deeppandya deeppandya merged commit 14f4927 into master Apr 28, 2021
@deeppandya deeppandya deleted the add_login_uphold_android branch April 28, 2021 01:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmancey tmancey tmancey approved these changes

@samartnik samartnik samartnik approved these changes

@SergeyZhukovsky SergeyZhukovsky SergeyZhukovsky approved these changes

@zenparsing zenparsing zenparsing approved these changes

@jumde jumde Awaiting requested review from jumde

Assignees

@deeppandya deeppandya

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
Milestone
1.25.x - Release
5 participants
@deeppandya @SergeyZhukovsky @tmancey @zenparsing @samartnik