Fix UI issues when migrating from rewards JSON to prefs #6057
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zenparsing
force-pushed
the
ksmith-rewards-state-fixes
branch
from
23fea15 to
da78793
Compare
zenparsing
force-pushed
the
ksmith-rewards-state-fixes
branch
from
da78793 to
a644af4
Compare
zenparsing
commented
Jul 10, 2020
| @@ -88,8 +88,11 @@ class SettingsPage extends React.Component<Props, State> { | |||
| componentDidUpdate (prevProps: Props, prevState: State) { | |||
| if ( | |||
| this.props.rewardsData.enabledMain && | |||
| prevProps.rewardsData.initializing && | |||
| !this.props.rewardsData.initializing | |||
| ( | |||
There was a problem hiding this comment.
This change fixes an edge case where startRewards is not called if initializing is not transitioning from true to false.
zenparsing
commented
Jul 10, 2020
| @@ -76,7 +76,7 @@ interface BatLedger { | |||
| OnTimer(uint32 timer_id); | |||
|
|
|||
| GetBalanceReport(ledger.mojom.ActivityMonth month, int32 year) => | |||
| (ledger.mojom.Result result, ledger.mojom.BalanceReportInfo report); | |||
| (ledger.mojom.Result result, ledger.mojom.BalanceReportInfo? report); | |||
There was a problem hiding this comment.
This change fixes a debug crash which occurs GetBalanceReport is called and an error condition is encountered.
zenparsing
commented
Jul 10, 2020
| @@ -298,7 +298,7 @@ | |||
| "@types/storybook__react": "^4.0.2", | |||
| "acorn": "^7.1.1", | |||
| "babel-loader": "^8.1.0", | |||
| "brave-ui": "github:brave/brave-ui#303a9d6424950a31836902f9bf2c03a0c174efda", | |||
| "brave-ui": "github:brave/brave-ui#36f3cd135399060641123136feb8253e53d68499", | |||
There was a problem hiding this comment.
This version bump fixes an issue with the Select component.
zenparsing
commented
Jul 10, 2020
| @@ -45,6 +45,11 @@ void Balance::Fetch(ledger::FetchBalanceCallback callback) { | |||
| } | |||
|
|
|||
| std::string payment_id = ledger_->GetPaymentId(); | |||
| if (payment_id.empty()) { | |||
There was a problem hiding this comment.
This changes fixes an issue where the wallet endpoint can be requested with an empty payment ID path component.
zenparsing
commented
Jul 10, 2020
| @@ -68,7 +68,12 @@ export const rewardsPanelReducer: Reducer<RewardsExtension.State | undefined> = | |||
| }) | |||
| } else if (result === RewardsExtension.Result.WALLET_CORRUPT) { | |||
| state.walletCorrupted = true | |||
| } else if (result !== RewardsExtension.Result.LEDGER_OK) { | |||
| } else if (result === RewardsExtension.Result.LEDGER_OK) { | |||
There was a problem hiding this comment.
This change fixes an issue where the panel will display the welcome UI after a migration, even when rewards is enabled.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves brave/brave-browser#10717
Submitter Checklist:
npm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
Reviewer Checklist:
After-merge Checklist:
changes has landed on.