Merge pull request #1712 from p2p-org/feature/pwn-1033

Fix wormhole feature flag doesn't work
p2p-org · Feb 21, 2024 · 655ff06 · 655ff06
2 parents 4b22e71 + 5cea3dc
commit 655ff06
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 13 deletions.
diff --git a/p2p_wallet/Scenes/DebugMenu/View/DebugMenuView.swift b/p2p_wallet/Scenes/DebugMenu/View/DebugMenuView.swift
@@ -98,6 +98,7 @@ struct DebugMenuView: View {
             NavigationLink("Socket", destination: SocketDebugView())
             NavigationLink("Web3Auth", destination: OnboardingDebugView())
             NavigationLink("History") { HistoryDebugView() }
+            NavigationLink("Flags") { FlagDebugMenuView() }
         }
     }
 

diff --git a/p2p_wallet/Scenes/DebugMenu/View/FlagDebugMenuView.swift b/p2p_wallet/Scenes/DebugMenu/View/FlagDebugMenuView.swift
@@ -0,0 +1,27 @@
+import SwiftUI
+
+struct FlagDebugMenuView: View {
+    var body: some View {
+        List {
+            DebugText(title: "ETH Address", value: "\(available(.ethAddressEnabled))")
+            DebugText(title: "Invest Solend", value: "\(available(.investSolendFeature))")
+            DebugText(title: "Mocked API Gateway", value: "\(available(.mockedApiGateway))")
+            DebugText(title: "Mocked TKey Facade", value: "\(available(.mockedTKeyFacade))")
+            DebugText(title: "Onboarding Username", value: "\(available(.onboardingUsernameEnabled))")
+            DebugText(
+                title: "Onboarding Username Button Skip",
+                value: "\(available(.onboardingUsernameButtonSkipEnabled))"
+            )
+            DebugText(title: "PnL", value: "\(available(.pnlEnabled))")
+            DebugText(title: "Referral Program", value: "\(available(.referralProgramEnabled))")
+            DebugText(title: "Send Via Link", value: "\(available(.sendViaLinkEnabled))")
+            DebugText(title: "Simulated Social Error", value: "\(available(.simulatedSocialError))")
+            DebugText(title: "Solana ETH Address", value: "\(available(.solanaEthAddressEnabled))")
+            DebugText(title: "Solana Negative Status", value: "\(available(.solanaNegativeStatus))")
+            DebugText(title: "Solend Disable Placeholder", value: "\(available(.solendDisablePlaceholder))")
+            DebugText(title: "Swap Transaction Simulation", value: "\(available(.swapTransactionSimulationEnabled))")
+            DebugText(title: "Sell Scenario", value: "\(available(.sellScenarioEnabled))")
+        }
+        .navigationTitle("Flags")
+    }
+}
diff --git a/p2p_wallet/Scenes/Main/Send/RecipentSearch/RecipientSearchViewModel.swift b/p2p_wallet/Scenes/Main/Send/RecipentSearch/RecipientSearchViewModel.swift
@@ -98,18 +98,22 @@ class RecipientSearchViewModel: ObservableObject {
         self.flow = flow
 
         let ethereumSearch: Bool
-        if let preChosenWallet {
-            // Check token is support wormhole
-            if WormholeSupportedTokens.bridges
-                .map(\.solAddress).contains(preChosenWallet.token.mintAddress)
-            {
-                ethereumSearch = true
+        if !available(.ethAddressEnabled) {
+            ethereumSearch = false
+        } else {
+            if let preChosenWallet {
+                // Check token is support wormhole
+                if WormholeSupportedTokens.bridges
+                    .map(\.solAddress).contains(preChosenWallet.token.mintAddress)
+                {
+                    ethereumSearch = true
+                } else {
+                    ethereumSearch = false
+                }
             } else {
-                ethereumSearch = false
+                // No pre chosen, search all
+                ethereumSearch = true
             }
-        } else {
-            // No pre chosen, search all
-            ethereumSearch = true
         }
 
         config = .init(
@@ -122,7 +126,7 @@ class RecipientSearchViewModel: ObservableObject {
         Task {
             let tokens = try await tokensRepository.all()
             await MainActor.run { [weak self] in
-                guard let self = self else { return }
+                guard let self else { return }
                 self.config.tokens = tokens
             }
         }
@@ -143,7 +147,7 @@ class RecipientSearchViewModel: ObservableObject {
             .combineLatest($config)
             .debounce(for: 0.2, scheduler: DispatchQueue.main)
             .sink { [weak self] (query: String, _) in
-                guard let self = self else { return }
+                guard let self else { return }
                 self.search(
                     query: query,
                     autoSelectTheOnlyOneResultMode: self.autoSelectTheOnlyOneResultMode,
@@ -206,7 +210,7 @@ class RecipientSearchViewModel: ObservableObject {
                     self?.searchResult = result
                 }
                 if
-                    let autoSelectTheOnlyOneResultMode = autoSelectTheOnlyOneResultMode,
+                    let autoSelectTheOnlyOneResultMode,
                     autoSelectTheOnlyOneResultMode.isEnabled
                 {
                     try? await Task.sleep(nanoseconds: autoSelectTheOnlyOneResultMode.delay!)