Skip to content

Integrate changes from controllers v15.0.2 - #3071

Merged
adonesky1 merged 4 commits into
developfrom
adapting-ignored-tokens-changes
Sep 2, 2021
Merged

Integrate changes from controllers v15.0.2#3071
adonesky1 merged 4 commits into
developfrom
adapting-ignored-tokens-changes

Conversation

@adonesky1

@adonesky1adonesky1 commented Aug 27, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

  • Adds migrations and required changes for breaking changes from controllers changes (572 and 570)

@adonesky1
adonesky1 requested a review from a team as a code ownerAugust 27, 2021 21:19
@adonesky1adonesky1 added the DO-NOT-MERGE Pull requests that should not be merged label Aug 27, 2021
@adonesky1
adonesky1 marked this pull request as draft August 27, 2021 21:20
@adonesky1
adonesky1force-pushed the adapting-ignored-tokens-changes branch from 695d520 to fad464cCompareAugust 27, 2021 21:22
Cal-L
Cal-L approved these changes Aug 30, 2021
View reviewed changes

@Cal-LCal-L left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. Awaiting controller update PR.

@adonesky1
adonesky1 marked this pull request as ready for review August 31, 2021 22:49
@adonesky1

adonesky1 commented Aug 31, 2021

Copy link
Copy Markdown
ContributorAuthor

@Cal-L do you want to re-review now that the controllers version has been bumped?

@adonesky1

adonesky1 commented Aug 31, 2021

Copy link
Copy Markdown
ContributorAuthor

Or should someone from QA review?

@adonesky1adonesky1 changed the title Adapting ignored tokens changesIntegrate breaking changes from controllers v15.0.0Aug 31, 2021
@adonesky1adonesky1 changed the title Integrate breaking changes from controllers v15.0.0Integrate changes from controllers v15.0.0Aug 31, 2021
@adonesky1
adonesky1 marked this pull request as draft September 1, 2021 14:36
@adonesky1
adonesky1force-pushed the adapting-ignored-tokens-changes branch 2 times, most recently from 4926a96 to 30ed192CompareSeptember 1, 2021 15:25
@adonesky1
adonesky1 marked this pull request as ready for review September 1, 2021 16:20
@adonesky1adonesky1 removed the DO-NOT-MERGE Pull requests that should not be merged label Sep 1, 2021
@adonesky1

adonesky1 commented Sep 1, 2021

Copy link
Copy Markdown
ContributorAuthor

I've done some local testing but it would probably good to have some more reliable QA on this before merging? @ibrahimtaveras00@Cal-L if someone has bandwidth?

@adonesky1adonesky1 changed the title Integrate changes from controllers v15.0.0Integrate changes from controllers v15.0.1Sep 1, 2021
Cal-L
Cal-L approved these changes Sep 1, 2021
View reviewed changes

@Cal-LCal-L left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM!

@adonesky1
adonesky1force-pushed the adapting-ignored-tokens-changes branch from 30ed192 to 4332b87CompareSeptember 1, 2021 19:33
@adonesky1adonesky1 added the DO-NOT-MERGE Pull requests that should not be merged label Sep 1, 2021
@adonesky1
adonesky1 marked this pull request as draft September 1, 2021 21:58
@adonesky1
adonesky1force-pushed the adapting-ignored-tokens-changes branch from 4332b87 to 45f00cbCompareSeptember 1, 2021 22:13
@adonesky1adonesky1 changed the title Integrate changes from controllers v15.0.1Integrate changes from controllers v15.0.2Sep 1, 2021
@adonesky1
adonesky1force-pushed the adapting-ignored-tokens-changes branch from 45f00cb to 8c5c82fCompareSeptember 1, 2021 22:15
@adonesky1
adonesky1 marked this pull request as ready for review September 2, 2021 16:02
@adonesky1
adonesky1 merged commit 1ddc113 into developSep 2, 2021
@adonesky1
adonesky1 deleted the adapting-ignored-tokens-changes branch September 2, 2021 16:02
@Cal-L

Cal-L commented Sep 2, 2021

Copy link
Copy Markdown
Contributor

@ibrahimtaveras00 QAd by me

rickycodes added a commit that referenced this pull request Sep 7, 2021
@rickycodes
Merge branch 'develop' into detox-stabilization
b679776
* develop:
[FIX] Handle token icon remote resource
Add typescript eslint from metamask (#3088)
Bump eth-url-parser from 1.0.2 to 1.0.4 (#3084)
Feature/improve warning eth sign (#2852)
Add support for wallet_switchEthereumChain (#3023)
Integrate changes from controllers v15.0.2 (#3071)
Bump @react-navigation/compat from 5.3.15 to 5.3.20 (#3068)
fix issues 2100 (#3081)
Make Engine .ts (#3072)
Update custom token copy (#3080)
Bump @react-native-community/cookies from 4.0.1 to 5.0.1 (#3069)
Bump regenerator-runtime from 0.13.1 to 0.13.9 (#2931)
Bump redux-persist from 5.10.0 to 6.0.0 (#2526)
Create general issue template (#3015)
sethkfman added a commit that referenced this pull request Sep 9, 2021
@sethkfman@estebanmino
Ibrahim Taveras@Cal-L@wachunei@andrepimenta@rickycodes@UFCSVCLionbridge!corpitSVCUFCGustavo Antunes@yulodl@JavonneM@dependabot@meppsilon@0xGaryWu@adonesky1
Merge pull request from GHSA-vfh4-cj95-8jv6
52636fb
* upgraded to react-native-webview 11.13.0 and applied the patches from 11.0.2
* added imports to patch file
* updated logics for when a url is updated on the browser view
* updated webview patch to removed injected code android studio added during debugging
* enable the dispaly of a port number if entered on url
* updated webview patch with latest keyboard updates
* Collectibles enhancements (#2735)
* resizemode
* margintop
* transparent
* emptystate
* snaps
* backgroundColor
* snaps
* update snapshot
* fix typo
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
Co-authored-by: Ibrahim Taveras <ibrahimtaveras@ibrahims-mbp.myfiosgateway.com>
* Release/3.0.1 patch (#2976)
* bumped version
* updated changelog
* updated formatting
* trigger patch build
* removed build trigger
* bugfix: issue #2763 (#2808)
* Remove extra top padding on send flow (#2907)
* Replace safe area view for send flow. Wrap send flow input focus in interaction block.
* Replace focus with optional chaining
* Update snapshot tests
* Remove redundant safe area view on Send component
* On-Ramp: Add on-ramp analytics (#2973)
* Add on-ramp analytics
* Add anonymized pairs
* Add more anonymized pairs
* Add fiatAmountInUsd for transak orders
* Move constants to app/constants
* Fix header layout. (#2980)
* Merge pull request from GHSA-3pg9-fvh4-99rr
* Fix address bar icon (#2893)
* Fix check if icon is empty
* Use boolean
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
* Remove cache pull
* added exclusion to yarn audit and upgraded url-parse module
* disable caching on ci
* updated yarn.lock and bitrise flow
* added caching back into bitrise build
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Feature/video subtitles (#2813)
* updated translation files with latest translations for secret recovery phrase
* added subtitles to secret phrase videos
* added english subtitles
* added urls for translations and updated video players to show subtitles
* updated subtitle location
* updated translation files with latest secret recovery text
* merge develop and trouble shoot subtitles
* removed subtitle logic from player
* update translations
* Review Translations (#2806)
* Lionbridge
* Lionbridge
* Client Update
* Lionbridge
Co-authored-by: Brennan <Mark.Brennan@lionbridge.com>
Co-authored-by: !corpitSVCUFC <!corpitSVCUFC@corpnet.liox.org>
* using updated to exo player for android video
* bumped version and updated changelog
* refactored subtitle uri and implemenation
* Update subtitles-en.vtt
removed formatting
* moved videos into secretPhrase folder
* udpated uri
* update uri
* Optional chaining dollarBalance (#2809)
* bumped version and updated changelog
* moved files into folder
* removed duplcate changelog
* updated comments
* removed duplicate swaps section
* removed debug param
* refactored video and subtitle location
* updated broken link
* updated fetching of subtitles for video
Co-authored-by: Brennan <Mark.Brennan@lionbridge.com>
Co-authored-by: !corpitSVCUFC <!corpitSVCUFC@corpnet.liox.org>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
* Branch updates (#2804)
* handleDeeplinks
* bumpbranch
* pods
* functional
* notused
* handleDeeplinks
* handleDeeplink
* mock
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
* Fix: Add TransakWebview mediaPlayback props for KYC (#2996)
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* [FIX] GH Action Permission for Bump-Version (#2961)
* updated permissions for gh action
* test bump action
* test bump action
* bump controllers to v14.0.2 (#2952)
* [EIP1559] Improve time estimates (#2955)
* Improve eip1559 time estimates
* Add extendOptions to EditGasFee Components
* Update test
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
* updated permission and add improvements to slack notification
* removed test workflow
* removed before_run not needed in e2e
* updated bump version script to bump version code everything we push to main or develop
* removed types didn't apply in push
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
* upgrade walletconnect (#2956)
* [FIX] Account for `txParams.data` when we sync (#2999)
* Account for txParams.data when we sync
* Remove "Bummer!" wording
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Fix/ci release update (#3004)
* removed release build trigger
* updated GH action tigger on pull requests not pushes
* [FEATURE] - Storage Limit - Reduce Txs Being Stored (#2972)
* added controller test tarball and updated path
* added DefaultPreference to save OPT_IN METRICS data
* added react native default prefs to pod
* added view on chain footer to list view, dis-allow list for onboarding and analytics in store
* updated yarn.lock file
* updated copy on footer
* updated tarball for latest controller PR
* yarn.lock update
* disable cache
* enable cache
* added migration for new values being stored in default preferences
* trigger test build
* [FIX] Account for `txParams.data` when we sync (#2999)
* Account for txParams.data when we sync
* Remove "Bummer!" wording
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Fix/ci release update (#3004)
* removed release build trigger
* updated GH action tigger on pull requests not pushes
* updated to v14.2.0 controllers
Co-authored-by: ricky <ricky.miller@gmail.com>
* Revert "Collectibles enhancements (#2735)" (#3005)
This reverts commit 93c1296.
* v3.1.0 RC (#3009)
* updated changelog for 3.1.0
* Bump version name
* version bumped
* updated changelog
Co-authored-by: github-actions <github-actions@github.com>
* RC 3.0.1 - Downgrade Android SDK Version (#3010)
* downgraded SDK version
* bump version
* uncomment release build steps and disable slack notification that needs logic update to work outside of PR release flow
* fix deep links bug related to branch updates (#3017)
* [FIX] Delete Message (#2981)
* fix(DeleteMessage): uUse word 'delete' for all languages
* update delete to be translation variable
Co-authored-by: Ricky Miller <ricky.miller@gmail.com>
* remove tarball (#3024)
* fix eddit button (#3026)
* RC 3.1.0 (v3) (#3025)
* release(3.1.0 v3): Pump version number
* release(3.1.0 v3): Update changelog
* release(3.1.0 v3): Delete merge message
* release(3.1.0 v3): Update title
* release(3.1.0 v3): Update changelog
* release(3.1.0 v3): Add deleted title
* release(3.1.0 v3): Delete duplicates
* release(3.1.0 v3): Update changelog
* fix(CHANGELOG): Title (#3027)
* Make decelerationRate normal (#3006)
Co-authored-by: yulodl <yulodl@gmail.com>
* do not translate logic strings (#3031)
* tidy util dir based on discussions (#3030)
* [FIX] Uni V3 NFT animated SVG crash
* Switched to sslip.io instead of xip.io (#2718)
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
* Bump multihashes from 0.4.14 to 4.0.2 (#2527)
Bumps [multihashes](https://github.com/multiformats/js-multihash) from 0.4.14 to 4.0.2.
- [Release notes](https://github.com/multiformats/js-multihash/releases)
- [Changelog](https://github.com/multiformats/js-multihash/blob/master/CHANGELOG.md)
- [Commits](multiformats/js-multihash@v0.4.14...v4.0.2)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
* increase the heap size to help mitigate the out of memory issue (#3038)
* [FIX] Video Subtitles Not Loading Properly (#3029)
* updated scope of variables to reflect currently selected language
* reverted podfile.lock changes
* [2783] Change default account name for ENS reversed-resolved name (#2878)
* Fix token transfer to address (#3046)
* v3.2.0 RC (#3044)
* Swaps V2 Integration (#3013)
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
* Bump minor version
* Update changelog
* Reset changelog
* Update changelog
* updated changelog
* updated changelog
* updated changelog
* updated changelog
* format changelogs
Co-authored-by: Matthew Epps <mepps32@gmail.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Revert multihashes (#3054)
* release(3.2.0): Pump verion number (#3056)
* Remove SwapsLiveness checks for non supported networks (#3057)
* [FEATURE] Update Recents (#3028)
render recents based on items stored in redux instead of from transactions
* remove circle ci badge (#3060)
* Enable Slack Notification on Successful Build (#3055)
* create a bitrise test slack step
* updated slack script
* update import
* updated e2e scripts to include minSDK being set to 26
* revert build.sh changes
* updated request import
* switched to non-depricated package
* updated bitrise build dep
* test
* test
* Slack Message Test
* removed bitrise test triggers & remove test text from slack message
* slack test
* added test trigger
* updated bitrise format
* update require
* removed test text and triggers
* Create general issue template (#3015)
* Bump redux-persist from 5.10.0 to 6.0.0 (#2526)
Bumps [redux-persist](https://github.com/rt2zz/redux-persist) from 5.10.0 to 6.0.0.
- [Release notes](https://github.com/rt2zz/redux-persist/releases)
- [Changelog](https://github.com/rt2zz/redux-persist/blob/master/CHANGELOG.md)
- [Commits](rt2zz/redux-persist@v5.10.0...v6.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
* Bump regenerator-runtime from 0.13.1 to 0.13.9 (#2931)
Bumps [regenerator-runtime](https://github.com/facebook/regenerator) from 0.13.1 to 0.13.9.
- [Release notes](https://github.com/facebook/regenerator/releases)
- [Commits](https://github.com/facebook/regenerator/compare/regenerator-runtime@0.13.1...regenerator-runtime@0.13.9)
---
updated-dependencies:
- dependency-name: regenerator-runtime
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
* Bump @react-native-community/cookies from 4.0.1 to 5.0.1 (#3069)
Bumps [@react-native-community/cookies](https://github.com/react-native-community/cookies) from 4.0.1 to 5.0.1.
- [Release notes](https://github.com/react-native-community/cookies/releases)
- [Changelog](https://github.com/react-native-cookies/cookies/blob/master/.releaserc)
- [Commits](react-native-cookies/cookies@v4.0.1...v5.0.1)
---
updated-dependencies:
- dependency-name: "@react-native-community/cookies"
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update custom token copy (#3080)
* Make Engine .ts (#3072)
Make Engine TypeScript and leverage our Transaction Type from controllers
* fix issues 2100 (#3081)
* fix issues 2100
/**
* fix bug: #2100
* * reason: redux-persist load storage data by 'getItem' API with a timeout (5 seconds default) when app ’cold start',
* on some old devices, I/O is slow and 'readfile' operation may take long time Occasionally, when this happened, timeout
* will lead to redux-persist rehydrate state with undefined and an Error(https://github.com/rt2zz/redux-persist/blob/master/src/persistReducer.js#89).
* * solution: the easy way to fix is to set a big timeout on config, Go further, we could save 'keyring' etc some important
* data to separate files or backup for this. the second way is not complicated, we could set
* serialize and deserialize to false to get JSON object and modify setItem/getItem API to save/load data.
*/
* remove comment
* Use Logger
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Ricky Miller <ricky.miller@gmail.com>
* Bump @react-navigation/compat from 5.3.15 to 5.3.20 (#3068)
Bumps [@react-navigation/compat](https://github.com/react-navigation/react-navigation/tree/HEAD/packages/compat) from 5.3.15 to 5.3.20.
- [Release notes](https://github.com/react-navigation/react-navigation/releases)
- [Changelog](https://github.com/react-navigation/react-navigation/blob/@react-navigation/compat@5.3.20/packages/compat/CHANGELOG.md)
- [Commits](https://github.com/react-navigation/react-navigation/commits/@react-navigation/compat@5.3.20/packages/compat)
---
updated-dependencies:
- dependency-name: "@react-navigation/compat"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Integrate changes from controllers v15.0.2 (#3071)
* ignored tokens updates
* add migration
* cleanup
* bump @metamask/controllers to 15.0.2
* Add support for wallet_switchEthereumChain (#3023)
* Add support for wallet_switchEthereumChain
* updated method name
* Update app/core/RPCMethods/wallet_switchEthereumChain.js
Optimized params logic
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
* Feature/improve warning eth sign (#2852)
* remove duplicate swap translations
* updated eth_sign warning
* added styling to warning message to allow different severity of warning
* updated prop name
* updated line height for alert text
* updated line spacing per design feedback
* updated snapshot
* removed translations that were not needed
* updated snapshot
* Bump eth-url-parser from 1.0.2 to 1.0.4 (#3084)
Bumps [eth-url-parser](https://github.com/brunobar79/eth-url-parser) from 1.0.2 to 1.0.4.
- [Release notes](https://github.com/brunobar79/eth-url-parser/releases)
- [Commits](brunobar79/eth-url-parser@v1.0.2...v1.0.4)
---
updated-dependencies:
- dependency-name: eth-url-parser
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Add typescript eslint from metamask (#3088)
* Add typescript eslint from metamask
* address new lints
Co-authored-by: Ricky Miller <ricky.miller@gmail.com>
* [FIX] Handle token icon remote resource
* Catch undefined navigate on buy eth (#3100)
* [FIX] Bug in token balance
* updated eth signing warning copy (#3103)
* Improvement/upgrade redux and tests (#3066)
* Begin converting tests to TS
* Upgrade redux. Update tests to TS and clean up.
* Remove unused line
* Leave react-redux 5.1.1 for testing purposes
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* [FEATURE] Add browser analytics
* [FIX] Fix undefined values in CustomGas component (#2977)
* Remove CustomGas component
* Removing custom gas breaks action sheet layout. Temporarily add View tag to fix this for now.
* Check lint status
* Prettify Approve view
* Remove unused warningGasPriceHigh
* update snapshot
* completely remove CustomGas
Co-authored-by: ricky <ricky.miller@gmail.com>
* Merge pull request from GHSA-rc56-6qmj-qg85
* Patch react-native & react-native-webview to remove learning from Android keyboards
* Initialize Android text input with BaseInputConnection
* Opt out of safe browsing
* Update bitrise.yml with NDK steps
* Fix bitrise.yml. Remove ds store diffs.
* Update README.md with NDK instructions
* chore: update swaps-controller and send clientId on fetchSwapsFeatureLiveness (#3101)
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* upgraded to react-native-webview 11.13.0 and applied the patches from 11.0.2
* Collectibles enhancements (#2735)
* resizemode
* margintop
* transparent
* emptystate
* snaps
* backgroundColor
* snaps
* update snapshot
* fix typo
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
Co-authored-by: Ibrahim Taveras <ibrahimtaveras@ibrahims-mbp.myfiosgateway.com>
* Improvement/upgrade redux and tests (#3066)
* Begin converting tests to TS
* Upgrade redux. Update tests to TS and clean up.
* Remove unused line
* Leave react-redux 5.1.1 for testing purposes
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* rebase with MM develop
* Improvement/upgrade redux and tests (#3066)
* Begin converting tests to TS
* Upgrade redux. Update tests to TS and clean up.
* Remove unused line
* Leave react-redux 5.1.1 for testing purposes
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Esteban Miño <efmino@uc.cl>
Co-authored-by: Ibrahim Taveras <ibrahimtaveras@ibrahims-mbp.myfiosgateway.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: Brennan <Mark.Brennan@lionbridge.com>
Co-authored-by: !corpitSVCUFC <!corpitSVCUFC@corpnet.liox.org>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Gustavo Antunes <gantunes@uc.cl>
Co-authored-by: yulodl <yulodl@gmail.com>
Co-authored-by: Javonne Martin <javonne.martin@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Epps <mepps32@gmail.com>
Co-authored-by: liangwu <liangwu.cas@gmail.com>
Co-authored-by: Alex Donesky <adonesky@gmail.com>
rickycodes pushed a commit that referenced this pull request Jan 31, 2022
@adonesky1
Integrate changes from controllers v15.0.2 (#3071)
a7465b8
* ignored tokens updates
* add migration
* cleanup
* bump @metamask/controllers to 15.0.2
rickycodes added a commit that referenced this pull request Jan 31, 2022
@sethkfman@estebanmino
Ibrahim Taveras@Cal-L@wachunei@andrepimenta@rickycodes@UFCSVCLionbridge!corpitSVCUFCGustavo Antunes@yulodl@JavonneM@dependabot@meppsilon@0xGaryWu@adonesky1
Merge pull request from GHSA-vfh4-cj95-8jv6
4a5127e
* upgraded to react-native-webview 11.13.0 and applied the patches from 11.0.2
* added imports to patch file
* updated logics for when a url is updated on the browser view
* updated webview patch to removed injected code android studio added during debugging
* enable the dispaly of a port number if entered on url
* updated webview patch with latest keyboard updates
* Collectibles enhancements (#2735)
* resizemode
* margintop
* transparent
* emptystate
* snaps
* backgroundColor
* snaps
* update snapshot
* fix typo
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
Co-authored-by: Ibrahim Taveras <ibrahimtaveras@ibrahims-mbp.myfiosgateway.com>
* Release/3.0.1 patch (#2976)
* bumped version
* updated changelog
* updated formatting
* trigger patch build
* removed build trigger
* bugfix: issue #2763 (#2808)
* Remove extra top padding on send flow (#2907)
* Replace safe area view for send flow. Wrap send flow input focus in interaction block.
* Replace focus with optional chaining
* Update snapshot tests
* Remove redundant safe area view on Send component
* On-Ramp: Add on-ramp analytics (#2973)
* Add on-ramp analytics
* Add anonymized pairs
* Add more anonymized pairs
* Add fiatAmountInUsd for transak orders
* Move constants to app/constants
* Fix header layout. (#2980)
* Merge pull request from GHSA-3pg9-fvh4-99rr
* Fix address bar icon (#2893)
* Fix check if icon is empty
* Use boolean
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
* Remove cache pull
* added exclusion to yarn audit and upgraded url-parse module
* disable caching on ci
* updated yarn.lock and bitrise flow
* added caching back into bitrise build
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Feature/video subtitles (#2813)
* updated translation files with latest translations for secret recovery phrase
* added subtitles to secret phrase videos
* added english subtitles
* added urls for translations and updated video players to show subtitles
* updated subtitle location
* updated translation files with latest secret recovery text
* merge develop and trouble shoot subtitles
* removed subtitle logic from player
* update translations
* Review Translations (#2806)
* Lionbridge
* Lionbridge
* Client Update
* Lionbridge
Co-authored-by: Brennan <Mark.Brennan@lionbridge.com>
Co-authored-by: !corpitSVCUFC <!corpitSVCUFC@corpnet.liox.org>
* using updated to exo player for android video
* bumped version and updated changelog
* refactored subtitle uri and implemenation
* Update subtitles-en.vtt
removed formatting
* moved videos into secretPhrase folder
* udpated uri
* update uri
* Optional chaining dollarBalance (#2809)
* bumped version and updated changelog
* moved files into folder
* removed duplcate changelog
* updated comments
* removed duplicate swaps section
* removed debug param
* refactored video and subtitle location
* updated broken link
* updated fetching of subtitles for video
Co-authored-by: Brennan <Mark.Brennan@lionbridge.com>
Co-authored-by: !corpitSVCUFC <!corpitSVCUFC@corpnet.liox.org>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
* Branch updates (#2804)
* handleDeeplinks
* bumpbranch
* pods
* functional
* notused
* handleDeeplinks
* handleDeeplink
* mock
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
* Fix: Add TransakWebview mediaPlayback props for KYC (#2996)
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* [FIX] GH Action Permission for Bump-Version (#2961)
* updated permissions for gh action
* test bump action
* test bump action
* bump controllers to v14.0.2 (#2952)
* [EIP1559] Improve time estimates (#2955)
* Improve eip1559 time estimates
* Add extendOptions to EditGasFee Components
* Update test
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
* updated permission and add improvements to slack notification
* removed test workflow
* removed before_run not needed in e2e
* updated bump version script to bump version code everything we push to main or develop
* removed types didn't apply in push
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
* upgrade walletconnect (#2956)
* [FIX] Account for `txParams.data` when we sync (#2999)
* Account for txParams.data when we sync
* Remove "Bummer!" wording
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Fix/ci release update (#3004)
* removed release build trigger
* updated GH action tigger on pull requests not pushes
* [FEATURE] - Storage Limit - Reduce Txs Being Stored (#2972)
* added controller test tarball and updated path
* added DefaultPreference to save OPT_IN METRICS data
* added react native default prefs to pod
* added view on chain footer to list view, dis-allow list for onboarding and analytics in store
* updated yarn.lock file
* updated copy on footer
* updated tarball for latest controller PR
* yarn.lock update
* disable cache
* enable cache
* added migration for new values being stored in default preferences
* trigger test build
* [FIX] Account for `txParams.data` when we sync (#2999)
* Account for txParams.data when we sync
* Remove "Bummer!" wording
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Fix/ci release update (#3004)
* removed release build trigger
* updated GH action tigger on pull requests not pushes
* updated to v14.2.0 controllers
Co-authored-by: ricky <ricky.miller@gmail.com>
* Revert "Collectibles enhancements (#2735)" (#3005)
This reverts commit 93c1296.
* v3.1.0 RC (#3009)
* updated changelog for 3.1.0
* Bump version name
* version bumped
* updated changelog
Co-authored-by: github-actions <github-actions@github.com>
* RC 3.0.1 - Downgrade Android SDK Version (#3010)
* downgraded SDK version
* bump version
* uncomment release build steps and disable slack notification that needs logic update to work outside of PR release flow
* fix deep links bug related to branch updates (#3017)
* [FIX] Delete Message (#2981)
* fix(DeleteMessage): uUse word 'delete' for all languages
* update delete to be translation variable
Co-authored-by: Ricky Miller <ricky.miller@gmail.com>
* remove tarball (#3024)
* fix eddit button (#3026)
* RC 3.1.0 (v3) (#3025)
* release(3.1.0 v3): Pump version number
* release(3.1.0 v3): Update changelog
* release(3.1.0 v3): Delete merge message
* release(3.1.0 v3): Update title
* release(3.1.0 v3): Update changelog
* release(3.1.0 v3): Add deleted title
* release(3.1.0 v3): Delete duplicates
* release(3.1.0 v3): Update changelog
* fix(CHANGELOG): Title (#3027)
* Make decelerationRate normal (#3006)
Co-authored-by: yulodl <yulodl@gmail.com>
* do not translate logic strings (#3031)
* tidy util dir based on discussions (#3030)
* [FIX] Uni V3 NFT animated SVG crash
* Switched to sslip.io instead of xip.io (#2718)
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
* Bump multihashes from 0.4.14 to 4.0.2 (#2527)
Bumps [multihashes](https://github.com/multiformats/js-multihash) from 0.4.14 to 4.0.2.
- [Release notes](https://github.com/multiformats/js-multihash/releases)
- [Changelog](https://github.com/multiformats/js-multihash/blob/master/CHANGELOG.md)
- [Commits](multiformats/js-multihash@v0.4.14...v4.0.2)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
* increase the heap size to help mitigate the out of memory issue (#3038)
* [FIX] Video Subtitles Not Loading Properly (#3029)
* updated scope of variables to reflect currently selected language
* reverted podfile.lock changes
* [2783] Change default account name for ENS reversed-resolved name (#2878)
* Fix token transfer to address (#3046)
* v3.2.0 RC (#3044)
* Swaps V2 Integration (#3013)
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
* Bump minor version
* Update changelog
* Reset changelog
* Update changelog
* updated changelog
* updated changelog
* updated changelog
* updated changelog
* format changelogs
Co-authored-by: Matthew Epps <mepps32@gmail.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Revert multihashes (#3054)
* release(3.2.0): Pump verion number (#3056)
* Remove SwapsLiveness checks for non supported networks (#3057)
* [FEATURE] Update Recents (#3028)
render recents based on items stored in redux instead of from transactions
* remove circle ci badge (#3060)
* Enable Slack Notification on Successful Build (#3055)
* create a bitrise test slack step
* updated slack script
* update import
* updated e2e scripts to include minSDK being set to 26
* revert build.sh changes
* updated request import
* switched to non-depricated package
* updated bitrise build dep
* test
* test
* Slack Message Test
* removed bitrise test triggers & remove test text from slack message
* slack test
* added test trigger
* updated bitrise format
* update require
* removed test text and triggers
* Create general issue template (#3015)
* Bump redux-persist from 5.10.0 to 6.0.0 (#2526)
Bumps [redux-persist](https://github.com/rt2zz/redux-persist) from 5.10.0 to 6.0.0.
- [Release notes](https://github.com/rt2zz/redux-persist/releases)
- [Changelog](https://github.com/rt2zz/redux-persist/blob/master/CHANGELOG.md)
- [Commits](rt2zz/redux-persist@v5.10.0...v6.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
* Bump regenerator-runtime from 0.13.1 to 0.13.9 (#2931)
Bumps [regenerator-runtime](https://github.com/facebook/regenerator) from 0.13.1 to 0.13.9.
- [Release notes](https://github.com/facebook/regenerator/releases)
- [Commits](https://github.com/facebook/regenerator/compare/regenerator-runtime@0.13.1...regenerator-runtime@0.13.9)
---
updated-dependencies:
- dependency-name: regenerator-runtime
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
* Bump @react-native-community/cookies from 4.0.1 to 5.0.1 (#3069)
Bumps [@react-native-community/cookies](https://github.com/react-native-community/cookies) from 4.0.1 to 5.0.1.
- [Release notes](https://github.com/react-native-community/cookies/releases)
- [Changelog](https://github.com/react-native-cookies/cookies/blob/master/.releaserc)
- [Commits](react-native-cookies/cookies@v4.0.1...v5.0.1)
---
updated-dependencies:
- dependency-name: "@react-native-community/cookies"
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update custom token copy (#3080)
* Make Engine .ts (#3072)
Make Engine TypeScript and leverage our Transaction Type from controllers
* fix issues 2100 (#3081)
* fix issues 2100
/**
* fix bug: #2100
* * reason: redux-persist load storage data by 'getItem' API with a timeout (5 seconds default) when app ’cold start',
* on some old devices, I/O is slow and 'readfile' operation may take long time Occasionally, when this happened, timeout
* will lead to redux-persist rehydrate state with undefined and an Error(https://github.com/rt2zz/redux-persist/blob/master/src/persistReducer.js#89).
* * solution: the easy way to fix is to set a big timeout on config, Go further, we could save 'keyring' etc some important
* data to separate files or backup for this. the second way is not complicated, we could set
* serialize and deserialize to false to get JSON object and modify setItem/getItem API to save/load data.
*/
* remove comment
* Use Logger
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Ricky Miller <ricky.miller@gmail.com>
* Bump @react-navigation/compat from 5.3.15 to 5.3.20 (#3068)
Bumps [@react-navigation/compat](https://github.com/react-navigation/react-navigation/tree/HEAD/packages/compat) from 5.3.15 to 5.3.20.
- [Release notes](https://github.com/react-navigation/react-navigation/releases)
- [Changelog](https://github.com/react-navigation/react-navigation/blob/@react-navigation/compat@5.3.20/packages/compat/CHANGELOG.md)
- [Commits](https://github.com/react-navigation/react-navigation/commits/@react-navigation/compat@5.3.20/packages/compat)
---
updated-dependencies:
- dependency-name: "@react-navigation/compat"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Integrate changes from controllers v15.0.2 (#3071)
* ignored tokens updates
* add migration
* cleanup
* bump @metamask/controllers to 15.0.2
* Add support for wallet_switchEthereumChain (#3023)
* Add support for wallet_switchEthereumChain
* updated method name
* Update app/core/RPCMethods/wallet_switchEthereumChain.js
Optimized params logic
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
* Feature/improve warning eth sign (#2852)
* remove duplicate swap translations
* updated eth_sign warning
* added styling to warning message to allow different severity of warning
* updated prop name
* updated line height for alert text
* updated line spacing per design feedback
* updated snapshot
* removed translations that were not needed
* updated snapshot
* Bump eth-url-parser from 1.0.2 to 1.0.4 (#3084)
Bumps [eth-url-parser](https://github.com/brunobar79/eth-url-parser) from 1.0.2 to 1.0.4.
- [Release notes](https://github.com/brunobar79/eth-url-parser/releases)
- [Commits](brunobar79/eth-url-parser@v1.0.2...v1.0.4)
---
updated-dependencies:
- dependency-name: eth-url-parser
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* Add typescript eslint from metamask (#3088)
* Add typescript eslint from metamask
* address new lints
Co-authored-by: Ricky Miller <ricky.miller@gmail.com>
* [FIX] Handle token icon remote resource
* Catch undefined navigate on buy eth (#3100)
* [FIX] Bug in token balance
* updated eth signing warning copy (#3103)
* Improvement/upgrade redux and tests (#3066)
* Begin converting tests to TS
* Upgrade redux. Update tests to TS and clean up.
* Remove unused line
* Leave react-redux 5.1.1 for testing purposes
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* [FEATURE] Add browser analytics
* [FIX] Fix undefined values in CustomGas component (#2977)
* Remove CustomGas component
* Removing custom gas breaks action sheet layout. Temporarily add View tag to fix this for now.
* Check lint status
* Prettify Approve view
* Remove unused warningGasPriceHigh
* update snapshot
* completely remove CustomGas
Co-authored-by: ricky <ricky.miller@gmail.com>
* Merge pull request from GHSA-rc56-6qmj-qg85
* Patch react-native & react-native-webview to remove learning from Android keyboards
* Initialize Android text input with BaseInputConnection
* Opt out of safe browsing
* Update bitrise.yml with NDK steps
* Fix bitrise.yml. Remove ds store diffs.
* Update README.md with NDK instructions
* chore: update swaps-controller and send clientId on fetchSwapsFeatureLiveness (#3101)
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* upgraded to react-native-webview 11.13.0 and applied the patches from 11.0.2
* Collectibles enhancements (#2735)
* resizemode
* margintop
* transparent
* emptystate
* snaps
* backgroundColor
* snaps
* update snapshot
* fix typo
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
Co-authored-by: Ibrahim Taveras <ibrahimtaveras@ibrahims-mbp.myfiosgateway.com>
* Improvement/upgrade redux and tests (#3066)
* Begin converting tests to TS
* Upgrade redux. Update tests to TS and clean up.
* Remove unused line
* Leave react-redux 5.1.1 for testing purposes
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
* rebase with MM develop
* Improvement/upgrade redux and tests (#3066)
* Begin converting tests to TS
* Upgrade redux. Update tests to TS and clean up.
* Remove unused line
* Leave react-redux 5.1.1 for testing purposes
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Esteban Miño <efmino@uc.cl>
Co-authored-by: Ibrahim Taveras <ibrahimtaveras@ibrahims-mbp.myfiosgateway.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Andre Pimenta <andrepimenta7@gmail.com>
Co-authored-by: ricky <ricky.miller@gmail.com>
Co-authored-by: Brennan <Mark.Brennan@lionbridge.com>
Co-authored-by: !corpitSVCUFC <!corpitSVCUFC@corpnet.liox.org>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Gustavo Antunes <gantunes@uc.cl>
Co-authored-by: yulodl <yulodl@gmail.com>
Co-authored-by: Javonne Martin <javonne.martin@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Epps <mepps32@gmail.com>
Co-authored-by: liangwu <liangwu.cas@gmail.com>
Co-authored-by: Alex Donesky <adonesky@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Cal-LCal-LCal-L approved these changes

Assignees

No one assigned

Labels

DO-NOT-MERGEPull requests that should not be merged

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@adonesky1@Cal-L