@oxyhq/services 5.13.40 → 5.15.0

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

@@ -6,14 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _reactNative = require("react-native");
 var _vectorIcons = require("@expo/vector-icons");
+var _useThemeStyles = require("../hooks/useThemeStyles");
+var _useColorScheme = require("../hooks/use-color-scheme");
 var _jsxRuntime = require("react/jsx-runtime");
 const QuickActions = ({
   actions,
   theme
 }) => {
-  const isDarkTheme = theme === 'dark';
-  const textColor = isDarkTheme ? '#FFFFFF' : '#000000';
-  const secondaryBackgroundColor = isDarkTheme ? '#222222' : '#FFFFFF';
+  const colorScheme = (0, _useColorScheme.useColorScheme)();
+  const themeStyles = (0, _useThemeStyles.useThemeStyles)(theme, colorScheme);
+  const textColor = themeStyles.textColor;
+  const secondaryBackgroundColor = themeStyles.secondaryBackgroundColor;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
     style: [styles.quickActionsContainer, styles.firstGroupedItem, styles.lastGroupedItem, {
       backgroundColor: secondaryBackgroundColor
@@ -24,7 +27,7 @@ const QuickActions = ({
         style: styles.quickActionItem,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
           style: [styles.quickActionCircle, {
-            backgroundColor: isDarkTheme ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.03)'
+            backgroundColor: themeStyles.isDarkTheme ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.03)'
           }],
           onPress: action.onPress,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.Ionicons, {

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_vectorIcons","_jsxRuntime","QuickActions","actions","theme","isDarkTheme","textColor","secondaryBackgroundColor","jsx","View","style","styles","quickActionsContainer","firstGroupedItem","lastGroupedItem","backgroundColor","children","quickActionsRow","map","action","jsxs","quickActionItem","TouchableOpacity","quickActionCircle","onPress","Ionicons","name","icon","size","color","iconColor","Text","quickActionText","title","id","StyleSheet","create","padding","marginBottom","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","flexDirection","alignItems","justifyContent","flexWrap","minWidth","width","height","borderRadius","fontSize","fontWeight","textAlign","_default","exports","default"],"sourceRoot":"../../../../src","sources":["ui/components/QuickActions.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_vectorIcons","_useThemeStyles","_useColorScheme","_jsxRuntime","QuickActions","actions","theme","colorScheme","useColorScheme","themeStyles","useThemeStyles","textColor","secondaryBackgroundColor","jsx","View","style","styles","quickActionsContainer","firstGroupedItem","lastGroupedItem","backgroundColor","children","quickActionsRow","map","action","jsxs","quickActionItem","TouchableOpacity","quickActionCircle","isDarkTheme","onPress","Ionicons","name","icon","size","color","iconColor","Text","quickActionText","title","id","StyleSheet","create","padding","marginBottom","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","flexDirection","alignItems","justifyContent","flexWrap","minWidth","width","height","borderRadius","fontSize","fontWeight","textAlign","_default","exports","default"],"sourceRoot":"../../../../src","sources":["ui/components/QuickActions.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _reactNative = require("react-native");
 var _SectionTitle = _interopRequireDefault(require("./SectionTitle"));
+var _useColorScheme = require("../hooks/use-color-scheme");
+var _themeUtils = require("../utils/themeUtils");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const Section = ({
@@ -15,11 +17,12 @@ const Section = ({
   isFirst = false,
   style
 }) => {
+  const colorScheme = (0, _themeUtils.normalizeColorScheme)((0, _useColorScheme.useColorScheme)(), theme);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
     style: [styles.section, isFirst && styles.firstSection, style],
     children: [title && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SectionTitle.default, {
       title: title,
-      theme: theme
+      theme: colorScheme
     }), children]
   });
 };

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_SectionTitle","_interopRequireDefault","_jsxRuntime","e","__esModule","default","Section","title","theme","children","isFirst","style","jsxs","View","styles","section","firstSection","jsx","StyleSheet","create","marginBottom","marginTop","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/components/Section.tsx"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAC,sBAAA,CAAAF,OAAA;AAA0C,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAE,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAU1C,MAAMG,OAA+B,GAAGA,CAAC;EACrCC,KAAK;EACLC,KAAK;EACLC,QAAQ;EACRC,OAAO,GAAG,KAAK;EACfC;AACJ,CAAC,KAAK;EACF,oBACI,IAAAT,WAAA,CAAAU,IAAA,EAACd,YAAA,CAAAe,IAAI;IAACF,KAAK,EAAE,CAACG,MAAM,CAACC,OAAO,EAAEL,OAAO,IAAII,MAAM,CAACE,YAAY,EAAEL,KAAK,CAAE;IAAAF,QAAA,GAChEF,KAAK,iBAAI,IAAAL,WAAA,CAAAe,GAAA,EAACjB,aAAA,CAAAK,OAAY;MAACE,KAAK,EAAEA,KAAM;MAACC,KAAK,EAAEA;IAAM,CAAE,CAAC,EACrDC,QAAQ;EAAA,CACP,CAAC;AAEf,CAAC;AAED,MAAMK,MAAM,GAAGI,uBAAU,CAACC,MAAM,CAAC;EAC7BJ,OAAO,EAAE;IACLK,YAAY,EAAE;EAClB,CAAC;EACDJ,YAAY,EAAE;IACVK,SAAS,EAAE;EACf;AACJ,CAAC,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAlB,OAAA,GAEYC,OAAO","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_SectionTitle","_interopRequireDefault","_useColorScheme","_themeUtils","_jsxRuntime","e","__esModule","default","Section","title","theme","children","isFirst","style","colorScheme","normalizeColorScheme","useColorScheme","jsxs","View","styles","section","firstSection","jsx","StyleSheet","create","marginBottom","marginTop","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/components/Section.tsx"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AAA2D,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAE,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAU3D,MAAMG,OAA+B,GAAGA,CAAC;EACrCC,KAAK;EACLC,KAAK;EACLC,QAAQ;EACRC,OAAO,GAAG,KAAK;EACfC;AACJ,CAAC,KAAK;EACF,MAAMC,WAAW,GAAG,IAAAC,gCAAoB,EAAC,IAAAC,8BAAc,EAAC,CAAC,EAAEN,KAAK,CAAC;EAEjE,oBACI,IAAAN,WAAA,CAAAa,IAAA,EAACnB,YAAA,CAAAoB,IAAI;IAACL,KAAK,EAAE,CAACM,MAAM,CAACC,OAAO,EAAER,OAAO,IAAIO,MAAM,CAACE,YAAY,EAAER,KAAK,CAAE;IAAAF,QAAA,GAChEF,KAAK,iBAAI,IAAAL,WAAA,CAAAkB,GAAA,EAACtB,aAAA,CAAAO,OAAY;MAACE,KAAK,EAAEA,KAAM;MAACC,KAAK,EAAEI;IAAY,CAAE,CAAC,EAC3DH,QAAQ;EAAA,CACP,CAAC;AAEf,CAAC;AAED,MAAMQ,MAAM,GAAGI,uBAAU,CAACC,MAAM,CAAC;EAC7BJ,OAAO,EAAE;IACLK,YAAY,EAAE;EAClB,CAAC;EACDJ,YAAY,EAAE;IACVK,SAAS,EAAE;EACf;AACJ,CAAC,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAArB,OAAA,GAEYC,OAAO","ignoreList":[]}

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

@@ -6,17 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _reactNative = require("react-native");
 var _fonts = require("../styles/fonts");
+var _useColorScheme = require("../hooks/use-color-scheme");
+var _themeUtils = require("../utils/themeUtils");
+var _useThemeStyles = require("../hooks/useThemeStyles");
 var _jsxRuntime = require("react/jsx-runtime");
 const SectionTitle = ({
   title,
   theme,
   style
 }) => {
-  const isDarkTheme = theme === 'dark';
-  const textColor = isDarkTheme ? '#FFFFFF' : '#000000';
+  const colorScheme = (0, _themeUtils.normalizeColorScheme)((0, _useColorScheme.useColorScheme)(), theme);
+  const themeStyles = (0, _useThemeStyles.useThemeStyles)(theme || colorScheme, colorScheme);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
     style: [styles.sectionTitle, {
-      color: textColor
+      color: themeStyles.textColor
     }, style],
     children: title
   });

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_fonts","_jsxRuntime","SectionTitle","title","theme","style","isDarkTheme","textColor","jsx","Text","styles","sectionTitle","color","children","StyleSheet","create","fontSize","fontWeight","fontFamily","fontFamilies","phuduSemiBold","marginBottom","_default","exports","default"],"sourceRoot":"../../../../src","sources":["ui/components/SectionTitle.tsx"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAA+C,IAAAE,WAAA,GAAAF,OAAA;AAQ/C,MAAMG,YAAyC,GAAGA,CAAC;EAAEC,KAAK;EAAEC,KAAK;EAAEC;AAAM,CAAC,KAAK;EAC3E,MAAMC,WAAW,GAAGF,KAAK,KAAK,MAAM;EACpC,MAAMG,SAAS,GAAGD,WAAW,GAAG,SAAS,GAAG,SAAS;EAErD,oBACI,IAAAL,WAAA,CAAAO,GAAA,EAACV,YAAA,CAAAW,IAAI;IAACJ,KAAK,EAAE,CAACK,MAAM,CAACC,YAAY,EAAE;MAAEC,KAAK,EAAEL;IAAU,CAAC,EAAEF,KAAK,CAAE;IAAAQ,QAAA,EAC3DV;EAAK,CACJ,CAAC;AAEf,CAAC;AAED,MAAMO,MAAM,GAAGI,uBAAU,CAACC,MAAM,CAAC;EAC7BJ,YAAY,EAAE;IACVK,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,KAAK;IACjBC,UAAU,EAAEC,mBAAY,CAACC,aAAa;IACtCC,YAAY,EAAE;EAClB;AACJ,CAAC,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEYtB,YAAY","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_fonts","_useColorScheme","_themeUtils","_useThemeStyles","_jsxRuntime","SectionTitle","title","theme","style","colorScheme","normalizeColorScheme","useColorScheme","themeStyles","useThemeStyles","jsx","Text","styles","sectionTitle","color","textColor","children","StyleSheet","create","fontSize","fontWeight","fontFamily","fontFamilies","phuduSemiBold","marginBottom","_default","exports","default"],"sourceRoot":"../../../../src","sources":["ui/components/SectionTitle.tsx"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AAAyD,IAAAK,WAAA,GAAAL,OAAA;AAQzD,MAAMM,YAAyC,GAAGA,CAAC;EAAEC,KAAK;EAAEC,KAAK;EAAEC;AAAM,CAAC,KAAK;EAC3E,MAAMC,WAAW,GAAG,IAAAC,gCAAoB,EAAC,IAAAC,8BAAc,EAAC,CAAC,EAAEJ,KAAK,CAAC;EACjE,MAAMK,WAAW,GAAG,IAAAC,8BAAc,EAACN,KAAK,IAAIE,WAAW,EAAEA,WAAW,CAAC;EAErE,oBACI,IAAAL,WAAA,CAAAU,GAAA,EAAChB,YAAA,CAAAiB,IAAI;IAACP,KAAK,EAAE,CAACQ,MAAM,CAACC,YAAY,EAAE;MAAEC,KAAK,EAAEN,WAAW,CAACO;IAAU,CAAC,EAAEX,KAAK,CAAE;IAAAY,QAAA,EACvEd;EAAK,CACJ,CAAC;AAEf,CAAC;AAED,MAAMU,MAAM,GAAGK,uBAAU,CAACC,MAAM,CAAC;EAC7BL,YAAY,EAAE;IACVM,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,KAAK;IACjBC,UAAU,EAAEC,mBAAY,CAACC,aAAa;IACtCC,YAAY,EAAE;EAClB;AACJ,CAAC,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEY1B,YAAY","ignoreList":[]}

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

@@ -0,0 +1,77 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _reactNative = require("react-native");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/**
+ * Reusable setting row component with switch
+ * Extracted from PrivacySettingsScreen for reuse across settings screens
+ */
+const SettingRow = ({
+  title,
+  description,
+  value,
+  onValueChange,
+  disabled = false,
+  textColor,
+  mutedTextColor,
+  borderColor
+}) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+    style: [styles.settingRow, borderColor ? {
+      borderBottomColor: borderColor
+    } : undefined],
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+      style: styles.settingInfo,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+        style: [styles.settingTitle, textColor ? {
+          color: textColor
+        } : undefined],
+        children: title
+      }), description && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
+        style: [styles.settingDescription, mutedTextColor ? {
+          color: mutedTextColor
+        } : undefined],
+        children: description
+      })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Switch, {
+      value: value,
+      onValueChange: onValueChange,
+      disabled: disabled,
+      trackColor: {
+        false: '#767577',
+        true: '#d169e5'
+      },
+      thumbColor: value ? '#fff' : '#f4f3f4'
+    })]
+  });
+};
+const styles = _reactNative.StyleSheet.create({
+  settingRow: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    paddingVertical: 16,
+    borderBottomWidth: 1
+  },
+  settingInfo: {
+    flex: 1,
+    marginRight: 16
+  },
+  settingTitle: {
+    fontSize: 16,
+    fontWeight: '500',
+    marginBottom: 4
+  },
+  settingDescription: {
+    fontSize: 14,
+    opacity: 0.7
+  }
+});
+var _default = exports.default = /*#__PURE__*/_react.default.memo(SettingRow);
+//# sourceMappingURL=SettingRow.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_jsxRuntime","e","__esModule","default","SettingRow","title","description","value","onValueChange","disabled","textColor","mutedTextColor","borderColor","jsxs","View","style","styles","settingRow","borderBottomColor","undefined","children","settingInfo","jsx","Text","settingTitle","color","settingDescription","Switch","trackColor","false","true","thumbColor","StyleSheet","create","flexDirection","justifyContent","alignItems","paddingVertical","borderBottomWidth","flex","marginRight","fontSize","fontWeight","marginBottom","opacity","_default","exports","React","memo"],"sourceRoot":"../../../../src","sources":["ui/components/SettingRow.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAA8D,IAAAE,WAAA,GAAAF,OAAA;AAAA,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAa9D;AACA;AACA;AACA;AACA,MAAMG,UAAqC,GAAGA,CAAC;EAC3CC,KAAK;EACLC,WAAW;EACXC,KAAK;EACLC,aAAa;EACbC,QAAQ,GAAG,KAAK;EAChBC,SAAS;EACTC,cAAc;EACdC;AACJ,CAAC,KAAK;EACF,oBACI,IAAAZ,WAAA,CAAAa,IAAA,EAACd,YAAA,CAAAe,IAAI;IAACC,KAAK,EAAE,CAACC,MAAM,CAACC,UAAU,EAAEL,WAAW,GAAG;MAAEM,iBAAiB,EAAEN;IAAY,CAAC,GAAGO,SAAS,CAAE;IAAAC,QAAA,gBAC3F,IAAApB,WAAA,CAAAa,IAAA,EAACd,YAAA,CAAAe,IAAI;MAACC,KAAK,EAAEC,MAAM,CAACK,WAAY;MAAAD,QAAA,gBAC5B,IAAApB,WAAA,CAAAsB,GAAA,EAACvB,YAAA,CAAAwB,IAAI;QAACR,KAAK,EAAE,CAACC,MAAM,CAACQ,YAAY,EAAEd,SAAS,GAAG;UAAEe,KAAK,EAAEf;QAAU,CAAC,GAAGS,SAAS,CAAE;QAAAC,QAAA,EAC5Ef;MAAK,CACJ,CAAC,EACNC,WAAW,iBACR,IAAAN,WAAA,CAAAsB,GAAA,EAACvB,YAAA,CAAAwB,IAAI;QAACR,KAAK,EAAE,CAACC,MAAM,CAACU,kBAAkB,EAAEf,cAAc,GAAG;UAAEc,KAAK,EAAEd;QAAe,CAAC,GAAGQ,SAAS,CAAE;QAAAC,QAAA,EAC5Fd;MAAW,CACV,CACT;IAAA,CACC,CAAC,eACP,IAAAN,WAAA,CAAAsB,GAAA,EAACvB,YAAA,CAAA4B,MAAM;MACHpB,KAAK,EAAEA,KAAM;MACbC,aAAa,EAAEA,aAAc;MAC7BC,QAAQ,EAAEA,QAAS;MACnBmB,UAAU,EAAE;QAAEC,KAAK,EAAE,SAAS;QAAEC,IAAI,EAAE;MAAU,CAAE;MAClDC,UAAU,EAAExB,KAAK,GAAG,MAAM,GAAG;IAAU,CAC1C,CAAC;EAAA,CACA,CAAC;AAEf,CAAC;AAED,MAAMS,MAAM,GAAGgB,uBAAU,CAACC,MAAM,CAAC;EAC7BhB,UAAU,EAAE;IACRiB,aAAa,EAAE,KAAK;IACpBC,cAAc,EAAE,eAAe;IAC/BC,UAAU,EAAE,QAAQ;IACpBC,eAAe,EAAE,EAAE;IACnBC,iBAAiB,EAAE;EACvB,CAAC;EACDjB,WAAW,EAAE;IACTkB,IAAI,EAAE,CAAC;IACPC,WAAW,EAAE;EACjB,CAAC;EACDhB,YAAY,EAAE;IACViB,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,KAAK;IACjBC,YAAY,EAAE;EAClB,CAAC;EACDjB,kBAAkB,EAAE;IAChBe,QAAQ,EAAE,EAAE;IACZG,OAAO,EAAE;EACb;AACJ,CAAC,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAA3C,OAAA,gBAEY4C,cAAK,CAACC,IAAI,CAAC5C,UAAU,CAAC","ignoreList":[]}

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

@@ -8,6 +8,8 @@ var _react = require("react");
 var _reactNative = require("react-native");
 var _reactNativeReanimated = _interopRequireWildcard(require("react-native-reanimated"));
 var _styles = require("../styles");
+var _spacing = require("../constants/spacing");
+var _reactNativeSafeAreaContext = require("react-native-safe-area-context");
 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); }
 // Individual animated progress dot
@@ -52,28 +54,8 @@ const ProgressIndicator = ({
   }, index))
 });
 
-// Step container with animations
-const AnimatedStepContainer = ({
-  children,
-  fadeAnim,
-  slideAnim,
-  scaleAnim,
-  styles,
-  stepKey
-}) => {
-  const animatedStyle = (0, _reactNativeReanimated.useAnimatedStyle)(() => ({
-    opacity: fadeAnim.value,
-    transform: [{
-      translateX: slideAnim.value
-    }, {
-      scale: scaleAnim.value
-    }]
-  }));
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, {
-    style: [styles.stepContainer, animatedStyle],
-    children: children
-  }, stepKey);
-};
+// Step container - animations are now handled by router
+
 const StepBasedScreen = ({
   steps,
   initialStep = 0,
@@ -86,11 +68,33 @@ const StepBasedScreen = ({
   goBack,
   onAuthenticated,
   theme,
-  oxyServices
+  oxyServices,
+  stepControllerRef,
+  currentScreen,
+  // Current screen name for router-based step navigation
+  getNavigationProps // Optional callback to extract navigation props from screen state
 }) => {
-  const colors = (0, _styles.useThemeColors)(theme);
+  // ========================================================================
+  // State Management
+  // ========================================================================
+  // Router now handles step navigation - we just track step data
+  const [state, setState] = (0, _react.useState)({
+    stepData: [...stepData]
+  });
+
+  // Current step comes from router via initialStep prop
+  const currentStep = initialStep ?? 0;
+
+  // ========================================================================
+  // Computed Values
+  // ========================================================================
+  // Narrow theme type with default value
+  const themeValue = theme === 'light' || theme === 'dark' ? theme : 'light';
+  const themeString = typeof theme === 'string' ? theme : 'light';
+  const colors = (0, _styles.useThemeColors)(themeValue);
+  const insets = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)();
   const styles = (0, _react.useMemo)(() => ({
-    ...(0, _styles.createAuthStyles)(colors, theme),
+    ...(0, _styles.createAuthStyles)(colors, themeString),
     // Additional styles for step components
     modernHeader: {
       alignItems: 'flex-start',
@@ -167,7 +171,7 @@ const StepBasedScreen = ({
       justifyContent: 'center',
       marginTop: 24,
       // Space for bottom sheet handle (~20px) + small buffer
-      marginBottom: 24 // Equal spacing below dots
+      marginBottom: 0 // BottomSheet handles all bottom spacing
     },
     progressDot: {
       height: 6,
@@ -178,146 +182,173 @@ const StepBasedScreen = ({
     }
   }), [colors, theme]);
 
-  // State management
-  const [state, setState] = (0, _react.useState)({
-    currentStep: initialStep,
-    stepData: stepData,
-    isTransitioning: false
-  });
-
-  // Update state when stepData prop changes
-  (0, _react.useEffect)(() => {
-    setState(prevState => ({
-      ...prevState,
-      stepData: stepData
-    }));
-  }, [stepData]);
-
-  // Animation values
-  const fadeAnim = (0, _reactNativeReanimated.useSharedValue)(1);
-  const slideAnim = (0, _reactNativeReanimated.useSharedValue)(0);
-  const scaleAnim = (0, _reactNativeReanimated.useSharedValue)(1);
+  // ========================================================================
+  // Animation Values (removed - router handles animations now)
+  // ========================================================================
 
-  // Refs for animation callbacks
+  // ========================================================================
+  // Refs for Callbacks
+  // ========================================================================
   const onStepChangeRef = (0, _react.useRef)(onStepChange);
   const onCompleteRef = (0, _react.useRef)(onComplete);
   onStepChangeRef.current = onStepChange;
   onCompleteRef.current = onComplete;
 
-  // Update step data
-  const updateStepData = (0, _react.useCallback)((stepIndex, data) => {
-    setState(prev => ({
-      ...prev,
-      stepData: prev.stepData.map((item, index) => index === stepIndex ? data : item)
+  // ========================================================================
+  // Effects
+  // ========================================================================
+  (0, _react.useEffect)(() => {
+    setState(prevState => ({
+      ...prevState,
+      stepData: [...stepData]
     }));
-  }, [setState]);
+  }, [stepData]);
 
-  // Animation transition function
-  const animateTransition = (0, _react.useCallback)(nextStep => {
-    if (!enableAnimations) {
-      setState(prev => ({
+  // ========================================================================
+  // Step Data Management
+  // ========================================================================
+  const updateStepData = (0, _react.useCallback)((stepIndex, data) => {
+    setState(prev => {
+      const nextStepData = prev.stepData.slice();
+      nextStepData[stepIndex] = data;
+      return {
         ...prev,
-        currentStep: nextStep
-      }));
-      onStepChangeRef.current?.(nextStep, steps.length);
+        stepData: nextStepData
+      };
+    });
+  }, []);
+
+  // ========================================================================
+  // Step Change Effects
+  // ========================================================================
+  // Router handles all step navigation - we just respond to prop changes
+  (0, _react.useEffect)(() => {
+    // Validate step
+    if (currentStep < 0 || currentStep >= steps.length) {
+      if (__DEV__) {
+        console.warn('StepBasedScreen: invalid step', currentStep);
+      }
       return;
     }
-    setState(prev => ({
-      ...prev,
-      isTransitioning: true
-    }));
-    const applyStepChange = (targetStep, totalSteps) => {
-      setState(prev => ({
-        ...prev,
-        currentStep: targetStep,
-        isTransitioning: false
-      }));
-      onStepChangeRef.current?.(targetStep, totalSteps);
 
-      // Prepare next step animation
-      fadeAnim.value = 0;
-      scaleAnim.value = 0.98;
-      slideAnim.value = 0;
-      fadeAnim.value = (0, _reactNativeReanimated.withTiming)(1, {
-        duration: 220
-      });
-      scaleAnim.value = (0, _reactNativeReanimated.withTiming)(1, {
-        duration: 220
-      });
-    };
+    // Call onEnter for current step
+    const currentStepConfig = steps[currentStep];
+    currentStepConfig?.onEnter?.();
 
-    // Animate current step out
-    scaleAnim.value = (0, _reactNativeReanimated.withTiming)(0.98, {
-      duration: 180
-    });
-    fadeAnim.value = (0, _reactNativeReanimated.withTiming)(0, {
-      duration: 180
-    }, finished => {
-      if (finished) {
-        (0, _reactNativeReanimated.runOnJS)(applyStepChange)(nextStep, steps.length);
+    // Notify parent of step change
+    onStepChangeRef.current?.(currentStep, steps.length);
+
+    // Cleanup: call onExit when step changes
+    return () => {
+      if (currentStepConfig?.onExit) {
+        currentStepConfig.onExit();
       }
-    });
-  }, [enableAnimations, steps.length, fadeAnim, scaleAnim, slideAnim]);
+    };
+  }, [currentStep, steps]);
 
-  // Navigation functions
+  // ========================================================================
+  // Step Navigation
+  // ========================================================================
+  // All step navigation is now handled by router - these functions use router's navigate/goBack
   const nextStep = (0, _react.useCallback)(() => {
-    if (state.isTransitioning) return;
-    const currentStepConfig = steps[state.currentStep];
+    const currentStepConfig = steps[currentStep];
     if (currentStepConfig?.canProceed) {
-      const stepData = state.stepData[state.currentStep];
+      const stepData = state.stepData[currentStep];
       if (!currentStepConfig.canProceed(stepData)) {
         return; // Step validation failed
       }
     }
-    if (state.currentStep < steps.length - 1) {
-      // Call onExit for current step
-      currentStepConfig?.onExit?.();
-      animateTransition(state.currentStep + 1);
+    if (currentStep < steps.length - 1) {
+      const nextStepIndex = currentStep + 1;
+
+      // Extract props to preserve them across navigation
+      const navigationProps = {
+        initialStep: nextStepIndex
+      };
+
+      // Use extraction callback if provided
+      if (getNavigationProps) {
+        const extractedProps = getNavigationProps();
+        Object.assign(navigationProps, extractedProps);
+      } else {
+        // Fallback: Extract props from stepData
+        const step0Data = stepData[0] || {};
+        const currentStepData = stepData[currentStep] || {};
+        if (step0Data.username || currentStepData.username) {
+          navigationProps.username = step0Data.username || currentStepData.username;
+        }
+        if (step0Data.userProfile || currentStepData.userProfile) {
+          navigationProps.userProfile = step0Data.userProfile || currentStepData.userProfile;
+        }
+        if (step0Data.email || currentStepData.email) {
+          navigationProps.email = step0Data.email || currentStepData.email;
+        }
+      }
 
-      // Call onEnter for next step
-      const nextStepConfig = steps[state.currentStep + 1];
-      nextStepConfig?.onEnter?.();
+      // Router handles step navigation with animations
+      if (currentScreen && navigate && typeof currentScreen === 'string') {
+        navigate(currentScreen, navigationProps);
+      }
     } else {
       // Final step - call onComplete
       onCompleteRef.current?.(state.stepData);
     }
-  }, [state.currentStep, state.stepData, state.isTransitioning, steps, animateTransition]);
+  }, [currentStep, steps, currentScreen, navigate, state.stepData, getNavigationProps, stepData]);
   const prevStep = (0, _react.useCallback)(() => {
-    if (state.isTransitioning) return;
-    if (state.currentStep > 0) {
-      // Call onExit for current step
-      const currentStepConfig = steps[state.currentStep];
-      currentStepConfig?.onExit?.();
-      animateTransition(state.currentStep - 1);
+    // Use router's goBack - it handles step navigation automatically
+    if (currentStep > 0 && typeof goBack === 'function') {
+      goBack();
+    } else if (typeof goBack === 'function') {
+      // On first step, goBack will check screen history or close
+      goBack();
+    }
+  }, [currentStep, goBack]);
+  const goToStep = (0, _react.useCallback)(stepIndex => {
+    if (stepIndex < 0 || stepIndex >= steps.length || stepIndex === currentStep) return;
 
-      // Call onEnter for previous step
-      const prevStepConfig = steps[state.currentStep - 1];
-      prevStepConfig?.onEnter?.();
+    // Extract props to preserve state
+    const navigationProps = {
+      initialStep: stepIndex
+    };
+    if (getNavigationProps) {
+      const extractedProps = getNavigationProps();
+      Object.assign(navigationProps, extractedProps);
     } else {
-      // First step - go back
-      goBack?.();
+      const step0Data = stepData[0] || {};
+      if (step0Data.username) navigationProps.username = step0Data.username;
+      if (step0Data.userProfile) navigationProps.userProfile = step0Data.userProfile;
+      if (step0Data.email) navigationProps.email = step0Data.email;
     }
-  }, [state.currentStep, state.isTransitioning, steps, animateTransition, goBack]);
-  const goToStep = (0, _react.useCallback)(stepIndex => {
-    if (state.isTransitioning || stepIndex < 0 || stepIndex >= steps.length) return;
-    if (stepIndex !== state.currentStep) {
-      // Call onExit for current step
-      const currentStepConfig = steps[state.currentStep];
-      currentStepConfig?.onExit?.();
-      animateTransition(stepIndex);
 
-      // Call onEnter for target step
-      const targetStepConfig = steps[stepIndex];
-      targetStepConfig?.onEnter?.();
+    // Router handles step navigation with animations
+    if (currentScreen && navigate && typeof currentScreen === 'string') {
+      navigate(currentScreen, navigationProps);
     }
-  }, [state.currentStep, state.isTransitioning, steps, animateTransition]);
+  }, [currentStep, steps, currentScreen, navigate, stepData, getNavigationProps]);
 
-  // Get current step component
-  const currentStepConfig = steps[state.currentStep];
-  const CurrentStepComponent = currentStepConfig?.component;
+  // ========================================================================
+  // Step Controller Exposure
+  // ========================================================================
+  (0, _react.useEffect)(() => {
+    if (!stepControllerRef || typeof stepControllerRef !== 'object' || !('current' in stepControllerRef)) return;
+    stepControllerRef.current = {
+      canGoBack: () => currentStep > 0,
+      goBack: prevStep
+    };
+    return () => {
+      if (stepControllerRef && typeof stepControllerRef === 'object' && 'current' in stepControllerRef) {
+        stepControllerRef.current = null;
+      }
+    };
+  }, [currentStep, prevStep, stepControllerRef]);
 
-  // Enhanced props for the step component
-  const stepProps = {
+  // ========================================================================
+  // Step Component & Props
+  // ========================================================================
+  const currentStepConfig = steps[currentStep];
+  const CurrentStepComponent = currentStepConfig?.component;
+  const updateCurrentStepData = (0, _react.useCallback)(data => updateStepData(currentStep, data), [currentStep, updateStepData]);
+  const stepProps = (0, _react.useMemo)(() => ({
     ...currentStepConfig?.props,
     // Common props
     colors,
@@ -331,49 +362,34 @@ const StepBasedScreen = ({
     nextStep,
     prevStep,
     goToStep,
-    currentStep: state.currentStep,
+    currentStep: currentStep,
     totalSteps: steps.length,
     // Step data - spread the step data properties directly as props
-    ...state.stepData[state.currentStep],
+    ...state.stepData[currentStep],
     // Step data management
-    updateStepData: data => updateStepData(state.currentStep, data),
-    allStepData: state.stepData,
-    // State
-    isTransitioning: state.isTransitioning,
-    // Animation refs (for components that need direct access)
-    fadeAnim,
-    slideAnim,
-    scaleAnim
-  };
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.KeyboardAvoidingView, {
-    style: [styles.container],
-    behavior: undefined,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.StatusBar, {
-      barStyle: theme === 'dark' ? 'light-content' : 'dark-content',
-      backgroundColor: colors.background
-    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.ScrollView, {
-      contentContainerStyle: styles.scrollContent,
-      showsVerticalScrollIndicator: false,
-      keyboardShouldPersistTaps: "handled",
-      bounces: false,
-      alwaysBounceVertical: false,
-      overScrollMode: "never",
-      removeClippedSubviews: true,
-      children: [showProgressIndicator && steps.length > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIndicator, {
-        currentStep: state.currentStep,
-        totalSteps: steps.length,
-        colors: colors,
-        styles: styles
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(AnimatedStepContainer, {
-        fadeAnim: fadeAnim,
-        slideAnim: slideAnim,
-        scaleAnim: scaleAnim,
-        styles: styles,
-        stepKey: `step-${state.currentStep}`,
-        children: CurrentStepComponent && /*#__PURE__*/(0, _jsxRuntime.jsx)(CurrentStepComponent, {
-          ...stepProps
-        })
-      })]
+    updateStepData: updateCurrentStepData,
+    allStepData: state.stepData
+  }), [currentStepConfig?.props, colors, styles, theme, navigate, goBack, onAuthenticated, oxyServices, nextStep, prevStep, goToStep, currentStep, state.stepData, steps.length, updateCurrentStepData]);
+
+  // Pure content wrapper - all layout is handled by BottomSheetRouter
+  // This component only renders content, no layout calculations
+  // Add safe area insets to bottom padding so content doesn't sit under safe area
+  const contentStyle = (0, _react.useMemo)(() => ({
+    ..._spacing.screenContentStyle,
+    paddingBottom: _spacing.screenContentStyle.paddingBottom + insets.bottom
+  }), [insets.bottom]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
+    style: contentStyle,
+    children: [showProgressIndicator && steps.length > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(ProgressIndicator, {
+      currentStep: currentStep,
+      totalSteps: steps.length,
+      colors: colors,
+      styles: styles
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+      style: styles.stepContainer,
+      children: CurrentStepComponent && /*#__PURE__*/(0, _jsxRuntime.jsx)(CurrentStepComponent, {
+        ...stepProps
+      })
     })]
   });
 };