diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2023-04-12 12:44:58 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-04-16 18:20:51 +0200 |
commit | 34f8e696e29683fd8b7113e7997e968869b76473 (patch) | |
tree | c75cb4589dbc605065f9d32aef783de36631529a /app/javascript/flavours/glitch/features/status/index.jsx | |
parent | a3c05640f7f90ea9f4d23ee71f725143db7c8a47 (diff) |
[Glitch] Change all components to use the same error page in web UI
Port cee357d5385c66a0217827ba3ceab2e77cd2f649 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Diffstat (limited to 'app/javascript/flavours/glitch/features/status/index.jsx')
-rw-r--r-- | app/javascript/flavours/glitch/features/status/index.jsx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx index f01ad2dbe..c220d761f 100644 --- a/app/javascript/flavours/glitch/features/status/index.jsx +++ b/app/javascript/flavours/glitch/features/status/index.jsx @@ -16,7 +16,6 @@ import { translateStatus, undoStatusTranslation, } from 'flavours/glitch/actions/statuses'; -import MissingIndicator from 'flavours/glitch/components/missing_indicator'; import LoadingIndicator from 'flavours/glitch/components/loading_indicator'; import DetailedStatus from './components/detailed_status'; import ActionBar from './components/action_bar'; @@ -43,7 +42,6 @@ import { initReport } from 'flavours/glitch/actions/reports'; import { initBoostModal } from 'flavours/glitch/actions/boosts'; import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors'; import ScrollContainer from 'flavours/glitch/containers/scroll_container'; -import ColumnBackButton from 'flavours/glitch/components/column_back_button'; import ColumnHeader from '../../components/column_header'; import StatusContainer from 'flavours/glitch/containers/status_container'; import { openModal } from 'flavours/glitch/actions/modal'; @@ -56,6 +54,7 @@ import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning'; import { textForScreenReader, defaultMediaVisibility } from 'flavours/glitch/components/status'; import Icon from 'flavours/glitch/components/icon'; import { Helmet } from 'react-helmet'; +import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error'; const messages = defineMessages({ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, @@ -620,21 +619,18 @@ class Status extends ImmutablePureComponent { if (status === null) { return ( - <Column> - <ColumnBackButton multiColumn={multiColumn} /> - <MissingIndicator /> - </Column> + <BundleColumnError multiColumn={multiColumn} errorType='routing' /> ); } const isExpanded = settings.getIn(['content_warnings', 'shared_state']) ? !status.get('hidden') : this.state.isExpanded; if (ancestorsIds && ancestorsIds.size > 0) { - ancestors = <div>{this.renderChildren(ancestorsIds)}</div>; + ancestors = <>{this.renderChildren(ancestorsIds)}</>; } if (descendantsIds && descendantsIds.size > 0) { - descendants = <div>{this.renderChildren(descendantsIds)}</div>; + descendants = <>{this.renderChildren(descendantsIds)}</>; } const isLocal = status.getIn(['account', 'acct'], '').indexOf('@') === -1; |