Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Fix #7947, #7944, #7948, #7946: Portfolio Fixes #7950

Merged
merged 4 commits into from
Aug 24, 2023

Conversation

StephenHeaps
Copy link
Contributor

Summary of Changes

  • Filter out Filecoin accounts when fetching All Accounts for Portfolio & NFT tabs. Filecoin accounts can exist when restoring a wallet with FIL balance.
  • Fix Hide Unowned and Show Network Logo toggles not resetting when Reset tapped in NFT tab's Filters & Display Settings
  • Disable Reset button in Filters & Display Settings when showing default values
  • Remove animations & fix truncation on Picker label for Sort Order and other pickers.

This pull request...
fixes #7947
fixes #7948
fixes #7944
fixes #7946

Submitter Checklist:

  • Unit Tests are updated to cover new or changed functionality
  • User-facing strings use NSLocalizableString()
  • New or updated UI has been tested across:
    • Light & dark mode
    • Different size classes (iPhone, landscape, iPad)
    • Different dynamic type sizes

Test Plan:

Filecoin Account groups displayed when grouping Portfolio by Accounts

  1. Restore a wallet with a Filecoin balance
  2. Open Filters & Display Settings and change Group By to Accounts
  3. Tap Save Changes
  4. Scroll through Portfolio to verify no Filecoin account groups are shown.
Filecoin.Accounts.hidden.mp4

NFT Filters Reset button does not reset some filters

  1. Open NFT tab and tap Filters & Display Settings button
  2. Change Hide Unowned toggle to on/enabled, change Show Network Logo to on/enabled
  3. Tap Reset
  4. Verify both Hide Unowned & Show Network Logo are reset to off/disabled
NFT.Filter.Reset.mp4

Disable Reset button if there are no changes done to portfolio settings

  1. Open Portfolio and tap Filters & Display Settings button
  2. If Reset is not disabled, tap it to reset to default filters.
  3. Verify Reset button is disabled.
  4. Change some filters, ex de-select 1 account, or de-select 1 network, enable/disable toggles
  5. Verify Reset is not disabled when not showing default filter selections.
Reset.Disabled.mp4

Portfolio setting dropdown text doesn't have a smooth transition when changing

  1. Open Portfolio tap Filters & Display Settings button
  2. Change any filter / setting in a dropdown
  3. Verify text showing selection updates immediately
  4. Update Sort Assets toA to Z
  5. Click on Reset
  6. Drop down text only shows Hig... instead of High to Low
Truncated.Picker.Label.mp4

Reviewer Checklist:

  • Issues include necessary QA labels:
    • QA/(Yes|No)
    • bug / enhancement
  • Necessary security reviews have taken place.
  • Adequate unit test coverage exists to prevent regressions.
  • Adequate test plan exists for QA to validate (if applicable).
  • Issue and pull request is assigned to a milestone (should happen at merge time).

@StephenHeaps StephenHeaps added this to the 1.57 milestone Aug 24, 2023
@StephenHeaps StephenHeaps requested a review from nuo-xu August 24, 2023 17:22
@StephenHeaps StephenHeaps self-assigned this Aug 24, 2023
@StephenHeaps StephenHeaps requested a review from a team as a code owner August 24, 2023 17:22
@StephenHeaps StephenHeaps merged commit 98c7464 into development Aug 24, 2023
@StephenHeaps StephenHeaps deleted the wallet/portfolio-fixes branch August 24, 2023 20:49
StephenHeaps added a commit that referenced this pull request Aug 24, 2023
* Hide/Remove Filecoin accounts from Portfolio & NFT filters until they are supported.

* Fix `Network Logo` and `Hide Unowned` NFT Filters & Display Settings toggles not resetting to defaults when `Reset` tapped

* Disable `Reset` button on Filters & Display Settings when filters are showing defaults.

* Fix Filters & Display Settings Picker text truncated, janky animation when switching selection.
arthuredelstein pushed a commit to brave/brave-core that referenced this pull request Feb 13, 2024
…rave/brave-ios#7946: Portfolio Fixes (brave/brave-ios#7950)

* Hide/Remove Filecoin accounts from Portfolio & NFT filters until they are supported.

* Fix `Network Logo` and `Hide Unowned` NFT Filters & Display Settings toggles not resetting to defaults when `Reset` tapped

* Disable `Reset` button on Filters & Display Settings when filters are showing defaults.

* Fix Filters & Display Settings Picker text truncated, janky animation when switching selection.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.