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

feat: Sort/Import Tokens in Mobile #11618

Merged
merged 72 commits into from
Oct 22, 2024
Merged

feat: Sort/Import Tokens in Mobile #11618

merged 72 commits into from
Oct 22, 2024
+657 −64

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. 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

  2. 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

  3. 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

  4. 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

  5. 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

  6. 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

  7. 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

  8. 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

  9. 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

Commits on Oct 22, 2024

  1. chore: Address code review comments

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

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

    …-token-sort-config
    @gambinish
    gambinish committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    f376551 View commit details
    Browse the repository at this point in the history

  3. fix: Update trackEvent to use new createEventBuilder method

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

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

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