diff --git a/app/components/browser/BrowserSearch.tsx b/app/components/browser/BrowserSearch.tsx index 0a1292d33..2cafeeebb 100644 --- a/app/components/browser/BrowserSearch.tsx +++ b/app/components/browser/BrowserSearch.tsx @@ -230,6 +230,7 @@ export const BrowserSearch = memo(({ if (!url) { toaster.show({ type: 'error', message: t('browser.search.invalidUrl'), marginBottom: Platform.select({ ios: bottomBarHeight + 16, android: 16 }) }); + setLockSelection(false); return; } @@ -239,7 +240,7 @@ export const BrowserSearch = memo(({ if (currentSuggestions.length !== 0) { url = currentSuggestions[0].url; } else { - setLockSelection(false) + setLockSelection(false); toaster.show({ type: 'error', message: t('browser.search.urlNotReachable'), marginBottom: Platform.select({ ios: bottomBarHeight + 16, android: 16 }) }); @@ -287,6 +288,12 @@ export const BrowserSearch = memo(({ }; }); + const onSubmit = useCallback(() => { + const encodedQuery = encodeURIComponent(search); + const baseUrl = searchEngine === 'google' ? 'https://www.google.com/search?q=' : 'https://duckduckgo.com/?q='; + onSearch(`${baseUrl}${encodedQuery}`); + }, [search, searchEngine]); + return ( onSearch(search)} + onSubmit={onSubmit} keyboardType={'web-search'} inputMode={'search'} textContentType={'URL'} diff --git a/app/components/webview/DAppWebView.tsx b/app/components/webview/DAppWebView.tsx index faa11cc1d..f4fe28b89 100644 --- a/app/components/webview/DAppWebView.tsx +++ b/app/components/webview/DAppWebView.tsx @@ -98,8 +98,6 @@ export const DAppWebView = memo(forwardRef((props: DAppWebViewProps, ref: Forwar } ); - - const safelyOpenUrl = useCallback((url: string) => { try { const scheme = new URL(url).protocol.replace(':', ''); @@ -578,6 +576,7 @@ export const DAppWebView = memo(forwardRef((props: DAppWebViewProps, ref: Forwar /> ) }} + setSupportMultipleWindows={false} /> ([]);