Page MenuHomePhabricator
Files F2894003

D10157.diff
No OneTemporary
Actions

D10157.diff
View Options

diff --git a/lib/reducers/user-reducer.js b/lib/reducers/user-reducer.js
--- a/lib/reducers/user-reducer.js
+++ b/lib/reducers/user-reducer.js
@@ -262,7 +262,12 @@
action.type,
onStateDifference,
);
- if (!_isEqual(state.userInfos)(newUserInfos)) {
+ if (
+ action.type === logInActionTypes.success ||
+ action.type === siweAuthActionTypes.success ||
+ action.type === registerActionTypes.success ||
+ !_isEqual(state.userInfos)(newUserInfos)
+ ) {
return [
{
userInfos: newUserInfos,
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
@@ -14,6 +14,7 @@
} from 'lib/actions/user-actions.js';
import type { ThreadStoreOperation } from 'lib/ops/thread-store-ops.js';
import { threadStoreOpsHandlers } from 'lib/ops/thread-store-ops.js';
+import { reduceLoadingStatuses } from 'lib/reducers/loading-reducer.js';
import baseReducer from 'lib/reducers/master-reducer.js';
import {
invalidSessionDowngrade,
@@ -128,7 +129,10 @@
ashoatKeyserverID,
))
) {
- return state;
+ return {
+ ...state,
+ loadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action),
+ };
}
if (
(action.type === setNewSessionActionType &&
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
@@ -11,6 +11,7 @@
type ThreadStoreOperation,
threadStoreOpsHandlers,
} from 'lib/ops/thread-store-ops.js';
+import { reduceLoadingStatuses } from 'lib/reducers/loading-reducer.js';
import baseReducer from 'lib/reducers/master-reducer.js';
import { mostRecentlyReadThreadSelector } from 'lib/selectors/thread-selectors.js';
import { isLoggedIn } from 'lib/selectors/user-selectors.js';
@@ -173,7 +174,10 @@
keyserverID,
)
) {
- return oldState;
+ return {
+ ...oldState,
+ loadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action),
+ };
}
state = {
@@ -205,7 +209,10 @@
ashoatKeyserverID,
))
) {
- return oldState;
+ return {
+ ...oldState,
+ loadingStatuses: reduceLoadingStatuses(state.loadingStatuses, action),
+ };
}
if (

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 5, 2:11 PM (21 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2244108
Default Alt Text
D10157.diff (2 KB)

Event Timeline