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

Fix #28534 - Show correct swap value from asset details #28587

Closed
wants to merge 246 commits into from
Closed

Fix #28534 - Show correct swap value from asset details #28587

wants to merge 246 commits into from

Commits on Oct 11, 2024

  1. feat: Init network filter

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

  2. chore: Add tokenNetworkFilter action

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

  3. chore: Add selected indicator on TokenNetworkList controls

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

  4. chore: Subscribe to tokenNetworkFilter in token-list

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

  5. chore: Display multiAccountBalance, and selectedAccountBalance

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

  6. chore: Optimize multiAccountBalance with reduce function

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

Commits on Oct 16, 2024

  1. chore: Cross chain balances do not yet exist, add todo

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

  2. chore: Polish styling of list items in dropdown

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

  3. chore: Cleanup

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

Commits on Oct 17, 2024

  1. chore: Merge main, address conflicts

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

  2. Merge branch 'develop' into feat/mmassets-432_network-filter-extension

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

Commits on Oct 21, 2024

  1. Merge branch 'develop' into feat/mmassets-432_network-filter-extension

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

  2. fix: Update unit tests in preferences-controller

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

  3. feat: Add filterAssets function

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

  4. chore: Polish filters to be layerable in order of importance, allowin… 

    …g custom filter logic
    @gambinish
    gambinish committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    72ea2cf View commit details
    Browse the repository at this point in the history

  5. fix: Lint tsc, specifiy chain indication rather than arbitrary number

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

  6. chore: Localize strings

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

Commits on Oct 22, 2024

  1. Merge branch 'develop' into feat/mmassets-432_network-filter-extension

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

  2. chore: Add localized Network string

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

  3. Merge branch 'feat/mmassets-432_network-filter-extension' of github.c… 

    …om:MetaMask/metamask-extension into feat/mmassets-432_network-filter-extension
    @gambinish
    gambinish committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    42ad7d4 View commit details
    Browse the repository at this point in the history

  4. chore: Add FILTER_TOKENS_TOGGLE feature flag

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

  5. Merge branch 'develop' into feat/mmassets-432_network-filter-extension

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

  6. fix: Show current selection on Network filter, and ellipsize when ove… 

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

  7. Merge branch 'feat/mmassets-432_network-filter-extension' of github.c… 

    …om:MetaMask/metamask-extension into feat/mmassets-432_network-filter-extension
    @gambinish
    gambinish committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    c9a2d8d View commit details
    Browse the repository at this point in the history

  8. fix: Lint

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

  9. fix: Remove duplicate locale string

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

  10. fix: Cleanup

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

  11. bump asset controllers to 39

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

  12. update ConfirmTransaction

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

  13. fix useGasFeeEstimates unit test

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

Commits on Oct 23, 2024

  1. fix usePolling tests

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

  2. Merge branch 'develop' into feat/mmassets-432_network-filter-extension

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

  3. bump controller utils

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

  4. remove patch

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

  5. Merge branch 'develop' into brian/asset-controller-39

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

  6. Update LavaMoat policies

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

  7. lint

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

  8. Merge branch 'brian/asset-controller-39' of github.com:MetaMask/metam… 

    …ask-extension into brian/asset-controller-39
    @bergeron
    bergeron committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    04ea3d6 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Merge branch 'develop' into brian/asset-controller-39

    @bergeron
    bergeron authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    cf66072 View commit details
    Browse the repository at this point in the history

  2. fix: Clean up filterAssets logic

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

  3. Merge branch 'feat/mmassets-432_network-filter-extension' of github.c… 

    …om:MetaMask/metamask-extension into feat/mmassets-432_network-filter-extension
    @gambinish
    gambinish committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    15e4e47 View commit details
    Browse the repository at this point in the history

  4. fix: Update network-filter Avatar rendering logic

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

  5. Merge branch 'develop' into feat/mmassets-432_network-filter-extension

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

  6. fix: Duplicate chainId

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

  7. Merge branch 'feat/mmassets-432_network-filter-extension' of github.c… 

    …om:MetaMask/metamask-extension into feat/mmassets-432_network-filter-extension
    @gambinish
    gambinish committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    441d4cf View commit details
    Browse the repository at this point in the history

  8. chore: Aggregate token listings across chains, per account

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

  9. chore: Cleanup variables and logs

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

  10. Merge branch 'brian/asset-controller-39' into feat/mmassets-432_netwo… 

    …rk-filter-extension--integration--marketData
    @gambinish
    gambinish committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    1e461ee View commit details
    Browse the repository at this point in the history

  11. chore: Update yarn resolution to provide marketData across chains

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

Commits on Oct 25, 2024

  1. chore: get balances for tokens via TokenTracker

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

  2. feat: poc of consolidated asset view across chains. balances are mocked

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

  3. chore: Integrate filtering logic, to be improved

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

Commits on Oct 29, 2024

  1. initial multi chain polling for currency and token rates

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

  2. fix testnets

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

  3. only refetch prices on chains whose tokens changed

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

Commits on Oct 30, 2024

  1. poll multiple native currencies

    @bergeron
    bergeron committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    878f407 View commit details
    Browse the repository at this point in the history

  2. fix test

    @bergeron
    bergeron committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e8a9d6a View commit details
    Browse the repository at this point in the history

  3. yarn dedupe

    @bergeron
    bergeron committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    245f8d3 View commit details
    Browse the repository at this point in the history

  4. Update LavaMoat policies

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

  5. Merge branch 'develop' into brian/currency-rate-multichain-polling2

    @bergeron
    bergeron authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e99e2ef View commit details
    Browse the repository at this point in the history

  6. fix e2e test mocks

    @bergeron
    bergeron committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    ca590ec View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' of github.com:MetaMask/metamask-extension into… 

    … brian/currency-rate-multichain-polling2
    @bergeron
    bergeron committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    d2191ac View commit details
    Browse the repository at this point in the history

  8. fix e2e test

    @bergeron
    bergeron committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    70c0db4 View commit details
    Browse the repository at this point in the history

  9. .

    @bergeron
    bergeron committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    6b7df4d View commit details
    Browse the repository at this point in the history

  10. lint

    @bergeron
    bergeron committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    4e816c2 View commit details
    Browse the repository at this point in the history

  11. fix e2e test

    @bergeron
    bergeron committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    aaef377 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge branch 'brian/currency-rate-multichain-polling2' of github.com:… 

    …MetaMask/metamask-extension into brian/multiexchangerate
    @bergeron
    bergeron committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    48bff46 View commit details
    Browse the repository at this point in the history

  2. package.json

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

  3. Merge branch 'develop' of github.com:MetaMask/metamask-extension into… 

    … brian/multiexchangerate
    @bergeron
    bergeron committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    fdc04ad View commit details
    Browse the repository at this point in the history

  4. bump controller preview version

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

  5. Merge branch 'develop' into brian/multiexchangerate

    @bergeron
    bergeron authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    dcc8a64 View commit details
    Browse the repository at this point in the history

  6. fix: fix lint

    @sahar-fehri
    sahar-fehri committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    0e7a872 View commit details
    Browse the repository at this point in the history

  7. fix: update js file to tsx

    @sahar-fehri
    sahar-fehri committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    ea95aca View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Merge branch 'develop' into brian/multiexchangerate

    @sahar-fehri
    sahar-fehri authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    3bf7b78 View commit details
    Browse the repository at this point in the history

  2. make polling input a chain id

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

  3. Merge branch 'develop' into brian/multiexchangerate

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

  4. bump to asset controller v42

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

  5. .

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

  6. Merge branch 'brian/multiexchangerate' of github.com:MetaMask/metamas… 

    …k-extension into brian/multiexchangerate
    @bergeron
    bergeron committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    44861d9 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Merge branch 'develop' of github.com:MetaMask/metamask-extension into… 

    … brian/token-balances-controller
    @bergeron
    bergeron committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    0b543e0 View commit details
    Browse the repository at this point in the history

  2. initial token balances controller

    @bergeron
    bergeron committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    411fc1c View commit details
    Browse the repository at this point in the history

  3. Update metamask-controller.js

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

  4. Merge branch 'develop' into brian/token-balances-controller

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

  5. cleanup

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

  6. Merge branch 'brian/token-balances-controller' of github.com:MetaMask… 

    …/metamask-extension into brian/token-balances-controller
    @bergeron
    bergeron committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    f6e56b3 View commit details
    Browse the repository at this point in the history

  7. yarn

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

Commits on Nov 5, 2024

  1. feat: add native tokens to multichain token list (#28193) 

    Great job! Things are starting to come together 👍 

I addressed David's initial review, since they were all pretty minor changes.

Going to merge this after our initial review. We can rebranch from the feature branch once we get the conflicts addressed there. I'll also schedule a meeting for tomorrow between you me and Vince to get things started on mobile.
    @jonybur
    jonybur authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    6fac24b View commit details
    Browse the repository at this point in the history

  2. chore: Merge develop, address conflicts

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

  3. fix: Missed merge conflict in filter funciton

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

  4. fix: Address conflicts in lavamoat policies

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

  5. fix: Address conflict in main lavamoat policy

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

  6. fix: Update selectors and various discrepancies after merge conflict … 

    …resolution that was breaking build, delink local core package
    @gambinish
    gambinish committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    b0c07c1 View commit details
    Browse the repository at this point in the history

  7. fix: Incorrect selector for marketData

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

  8. fix: Cleanup

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

  9. fix: conversionRate undefined error on network switch

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

  10. fix: Get native token image from mapping

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

  11. fix: Ethereum mainnet should be called Ethereum

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

  12. fix: Changing selected network should reset filters to all networks

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

  13. fix: Cleanup selector console log

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

Commits on Nov 6, 2024

  1. Styling changes

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

  2. fix: Add percentage change for native currency

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

  3. fix: Multichain scam warning should not appear on native tokens, othe… 

    …r small cleanups
    @gambinish
    gambinish committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    f81cbbc View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. fix: Network selector should also update network filter

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

  2. fix: On mount, set the filters to show all networks by default

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

  3. fix: Temporarily stub out showScamWarning boolean. To improve on mult… 

    …ichain
    @gambinish
    gambinish committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    919faf5 View commit details
    Browse the repository at this point in the history

  4. fix: pricePercentChange1d can be undefined, use optional chaining

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

  5. fix: Tweak useEffect in asset-list-control-bar

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

  6. fix: Use tokenChainId not cached chainId from selected network

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

  7. Add auto switching for network on Send

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

  8. Merge branch 'feat/mmassets-432_network-filter-extension--integration… 

    …--marketData' of github.com:MetaMask/metamask-extension into feat/mmassets-432_network-filter-extension--integration--marketData
    @jonybur
    jonybur committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    f48e734 View commit details
    Browse the repository at this point in the history

  9. Bugfixing, add tooltips

    @jonybur
    jonybur committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    25c8a90 View commit details
    Browse the repository at this point in the history

  10. chore: Temporarily link preview build of assets-controllers package

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

  11. refactor: Init token balance integration

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

  12. Padding fixes

    @jonybur
    jonybur committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    42ce9be View commit details
    Browse the repository at this point in the history

  13. UI fixes

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

  14. Reduce size of selector

    @jonybur
    jonybur committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    ecb8508 View commit details
    Browse the repository at this point in the history

  15. Fix native token clicking

    @jonybur
    jonybur committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    a241f5e View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. chore: format currency and token values

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

  2. chore: Handle native token balances

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

  3. refactor: Handle balance calculation higher up to respect sorting

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

  4. fix: Include AssetsController patch

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

  5. chore: Cleanup

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

  6. chore: Tidy up some types on token-list

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

Commits on Nov 10, 2024

  1. Fix toast for network switching

    @jonybur
    jonybur committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    3edf269 View commit details
    Browse the repository at this point in the history

  2. Fix asset page for offchain native tokens

    @jonybur
    jonybur committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    2dc23d3 View commit details
    Browse the repository at this point in the history

  3. Filter out zero-value tokens on asset list picker

    @jonybur
    jonybur committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    d778834 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. Design changes

    @jonybur
    jonybur committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    6537cb6 View commit details
    Browse the repository at this point in the history

  2. Fix: Consolidate type for AdressTokenMapping

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

  3. Merge branch 'feat/mmassets-432_network-filter-extension--integration… 

    …--marketData' into feat/mmassets-432_network-filter-extension--integration-balances
    @gambinish
    gambinish committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    6397e30 View commit details
    Browse the repository at this point in the history

  4. chore: Fix calculated balances on asset details

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

  5. chore: Render chart data for native token

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

  6. chore: Key market details on chainId

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

  7. chore: Cleanup market details

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

  8. chore: Cleanup types on token-list

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

  9. Fix: small bug related to native token image

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

  10. fix: Remove console.log

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

  11. Fix: Include string in type

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

  12. fix: Persist cross chain balances on detail view

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

  13. chore: formatWithThreshold

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

  14. chore: calculateTokenBalance utility

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

  15. Create utilities for calculating tokenBalance and tokenFiatAmount

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

  16. fix: Memoized token listing should update after new tokens are imported

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

Commits on Nov 12, 2024

  1. fix: Missing import

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

  2. Add chain network switching for swaps and send on native tokens

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

  3. Fix toast on swap

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

  4. Fix NaN value on new tokens

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

  5. Remove console log

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

  6. NFT fixes for multichain

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

  7. fix: Init zero balance bug

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

  8. chore: Merge main, address conflicts

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

  9. fix: All networks filter should only show the chains for mainnet that… 

    … are in network selector
    @gambinish
    gambinish committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    ed8cd61 View commit details
    Browse the repository at this point in the history

  10. fix: Remove console.log

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

  11. fix: yarn lint

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

  12. fix: yarn lint:tsc

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

  13. fix: Cleanup

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

Commits on Nov 13, 2024

  1. fix: If network icons doesn't exist, we should not fallback to the cu… 

    …rrent selected network icon, fallback to the first letter of the network name
    @gambinish
    gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    6a663a8 View commit details
    Browse the repository at this point in the history

  2. fix: Show ETH as Ethereum on non ETH mainnet chains when allNetworks … 

    …filter is toggled on
    @gambinish
    gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    7e2b157 View commit details
    Browse the repository at this point in the history

  3. fix: Lint

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

  4. Merge branch 'develop' into feat/mmassets-432_network-filter-extensio… 

    …n--integration-balances
    @gambinish
    gambinish authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    a7e2a77 View commit details
    Browse the repository at this point in the history

  5. chore: Style updates to asset-list-control-bar

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

  6. chore: Update localization string in prep for multichain asset list

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

  7. chore: Update import button to import icon in preparation for Multich… 

    …ain asset list
    @gambinish
    gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    b4e4ba7 View commit details
    Browse the repository at this point in the history

  8. chore: Update sort control styles

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

  9. chore: Consider chainId when navigating from main asset list

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

  10. chore: Begin incorporating concept of chainId to support multichain a… 

    …sset list
    @gambinish
    gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    031e8e3 View commit details
    Browse the repository at this point in the history

  11. fix: Tweak unit test

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

  12. fix: Tweak unit test

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

  13. chore: Add low risk selectors to prepare for multichain asset list

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

  14. fix: Add unit testable utility in preperation for unified asset list

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

  15. fix: Revert changes to locales, can't do this in advance

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

  16. fix: Update test id in custom-token-add-approve.spec.js

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

  17. chore: Remove console.log

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

  18. fix: Update token-sort.spec.ts testid

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

  19. fix: Update other instances of testid Import

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

  20. chore: Add new unit test for findAssetByAddress util

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

  21. fix: Update nullish search bug in chainSupprotsPricing

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

  22. fix: Lint error in util.test.ts

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

  23. test: [POM] Migrate autodetect and import nft e2e tests to use Page O… 

    …bject Model (#28383)

## **Description**

- Migrate e2e tests `test/e2e/tests/tokens/nft/auto-detect-nft.spec.js`
to TS and Page Object Model, to reduce flakiness.
- Migrate e2e tests `test/e2e/tests/tokens/nft/import-nft.spec.js` to TS
and Page Object Model, to reduce flakiness.
- Create page classe functions for nft
- Deprecate/remove old functions in `helper.js`


[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27155?quickstart=1)

## **Related issues**

Fixes: #28388

## **Manual testing steps**
Check code readability, make sure tests pass.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
    @chloeYue @gambinish
    chloeYue authored and gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    57f8af1 View commit details
    Browse the repository at this point in the history

  24. test: fix state fixtures race condition (#28421) 

    <!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
There is a race condition in our testing setup, which causes that the
expected fixtures state, not being there when we start the test. This
has been surfaced in [this
branch](#28277),
where the account tracker multi polling is being added.
The problem is that if we don't have the AccountTracker in state when
the `resetState` function is called (at the beginning of wallet loading)
the balance will remain loading until we refresh the wallet.

Edit: performing the load state early in the test setup fixes the issue.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28421?quickstart=1)

## **Related issues**

Fixes: MetaMask/MetaMask-planning#3627

## **Manual testing steps**

1. Check all tests continue to pass
2. Check this changes fix this branch ENS test
https://github.com/MetaMask/metamask-extension/pull/28402/files#diff-1acb7898d60977530c97169551d22dbe477a4e3aeb74f1f14bf2eea0b4d75d35
. Alternatively, see videos below with before and after behaviours

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**




https://github.com/user-attachments/assets/8f50ec04-cf96-478e-9c3c-dce54254a628



### **After**


https://github.com/user-attachments/assets/0f109b1a-9289-48d9-b337-d51890c9d448




## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
    @seaona @gambinish
    seaona authored and gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    01652f5 View commit details
    Browse the repository at this point in the history

  25. feat: btc send flow e2e (#28340) 

    <!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR reintroduces the happy path send flow tests for BTC

## **Related issues**

Fixes: https://github.com/MetaMask/accounts-planning/issues/668

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: Charly Chevalier <charly.chevalier@consensys.net>
    @montelaidev @ccharly @gambinish
    2 people authored and gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    02dba24 View commit details
    Browse the repository at this point in the history

  26. fix: Default to dApp suggested fees only when user selects the option (… 

    …#28403)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Previously, some gas fee parameters defaulted to dApp suggested fee
values. This was problematic, because these values are always defined,
even when the user changed to a custom priority.

To fix the issue, we now only show the fees contained in txParams,
trusting they match the user selected priority level in the gas fees
modal.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28403?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

See screen recording below.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->



https://github.com/user-attachments/assets/3874d3b6-ad96-4fd9-9f40-361b38a0253b



### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
    @pedronfigueiredo @gambinish
    pedronfigueiredo authored and gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    bc5f345 View commit details
    Browse the repository at this point in the history

  27. Revert "fix: Lint error in util.test.ts" 

    This reverts commit aa3063f.
    @gambinish
    gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    0055289 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'develop' into feat/mmassets-432_network-filter-extensio… 

    …n--prep-updates
    @gambinish
    gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    c006bb6 View commit details
    Browse the repository at this point in the history

  29. fix: @metamask/assets-controllers should be imported before local fil… 

    …epath
    @gambinish
    gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    25c27ea View commit details
    Browse the repository at this point in the history

  30. chore: Merge main, address conflicts

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

  31. chore: Merge in prep updates to reduces file size diff

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

  32. fix: Remove duplicate import entry for getCurrentChainId

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

  33. fix: Revert component library change to ButtonBase

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

  34. fix: Revert margin update to ButtonBase

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

  35. fix: Continue using optional chaining in useFiatTokenBalance hook

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

  36. Merge branch 'develop' into feat/mmassets-432_network-filter-extensio… 

    …n--prep-updates
    @gambinish
    gambinish authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    572f998 View commit details
    Browse the repository at this point in the history

  37. fix: Update token cell test, by tweaking primary formatWithThreshold … 

    …function signature
    @gambinish
    gambinish committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    82e1ddd View commit details
    Browse the repository at this point in the history

  38. chore: tweak formatWithThreshold for primary token balance value

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

  39. fix: Update snapshot in token cell unit test

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

  40. chore: Replace scam token warning logic in token-list-item

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

  41. chore: Tweak token-list-item isOriginalToken symbol prop

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

  42. Merge branch 'develop' into feat/mmassets-432_network-filter-extensio… 

    …n--prep-updates
    @gambinish
    gambinish authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    bc2f132 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. chore: Merge develop

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

  2. chore: Update legacy gas display unit test

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

  3. fix: Remove suffix constraint

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

  4. fix: Update snapshot

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

  5. fix: chore fix otudated snapshot

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

  6. fix: Revert change to token cell snap

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

  7. fix: Tweak snap

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

  8. fix: troubleshoot whitespace diff

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

  9. fix: Troubleshoot whitespace diff

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

  10. fix: Troubleshoot whitespace diff

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

  11. fix: Update showScamWarning to not scam native tokens on multichain t… 

    …oken list
    @gambinish
    gambinish committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    43b0cfe View commit details
    Browse the repository at this point in the history

  12. fix: Fix behavior of native token click

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

  13. chore: Merge develop, address conflicts

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

  14. chore: Fix undefined bug during token import process causing crash

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

  15. fix: When hex balance is 0x0, return zero value

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

  16. fix: Cleanup console.log

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

  17. fix: Do not prematurely return from calculateTokenBalance function

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

Commits on Nov 15, 2024

  1. chore: Merge develop, address conflicts

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

  2. fix: Patch updates and NetworkController:state change subscription

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

  3. refactor: Integrate useTokenBalances hook

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

Commits on Nov 16, 2024

  1. chore: Merge develop, address conflicts

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

  2. fix: Address inconsistencies after merge

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

Commits on Nov 18, 2024

  1. Style fixes

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

Commits on Nov 19, 2024

  1. fix: Issue 28509 - when navigating to send/swap form a token from a c… 

    …hain that is not on the selected network, ensure correct balance is prepopulated in fromToken amount
    @gambinish
    gambinish committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    1df49df View commit details
    Browse the repository at this point in the history

  2. fix: Issue 28511 - Show native token symbol in token-list

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

  3. fix: Issue 28513 - WHen a network is added, and the network is switch… 

    …ed, and the current network filter it toggled on, filter tokens by that chain
    @gambinish
    gambinish committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    1fff579 View commit details
    Browse the repository at this point in the history

  4. fix: Issue 28513: Adding networks should toggle network filter

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

  5. Merge branch 'develop' into feat/mmassets-432_network-filter-extensio… 

    …n--integration-balances
    @gambinish
    gambinish authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    758fa6a View commit details
    Browse the repository at this point in the history

  6. Move refresh list to asset control bar

    @jonybur
    jonybur committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    3b42f0c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feat/mmassets-432_network-filter-extension--integration… 

    …-balances' of github.com:MetaMask/metamask-extension into feat/mmassets-432_network-filter-extension--integration-balances
    @jonybur
    jonybur committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    2338fcc View commit details
    Browse the repository at this point in the history

  8. Style fix

    @jonybur
    jonybur committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    a8364ff View commit details
    Browse the repository at this point in the history

  9. Filter tokens by test-nontest networks

    @jonybur
    jonybur committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    4f70ccd View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into feat/mmassets-432_network-filter-extensio… 

    …n--integration-balances
    @gambinish
    gambinish authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    da79b45 View commit details
    Browse the repository at this point in the history

  11. fix: Dedupde controller polling init

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

  12. fix: typo in test id

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

  13. fix: When new tokens are imported, rerender the token list

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

Commits on Nov 20, 2024

  1. fix: On network change, include newly added network to tokenNetworkFi… 

    …lter
    @gambinish
    gambinish committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    3273dba View commit details
    Browse the repository at this point in the history

  2. fix: Format currency with same format as previous implementation to a… 

    …void uneccesary regressions
    @gambinish
    gambinish committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    1bdaf8d View commit details
    Browse the repository at this point in the history

  3. fix: Map Arbitrum, Linea, and Base native token to ETH logo

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

  4. fix: Lint token-cell.tsx

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

  5. chore: Merge develop, address conflicts

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

  6. fix: Remove fake loading boolean

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

  7. fix: Lint

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

  8. Merge branch 'develop' into feat/mmassets-432_network-filter-extensio… 

    …n--integration-balances
    @gambinish
    gambinish authored Nov 20, 2024
    Configuration menu
    Copy the full SHA
    614b5ff View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into feat/mmassets-432_network-filter-extensio… 

    …n--integration-balances
    @gambinish
    gambinish committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    0bbaeb5 View commit details
    Browse the repository at this point in the history

  10. fix: Typo

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

Commits on Nov 21, 2024

  1. chore: Rebase with develop

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

  2. Fix #28534 - Show correct swap value from asset details

    @darkwing
    darkwing committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    87790df View commit details
    Browse the repository at this point in the history

  3. Fix lint issue

    @darkwing
    darkwing committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    214d89e View commit details
    Browse the repository at this point in the history