@oxyhq/services 5.5.9 → 5.6.0

package/lib/module/ui/hooks/useFollow.js

@@ -1,162 +1,78 @@
 "use strict";
 
-import { useDispatch, useSelector } from 'react-redux';
 import { useCallback, useMemo } from 'react';
-import { toggleFollowUser, setFollowingStatus, clearFollowError, fetchFollowStatus } from '../store';
+import { useFollowStore } from '../stores/followStore';
 import { useOxy } from '../context/OxyContext';
-
-// Memoized selector to prevent unnecessary re-renders
-const createFollowSelector = userId => state => ({
-  isFollowing: state.follow.followingUsers[userId] ?? false,
-  isLoading: state.follow.loadingUsers[userId] ?? false,
-  error: state.follow.errors[userId] ?? null
-});
-
-// Memoized selector for multiple users
-const createMultipleFollowSelector = userIds => state => {
-  const followData = {};
-  const followState = state.follow;
-  for (const userId of userIds) {
-    followData[userId] = {
-      isFollowing: followState.followingUsers[userId] ?? false,
-      isLoading: followState.loadingUsers[userId] ?? false,
-      error: followState.errors[userId] ?? null
-    };
-  }
-  return {
-    followData,
-    isAnyLoading: userIds.some(uid => followState.loadingUsers[uid]),
-    hasAnyError: userIds.some(uid => followState.errors[uid]),
-    allFollowing: userIds.every(uid => followState.followingUsers[uid]),
-    allNotFollowing: userIds.every(uid => !followState.followingUsers[uid])
-  };
-};
-
-/**
- * Custom hook for managing follow/unfollow functionality
- * Optimized to prevent unnecessary re-renders
- * Can handle both single user and multiple users
- */
 export const useFollow = userId => {
-  const dispatch = useDispatch();
   const {
     oxyServices
   } = useOxy();
-
-  // Memoize user IDs to prevent recreation on every render
-  const userIds = useMemo(() => {
-    return Array.isArray(userId) ? userId : userId ? [userId] : [];
-  }, [userId]);
+  const userIds = useMemo(() => Array.isArray(userId) ? userId : userId ? [userId] : [], [userId]);
   const isSingleUser = typeof userId === 'string';
 
-  // Memoize selectors to prevent recreation
-  const singleUserSelector = useMemo(() => {
-    return isSingleUser && userId ? createFollowSelector(userId) : null;
-  }, [isSingleUser, userId]);
-  const multipleUserSelector = useMemo(() => {
-    return !isSingleUser ? createMultipleFollowSelector(userIds) : null;
-  }, [isSingleUser, userIds]);
-
-  // Use appropriate selector based on mode
-  const singleUserData = useSelector(singleUserSelector || (() => ({
-    isFollowing: false,
-    isLoading: false,
-    error: null
-  })));
-  const multipleUserData = useSelector(multipleUserSelector || (() => ({
-    followData: {},
-    isAnyLoading: false,
-    hasAnyError: false,
-    allFollowing: false,
-    allNotFollowing: true
-  })));
+  // Zustand selectors
+  const followState = useFollowStore();
 
-  // Memoized callbacks to prevent recreation on every render
+  // Single user helpers
+  const isFollowing = isSingleUser && userId ? followState.followingUsers[userId] ?? false : false;
+  const isLoading = isSingleUser && userId ? followState.loadingUsers[userId] ?? false : false;
+  const error = isSingleUser && userId ? followState.errors[userId] ?? null : null;
   const toggleFollow = useCallback(async () => {
     if (!isSingleUser || !userId) throw new Error('toggleFollow is only available for single user mode');
-    try {
-      const result = await dispatch(toggleFollowUser({
-        userId,
-        oxyServices,
-        isCurrentlyFollowing: singleUserData.isFollowing
-      })).unwrap();
-      return result;
-    } catch (error) {
-      throw error;
-    }
-  }, [dispatch, userId, oxyServices, singleUserData.isFollowing, isSingleUser]);
+    await followState.toggleFollowUser(userId, oxyServices, isFollowing);
+  }, [isSingleUser, userId, followState, oxyServices, isFollowing]);
   const setFollowStatus = useCallback(following => {
     if (!isSingleUser || !userId) throw new Error('setFollowStatus is only available for single user mode');
-    dispatch(setFollowingStatus({
-      userId,
-      isFollowing: following
-    }));
-  }, [dispatch, userId, isSingleUser]);
+    followState.setFollowingStatus(userId, following);
+  }, [isSingleUser, userId, followState]);
   const fetchStatus = useCallback(async () => {
     if (!isSingleUser || !userId) throw new Error('fetchStatus is only available for single user mode');
-    try {
-      await dispatch(fetchFollowStatus({
-        userId,
-        oxyServices
-      })).unwrap();
-    } catch (error) {
-      console.warn(`Failed to fetch follow status for user ${userId}:`, error);
-    }
-  }, [dispatch, userId, oxyServices, isSingleUser]);
+    await followState.fetchFollowStatus(userId, oxyServices);
+  }, [isSingleUser, userId, followState, oxyServices]);
   const clearError = useCallback(() => {
     if (!isSingleUser || !userId) throw new Error('clearError is only available for single user mode');
-    dispatch(clearFollowError(userId));
-  }, [dispatch, userId, isSingleUser]);
+    followState.clearFollowError(userId);
+  }, [isSingleUser, userId, followState]);
 
-  // Multiple user callbacks
+  // Multiple user helpers
+  const followData = useMemo(() => {
+    const data = {};
+    userIds.forEach(uid => {
+      data[uid] = {
+        isFollowing: followState.followingUsers[uid] ?? false,
+        isLoading: followState.loadingUsers[uid] ?? false,
+        error: followState.errors[uid] ?? null
+      };
+    });
+    return data;
+  }, [userIds, followState.followingUsers, followState.loadingUsers, followState.errors]);
   const toggleFollowForUser = useCallback(async targetUserId => {
-    const currentState = multipleUserData.followData[targetUserId]?.isFollowing ?? false;
-    try {
-      const result = await dispatch(toggleFollowUser({
-        userId: targetUserId,
-        oxyServices,
-        isCurrentlyFollowing: currentState
-      })).unwrap();
-      return result;
-    } catch (error) {
-      throw error;
-    }
-  }, [dispatch, oxyServices, multipleUserData.followData]);
+    const currentState = followState.followingUsers[targetUserId] ?? false;
+    await followState.toggleFollowUser(targetUserId, oxyServices, currentState);
+  }, [followState, oxyServices]);
   const setFollowStatusForUser = useCallback((targetUserId, following) => {
-    dispatch(setFollowingStatus({
-      userId: targetUserId,
-      isFollowing: following
-    }));
-  }, [dispatch]);
+    followState.setFollowingStatus(targetUserId, following);
+  }, [followState]);
   const fetchStatusForUser = useCallback(async targetUserId => {
-    try {
-      await dispatch(fetchFollowStatus({
-        userId: targetUserId,
-        oxyServices
-      })).unwrap();
-    } catch (error) {
-      console.warn(`Failed to fetch follow status for user ${targetUserId}:`, error);
-    }
-  }, [dispatch, oxyServices]);
+    await followState.fetchFollowStatus(targetUserId, oxyServices);
+  }, [followState, oxyServices]);
   const fetchAllStatuses = useCallback(async () => {
-    const promises = userIds.map(uid => dispatch(fetchFollowStatus({
-      userId: uid,
-      oxyServices
-    })).unwrap().catch(error => {
-      console.warn(`Failed to fetch follow status for user ${uid}:`, error);
-    }));
-    await Promise.all(promises);
-  }, [dispatch, userIds, oxyServices]);
+    await Promise.all(userIds.map(uid => followState.fetchFollowStatus(uid, oxyServices)));
+  }, [userIds, followState, oxyServices]);
   const clearErrorForUser = useCallback(targetUserId => {
-    dispatch(clearFollowError(targetUserId));
-  }, [dispatch]);
+    followState.clearFollowError(targetUserId);
+  }, [followState]);
 
-  // Return appropriate interface based on mode
+  // Aggregate helpers for multiple users
+  const isAnyLoading = userIds.some(uid => followState.loadingUsers[uid]);
+  const hasAnyError = userIds.some(uid => !!followState.errors[uid]);
+  const allFollowing = userIds.every(uid => followState.followingUsers[uid]);
+  const allNotFollowing = userIds.every(uid => !followState.followingUsers[uid]);
   if (isSingleUser && userId) {
     return {
-      isFollowing: singleUserData.isFollowing,
-      isLoading: singleUserData.isLoading,
-      error: singleUserData.error,
+      isFollowing,
+      isLoading,
+      error,
       toggleFollow,
       setFollowStatus,
       fetchStatus,
@@ -164,17 +80,16 @@ export const useFollow = userId => {
     };
   }
   return {
-    followData: multipleUserData.followData,
+    followData,
     toggleFollowForUser,
     setFollowStatusForUser,
     fetchStatusForUser,
     fetchAllStatuses,
     clearErrorForUser,
-    // Helper methods
-    isAnyLoading: multipleUserData.isAnyLoading,
-    hasAnyError: multipleUserData.hasAnyError,
-    allFollowing: multipleUserData.allFollowing,
-    allNotFollowing: multipleUserData.allNotFollowing
+    isAnyLoading,
+    hasAnyError,
+    allFollowing,
+    allNotFollowing
   };
 };
 //# sourceMappingURL=useFollow.js.map

package/lib/module/ui/hooks/useFollow.js.map

@@ -1 +1 @@
-{"version":3,"names":["useDispatch","useSelector","useCallback","useMemo","toggleFollowUser","setFollowingStatus","clearFollowError","fetchFollowStatus","useOxy","createFollowSelector","userId","state","isFollowing","follow","followingUsers","isLoading","loadingUsers","error","errors","createMultipleFollowSelector","userIds","followData","followState","isAnyLoading","some","uid","hasAnyError","allFollowing","every","allNotFollowing","useFollow","dispatch","oxyServices","Array","isArray","isSingleUser","singleUserSelector","multipleUserSelector","singleUserData","multipleUserData","toggleFollow","Error","result","isCurrentlyFollowing","unwrap","setFollowStatus","following","fetchStatus","console","warn","clearError","toggleFollowForUser","targetUserId","currentState","setFollowStatusForUser","fetchStatusForUser","fetchAllStatuses","promises","map","catch","Promise","all","clearErrorForUser"],"sourceRoot":"../../../../src","sources":["ui/hooks/useFollow.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","useFollowStore","useOxy","useFollow","userId","oxyServices","userIds","Array","isArray","isSingleUser","followState","isFollowing","followingUsers","isLoading","loadingUsers","error","errors","toggleFollow","Error","toggleFollowUser","setFollowStatus","following","setFollowingStatus","fetchStatus","fetchFollowStatus","clearError","clearFollowError","followData","data","forEach","uid","toggleFollowForUser","targetUserId","currentState","setFollowStatusForUser","fetchStatusForUser","fetchAllStatuses","Promise","all","map","clearErrorForUser","isAnyLoading","some","hasAnyError","allFollowing","every","allNotFollowing"],"sourceRoot":"../../../../src","sources":["ui/hooks/useFollow.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/hooks/useSessionSocket.js

@@ -0,0 +1,47 @@
+"use strict";
+
+import { useEffect, useRef } from 'react';
+import io from 'socket.io-client';
+import { toast } from '../../lib/sonner';
+export function useSessionSocket({
+  userId,
+  activeSessionId,
+  refreshSessions,
+  logout,
+  baseURL,
+  onRemoteSignOut
+}) {
+  const socketRef = useRef(null);
+  useEffect(() => {
+    if (!userId || !baseURL) return;
+    if (!socketRef.current) {
+      socketRef.current = io(baseURL, {
+        transports: ['websocket']
+      });
+    }
+    const socket = socketRef.current;
+    socket.on('connect', () => {
+      console.log('Socket connected:', socket.id);
+    });
+    socket.emit('join', {
+      userId: `user:${userId}`
+    });
+    console.log('Emitting join for room:', `user:${userId}`);
+    socket.on('session_update', data => {
+      console.log('Received session_update:', data);
+      if (data.sessionId === activeSessionId) {
+        if (onRemoteSignOut) onRemoteSignOut();else toast.info('You have been signed out remotely.');
+        logout();
+      } else {
+        refreshSessions();
+      }
+    });
+    return () => {
+      socket.emit('leave', {
+        userId: `user:${userId}`
+      });
+      socket.off('session_update');
+    };
+  }, [userId, baseURL, activeSessionId, refreshSessions, logout, onRemoteSignOut]);
+}
+//# sourceMappingURL=useSessionSocket.js.map

package/lib/module/ui/hooks/useSessionSocket.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useEffect","useRef","io","toast","useSessionSocket","userId","activeSessionId","refreshSessions","logout","baseURL","onRemoteSignOut","socketRef","current","transports","socket","on","console","log","id","emit","data","sessionId","info","off"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSessionSocket.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AACzC,OAAOC,EAAE,MAAM,kBAAkB;AACjC,SAASC,KAAK,QAAQ,kBAAkB;AAWxC,OAAO,SAASC,gBAAgBA,CAAC;EAAEC,MAAM;EAAEC,eAAe;EAAEC,eAAe;EAAEC,MAAM;EAAEC,OAAO;EAAEC;AAAuC,CAAC,EAAE;EACtI,MAAMC,SAAS,GAAGV,MAAM,CAAM,IAAI,CAAC;EAEnCD,SAAS,CAAC,MAAM;IACd,IAAI,CAACK,MAAM,IAAI,CAACI,OAAO,EAAE;IAEzB,IAAI,CAACE,SAAS,CAACC,OAAO,EAAE;MACtBD,SAAS,CAACC,OAAO,GAAGV,EAAE,CAACO,OAAO,EAAE;QAC9BI,UAAU,EAAE,CAAC,WAAW;MAC1B,CAAC,CAAC;IACJ;IACA,MAAMC,MAAM,GAAGH,SAAS,CAACC,OAAO;IAEhCE,MAAM,CAACC,EAAE,CAAC,SAAS,EAAE,MAAM;MACzBC,OAAO,CAACC,GAAG,CAAC,mBAAmB,EAAEH,MAAM,CAACI,EAAE,CAAC;IAC7C,CAAC,CAAC;IAEFJ,MAAM,CAACK,IAAI,CAAC,MAAM,EAAE;MAAEd,MAAM,EAAE,QAAQA,MAAM;IAAG,CAAC,CAAC;IACjDW,OAAO,CAACC,GAAG,CAAC,yBAAyB,EAAE,QAAQZ,MAAM,EAAE,CAAC;IAExDS,MAAM,CAACC,EAAE,CAAC,gBAAgB,EAAGK,IAAyC,IAAK;MACzEJ,OAAO,CAACC,GAAG,CAAC,0BAA0B,EAAEG,IAAI,CAAC;MAC7C,IAAIA,IAAI,CAACC,SAAS,KAAKf,eAAe,EAAE;QACtC,IAAII,eAAe,EAAEA,eAAe,CAAC,CAAC,CAAC,KAClCP,KAAK,CAACmB,IAAI,CAAC,oCAAoC,CAAC;QACrDd,MAAM,CAAC,CAAC;MACV,CAAC,MAAM;QACLD,eAAe,CAAC,CAAC;MACnB;IACF,CAAC,CAAC;IAEF,OAAO,MAAM;MACXO,MAAM,CAACK,IAAI,CAAC,OAAO,EAAE;QAAEd,MAAM,EAAE,QAAQA,MAAM;MAAG,CAAC,CAAC;MAClDS,MAAM,CAACS,GAAG,CAAC,gBAAgB,CAAC;IAC9B,CAAC;EACH,CAAC,EAAE,CAAClB,MAAM,EAAEI,OAAO,EAAEH,eAAe,EAAEC,eAAe,EAAEC,MAAM,EAAEE,eAAe,CAAC,CAAC;AAClF","ignoreList":[]}

package/lib/module/ui/index.js

@@ -10,23 +10,13 @@ export { default as OxySignInButton } from './components/OxySignInButton';
 export { default as OxyLogo } from './components/OxyLogo';
 export { default as Avatar } from './components/Avatar';
 export { default as FollowButton } from './components/FollowButton';
+export { default as OxyPayButton } from './components/OxyPayButton';
 export { FontLoader, setupFonts } from './components/FontLoader';
 
 // Export icon components
 export { OxyIcon } from './components/icon';
 export { OxyContextProvider, useOxy, OxyContextState, OxyContextProviderProps } from './context/OxyContext';
 
-// Redux store exports - NEW ARCHITECTURE
-export { setupOxyStore, oxyReducers,
-// Individual slices
-authSlice, authActions, authSelectors, authReducer, followSlice, followActions, followSelectors, followThunks, followReducer,
-// Action creators
-loginStart, loginSuccess, loginFailure, logout, setFollowingStatus, clearFollowError, resetFollowState, fetchFollowStatus, toggleFollowUser,
-// Types
-AuthState, FollowState, initialAuthState, initialFollowState } from './store';
-
-// Legacy store exports (deprecated)
-export { store } from './store';
 // Export styles
 export { fontFamilies, fontStyles } from './styles/fonts';
 
@@ -34,8 +24,7 @@ export { fontFamilies, fontStyles } from './styles/fonts';
 export * from './navigation/types';
 
 // Hooks
-export { useOxyFollow, useFollow } from './hooks';
-export { default as useAuthFetch } from './hooks/useAuthFetch';
+export { useFollow } from './hooks';
 
 // Screens
 export { default as ProfileScreen } from './screens/ProfileScreen';

package/lib/module/ui/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["default","OxyProvider","OxySignInButton","OxyLogo","Avatar","FollowButton","FontLoader","setupFonts","OxyIcon","OxyContextProvider","useOxy","OxyContextState","OxyContextProviderProps","setupOxyStore","oxyReducers","authSlice","authActions","authSelectors","authReducer","followSlice","followActions","followSelectors","followThunks","followReducer","loginStart","loginSuccess","loginFailure","logout","setFollowingStatus","clearFollowError","resetFollowState","fetchFollowStatus","toggleFollowUser","AuthState","FollowState","initialAuthState","initialFollowState","store","fontFamilies","fontStyles","useOxyFollow","useFollow","useAuthFetch","ProfileScreen","OxyRouter"],"sourceRoot":"../../../src","sources":["ui/index.ts"],"mappings":";;AAAA;AACA;AACA;;AAEA;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,0BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,8BAA8B;AACzE,SAASF,OAAO,IAAIG,OAAO,QAAQ,sBAAsB;AACzD,SAASH,OAAO,IAAII,MAAM,QAAQ,qBAAqB;AACvD,SAASJ,OAAO,IAAIK,YAAY,QAAQ,2BAA2B;AACnE,SAASC,UAAU,EAAEC,UAAU,QAAQ,yBAAyB;;AAEhE;AACA,SAASC,OAAO,QAAQ,mBAAmB;AAG3C,SACEC,kBAAkB,EAClBC,MAAM,EACNC,eAAe,EACfC,uBAAuB,QAClB,sBAAsB;;AAE7B;AACA,SACEC,aAAa,EACbC,WAAW;AACX;AACAC,SAAS,EACTC,WAAW,EACXC,aAAa,EACbC,WAAW,EACXC,WAAW,EACXC,aAAa,EACbC,eAAe,EACfC,YAAY,EACZC,aAAa;AACb;AACAC,UAAU,EACVC,YAAY,EACZC,YAAY,EACZC,MAAM,EACNC,kBAAkB,EAClBC,gBAAgB,EAChBC,gBAAgB,EAChBC,iBAAiB,EACjBC,gBAAgB;AAChB;AACAC,SAAS,EACTC,WAAW,EACXC,gBAAgB,EAChBC,kBAAkB,QACb,SAAS;;AAEhB;AACA,SAASC,KAAK,QAAQ,SAAS;AAG/B;AACA,SAASC,YAAY,EAAEC,UAAU,QAAQ,gBAAgB;;AAEzD;AACA,cAAc,oBAAoB;;AAElC;AACA,SAASC,YAAY,EAAEC,SAAS,QAAQ,SAAS;AACjD,SAASzC,OAAO,IAAI0C,YAAY,QAAQ,sBAAsB;;AAE9D;AACA,SAAS1C,OAAO,IAAI2C,aAAa,QAAQ,yBAAyB;;AAElE;AACA,SAAS3C,OAAO,IAAI4C,SAAS,QAAQ,wBAAwB","ignoreList":[]}
+{"version":3,"names":["default","OxyProvider","OxySignInButton","OxyLogo","Avatar","FollowButton","OxyPayButton","FontLoader","setupFonts","OxyIcon","OxyContextProvider","useOxy","OxyContextState","OxyContextProviderProps","fontFamilies","fontStyles","useFollow","ProfileScreen","OxyRouter"],"sourceRoot":"../../../src","sources":["ui/index.ts"],"mappings":";;AAAA;AACA;AACA;;AAEA;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,0BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,8BAA8B;AACzE,SAASF,OAAO,IAAIG,OAAO,QAAQ,sBAAsB;AACzD,SAASH,OAAO,IAAII,MAAM,QAAQ,qBAAqB;AACvD,SAASJ,OAAO,IAAIK,YAAY,QAAQ,2BAA2B;AACnE,SAASL,OAAO,IAAIM,YAAY,QAAQ,2BAA2B;AACnE,SAASC,UAAU,EAAEC,UAAU,QAAQ,yBAAyB;;AAEhE;AACA,SAASC,OAAO,QAAQ,mBAAmB;AAG3C,SACEC,kBAAkB,EAClBC,MAAM,EACNC,eAAe,EACfC,uBAAuB,QAClB,sBAAsB;;AAE7B;AACA,SAASC,YAAY,EAAEC,UAAU,QAAQ,gBAAgB;;AAEzD;AACA,cAAc,oBAAoB;;AAElC;AACA,SAASC,SAAS,QAAQ,SAAS;;AAEnC;AACA,SAAShB,OAAO,IAAIiB,aAAa,QAAQ,yBAAyB;;AAElE;AACA,SAASjB,OAAO,IAAIkB,SAAS,QAAQ,wBAAwB","ignoreList":[]}

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

@@ -1,6 +1,6 @@
 "use strict";
 
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { View, StyleSheet } from 'react-native';
 // Import screens
 import SignInScreen from '../screens/SignInScreen';
@@ -11,7 +11,6 @@ import SessionManagementScreen from '../screens/SessionManagementScreen';
 import AccountOverviewScreen from '../screens/AccountOverviewScreen';
 import AccountSettingsScreen from '../screens/AccountSettingsScreen';
 import PremiumSubscriptionScreen from '../screens/PremiumSubscriptionScreen';
-import BillingManagementScreen from '../screens/BillingManagementScreen';
 import AppInfoScreen from '../screens/AppInfoScreen';
 import FeedbackScreen from '../screens/FeedbackScreen';
 import KarmaCenterScreen from '../screens/karma/KarmaCenterScreen';
@@ -22,6 +21,8 @@ import KarmaRewardsScreen from '../screens/karma/KarmaRewardsScreen';
 import KarmaFAQScreen from '../screens/karma/KarmaFAQScreen';
 import ProfileScreen from '../screens/ProfileScreen';
 import FileManagementScreen from '../screens/FileManagementScreen';
+import RecoverAccountScreen from '../screens/RecoverAccountScreen';
+import PaymentGatewayScreen from '../screens/PaymentGatewayScreen';
 
 // Import types
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -35,6 +36,10 @@ const routes = {
     component: SignUpScreen,
     snapPoints: ['10%', '90%']
   },
+  RecoverAccount: {
+    component: RecoverAccountScreen,
+    snapPoints: ['10%', '80%']
+  },
   AccountCenter: {
     component: AccountCenterScreen,
     snapPoints: ['60%', '100%']
@@ -59,10 +64,6 @@ const routes = {
     component: PremiumSubscriptionScreen,
     snapPoints: ['70%', '100%']
   },
-  BillingManagement: {
-    component: BillingManagementScreen,
-    snapPoints: ['70%', '100%']
-  },
   AppInfo: {
     component: AppInfoScreen,
     snapPoints: ['60%', '90%']
@@ -102,6 +103,10 @@ const routes = {
   FileManagement: {
     component: FileManagementScreen,
     snapPoints: ['70%', '100%']
+  },
+  PaymentGateway: {
+    component: PaymentGatewayScreen,
+    snapPoints: ['60%', '90%']
   }
 };
 const OxyRouter = ({
@@ -116,25 +121,47 @@ const OxyRouter = ({
 }) => {
   const [currentScreen, setCurrentScreen] = useState(initialScreen);
   const [screenHistory, setScreenHistory] = useState([initialScreen]);
-  const [screenProps, setScreenProps] = useState({});
+  // Store props per screen for correct restoration on back
+  const [screenPropsMap, setScreenPropsMap] = useState({
+    [initialScreen]: {}
+  });
 
   // Update snap points when the screen changes
   useEffect(() => {
-    if (routes[currentScreen]) {
+    if (routes[currentScreen] && typeof adjustSnapPoints === 'function') {
       adjustSnapPoints(routes[currentScreen].snapPoints);
     }
   }, [currentScreen, adjustSnapPoints]);
 
-  // Navigation methods
-  const navigate = (screen, props = {}) => {
+  // Memoized navigation methods
+  const navigate = useCallback((screen, props = {}) => {
     if (routes[screen]) {
       setCurrentScreen(screen);
       setScreenHistory(prev => [...prev, screen]);
-      setScreenProps(props);
+      setScreenPropsMap(prev => ({
+        ...prev,
+        [screen]: props
+      }));
     } else {
-      console.error(`Screen "${screen}" not found`);
+      if (process.env.NODE_ENV !== 'production') {
+        console.error(`Screen "${screen}" not found`);
+      }
     }
-  };
+  }, []);
+  const goBack = useCallback(() => {
+    setScreenHistory(prev => {
+      if (prev.length > 1) {
+        const newHistory = [...prev];
+        newHistory.pop();
+        const previousScreen = newHistory[newHistory.length - 1];
+        setCurrentScreen(previousScreen);
+        return newHistory;
+      } else {
+        if (onClose) onClose();
+        return prev;
+      }
+    });
+  }, [onClose]);
 
   // Expose the navigate function to the parent component
   useEffect(() => {
@@ -150,83 +177,52 @@ const OxyRouter = ({
 
   // Expose the navigate method to the parent component (OxyProvider)
   useEffect(() => {
-    // Set up event listener for navigation events
     const handleNavigationEvent = event => {
       if (event && event.detail) {
-        // Support both string and object detail
         if (typeof event.detail === 'string') {
-          const screenName = event.detail;
-          console.log(`Navigation event received for screen: ${screenName}`);
-          navigate(screenName);
+          navigate(event.detail);
         } else if (typeof event.detail === 'object' && event.detail.screen) {
           const {
             screen,
             props
           } = event.detail;
-          console.log(`Navigation event received for screen: ${screen} with props`, props);
           navigate(screen, props || {});
         }
       }
     };
-
-    // For React Native - check for global navigation events
     let intervalId = null;
-    if (typeof document !== 'undefined') {
-      // Web - use custom event listener
+    if (typeof document !== 'undefined' && document.addEventListener) {
       document.addEventListener('oxy:navigate', handleNavigationEvent);
     } else {
-      // React Native - poll for global navigation events
       intervalId = setInterval(() => {
         const globalNav = globalThis.oxyNavigateEvent;
-        if (globalNav) {
-          console.log(`RN Navigation event received:`, globalNav);
-          if (globalNav.screen) {
-            navigate(globalNav.screen, globalNav.props || {});
-          }
-          // Clear the event after processing
+        if (globalNav && globalNav.screen) {
+          navigate(globalNav.screen, globalNav.props || {});
           globalThis.oxyNavigateEvent = null;
         }
-      }, 100); // Check every 100ms
+      }, 100);
     }
-
-    // Cleanup
     return () => {
-      if (typeof document !== 'undefined') {
+      if (typeof document !== 'undefined' && document.removeEventListener) {
         document.removeEventListener('oxy:navigate', handleNavigationEvent);
       }
       if (intervalId) {
         clearInterval(intervalId);
       }
     };
-  }, []);
-  const goBack = () => {
-    if (screenHistory.length > 1) {
-      const newHistory = [...screenHistory];
-      newHistory.pop();
-      const previousScreen = newHistory[newHistory.length - 1];
-      setCurrentScreen(previousScreen);
-      setScreenHistory(newHistory);
-    } else {
-      // If no history, close the UI
-      if (onClose) {
-        onClose();
-      }
-    }
-  };
+  }, [navigate]);
 
   // Render the current screen component
   const renderScreen = () => {
     const CurrentScreen = routes[currentScreen]?.component;
-    console.log('[OxyRouter] Rendering screen:', currentScreen);
-    console.log('[OxyRouter] Available routes:', Object.keys(routes));
-    console.log('[OxyRouter] Current screen component found:', !!CurrentScreen);
     if (!CurrentScreen) {
-      console.error(`Screen "${currentScreen}" not found`);
+      if (process.env.NODE_ENV !== 'production') {
+        console.error(`Screen "${currentScreen}" not found`);
+      }
       return /*#__PURE__*/_jsx(View, {
         style: styles.errorContainer
       });
     }
-    console.log('[OxyRouter] Rendering screen component for:', currentScreen);
     return /*#__PURE__*/_jsx(CurrentScreen, {
       oxyServices: oxyServices,
       navigate: navigate,
@@ -235,7 +231,7 @@ const OxyRouter = ({
       onAuthenticated: onAuthenticated,
       theme: theme,
       containerWidth: containerWidth,
-      ...screenProps
+      ...(screenPropsMap[currentScreen] || {})
     });
   };
   return /*#__PURE__*/_jsx(View, {
@@ -245,17 +241,13 @@ const OxyRouter = ({
 };
 const styles = StyleSheet.create({
   container: {
-    flex: 1,
-    minHeight: 200,
-    // Ensure minimum height
-    backgroundColor: 'transparent' // Make sure it's visible
+    flex: 1
   },
   errorContainer: {
     flex: 1,
     justifyContent: 'center',
     alignItems: 'center',
-    minHeight: 100,
-    backgroundColor: 'red' // Make errors visible
+    minHeight: 100
   }
 });
 export default OxyRouter;