diff --git a/.gitignore b/.gitignore
index bbf7688..5a3e6af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,9 @@ local.properties
 *.keystore
 !debug.keystore
 
+# sonar scan
+.scannerwork
+
 # node.js
 #
 node_modules/
diff --git a/App.tsx b/App.tsx
index 486e2a3..c9f3536 100644
--- a/App.tsx
+++ b/App.tsx
@@ -1,13 +1,21 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { SafeAreaView, ScrollView } from 'react-native';
-import { Container, ThemeProvider } from './src/packages/react-native-material-elements';
+import { Container, SegmentedControl, ThemeProvider } from './src/packages/react-native-material-elements';
 
 function App(): React.JSX.Element {
+  const [index, setIndex] = useState<number>(0);
+
   return (
     <ThemeProvider>
       <SafeAreaView>
         <ScrollView>
-          <Container />
+          <Container>
+            <SegmentedControl
+              data={['One', 'Two', 'Three', 'Four', 'Five']}
+              selectedIndex={index}
+              onChange={(_, _index) => setIndex(_index)}
+            />
+          </Container>
         </ScrollView>
       </SafeAreaView>
     </ThemeProvider>
diff --git a/jest.config.js b/jest.config.js
index 2f2e0f9..d8dd005 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -22,6 +22,8 @@ module.exports = {
     'babel.config.js',
   ],
 
+  testPathIgnorePatterns: ['/node_modules', '/e2e'],
+
   coverageReporters: ['html', 'text', 'lcov', 'text-summary'],
 
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node', 'mjs', 'svg', 'png'],
@@ -32,7 +34,7 @@ module.exports = {
   coverageThreshold: {
     global: {
       statements: 80,
-      branches: 75,
+      branches: 79,
       functions: 80,
       lines: 80,
     },
diff --git a/package.json b/package.json
index bf00d93..8c9c425 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
     "ios": "react-native run-ios",
     "lint": "eslint .",
     "start": "react-native start",
-    "test": "jest --coverage"
+    "test": "jest --coverage",
+    "sonar-scanner": "sonar-scanner"
   },
   "dependencies": {
     "lodash": "^4.17.21",
diff --git a/src/packages/react-native-material-elements/__test__/Button.test.tsx b/src/packages/react-native-material-elements/__test__/Button.test.tsx
index cb2994e..dc34171 100644
--- a/src/packages/react-native-material-elements/__test__/Button.test.tsx
+++ b/src/packages/react-native-material-elements/__test__/Button.test.tsx
@@ -1,7 +1,7 @@
 import { render as testRenderer, waitFor } from '@testing-library/react-native';
 import React from 'react';
 import { Text, View } from 'react-native';
-import { Button, green, lightBlue, primary, red, secondary, ThemeProvider, yellow } from '../src';
+import { Button, gray, green, lightBlue, primary, red, secondary, ThemeProvider, yellow } from '../src';
 import { fireEvent, render } from './test-utils';
 
 describe('Button', () => {
@@ -427,4 +427,35 @@ describe('Button', () => {
     const labelText = getByText(mockLabel);
     expect(labelText.props.style).toEqual(expect.objectContaining({ color: 'red', fontWeight: 100 }));
   });
+
+  it('should show the dark gray color of the text label when button color is lightGray', () => {
+    const { getByText } = render(<Button label="Save" buttonColor="lightGray" />);
+
+    const text = getByText('Save');
+    expect(text).toBeDefined();
+    expect(text.props.style.color).toEqual(gray[900]);
+  });
+
+  it('should show the dark gray color of the text label when button color is lightGray and button variant outlined ', () => {
+    const { getByText } = render(<Button label="Save" variation="outlined" buttonColor="lightGray" />);
+
+    const text = getByText('Save');
+    expect(text).toBeDefined();
+    expect(text.props.style.color).toEqual(gray[900]);
+  });
+
+  it('should render the loader when loading is passed', () => {
+    const { getByTestId } = render(<Button label="Save" loading />);
+
+    const loader = getByTestId('button-loader');
+    expect(loader).toBeDefined();
+  });
+
+  it('should show the dark color of the text label when button color is warning', () => {
+    const { getByText } = render(<Button label="Save" buttonColor="warning" />);
+
+    const text = getByText('Save');
+    expect(text).toBeDefined();
+    expect(text.props.style.color).toEqual(gray[900]);
+  });
 });
diff --git a/src/packages/react-native-material-elements/__test__/DropDown.test.tsx b/src/packages/react-native-material-elements/__test__/DropDown.test.tsx
index db60a29..d5a9e6a 100644
--- a/src/packages/react-native-material-elements/__test__/DropDown.test.tsx
+++ b/src/packages/react-native-material-elements/__test__/DropDown.test.tsx
@@ -9,6 +9,7 @@ describe('DropDown Component', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    jest.clearAllTimers();
   });
 
   it('should render correctly', async () => {
@@ -244,6 +245,7 @@ describe('DropDownListContainer component', () => {
   });
 
   it('should call the onClose function when press on item', () => {
+    jest.useFakeTimers();
     const { getByText } = render(
       <DropDownListContainer
         inputLayoutRectangle={{ x: 0, y: 0, width: 0, height: 0 }}
diff --git a/src/packages/react-native-material-elements/__test__/ModalContainer.test.tsx b/src/packages/react-native-material-elements/__test__/ModalContainer.test.tsx
index 2f71f5c..5ac5127 100644
--- a/src/packages/react-native-material-elements/__test__/ModalContainer.test.tsx
+++ b/src/packages/react-native-material-elements/__test__/ModalContainer.test.tsx
@@ -1,8 +1,12 @@
 import React from 'react';
-import { render } from './test-utils';
+import { fireEvent, render } from './test-utils';
 import { ModalContainer, Text } from '../src';
 
 describe('ModalContainer', () => {
+  const mockOnCloseHandler = jest.fn();
+
+  const mockTestId = 'mock-test-id';
+
   it('should render correctly with default props', () => {
     const { toJSON } = render(
       <ModalContainer>
@@ -21,4 +25,18 @@ describe('ModalContainer', () => {
     const element = getByText('Hello');
     expect(element).toBeDefined();
   });
+
+  it('should call the onClose function', () => {
+    const { getByTestId } = render(
+      <ModalContainer onClose={mockOnCloseHandler} rootWrapperTestID={mockTestId}>
+        <></>
+      </ModalContainer>,
+    );
+
+    const item = getByTestId(mockTestId);
+
+    fireEvent(item, 'press', { nativeEvent: {} });
+    expect(mockOnCloseHandler).toHaveBeenCalled();
+    expect(mockOnCloseHandler).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/src/packages/react-native-material-elements/__test__/Pagination.test.tsx b/src/packages/react-native-material-elements/__test__/Pagination.test.tsx
index 619bd33..78cb9b5 100644
--- a/src/packages/react-native-material-elements/__test__/Pagination.test.tsx
+++ b/src/packages/react-native-material-elements/__test__/Pagination.test.tsx
@@ -157,4 +157,16 @@ describe('Pagination Component', () => {
     expect(flattenedStyle.backgroundColor).toEqual('red');
     expect(flattenedStyle.borderWidth).toEqual(2);
   });
+
+  it('should show all the pagination item if count is less than or equal to the max visible items, show all pages', () => {
+    const { getByText } = render(<Pagination count={3} />);
+    const firstItem = getByText('1');
+    expect(firstItem).toBeDefined();
+
+    const secondItem = getByText('2');
+    expect(secondItem).toBeDefined();
+
+    const thirdItem = getByText('3');
+    expect(thirdItem).toBeDefined();
+  });
 });
diff --git a/src/packages/react-native-material-elements/__test__/ProgressBar.test.tsx b/src/packages/react-native-material-elements/__test__/ProgressBar.test.tsx
new file mode 100644
index 0000000..5f4dca6
--- /dev/null
+++ b/src/packages/react-native-material-elements/__test__/ProgressBar.test.tsx
@@ -0,0 +1,15 @@
+import { ProgressBar } from '../src';
+import { render } from './test-utils';
+
+describe('ProgressBar component', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render correctly with default props', () => {
+    jest.useFakeTimers();
+    const { toJSON } = render(<ProgressBar progress={0.2} />);
+    expect(toJSON()).toMatchSnapshot();
+    jest.clearAllTimers();
+  });
+});
diff --git a/src/packages/react-native-material-elements/__test__/Radio.test.tsx b/src/packages/react-native-material-elements/__test__/Radio.test.tsx
index fb2694e..a6b25c9 100644
--- a/src/packages/react-native-material-elements/__test__/Radio.test.tsx
+++ b/src/packages/react-native-material-elements/__test__/Radio.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { fireEvent, render, waitFor } from './test-utils';
-import { Radio, Text } from '../src';
+import { Radio, RadioCircle, Text } from '../src';
 import { View } from 'react-native';
+import { RADIO_LARGE, RADIO_MEDIUM, RADIO_SMALL } from '../src/components/Radio/constants';
 
 describe('Radio Component', () => {
   const mockRadioBaseButtonTestId = 'radio-base-button-test-id';
@@ -92,4 +93,110 @@ describe('Radio Component', () => {
     expect(queryByText('mock-label')).toBeNull();
     expect(queryByText('mock-description')).toBeNull();
   });
+
+  it('should render the divider component', () => {
+    const { getByTestId } = render(<Radio showDivider dividerProps={{ testID: 'divider' }} />);
+
+    const divider = getByTestId('divider');
+    expect(divider).toBeDefined();
+  });
+
+  it('should call the onPress function when click on the label component', () => {
+    const { getByText } = render(<Radio onPress={mockOnPress} actionType="root" label="label" />);
+
+    const label = getByText('label');
+    expect(label).toBeDefined();
+
+    fireEvent(label, 'press', { nativeEvent: {} });
+
+    expect(mockOnPress).toHaveBeenCalled();
+    expect(mockOnPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('should call the onPress function when click on the radio button', () => {
+    const { getByTestId } = render(<Radio onPress={mockOnPress} radioBaseButtonTestId={mockRadioBaseButtonTestId} />);
+
+    const radio = getByTestId(mockRadioBaseButtonTestId);
+
+    expect(radio).toBeDefined();
+
+    fireEvent(radio, 'press', { nativeEvent: {} });
+
+    expect(mockOnPress).toHaveBeenCalled();
+    expect(mockOnPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('should render the custom radio item if radio isActive', () => {
+    const { getByText } = render(<Radio isActive radioItem={<Text>Hello</Text>} />);
+    const text = getByText('Hello');
+    expect(text).toBeDefined();
+  });
+
+  it('should render the start adornment component', () => {
+    const { getByText } = render(<Radio adornment={<Text>Hello</Text>} adornmentType="start" />);
+
+    const text = getByText('Hello');
+    expect(text).toBeDefined();
+  });
+
+  it('should render the start adornment divider component', () => {
+    const { getByTestId } = render(
+      <Radio showDivider dividerProps={{ testID: 'divider-test-id' }} adornment={<Text>Hello</Text>} adornmentType="start" />,
+    );
+
+    const divider = getByTestId('divider-test-id');
+    expect(divider).toBeDefined();
+  });
+
+  it('should render active radio item when radio is active', () => {
+    jest.useFakeTimers();
+    const { getByTestId } = render(<Radio isActive />);
+    const radioItem = getByTestId('radio-item-test-id');
+    expect(radioItem).toBeDefined();
+    jest.clearAllTimers();
+  });
+});
+
+describe('Radio Circle', () => {
+  const testID = 'mock-test-id';
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render small divider component', () => {
+    const { getByTestId } = render(<RadioCircle size="small" testID={testID} />);
+
+    const radio = getByTestId(testID);
+
+    expect(radio).toBeDefined();
+    expect(radio.props.style.width).toEqual(RADIO_SMALL);
+  });
+
+  it('should render medium radioCircle component', () => {
+    const { getByTestId } = render(<RadioCircle size="medium" testID={testID} />);
+
+    const radio = getByTestId(testID);
+
+    expect(radio).toBeDefined();
+    expect(radio.props.style.width).toEqual(RADIO_MEDIUM);
+  });
+
+  it('should render large radioCircle component', () => {
+    const { getByTestId } = render(<RadioCircle size="large" testID={testID} />);
+
+    const radio = getByTestId(testID);
+
+    expect(radio).toBeDefined();
+    expect(radio.props.style.width).toEqual(RADIO_LARGE);
+  });
+
+  it('should render small radioCircle component when invalid size passed', () => {
+    const { getByTestId } = render(<RadioCircle size={'invalid' as any} testID={testID} />);
+
+    const radio = getByTestId(testID);
+
+    expect(radio).toBeDefined();
+    expect(radio.props.style.width).toEqual(RADIO_SMALL);
+  });
 });
diff --git a/src/packages/react-native-material-elements/__test__/SegmentedControl.test.tsx b/src/packages/react-native-material-elements/__test__/SegmentedControl.test.tsx
index b49d539..1723f28 100644
--- a/src/packages/react-native-material-elements/__test__/SegmentedControl.test.tsx
+++ b/src/packages/react-native-material-elements/__test__/SegmentedControl.test.tsx
@@ -1,9 +1,14 @@
+import { StyleSheet } from 'react-native';
 import { SegmentedControl } from '../src';
 import { SegmentedControlContainer } from '../src/components/SegmentedControl/SegmentedControlContainer';
 import { SegmentedControlItem } from '../src/components/SegmentedControl/SegmentedControlItem';
 import { fireEvent, render } from './test-utils';
 
 describe('SegmentedControl component', () => {
+  const mockSegmentedControllerTestId = 'mock-segmented-item-test-id';
+
+  const mockOnPress = jest.fn();
+
   beforeEach(() => {
     jest.clearAllMocks();
   });
@@ -12,6 +17,92 @@ describe('SegmentedControl component', () => {
     const { toJSON } = render(<SegmentedControl data={['']} selectedIndex={0} />);
     expect(toJSON()).toMatchSnapshot();
   });
+
+  it('should call the onChange function', () => {
+    const { getByTestId } = render(
+      <SegmentedControl
+        data={['First', 'Second']}
+        selectedIndex={0}
+        segmentedControlItemTestId={mockSegmentedControllerTestId}
+        onChange={mockOnPress}
+      />,
+    );
+
+    const firstItem = getByTestId(`${mockSegmentedControllerTestId}-0`);
+
+    fireEvent(firstItem, 'press', { nativeEvent: {} });
+
+    expect(firstItem).toBeDefined();
+    expect(mockOnPress).toHaveBeenCalled();
+    expect(mockOnPress).toHaveBeenCalledTimes(1);
+  });
+
+  it('should apply the correct segmentTextStyle', () => {
+    const { getByText } = render(
+      <SegmentedControl data={['First', 'Second']} selectedIndex={0} segmentTextStyle={{ color: 'red' }} />,
+    );
+
+    const firstItem = getByText('First');
+    expect(firstItem).toBeDefined();
+
+    expect(firstItem.props.style.color).toEqual('red');
+
+    const secondItem = getByText('Second');
+    expect(secondItem).toBeDefined();
+
+    expect(secondItem.props.style.color).toEqual('red');
+  });
+
+  it('should apply the correct segmentTextStyle to specific item', () => {
+    const { getByText } = render(
+      <SegmentedControl
+        data={['First', 'Second']}
+        selectedIndex={0}
+        segmentTextStyle={{ color: 'red' }}
+        applySegmentItemTextStyleIndex={0}
+      />,
+    );
+
+    const firstItem = getByText('First');
+    expect(firstItem).toBeDefined();
+
+    expect(firstItem.props.style.color).toEqual('red');
+  });
+
+  it('should apply the segmentItemStyles', () => {
+    const { getByTestId } = render(
+      <SegmentedControl
+        data={['First', 'Second']}
+        selectedIndex={0}
+        segmentItemStyles={{ backgroundColor: 'red' }}
+        segmentedControlItemTestId={mockSegmentedControllerTestId}
+      />,
+    );
+
+    const segmentedFirstItem = getByTestId(`${mockSegmentedControllerTestId}-0`);
+    const firstItemStyles = StyleSheet.flatten(segmentedFirstItem.props.style);
+    expect(firstItemStyles).toEqual(expect.objectContaining({ backgroundColor: 'red' }));
+
+    const segmentedSecondItem = getByTestId(`${mockSegmentedControllerTestId}-0`);
+    const secondItemStyles = StyleSheet.flatten(segmentedSecondItem.props.style);
+    expect(secondItemStyles).toEqual(expect.objectContaining({ backgroundColor: 'red' }));
+  });
+
+  it('should apply the segmentItemStyles', () => {
+    const { getByTestId } = render(
+      <SegmentedControl
+        data={['First', 'Second']}
+        selectedIndex={0}
+        segmentItemStyles={{ backgroundColor: 'red' }}
+        segmentedControlItemTestId={mockSegmentedControllerTestId}
+        applySegmentItemStyleIndex={0}
+      />,
+    );
+
+    const segmentedFirstItem = getByTestId(`${mockSegmentedControllerTestId}-0`);
+    const firstItemStyles = StyleSheet.flatten(segmentedFirstItem.props.style);
+    expect(firstItemStyles).toEqual(expect.objectContaining({ backgroundColor: 'red' }));
+  });
 });
 
 describe('SegmentedControlContainer component', () => {
diff --git a/src/packages/react-native-material-elements/__test__/Switch.test.tsx b/src/packages/react-native-material-elements/__test__/Switch.test.tsx
index 71add79..39f9b98 100644
--- a/src/packages/react-native-material-elements/__test__/Switch.test.tsx
+++ b/src/packages/react-native-material-elements/__test__/Switch.test.tsx
@@ -22,7 +22,7 @@ import {
   SWITCH_THUMB_WIDTH_MEDIUM,
   SWITCH_THUMB_WIDTH_SMALL,
 } from '../src';
-import { fireEvent, render, waitFor } from './test-utils';
+import { fireEvent, render } from './test-utils';
 
 describe('Switch Component', () => {
   const switchMockTestId = 'switch-test-id';
@@ -33,11 +33,9 @@ describe('Switch Component', () => {
     jest.clearAllMocks();
   });
 
-  it('should match the snapshot with default props', async () => {
+  it('should match the snapshot with default props', () => {
     const { toJSON } = render(<Switch />);
-    await waitFor(() => {
-      expect(toJSON()).toMatchSnapshot();
-    });
+    expect(toJSON()).toMatchSnapshot();
   });
 
   it('should forward ref correctly', () => {
diff --git a/src/packages/react-native-material-elements/__test__/V2ThemeContext.test.tsx b/src/packages/react-native-material-elements/__test__/V2ThemeContext.test.tsx
index 1cdb0a8..e3a4912 100644
--- a/src/packages/react-native-material-elements/__test__/V2ThemeContext.test.tsx
+++ b/src/packages/react-native-material-elements/__test__/V2ThemeContext.test.tsx
@@ -96,6 +96,7 @@ describe('V2ThemeContext', () => {
     });
 
     it('should throw error when used outside ThemeProvider', () => {
+      const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
       try {
         renderHook(useTheme);
       } catch (error) {
@@ -104,6 +105,7 @@ describe('V2ThemeContext', () => {
           expect(error?.message).toBe('Theme context must be used within a ThemeProvider');
         }
       }
+      consoleSpy.mockRestore();
     });
   });
 });
diff --git a/src/packages/react-native-material-elements/__test__/__snapshots__/ProgressBar.test.tsx.snap b/src/packages/react-native-material-elements/__test__/__snapshots__/ProgressBar.test.tsx.snap
new file mode 100644
index 0000000..35921c3
--- /dev/null
+++ b/src/packages/react-native-material-elements/__test__/__snapshots__/ProgressBar.test.tsx.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ProgressBar component should render correctly with default props 1`] = `
+<View
+  accessible={true}
+  onLayout={[Function]}
+>
+  <View
+    collapsable={false}
+    style={
+      {
+        "borderColor": "#03A9F4",
+        "borderRadius": 3,
+        "borderWidth": 0.6,
+        "height": 9,
+        "overflow": "hidden",
+      }
+    }
+  />
+</View>
+`;
diff --git a/src/packages/react-native-material-elements/__test__/__snapshots__/Radio.test.tsx.snap b/src/packages/react-native-material-elements/__test__/__snapshots__/Radio.test.tsx.snap
index fd99153..759aa85 100644
--- a/src/packages/react-native-material-elements/__test__/__snapshots__/Radio.test.tsx.snap
+++ b/src/packages/react-native-material-elements/__test__/__snapshots__/Radio.test.tsx.snap
@@ -96,6 +96,7 @@ exports[`Radio Component should render correctly 1`] = `
                 "width": 18,
               }
             }
+            testID="radio-item-test-id"
           />
         </View>
       </View>
diff --git a/src/packages/react-native-material-elements/__test__/__snapshots__/SegmentedControl.test.tsx.snap b/src/packages/react-native-material-elements/__test__/__snapshots__/SegmentedControl.test.tsx.snap
index 4b6247c..4b55a89 100644
--- a/src/packages/react-native-material-elements/__test__/__snapshots__/SegmentedControl.test.tsx.snap
+++ b/src/packages/react-native-material-elements/__test__/__snapshots__/SegmentedControl.test.tsx.snap
@@ -104,6 +104,7 @@ exports[`SegmentedControl component should render correctly with default props 1
             "zIndex": 10,
           }
         }
+        testID="segmented-item-0"
       >
         <Text
           collapsable={false}
diff --git a/src/packages/react-native-material-elements/__test__/useThemedProps.test.tsx b/src/packages/react-native-material-elements/__test__/useThemedProps.test.tsx
index 4ec93a8..eb4a494 100644
--- a/src/packages/react-native-material-elements/__test__/useThemedProps.test.tsx
+++ b/src/packages/react-native-material-elements/__test__/useThemedProps.test.tsx
@@ -7,12 +7,16 @@ import { green } from '../src';
 import { Theme } from '../src/libraries/types';
 
 describe('useThemedProps', () => {
+  beforeAll(() => {
+    jest.spyOn(console, 'warn').mockImplementation(() => {});
+  });
+
   it('should match icon component snapshot correctly', () => {
     const props = {
       icon: () => <View />,
     };
     const { result } = renderHook(() => useThemedProps(props), { wrapper: ThemeWrapper });
-    const { toJSON } = render(result.current.icon);
+    const { toJSON } = render(result.current.icon as any);
     expect(toJSON()).toMatchSnapshot();
   });
 
@@ -41,7 +45,7 @@ describe('useThemedProps', () => {
     const props = {};
     const { result } = renderHook(() => useThemedProps(props), { wrapper: ThemeWrapper });
 
-    expect(result.current.icon).toBeUndefined();
+    expect(result.current.icon as any).toBeUndefined();
   });
 
   it('should support label as a ReactNode', () => {
@@ -82,7 +86,7 @@ describe('useThemedProps', () => {
 
     const { result } = renderHook(() => useThemedProps(props), { wrapper: ThemeWrapper });
 
-    const iconComponent = result.current.icon;
+    const iconComponent = result.current.icon as any;
 
     expect(iconComponent).toBeDefined();
     expect(iconComponent.props.style.backgroundColor).toEqual(green[500]);
@@ -96,7 +100,7 @@ describe('useThemedProps', () => {
 
     const iconComponent = result.current.icon;
     expect(iconComponent).toBeDefined();
-    const { toJSON } = render(iconComponent);
+    const { toJSON } = render(iconComponent as any);
     expect(toJSON()).toMatchSnapshot();
   });
 
@@ -188,15 +192,9 @@ describe('useThemedProps', () => {
 
   it('should warn if icon is a primitive value', () => {
     const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
-
-    const props = {
-      icon: 'not-a-component' as any,
-    };
-
+    const props = { icon: 'not-a-component' as any };
     renderHook(() => useThemedProps(props), { wrapper: ThemeWrapper });
-
     expect(warnSpy).toHaveBeenCalledWith('icon prop must be either <Icon /> or () => <Icon />. Other values are not valid.');
-
     warnSpy.mockRestore();
   });
 
@@ -206,11 +204,8 @@ describe('useThemedProps', () => {
     const props = {
       icon: { something: true } as any,
     };
-
     renderHook(() => useThemedProps(props), { wrapper: ThemeWrapper });
-
     expect(warnSpy).toHaveBeenCalledWith('icon prop must be either <Icon /> or () => <Icon />. Other values are not valid.');
-
     warnSpy.mockRestore();
   });
 
diff --git a/src/packages/react-native-material-elements/__test__/utils.test.ts b/src/packages/react-native-material-elements/__test__/utils.test.ts
index 980a103..a9a0dc7 100644
--- a/src/packages/react-native-material-elements/__test__/utils.test.ts
+++ b/src/packages/react-native-material-elements/__test__/utils.test.ts
@@ -1,34 +1,6 @@
 import _ from 'lodash';
 import { StyleProp, ViewStyle } from 'react-native';
-import { defaultLightTheme, generateUniqueId, getVariant, gutter, maxLength, merge } from '../src';
-
-describe('generateUniqueId', () => {
-  it('should return a non-empty string', () => {
-    const id = generateUniqueId();
-    expect(typeof id).toBe('string');
-    expect(id.length).toBeGreaterThan(0);
-  });
-
-  it('should include a timestamp and a random string separated by a hyphen', () => {
-    const id = generateUniqueId();
-    const parts = id.split('-');
-
-    expect(parts.length).toBe(2);
-    expect(parts[0]).toMatch(/^[a-z0-9]+$/);
-    expect(parts[1]).toMatch(/^[a-z0-9]{5}$/);
-  });
-
-  it('should generate different ids on multiple calls', () => {
-    const id1 = generateUniqueId();
-    const id2 = generateUniqueId();
-    expect(id1).not.toBe(id2);
-  });
-
-  it('should generate id containing base36 characters only', () => {
-    const id = generateUniqueId();
-    expect(id).toMatch(/^[a-z0-9]+-[a-z0-9]+$/);
-  });
-});
+import { defaultLightTheme, getVariant, gutter, maxLength, merge } from '../src';
 
 describe('maxLength', () => {
   it('should return the original text if its length is less than the max length', () => {
diff --git a/src/packages/react-native-material-elements/src/components/Accordion/AccordionSummary.tsx b/src/packages/react-native-material-elements/src/components/Accordion/AccordionSummary.tsx
index e08f224..0e63c83 100644
--- a/src/packages/react-native-material-elements/src/components/Accordion/AccordionSummary.tsx
+++ b/src/packages/react-native-material-elements/src/components/Accordion/AccordionSummary.tsx
@@ -100,9 +100,6 @@ export const AccordionSummary = React.forwardRef<View, AccordionSummaryProps>(
             easing: Easing.ease,
             useNativeDriver: false,
           }),
-        );
-
-        animations.push(
           Animated.timing(accordionDetailsOpacityValue, {
             toValue: isActive ? 1 : 0,
             duration: accordionDetailsOpacityDuration,
diff --git a/src/packages/react-native-material-elements/src/components/Alert/Alert.tsx b/src/packages/react-native-material-elements/src/components/Alert/Alert.tsx
index 9b088bc..03ba63f 100644
--- a/src/packages/react-native-material-elements/src/components/Alert/Alert.tsx
+++ b/src/packages/react-native-material-elements/src/components/Alert/Alert.tsx
@@ -1,46 +1,11 @@
 import React, { useMemo } from 'react';
-import { ColorSchemeName, StyleSheet, TextStyle, useColorScheme, View, ViewStyle } from 'react-native';
-import { ThemedIconProp, useThemedProps } from '../../hooks';
+import { StyleSheet, useColorScheme, View } from 'react-native';
+import { useThemedProps } from '../../hooks';
 import { useThemeColorsSelector } from '../../libraries';
-import { Theme } from '../../libraries/types';
-import { VariantTypes } from '../../utils';
 import { Box } from '../Box';
-import { BoxProps } from '../types';
 import { Text } from '../Typography';
 import { getAlertContainerStyles, getAlertTitleStyles } from './utils';
-
-export interface AlertProps extends BoxProps {
-  /** Main title text displayed in the alert */
-  title?: string;
-  /** Custom styles applied to the title text */
-  titleStyles?: TextStyle;
-  /** Optional subtitle or description below the title */
-  subTitle?: string;
-  /** Custom styles applied to the subtitle text */
-  subTitleStyles?: TextStyle;
-  /** Type of alert variant (e.g., success, error, warning) */
-  variant?: VariantTypes;
-  /** Optional action element (e.g., button or link) displayed inside the alert */
-  action?: React.ReactNode;
-  /** Defines the visual style of the alert: 'filled' for solid background, 'outlined' for bordered */
-  variation?: 'filled' | 'outlined';
-  /** Maximum length of the title text, useful for truncating or layout adjustment */
-  titleMixLength?: number;
-  /** Optional icon displayed at the start (left) of the alert */
-  startIcon?: ThemedIconProp;
-  /** Custom styles for the container wrapping the start icon */
-  startIconContainerStyles?: ViewStyle;
-  /** Optional icon displayed at the end (right) of the alert */
-  endIcon?: ThemedIconProp;
-  /** Custom styles for the container wrapping the end icon */
-  endIconContainerStyles?: ViewStyle;
-}
-export interface GetAlertContainerStylesParams extends Pick<AlertProps, 'variant' | 'variation'> {
-  colors: Theme;
-}
-export interface GetAlertTitleStylesParams extends Pick<AlertProps, 'variant' | 'variation'> {
-  colorScheme: ColorSchemeName;
-}
+import { AlertProps } from './Alert.types';
 
 export const Alert = React.forwardRef<View, AlertProps>(
   (
diff --git a/src/packages/react-native-material-elements/src/components/Alert/Alert.types.d.ts b/src/packages/react-native-material-elements/src/components/Alert/Alert.types.d.ts
new file mode 100644
index 0000000..0e90fd6
--- /dev/null
+++ b/src/packages/react-native-material-elements/src/components/Alert/Alert.types.d.ts
@@ -0,0 +1,38 @@
+import { ColorSchemeName, TextStyle, ViewStyle } from 'react-native';
+import { BoxProps } from '../types';
+import { VariantTypes } from '../../utils';
+import { ThemedIconProp } from '../../hooks';
+import { Theme } from '../../libraries/types';
+
+export interface AlertProps extends BoxProps {
+  /** Main title text displayed in the alert */
+  title?: string;
+  /** Custom styles applied to the title text */
+  titleStyles?: TextStyle;
+  /** Optional subtitle or description below the title */
+  subTitle?: string;
+  /** Custom styles applied to the subtitle text */
+  subTitleStyles?: TextStyle;
+  /** Type of alert variant (e.g., success, error, warning) */
+  variant?: VariantTypes;
+  /** Optional action element (e.g., button or link) displayed inside the alert */
+  action?: React.ReactNode;
+  /** Defines the visual style of the alert: 'filled' for solid background, 'outlined' for bordered */
+  variation?: 'filled' | 'outlined';
+  /** Maximum length of the title text, useful for truncating or layout adjustment */
+  titleMixLength?: number;
+  /** Optional icon displayed at the start (left) of the alert */
+  startIcon?: ThemedIconProp;
+  /** Custom styles for the container wrapping the start icon */
+  startIconContainerStyles?: ViewStyle;
+  /** Optional icon displayed at the end (right) of the alert */
+  endIcon?: ThemedIconProp;
+  /** Custom styles for the container wrapping the end icon */
+  endIconContainerStyles?: ViewStyle;
+}
+export interface GetAlertContainerStylesParams extends Pick<AlertProps, 'variant' | 'variation'> {
+  colors: Theme;
+}
+export interface GetAlertTitleStylesParams extends Pick<AlertProps, 'variant' | 'variation'> {
+  colorScheme: ColorSchemeName;
+}
diff --git a/src/packages/react-native-material-elements/src/components/Alert/utils.ts b/src/packages/react-native-material-elements/src/components/Alert/utils.ts
index 44a0c87..dd9aadb 100644
--- a/src/packages/react-native-material-elements/src/components/Alert/utils.ts
+++ b/src/packages/react-native-material-elements/src/components/Alert/utils.ts
@@ -1,7 +1,7 @@
 import { TextStyle, ViewStyle } from 'react-native';
-import { GetAlertContainerStylesParams, GetAlertTitleStylesParams } from './Alert';
 import { getVariant } from '../../utils';
 import { gray } from '../../libraries';
+import { GetAlertContainerStylesParams, GetAlertTitleStylesParams } from './Alert.types';
 
 export const getAlertContainerStyles = ({ colors, variant, variation }: GetAlertContainerStylesParams): ViewStyle => {
   const variantColor = getVariant({ variant, colors });
@@ -21,10 +21,10 @@ export const getAlertTitleStyles = ({ variant, variation, colorScheme }: GetAler
   const isLight = colorScheme === 'light';
 
   const isWarningVariant = variant === 'warning';
-  const islightGrayVariant = variant === 'lightGray';
+  const isLightGrayVariant = variant === 'lightGray';
   const isOutlinedAlert = variation === 'outlined';
 
-  if (islightGrayVariant && isLight) {
+  if (isLightGrayVariant && isLight) {
     return { color: gray[900] };
   }
 
diff --git a/src/packages/react-native-material-elements/src/components/Badge/Badge.tsx b/src/packages/react-native-material-elements/src/components/Badge/Badge.tsx
index 267115e..18bc2b4 100644
--- a/src/packages/react-native-material-elements/src/components/Badge/Badge.tsx
+++ b/src/packages/react-native-material-elements/src/components/Badge/Badge.tsx
@@ -83,7 +83,7 @@ export const Badge = React.forwardRef<View, BadgeProps>(
         }
 
         if (typeof content === 'object') {
-          throw new Error('Badge content must be a string or number');
+          throw new TypeError('Badge content must be a string or number');
         }
       },
       // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -96,7 +96,7 @@ export const Badge = React.forwardRef<View, BadgeProps>(
 
         const textStyles = StyleSheet.flatten([styles.badgeContent, badgeContentDefaultStyles({ variation }), badgeContentStyle]);
 
-        if (isNaN(badgeNumber)) {
+        if (Number.isNaN(badgeNumber)) {
           return <Text style={textStyles}>{content}</Text>;
         }
 
diff --git a/src/packages/react-native-material-elements/src/components/Button/Button.tsx b/src/packages/react-native-material-elements/src/components/Button/Button.tsx
index 7b9be55..b228b0b 100644
--- a/src/packages/react-native-material-elements/src/components/Button/Button.tsx
+++ b/src/packages/react-native-material-elements/src/components/Button/Button.tsx
@@ -44,6 +44,7 @@ export const Button = React.forwardRef<View, ButtonProps>(
       overrideRootRippleEdge = false,
       buttonColor = 'secondary',
       variation = 'contained',
+      loaderTestId = 'button-loader',
       square = false,
       overrideRootSquareConfig = false,
       ...props
@@ -199,6 +200,7 @@ export const Button = React.forwardRef<View, ButtonProps>(
             color={_loadingIndicatorColor}
             switchMode={switchSpinnerMode}
             size={loadingIndicatorSize}
+            testID={loaderTestId}
           />
         );
       }
diff --git a/src/packages/react-native-material-elements/src/components/Button/Button.types.d.ts b/src/packages/react-native-material-elements/src/components/Button/Button.types.d.ts
index 42964e7..1513630 100644
--- a/src/packages/react-native-material-elements/src/components/Button/Button.types.d.ts
+++ b/src/packages/react-native-material-elements/src/components/Button/Button.types.d.ts
@@ -92,6 +92,10 @@ export interface ButtonProps extends Omit<BaseButtonProps, 'sx'> {
    * show the loading indicator when the button is clicked
    */
   loading?: boolean;
+  /**
+   * loader test id
+   */
+  loaderTestId?: string;
   /**
    * Button label
    */
diff --git a/src/packages/react-native-material-elements/src/components/Grid/FlatGird.tsx b/src/packages/react-native-material-elements/src/components/Grid/FlatGird.tsx
index 72d00ea..f5ab6a3 100644
--- a/src/packages/react-native-material-elements/src/components/Grid/FlatGird.tsx
+++ b/src/packages/react-native-material-elements/src/components/Grid/FlatGird.tsx
@@ -11,7 +11,9 @@ export interface FlatGirdProps<T> extends Omit<FlatListProps<T>, 'renderItem'> {
 export const FlatGrid = <T,>({ data, numColumns = 2, spacing = 0, renderItem, ...flatListProps }: FlatGirdProps<T>) => {
   const renderGridItem = (info: ListRenderItemInfo<T>) => {
     return (
-      <View style={[styles.gridItem, { width: `${100 / numColumns}%`, padding: spacing }]}>{renderItem && renderItem(info)}</View>
+      <View style={[styles.gridItem, { width: `${100 / numColumns}%`, padding: spacing }]}>
+        {renderItem ? renderItem(info) : null}
+      </View>
     );
   };
 
diff --git a/src/packages/react-native-material-elements/src/components/List/List.style.ts b/src/packages/react-native-material-elements/src/components/List/List.style.ts
index 22447b4..1e69caf 100644
--- a/src/packages/react-native-material-elements/src/components/List/List.style.ts
+++ b/src/packages/react-native-material-elements/src/components/List/List.style.ts
@@ -66,9 +66,15 @@ export const listItemContainerStyles = ({
   const defaultBgColor = colors.gray[50];
   const selectedBgColor = selectedColor ?? colors.gray[100];
 
-  let baseStyles: ViewStyle = {
-    backgroundColor: selected ? selectedBgColor : showDefaultBg ? defaultBgColor : 'transparent',
-  };
+  let baseStyles: ViewStyle = {};
+
+  if (selected) {
+    baseStyles.backgroundColor = selectedBgColor;
+  } else if (showDefaultBg) {
+    baseStyles.backgroundColor = defaultBgColor;
+  } else {
+    baseStyles.backgroundColor = 'transparent';
+  }
 
   if (showOutline) {
     baseStyles.borderWidth = outlineWidth ?? 1;
diff --git a/src/packages/react-native-material-elements/src/components/Radio/Radio.tsx b/src/packages/react-native-material-elements/src/components/Radio/Radio.tsx
index 78266c8..b894e94 100644
--- a/src/packages/react-native-material-elements/src/components/Radio/Radio.tsx
+++ b/src/packages/react-native-material-elements/src/components/Radio/Radio.tsx
@@ -137,6 +137,10 @@ export interface RadioProps extends ViewProps, BaseInterface, StyledProps {
    * Customize the divider component.
    */
   dividerProps?: DividerProps;
+  /**
+   * Radio item test id
+   */
+  radioItemTestId?: string;
 }
 
 export const Radio = React.forwardRef<View, RadioProps>(
@@ -166,6 +170,7 @@ export const Radio = React.forwardRef<View, RadioProps>(
       variant = 'info',
       actionType = 'element',
       adornmentType = 'end',
+      radioItemTestId = 'radio-item-test-id',
       ...props
     },
     ref,
@@ -176,7 +181,7 @@ export const Radio = React.forwardRef<View, RadioProps>(
     const { sizeConfig: themeSizeConfig = sizeConfig } = radioThemeConfig || {};
 
     const radioOnPressHandler = (event: GestureResponderEvent) => {
-      if (!!onPress && typeof onPress === 'function') {
+      if (onPress) {
         onPress(event);
       }
     };
@@ -270,6 +275,7 @@ export const Radio = React.forwardRef<View, RadioProps>(
                   size={size}
                   sizeConfig={themeSizeConfig}
                   activeColor={activeColor}
+                  testID={radioItemTestId}
                 />
               )}
             </RadioOutline>
@@ -311,7 +317,7 @@ const RadioOutline: React.FC<RadioOutlineProps> = ({ style, isActive, children,
   );
 };
 
-const RadioCircle: React.FC<RadioCircleProps> = ({
+export const RadioCircle: React.FC<RadioCircleProps> = ({
   style,
   variant,
   isActive,
diff --git a/src/packages/react-native-material-elements/src/components/Ripple/Ripple.tsx b/src/packages/react-native-material-elements/src/components/Ripple/Ripple.tsx
index 5cc4e4d..5723f4f 100644
--- a/src/packages/react-native-material-elements/src/components/Ripple/Ripple.tsx
+++ b/src/packages/react-native-material-elements/src/components/Ripple/Ripple.tsx
@@ -1,6 +1,5 @@
 import React, { useImperativeHandle, useMemo, useState } from 'react';
 import { Animated, Easing, LayoutRectangle, StyleSheet, useColorScheme, View, ViewStyle } from 'react-native';
-import { generateUniqueId } from '../../utils';
 import { RIPPLE_DURATION, RIPPLE_RADIUS, RIPPLE_SIZE } from './constants';
 import { RippleInterface, RippleObject, RipplePosition, RippleProps, onRippleAnimationType } from './Ripple.types';
 
@@ -58,7 +57,7 @@ export const Ripple = React.forwardRef<RippleInterface, RippleProps>(
         positionX: positionX - RIPPLE_SIZE / 2,
         positionY: positionY - RIPPLE_SIZE / 2,
         radius: RIPPLE_RADIUS,
-        id: generateUniqueId(),
+        id: Date.now(),
       };
 
       let animation = Animated.timing(ripple.progress, {
diff --git a/src/packages/react-native-material-elements/src/components/Ripple/Ripple.types.d.ts b/src/packages/react-native-material-elements/src/components/Ripple/Ripple.types.d.ts
index cce880b..82a366c 100644
--- a/src/packages/react-native-material-elements/src/components/Ripple/Ripple.types.d.ts
+++ b/src/packages/react-native-material-elements/src/components/Ripple/Ripple.types.d.ts
@@ -23,7 +23,7 @@ export interface RippleObject {
   /**
    * Unique identifier for the ripple object
    */
-  id: string;
+  id: number;
 }
 
 type RipplePosition = 'center' | 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight';
diff --git a/src/packages/react-native-material-elements/src/components/SegmentedControl/SegmentedControl.tsx b/src/packages/react-native-material-elements/src/components/SegmentedControl/SegmentedControl.tsx
index 846b0b4..cdd2eb8 100644
--- a/src/packages/react-native-material-elements/src/components/SegmentedControl/SegmentedControl.tsx
+++ b/src/packages/react-native-material-elements/src/components/SegmentedControl/SegmentedControl.tsx
@@ -48,6 +48,7 @@ export interface SegmentedControlProps
   applySegmentItemTextStyleIndex?: number;
   /** View styles for animated segment */
   animatedSegmentStyle?: ViewStyle;
+  segmentedControlItemTestId?: string;
 }
 
 export const SegmentedControl = ({
@@ -62,6 +63,7 @@ export const SegmentedControl = ({
   animatedSegmentStyle,
   segmentItemContainerStyles,
   selectedIndex = 0,
+  segmentedControlItemTestId = 'segmented-item',
   ...props
 }: SegmentedControlProps) => {
   const animatedSegmentWidth = useRef(new Animated.Value(0));
@@ -70,15 +72,11 @@ export const SegmentedControl = ({
 
   const colorScheme = useColorScheme();
 
-  const [selectedSegment, setSelectedSegment] = useState<Partial<SegmentedControlDataInterface>>(data[0]);
   const [segmentRect, setSegmentRect] = useState<LayoutRectangle | null>(null);
 
   const segmentedItemHandler = function (value: Partial<SegmentedControlDataInterface>, index: number) {
-    if (selectedSegment !== value) {
-      setSelectedSegment(value);
-      if (onChange) {
-        onChange(value, index);
-      }
+    if (onChange) {
+      onChange(value, index);
     }
   };
 
@@ -131,10 +129,6 @@ export const SegmentedControl = ({
         toValue: width * selectedIndex,
       }).start();
     }
-
-    if (selectedIndex && selectedIndex < data.length) {
-      setSelectedSegment(data[selectedIndex]);
-    }
   }, [segmentRect, selectedIndex, data]);
 
   return (
@@ -151,6 +145,7 @@ export const SegmentedControl = ({
             headingStyles={getSegmentItemHeadingStyle(index)}
             style={getSegmentItemStyle(index)}
             segmentItemContainerStyles={segmentItemContainerStyles}
+            testID={`${segmentedControlItemTestId}-${index}`}
           />
         ))}
       </View>
diff --git a/src/packages/react-native-material-elements/src/components/Snackbar/Snackbar.tsx b/src/packages/react-native-material-elements/src/components/Snackbar/Snackbar.tsx
index 2d5b39d..9d27dd3 100644
--- a/src/packages/react-native-material-elements/src/components/Snackbar/Snackbar.tsx
+++ b/src/packages/react-native-material-elements/src/components/Snackbar/Snackbar.tsx
@@ -164,7 +164,7 @@ export const Snackbar: React.FC<SnackbarProps> = ({
   }, [position, screenHeight]);
 
   const snackbarRootContainerOnLayout = (event: LayoutChangeEvent) => {
-    if (onLayout && typeof onLayout === 'function') {
+    if (onLayout) {
       onLayout(event);
     }
     const { layout } = event.nativeEvent;
diff --git a/src/packages/react-native-material-elements/src/components/TextField/TextField.tsx b/src/packages/react-native-material-elements/src/components/TextField/TextField.tsx
index fdd45cf..1d5c0ff 100644
--- a/src/packages/react-native-material-elements/src/components/TextField/TextField.tsx
+++ b/src/packages/react-native-material-elements/src/components/TextField/TextField.tsx
@@ -97,7 +97,7 @@ export const TextField = React.forwardRef<View, TextFieldProps>(
       height: textFieldFieldHeight,
     } = textFieldThemeConfig?.filled || {};
 
-    const placeHolderLeftPos = !isOutlined ? PLACEHOLDER_FILED_INPUT_LEFT_POSITION : PLACEHOLDER_OUTLINE_LEFT_POSITION;
+    const placeHolderLeftPos = isOutlined ? PLACEHOLDER_OUTLINE_LEFT_POSITION : PLACEHOLDER_FILED_INPUT_LEFT_POSITION;
     const shouldApplySquareShape = square ?? textFieldThemeConfig?.square ?? false;
 
     const getTextFiledHeight = () => {
diff --git a/src/packages/react-native-material-elements/src/components/TextField/TextFieldEndAdornment.tsx b/src/packages/react-native-material-elements/src/components/TextField/TextFieldEndAdornment.tsx
index c12be56..2053de1 100644
--- a/src/packages/react-native-material-elements/src/components/TextField/TextFieldEndAdornment.tsx
+++ b/src/packages/react-native-material-elements/src/components/TextField/TextFieldEndAdornment.tsx
@@ -27,16 +27,12 @@ const TextFieldEndAdornment: React.FC<TextFieldEndAdornmentProps> = ({
     return null;
   }
 
-  let element: React.ReactNode;
+  let element: React.ReactNode = null;
 
   if (endAdornment) {
     element = endAdornment;
-  } else {
-    if (showLoadingIndicatorWhenFocused && isFocused && loading) {
-      element = <ActivityIndicator {...loadingIndicatorProps} />;
-    } else if (!showLoadingIndicatorWhenFocused && loading) {
-      element = <ActivityIndicator {...loadingIndicatorProps} />;
-    }
+  } else if ((showLoadingIndicatorWhenFocused && isFocused && loading) || (!showLoadingIndicatorWhenFocused && loading)) {
+    element = <ActivityIndicator {...loadingIndicatorProps} />;
   }
 
   if (!element) {
diff --git a/src/packages/react-native-material-elements/src/hooks/useRestyle.ts b/src/packages/react-native-material-elements/src/hooks/useRestyle.ts
index c514303..c9c034b 100644
--- a/src/packages/react-native-material-elements/src/hooks/useRestyle.ts
+++ b/src/packages/react-native-material-elements/src/hooks/useRestyle.ts
@@ -1,14 +1,14 @@
 import React from 'react';
 import { StyledProps, StyleLike } from '../libraries/style/styleTypes';
 
-export const useRestyle = <T>(props: T & StyledProps) => {
-  function isValidStyle<U>(value: U) {
-    if (value === undefined || value === null || React.isValidElement(value)) {
-      return false;
-    }
-    return typeof value === 'string' || typeof value === 'number';
+function isValidStyle<U>(value: U) {
+  if (value === undefined || value === null || React.isValidElement(value)) {
+    return false;
   }
+  return typeof value === 'string' || typeof value === 'number';
+}
 
+export const useRestyle = <T>(props: T & StyledProps) => {
   const getStyleFromProps = () => {
     const result: Record<string, StyleLike> = {};
 
diff --git a/src/packages/react-native-material-elements/src/libraries/themes/v1/colors/colors.ts b/src/packages/react-native-material-elements/src/libraries/themes/v1/colors/colors.ts
index 7fb6258..86fd685 100644
--- a/src/packages/react-native-material-elements/src/libraries/themes/v1/colors/colors.ts
+++ b/src/packages/react-native-material-elements/src/libraries/themes/v1/colors/colors.ts
@@ -66,7 +66,7 @@ const initialLightTheme = {
 };
 
 const createDarkColorTheme = (key: keyof typeof initialLightTheme) => {
-  const colors = initialLightTheme[key] as ColorShades;
+  const colors = initialLightTheme[key];
   const darkColors: any = {};
   const shades = ['50', '100', '200', '300', '400', '500', '600', '700', '800', '900'];
   const reverseShades = [...shades].reverse();
diff --git a/src/packages/react-native-material-elements/src/utils/index.ts b/src/packages/react-native-material-elements/src/utils/index.ts
index f19e400..b2e2891 100644
--- a/src/packages/react-native-material-elements/src/utils/index.ts
+++ b/src/packages/react-native-material-elements/src/utils/index.ts
@@ -1,4 +1,3 @@
 export * from './styleGenerator';
-export * from './randomId';
 export * from './utils';
 export * from './dimensions';
diff --git a/src/packages/react-native-material-elements/src/utils/randomId.ts b/src/packages/react-native-material-elements/src/utils/randomId.ts
deleted file mode 100644
index 7c9d53b..0000000
--- a/src/packages/react-native-material-elements/src/utils/randomId.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export function generateUniqueId() {
-  const timestamp = Date.now().toString(36);
-  const randomStr = Math.random().toString(36).substr(2, 5);
-  return timestamp + '-' + randomStr;
-}