Merge porfolio

android/gemcore/src/main/kotlin/com/wallet/core/primitives/generated/Portfolio.kt

@@ -66,10 +66,62 @@ data class PortfolioAssetsRequest (
 )
 
 @Serializable
-enum class PerpetualPortfolioChartType(val string: String) {
+enum class PortfolioChartType(val string: String) {
 	@SerialName("value")
 	Value("value"),
 	@SerialName("pnl")
 	Pnl("pnl"),
 }
 
+@Serializable
+data class PortfolioChartData (
+	val chartType: PortfolioChartType,
+	val values: List<ChartDateValue>
+)
+
+@Serializable
+sealed class PortfolioStatistic {
+	@Serializable
+	@SerialName("allTimeHigh")
+	data class AllTimeHigh(val content: ChartValuePercentage): PortfolioStatistic()
+	@Serializable
+	@SerialName("allTimeLow")
+	data class AllTimeLow(val content: ChartValuePercentage): PortfolioStatistic()
+	@Serializable
+	@SerialName("unrealizedPnl")
+	data class UnrealizedPnl(val content: Double): PortfolioStatistic()
+	@Serializable
+	@SerialName("accountLeverage")
+	data class AccountLeverage(val content: Double): PortfolioStatistic()
+	@Serializable
+	@SerialName("marginUsage")
+	data class MarginUsage(val content: PortfolioMarginUsage): PortfolioStatistic()
+	@Serializable
+	@SerialName("allTimePnl")
+	data class AllTimePnl(val content: Double): PortfolioStatistic()
+	@Serializable
+	@SerialName("volume")
+	data class Volume(val content: Double): PortfolioStatistic()
+}
+
+@Serializable
+data class PortfolioData (
+	val charts: List<PortfolioChartData>,
+	val statistics: List<PortfolioStatistic>,
+	val availablePeriods: List<ChartPeriod>
+)
+
+@Serializable
+data class PortfolioMarginUsage (
+	val accountValue: Double,
+	val usage: Double
+)
+
+@Serializable
+enum class PortfolioType(val string: String) {
+	@SerialName("wallet")
+	Wallet("wallet"),
+	@SerialName("perpetuals")
+	Perpetuals("perpetuals"),
+}
+

ios/Features/Perpetuals/Sources/Navigation/PerpetualsNavigationView.swift

@@ -16,6 +16,7 @@ public struct PerpetualsNavigationView: View {
         activityService: ActivityService,
         onSelectAssetType: @escaping (SelectAssetType) -> Void,
         onSelectAsset: @escaping (Asset) -> Void,
+        onSelectPortfolio: @escaping () -> Void,
     ) {
         _model = State(
             initialValue: PerpetualsSceneViewModel(
@@ -25,6 +26,7 @@ public struct PerpetualsNavigationView: View {
                 activityService: activityService,
                 onSelectAssetType: onSelectAssetType,
                 onSelectAsset: onSelectAsset,
+                onSelectPortfolio: onSelectPortfolio,
             ),
         )
     }

ios/Features/Perpetuals/Sources/Scenes/PerpetualsScene.swift

@@ -65,14 +65,6 @@ struct PerpetualsScene: View {
                 ),
             )
         }
-        .sheet(isPresented: $model.isPresentingPortfolio) {
-            PerpetualPortfolioScene(
-                model: PerpetualPortfolioSceneViewModel(
-                    wallet: model.wallet,
-                    perpetualService: model.perpetualService,
-                ),
-            )
-        }
     }
 
     var list: some View {

ios/Features/Perpetuals/Sources/ViewModels/PerpetualsSceneViewModel.swift

@@ -36,10 +36,10 @@ final class PerpetualsSceneViewModel {
     var searchQuery: String = .empty
     var isSearching: Bool = false
     var isPresentingRecents: Bool = false
-    var isPresentingPortfolio: Bool = false
 
     let onSelectAssetType: ((SelectAssetType) -> Void)?
     let onSelectAsset: ((Asset) -> Void)?
+    let onSelectPortfolio: VoidAction
 
     init(
         wallet: Wallet,
@@ -48,13 +48,15 @@ final class PerpetualsSceneViewModel {
         activityService: ActivityService,
         onSelectAssetType: ((SelectAssetType) -> Void)? = nil,
         onSelectAsset: ((Asset) -> Void)? = nil,
+        onSelectPortfolio: (() -> Void)? = nil,
     ) {
         self.wallet = wallet
         self.perpetualService = perpetualService
         self.observerService = observerService
         self.activityService = activityService
         self.onSelectAssetType = onSelectAssetType
         self.onSelectAsset = onSelectAsset
+        self.onSelectPortfolio = onSelectPortfolio
         positionsQuery = ObservableQuery(PerpetualPositionsRequest(walletId: wallet.walletId, searchQuery: ""), initialValue: [])
         perpetualsQuery = ObservableQuery(PerpetualsRequest(searchQuery: ""), initialValue: [])
         walletBalanceQuery = ObservableQuery(PerpetualWalletBalanceRequest(walletId: wallet.walletId), initialValue: .zero)
@@ -179,6 +181,6 @@ extension PerpetualsSceneViewModel {
     }
 
     func onSelectBalance() {
-        isPresentingPortfolio = true
+        onSelectPortfolio?()
     }
 }