Merge branch 'master' into feat/i18n

components/settings/OtherSettings.tsx

@@ -181,6 +181,15 @@ export const OtherSettings: React.FC = () => {
           }
         />
       </ListItem>
+
+      <ListItem title="Disable Haptic Feedback">
+        <Switch
+          value={settings.disableHapticFeedback}
+          onValueChange={(value) =>
+            updateSettings({ disableHapticFeedback: value })
+          }
+        />
+      </ListItem>
     </ListGroup>
   );
 };