2 files changed, 4 insertions(+), 8 deletions(-)

M app/javascript/flavours/glitch/containers/status_container.js
M app/javascript/flavours/glitch/features/status/index.jsx

@@ 38,7 38,7 @@ import {
   undoStatusTranslation,
 } from 'flavours/glitch/actions/statuses';
 import Status from 'flavours/glitch/components/status';
-import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
+import { favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
 
 import { showAlertForError } from '../actions/alerts';


@@ 127,9 127,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
       let state = getState();
       if (state.getIn(['local_settings', 'confirm_boost_missing_media_description']) && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
         dispatch(initBoostModal({ status, onReblog: this.onModalReblog, missingMediaDescription: true }));
-      } else if (state.getIn(['local_settings', 'confirm_boost']) && !e.shiftKey && !status.get('reblogged')) {
-        dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
-      } else if ( e.shiftKey || !boostModal) {
+      } else if ( e.shiftKey || !state.getIn(['local_settings', 'confirm_boost']) || status.get('reblogged')) {
         this.onModalReblog(status);
       } else {
         dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));

@@ 52,7 52,7 @@ import ScrollContainer from 'flavours/glitch/containers/scroll_container';
 import StatusContainer from 'flavours/glitch/containers/status_container';
 import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
 import Column from 'flavours/glitch/features/ui/components/column';
-import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
+import { favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
 import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
 


@@ 357,9 357,7 @@ class Status extends ImmutablePureComponent {
     if (signedIn) {
       if (settings.get('confirm_boost_missing_media_description') && status.get('media_attachments').some(item => !item.get('description')) && !status.get('reblogged')) {
         dispatch(initBoostModal({ status, onReblog: this.handleModalReblog, missingMediaDescription: true }));
-      } else if (settings.get('confirm_boost') && !e.shiftKey && !status.get('reblogged')) {
-        dispatch(initBoostModal({ status, onReblog:this.handleModalReblog}));
-      } else if ((e && e.shiftKey) || !boostModal) {
+      } else if ((e && e.shiftKey) || !settings.get('confirm_boost') || status.get('reblogged')) {
         this.handleModalReblog(status);
       } else {
         dispatch(initBoostModal({ status, onReblog: this.handleModalReblog }));