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

Upgrade swaps-controller v4 #2586

Merged
merged 3 commits into from
May 3, 2021
Merged

Conversation

wachunei
Copy link
Member

@wachunei wachunei commented Apr 24, 2021

Description
This PR upgrades to swaps-controller as module. Depends on #2416, do not merge before #2416

TODO

  • Replace tgz with v4.0.0 once published

PD: Tests are failing because of the breaking change from v7 -> v8 controllers architecture (current code is v7 style, while SwapsController is a v8 controller).

@wachunei wachunei added the swaps MetaSwaps issues label Apr 24, 2021
@wachunei wachunei force-pushed the chore/upgrade-swaps-controller branch from 358b2b4 to 75e43a8 Compare April 26, 2021 23:54
@wachunei wachunei changed the title Upgrade swaps-controller v3.1 Upgrade swaps-controller v4 Apr 26, 2021
@wachunei wachunei force-pushed the chore/upgrade-swaps-controller branch from a431b51 to d4c0a26 Compare April 27, 2021 17:23
@wachunei wachunei force-pushed the chore/upgrade-swaps-controller branch from d4c0a26 to 03c4bad Compare April 28, 2021 01:40
@wachunei wachunei marked this pull request as ready for review April 28, 2021 01:46
@wachunei wachunei requested a review from a team as a code owner April 28, 2021 01:46
@wachunei wachunei added the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Apr 28, 2021
@mobularay
Copy link
Contributor

@wachunei is this work in-scope of this sprint (new work?)?

@wachunei
Copy link
Member Author

Yeah this is part of BSC Swaps release

Copy link
Contributor

@estebanmino estebanmino left a comment

Choose a reason for hiding this comment

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

working for me

@wachunei wachunei added needs-qa Any New Features that needs a full manual QA prior to being added to a release. and removed needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) labels Apr 28, 2021
@ibrahimtaveras00 ibrahimtaveras00 added next release QA in Progress QA has started on the feature. and removed needs-qa Any New Features that needs a full manual QA prior to being added to a release. labels Apr 29, 2021
Copy link
Contributor

@ibrahimtaveras00 ibrahimtaveras00 left a comment

Choose a reason for hiding this comment

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

QA Passed 👍🏽

@ibrahimtaveras00 ibrahimtaveras00 added QA Passed A successful QA run through has been done and removed QA in Progress QA has started on the feature. labels May 3, 2021
@wachunei wachunei merged commit 77e85f2 into develop May 3, 2021
@wachunei wachunei deleted the chore/upgrade-swaps-controller branch May 3, 2021 21:29
rickycodes added a commit that referenced this pull request May 4, 2021
…ask/metamask-mobile into feature/update-seed-phrase-wording

* 'feature/update-seed-phrase-wording' of github.com:MetaMask/metamask-mobile:
  Fix/respect custom spend limit on dapp approve modal (#2556)
  updated lock files (#2614)
  Upgrade swaps-controller v4 (#2586)
  remove typo (#2613)
sethkfman added a commit that referenced this pull request May 12, 2021
* resolve isENS without case sensitivity (#2545) (#2568)

Co-authored-by: ricky <ricky.miller@gmail.com>

Co-authored-by: Minh <minhle@canva.com>

* Use node 14 (#2539)

* Swaps: BSC Support (#2468)

* Swaps: Add cache thresholds configuration (#2514)

* Upgrade .nvmrc to node v14 (#2588)

* Address yarn lints (#2524)

* address yarn lints

* add eslint-disable

* Update isENS method

* fix rn-fetch-blob.js mock

* Add tests for isENS

* useRef instead of useMemo

* Update eslint

* Use lastIndexOf and add test

* Add test case for ricky.metamask.eth

* Add offset

* Fix AppConstants import

* only add custom tokens if not in mainnet (#2470)

* checkchainid

* tests

* Fix adding custom token in custom network (#2590)

* Replace controller context (#2416)

* Replace controller context

The `context` object previously constructed by the
`ComposableController` is no more. Instead each controller now accepts
its dependencies directly as constructor parameters, in a similar
manner to the extension controllers.

This was done in preparation for migrating to BaseControllerV2 and the
new controller messaging system - this is just a temporary solution
that will let us migrate controllers one at a time.

The style of dependency injection here matches the extension (at least
with newer controllers anyway). Specific methods and state snapshots
are injected rather than entire controllers, to help simplify unit
tests and make it easier to understand how controllers interact.

The `Engine.context` property was used throughout mobile, so it has
been preserved. It is now constructed explicitly, rather than being a
re-export of the `ComposableController` context.

This PR depends upon MetaMask/core#387

* Pass in function for `getOpenSeaApiKey` rather than string

The API key was passed in directly by accident, instead of a function get returned the key. This has been fixed.

Co-authored-by: Esteban Miño <efmino@uc.cl>

* Update `AccountTrackerController` options

The `AccountTrackerController` option `initialIdentities` was replaced
with `getIdentities`. The initial identities passed in here were
incorrect anyway due to a typo (`initialState.preferencesController`
was used instead of `initialState.PreferencesController`).

* Fix `getIdentities` handler for `AccountTrackerController`

* Set initial controller state

The `controllers` setter on `ComposedController` used to be responsible
for setting initial state. Since that setter has been removed, the
initial state is now set after the controllers have been constructed.

This should be functionally equivalent to what it was before. We're
setting the initial state by calling `update` on each controller, just
as the `controller` setter used to.

* Fix initial state variable reference

Co-authored-by: Esteban Miño <efmino@uc.cl>

* fix typeface on login text field (#2610)

* Feature/confusables (#2464)

* Add confusable warning to SendTo

* Highlight confusable characters

* Replace zeroWidthPoints characters with ?

* Add some notes

* Add confusable highlight to confirm screen

* Update checkZeroWidth function

* Add exclamation mark to Confirm

* Add handleConfusables method

* Move this into one spot

* Add hasZeroWidthPoints

* Rename T to Texts

* Use reduce

* Add homoglyphic tests

* Add Modal for confusable on confirm screen

* Update snapshot

* Use Swaps InfoModal

* Increase lineheight on modals

* Only display warning if address is not in addressBook

* Update snapshot

* Make texts lowercase

* Remove unused state

* Add patch

* Display as warning in yelllow when not zero width

* Only display confusables warnings if the user is not in addressbook

* Add optional chaining for addressBook

Co-authored-by: andrepimenta <andrepimenta7@gmail.com>

* Add New Zealand Dollar to currency options (#2446)

* Add New Zealand Dollar to currency options

* Update snapshot to include nzd

Co-authored-by: Ricky Miller <ricky.miller@gmail.com>

* Move some errors to analytics instead of sentry (#2529)

* Move some errors to analytics instead of sentry

* Add swaps errors

* Change to log just as 1 error

* Fix typos

* Log can't reach branch servers as analytics

* Browser: Failed to resolve ENS name for chainId - log as analytics

* Update tests

Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>

* Don't hide url modal on emulator (#2604)

* Detox/Fix failing tests (#2607)

* fixed all failing tests

* remove a

Co-authored-by: Ibrahim Taveras <ibrahimtaveras@ibrahims-mbp.myfiosgateway.com>

* Upgrade wallet connect (#2552)

* This will fix sentry errors with no title by using the extra info as a title (#2565)

* Bugfix/android anr (#2603)

* updated Sentry SDK and increase the default timeout for ANR to be thrown  from 4 to 10 seconds #2498

* updated ANR reporting time to 8 seconds

* removed increased timeout and correct sentry integrations vesion

* updated pod dependencies

* remove typo (#2613)

* Upgrade swaps-controller v4 (#2586)

* updated lock files (#2614)

* Fix/respect custom spend limit on dapp approve modal (#2556)

* Add better initial state reset for permission edit modal

* Use spendLimitCustomValue for allowance

* minimumSpendLimit 1

* Remove minimumSpendLimit prop

* Get minimumSpendLimit from EditPermission component

* Add MINIMUM_VALUE const

* use export const

* Coerce minimumSpendLimit to number

* Log error

* Remove callback from initialState

Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>

* Improve rpc errors logging and removing user rejected errors (#2564)

* Improve rpc errors logging and removing user rejected errors

* Update for even more cases

* Add comments to code

* Add trackErrorAsAnalytics

* Use typeof

* Feature/update seed phrase wording (#2605)

* Move login strings to translation file

* replace seed phrase with Secret Recovery phrase

* Get an video working

* get video working off disk

* Add SeedPhraseVideo component

* Add TODO:

* Add SeedPhraseVideo to onboarding

* Update snapshots

* Add borderRadius

* cleanup

* Remove placeholder video and add recovery-phrase

* Add video-controls

* Add cover to video

* Add play button to cover

* adjust opacity to closer match design

* Add marginTop to video on settings page

* Remove subtitles for now

* Update few remaining instances

* Account for single word instances

* update snapshots

* Update snapshots

* RC v2.3.0 (#2621)

* bump version numbers

* update change log

* Implement 'hide zero balance token' setting for token balances on home screen (#2444)

* Implement 'hide zero balance token' setting for token balances on home screen

* Add localizations

* Refactor how balances are detected, add tests

* Fix lint, add spacing, create jest snapshots

* Fix test, lint

* Remove unnecessary proop from test

* Remove 'paymentChannelsEnabled' prop that doesn't belong in this patch

Co-authored-by: ricky <ricky.miller@gmail.com>

* Fix isZero is undefined (#2625)

* Fix isZero is undefined

* Update app/components/UI/Tokens/index.js

Co-authored-by: Esteban Miño <efmino@uc.cl>

* add optional chaining

Co-authored-by: Esteban Miño <efmino@uc.cl>

* Address yarn audit (#2633)

* updated change log (#2631)

* updated change log

* updated change log

* updated change log

* Exclude native asset from hiding when balance is zero (#2639)

* Fix undefined is not an object identities[selectedAddress].importTime (#2643)

* Fix undefined is not an object (evaluating 'identities[selectedAddress].importTime

* Use accountImportTime for consistency

* Safe navbar for iphone 12 (#2645)

* safenavbar

* Update app/util/Device.js

Co-authored-by: ricky <ricky.miller@gmail.com>

* mocks

* lint

* finally

Co-authored-by: ricky <ricky.miller@gmail.com>

* Fix missing seed phrase updates (#2657)

* Fix Balance undefined for deeplink payment requests (#2656)

* Check for transactionToName

* Account for own accounts

* Remove console.log

* Use account names from identities

* Remove async

* Add some safety

* Load video over the network (#2663)

* updated version code and change logs (#2664)

* updated version code and change logs

* update change log

* added export of iOS artifacts (#2667)

* added export of iOS artifacts

* updated destination directory

* Bump hosted-git-info from 2.8.8 to 2.8.9 (#2670)

Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](npm/hosted-git-info@v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Key off accounts (#2669)

* Key off accounts

* Key off accounts in ChoosePassword as well

* Fix deploy contract and create token testnets (#2674)

* updated change logs

* upated version codes and change logs (#2675)

Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: Minh <minhle@canva.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Esteban Miño <efmino@uc.cl>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: andrepimenta <andrepimenta7@gmail.com>
Co-authored-by: Michael Standen <screaminghawk@gmail.com>
Co-authored-by: Ibrahim Taveras <ibrahimtaveras00@gmail.com>
Co-authored-by: Ibrahim Taveras <ibrahimtaveras@ibrahims-mbp.myfiosgateway.com>
Co-authored-by: David Walsh <davidwalsh83@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
rickycodes pushed a commit that referenced this pull request Jan 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
next release QA Passed A successful QA run through has been done swaps MetaSwaps issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants