@pinwheel/react-native-pinwheel 3.5.1 → 3.5.3

package/android/build.gradle

@@ -32,7 +32,7 @@ repositories {
   google()
 }
 
-def PW_ANDROID_SDK_VERSION = '3.5.1'
+def PW_ANDROID_SDK_VERSION = '3.5.2'
 
 dependencies {
     def pwVersion = rootProject.hasProperty('pwVersion') ? rootProject.pwVersion : PW_ANDROID_SDK_VERSION

package/android/src/main/java/com/rtnpinwheel/Pinwheel.kt

@@ -89,7 +89,7 @@ class Pinwheel : FrameLayout {
     Handler(Looper.getMainLooper()).post {
       if (this.pinwheelFragment == null) {
         this.token?.let {
-          val pinwheelFragment = PinwheelFragment.newInstanceWithAdvancedOptions(it, "react native", "3.5.1", getReactNativeVersion(), this.handleInsets, this.useDarkMode)
+          val pinwheelFragment = PinwheelFragment.newInstanceWithAdvancedOptions(it, "react native", "3.5.3", getReactNativeVersion(), this.handleInsets, this.useDarkMode)
           pinwheelEventListener?.let { listener ->
             pinwheelFragment.pinwheelEventListener = listener
           }

package/ios/RTNPinwheelView.mm

@@ -7,8 +7,8 @@
 #import <react/renderer/components/RTNPinwheelSpec/Props.h>
 #import <react/renderer/components/RTNPinwheelSpec/RCTComponentViewHelpers.h>
 
-#import "RTNPinwheelEvents.h"
 #import "RCTFabricComponentsPlugins.h"
+#import "RTNPinwheelEvents.h"
 
 using namespace facebook::react;
 
@@ -17,186 +17,302 @@ using namespace facebook::react;
 
 @implementation RTNPinwheelView
 
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-    return concreteComponentDescriptorProvider<RTNPinwheelComponentDescriptor>();
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<RTNPinwheelComponentDescriptor>();
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame])) {
-        [self initPinwheelWrapperVC];
-    }
-    return self;
+  if ((self = [super initWithFrame:frame])) {
+    [self initPinwheelWrapperVC];
+  }
+  return self;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame token:(NSString *)token {
-    if ((self = [super initWithFrame:frame])) {
-        _token = token;
-    }
-    return self;
+  if ((self = [super initWithFrame:frame])) {
+    _token = token;
+  }
+  return self;
 }
 
-- (void)initPinwheelWrapperVC {
-    if (self.pinwheelWrapperVC != nil) {
-        [self.pinwheelWrapperVC.view removeFromSuperview];
-        self.pinwheelWrapperVC = nil;
-    }
-
-    if (self.token != nil) {
-        self.pinwheelWrapperVC = [[PinwheelWrapperVC alloc] initWithToken:self.token delegate:self sdk:@"react native" version:@"3.5.1" useDarkMode:self.useDarkMode useAppBoundDomains:NO useAppBoundDomainsForNativeLink:NO];
-        [self addSubview:self.pinwheelWrapperVC.view];
+// Helper to find parent VC from a UIView
+- (UIViewController *)getParentViewController {
+  UIResponder *responder = self.nextResponder;
+  while (responder) {
+    if ([responder isKindOfClass:[UIViewController class]]) {
+      return (UIViewController *)responder;
     }
+    responder = responder.nextResponder;
+  }
+  return nil;
 }
 
-- (void)setToken:(NSString *)newToken {
-    if (![_token isEqualToString:newToken]) {
-        _token = newToken;
-    }
+- (void)cleanUpPinwheelWrapperVC {
+  if (self.pinwheelWrapperVC != nil) {
+    [self.pinwheelWrapperVC willMoveToParentViewController:nil];
+    [self.pinwheelWrapperVC.view removeFromSuperview];
+    [self.pinwheelWrapperVC removeFromParentViewController];
+    self.pinwheelWrapperVC = nil;
+  }
 }
 
-- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
-{
-    const auto &oldViewProps = *std::static_pointer_cast<RTNPinwheelProps const>(_props);
-    const auto &newViewProps = *std::static_pointer_cast<RTNPinwheelProps const>(props);
+- (void)initPinwheelWrapperVC {
+  [self cleanUpPinwheelWrapperVC];
+
+  if (self.token == nil) {
+    return;
+  }
+
+  UIViewController *parentVC = [self getParentViewController];
+  if (!parentVC) {
+    // Not yet attached to the hierarchy, skip for now and `didMoveToWindow`
+    // will retry later.
+    return;
+  }
+
+  self.pinwheelWrapperVC =
+      [[PinwheelWrapperVC alloc] initWithToken:self.token
+                                      delegate:self
+                                           sdk:@"react native"
+                                       version:@"3.5.3"
+                                   useDarkMode:self.useDarkMode
+                            useAppBoundDomains:NO
+               useAppBoundDomainsForNativeLink:NO];
+
+  // Guard against double-attachment (shouldn’t happen after cleanup, but safe).
+  if (self.pinwheelWrapperVC.parentViewController == parentVC) {
+    self.pinwheelWrapperVC.view.frame = self.bounds;
+    return;
+  }
+
+  [parentVC addChildViewController:self.pinwheelWrapperVC];
+  [self addSubview:self.pinwheelWrapperVC.view];
+  self.pinwheelWrapperVC.view.frame = self.bounds;
+  [self.pinwheelWrapperVC didMoveToParentViewController:parentVC];
+}
 
-    if (oldViewProps.token != newViewProps.token) {
-        NSString* convertedToken = [NSString stringWithUTF8String:newViewProps.token.c_str()];
-        [self setToken:convertedToken];
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+  if (self.window) {
+    if (!self.pinwheelWrapperVC) {
+      [self initPinwheelWrapperVC];
     }
+  }
+}
 
-    if (oldViewProps.useDarkMode != newViewProps.useDarkMode) {
-        self.useDarkMode = newViewProps.useDarkMode;
-    }
+- (void)dealloc {
+  [self cleanUpPinwheelWrapperVC];
+}
 
-    // Ensures that the view is always re-initialized whenever the props change, or the React Native component is
-    // re-mounted. On the new architecture, there are optimizations which causes the view to be re-used in these
-    // scenarios, whereas the ideal functionality here is to have the Link modal reset to the starting state.
-    [self initPinwheelWrapperVC];
+- (void)setToken:(NSString *)newToken {
+  if (![_token isEqualToString:newToken]) {
+    _token = newToken;
+  }
+}
 
-    [super updateProps:props oldProps:oldProps];
+- (void)updateProps:(Props::Shared const &)props
+           oldProps:(Props::Shared const &)oldProps {
+  const auto &oldViewProps =
+      *std::static_pointer_cast<RTNPinwheelProps const>(_props);
+  const auto &newViewProps =
+      *std::static_pointer_cast<RTNPinwheelProps const>(props);
+
+  if (oldViewProps.token != newViewProps.token) {
+    NSString *convertedToken =
+        [NSString stringWithUTF8String:newViewProps.token.c_str()];
+    [self setToken:convertedToken];
+  }
+
+  if (oldViewProps.useDarkMode != newViewProps.useDarkMode) {
+    self.useDarkMode = newViewProps.useDarkMode;
+  }
+
+  // Ensures that the view is always re-initialized whenever the props change,
+  // or the React Native component is re-mounted. On the new architecture, there
+  // are optimizations which causes the view to be re-used in these scenarios,
+  // whereas the ideal functionality here is to have the Link modal reset to the
+  // starting state.
+  [self initPinwheelWrapperVC];
+
+  [super updateProps:props oldProps:oldProps];
 }
 
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-    if (self.pinwheelWrapperVC != nil) {
-        self.pinwheelWrapperVC.view.frame = self.bounds;
-    }
+- (void)layoutSubviews {
+  [super layoutSubviews];
+  if (self.pinwheelWrapperVC != nil) {
+    self.pinwheelWrapperVC.view.frame = self.bounds;
+  }
 }
 
-- (void)onEventWithName:(NSString *)name event:(NSDictionary<NSString *, id> *)event {
-    NSLog(@"%@", name);
-    NSDictionary *dataToSend = @{@"name": name, @"payload": event};
-    [RTNPinwheelEvents.sharedInstance handlePinwheelEvent:dataToSend];
+- (void)onEventWithName:(NSString *)name
+                  event:(NSDictionary<NSString *, id> *)event {
+  NSLog(@"%@", name);
+  NSDictionary *dataToSend = @{@"name" : name, @"payload" : event};
+  [RTNPinwheelEvents.sharedInstance handlePinwheelEvent:dataToSend];
 }
 
 - (void)onExit:(NSDictionary<NSString *, id> *)error {
-    NSLog(@"%@", error);
+  NSLog(@"%@", error);
 }
 
 - (void)onSuccess:(NSDictionary<NSString *, id> *)result {
-    NSLog(@"%@", result);
+  NSLog(@"%@", result);
 }
 
 - (void)onLogin:(NSDictionary<NSString *, id> *)result {
-    NSLog(@"%@", result);
+  NSLog(@"%@", result);
 }
 
 - (void)onLoginAttempt:(NSDictionary<NSString *, id> *)result {
-    NSLog(@"%@", result);
+  NSLog(@"%@", result);
 }
 
 - (void)onError:(NSDictionary<NSString *, id> *)error {
-    NSLog(@"%@", error);
+  NSLog(@"%@", error);
 }
 
 @end
 
-Class<RCTComponentViewProtocol> RTNPinwheelCls(void)
-{
+Class<RCTComponentViewProtocol> RTNPinwheelCls(void) {
   return RTNPinwheelView.class;
 }
 
 #else
 
-#import "RTNPinwheelView.h"
 #import "RTNPinwheelEvents.h"
+#import "RTNPinwheelView.h"
 
 @implementation RTNPinwheelView
 
 - (instancetype)initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame])) {
-        [self initPinwheelWrapperVC];
-    }
-    return self;
+  if ((self = [super initWithFrame:frame])) {
+    [self initPinwheelWrapperVC];
+  }
+  return self;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame token:(NSString *)token {
-    if ((self = [super initWithFrame:frame])) {
-        _token = token;
+  if ((self = [super initWithFrame:frame])) {
+    _token = token;
+  }
+  return self;
+}
+
+// Helper to find parent VC from a UIView
+- (UIViewController *)getParentViewController {
+  UIResponder *responder = self.nextResponder;
+  while (responder) {
+    if ([responder isKindOfClass:[UIViewController class]]) {
+      return (UIViewController *)responder;
     }
-    return self;
+    responder = responder.nextResponder;
+  }
+  return nil;
+}
+
+- (void)cleanUpPinwheelWrapperVC {
+  if (self.pinwheelWrapperVC != nil) {
+    [self.pinwheelWrapperVC willMoveToParentViewController:nil];
+    [self.pinwheelWrapperVC.view removeFromSuperview];
+    [self.pinwheelWrapperVC removeFromParentViewController];
+    self.pinwheelWrapperVC = nil;
+  }
 }
 
 - (void)initPinwheelWrapperVC {
-    if (self.pinwheelWrapperVC != nil) {
-        [self.pinwheelWrapperVC.view removeFromSuperview];
-        self.pinwheelWrapperVC = nil;
-    }
+  [self cleanUpPinwheelWrapperVC];
+
+  if (self.token == nil) {
+    return;
+  }
+
+  UIViewController *parentVC = [self getParentViewController];
+  if (!parentVC) {
+    // Not yet attached to the hierarchy, skip for now and `didMoveToWindow`
+    // will retry later.
+    return;
+  }
+
+  self.pinwheelWrapperVC =
+      [[PinwheelWrapperVC alloc] initWithToken:self.token
+                                      delegate:self
+                                           sdk:@"react native"
+                                       version:@"3.5.3"
+                                   useDarkMode:self.useDarkMode
+                            useAppBoundDomains:NO
+               useAppBoundDomainsForNativeLink:NO];
+
+  // Guard against double-attachment (shouldn’t happen after cleanup, but safe).
+  if (self.pinwheelWrapperVC.parentViewController == parentVC) {
+    self.pinwheelWrapperVC.view.frame = self.bounds;
+    return;
+  }
+
+  [parentVC addChildViewController:self.pinwheelWrapperVC];
+  [self addSubview:self.pinwheelWrapperVC.view];
+  self.pinwheelWrapperVC.view.frame = self.bounds;
+  [self.pinwheelWrapperVC didMoveToParentViewController:parentVC];
+}
 
-    if (self.token != nil) {
-        self.pinwheelWrapperVC = [[PinwheelWrapperVC alloc] initWithToken:self.token delegate:self sdk:@"react native" version:@"3.5.1" useDarkMode:self.useDarkMode useAppBoundDomains:NO useAppBoundDomainsForNativeLink:NO];
-        [self addSubview:self.pinwheelWrapperVC.view];
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+  if (self.window) {
+    if (!self.pinwheelWrapperVC) {
+      [self initPinwheelWrapperVC];
     }
+  }
+}
+
+- (void)dealloc {
+  [self cleanUpPinwheelWrapperVC];
 }
 
 - (void)setToken:(NSString *)newToken {
-    if (![_token isEqualToString:newToken]) {
-        _token = newToken;
-        [self initPinwheelWrapperVC];
-    }
+  if (![_token isEqualToString:newToken]) {
+    _token = newToken;
+    [self initPinwheelWrapperVC];
+  }
 }
 
 - (void)setUseDarkMode:(BOOL)newUseDarkMode {
-    if (_useDarkMode != newUseDarkMode) {
-        _useDarkMode = newUseDarkMode;
-        [self initPinwheelWrapperVC];
-    }
+  if (_useDarkMode != newUseDarkMode) {
+    _useDarkMode = newUseDarkMode;
+    [self initPinwheelWrapperVC];
+  }
 }
 
-- (void)layoutSubviews
-{
+- (void)layoutSubviews {
   [super layoutSubviews];
   self.pinwheelWrapperVC.view.frame = self.bounds;
 }
 
-- (void)onEventWithName:(NSString *)name event:(NSDictionary<NSString *, id> *)event {
-    NSLog(@"%@", name);
-    NSDictionary *dataToSend = @{@"name": name, @"payload": event};
-    [RTNPinwheelEvents.sharedInstance handlePinwheelEvent:dataToSend];
+- (void)onEventWithName:(NSString *)name
+                  event:(NSDictionary<NSString *, id> *)event {
+  NSLog(@"%@", name);
+  NSDictionary *dataToSend = @{@"name" : name, @"payload" : event};
+  [RTNPinwheelEvents.sharedInstance handlePinwheelEvent:dataToSend];
 }
 
 - (void)onExit:(NSDictionary<NSString *, id> *)error {
-    NSLog(@"%@", error);
+  NSLog(@"%@", error);
 }
 
 - (void)onSuccess:(NSDictionary<NSString *, id> *)result {
-    NSLog(@"%@", result);
+  NSLog(@"%@", result);
 }
 
 - (void)onLogin:(NSDictionary<NSString *, id> *)result {
-    NSLog(@"%@", result);
+  NSLog(@"%@", result);
 }
 
 - (void)onLoginAttempt:(NSDictionary<NSString *, id> *)result {
-    NSLog(@"%@", result);
+  NSLog(@"%@", result);
 }
 
 - (void)onError:(NSDictionary<NSString *, id> *)error {
-    NSLog(@"%@", error);
+  NSLog(@"%@", error);
 }
 
 @end
 
-
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinwheel/react-native-pinwheel",
-  "version": "3.5.1",
+  "version": "3.5.3",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/client-events/registry/v2.3.d.ts

@@ -1,80 +1,67 @@
 import type { AdditionsType, ModificationsType, RemovalsType } from '../utils';
-export type PinwheelErrorType =
-  | 'sandboxError'
-  | 'clientError'
-  | 'systemError'
-  | 'userActionRequired'
-  | 'platformError'
-  | 'invalidAccountsConfiguration'
-  | 'invalidUserInput'
-  | 'invalidLinkToken'
-  | 'networkError';
+export type PinwheelErrorType = 'sandboxError' | 'clientError' | 'systemError' | 'userActionRequired' | 'platformError' | 'invalidAccountsConfiguration' | 'invalidUserInput' | 'invalidLinkToken' | 'networkError';
 export type LinkApiJob = 'login' | 'direct_deposit_switch' | 'card_switch';
 export type OpenEventPayload = {};
 export type SelectEmployerEventPayload = {
-  selectedEmployerId: string;
-  selectedEmployerName: string;
+    selectedEmployerId: string;
+    selectedEmployerName: string;
 };
 export type SelectPlatformEventPayload = {
-  selectedPlatformId: string;
-  selectedPlatformName: string;
+    selectedPlatformId: string;
+    selectedPlatformName: string;
 };
 export type IncorrectPlatformGivenEventPayload = {};
 export type LoginAttemptEventPayload = {
-  platformId: string;
+    platformId: string;
 };
 export type LoginEventPayload = {
-  accountId: string;
-  platformId: string;
+    accountId: string;
+    platformId: string;
 };
 export type InputAmountEventPayload = {
-  value: number;
-  unit: '$' | '%';
+    value: number;
+    unit: '$' | '%';
 };
 type _PartialSwitch<T> = {
-  action: 'partial_switch';
-  allocation: T;
+    action: 'partial_switch';
+    allocation: T;
 };
 type InputAllocationPercentage = _PartialSwitch<{
-  type: 'percentage';
-  value: number;
+    type: 'percentage';
+    value: number;
 }>;
 type InputAllocationAmount = _PartialSwitch<{
-  type: 'amount';
-  value: number;
+    type: 'amount';
+    value: number;
 }>;
 type InputAllocationRemainder = _PartialSwitch<{
-  type: 'remainder';
+    type: 'remainder';
 }>;
-export type InputAllocationEventPayload =
-  | {
-      action: 'full_switch';
-    }
-  | InputAllocationRemainder
-  | InputAllocationAmount
-  | InputAllocationPercentage;
+export type InputAllocationEventPayload = {
+    action: 'full_switch';
+} | InputAllocationRemainder | InputAllocationAmount | InputAllocationPercentage;
 /**
  * @deprecated - Use `InputAllocationEventPayload` instead.
  */
 export type InputAllocation = InputAllocationEventPayload;
 export type CardSwitchBeginEventPayload = {};
 export type DocUploadsBeginEventPayload = {
-  uploadedDocumentsSubmittedCount?: number;
+    uploadedDocumentsSubmittedCount?: number;
 };
 export type DocUploadsSubmittedEventPayload = {
-  uploadedDocumentSubmittedCount: number;
+    uploadedDocumentSubmittedCount: number;
 };
 export type DdFormBeginEventPayload = {};
 export type DdFormCreateEventPayload = {
-  url: string;
+    url: string;
 };
 export type DdFormDownloadEventPayload = {};
 export type ScreenTransitionEventPayload = {
-  screenName: string;
-  selectedEmployerId?: string;
-  selectedEmployerName?: string;
-  selectedPlatformId?: string;
-  selectedPlatformName?: string;
+    screenName: string;
+    selectedEmployerId?: string;
+    selectedEmployerName?: string;
+    selectedPlatformId?: string;
+    selectedPlatformName?: string;
 };
 /**
  * @deprecated - Use `ScreenTransitionEventPayload` instead.
@@ -82,80 +69,74 @@ export type ScreenTransitionEventPayload = {
 export type ScreenTransition = ScreenTransitionEventPayload;
 export type ExitEventPayload = Record<string, never>;
 export type SuccessEventPayload = {
-  accountId: string;
-  platformId: string;
-  job: LinkApiJob;
-  params?: {
-    amount?: {
-      value: number;
-      unit: '%' | '$';
+    accountId: string;
+    platformId: string;
+    job: LinkApiJob;
+    params?: {
+        amount?: {
+            value: number;
+            unit: '%' | '$';
+        };
     };
-  };
 };
 export type ErrorEventPayload = {
-  type: PinwheelErrorType;
-  code: string;
-  message: string;
-  pendingRetry: boolean;
+    type: PinwheelErrorType;
+    code: string;
+    message: string;
+    pendingRetry: boolean;
 };
 export type OtherEventPayload = {
-  name: string;
-  payload: {
-    key: string;
-    value: string;
-    type: 'string' | 'boolean' | 'number';
-  }[];
+    name: string;
+    payload: {
+        key: string;
+        value: string;
+        type: 'string' | 'boolean' | 'number';
+    }[];
 };
 export type BillSwitchPayload = {
-  platformId: string;
-  platformName: string;
-  isGuidedSwitch: boolean;
-  frequency: string;
-  nextPaymentDate: string;
-  amountCents: number;
+    platformId: string;
+    platformName: string;
+    isGuidedSwitch: boolean;
+    isIntegratedSwitch: boolean;
+    frequency: string;
+    nextPaymentDate: string;
+    amountCents: number;
 };
 export type ExternalAccountConnectedPayload = {
-  institutionName: string;
-  accountName: string;
+    institutionName: string;
+    accountName: string;
 };
 /**
  * @deprecated - Use `ErrorEventPayload` instead.
  */
 export type PinwheelError = ErrorEventPayload;
 type EventPayloadAdditions = {
-  open: OpenEventPayload;
-  select_employer: SelectEmployerEventPayload;
-  select_platform: SelectPlatformEventPayload;
-  incorrect_platform_given: IncorrectPlatformGivenEventPayload;
-  login_attempt: LoginAttemptEventPayload;
-  login: LoginEventPayload;
-  input_amount: InputAmountEventPayload;
-  input_allocation: InputAllocationEventPayload;
-  card_switch_begin: CardSwitchBeginEventPayload;
-  doc_uploads_begin: DocUploadsBeginEventPayload;
-  doc_uploads_submitted: DocUploadsSubmittedEventPayload;
-  dd_form_begin: DdFormBeginEventPayload;
-  dd_form_create: DdFormCreateEventPayload;
-  dd_form_download: DdFormDownloadEventPayload;
-  screen_transition: ScreenTransitionEventPayload;
-  exit: ErrorEventPayload | ExitEventPayload;
-  other_event: OtherEventPayload;
-  success: SuccessEventPayload;
-  error: ErrorEventPayload;
-  bill_switch_success: BillSwitchPayload;
-  bill_removed: BillSwitchPayload;
-  external_account_connected: ExternalAccountConnectedPayload;
-  merchant_login_success: LoginEventPayload;
+    open: OpenEventPayload;
+    select_employer: SelectEmployerEventPayload;
+    select_platform: SelectPlatformEventPayload;
+    incorrect_platform_given: IncorrectPlatformGivenEventPayload;
+    login_attempt: LoginAttemptEventPayload;
+    login: LoginEventPayload;
+    input_amount: InputAmountEventPayload;
+    input_allocation: InputAllocationEventPayload;
+    card_switch_begin: CardSwitchBeginEventPayload;
+    doc_uploads_begin: DocUploadsBeginEventPayload;
+    doc_uploads_submitted: DocUploadsSubmittedEventPayload;
+    dd_form_begin: DdFormBeginEventPayload;
+    dd_form_create: DdFormCreateEventPayload;
+    dd_form_download: DdFormDownloadEventPayload;
+    screen_transition: ScreenTransitionEventPayload;
+    exit: ErrorEventPayload | ExitEventPayload;
+    other_event: OtherEventPayload;
+    success: SuccessEventPayload;
+    error: ErrorEventPayload;
+    bill_switch_success: BillSwitchPayload;
+    bill_removed: BillSwitchPayload;
+    external_account_connected: ExternalAccountConnectedPayload;
+    merchant_login_success: LoginEventPayload;
 };
 type EventPayloadModifications = {};
 type EventPayloadRemovals = [];
-export type EventPayloadMap = Omit<
-  AdditionsType<EventPayloadAdditions> &
-    ModificationsType<EventPayloadModifications>,
-  keyof RemovalsType<EventPayloadRemovals>
->;
-export type EventHandler = <T extends keyof EventPayloadMap>(
-  eventName: T,
-  payload: EventPayloadMap[T]
-) => void;
+export type EventPayloadMap = Omit<AdditionsType<EventPayloadAdditions> & ModificationsType<EventPayloadModifications>, keyof RemovalsType<EventPayloadRemovals>>;
+export type EventHandler = <T extends keyof EventPayloadMap>(eventName: T, payload: EventPayloadMap[T]) => void;
 export {};

package/src/client-events/registry/v2.3.ts

@@ -126,7 +126,8 @@ export type OtherEventPayload = {
 export type BillSwitchPayload = {
   platformId: string;
   platformName: string;
-  isGuidedSwitch: boolean;
+  isGuidedSwitch: boolean; // deprecated: will be removed in future version
+  isIntegratedSwitch: boolean;
   frequency: string;
   nextPaymentDate: string;
   amountCents: number;