react-native-candle 0.1.42 → 0.1.44

package/ReactNativeCandle.podspec

@@ -30,7 +30,7 @@ Pod::Spec.new do |s|
   load 'nitrogen/generated/ios/ReactNativeCandle+autolinking.rb'
   add_nitrogen_files(s)
 
-  s.dependency 'Candle', '3.0.364-beta'
+  s.dependency 'Candle', '3.0.395-beta'
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
   install_modules_dependencies(s)

package/ios/Sources/CandleActionViewModel.swift

@@ -1,13 +1,10 @@
 import Candle
 import Combine
 
-@available(iOS 17.0, *)
-final class CandleActionViewModel: ObservableObject {
+@available(iOS 17.0, *) final class CandleActionViewModel: ObservableObject {
 
-  @Published var tradeQuote: Models.TradeQuote?
-  @Published var tradeResult: Result<Candle.Models.Trade, Candle.Models.ExecuteTrade.Error>?
+    @Published var tradeQuote: Models.TradeQuote?
+    @Published var tradeResult: Result<Candle.Models.Trade, Candle.Models.ExecuteTrade.Error>?
 
-  init(tradeQuote: Models.TradeQuote?) {
-    self.tradeQuote = tradeQuote
-  }
+    init(tradeQuote: Models.TradeQuote?) { self.tradeQuote = tradeQuote }
 }

package/ios/Sources/CandleLinkSheetWrapperView.swift

@@ -1,68 +1,49 @@
 import Candle
 import SwiftUI
 
-@available(iOS 17.0, *)
-struct CandleLinkSheetWrapper: View {
+@available(iOS 17.0, *) struct CandleLinkSheetWrapper: View {
 
-  let candleClient: CandleClient
+    @ObservedObject var viewModel = CandleLinkViewModel()
 
-  @ObservedObject var viewModel: CandleLinkViewModel
-
-  init(appUser: Candle.Models.AppUser, accessGroup: String?) {
-    self.candleClient = CandleClient(appUser: appUser, accessGroup: accessGroup)
-    self.viewModel = CandleLinkViewModel(candleClient: candleClient)
-  }
-
-  var body: some View {
-    if let services = viewModel.services {
-      if let service = services.first, services.count == 1 {
-        Spacer()
-          .candleLinkSheet(
-            isPresented: $viewModel.showSheet,
-            service: service.toRNModel,
-            customerName: viewModel.customerName,
-            cornerRadius: viewModel.cornerRadius,
-            showDynamicLoading: viewModel.showDynamicLoading,
-            presentationStyle: viewModel.toCandlePresentationStyle,
-            presentationBackground: viewModel.toCandlePresentationBackground
-          ) { newLinkedAccount in
-            viewModel.linkedAccount = newLinkedAccount
-          }
-          .onChange(of: viewModel.showSheet) { _, newValue in
-            Task { @MainActor in
-              viewModel.isPresented = newValue
+    var body: some View {
+        if let services = viewModel.services {
+            if let service = services.first, services.count == 1 {
+                Spacer()
+                    .candleLinkSheet(
+                        isPresented: $viewModel.showSheet,
+                        service: .init(reactModel: service),
+                        customerName: viewModel.customerName,
+                        cornerRadius: viewModel.cornerRadius,
+                        showDynamicLoading: viewModel.showDynamicLoading,
+                        presentationStyle: viewModel.toCandlePresentationStyle,
+                        presentationBackground: viewModel.toCandlePresentationBackground
+                    ) { newLinkedAccount in viewModel.linkedAccount = newLinkedAccount }
+                    .onChange(of: viewModel.showSheet) { _, newValue in
+                        Task { @MainActor in viewModel.isPresented = newValue }
+                    }
+            } else {
+                Spacer()
+                    .candleLinkSheet(
+                        isPresented: $viewModel.showSheet,
+                        customerName: viewModel.customerName,
+                        cornerRadius: viewModel.cornerRadius,
+                        services: services.map(Models.Service.init(reactModel:)),
+                        showDynamicLoading: viewModel.showDynamicLoading,
+                        presentationStyle: viewModel.toCandlePresentationStyle,
+                        presentationBackground: viewModel.toCandlePresentationBackground
+                    ) { newLinkedAccount in viewModel.linkedAccount = newLinkedAccount }
             }
-          }
-          .environment(candleClient)
-      } else {
-        Spacer()
-          .candleLinkSheet(
-            isPresented: $viewModel.showSheet,
-            customerName: viewModel.customerName,
-            cornerRadius: viewModel.cornerRadius,
-            services: services.map(\.toRNModel),
-            showDynamicLoading: viewModel.showDynamicLoading,
-            presentationStyle: viewModel.toCandlePresentationStyle,
-            presentationBackground: viewModel.toCandlePresentationBackground
-          ) { newLinkedAccount in
-            viewModel.linkedAccount = newLinkedAccount
-          }
-          .environment(candleClient)
-      }
-    } else {
-      Spacer()
-        .candleLinkSheet(
-          isPresented: $viewModel.showSheet,
-          customerName: viewModel.customerName,
-          cornerRadius: viewModel.cornerRadius,
-          services: .supported,
-          showDynamicLoading: viewModel.showDynamicLoading,
-          presentationStyle: viewModel.toCandlePresentationStyle,
-          presentationBackground: viewModel.toCandlePresentationBackground
-        ) { newLinkedAccount in
-          viewModel.linkedAccount = newLinkedAccount
+        } else {
+            Spacer()
+                .candleLinkSheet(
+                    isPresented: $viewModel.showSheet,
+                    customerName: viewModel.customerName,
+                    cornerRadius: viewModel.cornerRadius,
+                    services: .supported,
+                    showDynamicLoading: viewModel.showDynamicLoading,
+                    presentationStyle: viewModel.toCandlePresentationStyle,
+                    presentationBackground: viewModel.toCandlePresentationBackground
+                ) { newLinkedAccount in viewModel.linkedAccount = newLinkedAccount }
         }
-        .environment(candleClient)
     }
-  }
 }

package/ios/Sources/CandleLinkViewModel.swift

@@ -1,41 +1,31 @@
 import Candle
 import SwiftUI
 
-@available(iOS 17.0, *)
-final class CandleLinkViewModel: ObservableObject {
+@available(iOS 17.0, *) final class CandleLinkViewModel: ObservableObject {
 
-  let candleClient: CandleClient
+    @Published var showSheet = false
+    @Published var linkedAccount: Models.LinkedAccount?
+    @Published var isPresented: Bool = false
+    @Published var services: [Service]?
+    @Published var cornerRadius: Double = 0
+    @Published var customerName: String?
+    @Published var showDynamicLoading: Bool = false
+    @Published var presentationBackground: PresentationBackground = .default
+    @Published var presentationStyle: PresentationStyle = .fullscreen
 
-  @Published var showSheet = false
-  @Published var linkedAccount: Models.LinkedAccount?
-  @Published var isPresented: Bool = false
-  @Published var services: [Service]?
-  @Published var cornerRadius: Double = 0
-  @Published var customerName: String?
-  @Published var showDynamicLoading: Bool = false
-  @Published var presentationBackground: PresentationBackground = .default
-  @Published var presentationStyle: PresentationStyle = .fullscreen
+    init() {}
 
-  init(candleClient: Candle.CandleClient) {
-    self.candleClient = candleClient
-  }
-
-  @available(iOS 17.0, *)
-  var toCandlePresentationStyle: Candle.PresentationStyle {
-    switch presentationStyle {
-    case .fullscreen:
-      return .fullScreen
-    case .sheet:
-      return .sheet
+    @available(iOS 17.0, *) var toCandlePresentationStyle: Candle.PresentationStyle {
+        switch presentationStyle {
+        case .fullscreen: return .fullScreen
+        case .sheet: return .sheet
+        }
     }
-  }
 
-  var toCandlePresentationBackground: AnyShapeStyle? {
-    switch presentationBackground {
-    case .default:
-      return nil
-    case .blur:
-      return AnyShapeStyle(Material.regular)
+    var toCandlePresentationBackground: AnyShapeStyle? {
+        switch presentationBackground {
+        case .default: return nil
+        case .blur: return AnyShapeStyle(Material.regular)
+        }
     }
-  }
 }

package/ios/Sources/CandleTradeExecutionSheetWrapper.swift

@@ -1,31 +1,22 @@
 import Candle
 import SwiftUI
 
-@available(iOS 17.0, *)
-struct CandleTradeExecutionSheetWrapper: View {
+@available(iOS 17.0, *) struct CandleTradeExecutionSheetWrapper: View {
 
-  let candleClient: CandleClient
+    @ObservedObject var viewModel: CandleActionViewModel
+    let presentationBackground: PresentationBackground
 
-  @ObservedObject var viewModel: CandleActionViewModel
-  let presentationBackground: PresentationBackground
-
-  var toCandlePresentationBackground: AnyShapeStyle {
-    switch presentationBackground {
-    case .default:
-      return AnyShapeStyle(Material.regular)
-    case .blur:
-      return AnyShapeStyle(Material.ultraThick)
+    var toCandlePresentationBackground: AnyShapeStyle {
+        switch presentationBackground {
+        case .default: return AnyShapeStyle(Material.regular)
+        case .blur: return AnyShapeStyle(Material.ultraThick)
+        }
     }
-  }
 
-  var body: some View {
-    Color.clear
-      .candleTradeExecutionSheet(
-        item: $viewModel.tradeQuote,
-        presentationBackground: toCandlePresentationBackground
-      ) { result in
-        viewModel.tradeResult = result
-      }
-      .environment(candleClient)
-  }
+    var body: some View {
+        Color.clear.candleTradeExecutionSheet(
+            item: $viewModel.tradeQuote,
+            presentationBackground: toCandlePresentationBackground
+        ) { result in viewModel.tradeResult = result }
+    }
 }

package/ios/Sources/HostingViewController.swift

@@ -2,35 +2,35 @@ import SwiftUI
 import UIKit
 
 extension UIViewController {
-  func embed(_ child: UIViewController) {
-    addChild(child)
-    view.insertSubview(child.view, belowSubview: view.subviews.first ?? view)
-    child.view.pinEdges(to: view)
-    child.didMove(toParent: self)
-  }
+    func embed(_ child: UIViewController) {
+        addChild(child)
+        view.insertSubview(child.view, belowSubview: view.subviews.first ?? view)
+        child.view.pinEdges(to: view)
+        child.didMove(toParent: self)
+    }
 
-  func embedOnTop(_ child: UIViewController) {
-    addChild(child)
-    view.insertSubview(child.view, aboveSubview: view)
-    child.view.pinEdges(to: view)
-    child.didMove(toParent: self)
-  }
+    func embedOnTop(_ child: UIViewController) {
+        addChild(child)
+        view.insertSubview(child.view, aboveSubview: view)
+        child.view.pinEdges(to: view)
+        child.didMove(toParent: self)
+    }
 
-  func removeEmbedded(_ child: UIViewController) {
-    child.willMove(toParent: nil)
-    child.view.removeFromSuperview()
-    child.removeFromParent()
-  }
+    func removeEmbedded(_ child: UIViewController) {
+        child.willMove(toParent: nil)
+        child.view.removeFromSuperview()
+        child.removeFromParent()
+    }
 }
 
 extension UIView {
-  func pinEdges(to superview: UIView) {
-    translatesAutoresizingMaskIntoConstraints = false
-    NSLayoutConstraint.activate([
-      leadingAnchor.constraint(equalTo: superview.leadingAnchor),
-      trailingAnchor.constraint(equalTo: superview.trailingAnchor),
-      topAnchor.constraint(equalTo: superview.topAnchor),
-      bottomAnchor.constraint(equalTo: superview.bottomAnchor),
-    ])
-  }
+    func pinEdges(to superview: UIView) {
+        translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            leadingAnchor.constraint(equalTo: superview.leadingAnchor),
+            trailingAnchor.constraint(equalTo: superview.trailingAnchor),
+            topAnchor.constraint(equalTo: superview.topAnchor),
+            bottomAnchor.constraint(equalTo: superview.bottomAnchor),
+        ])
+    }
 }