Page MenuHomePhorge
Files F33302456

D11368.1768779146.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D11368.1768779146.diff
View Options

diff --git a/native/redux/redux-setup.js b/native/redux/redux-setup.js
--- a/native/redux/redux-setup.js
+++ b/native/redux/redux-setup.js
@@ -48,7 +48,6 @@
import { remoteReduxDevServerConfig } from './dev-tools.js';
import { persistConfig, setPersistor } from './persist.js';
import { onStateDifference } from './redux-debug-utils.js';
-import { processDBStoreOperations } from './redux-utils.js';
import { nonUserSpecificFieldsNative } from './state-types.js';
import type { AppState } from './state-types.js';
import { getGlobalNavContext } from '../navigation/icky-global.js';
@@ -316,8 +315,6 @@
dbOpsStore: queueDBOps(state.dbOpsStore, action.messageID, ops),
};
- void processDBStoreOperations(ops);
-
return state;
}
diff --git a/web/redux/redux-setup.js b/web/redux/redux-setup.js
--- a/web/redux/redux-setup.js
+++ b/web/redux/redux-setup.js
@@ -64,7 +64,6 @@
import { reduceServicesAccessToken } from './services-access-token-reducer.js';
import { getVisibility } from './visibility.js';
import { activeThreadSelector } from '../selectors/nav-selectors.js';
-import { processDBStoreOperations } from '../shared-worker/utils/store.js';
import type { InitialReduxState } from '../types/redux-types.js';
export type WindowDimensions = { width: number, height: number };
@@ -171,7 +170,7 @@
},
});
}
- return validateStateAndProcessDBOperations(
+ return validateStateAndQueueOpsProcessing(
action,
oldState,
{
@@ -193,7 +192,7 @@
},
);
} else if (action.type === updateWindowDimensionsActionType) {
- return validateStateAndProcessDBOperations(
+ return validateStateAndQueueOpsProcessing(
action,
oldState,
{
@@ -203,7 +202,7 @@
storeOperations,
);
} else if (action.type === updateWindowActiveActionType) {
- return validateStateAndProcessDBOperations(
+ return validateStateAndQueueOpsProcessing(
action,
oldState,
{
@@ -353,7 +352,7 @@
),
};
- return validateStateAndProcessDBOperations(
+ return validateStateAndQueueOpsProcessing(
action,
oldState,
state,
@@ -361,7 +360,7 @@
);
}
-function validateStateAndProcessDBOperations(
+function validateStateAndQueueOpsProcessing(
action: Action,
oldState: AppState,
state: AppState,
@@ -480,22 +479,14 @@
// As soon as one of the actions is updated, this fix (and the corresponding
// one in tab-synchronization.js) can be removed.
// $FlowFixMe
- if (action.dispatchSource !== 'tab-sync') {
- state = {
- ...state,
- dbOpsStore: queueDBOps(
- state.dbOpsStore,
- action.messageID,
- storeOperations,
- ),
- };
- void processDBStoreOperations(
- storeOperations,
- state.currentUserInfo?.id ?? null,
- );
+ if (action.dispatchSource === 'tab-sync') {
+ return state;
}
- return state;
+ return {
+ ...state,
+ dbOpsStore: queueDBOps(state.dbOpsStore, action.messageID, storeOperations),
+ };
}
export { nonUserSpecificFieldsWeb, reducer };

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 18, 11:32 PM (9 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5953450
Default Alt Text
D11368.1768779146.diff (3 KB)

Event Timeline