[FIX] Delete user warning message undefined (#18310)

pull/18313/head^2
gabriellsh 6 years ago committed by GitHub
parent 6674257d57
commit dab320a745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      client/admin/users/UserInfoActions.js
  2. 28
      client/providers/MeteorProvider.js

@ -12,9 +12,8 @@ import { useSetting } from '../../contexts/SettingsContext';
import { useToastMessageDispatch } from '../../contexts/ToastMessagesContext';
import { useTranslation } from '../../contexts/TranslationContext';
const DeleteWarningModal = ({ onDelete, onCancel, ...props }) => {
const DeleteWarningModal = ({ onDelete, onCancel, erasureType, ...props }) => {
const t = useTranslation();
const erasureType = useSetting('Message_ErasureType');
return <Modal {...props}>
<Modal.Header>
@ -111,8 +110,8 @@ export const UserInfoActions = ({ username, _id, isActive, isAdmin, onChange })
});
const confirmDeleteUser = useCallback(() => {
setModal(<DeleteWarningModal onDelete={deleteUser} onCancel={() => setModal()}/>);
}, [deleteUser, setModal]);
setModal(<DeleteWarningModal onDelete={deleteUser} onCancel={() => setModal()} erasureType={erasureType}/>);
}, [deleteUser, erasureType, setModal]);
const setAdminStatus = useMethod('setAdminStatus');
const changeAdminStatus = useCallback(() => {

@ -23,21 +23,21 @@ export function MeteorProvider({ children }) {
<SessionProvider>
<SidebarProvider>
<ToastMessagesProvider>
<ModalProvider>
<SettingsProvider>
<CustomSoundProvider>
<AvatarUrlProvider>
<SubscriptionProvider>
<UserProvider>
<AuthorizationProvider>
<SettingsProvider>
<CustomSoundProvider>
<AvatarUrlProvider>
<SubscriptionProvider>
<UserProvider>
<AuthorizationProvider>
<ModalProvider>
{children}
</AuthorizationProvider>
</UserProvider>
</SubscriptionProvider>
</AvatarUrlProvider>
</CustomSoundProvider>
</SettingsProvider>
</ModalProvider>
</ModalProvider>
</AuthorizationProvider>
</UserProvider>
</SubscriptionProvider>
</AvatarUrlProvider>
</CustomSoundProvider>
</SettingsProvider>
</ToastMessagesProvider>
</SidebarProvider>
</SessionProvider>

Loading…
Cancel
Save