This repository has been archived by the owner on May 10, 2024. It is now read-only.
Fix #2378: iOS DB Migration & Rebase to brave-core master #2389
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
kylehickinson
force-pushed
the
ios-db-migration
branch
from
8cba0f8
to
a39df1a
Compare
iccub
added
the
blocked
iccub
suggested changes
Mar 5, 2020
| @@ -93,7 +94,10 @@ extension RewardsSummaryProtocol { | |||
| }) | |||
| } | |||
|
|
|||
| let reservedAmount = BATValue(state.ledger.reservedAmount) | |||
| state.ledger.pendingContributionsTotal { amount in | |||
|
|
|||
There was a problem hiding this comment.
Whoops, left this in here when I moved the logic for getting it out (now passed in the arg since its async)
I'll delete it :)
| self.rewardsSummaryView.disclaimerView = WalletDisclaimerView().then { | ||
| $0.labels = labels | ||
| $0.labels.forEach { | ||
| $0.onLinkedTapped = { [weak self] link in |
There was a problem hiding this comment.
this $0 refers to labels or to WalletDisclaimerView? idk, maybe name one of the params to avoid confusion
| @@ -78,7 +78,7 @@ final class AutoContributeExclusionListController: UIViewController { | |||
| } | |||
|
|
|||
| @objc private func tappedRestoreAll(_ sender: UIBarButtonItem) { | |||
| let numberOfExcludedSites = state.ledger.numberOfExcludedPublishers | |||
| let numberOfExcludedSites = publishers.count | |||
There was a problem hiding this comment.
not sure about naming but shouldn't this be some kind of excluded publishers count?
There was a problem hiding this comment.
We are in a controller which only shows excluded publishers, so any publisher in here is already excluded
kylehickinson
force-pushed
the
ios-db-migration
branch
from
a39df1a
to
6bd8878
Compare
kylehickinson
removed
the
blocked
iccub
approved these changes
Mar 5, 2020
Brandon-T
approved these changes
Mar 9, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary of Changes
This pull request fixes #2378
By moving BraveRewards framework build up to brave-core/master this issue also fixes #2200
Submitter Checklist:
NSLocalizableString()Test Plan:
Screenshots:
iOS 12 Failure Screenshots
iOS 13 Failure Screenshots
Reviewer Checklist:
QA/(Yes|No)release-notes/(include|exclude)bug/enhancement