Skip to content

Commit

Permalink
Merge branch 'develop' into feature/17670-cancel-speedup-popover
Browse files Browse the repository at this point in the history
  • Loading branch information
georgewrmarshall authored Jun 19, 2023
2 parents 73307fd + 8a85d22 commit a6fb0dd
Show file tree
Hide file tree
Showing 639 changed files with 33,287 additions and 16,881 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ jobs:
command: |
if .circleci/scripts/test-run-e2e.sh
then
yarn test:e2e:chrome --retries 2
yarn test:e2e:chrome --retries 2 --debug
fi
no_output_timeout: 20m
- run:
Expand Down Expand Up @@ -692,7 +692,7 @@ jobs:
command: |
if .circleci/scripts/test-run-e2e.sh
then
yarn test:e2e:chrome --retries 2 --mv3 || echo "Temporarily suppressing MV3 e2e test failures"
yarn test:e2e:chrome --retries 2 --debug --mv3 || echo "Temporarily suppressing MV3 e2e test failures"
fi
no_output_timeout: 20m
- store_artifacts:
Expand Down Expand Up @@ -720,7 +720,7 @@ jobs:
command: |
if .circleci/scripts/test-run-e2e.sh
then
yarn test:e2e:firefox:snaps --retries 2
yarn test:e2e:firefox:snaps --retries 2 --debug
fi
no_output_timeout: 20m
- run:
Expand Down Expand Up @@ -757,7 +757,7 @@ jobs:
command: |
if .circleci/scripts/test-run-e2e.sh
then
yarn test:e2e:chrome:snaps --retries 2
yarn test:e2e:chrome:snaps --retries 2 --debug
fi
no_output_timeout: 20m
- run:
Expand Down Expand Up @@ -794,7 +794,7 @@ jobs:
command: |
if .circleci/scripts/test-run-e2e.sh
then
yarn test:e2e:firefox --retries 2
yarn test:e2e:firefox --retries 2 --debug
fi
no_output_timeout: 20m
- run:
Expand Down
4 changes: 3 additions & 1 deletion .iyarc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ GHSA-257v-vj4p-3w2h

# request library is subject to SSRF.
# addressed by temporary patch in .yarn/patches/request-npm-2.88.2-f4a57c72c4.patch
GHSA-p8p7-x288-28g6
# NOTE: Disabled for now since this library seems to have been removed from the
# dependency tree — we can re-enable this line later if it appears again
#GHSA-p8p7-x288-28g6
1 change: 0 additions & 1 deletion .metamaskrc.dist
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ INFURA_PROJECT_ID=00000000000
;SWAPS_USE_DEV_APIS=
;PORTFOLIO_URL=
;TRANSACTION_SECURITY_PROVIDER=
;MULTICHAIN=

; Set this to test changes to the phishing warning page.
;PHISHING_WARNING_PAGE_URL=
168 changes: 103 additions & 65 deletions .storybook/initial-states/approval-screens/add-suggested-token.js
Original file line number Diff line number Diff line change
@@ -1,83 +1,121 @@
export const suggestedAssets = [
{
asset: {
address: '0x6b175474e89094c44da98b954eedeac495271d0f',
symbol: 'ETH',
decimals: 18,
image: './images/eth_logo.png',
unlisted: false,
import { ApprovalType } from '@metamask/controller-utils';

export const pendingTokenApprovals = {
1: {
id: 1,
type: ApprovalType.WatchAsset,
requestData: {
asset: {
address: '0x6b175474e89094c44da98b954eedeac495271d0f',
symbol: 'ETH',
decimals: 18,
image: './images/eth_logo.png',
unlisted: false,
},
},
},
{
asset: {
address: '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
symbol: '0X',
decimals: 18,
image: '0x.svg',
unlisted: false,
2: {
id: 2,
type: ApprovalType.WatchAsset,
requestData: {
asset: {
address: '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
symbol: '0X',
decimals: 18,
image: '0x.svg',
unlisted: false,
},
},
},
{
asset: {
address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
symbol: 'AST',
decimals: 18,
image: 'ast.png',
unlisted: false,
3: {
id: 3,
type: ApprovalType.WatchAsset,
requestData: {
asset: {
address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
symbol: 'AST',
decimals: 18,
image: 'ast.png',
unlisted: false,
},
},
},
{
asset: {
address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
symbol: 'BAT',
decimals: 18,
image: 'BAT_icon.svg',
unlisted: false,
4: {
id: 4,
type: ApprovalType.WatchAsset,
requestData: {
asset: {
address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
symbol: 'BAT',
decimals: 18,
image: 'BAT_icon.svg',
unlisted: false,
},
},
},
{
asset: {
address: '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1',
symbol: 'CVL',
decimals: 18,
image: 'CVL_token.svg',
unlisted: false,
5: {
id: 5,
type: ApprovalType.WatchAsset,
requestData: {
asset: {
address: '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1',
symbol: 'CVL',
decimals: 18,
image: 'CVL_token.svg',
unlisted: false,
},
},
},
{
asset: {
address: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
symbol: 'GLA',
decimals: 18,
image: 'gladius.svg',
unlisted: false,
6: {
id: 6,
type: ApprovalType.WatchAsset,
requestData: {
asset: {
address: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
symbol: 'GLA',
decimals: 18,
image: 'gladius.svg',
unlisted: false,
},
},
},
{
asset: {
address: '0x467Bccd9d29f223BcE8043b84E8C8B282827790F',
symbol: 'GNO',
decimals: 18,
image: 'gnosis.svg',
unlisted: false,
7: {
id: 7,
type: ApprovalType.WatchAsset,
requestData: {
asset: {
address: '0x467Bccd9d29f223BcE8043b84E8C8B282827790F',
symbol: 'GNO',
decimals: 18,
image: 'gnosis.svg',
unlisted: false,
},
},
},
{
asset: {
address: '0xff20817765cb7f73d4bde2e66e067e58d11095c2',
symbol: 'OMG',
decimals: 18,
image: 'omg.jpg',
unlisted: false,
8: {
id: 8,
type: ApprovalType.WatchAsset,
requestData: {
asset: {
address: '0xff20817765cb7f73d4bde2e66e067e58d11095c2',
symbol: 'OMG',
decimals: 18,
image: 'omg.jpg',
unlisted: false,
},
},
},
{
asset: {
address: '0x8e870d67f660d95d5be530380d0ec0bd388289e1',
symbol: 'WED',
decimals: 18,
image: 'wed.png',
unlisted: false,
9: {
id: 9,
type: ApprovalType.WatchAsset,
requestData: {
asset: {
address: '0x8e870d67f660d95d5be530380d0ec0bd388289e1',
symbol: 'WED',
decimals: 18,
image: 'wed.png',
unlisted: false,
},
},
},
];
};
Loading

0 comments on commit a6fb0dd

Please sign in to comment.