Skip to content

Commit f7102f7

Browse files
authored
Merge branch 'main' into gas_display_fix
2 parents 56bb24d + b9c5763 commit f7102f7

File tree

14 files changed

+162
-163
lines changed

14 files changed

+162
-163
lines changed

app/scripts/controllers/permissions/background-api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import nanoid from 'nanoid';
1+
import { nanoid } from 'nanoid';
22
import {
33
CaveatTypes,
44
RestrictedMethods,

app/scripts/metamask-controller.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import { rawChainData } from 'eth-chainlist';
4747
import { MetaMaskKeyring as QRHardwareKeyring } from '@keystonehq/metamask-airgapped-keyring';
4848
import EthQuery from '@metamask/eth-query';
4949
import EthJSQuery from '@metamask/ethjs-query';
50-
import nanoid from 'nanoid';
50+
import { nanoid } from 'nanoid';
5151
import { captureException } from '@sentry/browser';
5252
import { AddressBookController } from '@metamask/address-book-controller';
5353
import {

lavamoat/browserify/beta/policy.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -637,9 +637,9 @@
637637
"console.info": true
638638
},
639639
"packages": {
640-
"@metamask/approval-controller>nanoid": true,
641640
"@metamask/base-controller": true,
642-
"@metamask/rpc-errors": true
641+
"@metamask/rpc-errors": true,
642+
"nanoid": true
643643
}
644644
},
645645
"@metamask/approval-controller>nanoid": {
@@ -1959,11 +1959,11 @@
19591959
"@metamask/base-controller": true,
19601960
"@metamask/controller-utils": true,
19611961
"@metamask/json-rpc-engine": true,
1962-
"@metamask/permission-controller>nanoid": true,
19631962
"@metamask/rpc-errors": true,
19641963
"@metamask/utils": true,
19651964
"deep-freeze-strict": true,
1966-
"immer": true
1965+
"immer": true,
1966+
"nanoid": true
19671967
}
19681968
},
19691969
"@metamask/permission-controller>nanoid": {
@@ -2446,7 +2446,6 @@
24462446
"@metamask/snaps-controllers>@xstate/fsm": true,
24472447
"@metamask/snaps-controllers>concat-stream": true,
24482448
"@metamask/snaps-controllers>get-npm-tarball-url": true,
2449-
"@metamask/snaps-controllers>nanoid": true,
24502449
"@metamask/snaps-controllers>readable-web-to-node-stream": true,
24512450
"@metamask/snaps-controllers>tar-stream": true,
24522451
"@metamask/snaps-rpc-methods": true,
@@ -2457,6 +2456,7 @@
24572456
"browserify>browserify-zlib": true,
24582457
"eslint>fast-deep-equal": true,
24592458
"immer": true,
2459+
"nanoid": true,
24602460
"readable-stream": true,
24612461
"semver": true
24622462
}
@@ -4514,9 +4514,7 @@
45144514
},
45154515
"nanoid": {
45164516
"globals": {
4517-
"crypto": true,
4518-
"msCrypto": true,
4519-
"navigator": true
4517+
"crypto.getRandomValues": true
45204518
}
45214519
},
45224520
"nock>debug": {

lavamoat/browserify/flask/policy.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -637,9 +637,9 @@
637637
"console.info": true
638638
},
639639
"packages": {
640-
"@metamask/approval-controller>nanoid": true,
641640
"@metamask/base-controller": true,
642-
"@metamask/rpc-errors": true
641+
"@metamask/rpc-errors": true,
642+
"nanoid": true
643643
}
644644
},
645645
"@metamask/approval-controller>nanoid": {
@@ -1959,11 +1959,11 @@
19591959
"@metamask/base-controller": true,
19601960
"@metamask/controller-utils": true,
19611961
"@metamask/json-rpc-engine": true,
1962-
"@metamask/permission-controller>nanoid": true,
19631962
"@metamask/rpc-errors": true,
19641963
"@metamask/utils": true,
19651964
"deep-freeze-strict": true,
1966-
"immer": true
1965+
"immer": true,
1966+
"nanoid": true
19671967
}
19681968
},
19691969
"@metamask/permission-controller>nanoid": {
@@ -2446,7 +2446,6 @@
24462446
"@metamask/snaps-controllers>@xstate/fsm": true,
24472447
"@metamask/snaps-controllers>concat-stream": true,
24482448
"@metamask/snaps-controllers>get-npm-tarball-url": true,
2449-
"@metamask/snaps-controllers>nanoid": true,
24502449
"@metamask/snaps-controllers>readable-web-to-node-stream": true,
24512450
"@metamask/snaps-controllers>tar-stream": true,
24522451
"@metamask/snaps-rpc-methods": true,
@@ -2457,6 +2456,7 @@
24572456
"browserify>browserify-zlib": true,
24582457
"eslint>fast-deep-equal": true,
24592458
"immer": true,
2459+
"nanoid": true,
24602460
"readable-stream": true,
24612461
"semver": true
24622462
}
@@ -4514,9 +4514,7 @@
45144514
},
45154515
"nanoid": {
45164516
"globals": {
4517-
"crypto": true,
4518-
"msCrypto": true,
4519-
"navigator": true
4517+
"crypto.getRandomValues": true
45204518
}
45214519
},
45224520
"nock>debug": {

lavamoat/browserify/main/policy.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -637,9 +637,9 @@
637637
"console.info": true
638638
},
639639
"packages": {
640-
"@metamask/approval-controller>nanoid": true,
641640
"@metamask/base-controller": true,
642-
"@metamask/rpc-errors": true
641+
"@metamask/rpc-errors": true,
642+
"nanoid": true
643643
}
644644
},
645645
"@metamask/approval-controller>nanoid": {
@@ -1959,11 +1959,11 @@
19591959
"@metamask/base-controller": true,
19601960
"@metamask/controller-utils": true,
19611961
"@metamask/json-rpc-engine": true,
1962-
"@metamask/permission-controller>nanoid": true,
19631962
"@metamask/rpc-errors": true,
19641963
"@metamask/utils": true,
19651964
"deep-freeze-strict": true,
1966-
"immer": true
1965+
"immer": true,
1966+
"nanoid": true
19671967
}
19681968
},
19691969
"@metamask/permission-controller>nanoid": {
@@ -2446,7 +2446,6 @@
24462446
"@metamask/snaps-controllers>@xstate/fsm": true,
24472447
"@metamask/snaps-controllers>concat-stream": true,
24482448
"@metamask/snaps-controllers>get-npm-tarball-url": true,
2449-
"@metamask/snaps-controllers>nanoid": true,
24502449
"@metamask/snaps-controllers>readable-web-to-node-stream": true,
24512450
"@metamask/snaps-controllers>tar-stream": true,
24522451
"@metamask/snaps-rpc-methods": true,
@@ -2457,6 +2456,7 @@
24572456
"browserify>browserify-zlib": true,
24582457
"eslint>fast-deep-equal": true,
24592458
"immer": true,
2459+
"nanoid": true,
24602460
"readable-stream": true,
24612461
"semver": true
24622462
}
@@ -4514,9 +4514,7 @@
45144514
},
45154515
"nanoid": {
45164516
"globals": {
4517-
"crypto": true,
4518-
"msCrypto": true,
4519-
"navigator": true
4517+
"crypto.getRandomValues": true
45204518
}
45214519
},
45224520
"nock>debug": {

lavamoat/browserify/mmi/policy.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -729,9 +729,9 @@
729729
"console.info": true
730730
},
731731
"packages": {
732-
"@metamask/approval-controller>nanoid": true,
733732
"@metamask/base-controller": true,
734-
"@metamask/rpc-errors": true
733+
"@metamask/rpc-errors": true,
734+
"nanoid": true
735735
}
736736
},
737737
"@metamask/approval-controller>nanoid": {
@@ -2051,11 +2051,11 @@
20512051
"@metamask/base-controller": true,
20522052
"@metamask/controller-utils": true,
20532053
"@metamask/json-rpc-engine": true,
2054-
"@metamask/permission-controller>nanoid": true,
20552054
"@metamask/rpc-errors": true,
20562055
"@metamask/utils": true,
20572056
"deep-freeze-strict": true,
2058-
"immer": true
2057+
"immer": true,
2058+
"nanoid": true
20592059
}
20602060
},
20612061
"@metamask/permission-controller>nanoid": {
@@ -2538,7 +2538,6 @@
25382538
"@metamask/snaps-controllers>@xstate/fsm": true,
25392539
"@metamask/snaps-controllers>concat-stream": true,
25402540
"@metamask/snaps-controllers>get-npm-tarball-url": true,
2541-
"@metamask/snaps-controllers>nanoid": true,
25422541
"@metamask/snaps-controllers>readable-web-to-node-stream": true,
25432542
"@metamask/snaps-controllers>tar-stream": true,
25442543
"@metamask/snaps-rpc-methods": true,
@@ -2549,6 +2548,7 @@
25492548
"browserify>browserify-zlib": true,
25502549
"eslint>fast-deep-equal": true,
25512550
"immer": true,
2551+
"nanoid": true,
25522552
"readable-stream": true,
25532553
"semver": true
25542554
}
@@ -4606,9 +4606,7 @@
46064606
},
46074607
"nanoid": {
46084608
"globals": {
4609-
"crypto": true,
4610-
"msCrypto": true,
4611-
"navigator": true
4609+
"crypto.getRandomValues": true
46124610
}
46134611
},
46144612
"nock>debug": {

lavamoat/build-system/policy.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6510,7 +6510,7 @@
65106510
"process.env.NODE_ENV": true
65116511
},
65126512
"packages": {
6513-
"postcss>nanoid": true,
6513+
"nanoid": true,
65146514
"postcss>picocolors": true,
65156515
"postcss>source-map-js": true
65166516
}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@
398398
"loglevel": "^1.8.1",
399399
"lottie-web": "^5.12.2",
400400
"luxon": "^3.2.1",
401-
"nanoid": "^2.1.6",
401+
"nanoid": "^3.3.8",
402402
"pify": "^5.0.0",
403403
"promise-to-callback": "^1.0.0",
404404
"prop-types": "^15.6.1",

test/e2e/page-objects/pages/account-list-page.ts

+13
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,19 @@ class AccountListPage {
547547
});
548548
}
549549

550+
/**
551+
* Verifies that all occurrences of the account balance value and symbol are displayed as private.
552+
*
553+
*/
554+
async check_balanceIsPrivateEverywhere(): Promise<void> {
555+
console.log(`Verify all account balance occurrences are private`);
556+
const balanceSelectors = {
557+
tag: 'span',
558+
text: '••••••',
559+
};
560+
await this.driver.elementCountBecomesN(balanceSelectors, 6);
561+
}
562+
550563
async check_currentAccountIsImported(): Promise<void> {
551564
console.log(`Check that current account is an imported account`);
552565
await this.driver.waitForSelector({

test/e2e/page-objects/pages/header-navbar.ts

+12-7
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,6 @@ class HeaderNavbar {
8080
await this.driver.clickElement(this.switchNetworkDropDown);
8181
}
8282

83-
async check_currentSelectedNetwork(networkName: string): Promise<void> {
84-
console.log(`Validate the Switch network to ${networkName}`);
85-
await this.driver.waitForSelector(
86-
`button[data-testid="network-display"][aria-label="Network Menu ${networkName}"]`,
87-
);
88-
}
89-
9083
/**
9184
* Verifies that the displayed account label in header matches the expected label.
9285
*
@@ -101,6 +94,18 @@ class HeaderNavbar {
10194
text: expectedLabel,
10295
});
10396
}
97+
98+
/**
99+
* Validates that the currently selected network matches the expected network name.
100+
*
101+
* @param networkName - The expected name of the currently selected network.
102+
*/
103+
async check_currentSelectedNetwork(networkName: string): Promise<void> {
104+
console.log(`Validate the Switch network to ${networkName}`);
105+
await this.driver.waitForSelector(
106+
`button[data-testid="network-display"][aria-label="Network Menu ${networkName}"]`,
107+
);
108+
}
104109
}
105110

106111
export default HeaderNavbar;

test/e2e/page-objects/pages/home/homepage.ts

+29-8
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ class HomePage {
88

99
public headerNavbar: HeaderNavbar;
1010

11-
private readonly activityTab =
12-
'[data-testid="account-overview__activity-tab"]';
11+
private readonly activityTab = {
12+
testId: 'account-overview__activity-tab',
13+
};
1314

1415
private readonly balance = '[data-testid="eth-overview__primary-currency"]';
1516

@@ -23,19 +24,35 @@ class HomePage {
2324
tag: 'h6',
2425
};
2526

26-
private readonly erc20TokenDropdown = '[data-testid="import-token-button"]';
27+
private readonly erc20TokenDropdown = {
28+
testId: 'import-token-button',
29+
};
2730

28-
private readonly nftTab = '[data-testid="account-overview__nfts-tab"]';
31+
private readonly nftTab = {
32+
testId: 'account-overview__nfts-tab',
33+
};
2934

3035
private readonly popoverBackground = '.popover-bg';
3136

32-
private readonly popoverCloseButton = '[data-testid="popover-close"]';
37+
private readonly popoverCloseButton = {
38+
testId: 'popover-close',
39+
};
3340

34-
private readonly refreshErc20Tokens = '[data-testid="refreshList"]';
41+
private readonly privacyBalanceToggle = {
42+
testId: 'sensitive-toggle',
43+
};
3544

36-
private readonly sendButton = '[data-testid="eth-overview-send"]';
45+
private readonly refreshErc20Tokens = {
46+
testId: 'refreshList',
47+
};
3748

38-
private readonly tokensTab = '[data-testid="account-overview__asset-tab"]';
49+
private readonly sendButton = {
50+
testId: 'eth-overview-send',
51+
};
52+
53+
private readonly tokensTab = {
54+
testId: 'account-overview__asset-tab',
55+
};
3956

4057
constructor(driver: Driver) {
4158
this.driver = driver;
@@ -93,6 +110,10 @@ class HomePage {
93110
await this.driver.clickElement(this.sendButton);
94111
}
95112

113+
async togglePrivacyBalance(): Promise<void> {
114+
await this.driver.clickElement(this.privacyBalanceToggle);
115+
}
116+
96117
/**
97118
* Checks if the toaster message for adding a network is displayed on the homepage.
98119
*

0 commit comments

Comments
 (0)