diff --git a/src/pages/CreateWorkspace/tabs/CreateFromTemplateTab.tsx b/src/pages/CreateWorkspace/tabs/CreateFromTemplateTab.tsx index fc108f4..a0a15bf 100644 --- a/src/pages/CreateWorkspace/tabs/CreateFromTemplateTab.tsx +++ b/src/pages/CreateWorkspace/tabs/CreateFromTemplateTab.tsx @@ -26,7 +26,7 @@ export const CreateFromTemplateTab = () => { navigation.navigate('PreviewWebView', { uri }); }} onUsePress={(uri: string) => { - navigation.navigate('Importer', { uri, autoImportBinary: true, addAsServer: false }); + navigation.navigate('Importer', { uri, autoStartImport: true, addAsServer: false }); }} /> ); diff --git a/src/pages/Importer/Index.tsx b/src/pages/Importer/Index.tsx index 85d0040..10ee254 100644 --- a/src/pages/Importer/Index.tsx +++ b/src/pages/Importer/Index.tsx @@ -59,9 +59,9 @@ export interface ImporterProps { */ addAsServer?: boolean; /** - * Auto trigger the import of binary tiddlers after the import of the HTML + * Auto trigger the import of wiki after select from template list, and import binary tiddlers after the import of the HTML */ - autoImportBinary?: boolean; + autoStartImport?: boolean; /** * The URI to auto fill the server URI input */ @@ -143,8 +143,8 @@ export const Importer: FC> skinnyTiddlerTextCacheDownloadPercentage, } = downloadPercentage; - return ( - + const serverConfigs = ( + <> {qrScannerOpen && ( > setServerUriToUseString(newText); }} /> + + ); + + const autoStartImport = route.params.autoStartImport; + return ( + + {/* Hide server config if is importing from template, for simplicity for new users. */} + {autoStartImport !== true && serverConfigs} {importStatus === 'idle' && !qrScannerOpen && wikiUrl !== undefined && ( <> > {`${t('Open')} ${createdWikiWorkspace.name}`} {t('OptionalActions')} - + )}