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.

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

Asset Overview / Token Detail view redesign #6230

Merged
merged 64 commits into from
May 25, 2023
Merged

Conversation

nikoferro
Copy link
Member

@nikoferro nikoferro commented Apr 20, 2023

Description

Asset Overview / Asset Detail" page redesign involves some key changes:

  • Interactive chart will be added to the page which will display pricing information for the asset across different time periods.
  • Users will be able to review the prices through the price chart.

The redesign will also include the repositioning of the buy/send/receive/swap buttons.

Screenshots/Recordings

New Project

Simulator Screen Recording - iPhone 11 - 2023-04-25 at 10 19 42

Checklist

  • There is a related GitHub issue
  • Tests are included if applicable
  • Any added code is fully documented

sethkfman added a commit that referenced this pull request May 5, 2023
…grade (#6327)

* [FIX] Gas is not re-calculated when updating a transaction (#5876)

* check gas is recalculate on confirm screen

* reset the value of gas before estimating

* update snapshot

* init engine for failing keyringcontroller

* test init

* mock transactioncontroller

* update test

* rebased to main

* revert test file name to index

* fix failing test

* enable M1 builds on RN

* updated NDK version

* bump to new workflow step and NDK version

* log out NDK home after install

* [FEATURE][MC] - Edit account name view (#6165)

* Edit account name view

* addressed review

* navigate to edit account name

* edit header style

* E2e appium/715 edit account name view (#6303)

* Fix flaky test

* Solve Browserstack errors

* Added Gesture.waitAndTap method AddContact and Contacts

---------

Co-authored-by: SamuelSalas <samuel.salas.reyes@gmail.com>

* Cleanup approve transaction review (#6213)

* Revert "ci: temporarily downgrade ubuntu to 20.04" (#5199)

This reverts commit 5542193.

* Fix duplicate test name lint warning (#6304)

The lint warning about a test title being repeated has been fixed. The
two tests were very similar; the titles have been updated to explain
how they are different.

---------

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: LeoTM <1881059+leotm@users.noreply.github.com>

* removed version print out step

* update bitrise step version

* updated ndk version

* added local prop file

* update build step and add local.properties file in android

* update local prop script

* bump ndk version in metamask gradle

* added strings to be translated for feature #6230 (#6308)

* bump ndk version

* add the NDK path to root gradle

* added hard code NDK version and path

* deps: force xml2js@>=0.5.0 via resolutions (#6240)

- CVE-2023-0842 / GHSA-776f-qx25-q3cc

* updated rootproject properties

* only update NDK version in patch

* only update NDK version

* removed local prop build step

* Revert "only update NDK version"

This reverts commit 2285dd3.

* Revert "Revert "only update NDK version""

This reverts commit 1cbfeb1.

* pull NDK path and bitrise script updates

* update filepath, script and gradle config to be more dynamic

* bump to max large M1

* update gradle to provide NDK path for bitrise

* more dynamic ndk path options

* update ndk path check

* added if check to function

* updated gradle for test

* updated gradle for test remove env check

* remove if check in react android patch

* updated ndkPath

* update build gradle

* remove ndk version

* remove ndk from gradle

* removed ndkVersion

* uncommented ndkVersion

* update file path name

* updated builds with name correction

* update version on install-missing-android-tools bitrise builds

* devDeps: Remove concat-cli (#6315)

Doesn't seem to ever have been useful.
Introduced in 69381f0

Prefer `cat`.

* Refactor SendTo - extract code to render from / to addresses into separate component (#6266)

* initial commit

* draft

* cleaned up

* lint

* include isBalanceZero for fromaddress

* fix snapshot

* resolved feedback

* renaming component names

* Update app/components/Views/SendFlow/AddressFrom/AddressFrom.test.tsx

Co-authored-by: Ariella Vu <20778143+digiwand@users.noreply.github.com>

* Update app/components/Views/SendFlow/SendTo/index.js

Co-authored-by: Ariella Vu <20778143+digiwand@users.noreply.github.com>

* removed redudant snapshot

* rebased to main

* snapshot update

* removed podfile change

---------

Co-authored-by: Ariella Vu <20778143+digiwand@users.noreply.github.com>

* On-ramp: Add redux-thunk, refactor successful order handler (#6257)

* Fix missing handler on mandatory modal (#6309)

* feature(on-ramp): add development environment to onramp-sdk (#6325)

* On-ramp: fix missing network name (#6340)

* 6.5.0 (#6241)

* 6.5.0

* fix(on-ramp): Add thunk to handle buy crypto deeplink (#6248)

* [FIX] Detox: wallet-tests.spec.js (#6250)

* fix wallet-tests.spec.js

* add collectible json

* updated collectible data for bitrise wallet

* fix: invalid title error (#6280)

* Update Network Badge to use Badge component of component library (#6254)

* Show unsupported token for network when watching tokens (#6258)

* [FIX] - Upgrading with deprecated test network selected (#6269)

* add migrations to handle deprecated networks

* use enums, const instead of strings

---------

Co-authored-by: CW <chris.wilcox@consensys.net>

* [FIX]  Patch assets-controller to not use BigInt (#6305)

* Patch assets-controller to not use BigInt

* Update to use public link

Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>

* Update to spell out React Native

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>

* Update to spell out React Native

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>

---------

Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>

* build 1104 (#6310)

* update changelog

---------

Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Chris Wilcox <chris.wilcox@consensys.net>
Co-authored-by: abretonc7s <107169956+abretonc7s@users.noreply.github.com>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: sethkfman <Seth.Kaufman@consensys.net>

* New Crowdin translations by Github Action (#6208)

* New Crowdin translations by Github Action

* PR update

* Revert "PR update"

This reverts commit 39e533a.

---------

Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: sethkfman <Seth.Kaufman@consensys.net>

* Stabilise E2e Android tests on pipeline (#6341)

* Modify actions bar function and small tidy ups

* Commit working Smoke tests

* Small changes to tests

* Small fixes

* hide Keyboard

* Fiz sendtoken browserStack

* fix sendToken and CreateWalletAccount

* add smoke tag to lockreset

* wait for no thanks button to exists

* increase wait time for term of use modal.

* fix wallet displayed step

* add time interval to waitFor on no thanks button

* add time interval for waitForDisplayed

* Add  check for terms of use modal loading delay

* Update common-steps.js

Alter CreateWalletTest to also wait for terms of use text

* Add double tap

* update tags

---------

Co-authored-by: Curtis <Curtis.David7@gmail.com>

* [DETOX] Only Run tests with the "smoke" tag in the describe block (#6338)

* add tags to test describe block.

* add regression tags to describe block

* create methods for Smoke & Regression

* update bitrise.yml

* fix lint

* update changelog

* Fix readme typos (#6275)

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>

* sturdier check (#5866)

* sturdier check

* apply feedback

* apply feedback

* unit test

* check phishing and deeplinks

* feedback

* resolve

* url check

* more tests

---------

Co-authored-by: Curtis David <Curtis.David7@gmail.com>

* Appium/fix reports video failures (#6343)

* try/catch error generating reports

* clean up for reports

* Update SendToken.feature

* delete feature, was renamed

* [e2e] Send ETH to an EOA using Ganache network on Android (#6215)

* Send ETH with Ganache network

* Move Ganache initialization to common steps

* Remove unneeded async

* Update wdio/features/Confirmations/SendEthEOA.feature

Co-authored-by: Curtis David <Curtis.David7@gmail.com>

* Add extra step for closing new modal

* Add tag @confirmations

---------

Co-authored-by: Curtis David <Curtis.David7@gmail.com>

* Fix yarn watch clean (#6339)

* enable proguard for release and QA builds

---------

Co-authored-by: Sylva Elendu <iamsylvaelendu@gmail.com>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: SamuelSalas <samuel.salas.reyes@gmail.com>
Co-authored-by: Jyoti Puri <jyotipuri@gmail.com>
Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: LeoTM <1881059+leotm@users.noreply.github.com>
Co-authored-by: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: Chris Wilcox <chris.wilcox@consensys.net>
Co-authored-by: abretonc7s <107169956+abretonc7s@users.noreply.github.com>
Co-authored-by: MetaMask Bot <37885440+metamaskbot@users.noreply.github.com>
Co-authored-by: yande <110056475+Andepande@users.noreply.github.com>
Co-authored-by: Curtis <Curtis.David7@gmail.com>
Co-authored-by: Brendan Kirby <124314512+bkirb@users.noreply.github.com>
Co-authored-by: witmicko <witmicko@users.noreply.github.com>
Co-authored-by: seaona <54408225+seaona@users.noreply.github.com>
Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
@wachunei wachunei added release-7.1.0 and removed release-6.6.0 PR for release 6.6.0 labels May 25, 2023
@wachunei
Copy link
Member

@SocketSecurity ignore-all

Copy link
Contributor

@sethkfman sethkfman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wachunei wachunei merged commit 96284f4 into main May 25, 2023
10 checks passed
@wachunei wachunei deleted the swaps/token-details branch May 25, 2023 18:56
@github-actions github-actions bot locked and limited conversation to collaborators May 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) QA Passed A successful QA run through has been done release-7.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants