@oxyhq/services 5.13.21 → 5.13.23

package/lib/commonjs/core/OxyServices.base.js

@@ -146,36 +146,49 @@ class OxyServicesBase {
   }
 
   /**
-   * Wait for authentication to be ready (public method)
-   * Useful for apps that want to ensure authentication is complete before proceeding
+   * Wait for authentication to be ready
+   * 
+   * Optimized for high-scale usage with immediate synchronous check and adaptive polling.
+   * Returns immediately if token is already available (0ms delay), otherwise uses
+   * adaptive polling that starts fast (50ms) and gradually increases to reduce CPU usage.
+   * 
+   * @param timeoutMs Maximum time to wait in milliseconds (default: 5000ms)
+   * @returns Promise that resolves to true if authentication is ready, false if timeout
+   * 
+   * @example
+   * ```typescript
+   * const isReady = await oxyServices.waitForAuth(3000);
+   * if (isReady) {
+   *   // Proceed with authenticated operations
+   * }
+   * ```
    */
   async waitForAuth(timeoutMs = 5000) {
-    return this.waitForAuthentication(timeoutMs);
-  }
+    // Immediate synchronous check - no delay if token is ready
+    if (this.httpClient.hasAccessToken()) {
+      return true;
+    }
+    const startTime = performance.now();
+    const maxTime = startTime + timeoutMs;
 
-  /**
-   * Wait for authentication to be ready with timeout
-   */
-  async waitForAuthentication(timeoutMs = 5000) {
-    const startTime = Date.now();
-    const checkInterval = 100; // Check every 100ms
+    // Adaptive polling: start fast, then slow down to reduce CPU usage
+    let pollInterval = 50; // Start with 50ms
 
-    while (Date.now() - startTime < timeoutMs) {
+    while (performance.now() < maxTime) {
+      await new Promise(resolve => setTimeout(resolve, pollInterval));
       if (this.httpClient.hasAccessToken()) {
         return true;
       }
-      await new Promise(resolve => setTimeout(resolve, checkInterval));
+
+      // Increase interval after first few checks (adaptive polling)
+      // This reduces CPU usage for long waits while maintaining responsiveness
+      if (pollInterval < 200) {
+        pollInterval = Math.min(pollInterval * 1.5, 200);
+      }
     }
     return false;
   }
 
-  /**
-   * Check if the client has a valid access token
-   */
-  hasAccessToken() {
-    return this.httpClient.hasAccessToken();
-  }
-
   /**
    * Execute a function with automatic authentication retry logic
    * This handles the common case where API calls are made before authentication completes
@@ -192,7 +205,7 @@ class OxyServicesBase {
         if (!this.httpClient.hasAccessToken()) {
           if (attempt === 0) {
             // On first attempt, wait briefly for authentication to complete
-            const authReady = await this.waitForAuthentication(authTimeoutMs);
+            const authReady = await this.waitForAuth(authTimeoutMs);
             if (!authReady) {
               throw new _OxyServices.OxyAuthenticationTimeoutError(operationName, authTimeoutMs);
             }
@@ -228,7 +241,7 @@ class OxyServicesBase {
    * Validate the current access token with the server
    */
   async validate() {
-    if (!this.hasAccessToken()) {
+    if (!this.hasValidToken()) {
       return false;
     }
     try {

package/lib/commonjs/core/OxyServices.base.js.map

@@ -1 +1 @@
-{"version":3,"names":["_jwtDecode","require","_errorUtils","_HttpClient","_RequestManager","_OxyServices","OxyServicesBase","constructor","args","config","Error","cloudURL","httpClient","HttpClient","requestManager","RequestManager","__resetTokensForTests","makeRequest","method","url","data","options","request","getBaseURL","getClient","getMetrics","clearCache","clearCacheEntry","key","getCacheStats","getCloudURL","setTokens","accessToken","refreshToken","clearTokens","getCurrentUserId","getAccessToken","decoded","jwtDecode","userId","id","error","hasValidToken","hasAccessToken","waitForAuth","timeoutMs","waitForAuthentication","startTime","Date","now","checkInterval","Promise","resolve","setTimeout","withAuthRetry","operation","operationName","maxRetries","retryDelay","authTimeoutMs","attempt","authReady","OxyAuthenticationTimeoutError","OxyAuthenticationError","isLastAttempt","isAuthError","response","status","code","message","includes","handleError","validate","res","undefined","cache","retry","valid","api","handleHttpError","err","details","healthCheck","exports"],"sourceRoot":"../../../src","sources":["core/OxyServices.base.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_jwtDecode","require","_errorUtils","_HttpClient","_RequestManager","_OxyServices","OxyServicesBase","constructor","args","config","Error","cloudURL","httpClient","HttpClient","requestManager","RequestManager","__resetTokensForTests","makeRequest","method","url","data","options","request","getBaseURL","getClient","getMetrics","clearCache","clearCacheEntry","key","getCacheStats","getCloudURL","setTokens","accessToken","refreshToken","clearTokens","getCurrentUserId","getAccessToken","decoded","jwtDecode","userId","id","error","hasValidToken","hasAccessToken","waitForAuth","timeoutMs","startTime","performance","now","maxTime","pollInterval","Promise","resolve","setTimeout","Math","min","withAuthRetry","operation","operationName","maxRetries","retryDelay","authTimeoutMs","attempt","authReady","OxyAuthenticationTimeoutError","OxyAuthenticationError","isLastAttempt","isAuthError","response","status","code","message","includes","handleError","validate","res","undefined","cache","retry","valid","api","handleHttpError","err","details","healthCheck","exports"],"sourceRoot":"../../../src","sources":["core/OxyServices.base.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/components/ErrorBoundary.js

@@ -0,0 +1,145 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.ErrorBoundary = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _reactNative = require("react-native");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+/**
+ * Error Boundary Component
+ * 
+ * Catches JavaScript errors anywhere in the child component tree,
+ * logs those errors, and displays a fallback UI instead of crashing.
+ * 
+ * Usage:
+ * <ErrorBoundary>
+ *   <YourComponent />
+ * </ErrorBoundary>
+ */
+class ErrorBoundary extends _react.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      hasError: false,
+      error: null,
+      errorInfo: null
+    };
+  }
+  static getDerivedStateFromError(error) {
+    // Update state so the next render will show the fallback UI
+    return {
+      hasError: true,
+      error
+    };
+  }
+  componentDidCatch(error, errorInfo) {
+    // Log error to console in development
+    if (__DEV__) {
+      console.error('ErrorBoundary caught an error:', error, errorInfo);
+    }
+
+    // Call optional error handler
+    if (this.props.onError) {
+      this.props.onError(error, errorInfo);
+    }
+
+    // Update state with error info
+    this.setState({
+      error,
+      errorInfo
+    });
+  }
+  handleReset = () => {
+    this.setState({
+      hasError: false,
+      error: null,
+      errorInfo: null
+    });
+  };
+  render() {
+    if (this.state.hasError) {
+      // Use custom fallback if provided
+      if (this.props.fallback) {
+        return this.props.fallback;
+      }
+
+      // Default fallback UI
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+        style: styles.container,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+          style: styles.errorContainer,
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+            style: styles.errorTitle,
+            children: "Something went wrong"
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+            style: styles.errorMessage,
+            children: this.state.error?.message || 'An unexpected error occurred'
+          }), __DEV__ && this.state.errorInfo && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+            style: styles.errorDetails,
+            children: this.state.errorInfo.componentStack
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+            style: styles.resetButton,
+            onPress: this.handleReset,
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+              style: styles.resetButtonText,
+              children: "Try Again"
+            })
+          })]
+        })
+      });
+    }
+    return this.props.children;
+  }
+}
+exports.ErrorBoundary = ErrorBoundary;
+const styles = _reactNative.StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    padding: 20,
+    backgroundColor: '#fff'
+  },
+  errorContainer: {
+    maxWidth: 400,
+    width: '100%',
+    padding: 20,
+    borderRadius: 8,
+    backgroundColor: '#f5f5f5',
+    borderWidth: 1,
+    borderColor: '#e0e0e0'
+  },
+  errorTitle: {
+    fontSize: 20,
+    fontWeight: 'bold',
+    marginBottom: 10,
+    color: '#d32f2f'
+  },
+  errorMessage: {
+    fontSize: 14,
+    marginBottom: 15,
+    color: '#666'
+  },
+  errorDetails: {
+    fontSize: 12,
+    marginBottom: 15,
+    color: '#999',
+    fontFamily: 'monospace'
+  },
+  resetButton: {
+    backgroundColor: '#007AFF',
+    padding: 12,
+    borderRadius: 6,
+    alignItems: 'center'
+  },
+  resetButtonText: {
+    color: '#fff',
+    fontSize: 16,
+    fontWeight: '600'
+  }
+});
+var _default = exports.default = ErrorBoundary;
+//# sourceMappingURL=ErrorBoundary.js.map

package/lib/commonjs/ui/components/ErrorBoundary.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ErrorBoundary","Component","constructor","props","state","hasError","error","errorInfo","getDerivedStateFromError","componentDidCatch","__DEV__","console","onError","setState","handleReset","render","fallback","jsx","View","style","styles","container","children","jsxs","errorContainer","Text","errorTitle","errorMessage","message","errorDetails","componentStack","TouchableOpacity","resetButton","onPress","resetButtonText","exports","StyleSheet","create","flex","justifyContent","alignItems","padding","backgroundColor","maxWidth","width","borderRadius","borderWidth","borderColor","fontSize","fontWeight","marginBottom","color","fontFamily","_default"],"sourceRoot":"../../../../src","sources":["ui/components/ErrorBoundary.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAAwE,IAAAE,WAAA,GAAAF,OAAA;AAAA,SAAAD,wBAAAI,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAN,uBAAA,YAAAA,CAAAI,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAcxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMkB,aAAa,SAASC,gBAAS,CAAe;EACvDC,WAAWA,CAACC,KAAY,EAAE;IACtB,KAAK,CAACA,KAAK,CAAC;IACZ,IAAI,CAACC,KAAK,GAAG;MACTC,QAAQ,EAAE,KAAK;MACfC,KAAK,EAAE,IAAI;MACXC,SAAS,EAAE;IACf,CAAC;EACL;EAEA,OAAOC,wBAAwBA,CAACF,KAAY,EAAkB;IAC1D;IACA,OAAO;MACHD,QAAQ,EAAE,IAAI;MACdC;IACJ,CAAC;EACL;EAEAG,iBAAiBA,CAACH,KAAY,EAAEC,SAAoB,EAAE;IAClD;IACA,IAAIG,OAAO,EAAE;MACTC,OAAO,CAACL,KAAK,CAAC,gCAAgC,EAAEA,KAAK,EAAEC,SAAS,CAAC;IACrE;;IAEA;IACA,IAAI,IAAI,CAACJ,KAAK,CAACS,OAAO,EAAE;MACpB,IAAI,CAACT,KAAK,CAACS,OAAO,CAACN,KAAK,EAAEC,SAAS,CAAC;IACxC;;IAEA;IACA,IAAI,CAACM,QAAQ,CAAC;MACVP,KAAK;MACLC;IACJ,CAAC,CAAC;EACN;EAEAO,WAAW,GAAGA,CAAA,KAAM;IAChB,IAAI,CAACD,QAAQ,CAAC;MACVR,QAAQ,EAAE,KAAK;MACfC,KAAK,EAAE,IAAI;MACXC,SAAS,EAAE;IACf,CAAC,CAAC;EACN,CAAC;EAEDQ,MAAMA,CAAA,EAAG;IACL,IAAI,IAAI,CAACX,KAAK,CAACC,QAAQ,EAAE;MACrB;MACA,IAAI,IAAI,CAACF,KAAK,CAACa,QAAQ,EAAE;QACrB,OAAO,IAAI,CAACb,KAAK,CAACa,QAAQ;MAC9B;;MAEA;MACA,oBACI,IAAApC,WAAA,CAAAqC,GAAA,EAACtC,YAAA,CAAAuC,IAAI;QAACC,KAAK,EAAEC,MAAM,CAACC,SAAU;QAAAC,QAAA,eAC1B,IAAA1C,WAAA,CAAA2C,IAAA,EAAC5C,YAAA,CAAAuC,IAAI;UAACC,KAAK,EAAEC,MAAM,CAACI,cAAe;UAAAF,QAAA,gBAC/B,IAAA1C,WAAA,CAAAqC,GAAA,EAACtC,YAAA,CAAA8C,IAAI;YAACN,KAAK,EAAEC,MAAM,CAACM,UAAW;YAAAJ,QAAA,EAAC;UAAoB,CAAM,CAAC,eAC3D,IAAA1C,WAAA,CAAAqC,GAAA,EAACtC,YAAA,CAAA8C,IAAI;YAACN,KAAK,EAAEC,MAAM,CAACO,YAAa;YAAAL,QAAA,EAC5B,IAAI,CAAClB,KAAK,CAACE,KAAK,EAAEsB,OAAO,IAAI;UAA8B,CAC1D,CAAC,EACNlB,OAAO,IAAI,IAAI,CAACN,KAAK,CAACG,SAAS,iBAC5B,IAAA3B,WAAA,CAAAqC,GAAA,EAACtC,YAAA,CAAA8C,IAAI;YAACN,KAAK,EAAEC,MAAM,CAACS,YAAa;YAAAP,QAAA,EAC5B,IAAI,CAAClB,KAAK,CAACG,SAAS,CAACuB;UAAc,CAClC,CACT,eACD,IAAAlD,WAAA,CAAAqC,GAAA,EAACtC,YAAA,CAAAoD,gBAAgB;YACbZ,KAAK,EAAEC,MAAM,CAACY,WAAY;YAC1BC,OAAO,EAAE,IAAI,CAACnB,WAAY;YAAAQ,QAAA,eAE1B,IAAA1C,WAAA,CAAAqC,GAAA,EAACtC,YAAA,CAAA8C,IAAI;cAACN,KAAK,EAAEC,MAAM,CAACc,eAAgB;cAAAZ,QAAA,EAAC;YAAS,CAAM;UAAC,CACvC,CAAC;QAAA,CACjB;MAAC,CACL,CAAC;IAEf;IAEA,OAAO,IAAI,CAACnB,KAAK,CAACmB,QAAQ;EAC9B;AACJ;AAACa,OAAA,CAAAnC,aAAA,GAAAA,aAAA;AAED,MAAMoB,MAAM,GAAGgB,uBAAU,CAACC,MAAM,CAAC;EAC7BhB,SAAS,EAAE;IACPiB,IAAI,EAAE,CAAC;IACPC,cAAc,EAAE,QAAQ;IACxBC,UAAU,EAAE,QAAQ;IACpBC,OAAO,EAAE,EAAE;IACXC,eAAe,EAAE;EACrB,CAAC;EACDlB,cAAc,EAAE;IACZmB,QAAQ,EAAE,GAAG;IACbC,KAAK,EAAE,MAAM;IACbH,OAAO,EAAE,EAAE;IACXI,YAAY,EAAE,CAAC;IACfH,eAAe,EAAE,SAAS;IAC1BI,WAAW,EAAE,CAAC;IACdC,WAAW,EAAE;EACjB,CAAC;EACDrB,UAAU,EAAE;IACRsB,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,MAAM;IAClBC,YAAY,EAAE,EAAE;IAChBC,KAAK,EAAE;EACX,CAAC;EACDxB,YAAY,EAAE;IACVqB,QAAQ,EAAE,EAAE;IACZE,YAAY,EAAE,EAAE;IAChBC,KAAK,EAAE;EACX,CAAC;EACDtB,YAAY,EAAE;IACVmB,QAAQ,EAAE,EAAE;IACZE,YAAY,EAAE,EAAE;IAChBC,KAAK,EAAE,MAAM;IACbC,UAAU,EAAE;EAChB,CAAC;EACDpB,WAAW,EAAE;IACTU,eAAe,EAAE,SAAS;IAC1BD,OAAO,EAAE,EAAE;IACXI,YAAY,EAAE,CAAC;IACfL,UAAU,EAAE;EAChB,CAAC;EACDN,eAAe,EAAE;IACbiB,KAAK,EAAE,MAAM;IACbH,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE;EAChB;AACJ,CAAC,CAAC;AAAC,IAAAI,QAAA,GAAAlB,OAAA,CAAA5C,OAAA,GAEYS,aAAa","ignoreList":[]}

package/lib/commonjs/ui/navigation/OxyRouter.js

@@ -3,13 +3,40 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.OxyRouter = void 0;
 var _react = require("react");
 var _reactNative = require("react-native");
+var _ErrorBoundary = _interopRequireDefault(require("../components/ErrorBoundary"));
 var _routes = require("./routes");
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Import types and route registry
 
+// Helper function to validate route names at runtime
+const isValidRouteName = screen => {
+  return _routes.routeNames.includes(screen);
+};
+
+// Helper function for safe navigation with validation
+const validateAndNavigate = (screen, props, setCurrentScreen, setScreenHistory, setScreenPropsMap) => {
+  if (!isValidRouteName(screen)) {
+    const errorMsg = `Invalid route name: "${screen}". Valid routes are: ${_routes.routeNames.join(', ')}`;
+    console.error('OxyRouter:', errorMsg);
+    if (process.env.NODE_ENV !== 'production') {
+      console.error('Navigation error:', errorMsg);
+    }
+    return false;
+  }
+  if (!_routes.routes[screen]) {
+    const errorMsg = `Route "${screen}" is registered but component is missing`;
+    console.error('OxyRouter:', errorMsg);
+    if (process.env.NODE_ENV !== 'production') {
+      console.error('Navigation error:', errorMsg);
+    }
+    return false;
+  }
+  return true;
+};
 const OxyRouter = ({
   oxyServices,
   initialScreen,
@@ -34,23 +61,22 @@ const OxyRouter = ({
     }
   }, [currentScreen, adjustSnapPoints]);
 
-  // Memoized navigation methods
+  // Memoized navigation methods with validation
   const navigate = (0, _react.useCallback)((screen, props = {}) => {
     if (__DEV__) console.log('OxyRouter: navigate called', screen, props);
-    if (_routes.routes[screen]) {
-      if (__DEV__) console.log('OxyRouter: screen found in routes');
-      setCurrentScreen(screen);
-      setScreenHistory(prev => [...prev, screen]);
-      setScreenPropsMap(prev => ({
-        ...prev,
-        [screen]: props
-      }));
-    } else {
-      console.error(`OxyRouter: Screen "${screen}" not found in routes:`, Object.keys(_routes.routes));
-      if (process.env.NODE_ENV !== 'production') {
-        console.error(`Screen "${screen}" not found`);
-      }
+
+    // Validate route before navigating
+    if (!validateAndNavigate(screen, props, setCurrentScreen, setScreenHistory, setScreenPropsMap)) {
+      return; // Early return if validation fails
     }
+
+    // All validations passed, proceed with navigation
+    setCurrentScreen(screen);
+    setScreenHistory(prev => [...prev, screen]);
+    setScreenPropsMap(prev => ({
+      ...prev,
+      [screen]: props
+    }));
   }, []);
   const goBack = (0, _react.useCallback)(() => {
     setScreenHistory(prev => {
@@ -86,13 +112,23 @@ const OxyRouter = ({
     const handleNavigationEvent = event => {
       if (event && event.detail) {
         if (typeof event.detail === 'string') {
-          navigate(event.detail);
+          // Validate string route name before navigating
+          if (isValidRouteName(event.detail)) {
+            navigate(event.detail);
+          } else {
+            console.error('OxyRouter: Invalid route name in event:', event.detail);
+          }
         } else if (typeof event.detail === 'object' && event.detail.screen) {
           const {
             screen,
             props
           } = event.detail;
-          navigate(screen, props || {});
+          // Validate route name before navigating
+          if (isValidRouteName(screen)) {
+            navigate(screen, props || {});
+          } else {
+            console.error('OxyRouter: Invalid route name in event:', screen);
+          }
         }
       }
     };
@@ -103,8 +139,14 @@ const OxyRouter = ({
       intervalId = setInterval(() => {
         const globalNav = globalThis.oxyNavigateEvent;
         if (globalNav && globalNav.screen) {
-          navigate(globalNav.screen, globalNav.props || {});
-          globalThis.oxyNavigateEvent = null;
+          // Validate route name before navigating
+          if (isValidRouteName(globalNav.screen)) {
+            navigate(globalNav.screen, globalNav.props || {});
+            globalThis.oxyNavigateEvent = null;
+          } else {
+            console.error('OxyRouter: Invalid route name in global event:', globalNav.screen);
+            globalThis.oxyNavigateEvent = null; // Clear invalid event
+          }
         }
       }, 100);
     }
@@ -118,7 +160,7 @@ const OxyRouter = ({
     };
   }, [navigate]);
 
-  // Render the current screen component
+  // Render the current screen component with error boundary
   const renderScreen = () => {
     const CurrentScreen = _routes.routes[currentScreen]?.component;
     if (!CurrentScreen) {
@@ -129,15 +171,20 @@ const OxyRouter = ({
         style: styles.errorContainer
       });
     }
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(CurrentScreen, {
-      oxyServices: oxyServices,
-      navigate: navigate,
-      goBack: goBack,
-      onClose: onClose,
-      onAuthenticated: onAuthenticated,
-      theme: theme,
-      containerWidth: containerWidth,
-      ...(screenPropsMap[currentScreen] || {})
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ErrorBoundary.default, {
+      onError: (error, errorInfo) => {
+        console.error(`Error in screen "${currentScreen}":`, error, errorInfo);
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(CurrentScreen, {
+        oxyServices: oxyServices,
+        navigate: navigate,
+        goBack: goBack,
+        onClose: onClose,
+        onAuthenticated: onAuthenticated,
+        theme: theme,
+        containerWidth: containerWidth,
+        ...(screenPropsMap[currentScreen] || {})
+      })
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
@@ -145,6 +192,10 @@ const OxyRouter = ({
     children: renderScreen()
   });
 };
+
+// Memoize the router component to prevent unnecessary re-renders
+exports.OxyRouter = OxyRouter;
+const MemoizedOxyRouter = /*#__PURE__*/(0, _react.memo)(OxyRouter);
 const styles = _reactNative.StyleSheet.create({
   container: {
     flex: 1
@@ -156,5 +207,7 @@ const styles = _reactNative.StyleSheet.create({
     minHeight: 100
   }
 });
-var _default = exports.default = OxyRouter;
+
+// Export both the memoized version (default) and the original for testing
+var _default = exports.default = MemoizedOxyRouter;
 //# sourceMappingURL=OxyRouter.js.map

package/lib/commonjs/ui/navigation/OxyRouter.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_routes","_jsxRuntime","OxyRouter","oxyServices","initialScreen","onClose","onAuthenticated","theme","adjustSnapPoints","navigationRef","containerWidth","currentScreen","setCurrentScreen","useState","screenHistory","setScreenHistory","screenPropsMap","setScreenPropsMap","useEffect","routes","snapPoints","navigate","useCallback","screen","props","__DEV__","console","log","prev","error","Object","keys","process","env","NODE_ENV","goBack","length","newHistory","pop","previousScreen","current","handleNavigationEvent","event","detail","intervalId","document","addEventListener","setInterval","globalNav","globalThis","oxyNavigateEvent","removeEventListener","clearInterval","renderScreen","CurrentScreen","component","jsx","View","style","styles","errorContainer","container","children","StyleSheet","create","flex","justifyContent","alignItems","minHeight","_default","exports","default"],"sourceRoot":"../../../../src","sources":["ui/navigation/OxyRouter.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_ErrorBoundary","_interopRequireDefault","_routes","_jsxRuntime","e","__esModule","default","isValidRouteName","screen","routeNames","includes","validateAndNavigate","props","setCurrentScreen","setScreenHistory","setScreenPropsMap","errorMsg","join","console","error","process","env","NODE_ENV","routes","OxyRouter","oxyServices","initialScreen","onClose","onAuthenticated","theme","adjustSnapPoints","navigationRef","containerWidth","currentScreen","useState","screenHistory","screenPropsMap","useEffect","snapPoints","navigate","useCallback","__DEV__","log","prev","goBack","length","newHistory","pop","previousScreen","current","handleNavigationEvent","event","detail","intervalId","document","addEventListener","setInterval","globalNav","globalThis","oxyNavigateEvent","removeEventListener","clearInterval","renderScreen","CurrentScreen","component","jsx","View","style","styles","errorContainer","onError","errorInfo","children","container","exports","MemoizedOxyRouter","memo","StyleSheet","create","flex","justifyContent","alignItems","minHeight","_default"],"sourceRoot":"../../../../src","sources":["ui/navigation/OxyRouter.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/screens/AccountCenterScreen.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _reactNative = require("react-native");
+var _react = require("react");
 var _OxyContext = require("../context/OxyContext");
 var _version = require("../../constants/version");
 var _sonner = require("../../lib/sonner");
@@ -40,7 +41,9 @@ const AccountCenterScreen = ({
   const borderColor = isDarkTheme ? '#444444' : '#E0E0E0';
   const primaryColor = '#0066CC';
   const dangerColor = '#D32F2F';
-  const handleLogout = async () => {
+
+  // Memoized logout handler - prevents unnecessary re-renders
+  const handleLogout = (0, _react.useCallback)(async () => {
     try {
       await logout();
       if (onClose) {
@@ -50,10 +53,12 @@ const AccountCenterScreen = ({
       console.error('Logout failed:', error);
       _sonner.toast.error(t('common.errors.signOutFailed') || 'There was a problem signing you out. Please try again.');
     }
-  };
-  const confirmLogout = () => {
+  }, [logout, onClose, t]);
+
+  // Memoized confirm logout handler - prevents unnecessary re-renders
+  const confirmLogout = (0, _react.useCallback)(() => {
     (0, _confirmAction.confirmAction)(t('common.confirms.signOut') || 'Are you sure you want to sign out?', handleLogout);
-  };
+  }, [handleLogout, t]);
   if (!isAuthenticated) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
       style: [styles.container, {
@@ -100,7 +105,7 @@ const AccountCenterScreen = ({
         theme: theme,
         isFirst: true,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_QuickActions.default, {
-          actions: [{
+          actions: (0, _react.useMemo)(() => [{
             id: 'overview',
             icon: 'person-circle',
             iconColor: '#007AFF',
@@ -136,14 +141,14 @@ const AccountCenterScreen = ({
             iconColor: '#FF9500',
             title: t('accountCenter.quickActions.switch') || 'Switch',
             onPress: () => navigate('AccountSwitcher')
-          }] : [])],
+          }] : [])], [user?.isPremium, sessions, navigate, t]),
           theme: theme
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Section.default, {
         title: t('accountCenter.sections.accountManagement') || 'Account Management',
         theme: theme,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_GroupedSection.default, {
-          items: [{
+          items: (0, _react.useMemo)(() => [{
             id: 'overview',
             icon: 'person-circle',
             iconColor: '#007AFF',
@@ -185,14 +190,14 @@ const AccountCenterScreen = ({
             title: t('accountCenter.items.billing.title') || 'Billing Management',
             subtitle: t('accountCenter.items.billing.subtitle') || 'Payment methods and invoices',
             onPress: () => navigate('PaymentGateway')
-          }] : [])],
+          }] : [])], [user?.isPremium, navigate, t]),
           theme: theme
         })
       }), sessions && sessions.length > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Section.default, {
         title: t('accountCenter.sections.multiAccount') || 'Multi-Account',
         theme: theme,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_GroupedSection.default, {
-          items: [{
+          items: (0, _react.useMemo)(() => [{
             id: 'switch',
             icon: 'people',
             iconColor: '#FF9500',
@@ -208,28 +213,28 @@ const AccountCenterScreen = ({
             title: t('accountCenter.items.addAccount.title') || 'Add Another Account',
             subtitle: t('accountCenter.items.addAccount.subtitle') || 'Sign in with a different account',
             onPress: () => navigate('SignIn')
-          }],
+          }], [sessions.length, navigate, t]),
           theme: theme
         })
       }), (!sessions || sessions.length <= 1) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Section.default, {
         title: t('accountCenter.sections.addAccount') || 'Add Account',
         theme: theme,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_GroupedSection.default, {
-          items: [{
+          items: (0, _react.useMemo)(() => [{
             id: 'add',
             icon: 'person-add',
             iconColor: '#30D158',
             title: t('accountCenter.items.addAccount.title') || 'Add Another Account',
             subtitle: t('accountCenter.items.addAccount.subtitle') || 'Sign in with a different account',
             onPress: () => navigate('SignIn')
-          }],
+          }], [navigate, t]),
           theme: theme
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Section.default, {
         title: t('accountCenter.sections.moreOptions') || 'More Options',
         theme: theme,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_GroupedSection.default, {
-          items: [...(_reactNative.Platform.OS !== 'web' ? [{
+          items: (0, _react.useMemo)(() => [...(_reactNative.Platform.OS !== 'web' ? [{
             id: 'notifications',
             icon: 'notifications',
             iconColor: '#FF9500',
@@ -257,7 +262,7 @@ const AccountCenterScreen = ({
             title: t('accountCenter.items.appInfo.title') || 'App Information',
             subtitle: t('accountCenter.items.appInfo.subtitle') || 'Version and system details',
             onPress: () => navigate('AppInfo')
-          }],
+          }], [navigate, t]),
           theme: theme
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Section.default, {