save webview state on both new tab and tabs list open

novasamatech · Nov 11, 2024 · 3d835a1 · 3d835a1
1 parent ead20fc
commit 3d835a1
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/novawallet/Modules/DApp/DAppBrowser/DAppBrowserPresenter.swift b/novawallet/Modules/DApp/DAppBrowser/DAppBrowserPresenter.swift
@@ -56,6 +56,20 @@ final class DAppBrowserPresenter {
 
         view?.didSet(canShowSettings: canShowSettings)
     }
+
+    private func saveCurrentWebViewState() {
+        if
+            let currentTabId,
+            let currentWebView = webViewPool.getWebView(for: currentTabId),
+            let url = currentWebView.url {
+            if #available(iOS 15.0, *) {
+                let currentWebViewState = currentWebView.interactionState
+                tabsManager.updateStateForTab(with: url, currentWebViewState)
+            } else {
+                // Fallback on earlier versions
+            }
+        }
+    }
 }
 
 extension DAppBrowserPresenter: DAppBrowserPresenterProtocol {
@@ -114,20 +128,10 @@ extension DAppBrowserPresenter: DAppBrowserPresenterProtocol {
                 return
             }
 
-            if
-                let currentTabId,
-                let currentWebView = webViewPool.getWebView(for: currentTabId),
-                let url = currentWebView.url {
-                if #available(iOS 15.0, *) {
-                    let currentWebViewState = currentWebView.interactionState
-                    tabsManager.updateStateForTab(with: url, currentWebViewState)
-                } else {
-                    // Fallback on earlier versions
-                }
-            }
-
             let webView = webViewPool.setupWebView(for: tab.uuid)
 
+            saveCurrentWebViewState()
+
             let viewModel = DAppBrowserTabViewModel(
                 tab: tab,
                 loadRequired: false,
@@ -181,6 +185,8 @@ extension DAppBrowserPresenter: DAppBrowserInteractorOutputProtocol {
             webView: webView
         )
 
+        saveCurrentWebViewState()
+
         currentTabId = tab.uuid
 
         view?.didReceiveTab(viewModel: viewModel)