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

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

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


@@ 148,10 147,12 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
   },
 
   onFavourite (status, e) {
+    dispatch((_, getState) => {
+    let state = getState();
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
     } else {
-      if (e.shiftKey || !favouriteModal) {
+      if (e.shiftKey || !state.getIn(['local_settings', 'confirm_favourite'])) {
         this.onModalFavourite(status);
       } else {
         dispatch(openModal({


@@ 162,7 163,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
           },
         }));
       }
-    }
+    }});
   },
 
   onPin (status) {

@@ 278,7 278,7 @@ class Status extends ImmutablePureComponent {
       if (status.get('favourited')) {
         dispatch(unfavourite(status));
       } else {
-        if ((e && e.shiftKey) || !favouriteModal) {
+        if ((e && e.shiftKey) || !settings.get('confirm_favourite')) {
           this.handleModalFavourite(status);
         } else {
           dispatch(openModal({