diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 396a8d94..85814d8a 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -13,6 +13,7 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
import { KeyboardProvider } from 'react-native-keyboard-controller';
import { StackAnimationTypes } from 'react-native-screens';
import Toast from 'react-native-toast-message';
+import { StyleSheet } from 'react-native-unistyles';
import { config } from '$domain/constants';
import { AuthContextProvider } from '$domain/contexts';
@@ -122,11 +123,11 @@ const screenOptions = {
animation: 'fade' as StackAnimationTypes,
};
-const styles = {
+const styles = StyleSheet.create({
wrapper: {
flex: 1,
},
-};
+});
const RootLayoutWithSentry = Sentry.wrap(RootLayout);
diff --git a/src/shared/components/navigation/components/HeaderLeft.tsx b/src/shared/components/navigation/components/HeaderLeft.tsx
index 9ae66441..a17431af 100644
--- a/src/shared/components/navigation/components/HeaderLeft.tsx
+++ b/src/shared/components/navigation/components/HeaderLeft.tsx
@@ -16,7 +16,7 @@ export const HeaderLeft = () => {
name="LeftArrow"
width={DEFAULT_ICON_SIZE}
height={DEFAULT_ICON_SIZE}
- color={theme.colors.content_primary}
+ fill={theme.colors.content_primary}
/>
);
diff --git a/src/shared/components/navigation/components/TabBarIcon.tsx b/src/shared/components/navigation/components/TabBarIcon.tsx
index 4b29fabe..f7757744 100644
--- a/src/shared/components/navigation/components/TabBarIcon.tsx
+++ b/src/shared/components/navigation/components/TabBarIcon.tsx
@@ -22,7 +22,7 @@ export const TabBarIcon = ({
name={iconName}
width={DEFAULT_ICON_SIZE}
height={DEFAULT_ICON_SIZE}
- color={
+ fill={
isFocused ? theme.colors.core_primary : theme.colors.content_secondary
}
testID={testID}
diff --git a/src/shared/icons/Icon.tsx b/src/shared/icons/Icon.tsx
index cb6d66ba..fe5060e7 100644
--- a/src/shared/icons/Icon.tsx
+++ b/src/shared/icons/Icon.tsx
@@ -4,7 +4,7 @@ type Name = keyof typeof AllIcons;
interface IconProps {
name: Name;
- color?: string;
+ fill?: string;
width?: number;
height?: number;
testID?: string;
@@ -12,7 +12,7 @@ interface IconProps {
export const Icon = ({
name,
- color,
+ fill,
width,
height,
testID = 'Icon',
@@ -20,11 +20,6 @@ export const Icon = ({
const IconComponent = AllIcons[name];
return (
-
+
);
};
diff --git a/src/shared/icons/components/Apps.tsx b/src/shared/icons/components/Apps.tsx
index 6298c170..b618b7b1 100644
--- a/src/shared/icons/components/Apps.tsx
+++ b/src/shared/icons/components/Apps.tsx
@@ -2,12 +2,12 @@ import type { SvgProps } from 'react-native-svg';
import Svg, { Path } from 'react-native-svg';
/* eslint-disable react/jsx-props-no-spreading */
-const Apps = ({ color = '#0C0D0F', ...props }: SvgProps) => {
+const Apps = ({ fill = '#0C0D0F', ...props }: SvgProps) => {
return (
);
diff --git a/src/shared/icons/components/Envelope.tsx b/src/shared/icons/components/Envelope.tsx
index 0051d12d..ed606b27 100644
--- a/src/shared/icons/components/Envelope.tsx
+++ b/src/shared/icons/components/Envelope.tsx
@@ -2,12 +2,12 @@ import type { SvgProps } from 'react-native-svg';
import Svg, { Path } from 'react-native-svg';
/* eslint-disable react/jsx-props-no-spreading */
-const Envelope = ({ color = '#0C0D0F', ...props }: SvgProps) => {
+const Envelope = ({ fill = '#0C0D0F', ...props }: SvgProps) => {
return (
);
diff --git a/src/shared/icons/components/Home.tsx b/src/shared/icons/components/Home.tsx
index 30c77af1..8c50933d 100644
--- a/src/shared/icons/components/Home.tsx
+++ b/src/shared/icons/components/Home.tsx
@@ -2,12 +2,12 @@ import type { SvgProps } from 'react-native-svg';
import Svg, { Path } from 'react-native-svg';
/* eslint-disable react/jsx-props-no-spreading */
-const Home = ({ color = '#0C0D0F', ...props }: SvgProps) => {
+const Home = ({ fill = '#0C0D0F', ...props }: SvgProps) => {
return (
);
diff --git a/src/shared/icons/components/Key.tsx b/src/shared/icons/components/Key.tsx
index d1e0f225..a16186cc 100644
--- a/src/shared/icons/components/Key.tsx
+++ b/src/shared/icons/components/Key.tsx
@@ -2,12 +2,12 @@ import type { SvgProps } from 'react-native-svg';
import Svg, { Path } from 'react-native-svg';
/* eslint-disable react/jsx-props-no-spreading */
-const Key = ({ color = '#0C0D0F', ...props }: SvgProps) => {
+const Key = ({ fill = '#0C0D0F', ...props }: SvgProps) => {
return (
);
diff --git a/src/shared/icons/components/LeftArrow.tsx b/src/shared/icons/components/LeftArrow.tsx
index 8871b915..85291b55 100644
--- a/src/shared/icons/components/LeftArrow.tsx
+++ b/src/shared/icons/components/LeftArrow.tsx
@@ -2,12 +2,12 @@ import type { SvgProps } from 'react-native-svg';
import Svg, { Path } from 'react-native-svg';
/* eslint-disable react/jsx-props-no-spreading */
-const LeftArrow = ({ color = '#0C0D0F', ...props }: SvgProps) => {
+const LeftArrow = ({ fill = '#0C0D0F', ...props }: SvgProps) => {
return (
);
diff --git a/src/shared/icons/components/User.tsx b/src/shared/icons/components/User.tsx
index c155cb4e..44fc05ff 100644
--- a/src/shared/icons/components/User.tsx
+++ b/src/shared/icons/components/User.tsx
@@ -2,12 +2,12 @@ import type { SvgProps } from 'react-native-svg';
import Svg, { Path } from 'react-native-svg';
/* eslint-disable react/jsx-props-no-spreading */
-const User = ({ color = '#0C0D0F', ...props }: SvgProps) => {
+const User = ({ fill = '#0C0D0F', ...props }: SvgProps) => {
return (
);
diff --git a/src/shared/uiKit/button/components/InnerIcon.tsx b/src/shared/uiKit/button/components/InnerIcon.tsx
index f1beef28..78c24655 100644
--- a/src/shared/uiKit/button/components/InnerIcon.tsx
+++ b/src/shared/uiKit/button/components/InnerIcon.tsx
@@ -30,7 +30,7 @@ export const InnerIcon = ({
name={iconName}
height={iconSize}
width={iconSize}
- color={theme.colors[getTextColor(parentVariant)]}
+ fill={theme.colors[getTextColor(parentVariant)]}
testID={testID}
/>
);
diff --git a/src/shared/uiKit/input/Input.tsx b/src/shared/uiKit/input/Input.tsx
index dde267bc..4993e98f 100644
--- a/src/shared/uiKit/input/Input.tsx
+++ b/src/shared/uiKit/input/Input.tsx
@@ -62,7 +62,7 @@ export const Input = ({