Skip to content

Commit dca23ea

Browse files
authored
Merge branch 'develop' into feat-migration-122-redesignedConfirmationsEnabled
2 parents d1e39ba + 0188ff8 commit dca23ea

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

app/scripts/lib/snap-keyring/keyring-snaps-permissions.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const PORTFOLIO_ORIGINS: string[] = [
1111
'https://portfolio.metamask.io',
1212
///: BEGIN:ONLY_INCLUDE_IF(build-flask)
1313
'https://dev.portfolio.metamask.io',
14+
'https://stage.portfolio.metamask.io',
1415
'https://ramps-dev.portfolio.metamask.io',
1516
///: END:ONLY_INCLUDE_IF
1617
];

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
"@metamask/approval-controller": "^7.0.0",
295295
"@metamask/assets-controllers": "^34.0.0",
296296
"@metamask/base-controller": "^5.0.1",
297-
"@metamask/bitcoin-wallet-snap": "^0.2.2",
297+
"@metamask/bitcoin-wallet-snap": "^0.2.3",
298298
"@metamask/browser-passworder": "^4.3.0",
299299
"@metamask/contract-metadata": "^2.5.0",
300300
"@metamask/controller-utils": "^10.0.0",

ui/components/multichain/pages/send/index.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
@use "design-system";
22

33
.multichain-send-page {
4-
width: 100%;
4+
width: 408px;
5+
6+
@media (max-width: 371px) {
7+
width: 100%;
8+
}
59

610
&__account-picker {
711
height: 62px;

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4921,10 +4921,10 @@ __metadata:
49214921
languageName: node
49224922
linkType: hard
49234923

4924-
"@metamask/bitcoin-wallet-snap@npm:^0.2.2":
4925-
version: 0.2.2
4926-
resolution: "@metamask/bitcoin-wallet-snap@npm:0.2.2"
4927-
checksum: 10/61ae7fbb2abaca74b4304504fd0d07c093204519a31cbedb9b89d7cc3e02fdd5317e82d5b9816e7e31bfb171584dd496d1c3008df391decd2e4e0f29f4b453de
4924+
"@metamask/bitcoin-wallet-snap@npm:^0.2.3":
4925+
version: 0.2.3
4926+
resolution: "@metamask/bitcoin-wallet-snap@npm:0.2.3"
4927+
checksum: 10/123dd6a2e0e7fba88050d4350fddbba560a57877d377f21e72a7245cda85dcccde9ed514415c5824d517ac1f0fb0d666caf61d7cfb5edfc43ae726b095aa2df1
49284928
languageName: node
49294929
linkType: hard
49304930

@@ -25195,7 +25195,7 @@ __metadata:
2519525195
"@metamask/assets-controllers": "npm:^34.0.0"
2519625196
"@metamask/auto-changelog": "npm:^2.1.0"
2519725197
"@metamask/base-controller": "npm:^5.0.1"
25198-
"@metamask/bitcoin-wallet-snap": "npm:^0.2.2"
25198+
"@metamask/bitcoin-wallet-snap": "npm:^0.2.3"
2519925199
"@metamask/browser-passworder": "npm:^4.3.0"
2520025200
"@metamask/build-utils": "npm:^1.0.0"
2520125201
"@metamask/contract-metadata": "npm:^2.5.0"

0 commit comments

Comments
 (0)