Skip to content

Merge/6.2.0 conflicts#6034

Merged
Cal-L merged 38 commits intorelease/6.2.0from
merge/6.2.0-conflicts
Mar 24, 2023
Merged

Merge/6.2.0 conflicts#6034
Cal-L merged 38 commits intorelease/6.2.0from
merge/6.2.0-conflicts

Conversation

@Cal-L
Copy link
Copy Markdown
Contributor

@Cal-L Cal-L commented Mar 24, 2023

Development & PR Process

  1. Follow MetaMask Mobile Coding Standards
  2. Add release-xx label to identify the PR slated for a upcoming release (will be used in release discussion)
  3. Add needs-dev-review label when work is completed
  4. Add needs-qa label when dev review is completed
  5. Add QA Passed label when QA has signed off

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?

Screenshots/Recordings

If applicable, add screenshots and/or recordings to visualize the before and after of your change

Issue

Progresses #???

Checklist

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

wachunei and others added 30 commits March 9, 2023 19:42
Update change log formatting and language
* set baseline time

* fix step to dismiss keyboard and add console.log to spit out launch time to console.

* add tags, create performance folder.

* remove scenario chaining

* change launch times
* draft_token_allowance

* code cleanup

* fetch token address, nickname and image

* rebased to main

* styles should match design

* toggle blockexplorer state, token image

* validate address before saving

* token symbols

* implement feedback

* updated snapshot

* rebased to main

* remove unused code

* code cleanup

* code rebase and clean

* snapshot update

* test_address rewrite

* rebased to main

* rebased to main, QA issue fix

* QA issues fix

* fix QA issues

* update snapshot

* rebased to main

* updated to use the new network controller update

* remove unneccessary fallbacks
* INFRA-837: Add sonar integration

* Update sonar branch
* Handle Vault Corruption
- trigger vault recovery flow in Login when error occurs
- fetch backup from vault and then reinitialize the engine with the
  backed up keyring
- we also destroy the old engine
- some local data might be lost but the accounts will be safe
- on fail we get them to create/import a new wallet
-  translations
* Remove select address as a prop on App index.js

* Update snapshot
Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.8.3 to 0.8.6.
- [Release notes](https://github.com/xmldom/xmldom/releases)
- [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md)
- [Commits](xmldom/xmldom@0.8.3...0.8.6)

---
updated-dependencies:
- dependency-name: "@xmldom/xmldom"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](kornelski/http-cache-semantics@v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* make detox import SRP from accounts.js file.
* extract account infos to env vars
* update e2e instructions and add vars in .js.env template

---------

Co-authored-by: Curtis <Curtis.David7@gmail.com>
* pin the sonar action to a specific commit

* format sonar file

* remove extra line from file
* pin the sonar action to a specific commit

* format sonar file

* remove extra line from file

* bump the sonar checkout action version which will use compliant version of node

* configure sonar analysis directors, test path, exclusions

* added project & file configurations

* remove test directory argument and added more exclusions

* added more exclusions

* added test inclusions and root directory for tests
* Refactor `eth_sendTransaction` method handler

The method handler for `eth_sendTransaction` has been moved to a
separate module to simplify unit testing. Unit tests have been added
as well.

This module was written in TypeScript, which asked for some additional
validation of the method parameters. We now throw a more explicit
message when the params are missing, and when the transaction
parameters are not an object. Previously the method would still throw
an error in these scenarios, just with a less helpful message. The
change in error message should be the only functional change here.

This refactor is intended to make testing PR #5619 easier.

* Support `.cjs` file extensions

The Metro configuration has been updated to support `.cjs` file
extensions. The `@metamask/utils` dependency relies upon the library
`superstruct` which uses `.cjs` for its main exported module.
…empt) (#5941)

- bundle video with embedded the subtitles in app
- add a readme in video folder to explain risks if video and subs files are moved or removed
- add a shell script running ffmpeg to regenerate the video
- remove useless constants and code related to remote SRP video resources.
* Send to multisig address.

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Linter fix.

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Revert wdio changes

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

---------

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>
… production value since the project is stilll maintained (#5978)
* user terms modal builded

* use terms modal logic implemented

* small fix on translations

* remove old terms and conditions

* remove ts ignore

* fix typo

* create a MandatoryModal component

* readme and update props to generic names

* update snapshot

* changing && to ternary operator for a more accurate ui rendering

* added margin and added component to the storybook

* implemented webview to show the ToU

* scale font size

* clean

* fix snapshot

* fix lint

* analytics

* modal mandatory more agnostic

* Clean up styles and storybook

* Clean up on accept logic

* logic on util file termsOfUse

* scrolling webview on Android and reusable modal not dismissable

* Implemented option scroll needed on ModalMandatory

* update source of use terms

* fix import

* remove margin bottom

* english translation updated

* fix button import

* modal mandatory not dismissable

* change icon name

* use terms modal on android for existing users

* ToU called only called on nav/app component

* Revert "ToU called only called on nav/app component"

This reverts commit 7f2e12f.

* fix redirect on ToU modal to acessibility website

* fix track ecent

* E2e appium/5783 tou onboarding new app installs (#5951)

* Webdriverio and Detox test scripts for Term of use feature. Test scripts updated to have the term of use steps

* Small changes to fit browserstack

* Remove static-logos.js file changes

* move terms of use to before importing or create a new allet

* Update Detox and wdio test scripts to be compatible with the recept term of use changes

* Solve lint issues

---------

Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: SamuelSalas <samuel.salas.reyes@gmail.com>
* feat: add portfolio button to asset action buttons

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

Co-authored-by: Cal Leung <cleun007@gmail.com>

* chore: move portfolio url to AppConstants

* chore: fix minor issues

* chore: add event for portfolio link clicked

* chore: add snapshot test update

* chore: add translations

* add new icon type name

* chore: move portfolio button next to net worth

* chore: add progress

* fix: tab not updating properly

* move styles to stylesheet

* fix wallet index test

* remove logs and actually fix wallet index test

* re-open existing tab instead of new tab after browser is loaded

* fix browser load, active tab not re-appearing bug

---------

Co-authored-by: Cal Leung <cleun007@gmail.com>
* clear hexdata when token updates to eth

* native token transaction data set to 0x

* use constants
A `.gitignore` entry has been added for the `artifacts` directory that
gets generated locally when a Detox iOS e2e test fails.
* detox permission system working.

* fix lint

* removing imported account steps.

* update steps in feature files.

* added constants for element locators and added new feature file

* fix linting

* update tests

* fix linting

* update test name

* delete wallet on permission system flow. need to set better timeouts to deal with toast

* remove redudant test steps.

* set baseline time

* fix step to dismiss keyboard and add console.log to spit out launch time to console.

* fix browser path

* update dapp

* fix tests from merge conflict.

* add long wait to terms of use modal to deal with flakiness on bitrise

* remove redundant test

* disabling the ToU test.
* Fix 18 JS type errors exposing 683 TS/TSX errors

Minimum required to tackle remaining errors in 120 files

Follow-up to: #5879

Fix: #5878

Next: #5882

* Fix app/core/Engine.ts lint errors

* Revert "Fix app/core/Engine.ts lint errors"

This reverts commit 7ac7011.

* Fix app/core/Engine.ts lint errors
* refactor: sdkconnect typescript rewrite and otp generation

* feat: permission management with otp deeplinks

* feat: modal ui for loading / feedback on sdk connection state

* feat: remove sdk settings from experimental

* feat: prevent empty title in transaction header

* feat: add otp in account approval modal

* feat: i18n on sdk feedback modal

* chore: cleanup comments

* chore: remove rememberme comments

* feat: use default codefi server url

* fix: missing otp actions

* chore: remove sdk from experiment description

* feat: mmsdk auto retrieve approved account on getProviderState

* chore: simplify logic for easier code readability

* feat: manage sdk backward compatibility

* feat: auto validate permission on deeplink reconnection

* fix: typo

* fix: useeffect deps

* feat: new styling of otp

* chore: remove comments

* feat: remove unnecessary view

* feat: remove unnecessary view

* chore: linting and typos

* chore: more linting adjustments

* fix: invalid json file

* fix: update jest snapshot for accountoverview

* chore: remove extra space

* feat: remove plaintext option used to debug protocol

* chore: remove unused text

* feat: move modal from drawer to root navigation

* feat: edit i18n values and remove unused text

* chore: remove console logs

* feat: use theme typography in createstyle

* feat: use navigation instead of redux store to display loading state

* feat: update snapshot after ui changes

* chore: remove unused code + linting

* fix: invalid typography

* fix: rename for valid camelcase

* chore: cleanup

* chore: remove unused code

* feat: consolidate action params within connect uri

* feat: add do not remember channel option

* feat: use useAssetFromTheme hook for loading modal

* fix: linting

* chore: remove console logs

* feat: remove sdk modal references

* feat: extract onconfirm action to component props

* fix: prevent opening inappbrowser on connect deeplink

* feat: update ui according to latest design file

* feat: prevent invalid connection interruption when paused

* feat: display sorted connection list

* feat: send metamask wallet version to connected clients

* feat: replace fontstyles with typography in account approval modal

* chore: consolidate sdk constants to AppConstants

* chore: formatting

* fix: duplicated imports

* build: update communication layer dep to 0.2.0

* chore: disable debug logs

* chore: prevent linting error

* chore: remove comm layer

* chore: linting

* feat: replace navigation.goback with sheetRef.hide

* feat: remove fontSize when using typography

* feat: use Icon library instead of fontawesome

* feat: catchall title value

* feat: catchall title value
wachunei and others added 8 commits March 22, 2023 18:38
* Account selector on swaps screen

* remove unused import

* update with comment and without justify content

* update with previous selected address

* add ellipsis to the account name if it is more than 13 chars
* feat: add consensys zkevm support

* fix: change consensys zkevm network name to Linea + change rpc url

* feat: add feature toggle for linea network

* feat: add two utility functions for block explorer url

* feat: add patches to support lineatestnet

* fix: add linea testnet as rpc network

* fix: updates imports
…results in wrong values beign displayed on the Amount screen (#5961)

* use setState callback to call onInputChange

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* E2E for currency switch

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Lint fix

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Update snapshot

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

---------

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>
@Cal-L Cal-L requested a review from a team as a code owner March 24, 2023 02:33
@github-actions
Copy link
Copy Markdown
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

Copy link
Copy Markdown
Contributor

@tommasini tommasini left a comment

Choose a reason for hiding this comment

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

LGTM

@Cal-L Cal-L merged commit ee529a8 into release/6.2.0 Mar 24, 2023
@Cal-L Cal-L deleted the merge/6.2.0-conflicts branch March 24, 2023 02:34
@github-actions github-actions bot locked and limited conversation to collaborators Mar 24, 2023
@Cal-L Cal-L restored the merge/6.2.0-conflicts branch March 24, 2023 02:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.