Skip to content

Commit b5a85bc

Browse files
committed
refactor: drop in-app banner rule and consume NetworkConnectionBannerController
1 parent ef1a58a commit b5a85bc

11 files changed

Lines changed: 159 additions & 1887 deletions

File tree

app/scripts/controllers/app-state-controller-method-action-types.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -296,16 +296,6 @@ export type AppStateControllerSetProductTourAction = {
296296
handler: AppStateController['setProductTour'];
297297
};
298298

299-
/**
300-
* Updates the network connection banner state
301-
*
302-
* @param networkConnectionBanner - The new banner state
303-
*/
304-
export type AppStateControllerUpdateNetworkConnectionBannerAction = {
305-
type: `AppStateController:updateNetworkConnectionBanner`;
306-
handler: AppStateController['updateNetworkConnectionBanner'];
307-
};
308-
309299
/**
310300
* Sets a unique ID for the current extension popup
311301
*
@@ -587,7 +577,6 @@ export type AppStateControllerMethodActions =
587577
| AppStateControllerSetMusdConversionEducationSeenAction
588578
| AppStateControllerAddMusdConversionDismissedCtaKeyAction
589579
| AppStateControllerSetProductTourAction
590-
| AppStateControllerUpdateNetworkConnectionBannerAction
591580
| AppStateControllerSetCurrentExtensionPopupIdAction
592581
| AppStateControllerSetTrezorModelAction
593582
| AppStateControllerUpdateNftDropDownStateAction

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import { SecurityAlertResponse } from '../lib/ppom/types';
4242
import {
4343
AccountOverviewTabKey,
4444
CarouselSlide,
45-
NetworkConnectionBanner,
4645
StorageWriteErrorType,
4746
} from '../../../shared/constants/app-state';
4847
import type {
@@ -114,7 +113,6 @@ export type AppStateControllerState = {
114113
lastUpdatedAt: number | null;
115114
lastUpdatedFromVersion: string | null;
116115
lastViewedUserSurvey: number | null;
117-
networkConnectionBanner: NetworkConnectionBanner;
118116
newPrivacyPolicyToastClickedOrClosed: boolean | null;
119117
newPrivacyPolicyToastShownDate: number | null;
120118
pna25Acknowledged: boolean;
@@ -260,7 +258,6 @@ type AppStateControllerInitState = Partial<
260258
| 'signatureSecurityAlertResponses'
261259
| 'addressSecurityAlertResponses'
262260
| 'currentExtensionPopupId'
263-
| 'networkConnectionBanner'
264261
>
265262
>;
266263

@@ -334,9 +331,6 @@ function getInitialStateOverrides() {
334331
currentExtensionPopupId: 0,
335332
nftsDropdownState: {},
336333
signatureSecurityAlertResponses: {},
337-
networkConnectionBanner: {
338-
status: 'unknown' as const,
339-
},
340334
};
341335
}
342336

@@ -439,12 +433,6 @@ const controllerMetadata: StateMetadata<AppStateControllerState> = {
439433
includeInDebugSnapshot: true,
440434
usedInUi: true,
441435
},
442-
networkConnectionBanner: {
443-
includeInStateLogs: false,
444-
persist: false,
445-
includeInDebugSnapshot: false,
446-
usedInUi: true,
447-
},
448436
newPrivacyPolicyToastClickedOrClosed: {
449437
includeInStateLogs: true,
450438
persist: true,
@@ -749,7 +737,6 @@ const MESSENGER_EXPOSED_METHODS = [
749737
'setTermsOfUseLastAgreed',
750738
'setTrezorModel',
751739
'setUpdateModalLastDismissedAt',
752-
'updateNetworkConnectionBanner',
753740
'updateNftDropDownState',
754741
'updateSlides',
755742
'updateThrottledOriginState',
@@ -1349,19 +1336,6 @@ export class AppStateController extends BaseController<
13491336
});
13501337
}
13511338

1352-
/**
1353-
* Updates the network connection banner state
1354-
*
1355-
* @param networkConnectionBanner - The new banner state
1356-
*/
1357-
updateNetworkConnectionBanner(
1358-
networkConnectionBanner: AppStateControllerState['networkConnectionBanner'],
1359-
): void {
1360-
this.update((state) => {
1361-
state.networkConnectionBanner = networkConnectionBanner;
1362-
});
1363-
}
1364-
13651339
/**
13661340
* Sets a unique ID for the current extension popup
13671341
*

app/scripts/metamask-controller.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3324,10 +3324,6 @@ export default class MetamaskController extends EventEmitter {
33243324
appStateController.addMusdConversionDismissedCtaKey.bind(
33253325
appStateController,
33263326
),
3327-
updateNetworkConnectionBanner:
3328-
appStateController.updateNetworkConnectionBanner.bind(
3329-
appStateController,
3330-
),
33313327
setShowShieldEntryModalOnce:
33323328
appStateController.setShowShieldEntryModalOnce.bind(appStateController),
33333329
setPendingShieldCohort:

shared/types/background.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ export type ControllerStatePropertiesEnumerated = {
145145
pendingShieldCohort: AppStateControllerState['pendingShieldCohort'];
146146
pendingShieldCohortTxType: AppStateControllerState['pendingShieldCohortTxType'];
147147
throttledOrigins: AppStateControllerState['throttledOrigins'];
148-
networkConnectionBanner: AppStateControllerState['networkConnectionBanner'];
149148
isWalletResetInProgress: AppStateControllerState['isWalletResetInProgress'];
150149
sidePanelGasPollTokens: AppStateControllerState['sidePanelGasPollTokens'];
151150
passkeyAutoUnlockSuppressed: AppStateControllerState['passkeyAutoUnlockSuppressed'];

ui/components/app/network-connection-banner/network-connection-banner.test.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import { NETWORKS_ROUTE } from '../../../helpers/constants/routes';
1111
import { NetworkConnectionBanner } from './network-connection-banner';
1212

1313
jest.mock('../../../store/actions', () => ({
14-
updateNetworkConnectionBanner: jest.fn(() => ({
15-
type: 'UPDATE_NETWORK_CONNECTION_BANNER',
16-
})),
1714
setEditedNetwork: jest.fn(() => ({
1815
type: 'SET_EDITED_NETWORK',
1916
})),

0 commit comments

Comments
 (0)