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

feat: Token Network Filter UI [Mobile] #11808

Merged
merged 145 commits into from
Nov 12, 2024
Merged

feat: Token Network Filter UI [Mobile] #11808

merged 145 commits into from
Nov 12, 2024
+390 −43

Commits on Sep 27, 2024

  1. feat: Add sortAssets utility function

    @gambinish
    gambinish committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    0248c74 View commit details
    Browse the repository at this point in the history

  2. chore: Breakup monolithic Tokens/index.tsx into smaller components

    @gambinish
    gambinish committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    6a2e8c7 View commit details
    Browse the repository at this point in the history

  3. fix: Correctly handle null check for buyable footer button

    @gambinish
    gambinish committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    7a78717 View commit details
    Browse the repository at this point in the history

  4. fix: Tweak boolean logic for rendering footer components

    @gambinish
    gambinish committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    57295ee View commit details
    Browse the repository at this point in the history

  5. chore: Update snapshot

    @gambinish
    gambinish committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    d00354f View commit details
    Browse the repository at this point in the history

  6. chore: Type out tokens as TokenI[]

    @gambinish
    gambinish committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    be87f81 View commit details
    Browse the repository at this point in the history

  7. chore: Remove unecessary comments around import statements in Networt… 

    …h component
    @gambinish
    gambinish committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    68c7b2e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into chore/componetize-tokens-screen

    @gambinish
    gambinish authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    a02e139 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into chore/componetize-tokens-screen

    @gambinish
    gambinish authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    de5bbed View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into chore/componetize-tokens-screen

    @gambinish
    gambinish authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    0fd9ad5 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. chore: Add unit tests to utility file, provide exports from index file

    @gambinish
    gambinish committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    032618c View commit details
    Browse the repository at this point in the history

  2. chore: Rename handleBalance to me more descriptive of what its logic … 

    …is handling
    @gambinish
    gambinish committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    a58f1ba View commit details
    Browse the repository at this point in the history

  3. chore: rename Networth to PortfolioBalance for clarity

    @gambinish
    gambinish committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    1dd31e3 View commit details
    Browse the repository at this point in the history

  4. chore: Cleanup styles extra whitespace

    @gambinish
    gambinish committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    16ded6a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into chore/componetize-tokens-screen

    @gambinish
    gambinish authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    52d3d85 View commit details
    Browse the repository at this point in the history

  6. fix: Update snapshot tests

    @gambinish
    gambinish committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    dd3ffdf View commit details
    Browse the repository at this point in the history

  7. Merge branch 'chore/componetize-tokens-screen' of github.com:MetaMask… 

    …/metamask-mobile into chore/componetize-tokens-screen
    @gambinish
    gambinish committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    da640bc View commit details
    Browse the repository at this point in the history

  8. fix: Remove unused component

    @gambinish
    gambinish committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    ebcbcf6 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into chore/componetize-tokens-screen

    @gambinish
    gambinish authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    31fad19 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. chore: Move PotfolioBalance above TabView

    @gambinish
    gambinish committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    4a8d927 View commit details
    Browse the repository at this point in the history

  2. fix: Wrap PortfolioBalance and ScrollableView in fragment for token r… 

    …endering
    @gambinish
    gambinish committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    a7b4c17 View commit details
    Browse the repository at this point in the history

  3. fix: Padding tweak below tab bar for consistency of token list

    @gambinish
    gambinish committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    658fcf6 View commit details
    Browse the repository at this point in the history

  4. fix: Reorganize test suite for PortfolioBalance

    @gambinish
    gambinish committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    18035d4 View commit details
    Browse the repository at this point in the history

  5. fix: Revert changes to wallet test

    @gambinish
    gambinish committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    c570c2c View commit details
    Browse the repository at this point in the history

  6. fix: Update fiatBalance text style to DisplayMD

    @gambinish
    gambinish committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    a97128b View commit details
    Browse the repository at this point in the history

  7. chore: Patch PreferencesController with tokenSortConfig

    @gambinish
    gambinish committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    8036a0a View commit details
    Browse the repository at this point in the history

  8. chore: Patch preferences controller with type

    @gambinish
    gambinish committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    1f0ac51 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. feat: Build token sorting UI, patch PreferencesController

    @gambinish
    gambinish committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    34d987c View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. chore: Merge main, address merge conflicts

    @gambinish
    gambinish committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    d57558b View commit details
    Browse the repository at this point in the history

  2. fix: ListHeaderComponent not needed in FlatList anymore

    @gambinish
    gambinish committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    c5c954c View commit details
    Browse the repository at this point in the history

  3. fix: Update snapshots and lint

    @gambinish
    gambinish committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    4f635e8 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. chore: Merge develop, address conflicts

    @gambinish
    gambinish committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    469270a View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. chore: Remove destructive index

    @gambinish
    gambinish committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    82eb1a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Merge branch 'main' into feat/mmassets_357-sort-import-tokens-mobile-… 

    …-reorg-portfolio-balance
    @gambinish
    gambinish authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    f18b820 View commit details
    Browse the repository at this point in the history

  2. chore: Merge main, address conflicts

    @gambinish
    gambinish committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    d3a79fc View commit details
    Browse the repository at this point in the history

  3. chore: Repatch preferences controller with tokenSortConfig

    @gambinish
    gambinish committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    5fc979c View commit details
    Browse the repository at this point in the history

  4. fix: Declning balance sort

    @gambinish
    gambinish committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    2890148 View commit details
    Browse the repository at this point in the history

  5. fix: Export raw value from deriveBalanceFromAssetMarketDetails

    @gambinish
    gambinish committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    25a7238 View commit details
    Browse the repository at this point in the history

  6. fix: deriveBalanceFromAssetMarketDetails.test.ts

    @gambinish
    gambinish committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    6637303 View commit details
    Browse the repository at this point in the history

  7. fix: Update unit tests and snapshots

    @gambinish
    gambinish committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    0415b73 View commit details
    Browse the repository at this point in the history

  8. fix: Lint unused imports from Tokens/index.tsx

    @gambinish
    gambinish committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    ff32cc4 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. chore: Update testIds and locale strings

    @gambinish
    gambinish committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    f4f2519 View commit details
    Browse the repository at this point in the history

  2. fix: Update WalletView import selector

    @gambinish
    gambinish committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    bd61eff View commit details
    Browse the repository at this point in the history

  3. fix: Update snapshots

    @gambinish
    gambinish committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    f28b6fe View commit details
    Browse the repository at this point in the history

  4. chore: Cleanup

    @gambinish
    gambinish committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    7c9d5cc View commit details
    Browse the repository at this point in the history

  5. fix: Add navigation type

    @gambinish
    gambinish committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    e747848 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. fix: fix snapshot

    @salimtb
    salimtb committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    71ce22f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/mmassets_357-sort-import-tokens-mobile-… 

    …-reorg-portfolio-balance
    @salimtb
    salimtb committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    6aa6f3f View commit details
    Browse the repository at this point in the history

  3. chore: Update snapshots

    @gambinish
    gambinish committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    fe21f40 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feat/mmassets_357-sort-import-tokens-mobile--reorg-port… 

    …folio-balance' into feat/mmassets_357-sort-import-tokens-mobile--token-sort-config
    @gambinish
    gambinish authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    6f52163 View commit details
    Browse the repository at this point in the history

  5. fix: Update placeholders in switch statement

    @gambinish
    gambinish committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    579f012 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feat/mmassets_357-sort-import-tokens-mobile--token-sort… 

    …-config' of github.com:MetaMask/metamask-mobile into feat/mmassets_357-sort-import-tokens-mobile--token-sort-config
    @gambinish
    gambinish committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    68338a3 View commit details
    Browse the repository at this point in the history

  7. chore: Add additional e2e test for import token footer link

    @gambinish
    gambinish committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    ff95c72 View commit details
    Browse the repository at this point in the history

  8. chore: Update snapshots

    @gambinish
    gambinish committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    1d929ce View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. chore: Patch PreferencesController with tokenNetworkFilter

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    9cf6337 View commit details
    Browse the repository at this point in the history

  2. fix: Update to correct type in PreferenceController patch

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    fcf0d64 View commit details
    Browse the repository at this point in the history

  3. fix: Correct method name in patched PreferenceController

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e3196a3 View commit details
    Browse the repository at this point in the history

  4. chore: Integrate Filter dropdown with PreferencesController

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    aa5b6da View commit details
    Browse the repository at this point in the history

  5. fix: Break out of switch statement rather than returning arbitrary st… 

    …ring
    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a926d64 View commit details
    Browse the repository at this point in the history

  6. chore: Init BottomSheet refactor

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    d3c5d81 View commit details
    Browse the repository at this point in the history

  7. fix: Remove arbitrary 8 second delays from import-tokens.spec

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e925da3 View commit details
    Browse the repository at this point in the history

  8. fix: Use ButtonBase component to customize button text color more dir… 

    …ectly
    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0c9ca35 View commit details
    Browse the repository at this point in the history

  9. fix: Update snapshot

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    63bb1a2 View commit details
    Browse the repository at this point in the history

  10. fix: Mock initial state that PortfolioBalance component needs

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a5d8b71 View commit details
    Browse the repository at this point in the history

  11. fix: Mock tabs in snapshot

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0b617f2 View commit details
    Browse the repository at this point in the history

  12. fix: Consider Error boundary during Wallet rendering process

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    96436be View commit details
    Browse the repository at this point in the history

  13. fix: Update localized string

    @gambinish
    gambinish committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    1365f4d View commit details
    Browse the repository at this point in the history

  14. Merge branch 'feat/mmassets_357-sort-import-tokens-mobile--reorg-port… 

    …folio-balance' into feat/mmassets_357-sort-import-tokens-mobile--token-sort-config
    @gambinish
    gambinish authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    bd9ad0d View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge branch 'main' into feat/mmassets_357-sort-import-tokens-mobile-… 

    …-reorg-portfolio-balance
    @gambinish
    gambinish authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    da5862d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/mmassets_357-sort-import-tokens-mobile--reorg-port… 

    …folio-balance' into feat/mmassets_357-sort-import-tokens-mobile--token-sort-config
    @gambinish
    gambinish authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    c0a28bc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/mmassets_357-sort-import-tokens-mobile-… 

    …-reorg-portfolio-balance
    @gambinish
    gambinish authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    2934811 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feat/mmassets_357-sort-import-tokens-mobile--reorg-port… 

    …folio-balance' into feat/mmassets_357-sort-import-tokens-mobile--token-sort-config
    @gambinish
    gambinish authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    8cb67f7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feat/mmassets_357-sort-import-tokens-mobile-… 

    …-token-sort-config
    @gambinish
    gambinish authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    990067f View commit details
    Browse the repository at this point in the history

  6. chore: Add TokenSortBottomSheet to RootModalFlow in Routes

    @gambinish
    gambinish committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    1f5ad7f View commit details
    Browse the repository at this point in the history

  7. fix: Resolve upstream conflicts

    @gambinish
    gambinish committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    e5b060e View commit details
    Browse the repository at this point in the history

  8. fix: Lint:tsc

    @gambinish
    gambinish committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    c057c24 View commit details
    Browse the repository at this point in the history

  9. fix: Lint

    @gambinish
    gambinish committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    4e9f8d9 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. chore: Init unit tests for new UI

    @gambinish
    gambinish committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    319706d View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. chore: Merge main

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    6bfa6ab View commit details
    Browse the repository at this point in the history

  2. chore: Show selected network in filter

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    60bbfe3 View commit details
    Browse the repository at this point in the history

  3. fix: Update unit tests and snapshots

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    bd40392 View commit details
    Browse the repository at this point in the history

  4. chore: Merge main, address conflicts

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    dd3de6f View commit details
    Browse the repository at this point in the history

  5. fix: Add test for refresh control on tokens screen

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    e8b22c4 View commit details
    Browse the repository at this point in the history

  6. chore: Update testID selectors for token list

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    d5a41ba View commit details
    Browse the repository at this point in the history

  7. chore: Add tokenSort BottomSheet trigger test

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    ce983b8 View commit details
    Browse the repository at this point in the history

  8. chore: Lint

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    931b122 View commit details
    Browse the repository at this point in the history

  9. fix: Update snapshots

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    3fd170f View commit details
    Browse the repository at this point in the history

  10. chore: TokenSortBottomSheet unit tests

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    0d00f62 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    a6f12d0 View commit details
    Browse the repository at this point in the history

  12. chore: Cleanup

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    784c39f View commit details
    Browse the repository at this point in the history

  13. chore: Cleanup, and queryByTestID for test stability

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    6a4a64e View commit details
    Browse the repository at this point in the history

  14. chore: More cleanup

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    1dfd1bf View commit details
    Browse the repository at this point in the history

  15. chore: Merge main, address conflicts

    @gambinish
    gambinish committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    fe1e236 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. fix: Lint

    @gambinish
    gambinish committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    0fe13d9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/mmassets_357-sort-import-tokens-mobile--token-sort… 

    …-config--bottom-sheet' into feat/mmassets-431_network-filter-ui
    @gambinish
    gambinish authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    4c6b6c2 View commit details
    Browse the repository at this point in the history

  3. fix: Lint after conflicts

    @gambinish
    gambinish committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    84ca594 View commit details
    Browse the repository at this point in the history

  4. fix: Missing testIDs after merge for unit tests

    @gambinish
    gambinish committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    997fc3d View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. chore: Merge main, address conflicts

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    43e9c85 View commit details
    Browse the repository at this point in the history

  2. refactor: Filter ActionSheet should be BottomSheet

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    18c4e43 View commit details
    Browse the repository at this point in the history

  3. chore: Tweak styles to fix merge conflict

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    d34b986 View commit details
    Browse the repository at this point in the history

  4. fix: Update unit tests with correct import path

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    621bd6f View commit details
    Browse the repository at this point in the history

  5. chore: Add unit tests for TokenFilterBottomSheet

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    4c5dab9 View commit details
    Browse the repository at this point in the history

  6. chore: Add locale strings

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    d3b4356 View commit details
    Browse the repository at this point in the history

  7. chore: Add MM_TOKEN_NETWORK_FILTER_ENABLED feature flag

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    e656fe6 View commit details
    Browse the repository at this point in the history

  8. fix: Add missing locale string

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    04c2613 View commit details
    Browse the repository at this point in the history

  9. chore: Update snapshots

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    b146421 View commit details
    Browse the repository at this point in the history

  10. fix: Cleanup localisation strings and code comments

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    7fe0909 View commit details
    Browse the repository at this point in the history

  11. fix: Cleanup localisation strings, remove code comments, update featu… 

    …re flag to PORTFOLIO_VIEW
    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    16a6bac View commit details
    Browse the repository at this point in the history

  12. chore: Revert changes to component-library that are no longer needed

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    27c3050 View commit details
    Browse the repository at this point in the history

  13. fix: Lint whitespace diff

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    a79f3a6 View commit details
    Browse the repository at this point in the history

  14. fix: Another whitespace diff fix

    @gambinish
    gambinish committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    1c1b6cb View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    a8fc838 View commit details
    Browse the repository at this point in the history

  2. chore: Merge main

    @gambinish
    gambinish committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    66c27e6 View commit details
    Browse the repository at this point in the history

  3. fix: Remove outdated patch to preferenceController

    @gambinish
    gambinish committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    77442e4 View commit details
    Browse the repository at this point in the history

  4. chore: Repatch package with tokenNetworkFilter

    @gambinish
    gambinish committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    195f656 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. fix: Lint

    @gambinish
    gambinish committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    cfcc55f View commit details
    Browse the repository at this point in the history

  2. chore: Merge main, address conflicts

    @gambinish
    gambinish committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    ad121ee View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    e3fdea1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    9ebaa20 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. chore: Merge main

    @gambinish
    gambinish committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    11af1e7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    dc5d76c View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    9d3260e View commit details
    Browse the repository at this point in the history

  2. refactor: Update AssetListControls buttons to icons per design revisions

    @gambinish
    gambinish committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    b2781a5 View commit details
    Browse the repository at this point in the history

  3. fix: Update button text wrapping with snapshots

    @gambinish
    gambinish committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    f3b9a14 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feat/mmassets-431_network-filter-ui' of github.com:Meta… 

    …Mask/metamask-mobile into feat/mmassets-431_network-filter-ui
    @gambinish
    gambinish committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    4a52719 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    e392f21 View commit details
    Browse the repository at this point in the history

  6. fix: Lint

    @gambinish
    gambinish committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    68a76d6 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feat/mmassets-431_network-filter-ui' of github.com:Meta… 

    …Mask/metamask-mobile into feat/mmassets-431_network-filter-ui
    @gambinish
    gambinish committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    166ac02 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    fcafb86 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    de35586 View commit details
    Browse the repository at this point in the history

  2. chore: Replace unrelated build flag

    @gambinish
    gambinish committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    edc8c5c View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    915549e View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. fix: Remove unused font style

    @gambinish
    gambinish committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    ab20b3e View commit details
    Browse the repository at this point in the history

  2. fix: Use true for feature flag

    @gambinish
    gambinish committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    fd28086 View commit details
    Browse the repository at this point in the history

  3. fix: Unblock podfile during CI

    @gambinish
    gambinish committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    db79b71 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2024

  1. chore: Merge main, fix conflicts

    @gambinish
    gambinish committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    497db58 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @vinnyhoward
    vinnyhoward authored Nov 11, 2024
    Configuration menu
    Copy the full SHA
    a2775a8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 11, 2024
    Configuration menu
    Copy the full SHA
    e3459ae View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 11, 2024
    Configuration menu
    Copy the full SHA
    0595d96 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. fix: Tweak padding

    @gambinish
    gambinish committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    cabf8d9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    2aac1ee View commit details
    Browse the repository at this point in the history

  3. chore: Update snapshot

    @gambinish
    gambinish committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    d380915 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feat/mmassets-431_network-filter-ui' of github.com:Meta… 

    …Mask/metamask-mobile into feat/mmassets-431_network-filter-ui
    @gambinish
    gambinish committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    8959d19 View commit details
    Browse the repository at this point in the history

  5. feat: 7.34.0 (#11858) 

    This is the release candidate for version 7.34.0
 
  # Team sign-off checklist
  - [ ] team-accounts
  - [ ] team-assets
  - [x] team-confirmations
  - [x] team-design-system
  - [ ] team-lavamoat
  - [x] team-mobile-platform 
  - [x] team-notifications
  - [x] team-ramp
  - [ ] team-sdk
  - [ ] team-security
  - [x] team-snaps-platform 
  - [x] team-stake
  - [ ] team-tiger
  - [ ] team-wallet-framework
  - [ ] team-wallet-ux


  # Reference
- Testing plan sheet -
https://docs.google.com/spreadsheets/d/1tsoodlAlyvEUpkkcNcbZ4PM9HuC9cEM80RZeoVv5OCQ/edit?gid=404070372#gid=404070372

---------

Signed-off-by: Kai Huang <kai.huang@consensys.net>
Co-authored-by: runway-github[bot] <73448015+runway-github[bot]@users.noreply.github.com>
Co-authored-by: MetaMask Bot <37885440+metamaskbot@users.noreply.github.com>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Xiaoming Wang <7315988+dawnseeker8@users.noreply.github.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
Co-authored-by: Xiaoming Wang <dawnseeker8@gmail.com>
Co-authored-by: Nicholas Ellul <nicholas.ellul1@gmail.com>
Co-authored-by: legobt <6wbvkn0j@anonaddy.me>
Co-authored-by: OGPoyraz <omergoktugpoyraz@gmail.com>
Co-authored-by: Salim TOUBAL <salim.toubal@outlook.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: tommasini <tommasini15@gmail.com>
Co-authored-by: Bryan Fullam <bryanfullam@gmail.com>
Co-authored-by: Mpendulo Ndlovu <mpendulo@elefantel.com>
Co-authored-by: Kaihuang72490 <147628638+Kaihuang72490@users.noreply.github.com>
Co-authored-by: Cal-L <cleun007@gmail.com>
Co-authored-by: Cal Leung <cal.leung@consensys.net>
Co-authored-by: sahar-fehri <sahar.fehri@consensys.net>
Co-authored-by: Vince Howard <vincenguyenhoward@gmail.com>
Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
    @sethkfman @runway-github
    @metamaskbot @tommasini @github-actions @dawnseeker8 @NicolasMassart @NicholasEllul @legobeat @OGPoyraz @salimtb @wachunei @bfullam @elefantel @Kaihuang72490 @Cal-L @sahar-fehri @vinnyhoward @matthewwalsh0
    24 people committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    2ce9b47 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into feat/mmassets-431_network-filter-ui

    @gambinish
    gambinish authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    496126b View commit details
    Browse the repository at this point in the history