Page MenuHomePhabricator
Files F3694082

D11601.id.diff
No OneTemporary
Actions

D11601.id.diff
View Options

diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -59,7 +59,7 @@
DEPRECATED_unshimMessageStore,
unshimFunc,
} from 'lib/shared/unshim-utils.js';
-import { defaultAlertInfo } from 'lib/types/alert-types.js';
+import { defaultAlertInfo, defaultAlertInfos } from 'lib/types/alert-types.js';
import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
import { defaultCalendarQuery } from 'lib/types/entry-types.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js';
@@ -1208,6 +1208,17 @@
const { userStore, ...rest } = state;
return rest;
},
+ [69]: (state: any) => {
+ const { notifPermissionAlertInfo, ...rest } = state;
+ const newState = {
+ ...rest,
+ alertStore: {
+ alertInfos: defaultAlertInfos,
+ },
+ };
+
+ return newState;
+ },
};
type PersistedReportStore = $Diff<
@@ -1229,7 +1240,7 @@
storage: AsyncStorage,
blacklist: persistBlacklist,
debug: __DEV__,
- version: 68,
+ version: 69,
transforms: [
messageStoreMessagesBlocklistTransform,
reportStoreTransform,
diff --git a/web/redux/persist.js b/web/redux/persist.js
--- a/web/redux/persist.js
+++ b/web/redux/persist.js
@@ -16,6 +16,7 @@
} from 'lib/shared/create-async-migrate.js';
import { keyserverStoreTransform } from 'lib/shared/transforms/keyserver-store-transform.js';
import { messageStoreMessagesBlocklistTransform } from 'lib/shared/transforms/message-store-transform.js';
+import { defaultAlertInfos } from 'lib/types/alert-types.js';
import { defaultCalendarQuery } from 'lib/types/entry-types.js';
import type { KeyserverInfo } from 'lib/types/keyserver-types.js';
import { cookieTypes } from 'lib/types/session-types.js';
@@ -47,7 +48,7 @@
const persistWhitelist = [
'enabledApps',
- 'notifPermissionAlertInfo',
+ 'alertStore',
'commServicesAccessToken',
'keyserverStore',
'globalThemeInfo',
@@ -372,6 +373,17 @@
return handleReduxMigrationFailure(state);
}
},
+ [15]: (state: any) => {
+ const { notifPermissionAlertInfo, ...rest } = state;
+ const newState = {
+ ...rest,
+ alertStore: {
+ alertInfos: defaultAlertInfos,
+ },
+ };
+
+ return newState;
+ },
};
const migrateStorageToSQLite: StorageMigrationFunction = async debug => {
@@ -417,7 +429,7 @@
{ debug: isDev },
migrateStorageToSQLite,
): any),
- version: 14,
+ version: 15,
transforms: [messageStoreMessagesBlocklistTransform, keyserverStoreTransform],
};

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 8, 9:47 AM (1 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2816018
Default Alt Text
D11601.id.diff (2 KB)

Event Timeline