CBW-1601 pr fixes

Concordium · Mar 7, 2024 · e7022ab · e7022ab
1 parent 1e94dc1
commit e7022ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/ConcordiumWallet/Views/AccountsView/AccountDetails/TokenLookup/CIS2TokensCoordinator.swift b/ConcordiumWallet/Views/AccountsView/AccountDetails/TokenLookup/CIS2TokensCoordinator.swift
@@ -23,10 +23,12 @@ class CIS2TokensCoordinator: Coordinator, AccountAddressQRCoordinatorDelegate {
     }
 
     func start() {
-        var view = TokenLookupView(service: dependencyProvider.cis2Service(), account: account)
-        view.displayContractTokens = { [weak self] tokens, contractIndex in
-            self?.showTokenSelectionView(with: tokens, contractIndex: contractIndex)
-        }
+        var view = TokenLookupView(
+            service: dependencyProvider.cis2Service(),
+            account: account,
+            displayContractTokens: { [weak self] tokens, contractIndex in
+                self?.showTokenSelectionView(with: tokens, contractIndex: contractIndex)
+            })
         navigationController.setNavigationBarHidden(true, animated: false)
         navigationController.setViewControllers([UIHostingController(rootView: view)], animated: false)
     }

diff --git a/ConcordiumWallet/Views/AccountsView/AccountDetails/TokenLookup/TokenLookupView.swift b/ConcordiumWallet/Views/AccountsView/AccountDetails/TokenLookup/TokenLookupView.swift
@@ -30,7 +30,7 @@ struct TokenLookupView: View {
     var service: CIS2ServiceProtocol
     var account: AccountDataType
 
-    var displayContractTokens: ((_ tokens: [CIS2Token], _ contractIndex: String) -> Void)?
+    var displayContractTokens: ((_ tokens: [CIS2Token], _ contractIndex: String) -> Void)
 
     private let tokenIndexPublisher = PassthroughSubject<String, Never>()
 
@@ -86,7 +86,7 @@ struct TokenLookupView: View {
                     .padding()
                 Spacer()
                 Button(action: {
-                    displayContractTokens?(tokens, contractIndex)
+                    displayContractTokens(tokens, contractIndex)
                 }) {
                     Text("Look for tokens")
                         .padding()

diff --git a/...allet/Views/AccountsView/AccountDetails/TokenSelectionView/CIS2TokenSelectViewModel.swift b/...allet/Views/AccountsView/AccountDetails/TokenSelectionView/CIS2TokenSelectViewModel.swift
@@ -72,15 +72,15 @@ final class CIS2TokenSelectViewModel: ObservableObject {
                 }
 
                 await MainActor.run {
-                    isLoading = false
-                    currentPage += 1
                     hasMore = !metadata.metadata.isEmpty
 
                     if currentPage == 1 {
                         tokens = representables
                     } else {
                         tokens += representables
                     }
+                    currentPage += 1
+                    isLoading = false
                 }
             } catch {
                 await MainActor.run {