pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-18 05:25:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(app): Make some modals use GenericErrorModal instead of ConfirmModal (#1023)

Browse Source
This commit is contained in:
PilkeySEK authored and GitHub committed 2026-06-19 22:10:49 +01:00
1 parent fa3e852575
commit 0f3f059454
30 files changed
+99 -243
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_app/src/features/moderation/components/alerts/MatureContentRejectedModal.tsx
+3 -8
View File
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {ConfirmModal} from '@app/features/app/components/dialogs/ConfirmModal';
import {UNDERSTOOD_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import {GenericErrorModal} from '@app/features/app/components/alerts/GenericErrorModal';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
@@ -18,13 +17,9 @@ const THIS_CHANNEL_IS_NOT_MARKED_FOR_MATURE_CONTENT_DESCRIPTOR = msg({
export const MatureContentRejectedModal = observer(() => {
const {i18n} = useLingui();
return (
<ConfirmModal
<GenericErrorModal
title={i18n._(MATURE_CONTENT_NOT_ALLOWED_DESCRIPTOR)}
description={i18n._(THIS_CHANNEL_IS_NOT_MARKED_FOR_MATURE_CONTENT_DESCRIPTOR)}
primaryText={i18n._(UNDERSTOOD_DESCRIPTOR)}
onPrimary={() => {}}
secondaryText={false}
hideCloseButton
message={i18n._(THIS_CHANNEL_IS_NOT_MARKED_FOR_MATURE_CONTENT_DESCRIPTOR)}
data-flx="moderation.mature-content-rejected-modal.confirm-modal"
/>
);
fluxer_app/src/features/moderation/components/alerts/UserBannedFromGuildModal.tsx
+3 -8
View File
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {ConfirmModal} from '@app/features/app/components/dialogs/ConfirmModal';
import {UNDERSTOOD_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import {GenericErrorModal} from '@app/features/app/components/alerts/GenericErrorModal';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
@@ -17,13 +16,9 @@ const YOU_ARE_BANNED_FROM_THIS_COMMUNITY_AND_CANNOT_DESCRIPTOR = msg({
export const UserBannedFromGuildModal = observer(() => {
const {i18n} = useLingui();
return (
<ConfirmModal
<GenericErrorModal
title={i18n._(YOU_RE_BANNED_DESCRIPTOR)}
description={i18n._(YOU_ARE_BANNED_FROM_THIS_COMMUNITY_AND_CANNOT_DESCRIPTOR)}
primaryText={i18n._(UNDERSTOOD_DESCRIPTOR)}
onPrimary={() => {}}
secondaryText={false}
hideCloseButton
message={i18n._(YOU_ARE_BANNED_FROM_THIS_COMMUNITY_AND_CANNOT_DESCRIPTOR)}
data-flx="moderation.user-banned-from-guild-modal.confirm-modal"
/>
);
fluxer_app/src/features/moderation/components/alerts/UserIpBannedFromGuildModal.tsx
+3 -8
View File
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {ConfirmModal} from '@app/features/app/components/dialogs/ConfirmModal';
import {UNDERSTOOD_DESCRIPTOR} from '@app/features/i18n/utils/CommonMessageDescriptors';
import {GenericErrorModal} from '@app/features/app/components/alerts/GenericErrorModal';
import {msg} from '@lingui/core/macro';
import {useLingui} from '@lingui/react/macro';
import {observer} from 'mobx-react-lite';
@@ -17,13 +16,9 @@ const YOUR_IP_ADDRESS_IS_BANNED_FROM_THIS_COMMUNITY_DESCRIPTOR = msg({
export const UserIpBannedFromGuildModal = observer(() => {
const {i18n} = useLingui();
return (
<ConfirmModal
<GenericErrorModal
title={i18n._(YOUR_IP_IS_BANNED_DESCRIPTOR)}
description={i18n._(YOUR_IP_ADDRESS_IS_BANNED_FROM_THIS_COMMUNITY_DESCRIPTOR)}
primaryText={i18n._(UNDERSTOOD_DESCRIPTOR)}
onPrimary={() => {}}
secondaryText={false}
hideCloseButton
message={i18n._(YOUR_IP_ADDRESS_IS_BANNED_FROM_THIS_COMMUNITY_DESCRIPTOR)}
data-flx="moderation.user-ip-banned-from-guild-modal.confirm-modal"
/>
);