@admin-layout/gluestack-ui-mobile 12.0.16-alpha.93 → 12.2.1-alpha.3

package/CHANGELOG.md

@@ -3,247 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [12.0.16-alpha.93](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.92...v12.0.16-alpha.93) (2025-11-23)
+## [12.2.1-alpha.3](https://github.com/CDEBase/admin-layout/compare/v12.2.1-alpha.2...v12.2.1-alpha.3) (2025-11-25)
 
 **Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
 
-## [12.0.16-alpha.91](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.90...v12.0.16-alpha.91) (2025-11-21)
+## [12.2.1-alpha.0](https://github.com/CDEBase/admin-layout/compare/v11.2.1-alpha.1...v12.2.1-alpha.0) (2025-11-24)
 
 **Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
 
-## [12.0.16-alpha.90](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.89...v12.0.16-alpha.90) (2025-11-20)
+## [11.2.1-alpha.1](https://github.com/CDEBase/admin-layout/compare/v11.2.1-alpha.0...v11.2.1-alpha.1) (2025-11-24)
 
 **Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
 
-## [12.0.16-alpha.88](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.87...v12.0.16-alpha.88) (2025-11-10)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.87](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.86...v12.0.16-alpha.87) (2025-11-08)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.79](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.78...v12.0.16-alpha.79) (2025-10-29)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.78](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.77...v12.0.16-alpha.78) (2025-10-29)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.76](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.75...v12.0.16-alpha.76) (2025-10-29)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.75](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.74...v12.0.16-alpha.75) (2025-10-29)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.74](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.73...v12.0.16-alpha.74) (2025-10-27)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.72](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.71...v12.0.16-alpha.72) (2025-10-27)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.70](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.69...v12.0.16-alpha.70) (2025-10-24)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.67](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.66...v12.0.16-alpha.67) (2025-10-22)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.64](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.63...v12.0.16-alpha.64) (2025-10-19)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.62](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.61...v12.0.16-alpha.62) (2025-10-17)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.59](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.58...v12.0.16-alpha.59) (2025-10-16)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.58](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.57...v12.0.16-alpha.58) (2025-10-16)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.56](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.55...v12.0.16-alpha.56) (2025-10-15)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.55](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.54...v12.0.16-alpha.55) (2025-10-15)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.54](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.53...v12.0.16-alpha.54) (2025-10-14)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.53](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.52...v12.0.16-alpha.53) (2025-10-13)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.51](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.50...v12.0.16-alpha.51) (2025-10-10)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.50](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.49...v12.0.16-alpha.50) (2025-10-10)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.48](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.47...v12.0.16-alpha.48) (2025-10-09)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.46](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.45...v12.0.16-alpha.46) (2025-10-08)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.45](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.44...v12.0.16-alpha.45) (2025-10-07)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.44](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.43...v12.0.16-alpha.44) (2025-10-06)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.43](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.42...v12.0.16-alpha.43) (2025-10-04)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.42](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.41...v12.0.16-alpha.42) (2025-10-03)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.41](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.40...v12.0.16-alpha.41) (2025-10-02)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.40](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.39...v12.0.16-alpha.40) (2025-10-02)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.38](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.37...v12.0.16-alpha.38) (2025-10-02)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.37](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.36...v12.0.16-alpha.37) (2025-10-01)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.36](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.35...v12.0.16-alpha.36) (2025-10-01)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.31](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.30...v12.0.16-alpha.31) (2025-09-28)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.28](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.27...v12.0.16-alpha.28) (2025-09-28)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.25](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.24...v12.0.16-alpha.25) (2025-09-24)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.24](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.23...v12.0.16-alpha.24) (2025-09-21)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.23](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.22...v12.0.16-alpha.23) (2025-09-12)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.16](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.15...v12.0.16-alpha.16) (2025-08-13)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.14](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.13...v12.0.16-alpha.14) (2025-08-11)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.7](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.6...v12.0.16-alpha.7) (2025-08-04)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.2](https://github.com/CDEBase/admin-layout/compare/v12.0.16-alpha.1...v12.0.16-alpha.2) (2025-07-31)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [12.0.16-alpha.0](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.29...v12.0.16-alpha.0) (2025-07-30)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.28](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.27...v10.1.1-alpha.28) (2025-07-22)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.27](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.26...v10.1.1-alpha.27) (2025-07-21)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.25](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.24...v10.1.1-alpha.25) (2025-07-18)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.24](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.23...v10.1.1-alpha.24) (2025-07-18)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.23](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.22...v10.1.1-alpha.23) (2025-07-18)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.21](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.20...v10.1.1-alpha.21) (2025-07-04)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.14](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.13...v10.1.1-alpha.14) (2025-06-16)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.12](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.11...v10.1.1-alpha.12) (2025-06-16)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.11](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.10...v10.1.1-alpha.11) (2025-06-13)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.10](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.9...v10.1.1-alpha.10) (2025-06-11)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.9](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.8...v10.1.1-alpha.9) (2025-06-11)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.8](https://github.com/CDEBase/admin-layout/compare/v10.1.1-alpha.7...v10.1.1-alpha.8) (2025-06-10)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.1.1-alpha.0](https://github.com/CDEBase/admin-layout/compare/v10.0.8-alpha.2...v10.1.1-alpha.0) (2025-05-22)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.0.8-alpha.2](https://github.com/CDEBase/admin-layout/compare/v10.0.8-alpha.1...v10.0.8-alpha.2) (2025-04-11)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.0.8-alpha.0](https://github.com/CDEBase/admin-layout/compare/v3.0.0-alpha.50...v10.0.8-alpha.0) (2025-04-11)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.0.6-alpha.0](https://github.com/CDEBase/admin-layout/compare/v3.0.0-alpha.50...v10.0.6-alpha.0) (2025-04-11)
-
-**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
-
-## [10.0.4-alpha.0](https://github.com/CDEBase/admin-layout/compare/v3.0.0-alpha.50...v10.0.4-alpha.0) (2025-04-11)
+## [11.2.1-alpha.0](https://github.com/CDEBase/admin-layout/compare/v10.0.8-alpha.2...v11.2.1-alpha.0) (2025-11-24)
 
 **Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
 

package/lib/components/AuthWrapper.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { isUserAuthenticated } from '@adminide-stack/user-auth0-client';
-import { useNavigation, useRoute } from '@react-navigation/native';
+import { useNavigation } from '@react-navigation/native';
 import { useSelector } from 'react-redux';
 import DefaultAuthComponent from './UnAuthenticatedComponent';
 import { withLifeCycleManaged, withInteractionsManaged, withLifeCycleInteractionsManaged, } from './with-interactions-lifecycle-managed';
@@ -8,12 +8,10 @@ export const AuthWrapper = ({ auth = false, component, unauthenticatedComponent
     const user = useSelector((state) => state.user);
     const { authenticated } = isUserAuthenticated();
     const navigation = useNavigation();
-    const route = useRoute();
     React.useEffect(() => {
-        if ((auth === true || route?.params?.auth === true) && !user?.profile) {
+        if (auth && !user?.profile)
             navigation.navigate('MainStack.Login');
-        }
-    }, [auth, route.params.auth]);
+    }, [auth, user]);
     const wrapperComponent = withLifeCycle
         ? withLifeCycleManaged(component, authority)
         : withInteraction

package/lib/components/AuthWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthWrapper.js","sourceRoot":"","sources":["../../src/components/AuthWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACH,oBAAoB,EACpB,uBAAuB,EACvB,gCAAgC,GACnC,MAAM,uCAAuC,CAAC;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EACxB,IAAI,GAAG,KAAK,EACZ,SAAS,EACT,wBAAwB,GAAG,IAAI,EAC/B,aAAa,GAAG,IAAI,EACpB,eAAe,GAAG,IAAI,EACtB,wBAAwB,GAAG,IAAI,EAC/B,SAAS,GAAG,IAAI,EAChB,gBAAgB,GAAG,IAAI,GACrB,EAAE,EAAE;IACN,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,EAAE,aAAa,EAAE,GAAG,mBAAmB,EAAE,CAAC;IAChD,MAAM,UAAU,GAAG,aAAa,EAAO,CAAC;IACxC,MAAM,KAAK,GAAG,QAAQ,EAAO,CAAC;IAE9B,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;YACpE,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAC3C,CAAC;IACL,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAE9B,MAAM,gBAAgB,GAAG,aAAa;QAClC,CAAC,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;QAC5C,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,uBAAuB,CAAC,SAAS,EAAE,eAAe,EAAE,QAAQ,IAAI,IAAI,EAAE,SAAS,CAAC;YAClF,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,gCAAgC,CAAC,SAAS,EAAE,wBAAwB,EAAE,QAAQ,IAAI,IAAI,EAAE,SAAS,CAAC;gBACpG,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,OAAO;QAAE,OAAO,wBAAwB,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,oBAAC,oBAAoB,OAAG,CAAC;;QAC7G,OAAO,gBAAgB,CAAC;AACjC,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"AuthWrapper.js","sourceRoot":"","sources":["../../src/components/AuthWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,oBAAoB,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACH,oBAAoB,EACpB,uBAAuB,EACvB,gCAAgC,GACnC,MAAM,uCAAuC,CAAC;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EACxB,IAAI,GAAG,KAAK,EACZ,SAAS,EACT,wBAAwB,GAAG,IAAI,EAC/B,aAAa,GAAG,IAAI,EACpB,eAAe,GAAG,IAAI,EACtB,wBAAwB,GAAG,IAAI,EAC/B,SAAS,GAAG,IAAI,EAChB,gBAAgB,GAAG,IAAI,GACrB,EAAE,EAAE;IACN,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,EAAE,aAAa,EAAE,GAAG,mBAAmB,EAAE,CAAC;IAChD,MAAM,UAAU,GAAG,aAAa,EAAO,CAAC;IAExC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,OAAO;YAAE,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IACvE,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEjB,MAAM,gBAAgB,GAAG,aAAa;QAClC,CAAC,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;QAC5C,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,uBAAuB,CAAC,SAAS,EAAE,eAAe,EAAE,QAAQ,IAAI,IAAI,EAAE,SAAS,CAAC;YAClF,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,gCAAgC,CAAC,SAAS,EAAE,wBAAwB,EAAE,QAAQ,IAAI,IAAI,EAAE,SAAS,CAAC;gBACpG,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,OAAO;QAAE,OAAO,wBAAwB,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,oBAAC,oBAAoB,OAAG,CAAC;;QAC7G,OAAO,gBAAgB,CAAC;AACjC,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC"}

package/lib/components/ErrorBounday.js.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorBounday.js","sourceRoot":"","sources":["../../src/components/ErrorBounday.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuB,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAO5C,MAAM,OAAO,aAAc,SAAQ,KAAK,CAAC,SAAiD;IACtF,YAAY,KAAyB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,CAAC,KAAK,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,wBAAwB,CAAC,KAAY;QACxC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACrC,CAAC;IAED,iBAAiB,CAAC,KAAY;QAC1B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,MAAM;QACF,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACtB,OAAO,oBAAC,iBAAiB,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAc,GAAI,CAAC;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC/B,CAAC;CACJ"}
+{"version":3,"file":"ErrorBounday.js","sourceRoot":"","sources":["../../src/components/ErrorBounday.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuB,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAQ5C,MAAM,OAAO,aAAc,SAAQ,KAAK,CAAC,SAAiD;IACxF,YAAY,KAAyB;QACnC,KAAK,CAAC,KAAK,CAAC,CAAC;QACb,IAAI,CAAC,KAAK,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,wBAAwB,CAAC,KAAY;QAC1C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACnC,CAAC;IAED,iBAAiB,CAAC,KAAY;QAC5B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACrB,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACxB,OAAO,oBAAC,iBAAiB,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAc,GAAI,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC7B,CAAC;CACF"}

package/lib/components/Fallback.js

@@ -1,52 +1,52 @@
 import { navigationRef } from '@common-stack/client-react';
-import { Button, ButtonText } from './ui';
+import { Button, ButtonText } from '@gluestack-ui/themed';
 import * as React from 'react';
 import { StyleSheet } from 'react-native';
-import { SafeAreaView, Text, View } from 'react-native';
+import { SafeAreaView, Text, View, } from 'react-native';
 import { useDispatch } from 'react-redux';
 export const FallbackComponent = (props) => {
     const dispatch = useDispatch();
     return (React.createElement(SafeAreaView, { style: styles.container },
         React.createElement(View, { style: styles.content },
             React.createElement(Text, { style: styles.title }, "Oops!"),
-            React.createElement(Text, { style: styles.subtitle }, "There's an error"),
+            React.createElement(Text, { style: styles.subtitle }, 'There\'s an error'),
             React.createElement(Text, { style: styles.error }, props?.error?.message),
-            React.createElement(Button, { style: styles.button, onPress: () => navigationRef.navigate('MainStack.Layout.Home') },
+            React.createElement(Button, { style: styles.button, onPress: () => navigationRef.navigate("MainStack.Layout.Home") },
                 React.createElement(ButtonText, { style: styles.buttonText }, "Go to homepage")))));
 };
 const styles = StyleSheet.create({
     container: {
         backgroundColor: '#fafafa',
         flex: 1,
-        justifyContent: 'center',
+        justifyContent: 'center'
     },
     content: {
-        marginHorizontal: 16,
+        marginHorizontal: 16
     },
     title: {
         fontSize: 48,
         fontWeight: '300',
         paddingBottom: 16,
-        color: '#000',
+        color: '#000'
     },
     subtitle: {
         fontSize: 32,
         fontWeight: '800',
-        color: '#000',
+        color: '#000'
     },
     error: {
-        paddingVertical: 16,
+        paddingVertical: 16
     },
     button: {
         backgroundColor: '#2196f3',
         borderRadius: 50,
         padding: 25,
-        height: 40,
+        height: 40
     },
     buttonText: {
         color: '#fff',
         fontWeight: '600',
-        textAlign: 'center',
-    },
+        textAlign: 'center'
+    }
 });
 //# sourceMappingURL=Fallback.js.map

package/lib/components/Fallback.js.map

@@ -1 +1 @@
-{"version":3,"file":"Fallback.js","sourceRoot":"","sources":["../../src/components/Fallback.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAY,EAAE,EAAE;IAC9C,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,OAAO,CACH,oBAAC,YAAY,IAAC,KAAK,EAAE,MAAM,CAAC,SAAS;QACjC,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,OAAO;YACvB,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,KAAK,YAAc;YACvC,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,IAAG,kBAAkB,CAAQ;YACzD,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAG,KAAK,EAAE,KAAK,EAAE,OAAO,CAAQ;YACzD,oBAAC,MAAM,IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,uBAAuB,CAAC;gBACxF,oBAAC,UAAU,IAAC,KAAK,EAAE,MAAM,CAAC,UAAU,qBAA6B,CAC5D,CACN,CACI,CAClB,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,MAAM,GAAQ,UAAU,CAAC,MAAM,CAAC;IAClC,SAAS,EAAE;QACP,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,QAAQ;KAC3B;IACD,OAAO,EAAE;QACL,gBAAgB,EAAE,EAAE;KACvB;IACD,KAAK,EAAE;QACH,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,KAAK;QACjB,aAAa,EAAE,EAAE;QACjB,KAAK,EAAE,MAAM;KAChB;IACD,QAAQ,EAAE;QACN,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,MAAM;KAChB;IACD,KAAK,EAAE;QACH,eAAe,EAAE,EAAE;KACtB;IACD,MAAM,EAAE;QACJ,eAAe,EAAE,SAAS;QAC1B,YAAY,EAAE,EAAE;QAChB,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;KACb;IACD,UAAU,EAAE;QACR,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,KAAK;QACjB,SAAS,EAAE,QAAQ;KACtB;CACJ,CAAC,CAAC"}
+{"version":3,"file":"Fallback.js","sourceRoot":"","sources":["../../src/components/Fallback.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAC,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,OAAO,EACL,YAAY,EACZ,IAAI,EACJ,IAAI,GACL,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAIzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAY,EAAE,EAAE;IAChD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;IAC9B,OAAO,CACL,oBAAC,YAAY,IAAC,KAAK,EAAE,MAAM,CAAC,SAAS;QACnC,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,OAAO;YACzB,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,KAAK,YAAc;YACvC,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,IAAG,mBAAmB,CAAQ;YAC1D,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAG,KAAK,EAAE,KAAK,EAAE,OAAO,CAAQ;YACzD,oBAAC,MAAM,IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,uBAAuB,CAAC;gBAC1F,oBAAC,UAAU,IAAC,KAAK,EAAE,MAAM,CAAC,UAAU,qBAA6B,CAC1D,CACJ,CACM,CAChB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,MAAM,GAAQ,UAAU,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE;QACT,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,QAAQ;KACzB;IACD,OAAO,EAAE;QACP,gBAAgB,EAAE,EAAE;KACrB;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,KAAK;QACjB,aAAa,EAAE,EAAE;QACjB,KAAK,EAAE,MAAM;KACd;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,MAAM;KACd;IACD,KAAK,EAAE;QACL,eAAe,EAAE,EAAE;KACpB;IACD,MAAM,EAAE;QACN,eAAe,EAAE,SAAS;QAC1B,YAAY,EAAE,EAAE;QAChB,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;KACX;IACD,UAAU,EAAE;QACV,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,KAAK;QACjB,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC,CAAA"}

package/lib/components/Layout/components/BasicLayout.js

@@ -1,6 +1,6 @@
 import React, { useRef, useState } from 'react';
 import { Route } from 'react-router-native';
-import { Box, Divider } from '../../ui';
+import { Box, Divider } from '@gluestack-ui/themed';
 import { Header } from './Header';
 import { Drawer } from './Drawer';
 import defaultSettings from './defaultSettings';
@@ -10,7 +10,7 @@ const BasicLayout = (props) => {
     const { route, rightContentRender, onSettingChange, settings, routeParams, showSettings, currentRoute } = props;
     const drawerRef = useRef();
     const [settingToggle, setSettingToggle] = useState(false);
-    return (React.createElement(Box, { className: "flex-1" },
+    return (React.createElement(Box, { flex: 1 },
         React.createElement(Header, { layout: settings.layout, setSettingToggle: setSettingToggle, title: currentRoute.name, drawerRef: drawerRef, rightContentRender: rightContentRender, settingToggle: settingToggle, navTheme: settings.navTheme, showSettings: showSettings, route: currentRoute.key, nextButton: currentRoute.nextButton }),
         React.createElement(Divider, null),
         !!settings && settings.layout !== 'bottom' ? (React.createElement(Drawer, { navTheme: settings.navTheme, match: props.match, routeParams: routeParams, routes: route.routes, drawerRef: drawerRef })) : null,

package/lib/components/Layout/components/BasicLayout.js.map

@@ -1 +1 @@
-{"version":3,"file":"BasicLayout.js","sourceRoot":"","sources":["../../../../src/components/Layout/components/BasicLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAa,OAAO,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,MAAM,WAAW,GAAyC,CAAC,KAAK,EAAE,EAAE;IAChE,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAChH,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC;IAC3B,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1D,OAAO,CACH,oBAAC,GAAG,IAAC,SAAS,EAAC,QAAQ;QACnB,oBAAC,MAAM,IACH,MAAM,EAAE,QAAQ,CAAC,MAAM,EACvB,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,YAAY,CAAC,IAAI,EACxB,SAAS,EAAE,SAAS,EACpB,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,YAAY,CAAC,GAAG,EACvB,UAAU,EAAE,YAAY,CAAC,UAAU,GACrC;QACF,oBAAC,OAAO,OAAG;QACV,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAC1C,oBAAC,MAAM,IACH,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,SAAS,GACtB,CACL,CAAC,CAAC,CAAC,IAAI;QACP,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ;YACrC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,CAC7B,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,GAAI,CAC3E,CAAC;YACJ,CAAC,CAAC,IAAI;QACT,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CACf,oBAAC,aAAa,IACV,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC1B,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAC1B,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC,GACH,CACL,CAAC,CAAC,CAAC,IAAI;QACP,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,IAAI,CAC5E,oBAAC,YAAY,IAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,GAAI,CACtE,CACC,CACT,CAAC;AACN,CAAC,CAAC;AAEF,WAAW,CAAC,YAAY,GAAG;IACvB,GAAG,eAAe;CACrB,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"BasicLayout.js","sourceRoot":"","sources":["../../../../src/components/Layout/components/BasicLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAG,GAAG,EAAa,OAAO,EAAiB,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C,MAAM,WAAW,GAAyC,CAAC,KAAK,EAAE,EAAE;IAChE,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAChH,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC;IAC3B,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1D,OAAO,CACH,oBAAC,GAAG,IAAC,IAAI,EAAE,CAAC;QACR,oBAAC,MAAM,IACH,MAAM,EAAE,QAAQ,CAAC,MAAM,EACvB,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,YAAY,CAAC,IAAI,EACxB,SAAS,EAAE,SAAS,EACpB,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,YAAY,CAAC,GAAG,EACvB,UAAU,EAAE,YAAY,CAAC,UAAU,GACrC;QACF,oBAAC,OAAO,OAAG;QACV,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAC1C,oBAAC,MAAM,IACH,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAC3B,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,SAAS,GACtB,CACL,CAAC,CAAC,CAAC,IAAI;QACP,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ;YACrC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,CAC7B,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,GAAI,CAC3E,CAAC;YACJ,CAAC,CAAC,IAAI;QACT,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CACf,oBAAC,aAAa,IACV,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC1B,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAC1B,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC,GACH,CACL,CAAC,CAAC,CAAC,IAAI;QACP,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,IAAI,CAC5E,oBAAC,YAAY,IAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,GAAI,CACtE,CACC,CACT,CAAC;AACN,CAAC,CAAC;AAEF,WAAW,CAAC,YAAY,GAAG;IACvB,GAAG,eAAe;CACrB,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/lib/components/Layout/components/BottomTabBar.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Pressable, Center, Text, StyledSafeAreaView, HStack } from '../../ui';
+import { Box, Pressable, Center, Text, SafeAreaView } from '@gluestack-ui/themed';
 import { useSelector } from 'react-redux';
 import { navigationRef } from '@common-stack/client-react';
 export const BottomTabBar = ({ state, descriptors, navigation, ...props }) => {
@@ -42,8 +42,8 @@ export const BottomTabBar = ({ state, descriptors, navigation, ...props }) => {
             });
         }
     }, []);
-    return (React.createElement(StyledSafeAreaView, null,
-        React.createElement(HStack, { className: "bg-white border-t w-full py-4 border-t-[#d3d3d3]", ...tabBarProps }, appRoutes.map((route, index) => {
+    return (React.createElement(SafeAreaView, null,
+        React.createElement(Box, { flexDirection: "row", width: "100%", alignSelf: "center", bg: '$white', borderTopWidth: "$1", borderTopColor: '#d3d3d3', py: "$4", ...tabBarProps }, appRoutes.map((route, index) => {
             const options = route.options;
             const label = options.tabBarLabel !== undefined
                 ? options.tabBarLabel
@@ -72,10 +72,10 @@ export const BottomTabBar = ({ state, descriptors, navigation, ...props }) => {
             //         target: route.route.key,
             //     });
             // };
-            return (React.createElement(Pressable, { key: index, className: `opacity-[${isFocused ? '100' : '50'}] flex-1`, 
+            return (React.createElement(Pressable, { key: index, opacity: isFocused ? "$100" : "$50", 
                 //  pb="$8"
                 //  pt={"$3"}
-                onPress: () => onPress(route, navigation, isFocused), onLongPress: () => onLongPress(route, navigation, isFocused), testID: options.tabBarTestID, accessibilityState: isFocused ? { selected: true } : {}, accessibilityLabel: options.tabBarAccessibilityLabel },
+                flex: 1, onPress: () => onPress(route, navigation, isFocused), onLongPress: () => onLongPress(route, navigation, isFocused), testID: options.tabBarTestID, accessibilityState: isFocused ? { selected: true } : {}, accessibilityLabel: options.tabBarAccessibilityLabel },
                 React.createElement(Center, null,
                     options?.tabBarIcon
                         ? options.tabBarIcon({
@@ -85,7 +85,7 @@ export const BottomTabBar = ({ state, descriptors, navigation, ...props }) => {
                             size: 24,
                         })
                         : null,
-                    React.createElement(Text, { color: isFocused ? options.tabBarActiveTintColor : options.tabBarInactiveTintColor, size: 'sm' }, label))));
+                    React.createElement(Text, { color: isFocused ? options.tabBarActiveTintColor : options.tabBarInactiveTintColor, style: { fontSize: 12 } }, label))));
         }))));
 };
 export default BottomTabBar;

package/lib/components/Layout/components/BottomTabBar.js.map

@@ -1 +1 @@
-{"version":3,"file":"BottomTabBar.js","sourceRoot":"","sources":["../../../../src/components/Layout/components/BottomTabBar.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BottomTabBar.js","sourceRoot":"","sources":["../../../../src/components/Layout/components/BottomTabBar.tsx"],"names":[],"mappings":"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"}

package/lib/components/Layout/components/Drawer.js

@@ -1,12 +1,11 @@
 import React from 'react';
 import { Ionicons } from '@expo/vector-icons';
 import { DrawerContentScrollView, DrawerItem } from '@react-navigation/drawer';
-import { Box, Text, Heading, Divider, StatusBar, Avatar, AvatarFallbackText, AvatarImage, HStack, useToast, } from '../../ui';
+import { Box, Text, Heading, Divider, StatusBar, Avatar, AvatarFallbackText, AvatarImage, HStack, VStack, useToast, Toast, ToastTitle, } from '@gluestack-ui/themed';
 import { useNavigation, useRoute } from '@react-navigation/native';
 import { navigationRef } from '@common-stack/client-react';
 import { useSelector, useDispatch } from 'react-redux';
 import { logoutAndRedirect, resetReduxState } from '@adminide-stack/user-auth0-client';
-import { ToastAlert } from '../../ToastAlert';
 export const Drawer = (props) => {
     const settings = useSelector((state) => state.settings);
     const platform = useSelector((state) => state.platform);
@@ -42,8 +41,8 @@ export const Drawer = (props) => {
         (b?.params?.priority ? b?.params?.priority : b?.name)) ?? [];
     const logoUrl = settings?.logo?.split('.') ?? null;
     const logoType = logoUrl ? logoUrl[logoUrl.length - 1] : null;
-    return (React.createElement(Box, { className: "flex-1" },
-        React.createElement(StatusBar, { barStyle: settings?.navTheme === 'light' || settings?.navTheme === 'dark' ? 'dark-content' : 'light-content' }),
+    return (React.createElement(Box, { flex: 1 },
+        React.createElement(StatusBar, { barStyle: settings?.navTheme == 'dark' ? 'light-content' : 'dark-content' }),
         React.createElement(DrawerContentScrollView, { ...props, style: {
                 backgroundColor: props?.backgroundColor
                     ? props?.backgroundColor
@@ -51,21 +50,21 @@ export const Drawer = (props) => {
                         ? '#000'
                         : '#fff',
             } },
-            settings?.logo && logoType && logoType != 'svg' ? (React.createElement(HStack, { className: "px-3 items-center" },
-                React.createElement(Avatar, { size: 'sm', className: "bg-transparent" },
+            settings?.logo && logoType && logoType != 'svg' ? (React.createElement(HStack, { px: '$3', alignItems: 'center' },
+                React.createElement(Avatar, { size: 'sm', bg: "transparent" },
                     React.createElement(AvatarFallbackText, null, "Logo"),
                     React.createElement(AvatarImage, { source: {
                             uri: settings?.logo,
                         }, alt: "logo" })),
-                props.title ? (React.createElement(Heading, { className: `p-5 text-${props?.titleColor
+                props.title ? (React.createElement(Heading, { p: '$5', size: 'lg', color: props?.titleColor
                         ? props?.titleColor
                         : settings?.navTheme == 'dark'
-                            ? 'white'
-                            : 'black'}`, size: 'lg' }, props?.headingTitle ?? settings?.title ?? props.title)) : null)) : (React.createElement(React.Fragment, null, props.title ? (React.createElement(Heading, { size: 'lg', className: `p-5 text-${props?.titleColor
+                            ? '$white'
+                            : '$black' }, props?.headingTitle ?? settings?.title ?? props.title)) : null)) : (React.createElement(React.Fragment, null, props.title ? (React.createElement(Heading, { p: '$5', size: 'lg', color: props?.titleColor
                     ? props?.titleColor
                     : settings?.navTheme == 'dark'
-                        ? 'white'
-                        : 'black'}` }, props?.headingTitle ?? settings?.title ?? props.title)) : null)),
+                        ? '$white'
+                        : '$black' }, props?.headingTitle ?? settings?.title ?? props.title)) : null)),
             [...sideRoutes]?.map((data) => {
                 return (React.createElement(DrawerItem, { key: data.key, icon: ({ focused }) => {
                         if (settings && settings.layout == 'mixSide') {
@@ -122,7 +121,7 @@ export const Drawer = (props) => {
                                             ? 'white'
                                             : 'black', size: 20 }));
                         }
-                    }, label: ({ color }) => (React.createElement(Text, { className: "font-semibold", style: { color, fontSize: 15 } }, data.name.split('.').pop() === 'Home' ? 'Home' : data.name.split('.').pop())), focused: 
+                    }, label: ({ color }) => (React.createElement(Text, { style: { color, fontSize: 15 }, fontWeight: '$semibold' }, data.name.split('.').pop() === 'Home' ? 'Home' : data.name.split('.').pop())), focused: 
                     // props.state.routes.findIndex((e: any) => e.name === data.name) === props.state.index
                     settings?.layout == 'side'
                         ? props.state.routes.findIndex((e) => e.name === data.name) ===
@@ -133,7 +132,7 @@ export const Drawer = (props) => {
                             ? 'white'
                             : 'black' }));
             })),
-        React.createElement(Box, { className: `mb-${settings?.layout == 'bottomDrawer' ? '0' : '4'} bg-${props?.backgroundColor ? props?.backgroundColor : settings?.navTheme == 'dark' ? '#000' : '#fff'}` },
+        React.createElement(Box, { mb: settings?.layout == 'bottomDrawer' ? '$0' : '$4', bg: props?.backgroundColor ? props?.backgroundColor : settings?.navTheme == 'dark' ? '#000' : '#fff' },
             React.createElement(Divider, null),
             React.createElement(React.Fragment, null, [...bottomRoutes]?.map((data) => {
                 return (React.createElement(DrawerItem, { key: data.key, icon: ({ focused }) => {
@@ -191,7 +190,7 @@ export const Drawer = (props) => {
                                             ? 'white'
                                             : 'black', size: 20 }));
                         }
-                    }, label: ({ color }) => (React.createElement(Text, { style: { color, fontSize: 15 }, className: "font-semibold" }, data.name.split('.').pop() === 'Home' ? 'Home' : data.name.split('.').pop())), focused: 
+                    }, label: ({ color }) => (React.createElement(Text, { style: { color, fontSize: 15 }, fontWeight: '$semibold' }, data.name.split('.').pop() === 'Home' ? 'Home' : data.name.split('.').pop())), focused: 
                     //  props.state.routes.findIndex((e: any) => e.name === data.name) === props.state.index
                     settings?.layout == 'side'
                         ? props.state.routes.findIndex((e) => e.name === data.name) ===
@@ -202,7 +201,7 @@ export const Drawer = (props) => {
                             ? 'white'
                             : 'black', onPress: () => props?.navigation?.navigate(data.name, { orgName: platform.orgName }) }));
             })),
-            props.logout && user && user.accessToken && (React.createElement(DrawerItem, { label: ({ color }) => (React.createElement(Text, { style: { color, fontSize: 15 }, className: "font-semibold" }, "Logout")), icon: ({ focused }) => (React.createElement(Ionicons, { name: 'log-out', size: 24, color: focused
+            props.logout && user && user.accessToken && (React.createElement(DrawerItem, { label: ({ color }) => (React.createElement(Text, { style: { color, fontSize: 15 }, fontWeight: '$semibold' }, "Logout")), icon: ({ focused }) => (React.createElement(Ionicons, { name: 'log-out', size: 24, color: focused
                         ? props?.activeTintColor ?? '#ff5a00'
                         : props?.inactiveTintColor
                             ? props?.inactiveTintColor
@@ -222,7 +221,9 @@ export const Drawer = (props) => {
                             placement: 'top',
                             render: ({ id }) => {
                                 const toastId = 'toast-' + id;
-                                return (React.createElement(ToastAlert, { id: id, title: 'Logging out....', status: 'success', variant: 'accent' }));
+                                return (React.createElement(Toast, { nativeID: toastId, action: "attention", variant: "solid" },
+                                    React.createElement(VStack, { space: "xs" },
+                                        React.createElement(ToastTitle, null, "Logging out"))));
                             },
                         });
                         props?.navigation?.closeDrawer();