Skip to content

Commit 418777d

Browse files
authored
Merge pull request #39347 from MetaMask/release/13.14.1
release: 13.14.1
2 parents 0aee84f + 65f393c commit 418777d

File tree

21 files changed

+456
-197
lines changed

21 files changed

+456
-197
lines changed

.github/scripts/check-template-and-add-labels.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const knownBots = [
3232
'sentry-io',
3333
'devin-ai-integration',
3434
'runway-github',
35+
'copilot',
3536
];
3637

3738
main().catch((error: Error): void => {

.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
url-to-cladocument: 'https://metamask.io/cla'
2828
# This branch can't have protections, commits are made directly to the specified branch.
2929
branch: 'cla-signatures'
30-
allowlist: 'dependabot[bot],metamaskbot,crowdin-bot,runway-github[bot],cursor'
30+
allowlist: 'dependabot[bot],metamaskbot,crowdin-bot,runway-github[bot],cursor,copilot'
3131
allow-organization-members: true
3232
blockchain-storage-flag: false

.yarnrc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ npmAuditIgnoreAdvisories:
5959
# New package name format for new versions: @ethereumjs/wallet.
6060
- 'ethereumjs-wallet (deprecation)'
6161

62+
# Deprecated package still used by older versions of our packages, to be eliminated soon as we
63+
# update.
64+
- '@metamask/error-reporting-service (deprecation)'
65+
6266
plugins:
6367
- path: .yarn/plugins/@yarnpkg/plugin-allow-scripts.cjs
6468
spec: 'https://raw.githubusercontent.com/LavaMoat/LavaMoat/main/packages/yarn-plugin-allow-scripts/bundles/@yarnpkg/plugin-allow-scripts.js'

CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [13.14.1]
11+
12+
### Changed
13+
14+
- Set 10-minute delay on first profile metrics collection after acknowledgement, rather than delaying until 2nd unlock (#39270)
15+
1016
## [13.14.0]
1117

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

1594-
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.14.0...HEAD
1600+
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.14.1...HEAD
1601+
[13.14.1]: https://github.com/MetaMask/metamask-extension/compare/v13.14.0...v13.14.1
15951602
[13.14.0]: https://github.com/MetaMask/metamask-extension/compare/v13.13.2...v13.14.0
15961603
[13.13.2]: https://github.com/MetaMask/metamask-extension/compare/v13.13.1...v13.13.2
15971604
[13.13.1]: https://github.com/MetaMask/metamask-extension/compare/v13.13.0...v13.13.1

app/scripts/controller-init/messengers/app-state-controller-messenger.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export function getAppStateControllerMessenger(messenger: RootMessenger) {
3333
'ApprovalController:acceptRequest',
3434
'KeyringController:getState',
3535
'PreferencesController:getState',
36+
'ProfileMetricsController:skipInitialDelay',
3637
],
3738
events: ['KeyringController:unlock', 'PreferencesController:stateChange'],
3839
});

app/scripts/controller-init/messengers/profile-metrics-controller-messenger.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export function getProfileMetricsControllerMessenger(
4040
'AccountsController:accountRemoved',
4141
'KeyringController:lock',
4242
'KeyringController:unlock',
43+
'TransactionController:transactionSubmitted',
4344
],
4445
});
4546
return controllerMessenger;

app/scripts/controller-init/profile-metrics-controller-init.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ describe('ProfileMetricsControllerInit', () => {
3939
state: undefined,
4040
interval: expect.any(Number),
4141
assertUserOptedIn: expect.any(Function),
42+
initialDelayDuration: expect.any(Number),
4243
getMetaMetricsId: expect.any(Function),
4344
});
4445
});

app/scripts/controller-init/profile-metrics-controller-init.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import type { ControllerInitFunction } from './types';
66

77
const isTestEnvironment = Boolean(process.env.IN_TEST);
88

9+
const initialDelayDuration = isTestEnvironment ? 1000 : 10 * 60 * 1000;
10+
911
/**
1012
* Initialize the profile metrics controller.
1113
*
@@ -35,6 +37,7 @@ export const ProfileMetricsControllerInit: ControllerInitFunction<
3537
messenger: controllerMessenger,
3638
state: persistedState.ProfileMetricsController,
3739
interval: isTestEnvironment ? 1000 : 10 * 1000,
40+
initialDelayDuration,
3841
assertUserOptedIn,
3942
getMetaMetricsId: () => metaMetricsController.getMetaMetricsId(),
4043
});

app/scripts/controllers/app-state-controller.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
KeyringControllerUnlockEvent,
2626
} from '@metamask/keyring-controller';
2727
import { QuoteResponse } from '@metamask/bridge-controller';
28+
import { ProfileMetricsControllerSkipInitialDelayAction } from '@metamask/profile-metrics-controller';
2829

2930
import { MINUTE } from '../../../shared/constants/time';
3031
import { AUTO_LOCK_TIMEOUT_ALARM } from '../../../shared/constants/alarms';
@@ -215,7 +216,8 @@ export type AllowedActions =
215216
| AddApprovalRequest
216217
| AcceptRequest
217218
| KeyringControllerGetStateAction
218-
| PreferencesControllerGetStateAction;
219+
| PreferencesControllerGetStateAction
220+
| ProfileMetricsControllerSkipInitialDelayAction;
219221

220222
/**
221223
* Event emitted when the state of the {@link AppStateController} changes.
@@ -920,10 +922,13 @@ export class AppStateController extends BaseController<
920922
});
921923
}
922924

923-
setPna25Acknowledged(acknowledged: boolean): void {
925+
setPna25Acknowledged(acknowledged: boolean, disableDelay = false): void {
924926
this.update((state) => {
925927
state.pna25Acknowledged = acknowledged;
926928
});
929+
if (disableDelay && acknowledged) {
930+
this.messenger.call('ProfileMetricsController:skipInitialDelay');
931+
}
927932
}
928933

929934
setShieldPausedToastLastClickedOrClosed(time: number): void {

attribution.txt

Lines changed: 81 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27557,7 +27557,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2755727557
******************************
2755827558

2755927559
@metamask/accounts-controller
27560-
35.0.0 <https://github.com/MetaMask/core>
27560+
35.0.2 <https://github.com/MetaMask/core>
2756127561
MIT License
2756227562

2756327563
Copyright (c) 2018 MetaMask
@@ -28490,6 +28490,32 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2849028490
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2849128491

2849228492

28493+
******************************
28494+
28495+
@metamask/connectivity-controller
28496+
0.1.0 <https://github.com/MetaMask/core>
28497+
MIT License
28498+
28499+
Copyright (c) 2026 MetaMask
28500+
28501+
Permission is hereby granted, free of charge, to any person obtaining a copy
28502+
of this software and associated documentation files (the "Software"), to deal
28503+
in the Software without restriction, including without limitation the rights
28504+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
28505+
copies of the Software, and to permit persons to whom the Software is
28506+
furnished to do so, subject to the following conditions:
28507+
28508+
The above copyright notice and this permission notice shall be included in all
28509+
copies or substantial portions of the Software.
28510+
28511+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
28512+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
28513+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
28514+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
28515+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
28516+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
28517+
28518+
2849328519
******************************
2849428520

2849528521
@metamask/contract-metadata
@@ -28514,7 +28540,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2851428540
******************************
2851528541

2851628542
@metamask/controller-utils
28517-
11.17.0 <https://github.com/MetaMask/core>
28543+
11.18.0 <https://github.com/MetaMask/core>
2851828544
MIT License
2851928545

2852028546
Copyright (c) 2018 MetaMask
@@ -29962,7 +29988,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2996229988
******************************
2996329989

2996429990
@metamask/eth-block-tracker
29965-
15.0.0 <https://github.com/MetaMask/core>
29991+
15.0.1 <https://github.com/MetaMask/core>
2996629992
MIT License
2996729993

2996829994
Copyright (c) 2018 MetaMask
@@ -30171,6 +30197,27 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
3017130197
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
3017230198

3017330199

30200+
******************************
30201+
30202+
@metamask/eth-json-rpc-middleware
30203+
23.0.0 <https://github.com/MetaMask/core>
30204+
ISC License
30205+
30206+
Copyright (c) 2020 MetaMask
30207+
30208+
Permission to use, copy, modify, and/or distribute this software for any
30209+
purpose with or without fee is hereby granted, provided that the above
30210+
copyright notice and this permission notice appear in all copies.
30211+
30212+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
30213+
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
30214+
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
30215+
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
30216+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
30217+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
30218+
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
30219+
30220+
3017430221
******************************
3017530222

3017630223
@metamask/eth-json-rpc-provider
@@ -30528,7 +30575,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3052830575
******************************
3052930576

3053030577
@metamask/gas-fee-controller
30531-
26.0.0 <https://github.com/MetaMask/core>
30578+
26.0.2 <https://github.com/MetaMask/core>
3053230579
MIT License
3053330580

3053430581
Copyright (c) 2018 MetaMask
@@ -30615,7 +30662,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
3061530662
******************************
3061630663

3061730664
@metamask/json-rpc-engine
30618-
10.2.0 <https://github.com/MetaMask/core>
30665+
10.2.1 <https://github.com/MetaMask/core>
3061930666
ISC License
3062030667

3062130668
Copyright (c) 2022 MetaMask
@@ -32802,6 +32849,32 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3280232849
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3280332850

3280432851

32852+
******************************
32853+
32854+
@metamask/network-controller
32855+
29.0.0 <https://github.com/MetaMask/core>
32856+
MIT License
32857+
32858+
Copyright (c) 2018 MetaMask
32859+
32860+
Permission is hereby granted, free of charge, to any person obtaining a copy
32861+
of this software and associated documentation files (the "Software"), to deal
32862+
in the Software without restriction, including without limitation the rights
32863+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
32864+
copies of the Software, and to permit persons to whom the Software is
32865+
furnished to do so, subject to the following conditions:
32866+
32867+
The above copyright notice and this permission notice shall be included in all
32868+
copies or substantial portions of the Software.
32869+
32870+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
32871+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
32872+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
32873+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
32874+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
32875+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
32876+
32877+
3280532878
******************************
3280632879

3280732880
@metamask/network-enablement-controller
@@ -33347,7 +33420,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3334733420
******************************
3334833421

3334933422
@metamask/polling-controller
33350-
16.0.0 <https://github.com/MetaMask/core>
33423+
16.0.2 <https://github.com/MetaMask/core>
3335133424
MIT License
3335233425

3335333426
Copyright (c) 2018 MetaMask
@@ -33634,7 +33707,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3363433707
******************************
3363533708

3363633709
@metamask/profile-metrics-controller
33637-
2.0.0 <https://github.com/MetaMask/core>
33710+
3.0.0 <https://github.com/MetaMask/core>
3363833711
MIT License
3363933712

3364033713
Copyright (c) 2025 MetaMask
@@ -34942,7 +35015,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3494235015
******************************
3494335016

3494435017
@metamask/transaction-controller
34945-
62.7.0 <https://github.com/MetaMask/core>
35018+
62.9.2 <https://github.com/MetaMask/core>
3494635019
MIT License
3494735020

3494835021
Copyright (c) 2018 MetaMask

0 commit comments

Comments
 (0)