@pinwheel/react-native-pinwheel 3.5.2 → 3.5.4

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.2", getReactNativeVersion(), this.handleInsets, this.useDarkMode)
+          val pinwheelFragment = PinwheelFragment.newInstanceWithAdvancedOptions(it, "react native", "3.5.4", getReactNativeVersion(), this.handleInsets, this.useDarkMode)
           pinwheelEventListener?.let { listener ->
             pinwheelFragment.pinwheelEventListener = listener
           }

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

@@ -14,6 +14,7 @@ import com.underdog_tech.pinwheel_android.model.PinwheelEventType
 import com.underdog_tech.pinwheel_android.model.PinwheelInputAllocationPayload
 import com.underdog_tech.pinwheel_android.model.PinwheelTarget
 import com.underdog_tech.pinwheel_android.model.PinwheelAllocation
+import com.underdog_tech.pinwheel_android.model.PinwheelBillSwitchEventPayload
 import com.underdog_tech.pinwheel_android.model.PinwheelParams
 import com.underdog_tech.pinwheel_android.model.PinwheelResult
 import com.underdog_tech.pinwheel_android.model.PinwheelError
@@ -22,56 +23,58 @@ import com.underdog_tech.pinwheel_android.model.PinwheelSelectedPlatformPayload
 import com.underdog_tech.pinwheel_android.model.PinwheelLoginPayload
 import com.underdog_tech.pinwheel_android.model.PinwheelLoginAttemptPayload
 import com.underdog_tech.pinwheel_android.model.PinwheelDDFormCreatePayload
+import com.underdog_tech.pinwheel_android.model.PinwheelExternalAccountConnectedPayload
+import com.underdog_tech.pinwheel_android.model.PinwheelOtherEventPayload
 import com.underdog_tech.pinwheel_android.model.PinwheelScreenTransitionPayload
 
 @ReactModule(name = PinwheelEventsModule.NAME)
 class PinwheelEventsModule(private val context: ReactApplicationContext) : ReactContextBaseJavaModule(context), PinwheelEventListener {
-    init {
-        Companion.context = context
-    }
+  init {
+    Companion.context = context
+  }
 
-    override fun getName(): String = NAME
+  override fun getName(): String = NAME
 
-    @ReactMethod
-    fun setListener() {
-        hasListeners = true;
-    }
+  @ReactMethod
+  fun setListener() {
+    hasListeners = true;
+  }
 
-    @ReactMethod
-    fun removeListener() {
-        hasListeners = false;
-    }
+  @ReactMethod
+  fun removeListener() {
+    hasListeners = false;
+  }
 
-    @ReactMethod
-    fun addListener(eventName: String) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
+  @ReactMethod
+  fun addListener(eventName: String) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
 
-    @ReactMethod
-    fun removeListeners(count: Int) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
+  @ReactMethod
+  fun removeListeners(count: Int) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
 
-    override fun onEvent(eventName: PinwheelEventType, payload: PinwheelEventPayload?) {
-        if (!hasListeners) return
-
-        val params = WritableNativeMap()
-        params.putString("name", eventName.toString())
-        if (payload != null) {
-            params.putMap("payload", payload.toWritableMap())
-        }
-        
-        context
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-            .emit(Companion.PinwheelEventName, params)
-    }
+  override fun onEvent(eventName: PinwheelEventType, payload: PinwheelEventPayload?) {
+    if (!hasListeners) return
 
-    companion object {
-        const val NAME = "RTNPinwheelEvents"
-        const val PinwheelEventName = "PINWHEEL_EVENT"
-        private var context: ReactApplicationContext? = null
-        private var hasListeners = false;
+    val params = WritableNativeMap()
+    params.putString("name", eventName.toString())
+    if (payload != null) {
+      params.putMap("payload", payload.toWritableMap())
     }
+
+    context
+      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+      .emit(Companion.PinwheelEventName, params)
+  }
+
+  companion object {
+    const val NAME = "RTNPinwheelEvents"
+    const val PinwheelEventName = "PINWHEEL_EVENT"
+    private var context: ReactApplicationContext? = null
+    private var hasListeners = false;
+  }
 }
 
 fun PinwheelTarget.toWritableMap(): WritableMap {
@@ -109,30 +112,37 @@ fun PinwheelEventPayload.toWritableMap(): WritableMap = when (this) {
     putString("job", this@toWritableMap.job)
     putMap("params", this@toWritableMap.params?.toWritableMap())
   }
+
   is PinwheelError -> Arguments.createMap().apply {
     putString("type", this@toWritableMap.type)
     putString("code", this@toWritableMap.code)
     putString("message", this@toWritableMap.message)
     putBoolean("pendingRetry", this@toWritableMap.pendingRetry)
   }
+
   is PinwheelSelectedEmployerPayload -> Arguments.createMap().apply {
     putString("selectedEmployerId", this@toWritableMap.selectedEmployerId)
     putString("selectedEmployerName", this@toWritableMap.selectedEmployerName)
   }
+
   is PinwheelSelectedPlatformPayload -> Arguments.createMap().apply {
     putString("selectedPlatformId", this@toWritableMap.selectedPlatformId)
     putString("selectedPlatformName", this@toWritableMap.selectedPlatformName)
   }
+
   is PinwheelLoginPayload -> Arguments.createMap().apply {
     putString("accountId", this@toWritableMap.accountId)
     putString("platformId", this@toWritableMap.platformId)
   }
+
   is PinwheelLoginAttemptPayload -> Arguments.createMap().apply {
     putString("platformId", this@toWritableMap.platformId)
   }
+
   is PinwheelDDFormCreatePayload -> Arguments.createMap().apply {
     putString("url", this@toWritableMap.url)
   }
+
   is PinwheelScreenTransitionPayload -> Arguments.createMap().apply {
     putString("screenName", this@toWritableMap.screenName)
     putString("selectedEmployerId", this@toWritableMap.selectedEmployerId)
@@ -140,5 +150,33 @@ fun PinwheelEventPayload.toWritableMap(): WritableMap = when (this) {
     putString("selectedPlatformId", this@toWritableMap.selectedPlatformId)
     putString("selectedPlatformName", this@toWritableMap.selectedPlatformName)
   }
+
+  is PinwheelOtherEventPayload -> Arguments.createMap().apply {
+    putString("name", this@toWritableMap.name)
+    val payloadArray = Arguments.createArray()
+    this@toWritableMap.payload.forEach { item ->
+      val map = Arguments.createMap()
+      map.putString("key", item.key)
+      map.putString("value", item.value)
+      map.putString("type", item.type.name)
+      payloadArray.pushMap(map)
+    }
+    putArray("payload", payloadArray)
+  }
+
+  is PinwheelBillSwitchEventPayload -> Arguments.createMap().apply {
+    putString("platformId", this@toWritableMap.platformId)
+    putString("platformName", this@toWritableMap.platformName)
+    putBoolean("isIntegratedSwitch", this@toWritableMap.isIntegratedSwitch)
+    putString("frequency", this@toWritableMap.frequency)
+    putString("nextPaymentDate", this@toWritableMap.nextPaymentDate)
+    putInt("amountCents", this@toWritableMap.amountCents)
+  }
+
+  is PinwheelExternalAccountConnectedPayload -> Arguments.createMap().apply {
+    putString("institutionName", this@toWritableMap.institutionName)
+    putString("accountName", this@toWritableMap.accountName)
+  }
+
   else -> throw IllegalArgumentException("Unsupported PinwheelEventPayload type")
 }

package/ios/RTNPinwheelView.mm

@@ -74,7 +74,7 @@ using namespace facebook::react;
       [[PinwheelWrapperVC alloc] initWithToken:self.token
                                       delegate:self
                                            sdk:@"react native"
-                                       version:@"3.5.2"
+                                       version:@"3.5.4"
                                    useDarkMode:self.useDarkMode
                             useAppBoundDomains:NO
                useAppBoundDomainsForNativeLink:NO];
@@ -97,8 +97,6 @@ using namespace facebook::react;
     if (!self.pinwheelWrapperVC) {
       [self initPinwheelWrapperVC];
     }
-  } else {
-    [self cleanUpPinwheelWrapperVC];
   }
 }
 
@@ -239,7 +237,7 @@ Class<RCTComponentViewProtocol> RTNPinwheelCls(void) {
       [[PinwheelWrapperVC alloc] initWithToken:self.token
                                       delegate:self
                                            sdk:@"react native"
-                                       version:@"3.5.2"
+                                       version:@"3.5.4"
                                    useDarkMode:self.useDarkMode
                             useAppBoundDomains:NO
                useAppBoundDomainsForNativeLink:NO];
@@ -262,8 +260,6 @@ Class<RCTComponentViewProtocol> RTNPinwheelCls(void) {
     if (!self.pinwheelWrapperVC) {
       [self initPinwheelWrapperVC];
     }
-  } else {
-    [self cleanUpPinwheelWrapperVC];
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinwheel/react-native-pinwheel",
-  "version": "3.5.2",
+  "version": "3.5.4",
   "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;