update fullUser in profile-section fix part II

dzonidoo · Jun 6, 2024 · 69ff164 · 69ff164
1 parent 352bf48
commit 69ff164
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/assets/notifications/actions.ts b/assets/notifications/actions.ts
@@ -2,8 +2,6 @@ import {get} from 'lodash';
 import {gettext, notify, errorHandler} from 'utils';
 import server from 'server';
 import {IUser} from 'interfaces';
-import {store as userProfileStore} from '../user-profile/store';
-import {getUser as getUserProfileUser} from 'user-profile/actions';
 
 export const UPDATE_NOTIFICATION_COUNT = 'UPDATE_NOTIFICATION_COUNT';
 export function updateNotificationCount(count: any) {
@@ -117,13 +115,12 @@ export function pushNotification(push: any): any {
     };
 }
 
-export function updateFullUser() {
+export function updateFullUser(userId: string) {
     return (dispatch: any, getState: any) => {
-        const fullUser = getState().fullUser;
-        return server.get(`/users/${fullUser._id}`)
+        return server.get(`/users/${userId}`)
         .then((data: IUser) => {
             dispatch(getUser(data));
-            userProfileStore.dispatch(getUserProfileUser(data));
+            return data;
         })
         .catch((error: any) => errorHandler(error, dispatch));
     };

diff --git a/assets/notifications/components/NotificationsApp.tsx b/assets/notifications/components/NotificationsApp.tsx
@@ -7,10 +7,13 @@ import {
     loadNotifications,
     updateFullUser,
 } from '../actions';
+import {store as userProfileStore} from '../../user-profile/store';
+import {getUser as getUserProfileUser} from 'user-profile/actions';
 
 import NotificationList from 'components/NotificationList';
 import {postNotificationSchedule} from 'helpers/notification';
 import {gettext} from 'utils';
+import {IUser} from 'interfaces/user';
 
 class NotificationsApp extends React.Component<any, any> {
     static propTypes: any;
@@ -32,7 +35,7 @@ class NotificationsApp extends React.Component<any, any> {
                 fullUser={this.props.fullUser}
                 resumeNotifications={() => {
                     postNotificationSchedule(this.props.fullUser._id, {pauseFrom: '', pauseTo: ''}, gettext('Notifications resumed')).then(() =>
-                        this.props.resumeNotifications()
+                        this.props.resumeNotifications(this.props.fullUser._id)
                     );
                 }}
             />,
@@ -63,9 +66,11 @@ const mapDispatchToProps = (dispatch: any) => ({
     clearNotification: (id: any) => dispatch(deleteNotification(id)),
     clearAll: () => dispatch(deleteAllNotifications()),
     loadNotifications: () => dispatch(loadNotifications()),
-    resumeNotifications: () => (
-        dispatch(updateFullUser())
-    ),
+    resumeNotifications: (userId: string) => {
+        dispatch(updateFullUser(userId)).then((fullUser: IUser) => {
+            userProfileStore.dispatch(getUserProfileUser(fullUser));
+        })
+    }
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(NotificationsApp);