Merge remote-tracking branch 'upstream/develop' into account-menu-react

2021-06-09 11:06:42 +04:00
parent 7b6aa4b48a 1894b13da9
commit 1e7dbb9b14
27 changed files with 1039 additions and 375 deletions
--- a/app/assets/javascripts/components/ConfirmSignoutModal.tsx
+++ b/app/assets/javascripts/components/ConfirmSignoutModal.tsx
@@ -23,9 +23,7 @@ export const ConfirmSignoutContainer = observer((props: Props) => {
 });

 const ConfirmSignoutModal = observer(({ application, appState }: Props) => {
-  const [deleteLocalBackups, setDeleteLocalBackups] = useState(
-    application.hasAccount()
-  );
+  const [deleteLocalBackups, setDeleteLocalBackups] = useState(false);

  const cancelRef = useRef<HTMLButtonElement>();
  function close() {