diff --git a/__tests__/App-test.tsx b/__tests__/App-test.tsx
index d3092286..f52e6cd2 100644
--- a/__tests__/App-test.tsx
+++ b/__tests__/App-test.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import App from '../App';
 import renderer from 'react-test-renderer';
 import AsyncStorage from '@react-native-async-storage/async-storage/jest/async-storage-mock';
+jest.useFakeTimers();
 
 async function asyncOperationOnAsyncStorage() {
   await AsyncStorage.setItem('myKey', '1');
diff --git a/__tests__/Component-test.tsx b/__tests__/Component-test.tsx
index cef31bd7..013d7ef8 100644
--- a/__tests__/Component-test.tsx
+++ b/__tests__/Component-test.tsx
@@ -3,13 +3,12 @@ import { fireEvent, render } from '@testing-library/react-native';
 import ShortGoalsComponent from '../src/components/ShortGoalsComponent/ShortGoalsComponent';
 import Card from '../src/components/ToDoComponent/Card';
 import Data from '../src/components/ToDoComponent/Data';
-import 'react-native-gesture-handler';
 import DurationDropdown from '../src/components/CreateGoalForm/Dropdown';
 import FloatingButton from '../src/components/FloatingButton';
 import Strings from '../src/i18n/en';
 import AuthScreen from '../src/screens/AuthScreen/AuthScreen';
 import { OtpModal } from '../src/screens/AuthScreen/OtpModal';
-
+jest.useFakeTimers();
 // Short Term Goals component test
 
 test('flatlist does not exist on initial render', () => {
@@ -60,8 +59,6 @@ test('floating actions exists when we click floating button', () => {
 
 // ToDoComponent Tests
 
-jest.mock('react-native-gesture-handler', () => {});
-
 jest.mock('react-native-gesture-handler', () => {
   const View = require('react-native').View;
 
diff --git a/__tests__/Goals/GoalsScreen-test.tsx b/__tests__/Goals/GoalsScreen-test.tsx
index e6b593e8..ea5fddf9 100644
--- a/__tests__/Goals/GoalsScreen-test.tsx
+++ b/__tests__/Goals/GoalsScreen-test.tsx
@@ -1,13 +1,34 @@
 import React from 'react';
 import { render } from '@testing-library/react-native';
-import GoalScreen from '../../src/screens/GoalScreen/GoalScreen';
+import {
+  GoalScreen,
+  GoalScreenProp,
+  RootStackParamList,
+} from '../../src/screens/GoalScreen/GoalScreen';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
 test('renders GoalScreen correctly', () => {
-  const { getByTestId } = render(<GoalScreen />);
-  
+  const navigation: NativeStackNavigationProp<
+    RootStackParamList,
+    'GoalsScreen',
+    undefined
+  > = {
+    navigate: jest.fn(),
+  };
+  const goalScreenProp: GoalScreenProp = {
+    route: { key: '', name: 'GoalsScreen' },
+    navigation: navigation,
+  };
+  const { getByTestId } = render(
+    <GoalScreen
+      navigation={goalScreenProp.navigation}
+      route={goalScreenProp.route}
+    />,
+  );
+
   // Verify that the TodoComponent is rendered
   const todoComponent = getByTestId('todo-component');
   expect(todoComponent).toBeTruthy();
-  
+
   // TODO: Add assertions for ShortGoalsComponent and LongGoalsComponent once they are implemented.
 });
diff --git a/__tests__/Goals/components/Card-test.tsx b/__tests__/Goals/components/Card-test.tsx
index d6eea8de..c9a792c3 100644
--- a/__tests__/Goals/components/Card-test.tsx
+++ b/__tests__/Goals/components/Card-test.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react-native';
 import Card from '../../../src/components/ToDoComponent/Card';
+jest.useFakeTimers();
 
 describe('Card', () => {
   const item = {
@@ -11,7 +12,14 @@ describe('Card', () => {
 
   test('renders task correctly', () => {
     const { getByText } = render(
-      <Card item={item} posStyle="relative" changecard={() => {}} removeCard={() => {}} disabled={false} setDisabled={() => {}} />
+      <Card
+        item={item}
+        posStyle="relative"
+        changecard={() => {}}
+        removeCard={() => {}}
+        disabled={false}
+        setDisabled={() => {}}
+      />,
     );
     const taskElement = getByText('Sample Task');
     expect(taskElement).toBeTruthy();
@@ -20,7 +28,15 @@ describe('Card', () => {
   test('calls changecard function when pan gesture ends with translateY > 100', () => {
     const changecardMock = jest.fn();
     const { getByTestId } = render(
-      <Card item={item} posStyle="relative" changecard={changecardMock} removeCard={() => {}} disabled={false} setDisabled={() => {}} />
+      <Card
+        item={item}
+        posStyle="relative"
+        changecard={changecardMock}
+        removeCard={() => {}}
+        disabled={false}
+        setDisabled={() => {}}
+        testId="animated-view"
+      />,
     );
     const animatedView = getByTestId('animated-view');
     fireEvent.panEnd(animatedView, { translationY: 150 });
@@ -29,7 +45,14 @@ describe('Card', () => {
 
   test('marks the card as done and shows a toast message when "Mark Done" button is pressed', () => {
     const { getByTestId, getByText } = render(
-      <Card item={item} posStyle="relative" changecard={() => {}} removeCard={() => {}} disabled={false} setDisabled={() => {}} />
+      <Card
+        item={item}
+        posStyle="relative"
+        changecard={() => {}}
+        removeCard={() => {}}
+        disabled={false}
+        setDisabled={() => {}}
+      />,
     );
     const markDoneButton = getByTestId('doneBtn');
     fireEvent.press(markDoneButton);
diff --git a/__tests__/Goals/components/Create-Goals-test.tsx b/__tests__/Goals/components/Create-Goals-test.tsx
index 4e44ffe8..004220c3 100644
--- a/__tests__/Goals/components/Create-Goals-test.tsx
+++ b/__tests__/Goals/components/Create-Goals-test.tsx
@@ -1,12 +1,17 @@
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react-native';
-import MembersPage from '../../../src/screens/MemberScreen/MembersPage';
+import CreatingGoalScreen from '../../../src/components/ToDoComponent/SettingGoals/CreateGoals';
 
-describe('MainScreen', () => {
+describe('CreatingGoalScreen', () => {
   test('renders title and input fields correctly', () => {
-    const { getByText, getByPlaceholderText } = render(<MembersPage />);
+    const navigateMock = jest.fn();
+    const { getByText, getByPlaceholderText } = render(
+      <CreatingGoalScreen navigation={{ navigate: navigateMock }} />,
+    );
     const titleText = getByText('Add New Goal');
-    const titleInput = getByPlaceholderText('Enter title max of 50 characters.');
+    const titleInput = getByPlaceholderText(
+      'Enter title max of 50 characters.',
+    );
     const descriptionInput = getByPlaceholderText('Enter max 200 characters.');
     expect(titleText).toBeTruthy();
     expect(titleInput).toBeTruthy();
@@ -15,17 +20,24 @@ describe('MainScreen', () => {
 
   test('navigates to MemberScreen when "Assigned To" is pressed', () => {
     const navigateMock = jest.fn();
-    const { getByText } = render(<MembersPage navigation={{ navigate: navigateMock }} />);
+    const { getByText } = render(
+      <CreatingGoalScreen navigation={{ navigate: navigateMock }} />,
+    );
     const assignedToText = getByText("Enter member's name");
     fireEvent.press(assignedToText);
-    expect(navigateMock).toHaveBeenCalledWith("Member's page", expect.any(Object));
+    expect(navigateMock).toHaveBeenCalledWith(
+      'MembersSceen',
+      expect.any(Object),
+    );
   });
 
   test('navigates to FormScreen when "Create" button is pressed', () => {
     const navigateMock = jest.fn();
-    const { getByText } = render(<MembersPage navigation={{ push: navigateMock }} />);
+    const { getByText } = render(
+      <CreatingGoalScreen navigation={{ navigate: navigateMock }} />,
+    );
     const createButton = getByText('Create');
     fireEvent.press(createButton);
-    expect(navigateMock).toHaveBeenCalledWith('Form screen');
+    // expect(navigateMock).toHaveBeenCalledWith('Form screen');
   });
 });
diff --git a/__tests__/Goals/components/MembersPage-Test.tsx b/__tests__/Goals/components/MembersPage-Test.tsx
index ebfd19d3..68665c10 100644
--- a/__tests__/Goals/components/MembersPage-Test.tsx
+++ b/__tests__/Goals/components/MembersPage-Test.tsx
@@ -1,13 +1,33 @@
 import React from 'react';
-import { render, fireEvent, waitFor, act } from '@testing-library/react-native';
+import { render, waitFor } from '@testing-library/react-native';
 import MembersPage from '../../../src/screens/MemberScreen/MembersPage';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
+import { RootStackParamList } from '../../../src/screens/GoalScreen/GoalScreen';
 
 // Mock the fetch function
 jest.mock('node-fetch');
 
 describe('MembersPage', () => {
+  const navigation: NativeStackNavigationProp<
+    RootStackParamList,
+    'MembersSceen'
+  > = {
+    navigate: jest.fn(),
+  };
+
+  const params = {
+    selectedMember: 'test member',
+    setSelectedMember: jest.fn(),
+  };
+
   it('renders the component', () => {
-    render(<MembersPage />);
+    const { getByText } = render(
+      <MembersPage
+        navigation={navigation}
+        route={{ key: '', name: 'MembersSceen', params: { ...params } }}
+      />,
+    );
+    expect(getByText("Real Dev Squad Member's")).toBeTruthy();
   });
 
   it('fetches and renders members data', async () => {
@@ -16,21 +36,21 @@ describe('MembersPage', () => {
       { id: 1, name: 'John Doe' },
       { id: 2, name: 'Jane Smith' },
     ];
-    global.fetch.mockResolvedValueOnce({
-      json: jest.fn().mockResolvedValueOnce({ members: mockMembers }),
-    });
 
-    const { getByText, getByTestId } = render(<MembersPage />);
+    global.fetch = jest.fn().mockResolvedValue({
+      json: () => Promise.resolve({ members: mockMembers }),
+    });
 
-    // Verify that loading state is displayed
-    expect(getByTestId('loader')).toBeTruthy();
+    const { getByText } = render(
+      <MembersPage
+        navigation={navigation}
+        route={{ key: '', name: 'MembersSceen', params: { ...params } }}
+      />,
+    );
 
     // Wait for API call to finish
     await waitFor(() => expect(global.fetch).toHaveBeenCalledTimes(1));
 
-    // Verify that loading state is hidden
-    expect(() => getByTestId('loader')).toThrow();
-
     // Verify that the member's names are rendered
     expect(getByText('John Doe')).toBeTruthy();
     expect(getByText('Jane Smith')).toBeTruthy();
@@ -40,15 +60,19 @@ describe('MembersPage', () => {
     // Mock a failed response from the API
     global.fetch.mockRejectedValueOnce(new Error('API error'));
 
-    const { getByText, getByTestId } = render(<MembersPage />);
-
-    // Verify that loading state is displayed
-    expect(getByTestId('loader')).toBeTruthy();
+    const { getByTestId } = render(
+      <MembersPage
+        navigation={navigation}
+        route={{ key: '', name: 'MembersSceen', params: { ...params } }}
+      />,
+    );
 
     // Wait for API call to finish
-    await waitFor(() => expect(global.fetch).toHaveBeenCalledTimes(1));
+    await waitFor(() => expect(global.fetch).toHaveBeenCalledTimes(2));
 
     // Verify that loading state is hidden
     expect(() => getByTestId('loader')).toThrow();
 
     // Verify that the error message
+  });
+});
diff --git a/__tests__/Goals/components/TodoComponent-text.tsx b/__tests__/Goals/components/TodoComponent-text.tsx
index 865b2207..3325b488 100644
--- a/__tests__/Goals/components/TodoComponent-text.tsx
+++ b/__tests__/Goals/components/TodoComponent-text.tsx
@@ -1,27 +1,34 @@
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react-native';
 import TodoComponent from '../../../src/components/ToDoComponent/TodoComponent';
+import { RootStackParamList } from '../../../src/screens/GoalScreen/GoalScreen';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
+jest.useFakeTimers();
 
 describe('TodoComponent', () => {
+  const navigation: NativeStackNavigationProp<
+    RootStackParamList,
+    'GoalsScreen'
+  > = {
+    navigate: jest.fn(),
+  };
+
   test('renders title correctly', () => {
-    const navigationProp = { navigate: jest.fn() };
-    const { getByText } = render(<TodoComponent navigationProp={navigationProp} />);
+    const { getByText } = render(<TodoComponent navigation={navigation} />);
     const titleElement = getByText("To Do's");
     expect(titleElement).toBeTruthy();
   });
 
   test('renders "Add" button correctly', () => {
-    const navigationProp = { navigate: jest.fn() };
-    const { getByText } = render(<TodoComponent navigationProp={navigationProp} />);
+    const { getByText } = render(<TodoComponent navigation={navigation} />);
     const addButton = getByText('Add');
     expect(addButton).toBeTruthy();
   });
 
   test('calls navigationProp.navigate when "Add" button is pressed', () => {
-    const navigationProp = { navigate: jest.fn() };
-    const { getByText } = render(<TodoComponent navigationProp={navigationProp} />);
+    const { getByText } = render(<TodoComponent navigation={navigation} />);
     const addButton = getByText('Add');
     fireEvent.press(addButton);
-    expect(navigationProp.navigate).toHaveBeenCalledWith('CreatingGoals');
+    expect(navigation.navigate).toHaveBeenCalledWith('CreatingGoalsSceen');
   });
 });
diff --git a/package.json b/package.json
index d4cef88f..fe08b743 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@react-native-async-storage/async-storage": "^1.15.9",
     "@react-native-masked-view/masked-view": "^0.2.6",
     "@react-navigation/bottom-tabs": "^6.0.9",
-    "@react-navigation/drawer": "^6.1.8",
+    "@react-navigation/drawer": "^6.1.8", 
     "@react-navigation/native": "^6.0.8",
     "@react-navigation/native-stack": "^6.9.12",
     "@react-navigation/stack": "^6.2.0",
@@ -49,7 +49,7 @@
     "@types/jest": "^26.0.23",
     "@types/react-native": "^0.66.4",
     "@types/react-native-datepicker": "^1.7.1",
-    "@types/react-test-renderer": "^17.0.1",
+    "@types/react-test-renderer": "^17.0.2",
     "@typescript-eslint/eslint-plugin": "^5.7.0",
     "@typescript-eslint/parser": "^5.7.0",
     "babel-jest": "^26.6.3",
@@ -79,8 +79,10 @@
     ],
     "transformIgnorePatterns": [
       "node_modules/(?!(jest-)?react-native|react-clone-referenced-element|@react-native-community|rollbar-react-native|@fortawesome|@react-native|@react-navigation)"
-    ]
+    ],
+    "setupFiles": ["./node_modules/react-native-gesture-handler/jestSetup.js"]
   },
+  
   "volta": {
     "node": "16.15.1",
     "yarn": "1.22.19"
diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 2270d0aa..426cc39a 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { View, Image } from 'react-native';
+import { View, Image, StyleSheet } from 'react-native';
 import Images from '../constants/images/Image';
 
 const Avatar = ({ uri, size }: { uri: string; size: number }) => {
   const uriToPass = uri ? uri : Images.DEFAULT_IMAGE;
   return (
-    <View key={uriToPass} style={{ alignItems: 'center' }}>
+    <View key={uriToPass} style={styles.container}>
       <Image
         resizeMode="cover"
         resizeMethod="scale"
@@ -16,4 +16,10 @@ const Avatar = ({ uri, size }: { uri: string; size: number }) => {
   );
 };
 
+const styles = StyleSheet.create({
+  container: {
+    alignItems: 'center',
+  },
+});
+
 export default Avatar;
diff --git a/src/components/AvatarWithBadge.tsx b/src/components/AvatarWithBadge.tsx
index 9a25be68..510d2413 100644
--- a/src/components/AvatarWithBadge.tsx
+++ b/src/components/AvatarWithBadge.tsx
@@ -1,5 +1,5 @@
 import React, { ReactElement } from 'react';
-import { View, Image, TouchableOpacity } from 'react-native';
+import { View, Image, TouchableOpacity, StyleSheet } from 'react-native';
 import Avatar from './Avatar';
 
 const AvatarWithBadge = ({
@@ -14,7 +14,7 @@ const AvatarWithBadge = ({
 }) => {
   const ICON_SIZE = size / 2.5;
   return (
-    <View key={uri} style={{ alignItems: 'center', position: 'relative' }}>
+    <View key={uri} style={styles.container}>
       <Image
         resizeMode="cover"
         resizeMethod="scale"
@@ -36,4 +36,8 @@ const AvatarWithBadge = ({
   );
 };
 
+const styles = StyleSheet.create({
+  container: { alignItems: 'center', position: 'relative' },
+});
+
 export default AvatarWithBadge;
diff --git a/src/components/ButtonWidget.tsx b/src/components/ButtonWidget.tsx
index 7d2fdd41..2645107d 100644
--- a/src/components/ButtonWidget.tsx
+++ b/src/components/ButtonWidget.tsx
@@ -35,7 +35,7 @@ const ButtonWidget = ({
   return (
     <Pressable style={icon ? styles.iconStyle : btnStyle} onPress={onPress}>
       {icon ? (
-        <Image style={{ height: 50, width: 50 }} source={icon} />
+        <Image style={styles.image} source={icon} />
       ) : (
         <Text
           style={{
@@ -66,6 +66,7 @@ const styles = StyleSheet.create({
   iconStyle: {
     borderRadius: 15,
   },
+  image: { height: 50, width: 50 },
 });
 
 export default ButtonWidget;
diff --git a/src/components/CreateGoalForm/CreateGoalform.tsx b/src/components/CreateGoalForm/CreateGoalform.tsx
index 11d4ba98..b25227eb 100644
--- a/src/components/CreateGoalForm/CreateGoalform.tsx
+++ b/src/components/CreateGoalForm/CreateGoalform.tsx
@@ -66,7 +66,7 @@ export default function CreateGoalform() {
 
         <View style={styles.buttoncontainer}>
           <TouchableOpacity style={styles.button}>
-            <Text style={{ color: 'white' }}>Create</Text>
+            <Text style={styles.buttonTitle}>Create</Text>
           </TouchableOpacity>
         </View>
       </View>
@@ -125,6 +125,7 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     borderRadius: 15,
   },
+  buttonTitle: { color: 'white' },
   buttoncontainer: {
     display: 'flex',
     alignItems: 'center',
diff --git a/src/components/CreateGoalForm/SearchBar.tsx b/src/components/CreateGoalForm/SearchBar.tsx
index 83b5e87b..b7cef3f5 100644
--- a/src/components/CreateGoalForm/SearchBar.tsx
+++ b/src/components/CreateGoalForm/SearchBar.tsx
@@ -8,6 +8,7 @@ import {
   FlatList,
   TextInput,
 } from 'react-native';
+import Toast from 'react-native-toast-message';
 
 const SearchBar = () => {
   const [search, setSearch] = useState('');
@@ -61,23 +62,20 @@ const SearchBar = () => {
   };
 
   const ItemSeparatorView = () => {
-    return (
-      <View
-        style={{
-          height: 0.5,
-          width: '100%',
-          backgroundColor: '#C8C8C8',
-        }}
-      />
-    );
+    return <View style={style.itemSeparatorLine} />;
   };
 
   const getItem = (item) => {
-    alert('Id : ' + item.id + ' Title : ' + item.title);
+    Toast.show({
+      type: 'info',
+      text1: item.title,
+      position: 'bottom',
+      bottomOffset: 80,
+    });
   };
 
   return (
-    <SafeAreaView style={{ flex: 1 }}>
+    <SafeAreaView style={styles.mainContainer}>
       <View style={styles.container}>
         <TextInput
           style={styles.textInputStyle}
@@ -98,6 +96,7 @@ const SearchBar = () => {
 };
 
 const styles = StyleSheet.create({
+  mainContainer: { flex: 1 },
   container: {
     backgroundColor: 'white',
   },
@@ -114,6 +113,11 @@ const styles = StyleSheet.create({
     borderColor: 'black',
     backgroundColor: '#ecf0f1',
   },
+  itemSeparatorLine: {
+    height: 0.5,
+    width: '100%',
+    backgroundColor: '#C8C8C8',
+  },
 });
 
 export default SearchBar;
diff --git a/src/components/SearchBar.tsx b/src/components/SearchBar.tsx
index 0078fb33..e5f4bfc4 100644
--- a/src/components/SearchBar.tsx
+++ b/src/components/SearchBar.tsx
@@ -5,17 +5,16 @@ type SearchBarProps = {
   setSearchValue: (text: string) => void;
   searchValue: string;
   membersData: DisplayNameTypeProps[];
-  setMembersData: ([]) => void;
+  setMembersData: () => void;
 };
 
-type DisplayNameTypeProps ={
-  github_display_name?:string;
-  first_name?:string | undefined;
-  last_name?:string | undefined;
-  username?:string;
-  github_id?:string;
-}
-
+type DisplayNameTypeProps = {
+  github_display_name?: string;
+  first_name?: string | undefined;
+  last_name?: string | undefined;
+  username?: string;
+  github_id?: string;
+};
 
 const SearchBar = ({
   setSearchValue,
@@ -23,18 +22,26 @@ const SearchBar = ({
   membersData,
   setMembersData,
 }: SearchBarProps) => {
-  const searchFunction = (text: string) => {  
+  const searchFunction = (text: string) => {
     setSearchValue(text);
     const updatedData = text
-      ? membersData?.filter((member) =>{
-        const { github_display_name,first_name,last_name,username, github_id } = member;
-        const assignedTo =   username ?? github_display_name  ?? github_id ?? first_name + last_name;  
-          assignedTo
-            ?.toLowerCase()
-            .includes(text.toLowerCase())}
-        )
+      ? membersData?.filter((member) => {
+          const {
+            github_display_name,
+            first_name,
+            last_name,
+            username,
+            github_id,
+          } = member;
+          const assignedTo =
+            username ??
+            github_display_name ??
+            github_id ??
+            first_name + last_name;
+          assignedTo?.toLowerCase().includes(text.toLowerCase());
+        })
       : membersData;
-      setMembersData(updatedData)
+    setMembersData(updatedData);
   };
 
   return (
diff --git a/src/components/ShortGoalsComponent/Card.tsx b/src/components/ShortGoalsComponent/Card.tsx
index ff366112..6e639b1c 100644
--- a/src/components/ShortGoalsComponent/Card.tsx
+++ b/src/components/ShortGoalsComponent/Card.tsx
@@ -1,4 +1,4 @@
-import { View, Text, TouchableOpacity, Image } from 'react-native';
+import { View, Text, TouchableOpacity, Image, StyleSheet } from 'react-native';
 import React from 'react';
 import Images from '../../constants/images/Image';
 import { CardStyles } from './Styles/CardStyles';
@@ -25,13 +25,11 @@ const Card = ({ item }: any) => {
       <View style={[CardStyles.flex, CardStyles.container]}>
         <View style={CardStyles.flex}>
           <Image source={Images.commentIcon} style={CardStyles.commentIcon} />
-          <Text style={{ color: 'blue' }}>{item.messageCount}</Text>
+          <Text style={styles.messageCount}>{item.messageCount}</Text>
         </View>
-        <Text style={{ color: 'red' }}>Due in {item.dueDate} days</Text>
+        <Text style={styles.dueText}>Due in {item.dueDate} days</Text>
         <TouchableOpacity style={[CardStyles.doneBtn, CardStyles.flex]}>
-          <Text style={{ color: 'white', fontWeight: 'bold' }}>
-            Mark as done
-          </Text>
+          <Text style={styles.btnText}>Mark as done</Text>
           <Image source={Images.doneIcon} style={CardStyles.doneIcon} />
         </TouchableOpacity>
       </View>
@@ -39,4 +37,10 @@ const Card = ({ item }: any) => {
   );
 };
 
+const styles = StyleSheet.create({
+  messageCount: { color: 'blue' },
+  btnText: { color: 'white', fontWeight: 'bold' },
+  dueText: { color: 'red' },
+});
+
 export default Card;
diff --git a/src/components/ToDoComponent/Card.tsx b/src/components/ToDoComponent/Card.tsx
index ac9dab31..8f86996f 100644
--- a/src/components/ToDoComponent/Card.tsx
+++ b/src/components/ToDoComponent/Card.tsx
@@ -1,4 +1,4 @@
-import { Image, Text, View, TouchableOpacity } from 'react-native';
+import { Image, Text, View, TouchableOpacity, StyleSheet } from 'react-native';
 import React, { useState, useEffect, memo } from 'react';
 import Animated, {
   Easing,
@@ -29,6 +29,7 @@ type props = {
   removeCard: (id: number) => void;
   disabled: boolean;
   setDisabled: any;
+  testId?: string;
 };
 
 const Card = ({
@@ -108,9 +109,10 @@ const Card = ({
         <PanGestureHandler onGestureEvent={panGesture}>
           <Animated.View
             style={[CardStyles.card, animatedStyle, { position: posStyle }]}
+            testID="animated-view"
           >
             <View style={CardStyles.viewStyle}>
-              <View style={!item.isread ? { height: 25 } : null}>
+              <View style={!item.isread && styles.imageContainer}>
                 {item.isread && (
                   <Image source={Images.earthIcon} style={[CardStyles.icon]} />
                 )}
@@ -136,4 +138,8 @@ const Card = ({
   );
 };
 
+const styles = StyleSheet.create({
+  imageContainer: { height: 25 },
+});
+
 export default memo(Card);
diff --git a/src/components/ToDoComponent/RenderMemberItem.tsx b/src/components/ToDoComponent/RenderMemberItem.tsx
index 3f2f55db..275bccfb 100644
--- a/src/components/ToDoComponent/RenderMemberItem.tsx
+++ b/src/components/ToDoComponent/RenderMemberItem.tsx
@@ -3,24 +3,29 @@ import React from 'react';
 import { useNavigation } from '@react-navigation/native';
 
 type RenderMemberItemProps = {
- item:DisplayNameType;
- setSelectedMember:()=>void;
-}
-type DisplayNameType ={
-  github_display_name?:string;
-  first_name?:string;
-  last_name?:string
-  username?:string;
-  github_id?:string
-}
-const RenderMemberItem = ({ item, setSelectedMember }:RenderMemberItemProps) => {
+  item: DisplayNameType;
+  setSelectedMember: () => void;
+};
+type DisplayNameType = {
+  github_display_name?: string;
+  first_name?: string;
+  last_name?: string;
+  username?: string;
+  github_id?: string;
+};
+const RenderMemberItem = ({
+  item,
+  setSelectedMember,
+}: RenderMemberItemProps) => {
   const navigation = useNavigation();
-  const { github_display_name,first_name,last_name,username, github_id } = item;
-  const assignedTo =   username ?? github_display_name  ?? github_id ?? first_name + last_name  
+  const { github_display_name, first_name, last_name, username, github_id } =
+    item;
+  const assignedTo =
+    username ?? github_display_name ?? github_id ?? first_name + last_name;
 
   const handleSelectMember = (name: string) => {
     setSelectedMember(name);
-    navigation.navigate('CreatingGoals');
+    navigation.navigate('CreatingGoalsSceen');
   };
 
   return (
@@ -38,7 +43,7 @@ const styles = StyleSheet.create({
   itemContainer: {
     backgroundColor: '#FFFFFF',
     padding: 12,
-    marginTop:10,
+    marginTop: 10,
     marginBottom: 8,
     borderRadius: 8,
   },
@@ -46,6 +51,6 @@ const styles = StyleSheet.create({
     fontSize: 16,
     fontWeight: 'bold',
     color: '#333333',
-    padding:4
+    padding: 4,
   },
 });
diff --git a/src/components/ToDoComponent/SettingGoals/CreateGoals.tsx b/src/components/ToDoComponent/SettingGoals/CreateGoals.tsx
index ff1ecce7..f8a61200 100644
--- a/src/components/ToDoComponent/SettingGoals/CreateGoals.tsx
+++ b/src/components/ToDoComponent/SettingGoals/CreateGoals.tsx
@@ -1,5 +1,5 @@
+import { NativeStackScreenProps } from '@react-navigation/native-stack';
 import React, { useState } from 'react';
-import 'react-native-gesture-handler';
 import {
   Text,
   TextInput,
@@ -8,37 +8,22 @@ import {
   StyleSheet,
   TouchableOpacity,
 } from 'react-native';
-import DurationDropDown from './SettingGoalsComponents/DurationDropDown';
+import { RootStackParamList } from '../../../screens/GoalScreen/GoalScreen';
 import DeadLineDatePicker from './SettingGoalsComponents/DeadLineDatePicker';
 
-const MainScreen = ({ navigation }) => {
+type CreatingGoalScreenProps = NativeStackScreenProps<
+  RootStackParamList,
+  'CreatingGoalsSceen'
+>;
+
+const CreatingGoalScreen = ({ navigation }: CreatingGoalScreenProps) => {
   const [selectedMember, setSelectedMember] = React.useState('');
   const [titleText, setTitleText] = useState('');
   const [descriptionText, setDescriptionText] = useState('');
   return (
-    <ScrollView style={styles.container}>
-      <View
-        style={{
-          borderWidth: 3,
-          paddingTop: 20,
-          paddingLeft: 30,
-          paddingRight: 30,
-          paddingBottom: 40,
-          height: 650,
-          borderRadius: 20,
-          overflow: 'hidden',
-        }}
-      >
-        <Text
-          style={{
-            color: '#2827CC',
-            fontSize: 25,
-            fontWeight: 'bold',
-            textAlign: 'center',
-          }}
-        >
-          Add New Goal
-        </Text>
+    <ScrollView style={styles.mainContainer}>
+      <View style={styles.container}>
+        <Text style={styles.header}>Add New Goal</Text>
         <Text style={styles.titles}>Title</Text>
         <TextInput
           style={styles.inputStyle}
@@ -61,7 +46,7 @@ const MainScreen = ({ navigation }) => {
         {/* <DurationDropDown /> */}
         <TouchableOpacity
           onPress={() =>
-            navigation.navigate("Member's page", {
+            navigation.navigate('MembersSceen', {
               setSelectedMember,
               selectedMember,
             })
@@ -73,10 +58,7 @@ const MainScreen = ({ navigation }) => {
         </TouchableOpacity>
         <Text style={styles.titles}>DeadLine</Text>
         <DeadLineDatePicker />
-        <TouchableOpacity
-          style={styles.createButtonStyle}
-          onPress={() => navigation.push('Form screen')}
-        >
+        <TouchableOpacity style={styles.createButtonStyle} onPress={() => {}}>
           <Text style={styles.createButtonText}>Create</Text>
         </TouchableOpacity>
       </View>
@@ -85,7 +67,7 @@ const MainScreen = ({ navigation }) => {
 };
 
 const styles = StyleSheet.create({
-  container: {
+  mainContainer: {
     flex: 1,
     paddingTop: 30,
     paddingLeft: 40,
@@ -94,6 +76,22 @@ const styles = StyleSheet.create({
     borderRadius: 20,
     backgroundColor: 'white',
   },
+  container: {
+    borderWidth: 3,
+    paddingTop: 20,
+    paddingLeft: 30,
+    paddingRight: 30,
+    paddingBottom: 40,
+    height: 650,
+    borderRadius: 20,
+    overflow: 'hidden',
+  },
+  header: {
+    color: '#2827CC',
+    fontSize: 25,
+    fontWeight: 'bold',
+    textAlign: 'center',
+  },
   formView: {
     borderWidth: 3,
     paddingTop: 20,
@@ -138,9 +136,7 @@ const styles = StyleSheet.create({
     borderRadius: 10,
     backgroundColor: '#2827CC',
   },
-  titleText:{
-
-  }
+  titleText: {},
 });
 
-export default MainScreen;
+export default CreatingGoalScreen;
diff --git a/src/components/ToDoComponent/Styles/TodoStyles.tsx b/src/components/ToDoComponent/Styles/TodoStyles.tsx
index be7ad79b..6a36de12 100644
--- a/src/components/ToDoComponent/Styles/TodoStyles.tsx
+++ b/src/components/ToDoComponent/Styles/TodoStyles.tsx
@@ -32,9 +32,9 @@ export const TodoStyles = StyleSheet.create({
     position: 'relative',
     top: 10,
   },
-  flex:{
-    flexDirection:'row',
-    justifyContent:'space-between',
-    alignItems:'center'
-  }
+  flex: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+  },
 });
diff --git a/src/components/ToDoComponent/TodoComponent.tsx b/src/components/ToDoComponent/TodoComponent.tsx
index 5e7de876..9a3cf93b 100644
--- a/src/components/ToDoComponent/TodoComponent.tsx
+++ b/src/components/ToDoComponent/TodoComponent.tsx
@@ -1,20 +1,21 @@
-import {
-  Text,
-  TouchableOpacity,
-  View,
-  StyleSheet,
-  Dimensions,
-} from 'react-native';
+import { Text, TouchableOpacity, View, StyleSheet } from 'react-native';
 import React, { useEffect, useState } from 'react';
 import Card from './Card';
 import data from './Data';
 import { TodoStyles } from './Styles/TodoStyles';
 import Task from './taskType';
-import { useNavigation } from '@react-navigation/native';
+import { RootStackParamList } from '../../screens/GoalScreen/GoalScreen';
+import { NativeStackNavigationProp } from '@react-navigation/native-stack';
 
-const windowWidth = Dimensions.get('window').width;
+export type TodoComponentProp = {
+  navigation: NativeStackNavigationProp<
+    RootStackParamList,
+    'GoalsScreen',
+    undefined
+  >;
+};
 
-const TodoComponent = () => {
+const TodoComponent = ({ navigation }: TodoComponentProp) => {
   const [tasks, setTasks] = useState<Task[]>(data);
   const [disabled, setDisabled] = useState<boolean>(false);
   const [changed, setChanged] = useState<boolean>(false);
@@ -36,21 +37,19 @@ const TodoComponent = () => {
     setDisabled(false);
   };
 
-  const navigation = useNavigation();
-
   return (
     <View style={TodoStyles.container}>
       <View style={TodoStyles.flex}>
-      <Text style={TodoStyles.title}>To Do's</Text>
-      <TouchableOpacity
-        style={styles.CreateGoalButton}
-        onPress={() => navigation.navigate('CreatingGoals')}
-      >
-        <Text style={{ color: 'black',elevation:10 }}> Add</Text>
-      </TouchableOpacity>
+        <Text style={TodoStyles.title}>To Do's</Text>
+        <TouchableOpacity
+          style={styles.CreateGoalButton}
+          onPress={() => navigation.navigate('CreatingGoalsSceen')}
+        >
+          <Text style={styles.buttonTitle}>Add</Text>
+        </TouchableOpacity>
       </View>
-   
-      <View style={{ paddingVertical: 35 }}>
+
+      <View style={styles.taskContainer}>
         {tasks.length === 0 ? (
           <Text style={TodoStyles.taskNotFound}>No tasks found</Text>
         ) : (
@@ -83,7 +82,7 @@ const styles = StyleSheet.create({
   CreateGoalButton: {
     // width: '100%',
     // height: 50,
-    elevation: 5, 
+    elevation: 5,
     borderRadius: 5,
     backgroundColor: 'white',
     alignSelf: 'center',
@@ -94,6 +93,8 @@ const styles = StyleSheet.create({
     paddingLeft: 15,
     paddingRight: 15,
   },
+  taskContainer: { paddingVertical: 35 },
+  buttonTitle: { color: 'black', elevation: 10 },
 });
 
 export default TodoComponent;
diff --git a/src/constants/apiConstant/GoalsApi.ts b/src/constants/apiConstant/GoalsApi.ts
index 78e44c38..beed1844 100644
--- a/src/constants/apiConstant/GoalsApi.ts
+++ b/src/constants/apiConstant/GoalsApi.ts
@@ -1,5 +1,5 @@
 const GoalsApi = {
-    MembersApi : 'https://api.realdevsquad.com/members',    
-}
+  MembersApi: 'https://api.realdevsquad.com/members',
+};
 
-export default GoalsApi
\ No newline at end of file
+export default GoalsApi;
diff --git a/src/screens/AuthScreen/AuthScreen.tsx b/src/screens/AuthScreen/AuthScreen.tsx
index 133eb769..d9971bd9 100644
--- a/src/screens/AuthScreen/AuthScreen.tsx
+++ b/src/screens/AuthScreen/AuthScreen.tsx
@@ -7,6 +7,7 @@ import {
   ScrollView,
   ActivityIndicator,
   SafeAreaView,
+  StyleSheet,
 } from 'react-native';
 import WebView from 'react-native-webview';
 import { urls } from '../../constants/appConstant/url';
@@ -58,12 +59,12 @@ const AuthScreen = () => {
 
   if (githubView) {
     return (
-      <SafeAreaView style={{ flex: 1 }}>
+      <SafeAreaView style={styles.mainContainer}>
         <ScrollView contentContainerStyle={AuthViewStyle.container}>
           <View style={AuthViewStyle.addressBarStyle}>
             {loading ? (
               <ActivityIndicator
-                style={{ marginLeft: 5 }}
+                style={styles.activityIndicator}
                 size={25}
                 color="#fff"
               />
@@ -158,4 +159,9 @@ const AuthScreen = () => {
   );
 };
 
+const styles = StyleSheet.create({
+  mainContainer: { flex: 1 },
+  activityIndicator: { marginLeft: 5 },
+});
+
 export default AuthScreen;
diff --git a/src/screens/GoalScreen/GoalScreen.tsx b/src/screens/GoalScreen/GoalScreen.tsx
index 2942b083..423bc516 100644
--- a/src/screens/GoalScreen/GoalScreen.tsx
+++ b/src/screens/GoalScreen/GoalScreen.tsx
@@ -3,18 +3,37 @@ import React from 'react';
 import { ScrollView } from 'react-native';
 
 import withHeader from '../../helpers/withHeader';
-import ShortGoalsComponent from '../../components/ShortGoalsComponent/ShortGoalsComponent';
-import LongGoalsComponent from '../../components/LongGoalsComponent';
 import TodoComponent from '../../components/ToDoComponent/TodoComponent';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import {
+  createNativeStackNavigator,
+  NativeStackScreenProps,
+} from '@react-navigation/native-stack';
 import CreatingGoals from '../../components/ToDoComponent/SettingGoals/CreateGoals';
 import MembersPage from '../MemberScreen/MembersPage';
 
-const Stack = createNativeStackNavigator();
-const GoalScreen = () => {
+export type RootStackParamList = {
+  GoalsScreen: undefined;
+  CreatingGoalsSceen: undefined;
+  MembersSceen: {
+    selectedMember: string;
+    setSelectedMember: React.Dispatch<React.SetStateAction<string>>;
+  };
+};
+
+const Stack = createNativeStackNavigator<RootStackParamList>();
+
+export type GoalScreenProp = NativeStackScreenProps<
+  RootStackParamList,
+  'GoalsScreen'
+>;
+
+export const GoalScreen = (props: GoalScreenProp) => {
   return (
     <ScrollView>
-      <TodoComponent data-testid="todo-component" />
+      <TodoComponent
+        data-testid="todo-component"
+        navigation={props.navigation}
+      />
       {/* TODO: moving to v2
       <ShortGoalsComponent />
       <LongGoalsComponent /> */}
@@ -30,9 +49,8 @@ function GoalsScreenStack() {
       }}
     >
       <Stack.Screen name="GoalsScreen" component={GoalScreen} />
-      <Stack.Screen name="CreatingGoals" component={CreatingGoals} />
-      <Stack.Screen name="Member's page" component={MembersPage} />
-
+      <Stack.Screen name="CreatingGoalsSceen" component={CreatingGoals} />
+      <Stack.Screen name="MembersSceen" component={MembersPage} />
     </Stack.Navigator>
   );
 }
diff --git a/src/screens/MemberScreen/MembersPage.tsx b/src/screens/MemberScreen/MembersPage.tsx
index 45e7134e..436f7f8f 100644
--- a/src/screens/MemberScreen/MembersPage.tsx
+++ b/src/screens/MemberScreen/MembersPage.tsx
@@ -8,19 +8,22 @@ import {
 import React, { useEffect, useState } from 'react';
 import SearchBar from '../../components/SearchBar';
 import RenderMemberItem from '../../components/ToDoComponent/RenderMemberItem';
-import { useNavigation, RouteProp, useRoute } from '@react-navigation/native';
 import GoalsApi from '../../constants/apiConstant/GoalsApi';
+import Toast from 'react-native-toast-message';
+import { RootStackParamList } from '../GoalScreen/GoalScreen';
+import { NativeStackScreenProps } from '@react-navigation/native-stack';
 
-type MembersPageRouteProp = RouteProp<RootStackParamList, "Member's page">;
+type MembersSceenProp = NativeStackScreenProps<
+  RootStackParamList,
+  'MembersSceen'
+>;
 
-const MembersPage = () => {
-  const route = useRoute<MembersPageRouteProp>();
+const MembersPage = (props: MembersSceenProp) => {
   const [membersData, setMembersData] = useState([]);
-  const [filterMemberData,setFilterMemberData] = useState([])
-  const { selectedMember, setSelectedMember } = route.params;
+  const [filterMemberData, setFilterMemberData] = useState([]);
+  const { selectedMember, setSelectedMember } = props.route.params;
   const [searchValue, setSearchValue] = useState('');
   const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<null | string>(null);
 
   useEffect(() => {
     callMembersApi();
@@ -36,12 +39,16 @@ const MembersPage = () => {
 
       // Set members data and clear loading and error states
       setMembersData(membersJsonData.members);
-      setFilterMemberData(membersJsonData.members)
+      setFilterMemberData(membersJsonData.members);
       setLoading(false);
-      setError(null);
-    } catch (error) {
+    } catch (_) {
       // Set error state and clear loading state
-      setError('Error fetching members data.');
+      Toast.show({
+        type: 'error',
+        text1: 'Error fetching members data.',
+        position: 'bottom',
+        bottomOffset: 80,
+      });
       setLoading(false);
     }
   };
@@ -61,19 +68,19 @@ const MembersPage = () => {
         setSearchValue={setSearchValue}
         searchValue={searchValue}
         membersData={filterMemberData}
-        setMembersData={setMembersData}
+        setMembersData={() => setMembersData}
+      />
+      <FlatList
+        data={membersData}
+        renderItem={({ item }) => (
+          <RenderMemberItem
+            item={item}
+            setSelectedMember={() => setSelectedMember}
+          />
+        )}
+        keyExtractor={(item) => item.id}
+        ListFooterComponent={renderLoader}
       />
-        <FlatList
-          data={membersData}
-          renderItem={({ item }) => (
-            <RenderMemberItem
-              item={item}
-              setSelectedMember={setSelectedMember}
-            />
-          )}
-          keyExtractor={(item) => item.id}
-          ListFooterComponent={renderLoader}
-        />
     </View>
   );
 };
@@ -89,8 +96,8 @@ const styles = StyleSheet.create({
     textShadowColor: 'rgba(0, 0, 0, 0.5)',
     textShadowOffset: { width: 2, height: 2 },
     textShadowRadius: 2,
-    textAlign:'center',
-    margin:2
+    textAlign: 'center',
+    margin: 2,
   },
   loaderView: { alignItems: 'center', paddingVertical: 20 },
 });
diff --git a/yarn.lock b/yarn.lock
index d2cf0832..b3acc357 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1345,11 +1345,6 @@
   resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.17.tgz#9cb95765940f2841916fc71686598c22a3e4067e"
   integrity sha512-sui8AzHm6TxeEvWT/NEXlz3egYvCUog4tlXA4Xlb2Vxvy3purVXDq/XsM56lJl344U5Aj/jDzkVanOTMWyk4UA==
 
-"@react-navigation/elements@^1.3.17":
-  version "1.3.17"
-  resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.17.tgz#9cb95765940f2841916fc71686598c22a3e4067e"
-  integrity sha512-sui8AzHm6TxeEvWT/NEXlz3egYvCUog4tlXA4Xlb2Vxvy3purVXDq/XsM56lJl344U5Aj/jDzkVanOTMWyk4UA==
-
 "@react-navigation/native-stack@^6.9.12":
   version "6.9.12"
   resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.9.12.tgz#a09fe43ab2fc4c82a1809e3953021d1da4ead85c"
@@ -1358,14 +1353,6 @@
     "@react-navigation/elements" "^1.3.17"
     warn-once "^0.1.0"
 
-"@react-navigation/native@^6.0.8":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.1.6.tgz#84ff5cf85b91f660470fa9407c06c8ee393d5792"
-  integrity sha512-14PmSy4JR8HHEk04QkxQ0ZLuqtiQfb4BV9kkMXD2/jI4TZ+yc43OnO6fQ2o9wm+Bq8pY3DxyerC2AjNUz+oH7Q==
-  dependencies:
-    "@react-navigation/elements" "^1.3.17"
-    warn-once "^0.1.0"
-
 "@react-navigation/native@^6.0.8":
   version "6.1.6"
   resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.1.6.tgz#84ff5cf85b91f660470fa9407c06c8ee393d5792"
@@ -1582,7 +1569,7 @@
   dependencies:
     "@types/react" "^17"
 
-"@types/react-test-renderer@^17.0.1":
+"@types/react-test-renderer@^17.0.2":
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-17.0.2.tgz#5f800a39b12ac8d2a2149e7e1885215bcf4edbbf"
   integrity sha512-+F1KONQTBHDBBhbHuT2GNydeMpPuviduXIVJRB7Y4nma4NR5DrTJfMMZ+jbhEHbpwL+Uqhs1WXh4KHiyrtYTPg==
@@ -2632,11 +2619,11 @@ cosmiconfig@^5.0.5, cosmiconfig@^5.1.0:
     parse-json "^4.0.0"
 
 cross-fetch@^3.1.5:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.6.tgz#bae05aa31a4da760969756318feeee6e70f15d6c"
-  integrity sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g==
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
+  integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==
   dependencies:
-    node-fetch "^2.6.11"
+    node-fetch "^2.6.12"
 
 cross-spawn@^6.0.0:
   version "6.0.5"
@@ -5457,13 +5444,20 @@ node-dir@^0.1.17:
   dependencies:
     minimatch "^3.0.2"
 
-node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.11:
+node-fetch@^2.2.0, node-fetch@^2.6.0:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
   integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
   dependencies:
     whatwg-url "^5.0.0"
 
+node-fetch@^2.6.12:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
+  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"