diff --git a/src/Model/Global/.fileTransferModel.ts.swp b/src/Model/Global/.fileTransferModel.ts.swp deleted file mode 100644 index d1d3d56d..00000000 Binary files a/src/Model/Global/.fileTransferModel.ts.swp and /dev/null differ diff --git a/src/View/Modals/.dataTransferModal.tsx.swp b/src/View/Modals/.dataTransferModal.tsx.swp new file mode 100644 index 00000000..c5190778 Binary files /dev/null and b/src/View/Modals/.dataTransferModal.tsx.swp differ diff --git a/src/View/Modals/dataTransferModal.tsx b/src/View/Modals/dataTransferModal.tsx index ad237183..823e587d 100644 --- a/src/View/Modals/dataTransferModal.tsx +++ b/src/View/Modals/dataTransferModal.tsx @@ -758,6 +758,7 @@ function ExportModal( @@ -776,35 +777,36 @@ function ExportModal( bind:value={ fileTransferViewModel.exportKeyConfirmation } - type="password" - > - - - - -
- - -
- - + on:enter={fileTransferViewModel.downloadFile} + type="password" + > + + + + +
+ + +
+ + ); } @@ -813,57 +815,57 @@ function ImportModal( fileTransferViewModel: FileTransferViewModel, ) { const isPresented = React.createProxyState( - [fileTransferViewModel.presentedModal], - () => - fileTransferViewModel.presentedModal.value == - FileTransferModals.ImportSelection, + [fileTransferViewModel.presentedModal], + () => + fileTransferViewModel.presentedModal.value == + FileTransferModals.ImportSelection, ); return ( - +
+ + +
+ + ); } @@ -872,73 +874,74 @@ function ImportDecryptionDataModal( fileTransferViewModel: FileTransferViewModel, ) { const isPresented = React.createProxyState( - [fileTransferViewModel.presentedModal], - () => - fileTransferViewModel.presentedModal.value == - FileTransferModals.ImportDecryptData, + [fileTransferViewModel.presentedModal], + () => + fileTransferViewModel.presentedModal.value == + FileTransferModals.ImportDecryptData, ); return ( - ); } diff --git a/src/ViewModel/Global/.fileTransferViewModel.ts.swp b/src/ViewModel/Global/.fileTransferViewModel.ts.swp index b9b24768..2b17644e 100644 Binary files a/src/ViewModel/Global/.fileTransferViewModel.ts.swp and b/src/ViewModel/Global/.fileTransferViewModel.ts.swp differ diff --git a/src/ViewModel/Global/fileTransferViewModel.ts b/src/ViewModel/Global/fileTransferViewModel.ts index 4a41ef23..578f118d 100644 --- a/src/ViewModel/Global/fileTransferViewModel.ts +++ b/src/ViewModel/Global/fileTransferViewModel.ts @@ -139,6 +139,7 @@ export default class FileTransferViewModel extends Context { }; downloadFile = async (): Promise => { + if (this.cannotExport.value == true) return; const date = new Date().toISOString().split("T")[0]; const backup: Blob =