fix confirmation setting

eramdam · Nov 16, 2021 · 97aa1eb · 97aa1eb
1 parent 5495284
commit 97aa1eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/components/settings/menu/settingsTweetActions.tsx b/src/components/settings/menu/settingsTweetActions.tsx
@@ -72,7 +72,7 @@ export const SettingsTweetActions: FC<SettingsMenuSectionProps> = (props) => {
             label: getTransString('settings_action_download_media'),
           },
           {
-            initialValue: settings.requireConfirmationForTweetAction,
+            initialValue: settings.tweetActions.requireConfirmationForTweetAction,
             key: 'requireConfirmationForTweetAction',
             label: getTransString('settings_require_confirmation_for_block_and_mute_actions'),
           },

diff --git a/src/features/addTweetActions.ts b/src/features/addTweetActions.ts
@@ -353,7 +353,7 @@ export const maybeAddTweetActions = makeBTDModule(({settings, TD, jq, mR}) => {
           return;
 
         case TweetActions.MUTE_ACCOUNT: {
-          const blocked = settings.requireConfirmationForTweetAction
+          const blocked = settings.tweetActions.requireConfirmationForTweetAction
             ? !confirm(`Are you sure you want to mute @${user.screenName}?`)
             : false;
           if (blocked) {
@@ -367,7 +367,7 @@ export const maybeAddTweetActions = makeBTDModule(({settings, TD, jq, mR}) => {
         }
 
         case TweetActions.BLOCK_ACCOUNT: {
-          const blocked = settings.requireConfirmationForTweetAction
+          const blocked = settings.tweetActions.requireConfirmationForTweetAction
             ? !confirm(`Are you sure you want to block @${user.screenName}?`)
             : false;
           if (blocked) {

diff --git a/src/types/btdSettingsTypes.ts b/src/types/btdSettingsTypes.ts
@@ -143,10 +143,11 @@ export const RBetterTweetDeckSettings = t.type({
 
       /** Shows a block icon to block the author of a tweet quickly. */
       addBlockAction: withDefault(t.boolean, false),
+
+      requireConfirmationForTweetAction: withDefault(t.boolean, true),
     }),
     {}
   ),
-  requireConfirmationForTweetAction: withDefault(t.boolean, true),
 
   /** Always shows the account picker when favoriting a tweet */
   showAccountChoiceOnFavorite: withDefault(t.boolean, false),