react-native-candle 0.1.32 → 0.1.35

package/nitrogen/generated/shared/c++/TransportAccount.hpp

@@ -0,0 +1,94 @@
+///
+/// TransportAccount.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © 2025 Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+// Forward declaration of `TransportAccountKind` to properly resolve imports.
+namespace margelo::nitro::rncandle { enum class TransportAccountKind; }
+// Forward declaration of `Service` to properly resolve imports.
+namespace margelo::nitro::rncandle { enum class Service; }
+
+#include <string>
+#include "TransportAccountKind.hpp"
+#include "Service.hpp"
+
+namespace margelo::nitro::rncandle {
+
+  /**
+   * A struct which can be represented as a JavaScript object (TransportAccount).
+   */
+  struct TransportAccount {
+  public:
+    std::string assetKind     SWIFT_PRIVATE;
+    std::string serviceAccountID     SWIFT_PRIVATE;
+    TransportAccountKind accountKind     SWIFT_PRIVATE;
+    std::string nickname     SWIFT_PRIVATE;
+    std::string linkedAccountID     SWIFT_PRIVATE;
+    Service service     SWIFT_PRIVATE;
+
+  public:
+    TransportAccount() = default;
+    explicit TransportAccount(std::string assetKind, std::string serviceAccountID, TransportAccountKind accountKind, std::string nickname, std::string linkedAccountID, Service service): assetKind(assetKind), serviceAccountID(serviceAccountID), accountKind(accountKind), nickname(nickname), linkedAccountID(linkedAccountID), service(service) {}
+  };
+
+} // namespace margelo::nitro::rncandle
+
+namespace margelo::nitro {
+
+  using namespace margelo::nitro::rncandle;
+
+  // C++ TransportAccount <> JS TransportAccount (object)
+  template <>
+  struct JSIConverter<TransportAccount> final {
+    static inline TransportAccount fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return TransportAccount(
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "assetKind")),
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "serviceAccountID")),
+        JSIConverter<TransportAccountKind>::fromJSI(runtime, obj.getProperty(runtime, "accountKind")),
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "nickname")),
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "linkedAccountID")),
+        JSIConverter<Service>::fromJSI(runtime, obj.getProperty(runtime, "service"))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const TransportAccount& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, "assetKind", JSIConverter<std::string>::toJSI(runtime, arg.assetKind));
+      obj.setProperty(runtime, "serviceAccountID", JSIConverter<std::string>::toJSI(runtime, arg.serviceAccountID));
+      obj.setProperty(runtime, "accountKind", JSIConverter<TransportAccountKind>::toJSI(runtime, arg.accountKind));
+      obj.setProperty(runtime, "nickname", JSIConverter<std::string>::toJSI(runtime, arg.nickname));
+      obj.setProperty(runtime, "linkedAccountID", JSIConverter<std::string>::toJSI(runtime, arg.linkedAccountID));
+      obj.setProperty(runtime, "service", JSIConverter<Service>::toJSI(runtime, arg.service));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "assetKind"))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "serviceAccountID"))) return false;
+      if (!JSIConverter<TransportAccountKind>::canConvert(runtime, obj.getProperty(runtime, "accountKind"))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "nickname"))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "linkedAccountID"))) return false;
+      if (!JSIConverter<Service>::canConvert(runtime, obj.getProperty(runtime, "service"))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/nitrogen/generated/shared/c++/{LegalAccountKind.hpp → TransportAccountKind.hpp}

@@ -1,5 +1,5 @@
 ///
-/// LegalAccountKind.hpp
+/// TransportAccountKind.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2025 Marc Rousavy @ Margelo
@@ -26,13 +26,12 @@
 namespace margelo::nitro::rncandle {
 
   /**
-   * An enum which can be represented as a JavaScript union (LegalAccountKind).
+   * An enum which can be represented as a JavaScript union (TransportAccountKind).
    */
-  enum class LegalAccountKind {
+  enum class TransportAccountKind {
     INDIVIDUAL      SWIFT_NAME(individual) = 0,
     JOINT      SWIFT_NAME(joint) = 1,
-    TRADITIONALIRA      SWIFT_NAME(traditionalira) = 2,
-    ROTHIRA      SWIFT_NAME(rothira) = 3,
+    BUSINESS      SWIFT_NAME(business) = 2,
   } CLOSED_ENUM;
 
 } // namespace margelo::nitro::rncandle
@@ -41,28 +40,26 @@ namespace margelo::nitro {
 
   using namespace margelo::nitro::rncandle;
 
-  // C++ LegalAccountKind <> JS LegalAccountKind (union)
+  // C++ TransportAccountKind <> JS TransportAccountKind (union)
   template <>
-  struct JSIConverter<LegalAccountKind> final {
-    static inline LegalAccountKind fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<TransportAccountKind> final {
+    static inline TransportAccountKind fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
       switch (hashString(unionValue.c_str(), unionValue.size())) {
-        case hashString("individual"): return LegalAccountKind::INDIVIDUAL;
-        case hashString("joint"): return LegalAccountKind::JOINT;
-        case hashString("traditionalIra"): return LegalAccountKind::TRADITIONALIRA;
-        case hashString("rothIra"): return LegalAccountKind::ROTHIRA;
+        case hashString("individual"): return TransportAccountKind::INDIVIDUAL;
+        case hashString("joint"): return TransportAccountKind::JOINT;
+        case hashString("business"): return TransportAccountKind::BUSINESS;
         default: [[unlikely]]
-          throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum LegalAccountKind - invalid value!");
+          throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum TransportAccountKind - invalid value!");
       }
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, LegalAccountKind arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, TransportAccountKind arg) {
       switch (arg) {
-        case LegalAccountKind::INDIVIDUAL: return JSIConverter<std::string>::toJSI(runtime, "individual");
-        case LegalAccountKind::JOINT: return JSIConverter<std::string>::toJSI(runtime, "joint");
-        case LegalAccountKind::TRADITIONALIRA: return JSIConverter<std::string>::toJSI(runtime, "traditionalIra");
-        case LegalAccountKind::ROTHIRA: return JSIConverter<std::string>::toJSI(runtime, "rothIra");
+        case TransportAccountKind::INDIVIDUAL: return JSIConverter<std::string>::toJSI(runtime, "individual");
+        case TransportAccountKind::JOINT: return JSIConverter<std::string>::toJSI(runtime, "joint");
+        case TransportAccountKind::BUSINESS: return JSIConverter<std::string>::toJSI(runtime, "business");
         default: [[unlikely]]
-          throw std::invalid_argument("Cannot convert LegalAccountKind to JS - invalid value: "
+          throw std::invalid_argument("Cannot convert TransportAccountKind to JS - invalid value: "
                                     + std::to_string(static_cast<int>(arg)) + "!");
       }
     }
@@ -74,8 +71,7 @@ namespace margelo::nitro {
       switch (hashString(unionValue.c_str(), unionValue.size())) {
         case hashString("individual"):
         case hashString("joint"):
-        case hashString("traditionalIra"):
-        case hashString("rothIra"):
+        case hashString("business"):
           return true;
         default:
           return false;

package/nitrogen/generated/shared/c++/TransportAsset.hpp

@@ -40,6 +40,7 @@ namespace margelo::nitro::rncandle {
     std::string assetKind     SWIFT_PRIVATE;
     std::string serviceTradeID     SWIFT_PRIVATE;
     std::string serviceAssetID     SWIFT_PRIVATE;
+    std::string serviceAccountID     SWIFT_PRIVATE;
     std::string name     SWIFT_PRIVATE;
     std::string description     SWIFT_PRIVATE;
     std::string imageURL     SWIFT_PRIVATE;
@@ -55,7 +56,7 @@ namespace margelo::nitro::rncandle {
 
   public:
     TransportAsset() = default;
-    explicit TransportAsset(std::string assetKind, std::string serviceTradeID, std::string serviceAssetID, std::string name, std::string description, std::string imageURL, Coordinates originCoordinates, Address originAddress, Coordinates destinationCoordinates, Address destinationAddress, double seats, std::string departureDateTime, std::string arrivalDateTime, std::string linkedAccountID, Service service): assetKind(assetKind), serviceTradeID(serviceTradeID), serviceAssetID(serviceAssetID), name(name), description(description), imageURL(imageURL), originCoordinates(originCoordinates), originAddress(originAddress), destinationCoordinates(destinationCoordinates), destinationAddress(destinationAddress), seats(seats), departureDateTime(departureDateTime), arrivalDateTime(arrivalDateTime), linkedAccountID(linkedAccountID), service(service) {}
+    explicit TransportAsset(std::string assetKind, std::string serviceTradeID, std::string serviceAssetID, std::string serviceAccountID, std::string name, std::string description, std::string imageURL, Coordinates originCoordinates, Address originAddress, Coordinates destinationCoordinates, Address destinationAddress, double seats, std::string departureDateTime, std::string arrivalDateTime, std::string linkedAccountID, Service service): assetKind(assetKind), serviceTradeID(serviceTradeID), serviceAssetID(serviceAssetID), serviceAccountID(serviceAccountID), name(name), description(description), imageURL(imageURL), originCoordinates(originCoordinates), originAddress(originAddress), destinationCoordinates(destinationCoordinates), destinationAddress(destinationAddress), seats(seats), departureDateTime(departureDateTime), arrivalDateTime(arrivalDateTime), linkedAccountID(linkedAccountID), service(service) {}
   };
 
 } // namespace margelo::nitro::rncandle
@@ -73,6 +74,7 @@ namespace margelo::nitro {
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "assetKind")),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "serviceTradeID")),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "serviceAssetID")),
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "serviceAccountID")),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "name")),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "description")),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "imageURL")),
@@ -92,6 +94,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, "assetKind", JSIConverter<std::string>::toJSI(runtime, arg.assetKind));
       obj.setProperty(runtime, "serviceTradeID", JSIConverter<std::string>::toJSI(runtime, arg.serviceTradeID));
       obj.setProperty(runtime, "serviceAssetID", JSIConverter<std::string>::toJSI(runtime, arg.serviceAssetID));
+      obj.setProperty(runtime, "serviceAccountID", JSIConverter<std::string>::toJSI(runtime, arg.serviceAccountID));
       obj.setProperty(runtime, "name", JSIConverter<std::string>::toJSI(runtime, arg.name));
       obj.setProperty(runtime, "description", JSIConverter<std::string>::toJSI(runtime, arg.description));
       obj.setProperty(runtime, "imageURL", JSIConverter<std::string>::toJSI(runtime, arg.imageURL));
@@ -114,6 +117,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "assetKind"))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "serviceTradeID"))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "serviceAssetID"))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "serviceAccountID"))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "name"))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "description"))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "imageURL"))) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-candle",
-  "version": "0.1.32",
+  "version": "0.1.35",
   "description": "Candle SDK for React Native",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",
@@ -58,9 +58,9 @@
     "nitro-codegen": "^0.25.2",
     "react-native-nitro-modules": "^0.25.2",
     "react-native-builder-bob": "^0.35.2",
-    "release-it": "^18.1.2",
-    "@release-it/bumper": "^7.0.1",
-    "@release-it/conventional-changelog": "^10.0.0"
+    "release-it": "^19.0.4",
+    "@release-it/bumper": "^7.0.5",
+    "@release-it/conventional-changelog": "^10.0.1"
   },
   "peerDependencies": {
     "react": "*",

package/src/index.ts

@@ -10,13 +10,13 @@ import type {
   FiatAsset,
   FiatAssetQuoteRequest,
   FiatAssetRef,
+  FiatMarketAccountKind,
   AssetAccount as InternalAssetAccount,
   Counterparty as InternalCounterparty,
   TradeAsset as InternalTradeAsset,
   TradeAssetRef as InternalTradeAssetRef,
   TradeQuery as InternalTradeQuery,
   TradeQuote as InternalTradeQuote,
-  LegalAccountKind,
   LinkedAccount,
   LinkedAccountRef,
   LinkedAccountStatusRef,
@@ -35,8 +35,8 @@ import type {
   Service,
   ServiceCounterparty,
   TradeAssetQuoteRequest,
-  TradeExecutionResult,
   TradeState,
+  TransportAccountKind,
   TransportAsset,
   TransportAssetQuoteRequest,
   TransportAssetRef,
@@ -54,48 +54,56 @@ export class CandleClient {
     this.candle.initialize(appUser, accessGroup);
   }
 
-  public async executeTrade<
+  public presentCandleTradeExecutionSheet<
     GainedAssetKind extends AssetKind,
     LostAssetKind extends AssetKind
   >(input: {
     tradeQuote: TradeQuote<GainedAssetKind, LostAssetKind>;
     presentationBackground?: PresentationBackground;
-  }): Promise<
-    Trade & {
-      gained: { assetKind: GainedAssetKind };
-      lost: { assetKind: LostAssetKind };
-    }
-  > {
+    completion?: (
+      result:
+        | (Trade & {
+            kind: "success";
+            gained: { assetKind: GainedAssetKind };
+            lost: { assetKind: LostAssetKind };
+          })
+        | { kind: "failure"; error: Error }
+    ) => void;
+  }): void {
     const quote = this.convertTradeQuote(input.tradeQuote);
-    const promise: Promise<TradeExecutionResult> = new Promise((callback) => {
-      this.candle.candleTradeExecutionSheet(
-        quote,
-        input.presentationBackground ?? "default",
-        callback
-      );
-    });
-    const result = await promise;
-    if (result.trade !== undefined) {
-      return {
-        ...result.trade,
-        counterparty: this.convertToCounterparty(result.trade.counterparty),
-        lost: this.assertTradeAsset({
-          tradeAsset: this.convertTradeAsset(result.trade.lost),
-          expectedAssetKind: input.tradeQuote.lost.assetKind,
-        }),
-        gained: this.assertTradeAsset({
-          tradeAsset: this.convertTradeAsset(result.trade.gained),
-          expectedAssetKind: input.tradeQuote.gained.assetKind,
-        }),
-      };
-    } else {
-      if (result.error === undefined) {
-        throw new Error(
-          "Internal Candle Error: corrupted trade execution result."
-        );
+    this.candle.candleTradeExecutionSheet(
+      quote,
+      input.presentationBackground ?? "default",
+      (result) => {
+        if (input.completion === undefined) {
+          return;
+        }
+        if (result.trade !== undefined) {
+          input.completion({
+            kind: "success",
+            ...result.trade,
+            counterparty: this.convertToCounterparty(result.trade.counterparty),
+            lost: this.assertTradeAsset({
+              tradeAsset: this.convertTradeAsset(result.trade.lost),
+              expectedAssetKind: input.tradeQuote.lost.assetKind,
+            }),
+            gained: this.assertTradeAsset({
+              tradeAsset: this.convertTradeAsset(result.trade.gained),
+              expectedAssetKind: input.tradeQuote.gained.assetKind,
+            }),
+          });
+        } else {
+          if (result.error === undefined) {
+            throw new Error(
+              "Internal Candle Error: corrupted trade execution result."
+            );
+          } else {
+            const error = new Error(result.error);
+            input.completion({ kind: "failure", error });
+          }
+        }
       }
-      throw result.error;
-    }
+    );
   }
 
   public presentCandleLinkSheet({
@@ -128,16 +136,7 @@ export class CandleClient {
     );
   }
 
-  public async getLinkedAccounts(): Promise<
-    (
-      | (LinkedAccount & {
-          details: { state: "active" } & ActiveLinkedAccountDetails;
-        })
-      | (LinkedAccount & {
-          details: { state: "inactive" | "unavailable" };
-        })
-    )[]
-  > {
+  public async getLinkedAccounts(): Promise<LinkedAccountDetail[]> {
     const accounts = await this.candle.getLinkedAccounts();
     return accounts.map((account) => {
       if (account.details.activeLinkedAccountDetails !== undefined) {
@@ -464,6 +463,14 @@ export class CandleClient {
     }
   }
 
+  private assertFiatAssetKind(kind: string): "fiat" {
+    if (kind !== "fiat") {
+      throw new Error("Internal Candle Error: corrupted market account.");
+    } else {
+      return kind;
+    }
+  }
+
   private assertMarketAssetKind(kind: string): "stock" | "crypto" {
     if (kind !== "stock" && kind !== "crypto") {
       throw new Error("Internal Candle Error: corrupted market account.");
@@ -472,27 +479,31 @@ export class CandleClient {
     }
   }
 
+  private assertTransportAssetKind(kind: string): "transport" {
+    if (kind !== "transport") {
+      throw new Error("Internal Candle Error: corrupted market account.");
+    } else {
+      return kind;
+    }
+  }
+
   private convertToAssetAccount(account: InternalAssetAccount): AssetAccount {
-    const { legalAccountKind, nickname } = account;
-    const { fiatAccountDetails, marketAccountDetails } = account.details;
+    const { fiatAccount, marketAccount, transportAccount } = account;
 
-    if (fiatAccountDetails !== undefined) {
+    if (fiatAccount !== undefined) {
       return {
-        legalAccountKind,
-        nickname,
-        details: {
-          ...fiatAccountDetails,
-          assetKind: "fiat",
-        },
+        ...fiatAccount,
+        assetKind: this.assertFiatAssetKind(fiatAccount.assetKind),
       };
-    } else if (marketAccountDetails !== undefined) {
+    } else if (marketAccount !== undefined) {
       return {
-        legalAccountKind,
-        nickname,
-        details: {
-          ...marketAccountDetails,
-          assetKind: this.assertMarketAssetKind(marketAccountDetails.assetKind),
-        },
+        ...marketAccount,
+        assetKind: this.assertMarketAssetKind(marketAccount.assetKind),
+      };
+    } else if (transportAccount !== undefined) {
+      return {
+        ...transportAccount,
+        assetKind: this.assertTransportAssetKind(transportAccount.assetKind),
       };
     } else {
       throw new Error("Internal Candle Error: corrupted asset account.");
@@ -555,26 +566,28 @@ type TradeQueryAssetKind =
   | "nothing";
 
 type AssetAccount = {
-  legalAccountKind: LegalAccountKind;
+  serviceAccountID: string;
   nickname: string;
-  details:
-    | {
-        assetKind: "fiat";
-        serviceAccountID: string;
-        currencyCode: string;
-        balance?: number;
-        linkedAccountID: string;
-        service: Service;
-        ach?: ACHDetails;
-        wire?: WireDetails;
-      }
-    | {
-        assetKind: "stock" | "crypto";
-        serviceAccountID: string;
-        linkedAccountID: string;
-        service: Service;
-      };
-};
+  linkedAccountID: string;
+  service: Service;
+} & (
+  | {
+      assetKind: "fiat";
+      accountKind: FiatMarketAccountKind;
+      currencyCode: string;
+      balance?: number;
+      ach?: ACHDetails;
+      wire?: WireDetails;
+    }
+  | {
+      assetKind: "stock" | "crypto";
+      accountKind: FiatMarketAccountKind;
+    }
+  | {
+      assetKind: "transport";
+      accountKind: TransportAccountKind;
+    }
+);
 
 type Trade = {
   dateTime: string;
@@ -591,6 +604,14 @@ type TradeAssetRef =
   | ({ assetKind: "fiat" } & FiatAssetRef)
   | ({ assetKind: "stock" | "crypto" } & MarketTradeAssetRef);
 
+type LinkedAccountDetail =
+  | (LinkedAccount & {
+      details: { state: "active" } & ActiveLinkedAccountDetails;
+    })
+  | (LinkedAccount & {
+      details: { state: "inactive" | "unavailable" };
+    });
+
 export type {
   Address,
   AppUser,
@@ -600,7 +621,9 @@ export type {
   Coordinates,
   Counterparty,
   LinkedAccount,
+  LinkedAccountDetail,
   LinkedAccountRef,
+  LinkedAccountStatusRef,
   Service,
   Trade,
   TradeAsset,

package/src/specs/RNCandle.nitro.ts

@@ -19,9 +19,20 @@ export type WireDetails = {
   routingNumber: string;
 };
 
-type FiatAccountDetails = {
+export type FiatMarketAccountKind =
+  | "individual"
+  | "joint"
+  | "traditionalIRA"
+  | "rothIRA"
+  | "business";
+
+export type TransportAccountKind = "individual" | "joint" | "business";
+
+type FiatAccount = {
   assetKind: string; // fiat
   serviceAccountID: string;
+  accountKind: FiatMarketAccountKind;
+  nickname: string;
   currencyCode: string;
   balance?: number;
   ach?: ACHDetails;
@@ -30,31 +41,31 @@ type FiatAccountDetails = {
   service: Service;
 };
 
-type MarketAccountDetails = {
+type MarketAccount = {
   assetKind: string; // "stock" | "crypto"
   serviceAccountID: string;
+  accountKind: FiatMarketAccountKind;
+  nickname: string;
   linkedAccountID: string;
   service: Service;
 };
 
-type AssetAccountDetails = {
-  fiatAccountDetails?: FiatAccountDetails;
-  marketAccountDetails?: MarketAccountDetails;
+type TransportAccount = {
+  assetKind: string; // "transport"
+  serviceAccountID: string;
+  accountKind: TransportAccountKind;
+  nickname: string;
+  linkedAccountID: string;
+  service: Service;
 };
 
-export type LegalAccountKind =
-  | "individual"
-  | "joint"
-  | "traditionalIra"
-  | "rothIra";
-
 export type AssetAccount = {
-  legalAccountKind: LegalAccountKind;
-  nickname: string;
-  details: AssetAccountDetails;
+  fiatAccount?: FiatAccount;
+  marketAccount?: MarketAccount;
+  transportAccount?: TransportAccount;
 };
 
-type AssetAccountKind = "fiat" | "stock" | "crypto";
+type AssetAccountKind = "fiat" | "stock" | "crypto" | "transport";
 
 export type AssetAccountQuery = {
   linkedAccountIDs?: string;
@@ -98,6 +109,7 @@ export type TransportAsset = {
   assetKind: string; // "transport"
   serviceTradeID: string;
   serviceAssetID: string;
+  serviceAccountID: string;
   name: string;
   description: string;
   // FIXME: use URL type for url fields

package/nitrogen/generated/ios/swift/AssetAccountDetails.swift

@@ -1,83 +0,0 @@
-///
-/// AssetAccountDetails.swift
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
-///
-
-import NitroModules
-
-/// Represents an instance of `AssetAccountDetails`, backed by a C++ struct.
-public typealias AssetAccountDetails = margelo.nitro.rncandle.AssetAccountDetails
-
-extension AssetAccountDetails {
-  private typealias bridge = margelo.nitro.rncandle.bridge.swift
-
-  /**
-   * Create a new instance of `AssetAccountDetails`.
-   */
-  public init(fiatAccountDetails: FiatAccountDetails?, marketAccountDetails: MarketAccountDetails?)
-  {
-    self.init(
-      { () -> bridge.std__optional_FiatAccountDetails_ in
-        if let __unwrappedValue = fiatAccountDetails {
-          return bridge.create_std__optional_FiatAccountDetails_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }(),
-      { () -> bridge.std__optional_MarketAccountDetails_ in
-        if let __unwrappedValue = marketAccountDetails {
-          return bridge.create_std__optional_MarketAccountDetails_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }())
-  }
-
-  public var fiatAccountDetails: FiatAccountDetails? {
-    @inline(__always)
-    get {
-      return { () -> FiatAccountDetails? in
-        if let __unwrapped = self.__fiatAccountDetails.value {
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__fiatAccountDetails = { () -> bridge.std__optional_FiatAccountDetails_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_FiatAccountDetails_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
-  }
-
-  public var marketAccountDetails: MarketAccountDetails? {
-    @inline(__always)
-    get {
-      return { () -> MarketAccountDetails? in
-        if let __unwrapped = self.__marketAccountDetails.value {
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__marketAccountDetails = { () -> bridge.std__optional_MarketAccountDetails_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_MarketAccountDetails_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
-  }
-}