Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit839eae4

Browse files
Merge branch 'main' into fix/updated-usetheme-hook-for-logo
2 parents6e878b9 +1708fa2 commit839eae4

File tree

87 files changed

+3303
-1384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+3303
-1384
lines changed

‎CHANGELOG.md‎

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,88 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
##[Unreleased]
99

10+
##[13.10.0]
11+
12+
###Added
13+
14+
- Updated Shield settings banner ui, copywriting and text colors (#37791)
15+
- Updated texts and notes for shield plan page (#37800)
16+
- Supports tron in the swaps and bridge experience (#37683)
17+
- Show Shield Settings billing account name in full (#37797)
18+
- Add generic Platform Notification support (#37709)
19+
- Introduced sidepanel (#37304)
20+
- Adds shield membership event metrics (#37767)
21+
- Adds new events for shield eligibility and priority support (#37822)
22+
- Updated text on Claims Form top details (#37770)
23+
- Added metrics tracking for the new Subscriptions (#37735)
24+
- Updated error codes for shield rule engine (#37748)
25+
- Adds animation to Shield Entry Modal Illustration (#37686)
26+
- Updated Transaction Shield page UI and added animated icons (#37692)
27+
- Improved initial cross ecosystem connection flows by preselecting all supported chains (EVM + Solana) when connecting through (#37088)
28+
injected providers
29+
- Updated Shield Entry modal UI and added fullscreen mode (#37594)
30+
- All coverage statuses show a background of a lighter text color (#37580)
31+
Gray status for not covered shield coverage status
32+
Icon i info for all shield coverage status alert
33+
Fix shield coverage status for simple send not showing
34+
Onlys how shield footer indicator for
35+
signature/transaction confirmation
36+
- Implement cohort-based gating system for Shield entry modal display (#37651)
37+
- Keep shield transaction claimable after subscription cancelled (#37700)
38+
navigate back to shield plan if showing cancelled
39+
subscription and user press renew
40+
- Added gas sponsorship for shield trial subscriptions (#37441)
41+
- Enable automatic updates of preinstalled Snaps (#37610)
42+
- Get required configurations for shield claims process from the backend (#37693)
43+
- Virtualize the Tokens list (#37589)
44+
- Add Shield entry modal to settings page (#37606)
45+
- Added automatic account upgrade support (#37571)
46+
- Added support for Tron (#35984)
47+
- Support ignoring non-evm tokens (#37423)
48+
- Added`@metamask/claims-controller` for shield claims Added Claim Signature Generation (#37597)
49+
- Support importing non-evm tokens (#37501)
50+
- Shield plan copywriting update and removed footer note (#37595)
51+
- Show Priority Tag on Menu > Support when shield subscription is active or paused (#37590)
52+
53+
###Fixed
54+
55+
- Fixed evaluateCohortEligibility call in home page just after the onboarding is completed (#37803)
56+
- Fixed shield coverage alert title for the Signature requests (#37799)
57+
- Fixes shield metrics events wrt to eventSource and cohort props (#37783)
58+
- Permissions screen height (#37812)
59+
- Added missing metrics to import SRP flow (#37567)
60+
- Shows token balance for gas tokens if fiat balance is disabled in settings (#37738)
61+
- Updates confirmations logic for sidepanel (#37778)
62+
- Used feature flag to only show this change when sidepanel flag is enabled for chrome. Updated button on wallet creation (#37782)
63+
successful page from 'Done' to 'Open wallet'
64+
- Applied the settings theme to modify the background color of the unlock page (#37726)
65+
- Fix subscription default card payment method not saved (#37774)
66+
- Adds a hovered component when the address link is hovered over (#37539)
67+
- Added back hardware wallet device selection on expanded view in the context of sidepanel (#37731)
68+
- Fixed account details menu appearing in dapp connection account selection (#37704)
69+
- Fix design defects and show all native assets regardless of balance in send flow (#37613)
70+
- Fixed backup and sync toggle not persisting user's choice during onboarding (#37578)
71+
- Disable default "Alert" text and the arrow for inline Confirmation alerts (#37542)
72+
- Fixed bridging with qr-based wallets (#37549)
73+
- Validate seedphrase when user paste the data (#37611)
74+
- Fix incorrect token approval amount when change shield plan (#37585)
75+
- Show dest token symbol in HW approval label (#37629)
76+
- Smart transaction send and receive copy (#36229)
77+
- Fixed "Premature close" stream errors in extension context by adding graceful shutdown handlers (#37400)
78+
- Removed deprecated network warnings that were displayed at the bottom of the extension (#37702)
79+
- Use preferred avatar in site tooltip (#37634)
80+
- Filter Tron Energy/Bandwidth assets on token list (#37699)
81+
- Updates Shield Terms of Use URL (#37769)
82+
- Updates Shield confirmation messages (#37829)
83+
- Adds`from` and`to` fields to the send confirmation view (#37906)
84+
- Fixes menu height overflow (#37915)
85+
- Fixes crash when clicking away from swap flow (#37922)
86+
- Fixes styling in`MultichainHoveredAddressRowsList` and`MultichainAggregatedAddressListRow` components (#37792)
87+
- Fixes a bug that was not copying the checksummed address (#37939)
88+
- Updates Predict deeplink handler (#37907)
89+
- Fixes`Open full screen` text (#37916)
90+
- Adds the support link back in unlock page (#37967)
91+
1092
##[13.9.0]
1193

1294
###Added
@@ -1135,7 +1217,8 @@ authorized by the user.` error until the user fully revoked dapp
11351217
- This changelog was split off with 12.22.0
11361218
- All older changes can be found in[docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md)
11371219

1138-
[Unreleased]:https://github.com/MetaMask/metamask-extension/compare/v13.9.0...HEAD
1220+
[Unreleased]:https://github.com/MetaMask/metamask-extension/compare/v13.10.0...HEAD
1221+
[13.10.0]:https://github.com/MetaMask/metamask-extension/compare/v13.9.0...v13.10.0
11391222
[13.9.0]:https://github.com/MetaMask/metamask-extension/compare/v13.8.0...v13.9.0
11401223
[13.8.0]:https://github.com/MetaMask/metamask-extension/compare/v13.7.0...v13.8.0
11411224
[13.7.0]:https://github.com/MetaMask/metamask-extension/compare/v13.6.0...v13.7.0

‎app/_locales/en/messages.json‎

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎app/_locales/en_GB/messages.json‎

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Loading

‎app/scripts/app-init.js‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,20 +147,6 @@ function importAllScripts() {
147147
// eslint-disable-next-line no-undef
148148
self.addEventListener('install',importAllScripts);
149149

150-
/*
151-
* A keepalive message listener to prevent Service Worker getting shut down due to inactivity.
152-
* UI sends the message periodically, in a setInterval.
153-
* Chrome will revive the service worker if it was shut down, whenever a new message is sent, but only if a listener was defined here.
154-
*
155-
* chrome below needs to be replaced by cross-browser object,
156-
* but there is issue in importing webextension-polyfill into service worker.
157-
* chrome does seems to work in at-least all chromium based browsers
158-
*/
159-
chrome.runtime.onMessage.addListener(()=>{
160-
importAllScripts();
161-
returnfalse;
162-
});
163-
164150
/*
165151
* If the service worker is stopped and restarted, then the 'install' event will not occur
166152
* and the chrome.runtime.onMessage will only occur if it was a message that restarted the

‎app/scripts/controller-init/messengers/snaps/snap-controller-messenger.ts‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ import { NetworkControllerGetNetworkClientByIdAction } from '@metamask/network-c
4444
import{PreferencesControllerGetStateAction}from'../../../controllers/preferences-controller';
4545
import{MetaMetricsControllerTrackEventAction}from'../../../controllers/metametrics-controller';
4646
import{RootMessenger}from'../../../lib/messenger';
47+
import{
48+
OnboardingControllerGetStateAction,
49+
OnboardingControllerStateChangeEvent,
50+
}from'../../../controllers/onboarding';
4751

4852
typeActions=
4953
|GetEndowments
@@ -148,9 +152,13 @@ type InitActions =
148152
|KeyringControllerGetKeyringsByTypeAction
149153
|PreferencesControllerGetStateAction
150154
|MetaMetricsControllerTrackEventAction
151-
|SetClientActive;
155+
|SetClientActive
156+
|OnboardingControllerGetStateAction;
152157

153-
typeInitEvents=KeyringControllerUnlockEvent|KeyringControllerLockEvent;
158+
typeInitEvents=
159+
|KeyringControllerUnlockEvent
160+
|KeyringControllerLockEvent
161+
|OnboardingControllerStateChangeEvent;
154162

155163
exporttypeSnapControllerInitMessenger=ReturnType<
156164
typeofgetSnapControllerInitMessenger
@@ -182,8 +190,13 @@ export function getSnapControllerInitMessenger(
182190
'PreferencesController:getState',
183191
'MetaMetricsController:trackEvent',
184192
'SnapController:setClientActive',
193+
'OnboardingController:getState',
194+
],
195+
events:[
196+
'KeyringController:lock',
197+
'KeyringController:unlock',
198+
'OnboardingController:stateChange',
185199
],
186-
events:['KeyringController:lock','KeyringController:unlock'],
187200
});
188201
returncontrollerInitMessenger;
189202
}

‎app/scripts/controller-init/snaps/snap-controller-init.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ describe('SnapControllerInit', () => {
6868
getMnemonicSeed:expect.any(Function),
6969
preinstalledSnaps:expect.any(Array),
7070
trackEvent:expect.any(Function),
71+
ensureOnboardingComplete:expect.any(Function),
7172
});
7273
});
7374

‎app/scripts/controller-init/snaps/snap-controller-init.ts‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{SnapController}from'@metamask/snaps-controllers';
2-
import{hasProperty,Json}from'@metamask/utils';
2+
import{createDeferredPromise,hasProperty,Json}from'@metamask/utils';
33
import{ControllerInitFunction}from'../types';
44
import{
55
EndowmentPermissions,
@@ -13,6 +13,7 @@ import {
1313
SnapControllerMessenger,
1414
}from'../messengers/snaps';
1515
import{getBooleanFlag}from'../../lib/util';
16+
import{OnboardingControllerState}from'../../controllers/onboarding';
1617

1718
// Copied from `@metamask/snaps-controllers`, since it is not exported.
1819
typeTrackingEventPayload={
@@ -93,6 +94,34 @@ export const SnapControllerInit: ControllerInitFunction<
9394
};
9495
}
9596

97+
/**
98+
* Async function that resolves when onboarding has been completed.
99+
*
100+
*@returns A promise that resolves when onboarding is complete.
101+
*/
102+
asyncfunctionensureOnboardingComplete(){
103+
const{ completedOnboarding}=initMessenger.call(
104+
'OnboardingController:getState',
105+
);
106+
107+
if(completedOnboarding){
108+
return;
109+
}
110+
111+
const{ promise, resolve}=createDeferredPromise();
112+
113+
constlistener=(state:OnboardingControllerState)=>{
114+
if(state.completedOnboarding){
115+
resolve();
116+
initMessenger.unsubscribe('OnboardingController:stateChange',listener);
117+
}
118+
};
119+
120+
initMessenger.subscribe('OnboardingController:stateChange',listener);
121+
122+
awaitpromise;
123+
}
124+
96125
constcontroller=newSnapController({
97126
environmentEndowmentPermissions:Object.values(EndowmentPermissions),
98127
excludedPermissions:{
@@ -131,6 +160,8 @@ export const SnapControllerInit: ControllerInitFunction<
131160
preinstalledSnaps,
132161
getFeatureFlags,
133162

163+
ensureOnboardingComplete,
164+
134165
// `TrackEventHook` from `snaps-controllers` uses `Json | undefined` for
135166
// properties, but `MetaMetricsEventPayload` uses `Json`, even though
136167
// `undefined` is supported.

‎app/scripts/controller-init/snaps/snaps-registry-init.test.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ function getInitRequestMock(): jest.Mocked<
2525
}
2626

2727
describe('SnapsRegistryInit',()=>{
28+
constmetamaskVersion=process.env.METAMASK_VERSION;
29+
beforeAll(()=>{
30+
process.env.METAMASK_VERSION='13.9.0-flask.0';
31+
});
32+
33+
afterAll(()=>{
34+
process.env.METAMASK_VERSION=metamaskVersion;
35+
});
36+
2837
it('initializes the controller',()=>{
2938
const{ controller}=SnapsRegistryInit(getInitRequestMock());
3039
expect(controller).toBeInstanceOf(JsonSnapsRegistry);
@@ -38,6 +47,10 @@ describe('SnapsRegistryInit', () => {
3847
messenger:expect.any(Object),
3948
state:undefined,
4049
refetchOnAllowlistMiss:false,
50+
clientConfig:{
51+
type:'extension',
52+
version:'13.9.0',
53+
},
4154
});
4255
});
4356
});

‎app/scripts/controller-init/snaps/snaps-registry-init.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import{JsonSnapsRegistry}from'@metamask/snaps-controllers';
2+
import{SemVerVersion}from'@metamask/utils';
3+
import{parse}from'semver';
24
import{ControllerInitFunction}from'../types';
35
import{SnapsRegistryMessenger}from'../messengers/snaps';
46
import{getBooleanFlag}from'../../lib/util';
@@ -17,13 +19,26 @@ export const SnapsRegistryInit: ControllerInitFunction<
1719
>=({ controllerMessenger, persistedState})=>{
1820
constrequireAllowlist=getBooleanFlag(process.env.REQUIRE_SNAPS_ALLOWLIST);
1921

22+
constoriginalVersion=process.env.METAMASK_VERSION;
23+
constparsedVersion=parse(originalVersion);
24+
// Strip prerelease versions as they just indicate build types.
25+
constversion=(
26+
parsedVersion
27+
?`${parsedVersion.major}.${parsedVersion.minor}.${parsedVersion.patch}`
28+
:originalVersion
29+
)asSemVerVersion;
30+
2031
constcontroller=newJsonSnapsRegistry({
2132
//@ts-expect-error: `persistedState.SnapsRegistry` is not compatible
2233
// with the expected type.
2334
// TODO: Look into the type mismatch.
2435
state:persistedState.SnapsRegistry,
2536
messenger:controllerMessenger,
2637
refetchOnAllowlistMiss:requireAllowlist,
38+
clientConfig:{
39+
type:'extension',
40+
version,
41+
},
2742
});
2843

2944
return{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp