banking_dcb_sdk_react_native 1.0.774-w → 2.0.0

package/lib/typescript/src/helpers/utils/webviewCallback.d.ts

@@ -1,6 +1,7 @@
 export declare enum WebViewCallbackType {
     Logout = "logout",
-    Redirect = "redirect"
+    Redirect = "redirect",
+    SdkEvent = "sdkEvent"
 }
 export declare class WebViewCallback {
     type: WebViewCallbackType;
@@ -8,6 +9,14 @@ export declare class WebViewCallback {
     private constructor();
     static logout(): WebViewCallback;
     static redirect(status?: string | null): WebViewCallback;
+    static sdkEvent(status: string): WebViewCallback;
 }
 export type WebViewCallbackFunction = (callback: WebViewCallback) => void;
+export declare class SdkCallbackStatus {
+    static readonly userLocationPermissionGranted = "USER_LOCATION_PERMISSION_GRANTED";
+    static readonly userLocationPermissionDenied = "USER_LOCATION_PERMISSION_DENIED";
+    static readonly userLocationPermissionPermanentlyDenied = "USER_LOCATION_PERMISSION_PERMANENTLY_DENIED";
+    static readonly userLocationServiceDisabled = "USER_LOCATION_SERVICE_DISABLED";
+    static readonly userLocationFetchError = "USER_LOCATION_FETCH_ERROR";
+}
 //# sourceMappingURL=webviewCallback.d.ts.map

package/lib/typescript/src/helpers/utils/webviewCallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webviewCallback.d.ts","sourceRoot":"","sources":["../../../../../src/helpers/utils/webviewCallback.tsx"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAE3B,MAAM,WAAW;IACjB,QAAQ,aAAa;CACxB;AAED,qBAAa,eAAe;IACxB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB,OAAO;IAKP,MAAM,CAAC,MAAM,IAAI,eAAe;IAIhC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,eAAe;CAG3D;AAED,MAAM,MAAM,uBAAuB,GAAG,CAAC,QAAQ,EAAE,eAAe,KAAK,IAAI,CAAC"}
+{"version":3,"file":"webviewCallback.d.ts","sourceRoot":"","sources":["../../../../../src/helpers/utils/webviewCallback.tsx"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAC7B,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,QAAQ,aAAa;CACtB;AAED,qBAAa,eAAe;IAC1B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB,OAAO;IAKP,MAAM,CAAC,MAAM,IAAI,eAAe;IAIhC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,eAAe;IAIxD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;CAGjD;AAED,MAAM,MAAM,uBAAuB,GAAG,CAAC,QAAQ,EAAE,eAAe,KAAK,IAAI,CAAC;AAE1E,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,CAAC,6BAA6B,sCACR;IACrC,MAAM,CAAC,QAAQ,CAAC,4BAA4B,qCACR;IACpC,MAAM,CAAC,QAAQ,CAAC,uCAAuC,iDACP;IAChD,MAAM,CAAC,QAAQ,CAAC,2BAA2B,oCACR;IACnC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,+BAA+B;CACtE"}

package/lib/typescript/src/helpers/webview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webview.d.ts","sourceRoot":"","sources":["../../../../src/helpers/webview.tsx"],"names":[],"mappings":"AAgBA,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,yBAAyB,CAAC;AAcjC,UAAU,oBAAqB,SAAQ,YAAY;IACjD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,kBAAkB,CAAC,EAAE;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,WAAW,CAAC,EAAE,OAAO,CAAC;KACvB,CAAC;CACH;AACD,UAAU,kBAAkB;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,KAAK,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC;AAc7C;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAoCtE;AAuBD,eAAO,MAAM,OAAO,GAAI,0EAOrB,kBAAkB,4CAsgBpB,CAAC"}
+{"version":3,"file":"webview.d.ts","sourceRoot":"","sources":["../../../../src/helpers/webview.tsx"],"names":[],"mappings":"AAgBA,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,yBAAyB,CAAC;AAcjC,UAAU,oBAAqB,SAAQ,YAAY;IACjD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,kBAAkB,CAAC,EAAE;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,WAAW,CAAC,EAAE,OAAO,CAAC;KACvB,CAAC;CACH;AACD,UAAU,kBAAkB;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,KAAK,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC;AAc7C;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAoCtE;AAWD,eAAO,MAAM,OAAO,GAAI,0EAOrB,kBAAkB,4CAybpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "banking_dcb_sdk_react_native",
-  "version": "1.0.774w",
+  "version": "2.0.0",
   "description": "React Native package for partner integrating with DCB",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/src/helpers/banking_dcb_react_native.tsx

@@ -1,15 +1,26 @@
 import { APICall } from './network/APICall';
 import { DeviceInfoManager } from './utils/deviceInfoManager';
 import { LibraryConstants } from './utils/LibraryConstants';
-import { type WebViewCallbackFunction } from './utils/webviewCallback';
+import {
+  SdkCallbackStatus,
+  WebViewCallback,
+  type WebViewCallbackFunction,
+} from './utils/webviewCallback';
 import { ServiceNames } from './ServiceNames';
 import { Constants } from './utils/Constants';
 import { WebView } from './webview';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import { StatusBar } from 'react-native';
+import {
+  Alert,
+  PermissionsAndroid,
+  Platform,
+  StatusBar,
+  ToastAndroid,
+} from 'react-native';
 export type { WebViewCallbackFunction } from './utils/webviewCallback';
 import { AnalyticsLogger } from './analytics/analytics_logger';
 import * as base64js from 'base64-js';
+// import GetLocation, { type Location } from 'react-native-get-location';
 
 type InitOptions = {
   whitelistedDomains: string[];
@@ -28,7 +39,6 @@ export class BankingDcbReactNative {
 
   private _apiCall = new APICall();
   static webViewCallback: WebViewCallbackFunction;
-  private _analyticsLogger!: AnalyticsLogger;
   private constructor() {}
 
   static getInstance(): BankingDcbReactNative {
@@ -45,7 +55,7 @@ export class BankingDcbReactNative {
       deviceBindingEnabled: false,
     }
   ): Promise<void> {
-    //   console.log("PartnerLibrary.init - initialized:", PartnerLibrary.intialized);
+    console.log('SDK LOG: SDK INITIALIZED');
     if (BankingDcbReactNative.intialized) return;
 
     try {
@@ -82,7 +92,6 @@ export class BankingDcbReactNative {
       whitelistedDomains: whitelistedDomains,
       deviceBinding: deviceBindingEnabled,
     });
-    this._analyticsLogger = new AnalyticsLogger();
     // this._analyticsLogger.logEvent({ event: 'REACT_NATIVE_INTIALIZED' });
   }
 
@@ -90,7 +99,7 @@ export class BankingDcbReactNative {
     module: string,
     token: string,
     WebViewCallbackFunction: WebViewCallbackFunction
-  ): Promise<React.ReactElement> {
+  ): Promise<React.ReactElement | null> {
     // this._analyticsLogger.logEvent({ event: 'REACT_NATIVE_OPEN_FN_CALLED' });
 
     if (!BankingDcbReactNative.intialized) {
@@ -122,7 +131,7 @@ export class BankingDcbReactNative {
     bank: string,
     url: string,
     WebViewCallbackFunction: WebViewCallbackFunction
-  ): Promise<React.ReactElement> {
+  ): Promise<React.ReactElement | null> {
     // this._analyticsLogger.logEvent({
     //   event: 'REACT_NATIVE_DEVICE_BINDING_CALLED',
     // });
@@ -143,7 +152,7 @@ export class BankingDcbReactNative {
     bank: string,
     token: string,
     WebViewCallbackFunction: WebViewCallbackFunction
-  ): Promise<React.ReactElement> {
+  ): Promise<React.ReactElement | null> {
     // console.log("PartnerLibrary._loginAndNavigateToWebView - LibraryConstants.hostName:", LibraryConstants.hostName);
     try {
       // this._analyticsLogger.logEvent({ event: 'REACT_NATIVE_LOGIN_FN_CALLED' });
@@ -207,7 +216,7 @@ export class BankingDcbReactNative {
     bank: string,
     url: string,
     WebViewCallbackFunction: WebViewCallbackFunction
-  ): Promise<React.ReactElement> {
+  ): Promise<React.ReactElement | null> {
     try {
       console.log('SDK:LOG: in setup device session');
 
@@ -219,22 +228,38 @@ export class BankingDcbReactNative {
         console.log('App Version:', appVersion);
       }
       console.log('SDK:LOG device uuid is  ');
-
+      // const position = await this._getCurrentLocationIfPossible(
+      //   BankingDcbReactNative.webViewCallback
+      // );
+
+      // if (!position) {
+      //   console.log('SDK:LOG: location fetched is : ', position);
+      //   return null;
+      // }
+
+      // const latitude = String(position.latitude);
+      // const longitude = String(position.longitude);
+
+      const body: JSONMap = {
+        [Constants.MANUFACTURER]: deviceInfo[Constants.MANUFACTURER],
+        [Constants.MODEL]: deviceInfo[Constants.MODEL],
+        [Constants.DEVICE_UUID]: deviceInfo[Constants.DEVICE_UUID],
+        [Constants.OS]: deviceInfo[Constants.OS],
+        [Constants.OS_VERSION]: deviceInfo[Constants.OS_VERSION],
+        [Constants.APP_VERSION]: appVersion,
+        // [Constants.LATITUDE]: latitude,
+        // [Constants.LONGITUDE]: longitude,
+        // [Constants.ACCURACY]: String(position.accuracy),
+      };
+      console.log('SDK:LOG: body for device session is : ', body);
       const response = await this._apiCall.callAPI(
         'POST',
         ServiceNames.DEVICE_SESSION.params({ partner: bank }),
         {
-          body: {
-            [Constants.MANUFACTURER]: deviceInfo[Constants.MANUFACTURER],
-            [Constants.MODEL]: deviceInfo[Constants.MODEL],
-            [Constants.DEVICE_UUID]: deviceInfo[Constants.DEVICE_UUID],
-            [Constants.OS]: deviceInfo[Constants.OS],
-            [Constants.OS_VERSION]: deviceInfo[Constants.OS_VERSION],
-            [Constants.APP_VERSION]: appVersion,
-          },
+          body,
         }
       );
-      //console.log("response from setup device session is : ", response)
+      console.log('response from setup device session is : ', response);
       if (
         response &&
         response.data &&
@@ -380,7 +405,7 @@ export class BankingDcbReactNative {
               [Constants.MANUFACTURER]: deviceInfo[Constants.MANUFACTURER],
               [Constants.MODEL]: deviceInfo[Constants.MODEL],
               [Constants.DEVICE_UUID]: deviceInfo[Constants.DEVICE_UUID],
-              [Constants.OS]: deviceInfo[Constants.OS], // "Android"/"iOS" from your manager
+              [Constants.OS]: deviceInfo[Constants.OS],
               [Constants.OS_VERSION]: deviceInfo[Constants.OS_VERSION],
               [Constants.APP_VERSION]: appVersion,
             },
@@ -410,4 +435,97 @@ export class BankingDcbReactNative {
       };
     }
   }
+
+  // private async _getCurrentLocationIfPossible(
+  //   webViewCallback: WebViewCallbackFunction
+  // ): Promise<Location | null> {
+  //   try {
+  //     console.log('SDK:LOG: in get current location');
+
+  //     if (Platform.OS === 'android') {
+  //       const hasFineLocation = await PermissionsAndroid.check(
+  //         PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION
+  //       );
+
+  //       let result: string;
+
+  //       if (!hasFineLocation) {
+  //         result = await PermissionsAndroid.request(
+  //           PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION
+  //         );
+  //       } else {
+  //         result = PermissionsAndroid.RESULTS.GRANTED;
+  //       }
+
+  //       console.log('SDK:LOG: ANDROID LOCATION PERMISSION RESULT =>', result);
+
+  //       if (result === PermissionsAndroid.RESULTS.DENIED) {
+  //         webViewCallback(
+  //           WebViewCallback.sdkEvent(
+  //             SdkCallbackStatus.userLocationPermissionDenied
+  //           )
+  //         );
+  //         return null;
+  //       }
+
+  //       if (result === PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN) {
+  //         ToastAndroid.show(
+  //           'Location permission denied. Please enable it from Settings.',
+  //           ToastAndroid.LONG
+  //         );
+  //         webViewCallback(
+  //           WebViewCallback.sdkEvent(
+  //             SdkCallbackStatus.userLocationPermissionPermanentlyDenied
+  //           )
+  //         );
+  //         return null;
+  //       }
+  //     }
+
+  //     const location = await GetLocation.getCurrentPosition({
+  //       enableHighAccuracy: true,
+  //       timeout: 15000,
+  //     });
+
+  //     console.log('SDK:LOG: 📍 Got position via GetLocation:', {
+  //       latitude: location.latitude,
+  //       longitude: location.longitude,
+  //       accuracy: location.accuracy,
+  //       time: location.time,
+  //     });
+
+  //     return location;
+  //   } catch (error: any) {
+  //     console.log(
+  //       'SDK:LOG: Error while fetching location (GetLocation):',
+  //       error
+  //     );
+
+  //     const code = error?.code as string | undefined;
+
+  //     if (code === 'UNAUTHORIZED') {
+  //       webViewCallback(
+  //         WebViewCallback.sdkEvent(
+  //           SdkCallbackStatus.userLocationPermissionDenied
+  //         )
+  //       );
+  //     } else if (code === 'UNAVAILABLE') {
+  //       webViewCallback(
+  //         WebViewCallback.sdkEvent(
+  //           SdkCallbackStatus.userLocationServiceDisabled
+  //         )
+  //       );
+  //     } else if (code === 'TIMEOUT') {
+  //       webViewCallback(
+  //         WebViewCallback.sdkEvent(SdkCallbackStatus.userLocationFetchError)
+  //       );
+  //     } else {
+  //       webViewCallback(
+  //         WebViewCallback.sdkEvent(SdkCallbackStatus.userLocationFetchError)
+  //       );
+  //     }
+
+  //     return null;
+  //   }
+  // }
 }

package/src/helpers/utils/Constants.tsx

@@ -1,10 +1,12 @@
 export const Constants = {
-
-    MANUFACTURER: "manufacturer",
-    MODEL: "model",
-    OS: "os",
-    OS_VERSION: "os_version",
-    APP_VERSION: "app_version",
-    DEVICE_UUID: "device_uuid",
-    PRIMARY_COLOR: "#3F51B5"
-} as const;
+  MANUFACTURER: 'manufacturer',
+  MODEL: 'model',
+  OS: 'os',
+  OS_VERSION: 'os_version',
+  APP_VERSION: 'app_version',
+  DEVICE_UUID: 'device_uuid',
+  PRIMARY_COLOR: '#3F51B5',
+  LATITUDE: 'latitude',
+  LONGITUDE: 'longitude',
+  ACCURACY: 'accuracy',
+} as const;

package/src/helpers/utils/webviewCallback.tsx

@@ -1,25 +1,41 @@
 export enum WebViewCallbackType {
-
-    Logout = "logout",
-    Redirect = "redirect"
+  Logout = 'logout',
+  Redirect = 'redirect',
+  SdkEvent = 'sdkEvent',
 }
 
 export class WebViewCallback {
-    type: WebViewCallbackType;
-    status?: string | null;
+  type: WebViewCallbackType;
+  status?: string | null;
+
+  private constructor(type: WebViewCallbackType, status?: string | null) {
+    this.type = type;
+    this.status = status;
+  }
 
-    private constructor(type: WebViewCallbackType, status?: string | null) {
-        this.type = type;
-        this.status = status;
-    }
+  static logout(): WebViewCallback {
+    return new WebViewCallback(WebViewCallbackType.Logout);
+  }
 
-    static logout(): WebViewCallback {
-        return new WebViewCallback(WebViewCallbackType.Logout);
-    }
+  static redirect(status?: string | null): WebViewCallback {
+    return new WebViewCallback(WebViewCallbackType.Redirect, status);
+  }
 
-    static redirect(status?: string | null): WebViewCallback {
-        return new WebViewCallback(WebViewCallbackType.Redirect, status);
-    }
+  static sdkEvent(status: string): WebViewCallback {
+    return new WebViewCallback(WebViewCallbackType.SdkEvent, status);
+  }
 }
 
-export type WebViewCallbackFunction = (callback: WebViewCallback) => void;
+export type WebViewCallbackFunction = (callback: WebViewCallback) => void;
+
+export class SdkCallbackStatus {
+  static readonly userLocationPermissionGranted =
+    'USER_LOCATION_PERMISSION_GRANTED';
+  static readonly userLocationPermissionDenied =
+    'USER_LOCATION_PERMISSION_DENIED';
+  static readonly userLocationPermissionPermanentlyDenied =
+    'USER_LOCATION_PERMISSION_PERMANENTLY_DENIED';
+  static readonly userLocationServiceDisabled =
+    'USER_LOCATION_SERVICE_DISABLED';
+  static readonly userLocationFetchError = 'USER_LOCATION_FETCH_ERROR';
+}

package/src/helpers/webview.tsx

@@ -111,18 +111,6 @@ export async function openMailAppIntent(app: MailApp): Promise<boolean> {
 
   return false;
 }
-const isUserClosedRedirect = (url?: string | null): boolean => {
-  if (!url) return false;
-  try {
-    // Try to parse URL properly
-    const u = new URL(url);
-    if (!u.pathname.includes('/api/user/redirect')) return false;
-    return u.searchParams.get('status') === 'USER_CLOSED';
-  } catch {
-    // Fallback for relative / malformed URLs
-    return url.includes('/api/user/redirect?status=USER_CLOSED');
-  }
-};
 
 const clearAllCookies = async () => {
   try {
@@ -143,8 +131,8 @@ export const WebView = ({
 }: WebViewCustomProps) => {
   const webviewRef = useRef<RNWebView | null>(null);
   const [canGoBack, setCanGoBack] = useState(false);
-  const waitingForUserClosedRedirectRef = useRef(false);
-  const [, setWaitingForUserClosedRedirect] = useState(false); // just if you want UI, otherwise skip
+  const canGoBackRef = useRef(false);
+  const hasUserClosedRef = useRef(false);
 
   // const [hasRedirected, setHasRedirected] = useState(false);
   const [, setToast] = useState<{ visible: boolean; message: string } | null>(
@@ -283,20 +271,6 @@ export const WebView = ({
       return true;
     }
 
-    // 1. SPECIAL CASE: only USER_CLOSED navigation
-    if (isUserClosedRedirect(url)) {
-      console.log(
-        'SDK:LOG: USER_CLOSED redirect detected via navigation:',
-        url
-      );
-
-      StatusBar.setBackgroundColor('#7E7E7EFF');
-      clearAllCookies();
-      onCallback?.(WebViewCallback.redirect('USER_CLOSED'));
-
-      return false; // don't actually load that URL in WebView
-    }
-
     if (Platform.OS === 'android' && url) {
       if (url.includes('ms-outlook://')) {
         console.log('SDK:LOG: Intent to open Outlook detected');
@@ -402,7 +376,6 @@ export const WebView = ({
   );
 
   // Cookie injection script
-
   const injectedJavaScript = `
   (function() {
     function safePost(msg) {
@@ -413,13 +386,21 @@ export const WebView = ({
       } catch (e) {}
     }
 
-    // Let RN know injection actually ran
-    safePost({
-      type: 'INJECT_READY',
-      href: window.location.href
-    });
+    // Preserve any existing window.onerror
+    var previousOnError = window.onerror || null;
+    window.onerror = function(message, source, lineno, colno, error) {
+      try {
+        if (String(message || '').indexOf('RATE_LIMIT_USER') !== -1 &&
+            window.ReactNativeWebView) {
+          safePost({ type: 'RATE_LIMIT_ERROR' });
+        }
+      } catch (e) {}
+      if (typeof previousOnError === 'function') {
+        try { return previousOnError.apply(this, arguments); } catch (e) {}
+      }
+    };
 
-    // Spy on history.back()
+    // Patch history.back() to notify the app
     if (window.history && typeof window.history.back === 'function') {
       var originalBack = window.history.back;
       window.history.back = function() {
@@ -430,70 +411,6 @@ export const WebView = ({
         return originalBack.apply(this, arguments);
       };
     }
-
-    // Spy on location.assign / replace
-    try {
-      var originalAssign = window.location.assign
-        ? window.location.assign.bind(window.location)
-        : null;
-      var originalReplace = window.location.replace
-        ? window.location.replace.bind(window.location)
-        : null;
-
-      if (originalAssign) {
-        window.location.assign = function(url) {
-          safePost({
-            type: 'LOCATION_ASSIGN',
-            url: url,
-            from: window.location.href
-          });
-          return originalAssign(url);
-        };
-      }
-
-      if (originalReplace) {
-        window.location.replace = function(url) {
-          safePost({
-            type: 'LOCATION_REPLACE',
-            url: url,
-            from: window.location.href
-          });
-          return originalReplace(url);
-        };
-      }
-
-      // Spy on direct href writes (best-effort)
-      try {
-        var currentHref = window.location.href;
-        Object.defineProperty(window.location, 'href', {
-          get: function() {
-            return currentHref;
-          },
-          set: function(val) {
-            safePost({
-              type: 'LOCATION_HREF_SET',
-              url: val,
-              from: currentHref
-            });
-            currentHref = val;
-            if (originalAssign) {
-              return originalAssign(val);
-            }
-          }
-        });
-      } catch (e) {
-        // Some browsers/WebViews don't allow redefining href; ignore
-        safePost({
-          type: 'LOCATION_HREF_PATCH_FAILED',
-          error: String(e)
-        });
-      }
-    } catch (e) {
-      safePost({
-        type: 'LOCATION_SPY_ERROR',
-        error: String(e)
-      });
-    }
   })();
   true;
 `;
@@ -562,47 +479,40 @@ export const WebView = ({
     }
   };
 
-  const setWaitingFlag = (value: boolean) => {
-    waitingForUserClosedRedirectRef.current = value;
-    setWaitingForUserClosedRedirect(value);
-  };
-
   const handleMessage = (event: WebViewMessageEvent) => {
     try {
       const data = JSON.parse(event.nativeEvent.data);
-      console.log('SDK:LOG: onMessage data =', data);
+      console.log('SDK:LOG: onMessage data =');
 
-      switch (data?.type) {
-        case 'INJECT_READY':
-          console.log('SDK:LOG: INJECT_READY, href =', data.href);
-          break;
+      // 1) history.back() from a "root" page → treat as USER_CLOSED
+      if (data?.type === 'HISTORY_BACK_CALLED') {
+        console.log('SDK:LOG: HISTORY_BACK_CALLED at', data.href);
 
-        case 'HISTORY_BACK_CALLED':
-          console.log('SDK:LOG: HISTORY_BACK_CALLED at', data.href);
-          break;
+        if (!canGoBackRef.current && !hasUserClosedRef.current) {
+          hasUserClosedRef.current = true;
 
-        case 'LOCATION_ASSIGN':
-        case 'LOCATION_REPLACE':
-        case 'LOCATION_HREF_SET':
           console.log(
-            'SDK:LOG:',
-            data.type,
-            'from =',
-            data.from,
-            'to =',
-            data.url
+            'SDK:LOG: No WebView history. Treating HISTORY_BACK as USER_CLOSED'
           );
-          break;
 
-        case 'LOCATION_HREF_PATCH_FAILED':
-        case 'LOCATION_SPY_ERROR':
-          console.log('SDK:LOG:', data.type, data.error);
-          break;
+          StatusBar.setBackgroundColor('#7E7E7EFF');
+          clearAllCookies();
+          onCallback?.(WebViewCallback.redirect('USER_CLOSED'));
+        }
+
+        return;
+      }
 
-        default:
-          // keep your existing CLOSE_CLICKED / RATE_LIMIT logic here if you want,
-          // but for now pure logging is enough
-          break;
+      if (data?.type === 'RATE_LIMIT_ERROR') {
+        console.log('SDK:LOG: RATE_LIMIT_ERROR received from web');
+        ToastAndroid.show(
+          'Too many requests. Please try after 1 minute',
+          ToastAndroid.LONG
+        );
+        // StatusBar.setBackgroundColor('#7E7E7EFF');
+        // clearAllCookies();
+        // onCallback?.(WebViewCallback.redirect('RATE_LIMIT_ERROR'));
+        // return;
       }
     } catch (e) {
       console.warn('SDK:LOG: Error parsing WebView message', e);
@@ -646,6 +556,7 @@ export const WebView = ({
         onNavigationStateChange={(navState) => {
           console.log('SDK:LOG: NAV STATE URL:', navState.url);
           setCanGoBack(navState.canGoBack);
+          canGoBackRef.current = navState.canGoBack;
         }}
         injectedJavaScript={injectedJavaScript}
         decelerationRate={Platform.OS === 'ios' ? 'normal' : 0.9}

package/ios/PartnerReactNativeSdk.h

@@ -1,6 +0,0 @@
-
-#import <PartnerReactNativeSdk/RNPartnerReactNativeSdkSpec.h>
-
-@interface PartnerReactNativeSdk : NSObject <NativePartnerReactNativeSdkSpec>
-
-@end