Merge pull request #1616 from p2p-org/bugfix/pwn-665

[ETH-665] Redirect to main screen when swap is done
p2p-org · Jan 8, 2024 · 8b73444 · 8b73444
2 parents 0cc08f9 + 3c23f87
commit 8b73444
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 209 deletions.
diff --git a/Packages/KeyAppKit/Sources/AnalyticsManager/KeyApp/Events/KeyAppAnalyticsEvent.swift b/Packages/KeyAppKit/Sources/AnalyticsManager/KeyApp/Events/KeyAppAnalyticsEvent.swift
@@ -178,7 +178,6 @@ public enum KeyAppAnalyticsEvent: AnalyticsEvent {
     case settingsSupportClick
     case settingsRecoveryClick
     case settingsPinClick
-    case settingsNetworkClick
     case settingsFaceidClick
     case settingsLogOut
 

diff --git a/p2p_wallet/Resources/Assets.xcassets/network-icon.imageset/Contents.json b/p2p_wallet/Resources/Assets.xcassets/network-icon.imageset/Contents.json
diff --git a/p2p_wallet/Resources/Assets.xcassets/network-icon.imageset/network.pdf b/p2p_wallet/Resources/Assets.xcassets/network-icon.imageset/network.pdf
diff --git a/p2p_wallet/Scenes/Main/NewSettings/Network/NetworkCoordinator.swift b/p2p_wallet/Scenes/Main/NewSettings/Network/NetworkCoordinator.swift
diff --git a/p2p_wallet/Scenes/Main/NewSettings/Network/View/NetworkView.swift b/p2p_wallet/Scenes/Main/NewSettings/Network/View/NetworkView.swift
diff --git a/p2p_wallet/Scenes/Main/NewSettings/Network/ViewModel/NetworkViewModel.swift b/p2p_wallet/Scenes/Main/NewSettings/Network/ViewModel/NetworkViewModel.swift
diff --git a/p2p_wallet/Scenes/Main/NewSettings/Settings/View/SettingsView.swift b/p2p_wallet/Scenes/Main/NewSettings/Settings/View/SettingsView.swift
@@ -98,10 +98,6 @@ struct SettingsView: View {
                 action: { viewModel.showView(.yourPin) },
                 label: { cellView(image: .pinIcon, title: L10n.yourPIN) }
             )
-            Button(
-                action: { viewModel.showView(.network) },
-                label: { cellView(image: .networkIcon, title: L10n.network) }
-            )
             if viewModel.biometryIsAvailable, viewModel.biometryType != .none {
                 cellView(
                     image: viewModel.biometryType == .face ? .faceIdIcon : .touchIdIcon,

diff --git a/p2p_wallet/Scenes/Main/NewSettings/Settings/ViewModel/SettingsViewModel.swift b/p2p_wallet/Scenes/Main/NewSettings/Settings/ViewModel/SettingsViewModel.swift
@@ -64,8 +64,6 @@ final class SettingsViewModel: BaseViewModel, ObservableObject {
             switch $0 {
             case .yourPin:
                 return KeyAppAnalyticsEvent.settingsPinClick
-            case .network:
-                return KeyAppAnalyticsEvent.settingsNetworkClick
             case .recoveryKit:
                 return KeyAppAnalyticsEvent.settingsRecoveryClick
             default:
@@ -196,6 +194,5 @@ extension SettingsViewModel {
         case reserveUsername(userAddress: String)
         case recoveryKit
         case yourPin
-        case network
     }
 }
diff --git a/p2p_wallet/Scenes/Main/NewSettings/SettingsCoordinator.swift b/p2p_wallet/Scenes/Main/NewSettings/SettingsCoordinator.swift
@@ -40,11 +40,6 @@ final class SettingsCoordinator: Coordinator<Void> {
                             navigationController.popToRootViewController(animated: true)
                         })
                         .store(in: &subscriptions)
-                case .network:
-                    let coordinator = NetworkCoordinator(navigationController: navigationController)
-                    coordinate(to: coordinator)
-                        .sink(receiveValue: {})
-                        .store(in: &subscriptions)
                 }
             })
             .store(in: &subscriptions)

diff --git a/p2p_wallet/Scenes/TabBar/TabBarCoordinator.swift b/p2p_wallet/Scenes/TabBar/TabBarCoordinator.swift
@@ -157,20 +157,7 @@ final class TabBarCoordinator: Coordinator<Void> {
     /// Set up Swap scene
     private func setUpSwap() -> UIViewController {
         let nc = UINavigationController()
-        let swapCoordinator = JupiterSwapCoordinator(
-            navigationController: nc,
-            params: JupiterSwapParameters(
-                dismissAfterCompletion: false,
-                openKeyboardOnStart: false,
-                source: .actionPanel,
-                hideTabBar: false
-            )
-        )
-        jupiterSwapTabCoordinator = swapCoordinator
-        // coordinate to homeCoordinator
-        coordinate(to: swapCoordinator)
-            .sink(receiveValue: {})
-            .store(in: &subscriptions)
+        routeToSwap(nc: nc, hidesBottomBarWhenPushed: false, source: .tapMain)
         return nc
     }