From edd37d22d28eebe19fededc0a6881692eeb8aecc Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Sun, 10 Nov 2024 19:31:52 -0500
Subject: [PATCH 01/18] Adding in the card component

---
 frontend/src/constants.ts                     |  6 ++--
 .../src/screens/portfolio/PortfolioScreen.tsx | 36 ++++++++++---------
 .../portfolio/components/PortfolioItem.tsx    |  5 +--
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/frontend/src/constants.ts b/frontend/src/constants.ts
index 52baeae..6a9dfc0 100644
--- a/frontend/src/constants.ts
+++ b/frontend/src/constants.ts
@@ -1,4 +1,4 @@
-export const API_URL = "https://b725-155-33-135-24.ngrok-free.app";
-export const SUPABASE_URL = "https://40c4-155-33-135-24.ngrok-free.app";
-export const SUPABASE_JWT_SECRET = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0";
+export const API_URL = "https://bd24-155-33-132-9.ngrok-free.app";
+export const SUPABASE_URL = "https://51f3-155-33-132-9.ngrok-free.app";
+export const SUPABASE_JWT_SECRET = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblY";
 
diff --git a/frontend/src/screens/portfolio/PortfolioScreen.tsx b/frontend/src/screens/portfolio/PortfolioScreen.tsx
index 1404182..f77e15e 100644
--- a/frontend/src/screens/portfolio/PortfolioScreen.tsx
+++ b/frontend/src/screens/portfolio/PortfolioScreen.tsx
@@ -7,6 +7,7 @@ import PortfolioItem from './components/PortfolioItem';
 import PortfolioDetails from './components/PortfolioDetails';
 import UpdateCard from './components/PortfolioUpdateCard';
 
+
 interface PortfolioScreenProps {
   // This actually should be `any`, so disabling the linter rule
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -37,10 +38,10 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
           <StyledView className='flex flex-row justify-between'>
             <StyledText>Your Portfolio</StyledText>
             <StyledView className='items-right justify-right'>
-              {/* <StyledImage
-                source={require('../../assets/images/remove_red_eye.png')}
+              <StyledImage
+                source={require('../../../assets/images/settings.png')}
                 className='w-[6vw] h-[6vw]'
-              ></StyledImage> */}
+              ></StyledImage>
             </StyledView>
           </StyledView>
         </StyledView>
@@ -48,27 +49,28 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
         <PortfolioDetails></PortfolioDetails>
 
         {/* Tab section */}
-        <StyledView className='flex-row justify-center'>
-          <StyledView className = ' py-2.5 px-5 bg-white cursor-pointer transition-colors duration-300 hover:bg-gray-100 active:bg-green-900 active:text-white'>
-              <StyledTouchableOpacity onPress={() => setActiveTab('Your Projects')} className={`items-center py-2 rounded-t-lg ${activeTab === 'Your Projects' ? 'bg-green-900' : 'bg-white'}`}>
-                <StyledText className={`text-lg font-bold ${activeTab === 'Your Projects' ? 'text-white' : 'text-gray-800'}`}>
+        <StyledView className='w-full flex-row justify-center'>
+          <StyledView className = 'w-1/2 rounded'>
+              <StyledTouchableOpacity onPress={() => setActiveTab('Your Projects')} className={`items-center h-14 py-2 rounded-t-lg ${activeTab === 'Your Projects' ? 'bg-white' : 'bg-green-900'}`}>
+                <StyledText className={`text-lg font-bold ${activeTab === 'Your Projects' ? 'text-gray-800' : 'text-white'}`}>
                   Your Projects
                 </StyledText>
               </StyledTouchableOpacity>
             </StyledView>
-            <StyledView className = ' py-2.5 px-5 bg-white cursor-pointer transition-colors duration-300 hover:bg-gray-100 active:bg-green-900 active:text-white'>
-              <StyledTouchableOpacity onPress={() => setActiveTab('Updates')} className={` items-center py-2 rounded-t-lg ${activeTab === 'Updates' ? 'bg-green-900' : 'bg-white'}`}>
-                <StyledText className={`text-lg font-bold ${ activeTab === 'Updates' ? 'text-white' : 'text-gray-800'}`}>
+            <StyledView className = 'w-1/2 rounded'>
+              <StyledTouchableOpacity onPress={() => setActiveTab('Updates')} className={`items-center h-14 py-2 rounded-t-lg ${activeTab === 'Updates' ? 'bg-white' : 'bg-green-900'}`}>
+                <StyledText className={`text-lg font-bold ${ activeTab === 'Updates' ? 'text-gray-800' : 'text-white'}`}>
                   Updates
                 </StyledText>
               </StyledTouchableOpacity>
         </StyledView>
         </StyledView>
 
-        <StyledView className="p-5 bg-gray-50 border border-gray-300 rounded-b-lg">
+       
           {/*Your Projects*/}
         {activeTab === 'Your Projects' ? (
-        <StyledView className='flex w-98 p-[16px_24px] flex-col items-start gap-3 rounded-[27px] bg-white'>
+        <StyledView className = 'bg-green-900'>
+        <StyledView className='flex w-98 p-[16px_24px] flex-col items-start gap-2 rounded-[27px] bg-white'>
           <StyledText className='font-sourceSans3CaptionMedium text-defaultText'>
           {' '}
           8 Total Investments
@@ -145,18 +147,18 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
           completion={0}
           imageUrl={''}
         ></PortfolioItem>
+      </StyledView>
       </StyledView>) 
       : 
         (<StyledView className='flex w-98 p-[16px_24px] flex-col items-start gap-3 rounded-[27px] bg-white'>
           {/* Updates */}
             <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
+            <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
+            <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
+            <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
+            <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
         </StyledView>
           )}
-      </StyledView>
-
-       
-        
-        
       </StyledScrollView>
     </StyledView>
   );
diff --git a/frontend/src/screens/portfolio/components/PortfolioItem.tsx b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
index 80f7a81..44e7321 100644
--- a/frontend/src/screens/portfolio/components/PortfolioItem.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { View, Text, Image, ImageBackground } from 'react-native';
 import { styled } from 'nativewind';
+import Card from "../../../components/Card"
 
 
 const StyledView = styled(View);
@@ -18,7 +19,7 @@ interface PortfolioItemProps {
 
 const PortfolioItem = ({address, location, price, duration, invested, completion, imageUrl} : PortfolioItemProps )=> {
     return (
-        <StyledView className = 'h-100 flex w-75 flex-col items-start p-6 rounded-[8px] border border-border bg-SurfaceFG'>
+        <Card className = 'h-100'>
             <StyledView className = 'flex w-full min-w-38 flex-row items-start self-stretch'>
                 {/* Left Side of the Card*/}
                 <StyledView className = 'flex w-2/3 flex-col items-start'>
@@ -66,7 +67,7 @@ const PortfolioItem = ({address, location, price, duration, invested, completion
                     </StyledView>
                 </StyledView>
             </StyledView>
-        </StyledView>
+        </Card>
     );
 };
 

From 70341d687e27f9e490b2563eee97580bdfc6e1dd Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Sun, 10 Nov 2024 19:50:27 -0500
Subject: [PATCH 02/18] Supabase changes

---
 frontend/src/context/supabase.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/context/supabase.tsx b/frontend/src/context/supabase.tsx
index fa97d74..66bc788 100644
--- a/frontend/src/context/supabase.tsx
+++ b/frontend/src/context/supabase.tsx
@@ -2,9 +2,10 @@ import { AppState } from 'react-native';
 import 'react-native-url-polyfill/auto';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { createClient } from '@supabase/supabase-js';
-import { TS3_SUPABASE_PROJECT_URL, TS3_SUPABASE_JWT_SECRET } from '@env';
+//import { TS3_SUPABASE_PROJECT_URL, TS3_SUPABASE_JWT_SECRET } from '@env';
+import { SUPABASE_JWT_SECRET, SUPABASE_URL } from '../constants';
 
-export const supabase = createClient(TS3_SUPABASE_PROJECT_URL, TS3_SUPABASE_JWT_SECRET, {
+export const supabase = createClient(SUPABASE_URL, SUPABASE_JWT_SECRET, {
   auth: {
     storage: AsyncStorage,
     autoRefreshToken: true,

From b318bfcae11e487bc9f9cd9db554661d22c5b33b Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Mon, 11 Nov 2024 20:13:41 -0500
Subject: [PATCH 03/18] Fonts and more styling

---
 .../src/screens/portfolio/PortfolioScreen.tsx | 165 ++++++++++--------
 .../portfolio/components/PortfolioDetails.tsx |  43 ++---
 .../portfolio/components/PortfolioItem.tsx    |  32 ++--
 3 files changed, 126 insertions(+), 114 deletions(-)

diff --git a/frontend/src/screens/portfolio/PortfolioScreen.tsx b/frontend/src/screens/portfolio/PortfolioScreen.tsx
index f77e15e..1fda1df 100644
--- a/frontend/src/screens/portfolio/PortfolioScreen.tsx
+++ b/frontend/src/screens/portfolio/PortfolioScreen.tsx
@@ -36,7 +36,7 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
       <StyledScrollView contentContainerStyle={{ flexGrow: 1 }} className='flex-1'>
         <StyledView className='flex justify-between items-left self-stretch px-6 py-3'>
           <StyledView className='flex flex-row justify-between'>
-            <StyledText>Your Portfolio</StyledText>
+            <StyledText className = 'font-heading text-[24px]'>Your Portfolio</StyledText>
             <StyledView className='items-right justify-right'>
               <StyledImage
                 source={require('../../../assets/images/settings.png')}
@@ -50,15 +50,15 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
 
         {/* Tab section */}
         <StyledView className='w-full flex-row justify-center'>
-          <StyledView className = 'w-1/2 rounded'>
-              <StyledTouchableOpacity onPress={() => setActiveTab('Your Projects')} className={`items-center h-14 py-2 rounded-t-lg ${activeTab === 'Your Projects' ? 'bg-white' : 'bg-green-900'}`}>
+          <StyledView className = 'w-1/2'>
+              <StyledTouchableOpacity onPress={() => setActiveTab('Your Projects')} className={`items-center h-14 py-2 rounded-tl-[27px] rounded-tr-[27px] ${activeTab === 'Your Projects' ? 'bg-white' : 'bg-defaultPrimary'}`}>
                 <StyledText className={`text-lg font-bold ${activeTab === 'Your Projects' ? 'text-gray-800' : 'text-white'}`}>
                   Your Projects
                 </StyledText>
               </StyledTouchableOpacity>
             </StyledView>
-            <StyledView className = 'w-1/2 rounded'>
-              <StyledTouchableOpacity onPress={() => setActiveTab('Updates')} className={`items-center h-14 py-2 rounded-t-lg ${activeTab === 'Updates' ? 'bg-white' : 'bg-green-900'}`}>
+            <StyledView className = 'w-1/2'>
+              <StyledTouchableOpacity onPress={() => setActiveTab('Updates')} className={`items-center h-14 py-2 rounded-tl-[27px] rounded-tr-[27px] ${activeTab === 'Updates' ? 'bg-white' : 'bg-defaultPrimary'}`}>
                 <StyledText className={`text-lg font-bold ${ activeTab === 'Updates' ? 'text-gray-800' : 'text-white'}`}>
                   Updates
                 </StyledText>
@@ -67,14 +67,25 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
         </StyledView>
 
        
-          {/*Your Projects*/}
+        {/*Your Projects*/}
         {activeTab === 'Your Projects' ? (
-        <StyledView className = 'bg-green-900'>
-        <StyledView className='flex w-98 p-[16px_24px] flex-col items-start gap-2 rounded-[27px] bg-white'>
-          <StyledText className='font-sourceSans3CaptionMedium text-defaultText'>
-          {' '}
+        <StyledView className = 'bg-defaultPrimary'>
+        <StyledView className= {`flex p-[16px] flex-col items-start bg-white ${activeTab === 'Your Projects' ? 'rounded-tr-[27px]' : 'rounded-tl-[27px]'}`}>
+          <StyledText className='font-sourceSans3CaptionMedium text-[14px] mb-4'>
           8 Total Investments
         </StyledText>
+        <StyledView className = 'mb-4'>
+          <PortfolioItem
+            address={''}
+            location={''}
+            price={0}
+            duration={''}
+            invested={0}
+            completion={0}
+            imageUrl={''}
+          ></PortfolioItem>
+        </StyledView>
+        <StyledView className = 'mb-4'>
         <PortfolioItem
           address={''}
           location={''}
@@ -84,79 +95,85 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
           completion={0}
           imageUrl={''}
         ></PortfolioItem>
-        <PortfolioItem
-          address={''}
-          location={''}
-          price={0}
-          duration={''}
-          invested={0}
-          completion={0}
-          imageUrl={''}
-        ></PortfolioItem>
-        <PortfolioItem
-          address={''}
-          location={''}
-          price={0}
-          duration={''}
-          invested={0}
-          completion={0}
-          imageUrl={''}
-        ></PortfolioItem>
-        <PortfolioItem
-          address={''}
-          location={''}
-          price={0}
-          duration={''}
-          invested={0}
-          completion={0}
-          imageUrl={''}
-        ></PortfolioItem>
-        <PortfolioItem
-          address={''}
-          location={''}
-          price={0}
-          duration={''}
-          invested={0}
-          completion={0}
-          imageUrl={''}
-        ></PortfolioItem>
-        <PortfolioItem
-          address={''}
-          location={''}
-          price={0}
-          duration={''}
-          invested={0}
-          completion={0}
-          imageUrl={''}
-        ></PortfolioItem>
-        <PortfolioItem
-          address={''}
-          location={''}
-          price={0}
-          duration={''}
-          invested={0}
-          completion={0}
-          imageUrl={''}
-        ></PortfolioItem>
-        <PortfolioItem
-          address={''}
-          location={''}
-          price={0}
-          duration={''}
-          invested={0}
-          completion={0}
-          imageUrl={''}
-        ></PortfolioItem>
+        </StyledView>
+        <StyledView className = 'mb-4'>
+          <PortfolioItem
+            address={''}
+            location={''}
+            price={0}
+            duration={''}
+            invested={0}
+            completion={0}
+            imageUrl={''}
+          ></PortfolioItem>
+        </StyledView>
+        <StyledView className = 'mb-4'>
+          <PortfolioItem
+            address={''}
+            location={''}
+            price={0}
+            duration={''}
+            invested={0}
+            completion={0}
+            imageUrl={''}
+          ></PortfolioItem>
+        </StyledView>
+        <StyledView className = 'mb-4'>
+          <PortfolioItem
+            address={''}
+            location={''}
+            price={0}
+            duration={''}
+            invested={0}
+            completion={0}
+            imageUrl={''}
+          ></PortfolioItem>
+        </StyledView>
+        <StyledView className = 'mb-4'>
+          <PortfolioItem
+            address={''}
+            location={''}
+            price={0}
+            duration={''}
+            invested={0}
+            completion={0}
+            imageUrl={''}
+          ></PortfolioItem>
+        </StyledView>
+        <StyledView className = 'mb-4'>
+          <PortfolioItem
+            address={''}
+            location={''}
+            price={0}
+            duration={''}
+            invested={0}
+            completion={0}
+            imageUrl={''}
+          ></PortfolioItem>
+        </StyledView>
+        <StyledView className = 'mb-4'>
+          <PortfolioItem
+            address={''}
+            location={''}
+            price={0}
+            duration={''}
+            invested={0}
+            completion={0}
+            imageUrl={''}
+          ></PortfolioItem>
+        </StyledView>
       </StyledView>
       </StyledView>) 
       : 
-        (<StyledView className='flex w-98 p-[16px_24px] flex-col items-start gap-3 rounded-[27px] bg-white'>
+        (<StyledView className = 'bg-defaultPrimary'>
+        <StyledView className={`flex p-[16px] flex-col items-start bg-white ${activeTab === 'Updates' ? 'rounded-tl-[27px]' : 'rounded-tr-[27px]'}`}>
           {/* Updates */}
             <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
             <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
             <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
             <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
             <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
+        </StyledView>
         </StyledView>
           )}
       </StyledScrollView>
diff --git a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
index bea2987..cba3155 100644
--- a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
@@ -12,7 +12,7 @@ const PortfolioDetails = ()=> {
             {/* Top Part */}
             <StyledView className = 'flex flex-col items-start gap-1 self-stretch'>
                 <StyledView className = 'flex flex-row'> 
-                    <StyledText>Net Portfolio Value</StyledText>
+                    <StyledText className = 'font-body text-[16px]'>Net Portfolio Value</StyledText>
                     <StyledView className = 'px-2'>
                         <StyledImage
                             source={require('../../../../assets/images/remove_red_eye.png')}
@@ -20,45 +20,36 @@ const PortfolioDetails = ()=> {
                         ></StyledImage>
                     </StyledView>
                 </StyledView>
-                <StyledText className = 'font-bold'>$12,345.67</StyledText>
+                <StyledText className = 'font-bold text-[32px]'>$12,345.67</StyledText>
                 <StyledView className = 'flex flex-row justify-between items-center'>
-                    <StyledText className = 'color-success'>$350.23</StyledText>
-                    <StyledText className = 'color-success px-4'>+ 9.70%</StyledText>
-                    <StyledText>Total Return</StyledText>
+                    <StyledText className = 'color-success font-sourceSans3Bold text-[16px]'>+ $350.23</StyledText>
+                    <StyledText className = 'color-success px-4 font-sourceSans3Bold text-[16px]'>+ 9.70%</StyledText>
+                    <StyledText className = 'font-bodyBold text-[16px]'>Total Return</StyledText>
                 </StyledView>
             </StyledView>
             {/* Four grid */}
-            <StyledView className = 'flex flex-col p-4 w-full items-center'> 
-                <StyledView className = 'flex-row gap-5 p-4'>
-                    <StyledView className = 'flex justify-center w-1/2'>
-                        <StyledView className = 'flex flex-col items-start gap-1'>
-                            <StyledText> Market Value</StyledText>
-                            <StyledText> $10,000.00</StyledText>
-                        </StyledView>
+            <StyledView className = 'w-full flex-row justify-between'> 
+                <StyledView className = 'flex flex-col gap-6'>
+                    <StyledView className = 'flex flex-col items-start gap-1'>
+                        <StyledText className = 'font-body text-[16px]'>Market Value</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>$10,000.00</StyledText>
                     </StyledView>
-                    <StyledView className = 'flex justify-center w-1/2 items-end'>
                         <StyledView className = 'flex flex-col items-start gap-1'>
-                            <StyledText> Cash Value</StyledText>
-                            <StyledText> $2,345.67</StyledText>
-                        </StyledView>
+                        <StyledText className = 'font-body text-[16px]'>Cash Value</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>$2,345.67</StyledText>
                     </StyledView>
                 </StyledView>
-            <StyledView className = 'flex-row gap-5 p-4 '>
-                <StyledView className = 'flex justify-center w-1/2'>
+                <StyledView className = 'flex flex-col gap-6'>
                     <StyledView className = 'flex flex-col items-start gap-1'>
-                            <StyledText> Total Positions</StyledText>
-                            <StyledText> 11</StyledText>
+                        <StyledText className = 'font-body text-[16px]'>Total Positions</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[18px]'> 11</StyledText>
                     </StyledView>
-                </StyledView>
-                <StyledView className = 'flex justify-center w-1/2 items-end'>
                     <StyledView className = 'flex flex-col items-start gap-1'>
-                            <StyledText> Exp Maturity</StyledText>
-                            <StyledText> 12.5 Years</StyledText>
+                        <StyledText className = 'font-body text-[16px]'>Exp Maturity</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>12.5 Years</StyledText>
                     </StyledView>
                 </StyledView>
             </StyledView>
-            </StyledView>
-
         </StyledView>
 
     );
diff --git a/frontend/src/screens/portfolio/components/PortfolioItem.tsx b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
index 44e7321..0950010 100644
--- a/frontend/src/screens/portfolio/components/PortfolioItem.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { View, Text, Image, ImageBackground } from 'react-native';
 import { styled } from 'nativewind';
 import Card from "../../../components/Card"
+import Tag from "../../../components/Tag"
 
 
 const StyledView = styled(View);
@@ -17,29 +18,32 @@ interface PortfolioItemProps {
     imageUrl: string;
 }
 
-const PortfolioItem = ({address, location, price, duration, invested, completion, imageUrl} : PortfolioItemProps )=> {
+const PortfolioItem = ({address, location, price, duration, invested, completion, imageUrl} : PortfolioItemProps & { className?: string })=> {
     return (
         <Card className = 'h-100'>
             <StyledView className = 'flex w-full min-w-38 flex-row items-start self-stretch'>
                 {/* Left Side of the Card*/}
                 <StyledView className = 'flex w-2/3 flex-col items-start'>
                     <StyledView className = 'flex flex-col items-start p-1 self-stretch space-y-2 mb-2'>
-                        <StyledText className = 'font-sourceSans3BodyBold' >333 Market Street</StyledText>
-                        <StyledText className = 'font-sourceSans3CaptionMedium text-defaultText' >San Francisco, CA</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[16px]' >333 Market Street</StyledText>
+                        <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >San Francisco, CA</StyledText>
                         <StyledView className = 'py-3'>
-                            <StyledText className = 'font-sourceSans3CaptionMedium text-defaultText' >Commercial Development</StyledText>
-                        </StyledView>
-                        <StyledView className="flex py-1 px-3 gap-1 items-center rounded-[8px] bg-border mb-3">
-                            <StyledText className="font-sourceSans3CaptionMedium text-defaultText">Land Control Secured</StyledText>
+                            <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Commercial Development</StyledText>
                         </StyledView>
+                    
+                        <Tag> 
+                            <StyledView className="flex py-1 px-3 gap-1 items-center rounded-[8px] bg-border mb-3">
+                                <StyledText className="font-sourceSans3CaptionMedium text-defaultText">Land Control Secured</StyledText>
+                            </StyledView>
+                        </Tag>
                         <StyledView className = 'flex flex-row items-start justify-between w-full mb-3'>
                             <StyledView className = 'flex justify-between items-start mr-4'>
-                                <StyledText className = 'font-sourceSans3CaptionMedium text-defaultText' >Value</StyledText>
-                                <StyledText className = 'font-sourceSans3BodyBold text-defaultText' >$250.00</StyledText>
+                                <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Final Value</StyledText>
+                                <StyledText className = 'font-sourceSans3BodyBold text-[16px]' >$350.00</StyledText>
                             </StyledView>
                             <StyledView className = 'flex flex-col items-start'>
-                                <StyledText className = 'font-sourceSans3CaptionMedium text-defaultText' >Exp Return</StyledText>
-                                <StyledText className = 'font-sourceSans3BodyBold text-defaultText' >5.12%</StyledText>
+                                <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Initial Value</StyledText>
+                                <StyledText className = 'font-sourceSans3BodyBold text-[16px]' >$250.00</StyledText>
                             </StyledView>
 
                         </StyledView>
@@ -61,9 +65,9 @@ const PortfolioItem = ({address, location, price, duration, invested, completion
                             }}>                       
                         </ImageBackground>
                     </StyledView>
-                    <StyledView className = 'flex flex-col w-full justify-between items-end '>
-                        <StyledText className = 'font-sourceSans3CaptionMedium text-defaultText' >Time Line</StyledText>
-                        <StyledText className = 'font-sourceSans3BodyBold text-defaultText' >6 Years</StyledText>
+                    <StyledView className = 'flex flex-col w-full py-1 justify-between items-end '>
+                        <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Total Returns</StyledText>
+                        <StyledText className = 'font-sourceSans3BodyBold text-[16px]' >+5.12%</StyledText>
                     </StyledView>
                 </StyledView>
             </StyledView>

From e5e88ccbd3d7faec7dffcad29b5c1b981980f15f Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Mon, 11 Nov 2024 20:26:45 -0500
Subject: [PATCH 04/18] Added tasks to do

---
 frontend/src/screens/portfolio/components/PortfolioItem.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/screens/portfolio/components/PortfolioItem.tsx b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
index 0950010..4d1b126 100644
--- a/frontend/src/screens/portfolio/components/PortfolioItem.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
@@ -1,3 +1,6 @@
+//TO DO Add the tag component 
+//TO DO Make the updates page inline with the figma 
+
 import React from 'react';
 import { View, Text, Image, ImageBackground } from 'react-native';
 import { styled } from 'nativewind';

From 66ca47b4535795a0a46e2b6f400f837c2cea9f85 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Mon, 18 Nov 2024 16:24:18 -0500
Subject: [PATCH 05/18] Adding the tag component

---
 frontend/assets/images/celebration.png        |  Bin 0 -> 290 bytes
 frontend/assets/images/design_services.png    |  Bin 0 -> 441 bytes
 frontend/assets/images/handyman.png           |  Bin 0 -> 458 bytes
 frontend/assets/images/house.png              |  Bin 0 -> 362 bytes
 frontend/assets/images/maps_home_work.png     |  Bin 0 -> 374 bytes
 frontend/assets/images/topic.png              |  Bin 0 -> 292 bytes
 frontend/package-lock.json                    |  868 ++++---
 frontend/package.json                         |    3 +-
 frontend/src/constants.ts                     |    6 +-
 .../src/screens/portfolio/PortfolioScreen.tsx |   13 +
 .../portfolio/components/PortfolioItem.tsx    |   44 +-
 frontend/yarn.lock                            | 2037 +++--------------
 12 files changed, 1031 insertions(+), 1940 deletions(-)
 create mode 100644 frontend/assets/images/celebration.png
 create mode 100644 frontend/assets/images/design_services.png
 create mode 100644 frontend/assets/images/handyman.png
 create mode 100644 frontend/assets/images/house.png
 create mode 100644 frontend/assets/images/maps_home_work.png
 create mode 100644 frontend/assets/images/topic.png

diff --git a/frontend/assets/images/celebration.png b/frontend/assets/images/celebration.png
new file mode 100644
index 0000000000000000000000000000000000000000..c20b13bb7d10102da68a906c8652de35bd042857
GIT binary patch
literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{&r6n$B+ufy+H?g4;k=mnW3Ou($XVf_JZRk
z%Zvp%2RI}Zl?|NS8hCqj*PYN(ROGjKd1ckRx$CbB{FORm!<jDC+A+sa<B)-h*u5T4
zk+?HCVUOo|9_!ZHap;J$@1;t8N25oJ1*?B|nr@7LocU(fj;)ms)wxa;FLN>FJZlsv
zlkcO}!C$c~ChO6O_ZvK~`Ne&YZaz|)@`^FqZsC?K)-lehW#aQ%s(&dt9y8PZct-iS
i7@Oe!6BqY?WH{>{{Q2Kmp~*lmFnGH9xvX<aXaWGuU~26E

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/design_services.png b/frontend/assets/images/design_services.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd27158db421e1d900f7ff61eeb01622eee001f
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0ZvIoK~#7F%~CsV
zgFq1F+f$|_Hy{lXqT&Q0CkQ@4WDpXa@d3b_6WG2%(j}GU2Fm0H@ey2ufV@Gw)*6wt
z$w&jUv-94(on1xwYt!XLk|a-_=e_y9e^XV}yS$fWneDpn2llPHu8$(Gi6D;S)i4YU
z;Y;855y-YOLEE+){A_qmwIXjwH94G>Ww`{{0U41frfII5rg`kTZlUYCjl6@p2)@2j
zpsMPgHqtb8px}u01Byd{zla>*4M+m6Fu33*GuQ!ikKzD+2Kc~b3mX;67)@RjMG>L%
zD>@x!z-M%RRwkxR6F76uLt9Fp=mS-&UkT`{cxOun)0v@c!3VpYC6K`Oq=^Mp7Dz&n
ze9~ZLk_*8Mm^$BznHYw_Frzz7(`eA4D3ag76dW+dPKZhNj!5tyADP16z?Fg@z@yRa
jpzEG@Ug9cq<=@yhE6BZSE=I|O00000NkvXXu0mjf9Spgy

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/handyman.png b/frontend/assets/images/handyman.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdcbe4465f7477200d09fd69a855956acb1229cf
GIT binary patch
literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0bfZ(K~#7Ftx~&j
zgFq1Fqui9B4(v>$3{_yc1E~W>Kx~vbfk73>uE3%K$q|GOoe5_SF~or1lkYTVe4|J^
zbHnZ1eed>zVO-OqC~|c8YPEXA@pLguUVPu*)^&Xh!|-lMrZ&!P5CpDP0OWb!_X}K|
zwr%%nC8lY*I0szauIu)E=$}9w$2%mw2+V1k#+3<(%^=R$m_8p;MJy$8fzJ|Whor6A
z3dAe*Rf@=&n1;si!ZVWYZQGvFXIl`-fZbS@wLvSaV3Q<CsufU0L<O0s@MNCnjrmQ}
zwA2bPVKf?zIW*3OWMU)?bFCr3wV})-$(#qt5)&)^W9E=-{O(-Zk^@95uL>5S_qBBF
z3*-`2tU>;Q$Q-`>H{9uTYUFwTb`}sTc^Z&s?71k4YBHH*8j){^6sH*=Sn9|U;GGy_
z0;=F2&J{rE1B#yzau9gXO<PuiVY(vc-MEJR084+*N*>u}O#lD@07*qoM6N<$g1@!F
A;Q#;t

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/house.png b/frontend/assets/images/house.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee55c8d5a4d33c9b150bce5e02cb41060fca3915
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{(nyw$B+ufvw^z<nGFT*UagQ=Bt6xEQ;*Tg
zK(;`VZ|*~mi61&S4qm)?FqVA=p9^b1Q$dUDi^}qIpT6hm6+D`I@l4%4cWuGBB{xn!
zb~wMQu6oyv;|0=|v-jK)evl<%El_J5;PusT_ukXO>#loVn{daV(j<YOWz+ZPP8{Z2
z4Z~G*1lSn9O8=NGn)6WS+4H3j^j|YpyY0DVBNg10v0qH}eER=z#qvbmgzoU}qklG^
zeR`nO`$&fJlf?%Fl_f*wrabW8_>xVH_fUb2>yi80x?_Gj_U~!+uQm9uVRm(|nR?{$
z^KHq?E0_I0e`m+Mh02dJ8t01k7>4$IEMIE#_SJkh9YzVEf}2aMUa|v&g2B_(&t;uc
GLK6TubdgU0

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/maps_home_work.png b/frontend/assets/images/maps_home_work.png
new file mode 100644
index 0000000000000000000000000000000000000000..c40b4ace8f25c98e363f736ad8f6050c62a1c3ca
GIT binary patch
literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0Sie)K~#7F#Zo&?
z!$1(7H$;jn@DY3j=LS9koB*dIl_^OVDnu$8M7oF*a0EC4H(-xoQ8|%3liA3L9Lsi+
zDo@(qyq($iMoV;Qpo<7UULpm)l_=`C;&@n$xT^pKK~DXM%3^psXhyFW^NdJhDvD<W
z!AMuDnT4}T?vGzhRkFLkR}d~|;mzXp%aY&hm<sSG>vi`3@bt*4V@r0T`UxBL2T}P=
z%<r<zuYc8&#(wXM);YB}hwt-PdYa|sdOn{_9RqjNP{71xOve#zXOWx$trG(}17f|g
z<^E7X1J*S7!Ikd=ZZb`q@$P@n0&8|!0{sg5U=|Y8{=k)T?hCjRa$Rc-@=F)T2GWUP
U0&>;STL1t607*qoM6N<$f==d_H~;_u

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/topic.png b/frontend/assets/images/topic.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5daec223abae15a8c5c0ba42f0f5301b005cd3c
GIT binary patch
literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{!UL9$B+ufvq8Ig4=V`RPPkjml0T{E0k2a3
z1Aj;H<%=E8JP6$5c|uBL!eOBx5qVBOVf)VekMBJ$VL!0{;G;B|<C}}u^`)QN8R(@O
z$yR&ce@9H`Z_n)7-&q$*@1Bv^eZX!@hF$Rw+2sbJ?{(5PRlN6g3VE0j*V*eBIc@Ef
zO95GmF1c&}<}@&t>u4?IFPC1Y@F=Q@TXq$v+zO>hjhZ5z*EelUYnW=jLB2m!+W)YD
j$&Gzl;j(suGEDwof(;usIOJ6UJ;C7V>gTe~DWM4fjA?22

literal 0
HcmV?d00001

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index b04333f..88b366b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,13 +21,13 @@
         "axios": "^1.7.4",
         "class-variance-authority": "^0.7.0",
         "eslint": "^9.9.0",
-        "expo": "^52.0.5",
+        "expo": "52",
         "expo-font": "~13.0.1",
         "expo-splash-screen": "~0.29.8",
         "expo-status-bar": "~2.0.0",
         "nativewind": "^2.0.11",
         "nvm": "^0.0.4",
-        "react": "^18.3.1",
+        "react": "18.3.1",
         "react-dom": "18.3.1",
         "react-native": "0.76.1",
         "react-native-dotenv": "^3.4.11",
@@ -42,7 +42,8 @@
         "react-test-renderer": "18.1.0",
         "ts-jest": "^29.2.4",
         "typescript": "~5.3.3",
-        "uuid": "^10.0.0"
+        "uuid": "^10.0.0",
+        "wonka": "^6.3.4"
       },
       "devDependencies": {
         "@babel/core": "^7.25.2",
@@ -86,7 +87,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
       "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -189,7 +189,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz",
       "integrity": "sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==",
-      "dev": true,
       "dependencies": {
         "@babel/traverse": "^7.24.7",
         "@babel/types": "^7.24.7"
@@ -472,7 +471,6 @@
       "version": "7.25.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz",
       "integrity": "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.8",
         "@babel/traverse": "^7.25.3"
@@ -488,7 +486,6 @@
       "version": "7.25.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz",
       "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.8"
       },
@@ -503,7 +500,6 @@
       "version": "7.25.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz",
       "integrity": "sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.8"
       },
@@ -518,7 +514,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz",
       "integrity": "sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
@@ -535,7 +530,6 @@
       "version": "7.25.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz",
       "integrity": "sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.8",
         "@babel/traverse": "^7.25.0"
@@ -632,7 +626,6 @@
       "version": "7.21.0-placeholder-for-preset-env.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
       "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       },
@@ -756,7 +749,6 @@
       "version": "7.25.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz",
       "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.8"
       },
@@ -930,7 +922,6 @@
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
       "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -993,7 +984,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz",
       "integrity": "sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7"
       },
@@ -1037,7 +1027,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz",
       "integrity": "sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.24.7",
         "@babel/helper-plugin-utils": "^7.24.7",
@@ -1110,7 +1099,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz",
       "integrity": "sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.24.7",
         "@babel/helper-plugin-utils": "^7.24.7"
@@ -1126,7 +1114,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz",
       "integrity": "sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7"
       },
@@ -1141,7 +1128,6 @@
       "version": "7.25.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz",
       "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.25.0",
         "@babel/helper-plugin-utils": "^7.24.8"
@@ -1157,7 +1143,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
       "integrity": "sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
@@ -1173,7 +1158,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz",
       "integrity": "sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
         "@babel/helper-plugin-utils": "^7.24.7"
@@ -1250,7 +1234,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz",
       "integrity": "sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
@@ -1295,7 +1278,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz",
       "integrity": "sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7"
       },
@@ -1310,7 +1292,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz",
       "integrity": "sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-module-transforms": "^7.24.7",
         "@babel/helper-plugin-utils": "^7.24.7"
@@ -1342,7 +1323,6 @@
       "version": "7.25.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz",
       "integrity": "sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-module-transforms": "^7.25.0",
         "@babel/helper-plugin-utils": "^7.24.8",
@@ -1360,7 +1340,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz",
       "integrity": "sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-module-transforms": "^7.24.7",
         "@babel/helper-plugin-utils": "^7.24.7"
@@ -1391,7 +1370,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz",
       "integrity": "sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7"
       },
@@ -1453,7 +1431,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz",
       "integrity": "sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/helper-replace-supers": "^7.24.7"
@@ -1546,7 +1523,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz",
       "integrity": "sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7"
       },
@@ -1669,7 +1645,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz",
       "integrity": "sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7"
       },
@@ -1760,7 +1735,6 @@
       "version": "7.24.8",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz",
       "integrity": "sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.8"
       },
@@ -1793,7 +1767,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz",
       "integrity": "sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.7"
       },
@@ -1808,7 +1781,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz",
       "integrity": "sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.24.7",
         "@babel/helper-plugin-utils": "^7.24.7"
@@ -1839,7 +1811,6 @@
       "version": "7.25.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz",
       "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.25.2",
         "@babel/helper-plugin-utils": "^7.24.8"
@@ -1855,7 +1826,6 @@
       "version": "7.25.4",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz",
       "integrity": "sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==",
-      "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.25.4",
         "@babel/helper-compilation-targets": "^7.25.2",
@@ -1968,7 +1938,6 @@
       "version": "0.1.6-no-external-plugins",
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
       "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/types": "^7.4.4",
@@ -2162,8 +2131,7 @@
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
     },
     "node_modules/@egjs/hammerjs": {
       "version": "2.0.17",
@@ -4337,7 +4305,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -4354,7 +4321,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -4369,7 +4335,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -4385,7 +4350,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4396,14 +4360,12 @@
     "node_modules/@jest/console/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/@jest/console/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -4412,7 +4374,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4424,7 +4385,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
       "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
-      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/reporters": "^29.7.0",
@@ -4471,7 +4431,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -4486,7 +4445,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -4502,7 +4460,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4513,14 +4470,12 @@
     "node_modules/@jest/core/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/@jest/core/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -4529,7 +4484,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -4543,7 +4497,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -4554,14 +4507,12 @@
     "node_modules/@jest/core/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/@jest/core/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4598,7 +4549,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
-      "dev": true,
       "dependencies": {
         "expect": "^29.7.0",
         "jest-snapshot": "^29.7.0"
@@ -4611,7 +4561,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
       "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-      "dev": true,
       "dependencies": {
         "jest-get-type": "^29.6.3"
       },
@@ -4639,7 +4588,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
       "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
-      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -4654,7 +4602,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
       "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
-      "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^29.7.0",
@@ -4697,7 +4644,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -4712,7 +4658,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -4728,7 +4673,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4739,14 +4683,12 @@
     "node_modules/@jest/reporters/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/@jest/reporters/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -4755,7 +4697,6 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
       "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
-      "dev": true,
       "dependencies": {
         "@babel/core": "^7.23.9",
         "@babel/parser": "^7.23.9",
@@ -4771,7 +4712,6 @@
       "version": "7.6.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
       "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4783,7 +4723,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4806,7 +4745,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
       "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
@@ -4820,7 +4758,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
-      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -4835,7 +4772,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
-      "dev": true,
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
@@ -6027,6 +5963,38 @@
         "@types/responselike": "^1.0.0"
       }
     },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/@types/geojson": {
       "version": "7946.0.14",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
@@ -6126,6 +6094,14 @@
         "parse5": "^7.0.0"
       }
     },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
@@ -6160,13 +6136,13 @@
       "version": "15.7.12",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
       "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@types/react": {
       "version": "18.3.5",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz",
       "integrity": "sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -6500,6 +6476,182 @@
         "@urql/core": "^5.0.0"
       }
     },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
     "node_modules/@xmldom/xmldom": {
       "version": "0.7.13",
       "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
@@ -6508,6 +6660,22 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "peer": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true
+    },
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@@ -6634,6 +6802,17 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/anser": {
       "version": "1.4.10",
       "resolved": "https://registry.npmjs.org/anser/-/anser-1.4.10.tgz",
@@ -7246,7 +7425,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -7574,7 +7752,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
       "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-      "dev": true,
       "engines": {
         "node": ">= 6"
       }
@@ -7632,7 +7809,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -7650,7 +7826,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -7674,7 +7849,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -7708,6 +7882,17 @@
         "node": ">=12.13.0"
       }
     },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
     "node_modules/chromium-edge-launcher": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/chromium-edge-launcher/-/chromium-edge-launcher-0.2.0.tgz",
@@ -7751,8 +7936,7 @@
     "node_modules/cjs-module-lexer": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
-      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
-      "dev": true
+      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA=="
     },
     "node_modules/class-variance-authority": {
       "version": "0.7.0",
@@ -7848,7 +8032,6 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "dev": true,
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -7857,8 +8040,7 @@
     "node_modules/collect-v8-coverage": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-      "dev": true
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
     },
     "node_modules/color": {
       "version": "4.2.3",
@@ -8098,7 +8280,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
       "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -8119,7 +8300,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8134,7 +8314,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8150,7 +8329,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8161,14 +8339,12 @@
     "node_modules/create-jest/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/create-jest/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8177,7 +8353,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8286,7 +8461,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/data-urls": {
       "version": "3.0.2",
@@ -8412,7 +8587,6 @@
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
       "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
-      "dev": true,
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
       },
@@ -8605,7 +8779,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8613,14 +8786,12 @@
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-      "dev": true
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
     },
     "node_modules/diff-sequences": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
       "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -8640,8 +8811,7 @@
     "node_modules/dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-      "dev": true
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
     },
     "node_modules/doctrine": {
       "version": "2.1.0",
@@ -8735,7 +8905,6 @@
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
       "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -8764,6 +8933,21 @@
         "once": "^1.4.0"
       }
     },
+    "node_modules/enhanced-resolve": {
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/entities": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -8913,6 +9097,14 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/es-object-atoms": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
@@ -9345,6 +9537,17 @@
         "node": ">=6"
       }
     },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
     "node_modules/exec-async": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/exec-async/-/exec-async-2.2.0.tgz",
@@ -9452,7 +9655,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -9461,7 +9663,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
-      "dev": true,
       "dependencies": {
         "@jest/expect-utils": "^29.7.0",
         "jest-get-type": "^29.6.3",
@@ -10408,6 +10609,14 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true
+    },
     "node_modules/globals": {
       "version": "15.9.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-15.9.0.tgz",
@@ -10639,8 +10848,7 @@
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
     },
     "node_modules/http-cache-semantics": {
       "version": "4.1.1",
@@ -10798,7 +11006,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
       "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
-      "dev": true,
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -10955,7 +11162,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -11088,7 +11294,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -11403,7 +11608,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dev": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -11417,7 +11621,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -11426,7 +11629,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -11438,7 +11640,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dev": true,
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -11452,7 +11653,6 @@
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -11574,7 +11774,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
       "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
-      "dev": true,
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -11600,7 +11799,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
       "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
-      "dev": true,
       "dependencies": {
         "execa": "^5.0.0",
         "jest-util": "^29.7.0",
@@ -11614,7 +11812,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -11637,7 +11834,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -11649,7 +11845,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -11661,7 +11856,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -11670,7 +11864,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -11682,7 +11875,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -11697,7 +11889,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
       "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
-      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -11728,7 +11919,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -11743,7 +11933,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -11759,7 +11948,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -11770,14 +11958,12 @@
     "node_modules/jest-circus/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-circus/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -11786,7 +11972,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -11800,7 +11985,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -11811,14 +11995,12 @@
     "node_modules/jest-circus/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/jest-circus/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -11830,7 +12012,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
       "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
-      "dev": true,
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/test-result": "^29.7.0",
@@ -11863,7 +12044,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -11878,7 +12058,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -11894,7 +12073,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -11905,14 +12083,12 @@
     "node_modules/jest-cli/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-cli/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -11921,7 +12097,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -11933,7 +12108,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
       "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-      "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/test-sequencer": "^29.7.0",
@@ -11978,7 +12152,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -11993,7 +12166,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12009,7 +12181,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12020,14 +12191,12 @@
     "node_modules/jest-config/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-config/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12036,7 +12205,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -12050,7 +12218,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12061,14 +12228,12 @@
     "node_modules/jest-config/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/jest-config/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12080,7 +12245,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
       "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.6.3",
@@ -12095,7 +12259,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12110,7 +12273,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12126,7 +12288,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12137,14 +12298,12 @@
     "node_modules/jest-diff/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-diff/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12153,7 +12312,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -12167,7 +12325,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12178,14 +12335,12 @@
     "node_modules/jest-diff/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/jest-diff/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12197,7 +12352,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
       "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-      "dev": true,
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
@@ -12209,7 +12363,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
       "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -12225,7 +12378,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12240,7 +12392,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12256,7 +12407,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12267,14 +12417,12 @@
     "node_modules/jest-each/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-each/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12283,7 +12431,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -12297,7 +12444,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12308,14 +12454,12 @@
     "node_modules/jest-each/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/jest-each/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12445,6 +12589,28 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/jest-expo/node_modules/react-dom": {
+      "version": "19.0.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-56G4Pum5E7FeGL1rwHX5IxidSJxQnXP4yORRo0pVeOJuu5DQJvNKpUwmJoftMP/ez0AiglYTY77L2Gs8iyt1Hg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "scheduler": "0.25.0-rc-6230622a1a-20240610"
+      },
+      "peerDependencies": {
+        "react": "19.0.0-rc-6230622a1a-20240610"
+      }
+    },
+    "node_modules/jest-expo/node_modules/react-dom/node_modules/scheduler": {
+      "version": "0.25.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-GTIQdJXthps5mgkIFo7yAq03M0QQYTfN8z+GrnMC/SCKFSuyFP5tk2BMaaWUsVy4u4r+dTLdiXH8JEivVls0Bw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/jest-expo/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
@@ -12522,7 +12688,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
       "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
-      "dev": true,
       "dependencies": {
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.7.0"
@@ -12535,7 +12700,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12547,7 +12711,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -12560,14 +12723,12 @@
     "node_modules/jest-leak-detector/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/jest-matcher-utils": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
       "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "jest-diff": "^29.7.0",
@@ -12582,7 +12743,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12597,7 +12757,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12613,7 +12772,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12624,14 +12782,12 @@
     "node_modules/jest-matcher-utils/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-matcher-utils/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12640,7 +12796,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -12654,7 +12809,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -12665,14 +12819,12 @@
     "node_modules/jest-matcher-utils/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/jest-matcher-utils/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12809,7 +12961,6 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       },
@@ -12834,7 +12985,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
       "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
@@ -12854,7 +13004,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
       "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
-      "dev": true,
       "dependencies": {
         "jest-regex-util": "^29.6.3",
         "jest-snapshot": "^29.7.0"
@@ -12867,7 +13016,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12882,7 +13030,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -12898,7 +13045,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12909,14 +13055,12 @@
     "node_modules/jest-resolve/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-resolve/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12925,7 +13069,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12937,7 +13080,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
       "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
-      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/environment": "^29.7.0",
@@ -12969,7 +13111,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12984,7 +13125,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13000,7 +13140,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13011,14 +13150,12 @@
     "node_modules/jest-runner/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-runner/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -13027,7 +13164,6 @@
       "version": "0.5.13",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dev": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -13037,7 +13173,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13049,7 +13184,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
       "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -13082,7 +13216,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -13097,7 +13230,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13113,7 +13245,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13124,14 +13255,12 @@
     "node_modules/jest-runtime/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-runtime/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -13140,7 +13269,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13152,7 +13280,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
       "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-      "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
@@ -13183,7 +13310,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -13198,7 +13324,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13214,7 +13339,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13225,14 +13349,12 @@
     "node_modules/jest-snapshot/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-snapshot/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -13241,7 +13363,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -13255,7 +13376,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -13266,14 +13386,12 @@
     "node_modules/jest-snapshot/node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/jest-snapshot/node_modules/semver": {
       "version": "7.6.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
       "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -13285,7 +13403,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13753,7 +13870,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
       "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
-      "dev": true,
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -13772,7 +13888,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -13787,7 +13902,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -13803,7 +13917,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -13814,14 +13927,12 @@
     "node_modules/jest-watcher/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-watcher/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -13830,7 +13941,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -13883,7 +13993,6 @@
       "version": "1.21.6",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
       "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
-      "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -14099,8 +14208,7 @@
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
@@ -14444,7 +14552,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
       "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -14454,6 +14561,17 @@
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
     "node_modules/locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -14543,7 +14661,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -14558,7 +14675,6 @@
       "version": "7.6.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
       "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -15612,7 +15728,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
       "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "dev": true,
       "engines": {
         "node": ">= 6"
       }
@@ -15923,7 +16038,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -16059,7 +16173,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16076,7 +16189,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -16212,7 +16324,6 @@
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
       "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
-      "dev": true,
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
@@ -16229,7 +16340,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
       "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
-      "dev": true,
       "dependencies": {
         "camelcase-css": "^2.0.1"
       },
@@ -16248,7 +16358,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
       "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -16283,7 +16392,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
       "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
-      "dev": true,
       "engines": {
         "node": ">=14"
       },
@@ -16295,7 +16403,6 @@
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
       "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
-      "dev": true,
       "bin": {
         "yaml": "bin.mjs"
       },
@@ -16492,7 +16599,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
       "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -16574,6 +16680,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -17073,7 +17190,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-      "dev": true,
       "dependencies": {
         "pify": "^2.3.0"
       }
@@ -17103,7 +17219,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -17115,7 +17230,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -17334,7 +17448,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
       "dependencies": {
         "resolve-from": "^5.0.0"
       },
@@ -17505,6 +17618,26 @@
         "loose-envify": "^1.1.0"
       }
     },
+    "node_modules/schema-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/selfsigned": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
@@ -17600,6 +17733,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "peer": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
     "node_modules/serve-static": {
       "version": "1.16.0",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz",
@@ -17969,7 +18113,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dev": true,
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -18136,7 +18279,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -18333,7 +18475,6 @@
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
       "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
-      "dev": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -18371,7 +18512,6 @@
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
       "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -18392,6 +18532,17 @@
         "postcss": "^8.2.14"
       }
     },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/tar": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
@@ -18568,6 +18719,86 @@
         "node": ">=10"
       }
     },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.10",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.20",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -19164,7 +19395,6 @@
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
       "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -19222,6 +19452,21 @@
       "resolved": "https://registry.npmjs.org/warn-once/-/warn-once-0.1.1.tgz",
       "integrity": "sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q=="
     },
+    "node_modules/watchpack": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
@@ -19248,6 +19493,91 @@
         "node": ">=12"
       }
     },
+    "node_modules/webpack": {
+      "version": "5.96.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.17.1",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.11",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.10",
+        "watchpack": "^2.4.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/whatwg-encoding": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 71a1ee4..e5caf9f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -47,7 +47,8 @@
     "react-test-renderer": "18.1.0",
     "ts-jest": "^29.2.4",
     "typescript": "~5.3.3",
-    "uuid": "^10.0.0"
+    "uuid": "^10.0.0",
+    "wonka": "^6.3.4"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/frontend/src/constants.ts b/frontend/src/constants.ts
index 6a9dfc0..40bfccb 100644
--- a/frontend/src/constants.ts
+++ b/frontend/src/constants.ts
@@ -1,4 +1,4 @@
-export const API_URL = "https://bd24-155-33-132-9.ngrok-free.app";
-export const SUPABASE_URL = "https://51f3-155-33-132-9.ngrok-free.app";
-export const SUPABASE_JWT_SECRET = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblY";
+export const API_URL = "https://6482-155-33-135-54.ngrok-free.app";
+export const SUPABASE_URL = " https://4006-155-33-135-54.ngrok-free.app";
+export const SUPABASE_JWT_SECRET = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0";
 
diff --git a/frontend/src/screens/portfolio/PortfolioScreen.tsx b/frontend/src/screens/portfolio/PortfolioScreen.tsx
index 1fda1df..5e68539 100644
--- a/frontend/src/screens/portfolio/PortfolioScreen.tsx
+++ b/frontend/src/screens/portfolio/PortfolioScreen.tsx
@@ -1,3 +1,4 @@
+//Change loading page and if a portfolio cant be loaded page
 import React, { useState } from 'react';
 import { Image, Text, View, TouchableOpacity} from 'react-native';
 import { NavigationScreenProp } from 'react-navigation';
@@ -6,6 +7,7 @@ import { ScrollView } from 'react-native';
 import PortfolioItem from './components/PortfolioItem';
 import PortfolioDetails from './components/PortfolioDetails';
 import UpdateCard from './components/PortfolioUpdateCard';
+import { useInvestorPortfolio } from '../../../src/services/investor'
 
 
 interface PortfolioScreenProps {
@@ -27,6 +29,17 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
 
   const [activeTab, setActiveTab] = useState('Your Projects');
 
+  const InvestorPortfolio = () => {
+    const { portfolio, isLoading } = useInvestorPortfolio();
+
+    if (isLoading) {
+      return <p>Loading portfolio...</p>;
+    }
+  
+    if (!portfolio) {
+      return <p>Failed to load portfolio. Please try again later.</p>;
+    }
+
   return (
     <StyledView className='flex-1 justify-center bg-surfaceBG overflow-auto'>
       
diff --git a/frontend/src/screens/portfolio/components/PortfolioItem.tsx b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
index 4d1b126..3e0eb83 100644
--- a/frontend/src/screens/portfolio/components/PortfolioItem.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
@@ -8,6 +8,7 @@ import Card from "../../../components/Card"
 import Tag from "../../../components/Tag"
 
 
+
 const StyledView = styled(View);
 const StyledText = styled(Text);
 
@@ -34,11 +35,44 @@ const PortfolioItem = ({address, location, price, duration, invested, completion
                             <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Commercial Development</StyledText>
                         </StyledView>
                     
-                        <Tag> 
-                            <StyledView className="flex py-1 px-3 gap-1 items-center rounded-[8px] bg-border mb-3">
-                                <StyledText className="font-sourceSans3CaptionMedium text-defaultText">Land Control Secured</StyledText>
-                            </StyledView>
-                        </Tag>
+                        <StyledView>
+                            {condition && (
+                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                                    Sold</StyledText>} icon = {'../../../../assets/images/celebration'} level = {'success'} >
+                                </Tag>
+                            )}
+                            {condition && (
+                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                                    Construction Underway</StyledText>} icon = {'../../../../assets/images/maps_home_work'} level = {'successSubdued'} >
+                                </Tag>
+                            )}
+                            {condition && (
+                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                                    Construction Complete</StyledText>} icon = {'../../../../assets/images/house'} level = {'successSubdued'} >
+                                </Tag>
+                            )}
+                            {condition && (
+                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                                    Operational</StyledText>} icon = {'../../../../assets/images/maps_home_work'} level = {'successSubdued'} >
+                                </Tag>
+                            )}
+                            {condition && (
+                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                                    Construction Started</StyledText>} icon = {'../../../../assets/images/handyman'} level = {'neutralSubdued'} >
+                                </Tag>
+                            )}
+                            {condition && (
+                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                                    Permitting Secured</StyledText>} icon = {'../../../../assets/images/topic'} level = {'neutralSubdued'} >
+                                </Tag>
+                            )}
+                            {condition && (
+                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                                   Design Complete</StyledText>} icon = {'../../../../assets/images/design_services'} level = {'neutralSubdued'} >
+                                </Tag>
+                            )}
+                        </StyledView>
+
                         <StyledView className = 'flex flex-row items-start justify-between w-full mb-3'>
                             <StyledView className = 'flex justify-between items-start mr-4'>
                                 <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Final Value</StyledText>
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 5d0c518..379888c 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -4,11 +4,7 @@
 
 "@0no-co/graphql.web@^1.0.5", "@0no-co/graphql.web@^1.0.8":
   version "1.0.11"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.0.11.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@0no-co/graphql.web/-/graphql.web-1.0.11.tgz#035cbc6523af43358b81993f10b13e8d7a79c816"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-xuSJ9WXwTmtngWkbdEoopMo6F8NLtjy84UNAMsAr5C3/2SgAL/dEU10TMqTIsipqPQ8HA/7WzeqQ9DEQxSvPPA==
 
 "@alloc/quick-lru@^5.2.0":
@@ -52,12 +48,7 @@
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz"
   integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==
 
-"@babel/compat-data@^7.25.9":
-  version "7.26.2"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e"
-  integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==
-
-"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.20.0", "@babel/core@^7.23.9", "@babel/core@^7.25.2":
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.0.0-0 || ^8.0.0-0 <8.0.0", "@babel/core@^7.11.6", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.13.0", "@babel/core@^7.13.16", "@babel/core@^7.20.0", "@babel/core@^7.23.9", "@babel/core@^7.25.2", "@babel/core@^7.4.0 || ^8.0.0-0 <8.0.0", "@babel/core@^7.8.0", "@babel/core@>=7.0.0-beta.0 <8":
   version "7.25.2"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz"
   integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==
@@ -78,31 +69,12 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-<<<<<<< HEAD
 "@babel/generator@^7.18.7", "@babel/generator@^7.20.5", "@babel/generator@^7.25.0", "@babel/generator@^7.25.9", "@babel/generator@^7.7.2":
   version "7.26.2"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz"
   integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==
   dependencies:
     "@babel/parser" "^7.26.2"
-=======
-"@babel/generator@^7.18.7", "@babel/generator@^7.20.0", "@babel/generator@^7.20.5", "@babel/generator@^7.25.0", "@babel/generator@^7.7.2":
-  version "7.25.6"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz"
-  integrity sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==
-  dependencies:
-    "@babel/types" "^7.25.6"
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.25.9":
-  version "7.26.0"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.26.0.tgz"
-  integrity sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==
-  dependencies:
-    "@babel/parser" "^7.26.0"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
     "@babel/types" "^7.26.0"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
@@ -134,17 +106,6 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-compilation-targets@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875"
-  integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==
-  dependencies:
-    "@babel/compat-data" "^7.25.9"
-    "@babel/helper-validator-option" "^7.25.9"
-    browserslist "^4.24.0"
-    lru-cache "^5.1.1"
-    semver "^6.3.1"
-
 "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.7", "@babel/helper-create-class-features-plugin@^7.25.0", "@babel/helper-create-class-features-plugin@^7.25.4", "@babel/helper-create-class-features-plugin@^7.25.9":
   version "7.25.9"
   resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz"
@@ -167,15 +128,6 @@
     regexpu-core "^5.3.1"
     semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz#3e8999db94728ad2b2458d7a470e7770b7764e26"
-  integrity sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    regexpu-core "^6.1.1"
-    semver "^6.3.1"
-
 "@babel/helper-define-polyfill-provider@^0.6.2":
   version "0.6.2"
   resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz"
@@ -315,13 +267,6 @@
   dependencies:
     "@babel/types" "^7.26.0"
 
-"@babel/parser@^7.25.3":
-  version "7.26.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11"
-  integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==
-  dependencies:
-    "@babel/types" "^7.26.0"
-
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3":
   version "7.25.3"
   resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz"
@@ -386,26 +331,7 @@
     "@babel/helper-plugin-utils" "^7.24.7"
     "@babel/plugin-syntax-export-default-from" "^7.24.7"
 
-<<<<<<< HEAD
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
-=======
-"@babel/plugin-proposal-export-default-from@^7.24.7":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.25.9.tgz#52702be6ef8367fc8f18b8438278332beeb8f87c"
-  integrity sha512-ykqgwNfSnNOB+C8fV5X4mG3AVmvu+WVxcaU9xHHtBb7PCrPeweMmPjGsn8eMaeJg6SJuoUuZENeeSWaarWqonQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.18.0":
-  version "7.20.7"
-  resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.0":
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
@@ -490,13 +416,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-syntax-flow@^7.25.9":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.26.0.tgz#96507595c21b45fccfc2bc758d5c45452e6164fa"
-  integrity sha512-B+O2DnPc0iG+YXFqOxv2WNuNU97ToWjOomUQ78DouOENWUaM5sVrmet9mcomUGQFwpJd//gvUagXBSdzO1fRKg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-
 "@babel/plugin-syntax-import-assertions@^7.24.7":
   version "7.25.6"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz"
@@ -595,13 +514,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-syntax-typescript@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz#67dda2b74da43727cf21d46cf9afef23f4365399"
-  integrity sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-
 "@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz"
@@ -650,19 +562,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.8"
 
-<<<<<<< HEAD
 "@babel/plugin-transform-class-properties@^7.0.0-0", "@babel/plugin-transform-class-properties@^7.25.4":
-=======
-"@babel/plugin-transform-class-properties@^7.0.0-0":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f"
-  integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-
-"@babel/plugin-transform-class-properties@^7.25.4":
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.25.4"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz"
   integrity sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==
@@ -691,23 +591,7 @@
     "@babel/traverse" "^7.25.4"
     globals "^11.1.0"
 
-<<<<<<< HEAD
 "@babel/plugin-transform-computed-properties@^7.24.7":
-=======
-"@babel/plugin-transform-classes@^7.0.0-0":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52"
-  integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-replace-supers" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.24.7":
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz"
   integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==
@@ -777,14 +661,6 @@
     "@babel/helper-plugin-utils" "^7.24.8"
     "@babel/plugin-syntax-flow" "^7.24.7"
 
-"@babel/plugin-transform-flow-strip-types@^7.25.2":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.25.9.tgz#85879b42a8f5948fd6317069978e98f23ef8aec1"
-  integrity sha512-/VVukELzPDdci7UUsWQaSkhgnjIWXnIyRpM02ldxaVoFK96c41So8JcKT3m0gYjyv7j5FNPGS5vfELrWalkbDA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/plugin-syntax-flow" "^7.25.9"
-
 "@babel/plugin-transform-for-of@^7.24.7":
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz"
@@ -948,19 +824,7 @@
     "@babel/helper-create-class-features-plugin" "^7.25.4"
     "@babel/helper-plugin-utils" "^7.24.8"
 
-<<<<<<< HEAD
 "@babel/plugin-transform-private-property-in-object@^7.24.7":
-=======
-"@babel/plugin-transform-private-methods@^7.24.7":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz#847f4139263577526455d7d3223cd8bda51e3b57"
-  integrity sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-
-"@babel/plugin-transform-private-property-in-object@^7.22.11", "@babel/plugin-transform-private-property-in-object@^7.24.7":
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz"
   integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==
@@ -977,11 +841,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.7"
 
-<<<<<<< HEAD
 "@babel/plugin-transform-react-display-name@^7.24.7", "@babel/plugin-transform-react-display-name@^7.25.9":
-=======
-"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.24.7", "@babel/plugin-transform-react-display-name@^7.25.9":
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.25.9"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz"
   integrity sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==
@@ -1002,36 +862,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.7"
 
-<<<<<<< HEAD
 "@babel/plugin-transform-react-jsx-source@^7.24.7":
-=======
-"@babel/plugin-transform-react-jsx-self@^7.24.7":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.25.9.tgz#c0b6cae9c1b73967f7f9eb2fca9536ba2fad2858"
-  integrity sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-
-"@babel/plugin-transform-react-jsx-source@^7.0.0":
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz"
   integrity sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.7"
 
-<<<<<<< HEAD
 "@babel/plugin-transform-react-jsx@^7.25.2", "@babel/plugin-transform-react-jsx@^7.25.9":
-=======
-"@babel/plugin-transform-react-jsx-source@^7.24.7":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.25.9.tgz#4c6b8daa520b5f155b5fb55547d7c9fa91417503"
-  integrity sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-
-"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.25.2", "@babel/plugin-transform-react-jsx@^7.25.9":
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.25.9"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz"
   integrity sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==
@@ -1077,23 +915,7 @@
     babel-plugin-polyfill-regenerator "^0.6.1"
     semver "^6.3.1"
 
-<<<<<<< HEAD
 "@babel/plugin-transform-shorthand-properties@^7.0.0-0", "@babel/plugin-transform-shorthand-properties@^7.24.7":
-=======
-"@babel/plugin-transform-runtime@^7.24.7":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz#62723ea3f5b31ffbe676da9d6dae17138ae580ea"
-  integrity sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    babel-plugin-polyfill-corejs2 "^0.4.10"
-    babel-plugin-polyfill-corejs3 "^0.10.6"
-    babel-plugin-polyfill-regenerator "^0.6.1"
-    semver "^6.3.1"
-
-"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.0.0-0", "@babel/plugin-transform-shorthand-properties@^7.24.7":
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz"
   integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==
@@ -1140,17 +962,6 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
     "@babel/plugin-syntax-typescript" "^7.24.7"
 
-"@babel/plugin-transform-typescript@^7.25.2":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.9.tgz#69267905c2b33c2ac6d8fe765e9dc2ddc9df3849"
-  integrity sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
-    "@babel/plugin-syntax-typescript" "^7.25.9"
-
 "@babel/plugin-transform-unicode-escapes@^7.24.7":
   version "7.24.7"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz"
@@ -1174,14 +985,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.24.7"
     "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-unicode-regex@^7.0.0-0":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1"
-  integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-
 "@babel/plugin-transform-unicode-sets-regex@^7.25.4":
   version "7.25.4"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz"
@@ -1190,7 +993,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.25.2"
     "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/preset-env@^7.25.3":
+"@babel/preset-env@^7.1.6", "@babel/preset-env@^7.25.3":
   version "7.25.4"
   resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz"
   integrity sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==
@@ -1336,7 +1139,7 @@
   resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.12.5", "@babel/runtime@^7.20.0", "@babel/runtime@^7.25.0", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.12.5", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.25.0", "@babel/runtime@^7.8.4":
   version "7.25.6"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz"
   integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==
@@ -1353,22 +1156,6 @@
     "@babel/types" "^7.25.9"
 
 "@babel/traverse--for-generate-function-map@npm:@babel/traverse@^7.25.3":
-<<<<<<< HEAD
-=======
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84"
-  integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==
-  dependencies:
-    "@babel/code-frame" "^7.25.9"
-    "@babel/generator" "^7.25.9"
-    "@babel/parser" "^7.25.9"
-    "@babel/template" "^7.25.9"
-    "@babel/types" "^7.25.9"
-    debug "^4.3.1"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.20.0", "@babel/traverse@^7.24.7", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.3", "@babel/traverse@^7.25.4", "@babel/traverse@^7.25.9":
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.25.9"
   resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz"
   integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==
@@ -1411,17 +1198,6 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
-<<<<<<< HEAD
-=======
-"@babel/types@^7.0.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
-  version "7.26.0"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz"
-  integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
-
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
@@ -1496,11 +1272,7 @@
 
 "@expo/cli@0.21.2":
   version "0.21.2"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@expo/cli/-/cli-0.21.2.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.21.2.tgz#a5bdc7cf021ddf13c0bbec037cba888a52887202"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-qRTAx+WlOb59JV6X0wdPnFDUphMVyTm2yccqV8EikJ84uSvCUiB8P8f3VwgjOqrPh6FbAVo4/OG2DC2QuXXu3A==
   dependencies:
     "@0no-co/graphql.web" "^1.0.8"
@@ -1577,21 +1349,15 @@
 
 "@expo/code-signing-certificates@^0.0.5":
   version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@expo/code-signing-certificates/-/code-signing-certificates-0.0.5.tgz#a693ff684fb20c4725dade4b88a6a9f96b02496c"
+  resolved "https://registry.npmjs.org/@expo/code-signing-certificates/-/code-signing-certificates-0.0.5.tgz"
   integrity sha512-BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw==
   dependencies:
     node-forge "^1.2.1"
     nullthrows "^1.1.1"
 
-<<<<<<< HEAD
 "@expo/config-plugins@~9.0.0", "@expo/config-plugins@~9.0.3", "@expo/config-plugins@9.0.9":
   version "9.0.9"
   resolved "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-9.0.9.tgz"
-=======
-"@expo/config-plugins@9.0.9", "@expo/config-plugins@~9.0.0", "@expo/config-plugins@~9.0.3":
-  version "9.0.9"
-  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-9.0.9.tgz#3765c310c112e200c6715365d6023f6a05b001ed"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-pbgbY3SwCMwkijhfe163J05BrTx4MqzeaV+nVgUMs7vRcjHY1tfM57Pdv6SPtgeDvZ8fvdXFXXzkJva+a7C9Bw==
   dependencies:
     "@expo/config-types" "^52.0.0"
@@ -1611,21 +1377,12 @@
 
 "@expo/config-types@^52.0.0":
   version "52.0.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@expo/config-types/-/config-types-52.0.1.tgz"
   integrity sha512-vD8ZetyKV7U29lR6+NJohYeoLYTH+eNYXJeNiSOrWCz0witJYY11meMmEnpEaVbN89EfC6uauSUOa6wihtbyPQ==
 
 "@expo/config@~10.0.0", "@expo/config@~10.0.2", "@expo/config@10.0.3":
   version "10.0.3"
   resolved "https://registry.npmjs.org/@expo/config/-/config-10.0.3.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-52.0.1.tgz#327af1b72a3a9d4556f41e083e0e284dd8198b96"
-  integrity sha512-vD8ZetyKV7U29lR6+NJohYeoLYTH+eNYXJeNiSOrWCz0witJYY11meMmEnpEaVbN89EfC6uauSUOa6wihtbyPQ==
-
-"@expo/config@10.0.3", "@expo/config@~10.0.0", "@expo/config@~10.0.2":
-  version "10.0.3"
-  resolved "https://registry.yarnpkg.com/@expo/config/-/config-10.0.3.tgz#547b0bc1b78fad0d97d109d6db1755f3ab82918a"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-BrFMqoQXDl8O6gZqF2EtGtA1p8u3Sp8z6B8aJppEo5qrtPaxlyShkHwuLhlpLisQdipZWP89+meOqxk7bUOU2Q==
   dependencies:
     "@babel/code-frame" "~7.10.4"
@@ -1644,7 +1401,7 @@
 
 "@expo/devcert@^1.1.2":
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@expo/devcert/-/devcert-1.1.4.tgz#d98807802a541847cc42791a606bfdc26e641277"
+  resolved "https://registry.npmjs.org/@expo/devcert/-/devcert-1.1.4.tgz"
   integrity sha512-fqBODr8c72+gBSX5Ty3SIzaY4bXainlpab78+vEYEKL3fXmsOswMLf0+KE36mUEAa36BYabX7K3EiXOXX5OPMw==
   dependencies:
     application-config-path "^0.1.0"
@@ -1662,11 +1419,7 @@
 
 "@expo/env@~0.4.0":
   version "0.4.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@expo/env/-/env-0.4.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@expo/env/-/env-0.4.0.tgz#1ff3a15084566d12ca92cb67e5b0a9796a9f0aa7"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-g2JYFqck3xKIwJyK+8LxZ2ENZPWtRgjFWpeht9abnKgzXVXBeSNECFBkg+WQjQocSIdxXhEWM6hz4ZAe7Tc4ng==
   dependencies:
     chalk "^4.0.0"
@@ -1677,11 +1430,7 @@
 
 "@expo/fingerprint@0.11.2":
   version "0.11.2"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.11.2.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@expo/fingerprint/-/fingerprint-0.11.2.tgz#94de978e94e2e2773c6a5554d53d04f7a7c710d2"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-WPibADqymGSKkNNnrGfw4dRipz7F8DwMSv7zb6T9oTGtdRiObrUpGmtBXmvo6z9MqWkNRprEJNxPjvkkvMvwhQ==
   dependencies:
     "@expo/spawn-async" "^1.7.2"
@@ -1697,11 +1446,7 @@
 
 "@expo/image-utils@^0.6.0":
   version "0.6.3"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.6.3.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.6.3.tgz#89c744460beefc686989b969121357bbd5520c8a"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-v/JbCKBrHeudxn1gN1TgfPE/pWJSlLPrl29uXJBgrJFQVkViQvUHQNDhaS+UEa9wYI5HHh7XYmtzAehyG4L+GA==
   dependencies:
     "@expo/spawn-async" "^1.7.2"
@@ -1715,40 +1460,18 @@
     temp-dir "~2.0.0"
     unique-string "~2.0.0"
 
-<<<<<<< HEAD
 "@expo/json-file@^9.0.0", "@expo/json-file@~9.0.0":
   version "9.0.0"
   resolved "https://registry.npmjs.org/@expo/json-file/-/json-file-9.0.0.tgz"
   integrity sha512-M+55xFVrFzDcgMDf+52lPDLjKB5xwRfStWlv/b/Vu2OLgxGZLWpxoPYjlRoHqxjPbCQIi2ZCbobK+0KuNhsELg==
-=======
-"@expo/json-file@^8.3.0":
-  version "8.3.3"
-  resolved "https://registry.npmjs.org/@expo/json-file/-/json-file-8.3.3.tgz"
-  integrity sha512-eZ5dld9AD0PrVRiIWpRkm5aIoWBw3kAyd8VkuWEy92sEthBKDDDHAnK2a0dw0Eil6j7rK7lS/Qaq/Zzngv2h5A==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     "@babel/code-frame" "~7.10.4"
     json5 "^2.2.3"
     write-file-atomic "^2.3.0"
 
-<<<<<<< HEAD
 "@expo/metro-config@~0.19.0", "@expo/metro-config@0.19.3":
   version "0.19.3"
   resolved "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.19.3.tgz"
-=======
-"@expo/json-file@^9.0.0", "@expo/json-file@~9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-9.0.0.tgz#e3688c9b108cfd7e819f1354a9458ba6e93fc943"
-  integrity sha512-M+55xFVrFzDcgMDf+52lPDLjKB5xwRfStWlv/b/Vu2OLgxGZLWpxoPYjlRoHqxjPbCQIi2ZCbobK+0KuNhsELg==
-  dependencies:
-    "@babel/code-frame" "~7.10.4"
-    json5 "^2.2.3"
-    write-file-atomic "^2.3.0"
-
-"@expo/metro-config@0.19.3", "@expo/metro-config@~0.19.0":
-  version "0.19.3"
-  resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.19.3.tgz#fd825bb3512ab8fe572f87a5dd7bd926a670eb47"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-+QSDjRapqrY5YqnGa6PaFIn3tGukvsRAdzjJ18+Meh6y8NtzwXGQosHgvvRXUJ91FMOHFFw99H576VELdqhnPA==
   dependencies:
     "@babel/core" "^7.20.0"
@@ -1770,10 +1493,10 @@
     postcss "~8.4.32"
     resolve-from "^5.0.0"
 
-"@expo/ngrok-bin-win32-x64@2.3.41":
+"@expo/ngrok-bin-darwin-arm64@2.3.41":
   version "2.3.41"
-  resolved "https://registry.npmjs.org/@expo/ngrok-bin-win32-x64/-/ngrok-bin-win32-x64-2.3.41.tgz"
-  integrity sha512-mncsPRaG462LiYrM8mQT8OYe3/i44m3N/NzUeieYpGi8+pCOo8TIC23kR9P93CVkbM9mmXsy3X6hq91a8FWBdA==
+  resolved "https://registry.npmjs.org/@expo/ngrok-bin-darwin-arm64/-/ngrok-bin-darwin-arm64-2.3.41.tgz"
+  integrity sha512-TPf95xp6SkvbRONZjltTOFcCJbmzAH7lrQ36Dv+djrOckWGPVq4HCur48YAeiGDqspmFEmqZ7ykD5c/bDfRFOA==
 
 "@expo/ngrok-bin@2.3.42":
   version "2.3.42"
@@ -1830,26 +1553,16 @@
 
 "@expo/plist@^0.2.0":
   version "0.2.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@expo/plist/-/plist-0.2.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.2.0.tgz#beb014c0bfd56a993086c0972ec1ca3ef3f9d36c"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-F/IZJQaf8OIVnVA6XWUeMPC3OH6MV00Wxf0WC0JhTQht2QgjyHUa3U5Gs3vRtDq8tXNsZneOQRDVwpaOnd4zTQ==
   dependencies:
     "@xmldom/xmldom" "~0.7.7"
     base64-js "^1.2.3"
     xmlbuilder "^14.0.0"
 
-<<<<<<< HEAD
 "@expo/prebuild-config@^8.0.9", "@expo/prebuild-config@8.0.14":
   version "8.0.14"
   resolved "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-8.0.14.tgz"
-=======
-"@expo/prebuild-config@8.0.14", "@expo/prebuild-config@^8.0.9":
-  version "8.0.14"
-  resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-8.0.14.tgz#d74368cfe7e3daf32d5d516b2068f69cf44916f4"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-xKd6G/XH9AwDQYLMNddzu6R/xuKqFibt8BFzCJvayiP89q+x0xku3DCHJNHNfaUo8OvjHMFM8t5sdUaU1h5Nhg==
   dependencies:
     "@expo/config" "~10.0.0"
@@ -1866,7 +1579,7 @@
 
 "@expo/rudder-sdk-node@^1.1.1":
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@expo/rudder-sdk-node/-/rudder-sdk-node-1.1.1.tgz#6aa575f346833eb6290282118766d4919c808c6a"
+  resolved "https://registry.npmjs.org/@expo/rudder-sdk-node/-/rudder-sdk-node-1.1.1.tgz"
   integrity sha512-uy/hS/awclDJ1S88w9UGpc6Nm9XnNUjzOAAib1A3PVAnGQIwebg8DpFqOthFBTlZxeuV/BKbZ5jmTbtNZkp1WQ==
   dependencies:
     "@expo/bunyan" "^4.0.0"
@@ -1906,21 +1619,6 @@
     find-up "^5.0.0"
     js-yaml "^4.1.0"
 
-<<<<<<< HEAD
-=======
-"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
-  version "9.3.0"
-  resolved "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz"
-  integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
-
-"@hapi/topo@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz"
-  integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"
@@ -2130,7 +1828,7 @@
     jest-haste-map "^29.7.0"
     slash "^3.0.0"
 
-"@jest/transform@^29.7.0":
+"@jest/transform@^29.0.0", "@jest/transform@^29.7.0":
   version "29.7.0"
   resolved "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz"
   integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
@@ -2151,21 +1849,7 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.2"
 
-<<<<<<< HEAD
-=======
-"@jest/types@^26.6.2":
-  version "26.6.2"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"
-  integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
-"@jest/types@^29.6.3":
+"@jest/types@^29.0.0", "@jest/types@^29.6.3":
   version "29.6.3"
   resolved "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz"
   integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
@@ -2209,7 +1893,7 @@
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz"
   integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
   resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz"
   integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
@@ -2257,11 +1941,7 @@
 
 "@react-native-async-storage/async-storage@1.23.1":
   version "1.23.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.23.1.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-1.23.1.tgz#cad3cd4fab7dacfe9838dce6ecb352f79150c883"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-Qd2kQ3yi6Y3+AcUlrHxSLlnBvpdCEMVGFlVBneVOjaFaPU61g1huc38g339ysXspwY1QZA2aNhrk/KlHGO+ewA==
   dependencies:
     merge-options "^3.0.4"
@@ -2283,7 +1963,6 @@
   resolved "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.76.1.tgz"
   integrity sha512-b6YRmA13CmVuTQKHRen/Q0glHwmZFZoEDs+MJ1NL0UNHq9V5ytvdwTW1ntkmjtXuTnPMzkwYvumJBN9UTZjkBA==
   dependencies:
-<<<<<<< HEAD
     "@babel/core" "^7.25.2"
     "@babel/plugin-proposal-export-default-from" "^7.24.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
@@ -2334,264 +2013,6 @@
   version "0.76.1"
   resolved "https://registry.npmjs.org/@react-native/codegen/-/codegen-0.76.1.tgz"
   integrity sha512-7lE0hk2qq27wVeK5eF654v7XsKoRa7ficrfSwIDEDZ1aLB2xgUzLrsq+glSAP9EuzT6ycHhtD3QyqI+TqnlS/A==
-=======
-    serve-static "^1.13.1"
-
-"@react-native-community/cli-doctor@13.6.9":
-  version "13.6.9"
-  resolved "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-13.6.9.tgz"
-  integrity sha512-5quFaLdWFQB+677GXh5dGU9I5eg2z6Vg4jOX9vKnc9IffwyIFAyJfCZHrxLSRPDGNXD7biDQUdoezXYGwb6P/A==
-  dependencies:
-    "@react-native-community/cli-config" "13.6.9"
-    "@react-native-community/cli-platform-android" "13.6.9"
-    "@react-native-community/cli-platform-apple" "13.6.9"
-    "@react-native-community/cli-platform-ios" "13.6.9"
-    "@react-native-community/cli-tools" "13.6.9"
-    chalk "^4.1.2"
-    command-exists "^1.2.8"
-    deepmerge "^4.3.0"
-    envinfo "^7.10.0"
-    execa "^5.0.0"
-    hermes-profile-transformer "^0.0.6"
-    node-stream-zip "^1.9.1"
-    ora "^5.4.1"
-    semver "^7.5.2"
-    strip-ansi "^5.2.0"
-    wcwidth "^1.0.1"
-    yaml "^2.2.1"
-
-"@react-native-community/cli-hermes@13.6.9":
-  version "13.6.9"
-  resolved "https://registry.npmjs.org/@react-native-community/cli-hermes/-/cli-hermes-13.6.9.tgz"
-  integrity sha512-GvwiwgvFw4Ws+krg2+gYj8sR3g05evmNjAHkKIKMkDTJjZ8EdyxbkifRUs1ZCq3TMZy2oeblZBXCJVOH4W7ZbA==
-  dependencies:
-    "@react-native-community/cli-platform-android" "13.6.9"
-    "@react-native-community/cli-tools" "13.6.9"
-    chalk "^4.1.2"
-    hermes-profile-transformer "^0.0.6"
-
-"@react-native-community/cli-platform-android@13.6.9":
-  version "13.6.9"
-  resolved "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-13.6.9.tgz"
-  integrity sha512-9KsYGdr08QhdvT3Ht7e8phQB3gDX9Fs427NJe0xnoBh+PDPTI2BD5ks5ttsH8CzEw8/P6H8tJCHq6hf2nxd9cw==
-  dependencies:
-    "@react-native-community/cli-tools" "13.6.9"
-    chalk "^4.1.2"
-    execa "^5.0.0"
-    fast-glob "^3.3.2"
-    fast-xml-parser "^4.2.4"
-    logkitty "^0.7.1"
-
-"@react-native-community/cli-platform-apple@13.6.9":
-  version "13.6.9"
-  resolved "https://registry.npmjs.org/@react-native-community/cli-platform-apple/-/cli-platform-apple-13.6.9.tgz"
-  integrity sha512-KoeIHfhxMhKXZPXmhQdl6EE+jGKWwoO9jUVWgBvibpVmsNjo7woaG/tfJMEWfWF3najX1EkQAoJWpCDBMYWtlA==
-  dependencies:
-    "@react-native-community/cli-tools" "13.6.9"
-    chalk "^4.1.2"
-    execa "^5.0.0"
-    fast-glob "^3.3.2"
-    fast-xml-parser "^4.0.12"
-    ora "^5.4.1"
-
-"@react-native-community/cli-platform-ios@13.6.9":
-  version "13.6.9"
-  resolved "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-13.6.9.tgz"
-  integrity sha512-CiUcHlGs8vE0CAB4oi1f+dzniqfGuhWPNrDvae2nm8dewlahTBwIcK5CawyGezjcJoeQhjBflh9vloska+nlnw==
-  dependencies:
-    "@react-native-community/cli-platform-apple" "13.6.9"
-
-"@react-native-community/cli-server-api@13.6.9":
-  version "13.6.9"
-  resolved "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-13.6.9.tgz"
-  integrity sha512-W8FSlCPWymO+tlQfM3E0JmM8Oei5HZsIk5S0COOl0MRi8h0NmHI4WSTF2GCfbFZkcr2VI/fRsocoN8Au4EZAug==
-  dependencies:
-    "@react-native-community/cli-debugger-ui" "13.6.9"
-    "@react-native-community/cli-tools" "13.6.9"
-    compression "^1.7.1"
-    connect "^3.6.5"
-    errorhandler "^1.5.1"
-    nocache "^3.0.1"
-    pretty-format "^26.6.2"
-    serve-static "^1.13.1"
-    ws "^6.2.2"
-
-"@react-native-community/cli-tools@13.6.9":
-  version "13.6.9"
-  resolved "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-13.6.9.tgz"
-  integrity sha512-OXaSjoN0mZVw3nrAwcY1PC0uMfyTd9fz7Cy06dh+EJc+h0wikABsVRzV8cIOPrVV+PPEEXE0DBrH20T2puZzgQ==
-  dependencies:
-    appdirsjs "^1.2.4"
-    chalk "^4.1.2"
-    execa "^5.0.0"
-    find-up "^5.0.0"
-    mime "^2.4.1"
-    node-fetch "^2.6.0"
-    open "^6.2.0"
-    ora "^5.4.1"
-    semver "^7.5.2"
-    shell-quote "^1.7.3"
-    sudo-prompt "^9.0.0"
-
-"@react-native-community/cli-types@13.6.9":
-  version "13.6.9"
-  resolved "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-13.6.9.tgz"
-  integrity sha512-RLxDppvRxXfs3hxceW/mShi+6o5yS+kFPnPqZTaMKKR5aSg7LwDpLQW4K2D22irEG8e6RKDkZUeH9aL3vO2O0w==
-  dependencies:
-    joi "^17.2.1"
-
-"@react-native-community/cli@13.6.9":
-  version "13.6.9"
-  resolved "https://registry.npmjs.org/@react-native-community/cli/-/cli-13.6.9.tgz"
-  integrity sha512-hFJL4cgLPxncJJd/epQ4dHnMg5Jy/7Q56jFvA3MHViuKpzzfTCJCB+pGY54maZbtym53UJON9WTGpM3S81UfjQ==
-  dependencies:
-    "@react-native-community/cli-clean" "13.6.9"
-    "@react-native-community/cli-config" "13.6.9"
-    "@react-native-community/cli-debugger-ui" "13.6.9"
-    "@react-native-community/cli-doctor" "13.6.9"
-    "@react-native-community/cli-hermes" "13.6.9"
-    "@react-native-community/cli-server-api" "13.6.9"
-    "@react-native-community/cli-tools" "13.6.9"
-    "@react-native-community/cli-types" "13.6.9"
-    chalk "^4.1.2"
-    commander "^9.4.1"
-    deepmerge "^4.3.0"
-    execa "^5.0.0"
-    find-up "^4.1.0"
-    fs-extra "^8.1.0"
-    graceful-fs "^4.1.3"
-    prompts "^2.4.2"
-    semver "^7.5.2"
-
-"@react-native/assets-registry@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.74.87.tgz"
-  integrity sha512-1XmRhqQchN+pXPKEKYdpJlwESxVomJOxtEnIkbo7GAlaN2sym84fHEGDXAjLilih5GVPpcpSmFzTy8jx3LtaFg==
-
-"@react-native/assets-registry@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.76.1.tgz#eadf31b3fa05139516dc405a8355dc4ecd0d5de7"
-  integrity sha512-1mcDjyvC4Z+XYtY+Abl6pW9P49l/9HJmRChX7EHF1SoXe7zPAPBoAqeZsJNtf8dhJR3u/eGvapr1yJq8T/psEg==
-
-"@react-native/babel-plugin-codegen@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.74.87.tgz"
-  integrity sha512-+vJYpMnENFrwtgvDfUj+CtVJRJuUnzAUYT0/Pb68Sq9RfcZ5xdcCuUgyf7JO+akW2VTBoJY427wkcxU30qrWWw==
-  dependencies:
-    "@react-native/codegen" "0.74.87"
-
-"@react-native/babel-plugin-codegen@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.76.1.tgz#460e4aef8adc99fe89fcff4485783953fff2812d"
-  integrity sha512-V9bGLyEdAF39nvn4L5gaJcPX1SvCHPJhaT3qfpVGvCnl7WPhdRyCq++WsN8HXlpo6WOAf6//oruLnLdl3RNM4Q==
-  dependencies:
-    "@react-native/codegen" "0.76.1"
-
-"@react-native/babel-preset@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.74.87.tgz"
-  integrity sha512-hyKpfqzN2nxZmYYJ0tQIHG99FQO0OWXp/gVggAfEUgiT+yNKas1C60LuofUsK7cd+2o9jrpqgqW4WzEDZoBlTg==
-  dependencies:
-    "@babel/core" "^7.20.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.0.0"
-    "@babel/plugin-proposal-class-properties" "^7.18.0"
-    "@babel/plugin-proposal-export-default-from" "^7.0.0"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.0"
-    "@babel/plugin-proposal-numeric-separator" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.20.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-export-default-from" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.18.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-async-to-generator" "^7.20.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.20.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.20.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-private-methods" "^7.22.5"
-    "@babel/plugin-transform-private-property-in-object" "^7.22.11"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
-    "@babel/plugin-transform-runtime" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-sticky-regex" "^7.0.0"
-    "@babel/plugin-transform-typescript" "^7.5.0"
-    "@babel/plugin-transform-unicode-regex" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@react-native/babel-plugin-codegen" "0.74.87"
-    babel-plugin-transform-flow-enums "^0.0.2"
-    react-refresh "^0.14.0"
-
-"@react-native/babel-preset@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.76.1.tgz#2b9fd113e7c7889c1e87d6a36b7cb0f36118e7a6"
-  integrity sha512-b6YRmA13CmVuTQKHRen/Q0glHwmZFZoEDs+MJ1NL0UNHq9V5ytvdwTW1ntkmjtXuTnPMzkwYvumJBN9UTZjkBA==
-  dependencies:
-    "@babel/core" "^7.25.2"
-    "@babel/plugin-proposal-export-default-from" "^7.24.7"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-default-from" "^7.24.7"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.24.7"
-    "@babel/plugin-transform-async-generator-functions" "^7.25.4"
-    "@babel/plugin-transform-async-to-generator" "^7.24.7"
-    "@babel/plugin-transform-block-scoping" "^7.25.0"
-    "@babel/plugin-transform-class-properties" "^7.25.4"
-    "@babel/plugin-transform-classes" "^7.25.4"
-    "@babel/plugin-transform-computed-properties" "^7.24.7"
-    "@babel/plugin-transform-destructuring" "^7.24.8"
-    "@babel/plugin-transform-flow-strip-types" "^7.25.2"
-    "@babel/plugin-transform-for-of" "^7.24.7"
-    "@babel/plugin-transform-function-name" "^7.25.1"
-    "@babel/plugin-transform-literals" "^7.25.2"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.24.7"
-    "@babel/plugin-transform-modules-commonjs" "^7.24.8"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7"
-    "@babel/plugin-transform-numeric-separator" "^7.24.7"
-    "@babel/plugin-transform-object-rest-spread" "^7.24.7"
-    "@babel/plugin-transform-optional-catch-binding" "^7.24.7"
-    "@babel/plugin-transform-optional-chaining" "^7.24.8"
-    "@babel/plugin-transform-parameters" "^7.24.7"
-    "@babel/plugin-transform-private-methods" "^7.24.7"
-    "@babel/plugin-transform-private-property-in-object" "^7.24.7"
-    "@babel/plugin-transform-react-display-name" "^7.24.7"
-    "@babel/plugin-transform-react-jsx" "^7.25.2"
-    "@babel/plugin-transform-react-jsx-self" "^7.24.7"
-    "@babel/plugin-transform-react-jsx-source" "^7.24.7"
-    "@babel/plugin-transform-regenerator" "^7.24.7"
-    "@babel/plugin-transform-runtime" "^7.24.7"
-    "@babel/plugin-transform-shorthand-properties" "^7.24.7"
-    "@babel/plugin-transform-spread" "^7.24.7"
-    "@babel/plugin-transform-sticky-regex" "^7.24.7"
-    "@babel/plugin-transform-typescript" "^7.25.2"
-    "@babel/plugin-transform-unicode-regex" "^7.24.7"
-    "@babel/template" "^7.25.0"
-    "@react-native/babel-plugin-codegen" "0.76.1"
-    babel-plugin-syntax-hermes-parser "^0.23.1"
-    babel-plugin-transform-flow-enums "^0.0.2"
-    react-refresh "^0.14.0"
-
-"@react-native/codegen@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/codegen/-/codegen-0.74.87.tgz"
-  integrity sha512-GMSYDiD+86zLKgMMgz9z0k6FxmRn+z6cimYZKkucW4soGbxWsbjUAZoZ56sJwt2FJ3XVRgXCrnOCgXoH/Bkhcg==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     "@babel/parser" "^7.25.3"
     glob "^7.1.1"
@@ -2602,31 +2023,10 @@
     nullthrows "^1.1.1"
     yargs "^17.6.2"
 
-<<<<<<< HEAD
 "@react-native/community-cli-plugin@0.76.1":
   version "0.76.1"
   resolved "https://registry.npmjs.org/@react-native/community-cli-plugin/-/community-cli-plugin-0.76.1.tgz"
   integrity sha512-dECc1LuleMQDX/WK2oJInrYCpHb3OFBJxYkhPOAXb9HiktMWRA9T93qqpTDshmtLdYqvxeO9AM5eeoSL412WnQ==
-=======
-"@react-native/codegen@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.76.1.tgz#622185f4038fefc173efec84a08bb7869f04bcd9"
-  integrity sha512-7lE0hk2qq27wVeK5eF654v7XsKoRa7ficrfSwIDEDZ1aLB2xgUzLrsq+glSAP9EuzT6ycHhtD3QyqI+TqnlS/A==
-  dependencies:
-    "@babel/parser" "^7.25.3"
-    glob "^7.1.1"
-    hermes-parser "0.23.1"
-    invariant "^2.2.4"
-    jscodeshift "^0.14.0"
-    mkdirp "^0.5.1"
-    nullthrows "^1.1.1"
-    yargs "^17.6.2"
-
-"@react-native/community-cli-plugin@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/community-cli-plugin/-/community-cli-plugin-0.74.87.tgz"
-  integrity sha512-EgJG9lSr8x3X67dHQKQvU6EkO+3ksVlJHYIVv6U/AmW9dN80BEFxgYbSJ7icXS4wri7m4kHdgeq2PQ7/3vvrTQ==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     "@react-native/dev-middleware" "0.76.1"
     "@react-native/metro-babel-transformer" "0.76.1"
@@ -2639,7 +2039,6 @@
     node-fetch "^2.2.0"
     readline "^1.3.0"
 
-<<<<<<< HEAD
 "@react-native/debugger-frontend@0.76.1":
   version "0.76.1"
   resolved "https://registry.npmjs.org/@react-native/debugger-frontend/-/debugger-frontend-0.76.1.tgz"
@@ -2661,33 +2060,6 @@
     selfsigned "^2.4.1"
     serve-static "^1.13.1"
     ws "^6.2.3"
-=======
-"@react-native/community-cli-plugin@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.76.1.tgz#d54b2c5fbcb2c5b270261aca530dfdef1bd65421"
-  integrity sha512-dECc1LuleMQDX/WK2oJInrYCpHb3OFBJxYkhPOAXb9HiktMWRA9T93qqpTDshmtLdYqvxeO9AM5eeoSL412WnQ==
-  dependencies:
-    "@react-native/dev-middleware" "0.76.1"
-    "@react-native/metro-babel-transformer" "0.76.1"
-    chalk "^4.0.0"
-    execa "^5.1.1"
-    invariant "^2.2.4"
-    metro "^0.81.0"
-    metro-config "^0.81.0"
-    metro-core "^0.81.0"
-    node-fetch "^2.2.0"
-    readline "^1.3.0"
-
-"@react-native/debugger-frontend@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/debugger-frontend/-/debugger-frontend-0.74.87.tgz"
-  integrity sha512-MN95DJLYTv4EqJc+9JajA3AJZSBYJz2QEJ3uWlHrOky2vKrbbRVaW1ityTmaZa2OXIvNc6CZwSRSE7xCoHbXhQ==
-
-"@react-native/debugger-frontend@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.76.1.tgz#f2fd057ecf502ed787579242c107d3912331a9ca"
-  integrity sha512-0gExx7GR8o2ctGfjIZ9+x54iFbg0eP6+kMYzRA6AcgmFAmMGLADMmjtObCN0CqGeZyWtdVVqcv5mAwRwmMlNWA==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 
 "@react-native/gradle-plugin@0.76.1":
   version "0.76.1"
@@ -2696,94 +2068,12 @@
 
 "@react-native/js-polyfills@0.76.1":
   version "0.76.1"
-  resolved "https://registry.npmjs.org/@react-native/js-polyfills/-/js-polyfills-0.76.1.tgz"
-  integrity sha512-HO3fzJ0FnrnQGmxdXxh2lcGGAMfaX9h1Pg1Zh38MkVw35/KnZHxHqxg6cruze6iWwZdfqSoIcQoalmMuAHby7Q==
-
-"@react-native/metro-babel-transformer@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.76.1.tgz"
-  integrity sha512-LUAKqgsrioXS2a+pE0jak8sutTbLo3T34KWv7mdVUZ5lUACpqkIql1EFtIQlWjIcR4oZE480CkPbRHBI681tkQ==
-  dependencies:
-<<<<<<< HEAD
-    "@babel/core" "^7.25.2"
-    "@react-native/babel-preset" "0.76.1"
-    hermes-parser "0.23.1"
-    nullthrows "^1.1.1"
-
-"@react-native/normalize-colors@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.76.1.tgz"
-  integrity sha512-/+CUk/wGWIdXbJYVLw/q6Fs8Z0x91zzfXIbNiZUdSW1TNEDmytkF371H8a1/Nx3nWa1RqCMVsaZHCG4zqxeDvg==
-
-"@react-native/virtualized-lists@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.76.1.tgz"
-  integrity sha512-uWJfv0FC3zmlYORr0Sa17ngbAaw6K9yw4MAkBZyFeTM+W6AJRvTVyR1Mes/MU+vIyGFChnTcyaQrQz8jWqADOA==
-=======
-    "@isaacs/ttlcache" "^1.4.1"
-    "@react-native/debugger-frontend" "0.74.87"
-    "@rnx-kit/chromium-edge-launcher" "^1.0.0"
-    chrome-launcher "^0.15.2"
-    connect "^3.6.5"
-    debug "^2.2.0"
-    node-fetch "^2.2.0"
-    nullthrows "^1.1.1"
-    open "^7.0.3"
-    selfsigned "^2.4.1"
-    serve-static "^1.13.1"
-    temp-dir "^2.0.0"
-    ws "^6.2.2"
-
-"@react-native/dev-middleware@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.76.1.tgz#028649d0f1893ce04d177aab5bc233a9ebc7339b"
-  integrity sha512-htaFSN2dwI0CinsMxjRuvIVdSDN6d6TDPeOJczM1bdAYalZX1M58knTKs5LJDComW5tleOCAg5lS5tIeFlM9+Q==
-  dependencies:
-    "@isaacs/ttlcache" "^1.4.1"
-    "@react-native/debugger-frontend" "0.76.1"
-    chrome-launcher "^0.15.2"
-    chromium-edge-launcher "^0.2.0"
-    connect "^3.6.5"
-    debug "^2.2.0"
-    nullthrows "^1.1.1"
-    open "^7.0.3"
-    selfsigned "^2.4.1"
-    serve-static "^1.13.1"
-    ws "^6.2.3"
-
-"@react-native/gradle-plugin@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/gradle-plugin/-/gradle-plugin-0.74.87.tgz"
-  integrity sha512-T+VX0N1qP+U9V4oAtn7FTX7pfsoVkd1ocyw9swYXgJqU2fK7hC9famW7b3s3ZiufPGPr1VPJe2TVGtSopBjL6A==
-
-"@react-native/gradle-plugin@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.76.1.tgz#715725ce426686f0c677e733345650990285b5de"
-  integrity sha512-X7rNFltPa9QYxvYrQGaSCw7U57C+y+DwspXf4AnLZj0bQm9tL6UYpijh5vE3VmPcHn76/RNU2bpFjVvWg6gjqw==
-
-"@react-native/js-polyfills@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/js-polyfills/-/js-polyfills-0.74.87.tgz"
-  integrity sha512-M5Evdn76CuVEF0GsaXiGi95CBZ4IWubHqwXxV9vG9CC9kq0PSkoM2Pn7Lx7dgyp4vT7ccJ8a3IwHbe+5KJRnpw==
-
-"@react-native/js-polyfills@0.76.1":
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.76.1.tgz#a429e2b8ac24048931aa596d306375bca8450f92"
+  resolved "https://registry.npmjs.org/@react-native/js-polyfills/-/js-polyfills-0.76.1.tgz"
   integrity sha512-HO3fzJ0FnrnQGmxdXxh2lcGGAMfaX9h1Pg1Zh38MkVw35/KnZHxHqxg6cruze6iWwZdfqSoIcQoalmMuAHby7Q==
 
-"@react-native/metro-babel-transformer@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.74.87.tgz"
-  integrity sha512-UsJCO24sNax2NSPBmV1zLEVVNkS88kcgAiYrZHtYSwSjpl4WZ656tIeedBfiySdJ94Hr3kQmBYLipV5zk0NI1A==
-  dependencies:
-    "@babel/core" "^7.20.0"
-    "@react-native/babel-preset" "0.74.87"
-    hermes-parser "0.19.1"
-    nullthrows "^1.1.1"
-
 "@react-native/metro-babel-transformer@0.76.1":
   version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.76.1.tgz#155afba9bd2c68a02958f41d8cce9a27a533c75b"
+  resolved "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.76.1.tgz"
   integrity sha512-LUAKqgsrioXS2a+pE0jak8sutTbLo3T34KWv7mdVUZ5lUACpqkIql1EFtIQlWjIcR4oZE480CkPbRHBI681tkQ==
   dependencies:
     "@babel/core" "^7.25.2"
@@ -2791,28 +2081,14 @@
     hermes-parser "0.23.1"
     nullthrows "^1.1.1"
 
-"@react-native/normalize-colors@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.74.87.tgz"
-  integrity sha512-Xh7Nyk/MPefkb0Itl5Z+3oOobeG9lfLb7ZOY2DKpFnoCE1TzBmib9vMNdFaLdSxLIP+Ec6icgKtdzYg8QUPYzA==
-
 "@react-native/normalize-colors@0.76.1":
   version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.76.1.tgz#df8d54d78917a9f075283382fec834f5ccaecefd"
+  resolved "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.76.1.tgz"
   integrity sha512-/+CUk/wGWIdXbJYVLw/q6Fs8Z0x91zzfXIbNiZUdSW1TNEDmytkF371H8a1/Nx3nWa1RqCMVsaZHCG4zqxeDvg==
 
-"@react-native/virtualized-lists@0.74.87":
-  version "0.74.87"
-  resolved "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.74.87.tgz"
-  integrity sha512-lsGxoFMb0lyK/MiplNKJpD+A1EoEUumkLrCjH4Ht+ZlG8S0BfCxmskLZ6qXn3BiDSkLjfjI/qyZ3pnxNBvkXpQ==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
-  dependencies:
-    invariant "^2.2.4"
-    nullthrows "^1.1.1"
-
 "@react-native/virtualized-lists@0.76.1":
   version "0.76.1"
-  resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.76.1.tgz#590de081d1229de998b8a0905d07386abc6f2a84"
+  resolved "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.76.1.tgz"
   integrity sha512-uWJfv0FC3zmlYORr0Sa17ngbAaw6K9yw4MAkBZyFeTM+W6AJRvTVyR1Mes/MU+vIyGFChnTcyaQrQz8jWqADOA==
   dependencies:
     invariant "^2.2.4"
@@ -2852,7 +2128,7 @@
     "@react-navigation/elements" "^1.3.31"
     warn-once "^0.1.0"
 
-"@react-navigation/native@^6.1.18":
+"@react-navigation/native@^6.0.0", "@react-navigation/native@^6.1.18":
   version "6.1.18"
   resolved "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.18.tgz"
   integrity sha512-mIT9MiL/vMm4eirLcmw2h6h/Nm5FICtnYSdohq4vTLA2FF/6PNhByM7s8ffqoVfE5L0uAa6Xda1B7oddolUiGg==
@@ -3053,6 +2329,27 @@
     "@types/node" "*"
     "@types/responselike" "^1.0.0"
 
+"@types/eslint-scope@^3.7.7":
+  version "3.7.7"
+  resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz"
+  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "9.6.1"
+  resolved "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz"
+  integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*", "@types/estree@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz"
+  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
+
 "@types/geojson@^7946.0.13":
   version "7946.0.14"
   resolved "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz"
@@ -3111,6 +2408,11 @@
     "@types/tough-cookie" "*"
     parse5 "^7.0.0"
 
+"@types/json-schema@*", "@types/json-schema@^7.0.8":
+  version "7.0.15"
+  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
 "@types/keyv@^3.1.4":
   version "3.1.4"
   resolved "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz"
@@ -3144,11 +2446,7 @@
 
 "@types/react-dom@~18.3.1":
   version "18.3.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.1.tgz#1e4654c08a9cdcfb6594c780ac59b55aad42fe07"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==
   dependencies:
     "@types/react" "*"
@@ -3165,7 +2463,7 @@
   dependencies:
     react-native "*"
 
-"@types/react@*":
+"@types/react@*", "@types/react@^18.2.6":
   version "18.3.5"
   resolved "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz"
   integrity sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==
@@ -3207,16 +2505,6 @@
   resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz"
   integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
-<<<<<<< HEAD
-=======
-"@types/yargs@^15.0.0":
-  version "15.0.19"
-  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz"
-  integrity sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==
-  dependencies:
-    "@types/yargs-parser" "*"
-
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 "@types/yargs@^17.0.8":
   version "17.0.33"
   resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz"
@@ -3239,7 +2527,7 @@
     natural-compare "^1.4.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/parser@8.5.0":
+"@typescript-eslint/parser@^8.0.0 || ^8.0.0-alpha.0", "@typescript-eslint/parser@8.5.0":
   version "8.5.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.5.0.tgz"
   integrity sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==
@@ -3307,11 +2595,7 @@
 
 "@urql/core@^5.0.0", "@urql/core@^5.0.6":
   version "5.0.8"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@urql/core/-/core-5.0.8.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@urql/core/-/core-5.0.8.tgz#eba39eaa2bf9a0a963383e87a65cba7a9ca794bd"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-1GOnUw7/a9bzkcM0+U8U5MmxW2A7FE5YquuEmcJzTtW5tIs2EoS4F2ITpuKBjRBbyRjZgO860nWFPo1m4JImGA==
   dependencies:
     "@0no-co/graphql.web" "^1.0.5"
@@ -3319,16 +2603,133 @@
 
 "@urql/exchange-retry@^1.3.0":
   version "1.3.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/@urql/exchange-retry/-/exchange-retry-1.3.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/@urql/exchange-retry/-/exchange-retry-1.3.0.tgz#c46abdf74aee612645ff47562e6c6868ad1731dd"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-FLt+d81gP4oiHah4hWFDApimc+/xABWMU1AMYsZ1PVB0L0YPtrMCjbOp9WMM7hBzy4gbTDrG24sio0dCfSh/HQ==
   dependencies:
     "@urql/core" "^5.0.0"
     wonka "^6.3.2"
 
+"@webassemblyjs/ast@^1.12.1", "@webassemblyjs/ast@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz"
+  integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.13.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+
+"@webassemblyjs/floating-point-hex-parser@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz"
+  integrity sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==
+
+"@webassemblyjs/helper-api-error@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz"
+  integrity sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==
+
+"@webassemblyjs/helper-buffer@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz"
+  integrity sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==
+
+"@webassemblyjs/helper-numbers@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz"
+  integrity sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.13.2"
+    "@webassemblyjs/helper-api-error" "1.13.2"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/helper-wasm-bytecode@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz"
+  integrity sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==
+
+"@webassemblyjs/helper-wasm-section@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz"
+  integrity sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/wasm-gen" "1.14.1"
+
+"@webassemblyjs/ieee754@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz"
+  integrity sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz"
+  integrity sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz"
+  integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==
+
+"@webassemblyjs/wasm-edit@^1.12.1":
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz"
+  integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/helper-wasm-section" "1.14.1"
+    "@webassemblyjs/wasm-gen" "1.14.1"
+    "@webassemblyjs/wasm-opt" "1.14.1"
+    "@webassemblyjs/wasm-parser" "1.14.1"
+    "@webassemblyjs/wast-printer" "1.14.1"
+
+"@webassemblyjs/wasm-gen@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz"
+  integrity sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/ieee754" "1.13.2"
+    "@webassemblyjs/leb128" "1.13.2"
+    "@webassemblyjs/utf8" "1.13.2"
+
+"@webassemblyjs/wasm-opt@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz"
+  integrity sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/wasm-gen" "1.14.1"
+    "@webassemblyjs/wasm-parser" "1.14.1"
+
+"@webassemblyjs/wasm-parser@^1.12.1", "@webassemblyjs/wasm-parser@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz"
+  integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-api-error" "1.13.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/ieee754" "1.13.2"
+    "@webassemblyjs/leb128" "1.13.2"
+    "@webassemblyjs/utf8" "1.13.2"
+
+"@webassemblyjs/wast-printer@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz"
+  integrity sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@xtuc/long" "4.2.2"
+
 "@xmldom/xmldom@^0.8.8":
   version "0.8.10"
   resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz"
@@ -3339,6 +2740,16 @@
   resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz"
   integrity sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==
 
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
 abab@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz"
@@ -3374,11 +2785,7 @@ acorn-jsx@^5.3.2:
 
 acorn-loose@^8.3.0:
   version "8.4.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/acorn-loose/-/acorn-loose-8.4.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/acorn-loose/-/acorn-loose-8.4.0.tgz#26d3e219756d1e180d006f5bcc8d261a28530f55"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==
   dependencies:
     acorn "^8.11.0"
@@ -3390,7 +2797,7 @@ acorn-walk@^8.0.2:
   dependencies:
     acorn "^8.11.0"
 
-acorn@^8.1.0, acorn@^8.11.0, acorn@^8.12.0, acorn@^8.8.1, acorn@^8.8.2:
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.1.0, acorn@^8.11.0, acorn@^8.12.0, acorn@^8.14.0, acorn@^8.8.1, acorn@^8.8.2:
   version "8.14.0"
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz"
   integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
@@ -3410,7 +2817,12 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-ajv@^6.12.4:
+ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3437,18 +2849,6 @@ ansi-escapes@^6.0.0:
   resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz"
   integrity sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==
 
-<<<<<<< HEAD
-=======
-ansi-fragments@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/ansi-fragments/-/ansi-fragments-0.2.1.tgz"
-  integrity sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w==
-  dependencies:
-    colorette "^1.0.7"
-    slice-ansi "^2.0.0"
-    strip-ansi "^5.0.0"
-
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 ansi-regex@^4.1.0:
   version "4.1.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz"
@@ -3672,7 +3072,7 @@ babel-core@^7.0.0-bridge.0:
   resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz"
   integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
-babel-jest@^29.2.1, babel-jest@^29.7.0:
+babel-jest@^29.0.0, babel-jest@^29.2.1, babel-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz"
   integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
@@ -3732,16 +3132,12 @@ babel-plugin-polyfill-regenerator@^0.6.1:
 
 babel-plugin-react-native-web@~0.19.13:
   version "0.19.13"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.19.13.tgz#bf919bd6f18c4689dd1a528a82bda507363b953d"
+  resolved "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.19.13.tgz"
   integrity sha512-4hHoto6xaN23LCyZgL9LJZc3olmAxd7b6jDzlZnKXAh4rRAbZRKNBJoOOdp46OBqgy+K0t0guTj5/mhA8inymQ==
 
 babel-plugin-syntax-hermes-parser@^0.23.1:
   version "0.23.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.23.1.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.23.1.tgz#470e9d1d30ad670d4c8a37138e22ae39c843d1ff"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-uNLD0tk2tLUjGFdmCk+u/3FEw2o+BAwW4g+z2QVlxJrzZYOOPADroEcNtTPt5lNiScctaUmnsTkVEnOwZUOLhA==
   dependencies:
     hermes-parser "0.23.1"
@@ -3776,11 +3172,7 @@ babel-preset-current-node-syntax@^1.0.0:
 
 babel-preset-expo@~12.0.0:
   version "12.0.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/babel-preset-expo/-/babel-preset-expo-12.0.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/babel-preset-expo/-/babel-preset-expo-12.0.0.tgz#ad583c68d74eda5e2eef93d3186d6dabe947d59a"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-rUnaIHdF26LxPyB+tvGjxck4fM9bYdPGpgjoNhjz6PoHYC+LZKBv9IyyPgKoMjOYG1sYOp7tB7BvKG8HFG1hQA==
   dependencies:
     "@babel/plugin-proposal-decorators" "^7.12.9"
@@ -3878,7 +3270,7 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.23.1, browserslist@^4.23.3:
+browserslist@^4.23.1, browserslist@^4.23.3, browserslist@^4.24.0, "browserslist@>= 4.21.0":
   version "4.24.2"
   resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz"
   integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
@@ -3888,16 +3280,6 @@ browserslist@^4.23.1, browserslist@^4.23.3:
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.1"
 
-browserslist@^4.24.0:
-  version "4.24.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
-  integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
-  dependencies:
-    caniuse-lite "^1.0.30001669"
-    electron-to-chromium "^1.5.41"
-    node-releases "^2.0.18"
-    update-browserslist-db "^1.1.1"
-
 bs-logger@^0.2.6:
   version "0.2.6"
   resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz"
@@ -3948,11 +3330,6 @@ bytes@3.0.0:
   resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"
   integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
 
-bytes@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
-  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
-
 cacache@^18.0.2:
   version "18.0.4"
   resolved "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz"
@@ -4044,20 +3421,9 @@ camelize@^1.0.0:
   resolved "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz"
   integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
 
-<<<<<<< HEAD
 caniuse-lite@^1.0.30001669:
   version "1.0.30001680"
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz"
-=======
-caniuse-lite@^1.0.30001646:
-  version "1.0.30001660"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz"
-  integrity sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==
-
-caniuse-lite@^1.0.30001669:
-  version "1.0.30001680"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz#5380ede637a33b9f9f1fc6045ea99bd142f3da5e"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==
 
 chalk@^2.0.1, chalk@^2.4.2:
@@ -4077,7 +3443,6 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-<<<<<<< HEAD
 chalk@^4.0.0:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
@@ -4103,9 +3468,6 @@ chalk@^4.1.0:
     supports-color "^7.1.0"
 
 chalk@^4.1.2:
-=======
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -4158,13 +3520,14 @@ chrome-launcher@^0.15.2:
     is-wsl "^2.2.0"
     lighthouse-logger "^1.0.0"
 
+chrome-trace-event@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz"
+  integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==
+
 chromium-edge-launcher@^0.2.0:
   version "0.2.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/chromium-edge-launcher/-/chromium-edge-launcher-0.2.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/chromium-edge-launcher/-/chromium-edge-launcher-0.2.0.tgz#0c378f28c99aefc360705fa155de0113997f62fc"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-JfJjUnq25y9yg4FABRRVPmBGWPZZi+AQXT4mxupb67766/0UlhG8PAZCz6xzEMXTbW3CsSoE8PcCWA49n35mKg==
   dependencies:
     "@types/node" "*"
@@ -4312,11 +3675,7 @@ command-exists@^1.2.4:
 
 commander@^12.0.0:
   version "12.1.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
 
 commander@^2.20.0:
@@ -4344,7 +3703,7 @@ component-type@^1.2.1:
   resolved "https://registry.npmjs.org/component-type/-/component-type-1.2.2.tgz"
   integrity sha512-99VUHREHiN5cLeHm3YLq312p6v+HUEcwtLCAtelvUDI6+SH5g5Cr85oNR2S1o6ywzL0ykMbuwLzM2ANocjEOIA==
 
-compressible@~2.0.16, compressible@~2.0.18:
+compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
@@ -4364,19 +3723,6 @@ compression@^1.7.4:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-compression@^1.7.4:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93"
-  integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==
-  dependencies:
-    bytes "3.1.2"
-    compressible "~2.0.18"
-    debug "2.6.9"
-    negotiator "~0.6.4"
-    on-headers "~1.0.2"
-    safe-buffer "5.2.1"
-    vary "~1.1.2"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
@@ -4558,17 +3904,10 @@ debug@^2.2.0:
   dependencies:
     ms "2.0.0"
 
-<<<<<<< HEAD
 debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-=======
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5:
-  version "4.3.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz"
-  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     ms "2.0.0"
 
@@ -4625,11 +3964,7 @@ deep-is@^0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-<<<<<<< HEAD
 deepmerge@^4.2.2, deepmerge@^4.3.1:
-=======
-deepmerge@^4.2.2, deepmerge@^4.3.0, deepmerge@^4.3.1:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "4.3.1"
   resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
@@ -4801,11 +4136,6 @@ electron-to-chromium@^1.5.41:
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.57.tgz"
   integrity sha512-xS65H/tqgOwUBa5UmOuNSLuslDo7zho0y/lgQw35pnrqiZh7UOWHCeL/Bt6noJATbA6tpQJGCifsFsIRZj1Fqg==
 
-electron-to-chromium@^1.5.41:
-  version "1.5.57"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.57.tgz#cb43af8784166bca24565b3418bf5f775a6b1c86"
-  integrity sha512-xS65H/tqgOwUBa5UmOuNSLuslDo7zho0y/lgQw35pnrqiZh7UOWHCeL/Bt6noJATbA6tpQJGCifsFsIRZj1Fqg==
-
 emittery@^0.13.1:
   version "0.13.1"
   resolved "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz"
@@ -4828,11 +4158,7 @@ encodeurl@~1.0.2:
 
 encodeurl@~2.0.0:
   version "2.0.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
 
 end-of-stream@^1.1.0:
@@ -4842,6 +4168,14 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+enhanced-resolve@^5.17.1:
+  version "5.17.1"
+  resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz"
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
 entities@^4.4.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz"
@@ -4955,6 +4289,11 @@ es-iterator-helpers@^1.0.19:
     iterator.prototype "^1.1.2"
     safe-array-concat "^1.1.2"
 
+es-module-lexer@^1.2.1:
+  version "1.5.4"
+  resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz"
+  integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==
+
 es-object-atoms@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz"
@@ -4987,11 +4326,7 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-<<<<<<< HEAD
 escalade@^3.1.1, escalade@^3.2.0:
-=======
-escalade@^3.1.1, escalade@^3.1.2, escalade@^3.2.0:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "3.2.0"
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz"
   integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
@@ -5069,6 +4404,14 @@ eslint-scope@^8.0.2:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
+eslint-scope@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
 eslint-visitor-keys@^3.3.0:
   version "3.4.3"
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz"
@@ -5084,7 +4427,7 @@ eslint-visitor-keys@^4.0.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz"
   integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
 
-eslint@^9.9.0:
+"eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^8.57.0 || ^9.0.0", eslint@^9.9.0, eslint@>=7.0.0:
   version "9.10.0"
   resolved "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz"
   integrity sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==
@@ -5152,6 +4495,11 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
 estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
@@ -5172,6 +4520,11 @@ event-target-shim@^5.0.0, event-target-shim@^5.0.1:
   resolved "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"
   integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
+events@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
 exec-async@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/exec-async/-/exec-async-2.2.0.tgz"
@@ -5238,11 +4591,7 @@ expect@^29.0.0, expect@^29.7.0:
 
 expo-asset@~11.0.1:
   version "11.0.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/expo-asset/-/expo-asset-11.0.1.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/expo-asset/-/expo-asset-11.0.1.tgz#8608f5ea4639698553725b6690dd621f6f70f206"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-WatvD7JVC89EsllXFYcS/rji3ajVzE2B/USo0TqedsETixwyVCQfrrvCdCPQyuKghrxVNEj8bQ/Qbea/RZLYjg==
   dependencies:
     "@expo/image-utils" "^0.6.0"
@@ -5252,11 +4601,7 @@ expo-asset@~11.0.1:
 
 expo-constants@~17.0.0, expo-constants@~17.0.2:
   version "17.0.2"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/expo-constants/-/expo-constants-17.0.2.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/expo-constants/-/expo-constants-17.0.2.tgz#f4ad6af307a8d310f3515315271d10b62bc65485"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-Z4QrHuy2fDOP0xv9bNeX7dKaZ1GSBA5ExmtuSKX3hN1S1Gsllb/VxOYEaLUWk8xncQlbf2vEAHcMbHGo8U/3cA==
   dependencies:
     "@expo/config" "~10.0.0"
@@ -5264,42 +4609,26 @@ expo-constants@~17.0.0, expo-constants@~17.0.2:
 
 expo-file-system@~18.0.3:
   version "18.0.3"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/expo-file-system/-/expo-file-system-18.0.3.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-18.0.3.tgz#907f058f4f2e2bbbdb970280edf9be735e85c0de"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-HKe0dGW3FWYFi1F3THVnTRueTG7j0onmEpUJKRB4UbjeHD2723cn/EutcG216wvrJeebe8w3+00F8Z4xk+9Jrw==
   dependencies:
     web-streams-polyfill "^3.3.2"
 
 expo-font@~13.0.1:
   version "13.0.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/expo-font/-/expo-font-13.0.1.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-13.0.1.tgz#3a7eed7a4238a352fc74a425fd8c020c5f122382"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-8JE47B+6cLeKWr5ql8gU6YsPHjhrz1vMrTqYMm72No/8iW8Sb/uL4Oc0dpmbjq3hLLXBY0xPBQOgU7FQ6Y04Vg==
   dependencies:
     fontfaceobserver "^2.1.0"
 
 expo-keep-awake@~14.0.1:
   version "14.0.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-14.0.1.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-14.0.1.tgz#77c38feefa95c494aa167e6df5a6eacd17af2358"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-c5mGCAIk2YM+Vsdy90BlEJ4ZX+KG5Au9EkJUIxXWlpnuKmDAJ3N+5nEZ7EUO1ZTheqoSBeAo4jJ8rTWPU+JXdw==
 
 expo-modules-autolinking@2.0.2:
   version "2.0.2"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-2.0.2.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-2.0.2.tgz#cf946317e22e120dfe97440f225c8033c6bced42"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-n3jC7VoJLfOLGk8NWhEAvM5zSjbLh1kMUSo76nJupx5/vASxDdzihppYebrKrNXPHq5mcw8Jr+r7YB+8xHx7QQ==
   dependencies:
     "@expo/spawn-async" "^1.7.2"
@@ -5313,43 +4642,26 @@ expo-modules-autolinking@2.0.2:
 
 expo-modules-core@2.0.2:
   version "2.0.2"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-2.0.2.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/expo-modules-core/-/expo-modules-core-2.0.2.tgz#d761b409e7a626ab681e87554d9d0481ae5be8a1"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-IZdxGXxZXFtmffJOM9LDfeOQeJUftgAZxnPkz62bnbAQc0yUrOSZ+XsX0RP92xq7qGtdcL551GuzxWWbBG5EGA==
   dependencies:
     invariant "^2.2.4"
 
 expo-splash-screen@~0.29.8:
   version "0.29.8"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.29.8.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/expo-splash-screen/-/expo-splash-screen-0.29.8.tgz#a99b0a00995d61dbafb06718592e45e8b19868b4"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-pqPU+ngx6fkgqTznGJIdTcKNa4MH/oqgfrm/0RYWJLrbFgYmpkNTeU+59MHvmGfEXCm6PNFtPIqFU90adV0oJA==
   dependencies:
     "@expo/prebuild-config" "8.0.14"
 
 expo-status-bar@~2.0.0:
   version "2.0.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-2.0.0.tgz"
   integrity sha512-vxxdpvpNDMTEc5uTiIrbTvySKKUsOACmfl8OZuUdjNle05oGqwtq3v5YObwym/njSByjoyuZX8UpXBZnxvarwQ==
 
-expo@^52.0.5:
+expo@*, expo@52:
   version "52.0.5"
   resolved "https://registry.npmjs.org/expo/-/expo-52.0.5.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-2.0.0.tgz#dd99adc2ace12a24c92718cd0f97b93347103393"
-  integrity sha512-vxxdpvpNDMTEc5uTiIrbTvySKKUsOACmfl8OZuUdjNle05oGqwtq3v5YObwym/njSByjoyuZX8UpXBZnxvarwQ==
-
-expo@52:
-  version "52.0.5"
-  resolved "https://registry.yarnpkg.com/expo/-/expo-52.0.5.tgz#3f43c2de58571f959435fa53ab4d6440002d854f"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-dLqnnEIptjmZIRmtsK07Gnj3U8YwUmLZJ4NU4cUbSOZsL8D8nBWRlEhdp6HGFxBOgxK9yWG/K4/5HxpiMwadsA==
   dependencies:
     "@babel/runtime" "^7.20.0"
@@ -5590,7 +4902,7 @@ form-data@^4.0.0:
 
 freeport-async@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/freeport-async/-/freeport-async-2.0.0.tgz#6adf2ec0c629d11abff92836acd04b399135bab4"
+  resolved "https://registry.npmjs.org/freeport-async/-/freeport-async-2.0.0.tgz"
   integrity sha512-K7od3Uw45AJg00XUmy15+Hae2hOcgKcmN3/EF6Y7i01O0gaqiRx8sUSpsb9+BRNL8RPBrhzPsVfy8q9ADlJuWQ==
 
 fresh@0.5.2:
@@ -5656,6 +4968,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
+fsevents@^2.3.2, fsevents@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"
@@ -5761,11 +5078,12 @@ glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-<<<<<<< HEAD
+glob-to-regexp@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
+  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
 glob@^10.2.2:
-=======
-glob@^10.2.2, glob@^10.3.10, glob@^10.4.2:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "10.4.5"
   resolved "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz"
   integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
@@ -5777,7 +5095,6 @@ glob@^10.2.2, glob@^10.3.10, glob@^10.4.2:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-<<<<<<< HEAD
 glob@^10.3.10:
   version "10.4.5"
   resolved "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz"
@@ -5802,8 +5119,6 @@ glob@^10.4.2:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-=======
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
@@ -5875,7 +5190,7 @@ got@^11.5.1:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -5938,20 +5253,8 @@ hermes-estree@0.23.1:
 
 hermes-estree@0.24.0:
   version "0.24.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.24.0.tgz"
   integrity sha512-LyoXLB7IFzeZW0EvAbGZacbxBN7t6KKSDqFJPo3Ydow7wDlrDjXwsdiAHV6XOdvEN9MEuWXsSIFN4tzpyrXIHw==
-=======
-  resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.24.0.tgz#487dc1ddc0bae698c2d79f34153ac9bf62d7b3c0"
-  integrity sha512-LyoXLB7IFzeZW0EvAbGZacbxBN7t6KKSDqFJPo3Ydow7wDlrDjXwsdiAHV6XOdvEN9MEuWXsSIFN4tzpyrXIHw==
-
-hermes-parser@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.19.1.tgz"
-  integrity sha512-Vp+bXzxYJWrpEuJ/vXxUsLnt0+y4q9zyi4zUlkLqD8FKv4LjIfOvP69R/9Lty3dCyKh0E2BU7Eypqr63/rKT/A==
-  dependencies:
-    hermes-estree "0.19.1"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 
 hermes-parser@0.23.1:
   version "0.23.1"
@@ -5962,20 +5265,8 @@ hermes-parser@0.23.1:
 
 hermes-parser@0.24.0:
   version "0.24.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.24.0.tgz"
   integrity sha512-IJooSvvu2qNRe7oo9Rb04sUT4omtZqZqf9uq9WM25Tb6v3usmvA93UqfnnoWs5V0uYjEl9Al6MNU10MCGKLwpg==
-=======
-  resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.24.0.tgz#2ed19d079efc0848eb1f800f0c393a074c4696fb"
-  integrity sha512-IJooSvvu2qNRe7oo9Rb04sUT4omtZqZqf9uq9WM25Tb6v3usmvA93UqfnnoWs5V0uYjEl9Al6MNU10MCGKLwpg==
-  dependencies:
-    hermes-estree "0.24.0"
-
-hermes-profile-transformer@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.npmjs.org/hermes-profile-transformer/-/hermes-profile-transformer-0.0.6.tgz"
-  integrity sha512-cnN7bQUm65UWOy6cbGcCcZ3rpwW8Q/j4OP5aWRhEry4Z2t2aR1cjrbp0BS+KiBN0smvP1caBgAuxutvyvJILzQ==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     hermes-estree "0.24.0"
 
@@ -5993,13 +5284,6 @@ hosted-git-info@^7.0.0:
   dependencies:
     lru-cache "^10.0.1"
 
-hosted-git-info@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.2.tgz#9b751acac097757667f30114607ef7b661ff4f17"
-  integrity sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==
-  dependencies:
-    lru-cache "^10.0.1"
-
 html-encoding-sniffer@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"
@@ -6136,7 +5420,7 @@ ini@~1.3.0:
 
 internal-ip@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  resolved "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"
   integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
     default-gateway "^4.2.0"
@@ -6292,14 +5576,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-<<<<<<< HEAD
-=======
-is-interactive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz"
-  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
-
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 is-map@^2.0.3:
   version "2.0.3"
   resolved "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz"
@@ -6400,14 +5676,6 @@ is-typed-array@^1.1.13:
   dependencies:
     which-typed-array "^1.1.14"
 
-<<<<<<< HEAD
-=======
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 is-weakmap@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz"
@@ -6674,11 +5942,7 @@ jest-environment-node@^29.6.3, jest-environment-node@^29.7.0:
 
 jest-expo@~52.0.0:
   version "52.0.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/jest-expo/-/jest-expo-52.0.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-52.0.0.tgz#6badddcebe458674f78c596d6992251237fdf80d"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-HnMCdVh08me4VPucxlq3t28q7yxwrnDf55JFFwJ3hdfXUG55Zy6aDHT0Oeefd4uOCHAUJaBvl3kWpNgUmMRBtA==
   dependencies:
     "@expo/config" "~10.0.0"
@@ -6783,7 +6047,7 @@ jest-resolve-dependencies@^29.7.0:
     jest-regex-util "^29.6.3"
     jest-snapshot "^29.7.0"
 
-jest-resolve@^29.7.0:
+jest-resolve@*, jest-resolve@^29.7.0:
   version "29.7.0"
   resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz"
   integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==
@@ -6939,6 +6203,15 @@ jest-watcher@^29.0.0, jest-watcher@^29.7.0:
     jest-util "^29.7.0"
     string-length "^4.0.1"
 
+jest-worker@^27.4.5:
+  version "27.5.1"
+  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jest-worker@^29.6.3, jest-worker@^29.7.0:
   version "29.7.0"
   resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz"
@@ -6949,7 +6222,7 @@ jest-worker@^29.6.3, jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@^29.7.0:
+"jest@^27.0.0 || ^28.0.0 || ^29.0.0", jest@^29.0.0, jest@^29.7.0, jest@>=28.0.0:
   version "29.7.0"
   resolved "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz"
   integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==
@@ -6964,7 +6237,7 @@ jimp-compact@0.16.1:
   resolved "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1.tgz"
   integrity sha512-dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww==
 
-jiti@^1.18.2:
+jiti@*, jiti@^1.18.2:
   version "1.21.6"
   resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz"
   integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
@@ -7061,16 +6334,7 @@ jsdom@^20.0.0:
     ws "^8.11.0"
     xml-name-validator "^4.0.0"
 
-<<<<<<< HEAD
 jsesc@^3.0.2:
-=======
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-jsesc@^3.0.2, jsesc@~3.0.2:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "3.0.2"
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz"
   integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
@@ -7090,7 +6354,7 @@ json-parse-better-errors@^1.0.1:
   resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -7174,70 +6438,14 @@ lighthouse-logger@^1.0.0:
     debug "^2.6.9"
     marky "^1.2.2"
 
-<<<<<<< HEAD
-lightningcss-win32-x64-msvc@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.27.0.tgz"
-  integrity sha512-/OJLj94Zm/waZShL8nB5jsNj3CfNATLCTyFxZyouilfTmSoLDX7VlVAmhPHoZWVFp4vdmoiEbPEYC8HID3m6yw==
-
-lightningcss@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz"
-=======
 lightningcss-darwin-arm64@1.27.0:
   version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.27.0.tgz#565bd610533941cba648a70e105987578d82f996"
+  resolved "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.27.0.tgz"
   integrity sha512-Gl/lqIXY+d+ySmMbgDf0pgaWSqrWYxVHoc88q+Vhf2YNzZ8DwoRzGt5NZDVqqIW5ScpSnmmjcgXP87Dn2ylSSQ==
 
-lightningcss-darwin-x64@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.27.0.tgz#c906a267237b1c7fe08bff6c5ac032c099bc9482"
-  integrity sha512-0+mZa54IlcNAoQS9E0+niovhyjjQWEMrwW0p2sSdLRhLDc8LMQ/b67z7+B5q4VmjYCMSfnFi3djAAQFIDuj/Tg==
-
-lightningcss-freebsd-x64@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.27.0.tgz#a7c3c4d6ee18dffeb8fa69f14f8f9267f7dc0c34"
-  integrity sha512-n1sEf85fePoU2aDN2PzYjoI8gbBqnmLGEhKq7q0DKLj0UTVmOTwDC7PtLcy/zFxzASTSBlVQYJUhwIStQMIpRA==
-
-lightningcss-linux-arm-gnueabihf@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.27.0.tgz#c7c16432a571ec877bf734fe500e4a43d48c2814"
-  integrity sha512-MUMRmtdRkOkd5z3h986HOuNBD1c2lq2BSQA1Jg88d9I7bmPGx08bwGcnB75dvr17CwxjxD6XPi3Qh8ArmKFqCA==
-
-lightningcss-linux-arm64-gnu@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.27.0.tgz#cfd9e18df1cd65131da286ddacfa3aee6862a752"
-  integrity sha512-cPsxo1QEWq2sfKkSq2Bq5feQDHdUEwgtA9KaB27J5AX22+l4l0ptgjMZZtYtUnteBofjee+0oW1wQ1guv04a7A==
-
-lightningcss-linux-arm64-musl@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.27.0.tgz#6682ff6b9165acef9a6796bd9127a8e1247bb0ed"
-  integrity sha512-rCGBm2ax7kQ9pBSeITfCW9XSVF69VX+fm5DIpvDZQl4NnQoMQyRwhZQm9pd59m8leZ1IesRqWk2v/DntMo26lg==
-
-lightningcss-linux-x64-gnu@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.27.0.tgz#714221212ad184ddfe974bbb7dbe9300dfde4bc0"
-  integrity sha512-Dk/jovSI7qqhJDiUibvaikNKI2x6kWPN79AQiD/E/KeQWMjdGe9kw51RAgoWFDi0coP4jinaH14Nrt/J8z3U4A==
-
-lightningcss-linux-x64-musl@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.27.0.tgz#247958daf622a030a6dc2285afa16b7184bdf21e"
-  integrity sha512-QKjTxXm8A9s6v9Tg3Fk0gscCQA1t/HMoF7Woy1u68wCk5kS4fR+q3vXa1p3++REW784cRAtkYKrPy6JKibrEZA==
-
-lightningcss-win32-arm64-msvc@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.27.0.tgz#64cfe473c264ef5dc275a4d57a516d77fcac6bc9"
-  integrity sha512-/wXegPS1hnhkeG4OXQKEMQeJd48RDC3qdh+OA8pCuOPCyvnm/yEayrJdJVqzBsqpy1aJklRCVxscpFur80o6iQ==
-
-lightningcss-win32-x64-msvc@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.27.0.tgz#237d0dc87d9cdc9cf82536bcbc07426fa9f3f422"
-  integrity sha512-/OJLj94Zm/waZShL8nB5jsNj3CfNATLCTyFxZyouilfTmSoLDX7VlVAmhPHoZWVFp4vdmoiEbPEYC8HID3m6yw==
-
 lightningcss@~1.27.0:
   version "1.27.0"
-  resolved "https://registry.yarnpkg.com/lightningcss/-/lightningcss-1.27.0.tgz#d4608e63044343836dd9769f6c8b5d607867649a"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
+  resolved "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz"
   integrity sha512-8f7aNmS1+etYSLHht0fQApPc2kNO8qGRutifN5rVIc6Xo6ABsEbqOr758UwI7ALVbTt4x1fllKt0PYgzD9S3yQ==
   dependencies:
     detect-libc "^1.0.3"
@@ -7268,6 +6476,11 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+loader-runner@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"
+  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
+
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"
@@ -7444,7 +6657,6 @@ metro-babel-transformer@0.81.0:
     hermes-parser "0.24.0"
     nullthrows "^1.1.1"
 
-<<<<<<< HEAD
 metro-cache-key@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.81.0.tgz"
@@ -7456,61 +6668,15 @@ metro-cache@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-cache/-/metro-cache-0.81.0.tgz"
   integrity sha512-DyuqySicHXkHUDZFVJmh0ygxBSx6pCKUrTcSgb884oiscV/ROt1Vhye+x+OIHcsodyA10gzZtrVtxIFV4l9I4g==
-=======
-metro-babel-transformer@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.81.0.tgz#cf468eafea52e4d8a77844eb7257f8a76e9d9d94"
-  integrity sha512-Dc0QWK4wZIeHnyZ3sevWGTnnSkIDDn/SWyfrn99zbKbDOCoCYy71PAn9uCRrP/hduKLJQOy+tebd63Rr9D8tXg==
-  dependencies:
-    "@babel/core" "^7.25.2"
-    flow-enums-runtime "^0.0.6"
-    hermes-parser "0.24.0"
-    nullthrows "^1.1.1"
-
-metro-cache-key@0.80.12:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.80.12.tgz"
-  integrity sha512-o4BspKnugg/pE45ei0LGHVuBJXwRgruW7oSFAeSZvBKA/sGr0UhOGY3uycOgWInnS3v5yTTfiBA9lHlNRhsvGA==
-  dependencies:
-    flow-enums-runtime "^0.0.6"
-
-metro-cache-key@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.81.0.tgz#5db34fa1a323a2310205bda7abd0df9614e36f45"
-  integrity sha512-qX/IwtknP9bQZL78OK9xeSvLM/xlGfrs6SlUGgHvrxtmGTRSsxcyqxR+c+7ch1xr05n62Gin/O44QKg5V70rNQ==
-  dependencies:
-    flow-enums-runtime "^0.0.6"
-
-metro-cache@0.80.12:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-cache/-/metro-cache-0.80.12.tgz"
-  integrity sha512-p5kNHh2KJ0pbQI/H7ZBPCEwkyNcSz7OUkslzsiIWBMPQGFJ/xArMwkV7I+GJcWh+b4m6zbLxE5fk6fqbVK1xGA==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     exponential-backoff "^3.1.1"
     flow-enums-runtime "^0.0.6"
     metro-core "0.81.0"
 
-<<<<<<< HEAD
 metro-config@^0.81.0, metro-config@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-config/-/metro-config-0.81.0.tgz"
   integrity sha512-6CinEaBe3WLpRlKlYXXu8r1UblJhbwD6Gtnoib5U8j6Pjp7XxMG9h/DGMeNp9aGLDu1OieUqiXpFo7O0/rR5Kg==
-=======
-metro-cache@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.81.0.tgz#90470d10d190ad708f04c6e337eec2c7cddb3db0"
-  integrity sha512-DyuqySicHXkHUDZFVJmh0ygxBSx6pCKUrTcSgb884oiscV/ROt1Vhye+x+OIHcsodyA10gzZtrVtxIFV4l9I4g==
-  dependencies:
-    exponential-backoff "^3.1.1"
-    flow-enums-runtime "^0.0.6"
-    metro-core "0.81.0"
-
-metro-config@0.80.12, metro-config@^0.80.3:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-config/-/metro-config-0.80.12.tgz"
-  integrity sha512-4rwOWwrhm62LjB12ytiuR5NgK1ZBNr24/He8mqCsC+HXZ+ATbrewLNztzbAZHtFsrxP4D4GLTGgh96pCpYLSAQ==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     connect "^3.6.5"
     cosmiconfig "^5.0.5"
@@ -7521,56 +6687,19 @@ metro-config@0.80.12, metro-config@^0.80.3:
     metro-core "0.81.0"
     metro-runtime "0.81.0"
 
-<<<<<<< HEAD
 metro-core@^0.81.0, metro-core@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-core/-/metro-core-0.81.0.tgz"
   integrity sha512-CVkM5YCOAFkNMvJai6KzA0RpztzfEKRX62/PFMOJ9J7K0uq/UkOFLxcgpcncMIrfy0PbfEj811b69tjULUQe1Q==
-=======
-metro-config@0.81.0, metro-config@^0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.81.0.tgz#8f8074033cb7e9ddb5b0459642adf6880bc9fbc1"
-  integrity sha512-6CinEaBe3WLpRlKlYXXu8r1UblJhbwD6Gtnoib5U8j6Pjp7XxMG9h/DGMeNp9aGLDu1OieUqiXpFo7O0/rR5Kg==
-  dependencies:
-    connect "^3.6.5"
-    cosmiconfig "^5.0.5"
-    flow-enums-runtime "^0.0.6"
-    jest-validate "^29.6.3"
-    metro "0.81.0"
-    metro-cache "0.81.0"
-    metro-core "0.81.0"
-    metro-runtime "0.81.0"
-
-metro-core@0.80.12, metro-core@^0.80.3:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-core/-/metro-core-0.80.12.tgz"
-  integrity sha512-QqdJ/yAK+IpPs2HU/h5v2pKEdANBagSsc6DRSjnwSyJsCoHlmyJKCaCJ7KhWGx+N4OHxh37hoA8fc2CuZbx0Fw==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     flow-enums-runtime "^0.0.6"
     lodash.throttle "^4.1.1"
     metro-resolver "0.81.0"
 
-<<<<<<< HEAD
 metro-file-map@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.81.0.tgz"
   integrity sha512-zMDI5uYhQCyxbye/AuFx/pAbsz9K+vKL7h1ShUXdN2fz4VUPiyQYRsRqOoVG1DsiCgzd5B6LW0YW77NFpjDQeg==
-=======
-metro-core@0.81.0, metro-core@^0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.81.0.tgz#d0b634f9cf97849b7730c59457ab7a439811d4c8"
-  integrity sha512-CVkM5YCOAFkNMvJai6KzA0RpztzfEKRX62/PFMOJ9J7K0uq/UkOFLxcgpcncMIrfy0PbfEj811b69tjULUQe1Q==
-  dependencies:
-    flow-enums-runtime "^0.0.6"
-    lodash.throttle "^4.1.1"
-    metro-resolver "0.81.0"
-
-metro-file-map@0.80.12:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.80.12.tgz"
-  integrity sha512-sYdemWSlk66bWzW2wp79kcPMzwuG32x1ZF3otI0QZTmrnTaaTiGyhE66P1z6KR4n2Eu5QXiABa6EWbAQv0r8bw==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     anymatch "^3.0.3"
     debug "^2.2.0"
@@ -7586,41 +6715,14 @@ metro-file-map@0.80.12:
   optionalDependencies:
     fsevents "^2.3.2"
 
-<<<<<<< HEAD
 metro-minify-terser@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.81.0.tgz"
   integrity sha512-U2ramh3W822ZR1nfXgIk+emxsf5eZSg10GbQrT0ZizImK8IZ5BmJY+BHRIkQgHzWFpExOVxC7kWbGL1bZALswA==
-=======
-metro-file-map@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.81.0.tgz#af0ccf4f8db4fd8429f78f231faa49dde2c402c3"
-  integrity sha512-zMDI5uYhQCyxbye/AuFx/pAbsz9K+vKL7h1ShUXdN2fz4VUPiyQYRsRqOoVG1DsiCgzd5B6LW0YW77NFpjDQeg==
-  dependencies:
-    anymatch "^3.0.3"
-    debug "^2.2.0"
-    fb-watchman "^2.0.0"
-    flow-enums-runtime "^0.0.6"
-    graceful-fs "^4.2.4"
-    invariant "^2.2.4"
-    jest-worker "^29.6.3"
-    micromatch "^4.0.4"
-    node-abort-controller "^3.1.1"
-    nullthrows "^1.1.1"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^2.3.2"
-
-metro-minify-terser@0.80.12:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.80.12.tgz"
-  integrity sha512-muWzUw3y5k+9083ZoX9VaJLWEV2Jcgi+Oan0Mmb/fBNMPqP9xVDuy4pOMn/HOiGndgfh/MK7s4bsjkyLJKMnXQ==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     flow-enums-runtime "^0.0.6"
     terser "^5.15.0"
 
-<<<<<<< HEAD
 metro-resolver@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.81.0.tgz"
@@ -7632,78 +6734,13 @@ metro-runtime@^0.81.0, metro-runtime@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.81.0.tgz"
   integrity sha512-6oYB5HOt37RuGz2eV4A6yhcl+PUTwJYLDlY9vhT+aVjbUWI6MdBCf69vc4f5K5Vpt+yOkjy+2LDwLS0ykWFwYw==
-=======
-metro-minify-terser@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-minify-terser/-/metro-minify-terser-0.81.0.tgz#8b0abe977d63a99b99fa94d53678ef3170d5b659"
-  integrity sha512-U2ramh3W822ZR1nfXgIk+emxsf5eZSg10GbQrT0ZizImK8IZ5BmJY+BHRIkQgHzWFpExOVxC7kWbGL1bZALswA==
-  dependencies:
-    flow-enums-runtime "^0.0.6"
-    terser "^5.15.0"
-
-metro-resolver@0.80.12:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.80.12.tgz"
-  integrity sha512-PR24gYRZnYHM3xT9pg6BdbrGbM/Cu1TcyIFBVlAk7qDAuHkUNQ1nMzWumWs+kwSvtd9eZGzHoucGJpTUEeLZAw==
-  dependencies:
-    flow-enums-runtime "^0.0.6"
-
-metro-resolver@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.81.0.tgz#141f4837e1e0c5a1810ea02f2d9be3c9f6cf3766"
-  integrity sha512-Uu2Q+buHhm571cEwpPek8egMbdSTqmwT/5U7ZVNpK6Z2ElQBBCxd7HmFAslKXa7wgpTO2FAn6MqGeERbAtVDUA==
-  dependencies:
-    flow-enums-runtime "^0.0.6"
-
-metro-runtime@0.80.12, metro-runtime@^0.80.3:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.80.12.tgz"
-  integrity sha512-LIx7+92p5rpI0i6iB4S4GBvvLxStNt6fF0oPMaUd1Weku7jZdfkCZzmrtDD9CSQ6EPb0T9NUZoyXIxlBa3wOCw==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
-  dependencies:
-    "@babel/runtime" "^7.25.0"
-    flow-enums-runtime "^0.0.6"
-
-<<<<<<< HEAD
-metro-source-map@^0.81.0, metro-source-map@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.81.0.tgz"
-  integrity sha512-TzsVxhH83dyxg4A4+L1nzNO12I7ps5IHLjKGZH3Hrf549eiZivkdjYiq/S5lOB+p2HiQ+Ykcwtmcja95LIC62g==
-=======
-metro-runtime@0.81.0, metro-runtime@^0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.81.0.tgz#63af9b3fec15d1f307d89ef4881f5ba2c592291e"
-  integrity sha512-6oYB5HOt37RuGz2eV4A6yhcl+PUTwJYLDlY9vhT+aVjbUWI6MdBCf69vc4f5K5Vpt+yOkjy+2LDwLS0ykWFwYw==
   dependencies:
     "@babel/runtime" "^7.25.0"
-    flow-enums-runtime "^0.0.6"
-
-metro-source-map@0.80.12, metro-source-map@^0.80.3:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.80.12.tgz"
-  integrity sha512-o+AXmE7hpvM8r8MKsx7TI21/eerYYy2DCDkWfoBkv+jNkl61khvDHlQn0cXZa6lrcNZiZkl9oHSMcwLLIrFmpw==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
-  dependencies:
-    "@babel/traverse" "^7.25.3"
-    "@babel/traverse--for-generate-function-map" "npm:@babel/traverse@^7.25.3"
-    "@babel/types" "^7.25.2"
-    flow-enums-runtime "^0.0.6"
-    invariant "^2.2.4"
-    metro-symbolicate "0.81.0"
-    nullthrows "^1.1.1"
-    ob1 "0.81.0"
-    source-map "^0.5.6"
-    vlq "^1.0.0"
-
-<<<<<<< HEAD
-metro-symbolicate@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.81.0.tgz"
-  integrity sha512-C/1rWbNTPYp6yzID8IPuQPpVGzJ2rbWYBATxlvQ9dfK5lVNoxcwz77hjcY8ISLsRRR15hyd/zbjCNKPKeNgE1Q==
-=======
-metro-source-map@0.81.0, metro-source-map@^0.81.0:
+    flow-enums-runtime "^0.0.6"
+
+metro-source-map@^0.81.0, metro-source-map@0.81.0:
   version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.81.0.tgz#ca83964124bb227d5f0bdb1ee304dbfe635f869e"
+  resolved "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.81.0.tgz"
   integrity sha512-TzsVxhH83dyxg4A4+L1nzNO12I7ps5IHLjKGZH3Hrf549eiZivkdjYiq/S5lOB+p2HiQ+Ykcwtmcja95LIC62g==
   dependencies:
     "@babel/traverse" "^7.25.3"
@@ -7717,11 +6754,10 @@ metro-source-map@0.81.0, metro-source-map@^0.81.0:
     source-map "^0.5.6"
     vlq "^1.0.0"
 
-metro-symbolicate@0.80.12:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.80.12.tgz"
-  integrity sha512-/dIpNdHksXkGHZXARZpL7doUzHqSNxgQ8+kQGxwpJuHnDhGkENxB5PS2QBaTDdEcmyTMjS53CN1rl9n1gR6fmw==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
+metro-symbolicate@0.81.0:
+  version "0.81.0"
+  resolved "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.81.0.tgz"
+  integrity sha512-C/1rWbNTPYp6yzID8IPuQPpVGzJ2rbWYBATxlvQ9dfK5lVNoxcwz77hjcY8ISLsRRR15hyd/zbjCNKPKeNgE1Q==
   dependencies:
     flow-enums-runtime "^0.0.6"
     invariant "^2.2.4"
@@ -7731,30 +6767,10 @@ metro-symbolicate@0.80.12:
     through2 "^2.0.1"
     vlq "^1.0.0"
 
-<<<<<<< HEAD
 metro-transform-plugins@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.81.0.tgz"
   integrity sha512-uErLAPBvttGCrmGSCa0dNHlOTk3uJFVEVWa5WDg6tQ79PRmuYRwzUgLhVzn/9/kyr75eUX3QWXN79Jvu4txt6Q==
-=======
-metro-symbolicate@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.81.0.tgz#b7b1eae8bfd6ad2a922fa2bcb9f2144e464adafb"
-  integrity sha512-C/1rWbNTPYp6yzID8IPuQPpVGzJ2rbWYBATxlvQ9dfK5lVNoxcwz77hjcY8ISLsRRR15hyd/zbjCNKPKeNgE1Q==
-  dependencies:
-    flow-enums-runtime "^0.0.6"
-    invariant "^2.2.4"
-    metro-source-map "0.81.0"
-    nullthrows "^1.1.1"
-    source-map "^0.5.6"
-    through2 "^2.0.1"
-    vlq "^1.0.0"
-
-metro-transform-plugins@0.80.12:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.80.12.tgz"
-  integrity sha512-WQWp00AcZvXuQdbjQbx1LzFR31IInlkCDYJNRs6gtEtAyhwpMMlL2KcHmdY+wjDO9RPcliZ+Xl1riOuBecVlPA==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     "@babel/core" "^7.25.2"
     "@babel/generator" "^7.25.0"
@@ -7763,29 +6779,10 @@ metro-transform-plugins@0.80.12:
     flow-enums-runtime "^0.0.6"
     nullthrows "^1.1.1"
 
-<<<<<<< HEAD
 metro-transform-worker@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.81.0.tgz"
   integrity sha512-HrQ0twiruhKy0yA+9nK5bIe3WQXZcC66PXTvRIos61/EASLAP2DzEmW7IxN/MGsfZegN2UzqL2CG38+mOB45vg==
-=======
-metro-transform-plugins@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.81.0.tgz#614c0e50593df545487b3f3383fed810c608fb32"
-  integrity sha512-uErLAPBvttGCrmGSCa0dNHlOTk3uJFVEVWa5WDg6tQ79PRmuYRwzUgLhVzn/9/kyr75eUX3QWXN79Jvu4txt6Q==
-  dependencies:
-    "@babel/core" "^7.25.2"
-    "@babel/generator" "^7.25.0"
-    "@babel/template" "^7.25.0"
-    "@babel/traverse" "^7.25.3"
-    flow-enums-runtime "^0.0.6"
-    nullthrows "^1.1.1"
-
-metro-transform-worker@0.80.12:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.80.12.tgz"
-  integrity sha512-KAPFN1y3eVqEbKLx1I8WOarHPqDMUa8WelWxaJCNKO/yHCP26zELeqTJvhsQup+8uwB6EYi/sp0b6TGoh6lOEA==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     "@babel/core" "^7.25.2"
     "@babel/generator" "^7.25.0"
@@ -7801,36 +6798,10 @@ metro-transform-worker@0.80.12:
     metro-transform-plugins "0.81.0"
     nullthrows "^1.1.1"
 
-<<<<<<< HEAD
 metro@^0.81.0, metro@0.81.0:
   version "0.81.0"
   resolved "https://registry.npmjs.org/metro/-/metro-0.81.0.tgz"
   integrity sha512-kzdzmpL0gKhEthZ9aOV7sTqvg6NuTxDV8SIm9pf9sO8VVEbKrQk5DNcwupOUjgPPFAuKUc2NkT0suyT62hm2xg==
-=======
-metro-transform-worker@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.81.0.tgz#43e63c95014f36786f0e1a132c778c6392950de7"
-  integrity sha512-HrQ0twiruhKy0yA+9nK5bIe3WQXZcC66PXTvRIos61/EASLAP2DzEmW7IxN/MGsfZegN2UzqL2CG38+mOB45vg==
-  dependencies:
-    "@babel/core" "^7.25.2"
-    "@babel/generator" "^7.25.0"
-    "@babel/parser" "^7.25.3"
-    "@babel/types" "^7.25.2"
-    flow-enums-runtime "^0.0.6"
-    metro "0.81.0"
-    metro-babel-transformer "0.81.0"
-    metro-cache "0.81.0"
-    metro-cache-key "0.81.0"
-    metro-minify-terser "0.81.0"
-    metro-source-map "0.81.0"
-    metro-transform-plugins "0.81.0"
-    nullthrows "^1.1.1"
-
-metro@0.80.12, metro@^0.80.3:
-  version "0.80.12"
-  resolved "https://registry.npmjs.org/metro/-/metro-0.80.12.tgz"
-  integrity sha512-1UsH5FzJd9quUsD1qY+zUG4JY3jo3YEMxbMYH9jT6NK3j4iORhlwTK8fYTfAUBhDKjgLfKjAh7aoazNE23oIRA==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     "@babel/code-frame" "^7.24.7"
     "@babel/core" "^7.25.2"
@@ -7875,59 +6846,7 @@ metro@0.80.12, metro@^0.80.3:
     ws "^7.5.10"
     yargs "^17.6.2"
 
-<<<<<<< HEAD
 micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
-=======
-metro@0.81.0, metro@^0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/metro/-/metro-0.81.0.tgz#cffe9b7d597728dee8b57903ca155417b7c13a4f"
-  integrity sha512-kzdzmpL0gKhEthZ9aOV7sTqvg6NuTxDV8SIm9pf9sO8VVEbKrQk5DNcwupOUjgPPFAuKUc2NkT0suyT62hm2xg==
-  dependencies:
-    "@babel/code-frame" "^7.24.7"
-    "@babel/core" "^7.25.2"
-    "@babel/generator" "^7.25.0"
-    "@babel/parser" "^7.25.3"
-    "@babel/template" "^7.25.0"
-    "@babel/traverse" "^7.25.3"
-    "@babel/types" "^7.25.2"
-    accepts "^1.3.7"
-    chalk "^4.0.0"
-    ci-info "^2.0.0"
-    connect "^3.6.5"
-    debug "^2.2.0"
-    denodeify "^1.2.1"
-    error-stack-parser "^2.0.6"
-    flow-enums-runtime "^0.0.6"
-    graceful-fs "^4.2.4"
-    hermes-parser "0.24.0"
-    image-size "^1.0.2"
-    invariant "^2.2.4"
-    jest-worker "^29.6.3"
-    jsc-safe-url "^0.2.2"
-    lodash.throttle "^4.1.1"
-    metro-babel-transformer "0.81.0"
-    metro-cache "0.81.0"
-    metro-cache-key "0.81.0"
-    metro-config "0.81.0"
-    metro-core "0.81.0"
-    metro-file-map "0.81.0"
-    metro-resolver "0.81.0"
-    metro-runtime "0.81.0"
-    metro-source-map "0.81.0"
-    metro-symbolicate "0.81.0"
-    metro-transform-plugins "0.81.0"
-    metro-transform-worker "0.81.0"
-    mime-types "^2.1.27"
-    nullthrows "^1.1.1"
-    serialize-error "^2.1.0"
-    source-map "^0.5.6"
-    strip-ansi "^6.0.0"
-    throat "^5.0.0"
-    ws "^7.5.10"
-    yargs "^17.6.2"
-
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "4.0.8"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -8119,15 +7038,7 @@ negotiator@0.6.3:
   resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-<<<<<<< HEAD
-=======
-negotiator@~0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
-  integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
-
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
-neo-async@^2.5.0, neo-async@^2.6.1:
+neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -8154,11 +7065,7 @@ node-dir@^0.1.17:
   dependencies:
     minimatch "^3.0.2"
 
-<<<<<<< HEAD
 node-fetch@^2.2.0, node-fetch@^2.6.1, node-fetch@^2.6.12:
-=======
-node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.12:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "2.7.0"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
   integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
@@ -8192,23 +7099,8 @@ normalize-url@^6.0.1:
 
 npm-package-arg@^11.0.0:
   version "11.0.3"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz"
   integrity sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==
-=======
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-11.0.3.tgz#dae0c21199a99feca39ee4bfb074df3adac87e2d"
-  integrity sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==
-  dependencies:
-    hosted-git-info "^7.0.0"
-    proc-log "^4.0.0"
-    semver "^7.3.5"
-    validate-npm-package-name "^5.0.0"
-
-npm-package-arg@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-7.0.0.tgz"
-  integrity sha512-xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     hosted-git-info "^7.0.0"
     proc-log "^4.0.0"
@@ -8251,13 +7143,6 @@ ob1@0.81.0:
   dependencies:
     flow-enums-runtime "^0.0.6"
 
-ob1@0.81.0:
-  version "0.81.0"
-  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.81.0.tgz#dc3154cca7aa9c2eb58f5ac63e9ee23ff4c6f520"
-  integrity sha512-6Cvrkxt1tqaRdWqTAMcVYEiO5i1xcF9y7t06nFdjFqkfPsEloCf8WwhXdwBpNUkVYSQlSGS7cDgVQR86miBfBQ==
-  dependencies:
-    flow-enums-runtime "^0.0.6"
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
@@ -8576,7 +7461,6 @@ picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz"
   integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
 
-<<<<<<< HEAD
 picomatch@^2.0.4:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
@@ -8593,14 +7477,6 @@ picomatch@^2.2.3:
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 picomatch@^2.3.1:
-=======
-picocolors@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
-  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -8733,7 +7609,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.12, postcss@^8.4.23, postcss@~8.4.32:
+postcss@^8.0.0, postcss@^8.2, postcss@^8.2.14, postcss@^8.2.2, postcss@^8.2.6, postcss@^8.4.12, postcss@^8.4.21, postcss@^8.4.23, postcss@>=8.0.9, postcss@~8.4.32:
   version "8.4.45"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz"
   integrity sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==
@@ -8754,22 +7630,9 @@ prettier@3.3.3:
 
 pretty-bytes@^5.6.0:
   version "5.6.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
+  resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-<<<<<<< HEAD
-=======
-pretty-format@^26.5.2, pretty-format@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz"
-  integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==
-  dependencies:
-    "@jest/types" "^26.6.2"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^17.0.1"
-
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 pretty-format@^27.0.2:
   version "27.5.1"
   resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz"
@@ -8788,7 +7651,6 @@ pretty-format@^29.0.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-<<<<<<< HEAD
 pretty-format@^29.7.0:
   version "29.7.0"
   resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz"
@@ -8801,11 +7663,6 @@ pretty-format@^29.7.0:
 proc-log@^4.0.0:
   version "4.2.0"
   resolved "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz"
-=======
-proc-log@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==
 
 process-nextick-args@~2.0.0:
@@ -8815,7 +7672,7 @@ process-nextick-args@~2.0.0:
 
 progress@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
 promise@^7.1.1:
@@ -8914,6 +7771,13 @@ quick-lru@^5.1.1:
   resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
+randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
@@ -8937,28 +7801,21 @@ react-devtools-core@^5.3.1:
     shell-quote "^1.6.1"
     ws "^7"
 
-<<<<<<< HEAD
 react-dom@18.3.1:
   version "18.3.1"
   resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz"
-=======
-react-devtools-core@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-5.3.2.tgz#d5df92f8ef2a587986d094ef2c47d84cf4ae46ec"
-  integrity sha512-crr9HkVrDiJ0A4zot89oS0Cgv0Oa4OG1Em4jit3P3ZxZSKPMYyMjfwMqgcJna9o625g8oN87rBm8SWWrSTBZxg==
-  dependencies:
-    shell-quote "^1.6.1"
-    ws "^7"
-
-react-dom@18.3.1:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
   dependencies:
     loose-envify "^1.1.0"
     scheduler "^0.23.2"
 
+react-dom@19.0.0-rc-6230622a1a-20240610:
+  version "19.0.0-rc-6230622a1a-20240610"
+  resolved "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0-rc-6230622a1a-20240610.tgz"
+  integrity sha512-56G4Pum5E7FeGL1rwHX5IxidSJxQnXP4yORRo0pVeOJuu5DQJvNKpUwmJoftMP/ez0AiglYTY77L2Gs8iyt1Hg==
+  dependencies:
+    scheduler "0.25.0-rc-6230622a1a-20240610"
+
 react-freeze@^1.0.0:
   version "1.0.4"
   resolved "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.4.tgz"
@@ -8974,7 +7831,6 @@ react-is@^17.0.1:
   resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-<<<<<<< HEAD
 react-is@^18.0.0:
   version "18.3.1"
   resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz"
@@ -8986,9 +7842,6 @@ react-is@^18.1.0:
   integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
 react-is@^18.3.1:
-=======
-react-is@^18.0.0, react-is@^18.1.0, react-is@^18.3.1:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "18.3.1"
   resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz"
   integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
@@ -9000,13 +7853,9 @@ react-native-dotenv@^3.4.11:
   dependencies:
     dotenv "^16.4.5"
 
-react-native-gesture-handler@~2.20.2:
+react-native-gesture-handler@>=2.0.0, react-native-gesture-handler@>=2.x.x, react-native-gesture-handler@~2.20.2:
   version "2.20.2"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.20.2.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.20.2.tgz#73844c8e9c417459c2f2981bc4d8f66ba8a5ee66"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-HqzFpFczV4qCnwKlvSAvpzEXisL+Z9fsR08YV5LfJDkzuArMhBu2sOoSPUF/K62PCoAb+ObGlTC83TKHfUd0vg==
   dependencies:
     "@egjs/hammerjs" "^2.0.17"
@@ -9016,11 +7865,7 @@ react-native-gesture-handler@~2.20.2:
 
 react-native-maps@1.18.0:
   version "1.18.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/react-native-maps/-/react-native-maps-1.18.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/react-native-maps/-/react-native-maps-1.18.0.tgz#48d253041a9baa5606b4f3647043d660a93b3b01"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-S17nYUqeMptgIPaAZuVRo+eRelPreBBYQWw6jsxU7qQ12p+THSfFaqabcNn7fBmsXhT3T27iIl8ek8v1H8BaGw==
   dependencies:
     "@types/geojson" "^7946.0.13"
@@ -9030,13 +7875,9 @@ react-native-reanimated-carousel@^3.5.1:
   resolved "https://registry.npmjs.org/react-native-reanimated-carousel/-/react-native-reanimated-carousel-3.5.1.tgz"
   integrity sha512-9BBQV6JAYSQm2lV7MFtT4mzapXmW4IZO6s38gfiJL84Jg23ivGB1UykcNQauKgtHyhtW2NuZJzItb1s42lM+hA==
 
-react-native-reanimated@~3.16.1:
+react-native-reanimated@>=2.x.x, react-native-reanimated@>=3.0.0, react-native-reanimated@~3.16.1:
   version "3.16.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.16.1.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.16.1.tgz#7c3cb256adb8fb436f57911d0e8e7cae68e28a67"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-Wnbo7toHZ6kPLAD8JWKoKCTfNoqYOMW5vUEP76Rr4RBmJCrdXj6oauYP0aZnZq8NCbiP5bwwu7+RECcWtoetnQ==
   dependencies:
     "@babel/plugin-transform-arrow-functions" "^7.0.0-0"
@@ -9051,22 +7892,14 @@ react-native-reanimated@~3.16.1:
     convert-source-map "^2.0.0"
     invariant "^2.2.4"
 
-react-native-safe-area-context@4.12.0:
+"react-native-safe-area-context@>= 3.0.0", react-native-safe-area-context@4.12.0:
   version "4.12.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.12.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.12.0.tgz#17868522a55bbc6757418c94a1b4abdda6b045d9"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-ukk5PxcF4p3yu6qMZcmeiZgowhb5AsKRnil54YFUUAXVIS7PJcMHGGC+q44fCiBg44/1AJk5njGMez1m9H0BVQ==
 
-react-native-screens@~4.0.0:
+"react-native-screens@>= 3.0.0", react-native-screens@~4.0.0:
   version "4.0.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/react-native-screens/-/react-native-screens-4.0.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-4.0.0.tgz#f4f4f3f37b2e71c9960ab37c14f2bb3bd6d80a7d"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-QGQ8+d90chOZ9JwA2K01nFzrGCTMNjsiAKJGPUXcLEiIF77/VSjLjQE9ZluMtkva0gzGI9tb/yxETkJnkw1iag==
   dependencies:
     react-freeze "^1.0.0"
@@ -9079,61 +7912,10 @@ react-native-url-polyfill@^2.0.0:
   dependencies:
     whatwg-url-without-unicode "8.0.0-3"
 
-<<<<<<< HEAD
-react-native@*, react-native@0.76.1:
+react-native@*, "react-native@^0.0.0-0 || >=0.60 <1.0", "react-native@>= 0.64.3", react-native@>=0.59, react-native@>=0.6.0, react-native@>=0.62.x, react-native@0.76.1:
   version "0.76.1"
   resolved "https://registry.npmjs.org/react-native/-/react-native-0.76.1.tgz"
   integrity sha512-z4KnbrnnAvloRs9NGnah3u6/LK3IbtNMrvByxa3ifigbMlsMY4WPRYV9lvt/hH4Mzt8bfuI+utnOxFyJTTq3lg==
-=======
-react-native@*:
-  version "0.74.5"
-  resolved "https://registry.npmjs.org/react-native/-/react-native-0.74.5.tgz"
-  integrity sha512-Bgg2WvxaGODukJMTZFTZBNMKVaROHLwSb8VAGEdrlvKwfb1hHg/3aXTUICYk7dwgAnb+INbGMwnF8yeAgIUmqw==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
-  dependencies:
-    "@jest/create-cache-key-function" "^29.6.3"
-    "@react-native/assets-registry" "0.76.1"
-    "@react-native/codegen" "0.76.1"
-    "@react-native/community-cli-plugin" "0.76.1"
-    "@react-native/gradle-plugin" "0.76.1"
-    "@react-native/js-polyfills" "0.76.1"
-    "@react-native/normalize-colors" "0.76.1"
-    "@react-native/virtualized-lists" "0.76.1"
-    abort-controller "^3.0.0"
-    anser "^1.4.9"
-    ansi-regex "^5.0.0"
-    babel-jest "^29.7.0"
-    babel-plugin-syntax-hermes-parser "^0.23.1"
-    base64-js "^1.5.1"
-    chalk "^4.0.0"
-    commander "^12.0.0"
-    event-target-shim "^5.0.1"
-    flow-enums-runtime "^0.0.6"
-    glob "^7.1.1"
-    invariant "^2.2.4"
-    jest-environment-node "^29.6.3"
-    jsc-android "^250231.0.0"
-    memoize-one "^5.0.0"
-    metro-runtime "^0.81.0"
-    metro-source-map "^0.81.0"
-    mkdirp "^0.5.1"
-    nullthrows "^1.1.1"
-    pretty-format "^29.7.0"
-    promise "^8.3.0"
-    react-devtools-core "^5.3.1"
-    react-refresh "^0.14.0"
-    regenerator-runtime "^0.13.2"
-    scheduler "0.24.0-canary-efb381bbf-20230505"
-    semver "^7.1.3"
-    stacktrace-parser "^0.1.10"
-    whatwg-fetch "^3.0.0"
-    ws "^6.2.3"
-    yargs "^17.6.2"
-
-react-native@0.76.1:
-  version "0.76.1"
-  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.76.1.tgz#203cd10d6ba03537cda905f9bb5b4bcd937cdfe1"
-  integrity sha512-z4KnbrnnAvloRs9NGnah3u6/LK3IbtNMrvByxa3ifigbMlsMY4WPRYV9lvt/hH4Mzt8bfuI+utnOxFyJTTq3lg==
   dependencies:
     "@jest/create-cache-key-function" "^29.6.3"
     "@react-native/assets-registry" "0.76.1"
@@ -9186,11 +7968,7 @@ react-refresh@^0.14.0, react-refresh@^0.14.2:
 
 react-server-dom-webpack@19.0.0-rc-6230622a1a-20240610:
   version "19.0.0-rc-6230622a1a-20240610"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-19.0.0-rc-6230622a1a-20240610.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/react-server-dom-webpack/-/react-server-dom-webpack-19.0.0-rc-6230622a1a-20240610.tgz#6c534fe7d376250fcc400e48f5402436b7961be0"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-nr+IsOVD07QdeCr4BLvR5TALfLaZLi9AIaoa6vXymBc051iDPWedJujYYrjRJy5+9jp9oCx3G8Tt/Bs//TckJw==
   dependencies:
     acorn-loose "^8.3.0"
@@ -9204,7 +7982,7 @@ react-shallow-renderer@^16.15.0:
     object-assign "^4.1.1"
     react-is "^16.12.0 || ^17.0.0 || ^18.0.0"
 
-react-test-renderer@18.1.0:
+react-test-renderer@>=16.8.0, react-test-renderer@18.1.0:
   version "18.1.0"
   resolved "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.1.0.tgz"
   integrity sha512-OfuueprJFW7h69GN+kr4Ywin7stcuqaYAt1g7airM5cUgP0BoF5G5CXsPGmXeDeEkncb2fqYNECO4y18sSqphg==
@@ -9215,26 +7993,16 @@ react-test-renderer@18.1.0:
 
 react-test-renderer@18.3.1:
   version "18.3.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.3.1.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.3.1.tgz#e693608a1f96283400d4a3afead6893f958b80b4"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-KkAgygexHUkQqtvvx/otwxtuFu5cVjfzTCtjXLH9boS19/Nbtg84zS7wIQn39G8IlrhThBpQsMKkq5ZHZIYFXA==
   dependencies:
     react-is "^18.3.1"
     react-shallow-renderer "^16.15.0"
     scheduler "^0.23.2"
 
-<<<<<<< HEAD
-react@^18.3.1:
+react@*, "react@^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0", "react@^18 || ^19", react@^18.1.0, react@^18.2.0, react@^18.3.1, "react@>= 17.0.1", react@>=16.8, react@>=16.8.0, react@>=16.x.x, react@>=17.0.0, react@18.3.1, react@19.0.0-rc-6230622a1a-20240610:
   version "18.3.1"
   resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz"
-=======
-react@18.3.1:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
   dependencies:
     loose-envify "^1.1.0"
@@ -9309,13 +8077,6 @@ regenerate-unicode-properties@^10.1.0:
   dependencies:
     regenerate "^1.4.2"
 
-regenerate-unicode-properties@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0"
-  integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==
-  dependencies:
-    regenerate "^1.4.2"
-
 regenerate@^1.4.2:
   version "1.4.2"
   resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
@@ -9360,30 +8121,6 @@ regexpu-core@^5.3.1:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.1.0"
 
-regexpu-core@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.1.1.tgz#b469b245594cb2d088ceebc6369dceb8c00becac"
-  integrity sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==
-  dependencies:
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.2.0"
-    regjsgen "^0.8.0"
-    regjsparser "^0.11.0"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
-
-regjsgen@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab"
-  integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==
-
-regjsparser@^0.11.0:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.11.2.tgz#7404ad42be00226d72bcf1f003f1f441861913d8"
-  integrity sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==
-  dependencies:
-    jsesc "~3.0.2"
-
 regjsparser@^0.9.1:
   version "0.9.1"
   resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz"
@@ -9449,11 +8186,7 @@ resolve-from@^5.0.0:
 
 resolve-workspace-root@^2.0.0:
   version "2.0.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/resolve-workspace-root/-/resolve-workspace-root-2.0.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/resolve-workspace-root/-/resolve-workspace-root-2.0.0.tgz#a0098daa0067cd0efa6eb525c57c8fb4a61e78f8"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-IsaBUZETJD5WsI11Wt8PKHwaIe45or6pwNc8yflvLJ4DWtImK9kuLoH5kUva/2Mmx/RdIyr4aONNSa2v9LTJsw==
 
 resolve.exports@^2.0.0, resolve.exports@^2.0.2:
@@ -9537,16 +8270,11 @@ safe-array-concat@^1.1.2:
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1, safe-buffer@5.1.2:
+safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1, safe-buffer@5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
 safe-regex-test@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz"
@@ -9594,6 +8322,20 @@ scheduler@0.24.0-canary-efb381bbf-20230505:
   dependencies:
     loose-envify "^1.1.0"
 
+scheduler@0.25.0-rc-6230622a1a-20240610:
+  version "0.25.0-rc-6230622a1a-20240610"
+  resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-6230622a1a-20240610.tgz"
+  integrity sha512-GTIQdJXthps5mgkIFo7yAq03M0QQYTfN8z+GrnMC/SCKFSuyFP5tk2BMaaWUsVy4u4r+dTLdiXH8JEivVls0Bw==
+
+schema-utils@^3.1.1, schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 selfsigned@^2.4.1:
   version "2.4.1"
   resolved "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz"
@@ -9617,16 +8359,11 @@ semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-<<<<<<< HEAD
 semver@^7.1.3:
-=======
-semver@^7.1.3, semver@^7.3.5, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "7.6.3"
   resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
-<<<<<<< HEAD
 semver@^7.3.5:
   version "7.6.3"
   resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"
@@ -9671,8 +8408,6 @@ send@^0.19.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-=======
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
@@ -9692,30 +8427,18 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-send@^0.19.0:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.19.1.tgz#1c2563b2ee4fe510b806b21ec46f355005a369f9"
-  integrity sha512-p4rRk4f23ynFEfcD9LA0xRYngj+IyGiEYyqqOak8kaN0TvNmuxC2dcVeBn62GpCeR2CpWqyHCNScTP91QbAVFg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
 serialize-error@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz"
   integrity sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw==
 
+serialize-javascript@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-static@^1.13.1:
   version "1.16.0"
   resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz"
@@ -9728,18 +8451,8 @@ serve-static@^1.13.1:
 
 server-only@^0.0.1:
   version "0.0.1"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/server-only/-/server-only-0.0.1.tgz"
   integrity sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==
-=======
-  resolved "https://registry.yarnpkg.com/server-only/-/server-only-0.0.1.tgz#0f366bb6afb618c37c9255a314535dc412cd1c9e"
-  integrity sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
 
 set-function-length@^1.2.1:
   version "1.2.2"
@@ -10157,30 +8870,10 @@ structured-headers@^0.4.1:
   resolved "https://registry.npmjs.org/structured-headers/-/structured-headers-0.4.1.tgz"
   integrity sha512-0MP/Cxx5SzeeZ10p/bZI0S6MpgD+yxAhi1BOQ34jgnMXsCq3j1t6tQnZu+KdlL7dvJTLT3g9xN8tl10TqgFMcg==
 
-<<<<<<< HEAD
 sucrase@^3.32.0, sucrase@3.35.0:
   version "3.35.0"
   resolved "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz"
   integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==
-=======
-sucrase@3.35.0:
-  version "3.35.0"
-  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
-  integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.2"
-    commander "^4.0.0"
-    glob "^10.3.10"
-    lines-and-columns "^1.1.6"
-    mz "^2.7.0"
-    pirates "^4.0.1"
-    ts-interface-checker "^0.1.9"
-
-sucrase@^3.32.0:
-  version "3.34.0"
-  resolved "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz"
-  integrity sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.2"
     commander "^4.0.0"
@@ -10246,7 +8939,7 @@ symbol-tree@^3.2.4:
   resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-tailwindcss@3.3.2:
+tailwindcss@~3, tailwindcss@3.3.2:
   version "3.3.2"
   resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz"
   integrity sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==
@@ -10275,6 +8968,11 @@ tailwindcss@3.3.2:
     resolve "^1.22.2"
     sucrase "^3.32.0"
 
+tapable@^2.1.1, tapable@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
+  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
+
 tar@^6.1.11, tar@^6.2.1:
   version "6.2.1"
   resolved "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz"
@@ -10318,7 +9016,18 @@ terminal-link@^2.1.1:
     ansi-escapes "^4.2.1"
     supports-hyperlinks "^2.0.0"
 
-terser@^5.15.0:
+terser-webpack-plugin@^5.3.10:
+  version "5.3.10"
+  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.20"
+    jest-worker "^27.4.5"
+    schema-utils "^3.1.1"
+    serialize-javascript "^6.0.1"
+    terser "^5.26.0"
+
+terser@^5.15.0, terser@^5.26.0:
   version "5.36.0"
   resolved "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz"
   integrity sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==
@@ -10535,7 +9244,7 @@ typescript-eslint@^8.1.0:
     "@typescript-eslint/parser" "8.5.0"
     "@typescript-eslint/utils" "8.5.0"
 
-typescript@~5.3.3:
+typescript@>=4.2.0, "typescript@>=4.3 <6", typescript@~5.3.3:
   version "5.3.3"
   resolved "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
@@ -10562,11 +9271,7 @@ undici-types@~6.19.2:
 
 undici@^6.18.2:
   version "6.21.0"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/undici/-/undici-6.21.0.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/undici/-/undici-6.21.0.tgz#4b3d3afaef984e07b48e7620c34ed8a285ed4cd4"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-BUgJXc752Kou3oOIuU1i+yZZypyZRqNPW0vqoMPl8VaoalSfeR0D8/t4iAS3yirs79SSMTxTag+ZC86uswv+Cw==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
@@ -10646,14 +9351,6 @@ update-browserslist-db@^1.1.1:
     escalade "^3.2.0"
     picocolors "^1.1.0"
 
-update-browserslist-db@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5"
-  integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==
-  dependencies:
-    escalade "^3.2.0"
-    picocolors "^1.1.0"
-
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
@@ -10723,24 +9420,10 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^2.0.0"
 
-<<<<<<< HEAD
 validate-npm-package-name@^5.0.0:
   version "5.0.1"
   resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz"
   integrity sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==
-=======
-validate-npm-package-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"
-  integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
-  dependencies:
-    builtins "^1.0.3"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
-
-validate-npm-package-name@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz#a316573e9b49f3ccd90dbb6eb52b3f06c6d604e8"
-  integrity sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==
 
 vary@~1.1.2:
   version "1.1.2"
@@ -10771,6 +9454,14 @@ warn-once@^0.1.0:
   resolved "https://registry.npmjs.org/warn-once/-/warn-once-0.1.1.tgz"
   integrity sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q==
 
+watchpack@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz"
+  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"
@@ -10780,11 +9471,7 @@ wcwidth@^1.0.1:
 
 web-streams-polyfill@^3.3.2:
   version "3.3.3"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
 
 webidl-conversions@^3.0.0:
@@ -10802,6 +9489,40 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
+webpack-sources@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
+  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
+
+webpack@^5.1.0, webpack@^5.59.0:
+  version "5.96.1"
+  resolved "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz"
+  integrity sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==
+  dependencies:
+    "@types/eslint-scope" "^3.7.7"
+    "@types/estree" "^1.0.6"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
+    acorn "^8.14.0"
+    browserslist "^4.24.0"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.17.1"
+    es-module-lexer "^1.2.1"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.11"
+    json-parse-even-better-errors "^2.3.1"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.2.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
+    webpack-sources "^3.2.3"
+
 whatwg-encoding@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"
@@ -10908,13 +9629,9 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wonka@^6.3.2:
+wonka@^6.3.2, wonka@^6.3.4:
   version "6.3.4"
-<<<<<<< HEAD
   resolved "https://registry.npmjs.org/wonka/-/wonka-6.3.4.tgz"
-=======
-  resolved "https://registry.yarnpkg.com/wonka/-/wonka-6.3.4.tgz#76eb9316e3d67d7febf4945202b5bdb2db534594"
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   integrity sha512-CjpbqNtBGNAeyNS/9W6q3kSkKE52+FjIj7AkFlLr11s/VWGUu6a2CdYSdGxocIhIVjaW/zchesBQUKPVU69Cqg==
 
 word-wrap@^1.2.5:
@@ -10971,11 +9688,7 @@ write-file-atomic@^4.0.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
-<<<<<<< HEAD
 ws@^6.2.3:
-=======
-ws@^6.2.2, ws@^6.2.3:
->>>>>>> 9c961ba4a0511826c8e5c589f3d56271f32fea53
   version "6.2.3"
   resolved "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz"
   integrity sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==

From d1b4c6c1f517e4f6ae4ccd94dd082c312fcc293e Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Thu, 21 Nov 2024 08:52:47 -0500
Subject: [PATCH 06/18] Text Colour changes

---
 .../src/screens/portfolio/PortfolioScreen.tsx |  1 +
 .../portfolio/components/PortfolioItem.tsx    | 41 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/frontend/src/screens/portfolio/PortfolioScreen.tsx b/frontend/src/screens/portfolio/PortfolioScreen.tsx
index 5e68539..d112376 100644
--- a/frontend/src/screens/portfolio/PortfolioScreen.tsx
+++ b/frontend/src/screens/portfolio/PortfolioScreen.tsx
@@ -39,6 +39,7 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
     if (!portfolio) {
       return <p>Failed to load portfolio. Please try again later.</p>;
     }
+  }
 
   return (
     <StyledView className='flex-1 justify-center bg-surfaceBG overflow-auto'>
diff --git a/frontend/src/screens/portfolio/components/PortfolioItem.tsx b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
index 3e0eb83..bef0f23 100644
--- a/frontend/src/screens/portfolio/components/PortfolioItem.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
@@ -36,41 +36,38 @@ const PortfolioItem = ({address, location, price, duration, invested, completion
                         </StyledView>
                     
                         <StyledView>
-                            {condition && (
-                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                            
+                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText text-white">
                                     Sold</StyledText>} icon = {'../../../../assets/images/celebration'} level = {'success'} >
                                 </Tag>
-                            )}
-                            {condition && (
-                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                
+                            
+                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText text-success">
                                     Construction Underway</StyledText>} icon = {'../../../../assets/images/maps_home_work'} level = {'successSubdued'} >
                                 </Tag>
-                            )}
-                            {condition && (
-                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
-                                    Construction Complete</StyledText>} icon = {'../../../../assets/images/house'} level = {'successSubdued'} >
+         
+                            
+                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-success">
+                                    Construction Complete</StyledText>} icon = {'../../../../assets/images/house'} level = {'successSubdued'} className = '' >
                                 </Tag>
-                            )}
-                            {condition && (
-                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                       
+                          
+                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-success">
                                     Operational</StyledText>} icon = {'../../../../assets/images/maps_home_work'} level = {'successSubdued'} >
                                 </Tag>
-                            )}
-                            {condition && (
-                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                          
+                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
                                     Construction Started</StyledText>} icon = {'../../../../assets/images/handyman'} level = {'neutralSubdued'} >
                                 </Tag>
-                            )}
-                            {condition && (
-                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                          
+                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
                                     Permitting Secured</StyledText>} icon = {'../../../../assets/images/topic'} level = {'neutralSubdued'} >
                                 </Tag>
-                            )}
-                            {condition && (
-                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText">
+                          
+                                 <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
                                    Design Complete</StyledText>} icon = {'../../../../assets/images/design_services'} level = {'neutralSubdued'} >
                                 </Tag>
-                            )}
+                    
                         </StyledView>
 
                         <StyledView className = 'flex flex-row items-start justify-between w-full mb-3'>

From 1497d92ece2cf9979fe8b752f0ab40189604f671 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Sat, 30 Nov 2024 09:45:42 -0500
Subject: [PATCH 07/18] Connecting the bottom half of the screen to the backend

---
 frontend/src/constants.ts                     |   4 +-
 .../src/screens/portfolio/PortfolioScreen.tsx | 124 ++++--------------
 frontend/yarn.lock                            |  15 ---
 3 files changed, 26 insertions(+), 117 deletions(-)

diff --git a/frontend/src/constants.ts b/frontend/src/constants.ts
index 40bfccb..9eb1ccd 100644
--- a/frontend/src/constants.ts
+++ b/frontend/src/constants.ts
@@ -1,4 +1,4 @@
-export const API_URL = "https://6482-155-33-135-54.ngrok-free.app";
-export const SUPABASE_URL = " https://4006-155-33-135-54.ngrok-free.app";
+export const API_URL = "https://cbdc-155-33-135-54.ngrok-free.app";
+export const SUPABASE_URL = "https://d9c1-155-33-135-54.ngrok-free.app";
 export const SUPABASE_JWT_SECRET = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0";
 
diff --git a/frontend/src/screens/portfolio/PortfolioScreen.tsx b/frontend/src/screens/portfolio/PortfolioScreen.tsx
index c972070..8ac2734 100644
--- a/frontend/src/screens/portfolio/PortfolioScreen.tsx
+++ b/frontend/src/screens/portfolio/PortfolioScreen.tsx
@@ -9,7 +9,8 @@ import PortfolioDetails from './components/PortfolioDetails';
 import UpdateCard from './components/PortfolioUpdateCard';
 import { useInvestorPortfolio } from '../../../src/services/investor'
 import { useAuth } from "../../../src/context/AuthContext";
-import { useProjectTotalFunded, useAllProjects } from "../../services/project";
+import { useProjectTotalFunded, useAllProjects, useProjectPosts } from "../../services/project";
+
 
 
 interface PortfolioScreenProps {
@@ -31,28 +32,20 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
 
   const [activeTab, setActiveTab] = useState('Your Projects');
 
-  const InvestorPortfolio = () => {
-    const { session } = useAuth();
-    const { portfolio, isLoading } = useInvestorPortfolio();
-  
-    if (!portfolio) {
-      return <p>Failed to load portfolio. Please try again later.</p>;
-    }
+  const { portfolio, isLoading: portfolioLoading } = useInvestorPortfolio();
+  const { allProjects, isLoading: projectsLoading } = useAllProjects();
 
-    const { allProjects} = useAllProjects();
+  if (portfolioLoading || projectsLoading) {
+    return <StyledText className='text-lg font-bold'>Loading...</StyledText>;
+  }
 
-      if (isLoading) {
-        return <StyledText className='text-lg font-bold '>
-        Your Projects
-      </StyledText>;
-      }
+  if (!portfolio) {
+    return <StyledText>Failed to load portfolio. Please try again later.</StyledText>;
+  }
 
-      if (!allProjects || allProjects.length === 0) {
-        return <p>No projects found.</p>;
-      }
-
-      const projectIds = allProjects.map((project) => project.id);
-  
+  if (!allProjects || allProjects.length === 0) {
+    return <StyledText>No projects found.</StyledText>;
+  }
 
   return (
     <StyledView className='flex-1 justify-center bg-surfaceBG overflow-auto'>
@@ -120,95 +113,26 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
                   image={<Image key={project.images[0].id} src={project.images[0].url} alt="Project Image" />}
                 ></PortfolioItem>
               </StyledView>))}
-
-
-
-
-
-   
-        
-        <StyledView className = 'mb-4'>
-          <PortfolioItem
-            address={''}
-            location={''}
-            price={0}
-            duration={''}
-            invested={0}
-            completion={0}
-            imageUrl={''}
-          ></PortfolioItem>
-        </StyledView>
-        <StyledView className = 'mb-4'>
-          <PortfolioItem
-            address={''}
-            location={''}
-            price={0}
-            duration={''}
-            invested={0}
-            completion={0}
-            imageUrl={''}
-          ></PortfolioItem>
-        </StyledView>
-        <StyledView className = 'mb-4'>
-          <PortfolioItem
-            address={''}
-            location={''}
-            price={0}
-            duration={''}
-            invested={0}
-            completion={0}
-            imageUrl={''}
-          ></PortfolioItem>
-        </StyledView>
-        <StyledView className = 'mb-4'>
-          <PortfolioItem
-            address={''}
-            location={''}
-            price={0}
-            duration={''}
-            invested={0}
-            completion={0}
-            imageUrl={''}
-          ></PortfolioItem>
         </StyledView>
-        <StyledView className = 'mb-4'>
-          <PortfolioItem
-            address={''}
-            location={''}
-            price={0}
-            duration={''}
-            invested={0}
-            completion={0}
-            imageUrl={''}
-          ></PortfolioItem>
-        </StyledView>
-        <StyledView className = 'mb-4'>
-          <PortfolioItem
-            address={''}
-            location={''}
-            price={0}
-            duration={''}
-            invested={0}
-            completion={0}
-            imageUrl={''}
-          ></PortfolioItem>
-        </StyledView>
-      </StyledView>
-      </StyledView>) 
+       </StyledView>
+        
+        ) 
       : 
         (<StyledView className = 'bg-defaultPrimary'>
         <StyledView className={`flex p-[16px] flex-col items-start bg-white ${activeTab === 'Updates' ? 'rounded-tl-[27px]' : 'rounded-tr-[27px]'}`}>
           {/* Updates */}
-            <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
-            <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
-            <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
-            <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
-            <UpdateCard topText='931 1st Street' bottomText='You invested $200' quantity='+$200.00' />
+          {allProjects.flatMap(project => {
+                const { projectPosts = [] } = useProjectPosts(project.id) ?? {};
+                return projectPosts.map((post) => (
+                  <StyledView key={post.id} className="mb-2">
+                    <UpdateCard topText={post.title} bottomText={post.description} quantity={''} />
+                  </StyledView>
+                ));
+              })}
         </StyledView>
         </StyledView>
           )}
       </StyledScrollView>
     </StyledView>
   );
-}
 };
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index ec64d4b..0734b2d 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1474,11 +1474,6 @@
     postcss "~8.4.32"
     resolve-from "^5.0.0"
 
-"@expo/ngrok-bin-linux-x64@2.3.41":
-  version "2.3.41"
-  resolved "https://registry.npmjs.org/@expo/ngrok-bin-linux-x64/-/ngrok-bin-linux-x64-2.3.41.tgz"
-  integrity sha512-LcU3MbYHv7Sn2eFz8Yzo2rXduufOvX1/hILSirwCkH+9G8PYzpwp2TeGqVWuO+EmvtBe6NEYwgdQjJjN6I4L1A==
-
 "@expo/ngrok-bin@2.3.42":
   version "2.3.42"
   resolved "https://registry.npmjs.org/@expo/ngrok-bin/-/ngrok-bin-2.3.42.tgz"
@@ -6550,16 +6545,6 @@ lighthouse-logger@^1.0.0:
     debug "^2.6.9"
     marky "^1.2.2"
 
-lightningcss-linux-x64-gnu@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.27.0.tgz"
-  integrity sha512-Dk/jovSI7qqhJDiUibvaikNKI2x6kWPN79AQiD/E/KeQWMjdGe9kw51RAgoWFDi0coP4jinaH14Nrt/J8z3U4A==
-
-lightningcss-linux-x64-musl@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.27.0.tgz"
-  integrity sha512-QKjTxXm8A9s6v9Tg3Fk0gscCQA1t/HMoF7Woy1u68wCk5kS4fR+q3vXa1p3++REW784cRAtkYKrPy6JKibrEZA==
-
 lightningcss@~1.27.0:
   version "1.27.0"
   resolved "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz"

From f5d471505559a0c893141ed9d82c90de031b8eb0 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Sat, 30 Nov 2024 10:13:18 -0500
Subject: [PATCH 08/18] Changes to Portfolio Details Component

---
 .../portfolio/components/PortfolioDetails.tsx | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
index cba3155..9067184 100644
--- a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
@@ -6,7 +6,17 @@ const StyledView = styled(View);
 const StyledText = styled(Text);
 const StyledImage = styled(Image);
 
-const PortfolioDetails = ()=> {
+interface PortfolioDetailsProps {
+    netPortfolioValue: number;
+    portfolioChangeAmount: number;
+    marketValue: number;
+    cashValue: number;
+    totalProjects: number;
+    expMaturity: number;
+    
+}
+
+const PortfolioDetails = ({netPortfolioValue, portfolioChangeAmount, marketValue, cashValue, totalProjects, expMaturity} : PortfolioDetailsProps & { className?: string })=> {
     return (
         <StyledView className = 'w-full flex flex-col items-start gap-6 self-stretch px-6 pb-8 pt-0'>
             {/* Top Part */}
@@ -20,10 +30,10 @@ const PortfolioDetails = ()=> {
                         ></StyledImage>
                     </StyledView>
                 </StyledView>
-                <StyledText className = 'font-bold text-[32px]'>$12,345.67</StyledText>
+                <StyledText className = 'font-bold text-[32px]'>{netPortfolioValue}</StyledText>
                 <StyledView className = 'flex flex-row justify-between items-center'>
-                    <StyledText className = 'color-success font-sourceSans3Bold text-[16px]'>+ $350.23</StyledText>
-                    <StyledText className = 'color-success px-4 font-sourceSans3Bold text-[16px]'>+ 9.70%</StyledText>
+                    <StyledText className = 'color-success font-sourceSans3Bold text-[16px]'> {portfolioChangeAmount}</StyledText>
+                    <StyledText className = 'color-success px-4 font-sourceSans3Bold text-[16px]'>{portfolioChangeAmount/netPortfolioValue*100}</StyledText>
                     <StyledText className = 'font-bodyBold text-[16px]'>Total Return</StyledText>
                 </StyledView>
             </StyledView>
@@ -32,21 +42,21 @@ const PortfolioDetails = ()=> {
                 <StyledView className = 'flex flex-col gap-6'>
                     <StyledView className = 'flex flex-col items-start gap-1'>
                         <StyledText className = 'font-body text-[16px]'>Market Value</StyledText>
-                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>$10,000.00</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>{marketValue}</StyledText>
                     </StyledView>
                         <StyledView className = 'flex flex-col items-start gap-1'>
                         <StyledText className = 'font-body text-[16px]'>Cash Value</StyledText>
-                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>$2,345.67</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>{cashValue}</StyledText>
                     </StyledView>
                 </StyledView>
                 <StyledView className = 'flex flex-col gap-6'>
                     <StyledView className = 'flex flex-col items-start gap-1'>
-                        <StyledText className = 'font-body text-[16px]'>Total Positions</StyledText>
-                        <StyledText className = 'font-sourceSans3Bold text-[18px]'> 11</StyledText>
+                        <StyledText className = 'font-body text-[16px]'>Total Projects</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>{totalProjects}</StyledText>
                     </StyledView>
                     <StyledView className = 'flex flex-col items-start gap-1'>
                         <StyledText className = 'font-body text-[16px]'>Exp Maturity</StyledText>
-                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>12.5 Years</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[18px]'>{expMaturity}</StyledText>
                     </StyledView>
                 </StyledView>
             </StyledView>

From 07acaea0896650e85a7566a2c95bdcb345c2f204 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Sat, 30 Nov 2024 10:19:30 -0500
Subject: [PATCH 09/18] Adding changing colours for negative values

---
 .../src/screens/portfolio/components/PortfolioDetails.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
index 9067184..dc63590 100644
--- a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
@@ -32,8 +32,8 @@ const PortfolioDetails = ({netPortfolioValue, portfolioChangeAmount, marketValue
                 </StyledView>
                 <StyledText className = 'font-bold text-[32px]'>{netPortfolioValue}</StyledText>
                 <StyledView className = 'flex flex-row justify-between items-center'>
-                    <StyledText className = 'color-success font-sourceSans3Bold text-[16px]'> {portfolioChangeAmount}</StyledText>
-                    <StyledText className = 'color-success px-4 font-sourceSans3Bold text-[16px]'>{portfolioChangeAmount/netPortfolioValue*100}</StyledText>
+                    <StyledText className = {`${portfolioChangeAmount >= 0 ? 'color-success' : 'color-error'} font-sourceSans3Bold text-[16px]`}> {portfolioChangeAmount}</StyledText>
+                    <StyledText className = {`${portfolioChangeAmount >= 0 ? 'color-success' : 'color-error'} px-4 font-sourceSans3Bold text-[16px]`}>{portfolioChangeAmount/netPortfolioValue*100}</StyledText>
                     <StyledText className = 'font-bodyBold text-[16px]'>Total Return</StyledText>
                 </StyledView>
             </StyledView>

From bd0de1417386068ffe566c6af1ca8d3c2b404974 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Mon, 2 Dec 2024 14:41:29 -0500
Subject: [PATCH 10/18] Values on the portfolio can be hidden

---
 frontend/assets/images/View-Icon.png          | Bin 0 -> 555 bytes
 .../src/screens/portfolio/PortfolioScreen.tsx |  13 +++++--
 .../portfolio/components/PortfolioDetails.tsx |  34 ++++++++++++++----
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 frontend/assets/images/View-Icon.png

diff --git a/frontend/assets/images/View-Icon.png b/frontend/assets/images/View-Icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba45f38415aca8bd995327387a403abf8843159
GIT binary patch
literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0l-N_K~#7F)l;!?
z!axvwNeQ6>0*A_gAwaIcq64S^RDq!ak1L=AL<Nj109Swrm?5*A6DTAByesbTBU|>2
zo!B??aDTer+uQp$=C7NlPOH_L)a&(|-EOxwzc7bCVHo=R{eA^Ez#4A1+Zp4{W^;Ht
zojQ)=_}s(K;j`cpIawv3946Sp1|=Z;X$6@C>#+>%*c-In1B<zA3(z14{93J6F!Vgn
zKO7Dr+yPdEl_A#OY&NN4xazdq?T}z-DQ6-XfZ-s^vRn?o0BjC`6otCj$2^DF3VG2L
zL#tg{SN=b=k75&kK;c`q%5#XV?3glqki&&0qRUdXB2&Z?9O`5FSR;O5p2k#bmlGxn
zbDmsc-YqD%kMArJBi_*@#;~V`5gEH_n&!eLvbBJ{O69l&nn1^~CJ_XAp%A*X91EMN
z=vlNX|5JQ>vfJ0Gmb5R1<XT#cMaKmbwLKC1-eO*WiXVwIW4(`8_ps4ujC7L1aE2F@
z;vTXk-oyNOJT62Eoqk|n?khk`lL>%(R#*=NrS!`)tpv1z&3XEFmt^RSVrx#7MNR4L
te+l@VefIVlcg+t?bmOa9Vm+IGV{iUI1-f<Crtbg%002ovPDHLkV1f)v@SFeu

literal 0
HcmV?d00001

diff --git a/frontend/src/screens/portfolio/PortfolioScreen.tsx b/frontend/src/screens/portfolio/PortfolioScreen.tsx
index 8ac2734..0baed1d 100644
--- a/frontend/src/screens/portfolio/PortfolioScreen.tsx
+++ b/frontend/src/screens/portfolio/PortfolioScreen.tsx
@@ -7,9 +7,8 @@ import { ScrollView } from 'react-native';
 import PortfolioItem from './components/PortfolioItem';
 import PortfolioDetails from './components/PortfolioDetails';
 import UpdateCard from './components/PortfolioUpdateCard';
-import { useInvestorPortfolio } from '../../../src/services/investor'
-import { useAuth } from "../../../src/context/AuthContext";
 import { useProjectTotalFunded, useAllProjects, useProjectPosts } from "../../services/project";
+import {useInvestorPortfolio} from "../../services/investor";
 
 
 
@@ -66,7 +65,15 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
           </StyledView>
         </StyledView>
         
-        <PortfolioDetails></PortfolioDetails>
+        <PortfolioDetails 
+        netPortfolioValue={0} 
+        portfolioChangeAmount={0} 
+        marketValue={0} 
+        cashValue={0} 
+        totalProjects={allProjects.length} 
+        expMaturity={0}>
+
+        </PortfolioDetails>
 
         {/* Tab section */}
         <StyledView className='w-full flex-row justify-center'>
diff --git a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
index dc63590..5e0c7bd 100644
--- a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
@@ -1,10 +1,11 @@
-import React from 'react';
-import { View, Text, Image } from 'react-native';
+import React, { useState } from 'react';
+import { View, Text, Image, TouchableOpacity } from 'react-native';
 import { styled } from 'nativewind';
 
 const StyledView = styled(View);
 const StyledText = styled(Text);
 const StyledImage = styled(Image);
+const StyledTouchableOpacity = styled(TouchableOpacity);
 
 interface PortfolioDetailsProps {
     netPortfolioValue: number;
@@ -17,23 +18,42 @@ interface PortfolioDetailsProps {
 }
 
 const PortfolioDetails = ({netPortfolioValue, portfolioChangeAmount, marketValue, cashValue, totalProjects, expMaturity} : PortfolioDetailsProps & { className?: string })=> {
+
+    const [hideValues, setHideValues] = useState(false);
+
+    const toggleHideValues = () => {
+        setHideValues(!hideValues);
+    };
+
+    const displayValue = (value) => {
+        return hideValues ? '****' : value;
+    };
+
+    const [isEyeOpen, setIsEyeOpen] = useState(true);
+
+    const toggleEye = () => {
+        setIsEyeOpen(!isEyeOpen);
+    };
+
     return (
         <StyledView className = 'w-full flex flex-col items-start gap-6 self-stretch px-6 pb-8 pt-0'>
             {/* Top Part */}
             <StyledView className = 'flex flex-col items-start gap-1 self-stretch'>
                 <StyledView className = 'flex flex-row'> 
                     <StyledText className = 'font-body text-[16px]'>Net Portfolio Value</StyledText>
-                    <StyledView className = 'px-2'>
+                    <StyledTouchableOpacity onPress={toggleHideValues} className = 'px-2'>
                         <StyledImage
-                            source={require('../../../../assets/images/remove_red_eye.png')}
+                            source={isEyeOpen 
+                                ? require('../../../../assets/images/remove_red_eye.png')
+                                : require('../../../../assets/images/View-Icon.png')}
                             className='w-[5vw] h-[5vw]'
-                        ></StyledImage>
-                    </StyledView>
+                        />
+                    </StyledTouchableOpacity>
                 </StyledView>
                 <StyledText className = 'font-bold text-[32px]'>{netPortfolioValue}</StyledText>
                 <StyledView className = 'flex flex-row justify-between items-center'>
                     <StyledText className = {`${portfolioChangeAmount >= 0 ? 'color-success' : 'color-error'} font-sourceSans3Bold text-[16px]`}> {portfolioChangeAmount}</StyledText>
-                    <StyledText className = {`${portfolioChangeAmount >= 0 ? 'color-success' : 'color-error'} px-4 font-sourceSans3Bold text-[16px]`}>{portfolioChangeAmount/netPortfolioValue*100}</StyledText>
+                    <StyledText className = {`${portfolioChangeAmount >= 0 ? 'color-success' : 'color-error'} px-4 font-sourceSans3Bold text-[16px]`}>{displayValue((portfolioChangeAmount/netPortfolioValue*100).toFixed(2) + '%')}</StyledText>
                     <StyledText className = 'font-bodyBold text-[16px]'>Total Return</StyledText>
                 </StyledView>
             </StyledView>

From 1ed30fd2ea2c8f009e69c6341f63874f6ee690d3 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Mon, 2 Dec 2024 20:34:44 -0500
Subject: [PATCH 11/18] Picking the tags

---
 frontend/App.js                               | 14 +++-
 .../src/screens/portfolio/PortfolioScreen.tsx | 31 ++++++--
 .../portfolio/components/PortfolioDetails.tsx |  9 +--
 .../portfolio/components/PortfolioItem.tsx    | 73 ++++++++++---------
 .../components/PortfolioUpdateCard.tsx        | 55 ++++++++++++--
 5 files changed, 127 insertions(+), 55 deletions(-)

diff --git a/frontend/App.js b/frontend/App.js
index 955acb3..def8864 100644
--- a/frontend/App.js
+++ b/frontend/App.js
@@ -16,9 +16,19 @@ function RootNavigator() {
     if (isLoading) {
         return null; // or some loading screen (maybe we make in future?)
     }
-    return session ? <TabNavigator /> : <LoginNavigator />;
+    return session ? <TabNavigator /> : <TabNavigator />;
 }
 
+function TestNavigator() {
+    const { login } = useAuth();
+    login("user1@example.com", "password123")
+    if (isLoading) {
+        return null; // or some loading screen (maybe we make in future?)
+    }
+    return <TabNavigator/>
+}
+
+
 export default function App() {
     const [loaded, error] = useFonts({
         'Nunito-Black': require('./assets/fonts/nunito/Nunito-Black.ttf'),
@@ -49,7 +59,7 @@ export default function App() {
         <AuthProvider>
             <QueryClientProvider client={queryClient}>
                 <NavigationContainer>
-                    <RootNavigator />
+                    <TestNavigator />
                 </NavigationContainer>
             </QueryClientProvider>
         </AuthProvider>
diff --git a/frontend/src/screens/portfolio/PortfolioScreen.tsx b/frontend/src/screens/portfolio/PortfolioScreen.tsx
index 0baed1d..f4ed6c8 100644
--- a/frontend/src/screens/portfolio/PortfolioScreen.tsx
+++ b/frontend/src/screens/portfolio/PortfolioScreen.tsx
@@ -34,16 +34,33 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
   const { portfolio, isLoading: portfolioLoading } = useInvestorPortfolio();
   const { allProjects, isLoading: projectsLoading } = useAllProjects();
 
+  console.log(portfolio);
+
   if (portfolioLoading || projectsLoading) {
-    return <StyledText className='text-lg font-bold'>Loading...</StyledText>;
+    return (
+      <StyledView className='flex-1 justify-center bg-surfaceBG overflow-auto'>
+      <StyledView className='flex w-93 h-150 items-center shrink-0'></StyledView>
+        <StyledText className = 'text-error justify-center'>Loading</StyledText>
+      </StyledView>
+    );
   }
 
   if (!portfolio) {
-    return <StyledText>Failed to load portfolio. Please try again later.</StyledText>;
+    return (
+      <StyledView className='flex-1 justify-center bg-surfaceBG overflow-auto'>
+        <StyledView className='flex w-93 h-150 items-center shrink-0'></StyledView>
+        <StyledText className = 'text-error justify-center'>Failed to load portfolio. Please try again later.</StyledText>
+      </StyledView>
+    )
   }
 
   if (!allProjects || allProjects.length === 0) {
-    return <StyledText>No projects found.</StyledText>;
+    return (
+      <StyledView className='flex-1 justify-center bg-surfaceBG overflow-auto'>
+        <StyledView className='flex w-93 h-14 items-center shrink-0'></StyledView>
+        <StyledText className = 'text-error justify-center'>No projects.</StyledText>
+      </StyledView>
+    )
   }
 
   return (
@@ -113,12 +130,12 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
                 <PortfolioItem
                   address={project.street}
                   location={project.state}
-                  price={project.funding_goal_cents/100}
+                  price={project.funding_goal_cents / 100}
                   duration={''}
                   invested={-1}
                   completion={useProjectTotalFunded(project.id).projectTotalFunded}
-                  image={<Image key={project.images[0].id} src={project.images[0].url} alt="Project Image" />}
-                ></PortfolioItem>
+                  image={<Image key={project.images[0].id} src={project.images[0].url} alt="Project Image" />} 
+                  status={project.milestone}></PortfolioItem>
               </StyledView>))}
         </StyledView>
        </StyledView>
@@ -132,7 +149,7 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
                 const { projectPosts = [] } = useProjectPosts(project.id) ?? {};
                 return projectPosts.map((post) => (
                   <StyledView key={post.id} className="mb-2">
-                    <UpdateCard topText={post.title} bottomText={post.description} quantity={''} />
+                    <UpdateCard topText={post.title} bottomText={post.description} status={project.milestone} />
                   </StyledView>
                 ));
               })}
diff --git a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
index 5e0c7bd..b03edb7 100644
--- a/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioDetails.tsx
@@ -21,20 +21,19 @@ const PortfolioDetails = ({netPortfolioValue, portfolioChangeAmount, marketValue
 
     const [hideValues, setHideValues] = useState(false);
 
-    const toggleHideValues = () => {
-        setHideValues(!hideValues);
-    };
-
+    
     const displayValue = (value) => {
         return hideValues ? '****' : value;
     };
 
     const [isEyeOpen, setIsEyeOpen] = useState(true);
 
-    const toggleEye = () => {
+    const toggleHideValues = () => {
+        setHideValues(!hideValues);
         setIsEyeOpen(!isEyeOpen);
     };
 
+
     return (
         <StyledView className = 'w-full flex flex-col items-start gap-6 self-stretch px-6 pb-8 pt-0'>
             {/* Top Part */}
diff --git a/frontend/src/screens/portfolio/components/PortfolioItem.tsx b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
index 6642f5e..d03ed5b 100644
--- a/frontend/src/screens/portfolio/components/PortfolioItem.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
@@ -2,7 +2,7 @@
 //TO DO Make the updates page inline with the figma 
 
 import React from 'react';
-import { View, Text, Image, ImageBackground } from 'react-native';
+import { View, Text, Image } from 'react-native';
 import { styled } from 'nativewind';
 import Card from "../../../components/Card"
 import Tag from "../../../components/Tag"
@@ -21,9 +21,10 @@ interface PortfolioItemProps {
     invested: number;
     completion: number;
     image: React.ReactNode;
+    status: string;
 }
 
-const PortfolioItem = ({address, location, price, duration, invested, completion, image} : PortfolioItemProps & { className?: string })=> {
+const PortfolioItem = ({address, location, price, duration, invested, completion, image, status} : PortfolioItemProps & { className?: string })=> {
     return (
         <Card className = 'h-100'>
             <StyledView className = 'flex w-full min-w-38 flex-row items-start self-stretch'>
@@ -35,40 +36,42 @@ const PortfolioItem = ({address, location, price, duration, invested, completion
                         <StyledView className = 'py-3'>
                             <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Commercial Development</StyledText>
                         </StyledView>
-                    
                         <StyledView>
-                            
-                                <Tag className = 'w-1/2' children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText text-white">
-                                    Sold</StyledText>} icon = {<Image source={require('../../../../assets/images/celebration.png')}></Image>} level = {'success'} >
-                                </Tag>
-                
-                            
-                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText text-success">
-                                    Construction Underway</StyledText>} icon = {<Image source={require('../../../../assets/images/maps_home_work.png')}></Image>} level = {'successSubdued'} >
-                                </Tag>
-         
-                            
-                                <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-success">
-                                    Construction Complete</StyledText>} icon = {<Image source={require('../../../../assets/images/house.png')}></Image>} level = {'successSubdued'} className = '' >
-                                </Tag>
-                       
-                          
-                                 <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-success">
-                                    Operational</StyledText>} icon = {<Image source={require('../../../../assets/images/maps_home_work.png')}></Image>} level = {'successSubdued'} >
-                                </Tag>
-                          
-                                 <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
-                                    Construction Started</StyledText>} icon = {<Image source={require('../../../../assets/images/handyman.png')}></Image>} level = {'neutralSubdued'} >
-                                </Tag>
-                          
-                                 <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
-                                    Permitting Secured</StyledText>} icon = {<Image source={require('../../../../assets/images/topic.png')}></Image>} level = {'neutralSubdued'} >
-                                </Tag>
-                          
-                                 <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
-                                   Design Complete</StyledText>} icon = {<Image source={require('../../../../assets/images/design_services.png')}></Image>} level = {'neutralSubdued'} >
-                                </Tag>
-                    
+            {status == "Sold" &&
+              <Tag className = 'w-1/2' children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText text-white">
+                  Sold</StyledText>} icon = {<Image source={require('../../../../assets/images/celebration.png')}></Image>} level = {'success'} >
+              </Tag>
+              }
+              {status == "Construction Underway" &&
+              <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText text-success">
+                  Construction Underway</StyledText>} icon = {<Image source={require('../../../../assets/images/maps_home_work.png')}></Image>} level = {'successSubdued'} >
+              </Tag>
+              }
+              {status == "Construction Complete" &&
+              <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-success">
+                  Construction Complete</StyledText>} icon = {<Image source={require('../../../../assets/images/house.png')}></Image>} level = {'successSubdued'} className = '' >
+              </Tag>
+              }
+              {status == "Operational" &&
+                <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-success">
+                  Operational</StyledText>} icon = {<Image source={require('../../../../assets/images/maps_home_work.png')}></Image>} level = {'successSubdued'} >
+                </Tag>
+              }
+              {status == "Construction Started" &&
+                <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
+                  Construction Started</StyledText>} icon = {<Image source={require('../../../../assets/images/handyman.png')}></Image>} level = {'neutralSubdued'} >
+              </Tag>
+              }
+              {status == "Permitting Secured" &&
+                <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
+                  Permitting Secured</StyledText>} icon = {<Image source={require('../../../../assets/images/topic.png')}></Image>} level = {'neutralSubdued'} >
+                </Tag>
+              }
+              {status == "Design Complete" &&
+                <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
+                  Design Complete</StyledText>} icon = {<Image source={require('../../../../assets/images/design_services.png')}></Image>} level = {'neutralSubdued'} >
+                </Tag>
+              }
                         </StyledView>
 
                         <StyledView className = 'flex flex-row items-start justify-between w-full mb-3'>
diff --git a/frontend/src/screens/portfolio/components/PortfolioUpdateCard.tsx b/frontend/src/screens/portfolio/components/PortfolioUpdateCard.tsx
index 0541e03..72b4d08 100644
--- a/frontend/src/screens/portfolio/components/PortfolioUpdateCard.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioUpdateCard.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
-import { View, Text, ImageBackground } from 'react-native';
+import { View, Text, ImageBackground, Image} from 'react-native';
 import { styled } from 'nativewind';
-import UpdateText from './PortfolioUpdateText';
 import SideBySide from '../../../components/SideBySide';
+import Tag from "../../../components/Tag"
+
 
 const StyledView = styled(View);
 const StyledText = styled(Text);
@@ -10,10 +11,10 @@ const StyledText = styled(Text);
 interface UpdateCardProps {
     topText: string;
     bottomText: string;
-    quantity: string;
+    status: string;
 }
 
-const UpdateCard = ({ topText, bottomText, quantity }: UpdateCardProps) => {
+const UpdateCard = ({ topText, bottomText, status}: UpdateCardProps) => {
     return (
       <StyledView className="flex flex-row items-center justify-between p-2 w-full bg-surfaceFG overflow-hidden">
             <StyledView className="w-12 h-12 mr-2">
@@ -31,8 +32,50 @@ const UpdateCard = ({ topText, bottomText, quantity }: UpdateCardProps) => {
               />
             </StyledView>
         <SideBySide
-          leftComponent={<UpdateText topText={topText} bottomText={bottomText} />}
-          rightComponent={<StyledText>{quantity}</StyledText>}
+          leftComponent={
+          <StyledView className = 'flex-col' >
+              <StyledText className = 'font-sourceSans3Bold text-[16px]'> {topText}</StyledText>
+              {status == "Sold" &&
+              <Tag className = 'w-1/2' children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText text-white">
+                  Sold</StyledText>} icon = {<Image source={require('../../../../assets/images/celebration.png')}></Image>} level = {'success'} >
+              </Tag>
+              }
+              {status == "Construction Underway" &&
+              <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-defaultText text-success">
+                  Construction Underway</StyledText>} icon = {<Image source={require('../../../../assets/images/maps_home_work.png')}></Image>} level = {'successSubdued'} >
+              </Tag>
+              }
+              {status == "Construction Complete" &&
+              <Tag children = {<StyledText className="font-sourceSans3CaptionMedium text-success">
+                  Construction Complete</StyledText>} icon = {<Image source={require('../../../../assets/images/house.png')}></Image>} level = {'successSubdued'} className = '' >
+              </Tag>
+              }
+              {status == "Operational" &&
+                <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-success">
+                  Operational</StyledText>} icon = {<Image source={require('../../../../assets/images/maps_home_work.png')}></Image>} level = {'successSubdued'} >
+                </Tag>
+              }
+              {status == "Construction Started" &&
+                <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
+                  Construction Started</StyledText>} icon = {<Image source={require('../../../../assets/images/handyman.png')}></Image>} level = {'neutralSubdued'} >
+              </Tag>
+              }
+              {status == "Permitting Secured" &&
+                <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
+                  Permitting Secured</StyledText>} icon = {<Image source={require('../../../../assets/images/topic.png')}></Image>} level = {'neutralSubdued'} >
+                </Tag>
+              }
+              {status == "Design Complete" &&
+                <Tag className = 'w-3/4' children = {<StyledText className="font-sourceSans3CaptionMedium text-gray-600">
+                  Design Complete</StyledText>} icon = {<Image source={require('../../../../assets/images/design_services.png')}></Image>} level = {'neutralSubdued'} >
+                </Tag>
+              }
+              <StyledText className = 'font-sourceSans3Bold text-[16px]'> {bottomText}</StyledText>
+
+          </StyledView>
+
+          }
+          rightComponent={''}
           spacing="mr-4"
           containerStyle="flex-1"
         />

From 0415781eeada900b4f707694e090646465342fae Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Mon, 2 Dec 2024 22:29:12 -0500
Subject: [PATCH 12/18] Removing mock data

---
 .../src/screens/portfolio/PortfolioScreen.tsx | 63 +++++++++++++++----
 .../portfolio/components/PortfolioItem.tsx    | 21 +++----
 2 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/frontend/src/screens/portfolio/PortfolioScreen.tsx b/frontend/src/screens/portfolio/PortfolioScreen.tsx
index f4ed6c8..e1d7a5f 100644
--- a/frontend/src/screens/portfolio/PortfolioScreen.tsx
+++ b/frontend/src/screens/portfolio/PortfolioScreen.tsx
@@ -24,8 +24,46 @@ const StyledScrollView = styled(ScrollView);
 const StyledImage = styled(Image);
 const StyledTouchableOpacity= styled(TouchableOpacity);
 
+function calculateDaysRemaining(completionDateStr) {
+  const today = new Date();
+  const [monthStr, yearStr] = completionDateStr.split(" ");
+  const completionDate = new Date(`${monthStr} 1, ${yearStr}`);
 
-  
+  const timeDifference = completionDate.getTime() - today.getTime();
+
+  return Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
+}
+
+function calculateExpMaturity(projects) {
+    let totalDays = 0;
+    let validProjects = 0;
+
+    projects.forEach(project => {
+        const daysRemaining = calculateDaysRemaining(project.completion_date);
+
+        if (daysRemaining !== null) {
+            totalDays += daysRemaining;
+            validProjects++;
+        }
+    });
+
+    if (validProjects === 0) {
+        console.error("No valid projects to calculate average maturity.");
+        return null;
+    }
+
+    return totalDays / validProjects;
+}
+
+function netPortfolioValue(projects) {
+    let value = 0;
+
+    projects.forEach(project => {
+        value = value + project.funding_goal_cents
+    });
+
+    return value / 100;
+}
 
 export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
 
@@ -83,12 +121,12 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
         </StyledView>
         
         <PortfolioDetails 
-        netPortfolioValue={0} 
-        portfolioChangeAmount={0} 
-        marketValue={0} 
-        cashValue={0} 
+        netPortfolioValue={netPortfolioValue(allProjects)} 
+        portfolioChangeAmount={350} // HARD CODED VALUE
+        marketValue={10000} // HARD CODED VALUE 
+        cashValue={2345.67} //HARD CODED VALUE
         totalProjects={allProjects.length} 
-        expMaturity={0}>
+        expMaturity={calculateExpMaturity(allProjects)}>
 
         </PortfolioDetails>
 
@@ -130,17 +168,16 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
                 <PortfolioItem
                   address={project.street}
                   location={project.state}
-                  price={project.funding_goal_cents / 100}
-                  duration={''}
-                  invested={-1}
-                  completion={useProjectTotalFunded(project.id).projectTotalFunded}
-                  image={<Image key={project.images[0].id} src={project.images[0].url} alt="Project Image" />} 
-                  status={project.milestone}></PortfolioItem>
+                  image={<Image key={project.images[0].id} src={project.images[0].url} alt="Project Image" />}
+                  status={project.milestone} 
+                  description={project.description} 
+                  initialValue={useProjectTotalFunded(project.id).projectTotalFunded} 
+                  finalValue={project.funding_goal_cents/ 100}></PortfolioItem>
               </StyledView>))}
         </StyledView>
        </StyledView>
         
-        ) 
+        )   
       : 
         (<StyledView className = 'bg-defaultPrimary'>
         <StyledView className={`flex p-[16px] flex-col items-start bg-white ${activeTab === 'Updates' ? 'rounded-tl-[27px]' : 'rounded-tr-[27px]'}`}>
diff --git a/frontend/src/screens/portfolio/components/PortfolioItem.tsx b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
index d03ed5b..e310a0b 100644
--- a/frontend/src/screens/portfolio/components/PortfolioItem.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
@@ -16,25 +16,24 @@ const StyledImage = styled(Image);
 interface PortfolioItemProps {
     address: string;
     location: string;
-    price: number;
-    duration: string;
-    invested: number;
-    completion: number;
+    description: string;
+    initialValue: number;
+    finalValue: number;
     image: React.ReactNode;
     status: string;
 }
 
-const PortfolioItem = ({address, location, price, duration, invested, completion, image, status} : PortfolioItemProps & { className?: string })=> {
+const PortfolioItem = ({address, location, description, initialValue, finalValue, image, status} : PortfolioItemProps & { className?: string })=> {
     return (
         <Card className = 'h-100'>
             <StyledView className = 'flex w-full min-w-38 flex-row items-start self-stretch'>
                 {/* Left Side of the Card*/}
                 <StyledView className = 'flex w-2/3 flex-col items-start'>
                     <StyledView className = 'flex flex-col items-start p-1 self-stretch space-y-2 mb-2'>
-                        <StyledText className = 'font-sourceSans3Bold text-[16px]' >333 Market Street</StyledText>
-                        <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >San Francisco, CA</StyledText>
+                        <StyledText className = 'font-sourceSans3Bold text-[16px]' >{address}</StyledText>
+                        <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >{location}</StyledText>
                         <StyledView className = 'py-3'>
-                            <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Commercial Development</StyledText>
+                            <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >{description}</StyledText>
                         </StyledView>
                         <StyledView>
             {status == "Sold" &&
@@ -77,11 +76,11 @@ const PortfolioItem = ({address, location, price, duration, invested, completion
                         <StyledView className = 'flex flex-row items-start justify-between w-full mb-3'>
                             <StyledView className = 'flex justify-between items-start mr-4'>
                                 <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Final Value</StyledText>
-                                <StyledText className = 'font-sourceSans3BodyBold text-[16px]' >$350.00</StyledText>
+                                <StyledText className = 'font-sourceSans3BodyBold text-[16px]' >{finalValue}</StyledText>
                             </StyledView>
                             <StyledView className = 'flex flex-col items-start'>
                                 <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Initial Value</StyledText>
-                                <StyledText className = 'font-sourceSans3BodyBold text-[16px]' >$250.00</StyledText>
+                                <StyledText className = 'font-sourceSans3BodyBold text-[16px]' >{initialValue}</StyledText>
                             </StyledView>
 
                         </StyledView>
@@ -109,7 +108,7 @@ const PortfolioItem = ({address, location, price, duration, invested, completion
                     </StyledView>
                     <StyledView className = 'flex flex-col w-full py-1 justify-between items-end '>
                         <StyledText className = 'font-sourceSans3CaptionMedium text-[12px]' >Total Returns</StyledText>
-                        <StyledText className = 'font-sourceSans3BodyBold text-[16px]' >+5.12%</StyledText>
+                        <StyledText className = 'font-sourceSans3BodyBold text-[16px]' >{((finalValue - initialValue)/initialValue) * 100}</StyledText>
                     </StyledView>
                 </StyledView>
             </StyledView>

From 41166891f4d777cc4b6baade103041afae4e9545 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Tue, 3 Dec 2024 07:20:45 -0500
Subject: [PATCH 13/18] Temporary Change to file names

---
 frontend/assets/images/celebration2.png     | Bin 0 -> 290 bytes
 frontend/assets/images/design_services2.png | Bin 0 -> 441 bytes
 frontend/assets/images/handyman2.png        | Bin 0 -> 458 bytes
 frontend/assets/images/house2.png           | Bin 0 -> 362 bytes
 frontend/assets/images/maps_home_work2.png  | Bin 0 -> 374 bytes
 frontend/assets/images/topic2.png           | Bin 0 -> 292 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 frontend/assets/images/celebration2.png
 create mode 100644 frontend/assets/images/design_services2.png
 create mode 100644 frontend/assets/images/handyman2.png
 create mode 100644 frontend/assets/images/house2.png
 create mode 100644 frontend/assets/images/maps_home_work2.png
 create mode 100644 frontend/assets/images/topic2.png

diff --git a/frontend/assets/images/celebration2.png b/frontend/assets/images/celebration2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c20b13bb7d10102da68a906c8652de35bd042857
GIT binary patch
literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{&r6n$B+ufy+H?g4;k=mnW3Ou($XVf_JZRk
z%Zvp%2RI}Zl?|NS8hCqj*PYN(ROGjKd1ckRx$CbB{FORm!<jDC+A+sa<B)-h*u5T4
zk+?HCVUOo|9_!ZHap;J$@1;t8N25oJ1*?B|nr@7LocU(fj;)ms)wxa;FLN>FJZlsv
zlkcO}!C$c~ChO6O_ZvK~`Ne&YZaz|)@`^FqZsC?K)-lehW#aQ%s(&dt9y8PZct-iS
i7@Oe!6BqY?WH{>{{Q2Kmp~*lmFnGH9xvX<aXaWGuU~26E

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/design_services2.png b/frontend/assets/images/design_services2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd27158db421e1d900f7ff61eeb01622eee001f
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0ZvIoK~#7F%~CsV
zgFq1F+f$|_Hy{lXqT&Q0CkQ@4WDpXa@d3b_6WG2%(j}GU2Fm0H@ey2ufV@Gw)*6wt
z$w&jUv-94(on1xwYt!XLk|a-_=e_y9e^XV}yS$fWneDpn2llPHu8$(Gi6D;S)i4YU
z;Y;855y-YOLEE+){A_qmwIXjwH94G>Ww`{{0U41frfII5rg`kTZlUYCjl6@p2)@2j
zpsMPgHqtb8px}u01Byd{zla>*4M+m6Fu33*GuQ!ikKzD+2Kc~b3mX;67)@RjMG>L%
zD>@x!z-M%RRwkxR6F76uLt9Fp=mS-&UkT`{cxOun)0v@c!3VpYC6K`Oq=^Mp7Dz&n
ze9~ZLk_*8Mm^$BznHYw_Frzz7(`eA4D3ag76dW+dPKZhNj!5tyADP16z?Fg@z@yRa
jpzEG@Ug9cq<=@yhE6BZSE=I|O00000NkvXXu0mjf9Spgy

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/handyman2.png b/frontend/assets/images/handyman2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdcbe4465f7477200d09fd69a855956acb1229cf
GIT binary patch
literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0bfZ(K~#7Ftx~&j
zgFq1Fqui9B4(v>$3{_yc1E~W>Kx~vbfk73>uE3%K$q|GOoe5_SF~or1lkYTVe4|J^
zbHnZ1eed>zVO-OqC~|c8YPEXA@pLguUVPu*)^&Xh!|-lMrZ&!P5CpDP0OWb!_X}K|
zwr%%nC8lY*I0szauIu)E=$}9w$2%mw2+V1k#+3<(%^=R$m_8p;MJy$8fzJ|Whor6A
z3dAe*Rf@=&n1;si!ZVWYZQGvFXIl`-fZbS@wLvSaV3Q<CsufU0L<O0s@MNCnjrmQ}
zwA2bPVKf?zIW*3OWMU)?bFCr3wV})-$(#qt5)&)^W9E=-{O(-Zk^@95uL>5S_qBBF
z3*-`2tU>;Q$Q-`>H{9uTYUFwTb`}sTc^Z&s?71k4YBHH*8j){^6sH*=Sn9|U;GGy_
z0;=F2&J{rE1B#yzau9gXO<PuiVY(vc-MEJR084+*N*>u}O#lD@07*qoM6N<$g1@!F
A;Q#;t

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/house2.png b/frontend/assets/images/house2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee55c8d5a4d33c9b150bce5e02cb41060fca3915
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{(nyw$B+ufvw^z<nGFT*UagQ=Bt6xEQ;*Tg
zK(;`VZ|*~mi61&S4qm)?FqVA=p9^b1Q$dUDi^}qIpT6hm6+D`I@l4%4cWuGBB{xn!
zb~wMQu6oyv;|0=|v-jK)evl<%El_J5;PusT_ukXO>#loVn{daV(j<YOWz+ZPP8{Z2
z4Z~G*1lSn9O8=NGn)6WS+4H3j^j|YpyY0DVBNg10v0qH}eER=z#qvbmgzoU}qklG^
zeR`nO`$&fJlf?%Fl_f*wrabW8_>xVH_fUb2>yi80x?_Gj_U~!+uQm9uVRm(|nR?{$
z^KHq?E0_I0e`m+Mh02dJ8t01k7>4$IEMIE#_SJkh9YzVEf}2aMUa|v&g2B_(&t;uc
GLK6TubdgU0

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/maps_home_work2.png b/frontend/assets/images/maps_home_work2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c40b4ace8f25c98e363f736ad8f6050c62a1c3ca
GIT binary patch
literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0Sie)K~#7F#Zo&?
z!$1(7H$;jn@DY3j=LS9koB*dIl_^OVDnu$8M7oF*a0EC4H(-xoQ8|%3liA3L9Lsi+
zDo@(qyq($iMoV;Qpo<7UULpm)l_=`C;&@n$xT^pKK~DXM%3^psXhyFW^NdJhDvD<W
z!AMuDnT4}T?vGzhRkFLkR}d~|;mzXp%aY&hm<sSG>vi`3@bt*4V@r0T`UxBL2T}P=
z%<r<zuYc8&#(wXM);YB}hwt-PdYa|sdOn{_9RqjNP{71xOve#zXOWx$trG(}17f|g
z<^E7X1J*S7!Ikd=ZZb`q@$P@n0&8|!0{sg5U=|Y8{=k)T?hCjRa$Rc-@=F)T2GWUP
U0&>;STL1t607*qoM6N<$f==d_H~;_u

literal 0
HcmV?d00001

diff --git a/frontend/assets/images/topic2.png b/frontend/assets/images/topic2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5daec223abae15a8c5c0ba42f0f5301b005cd3c
GIT binary patch
literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{!UL9$B+ufvq8Ig4=V`RPPkjml0T{E0k2a3
z1Aj;H<%=E8JP6$5c|uBL!eOBx5qVBOVf)VekMBJ$VL!0{;G;B|<C}}u^`)QN8R(@O
z$yR&ce@9H`Z_n)7-&q$*@1Bv^eZX!@hF$Rw+2sbJ?{(5PRlN6g3VE0j*V*eBIc@Ef
zO95GmF1c&}<}@&t>u4?IFPC1Y@F=Q@TXq$v+zO>hjhZ5z*EelUYnW=jLB2m!+W)YD
j$&Gzl;j(suGEDwof(;usIOJ6UJ;C7V>gTe~DWM4fjA?22

literal 0
HcmV?d00001


From 96232e607d4fdc109246b932542407e8e8878438 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Tue, 3 Dec 2024 07:22:30 -0500
Subject: [PATCH 14/18] Temporary File Name Changes

---
 frontend/assets/images/celebration.png     | Bin 290 -> 0 bytes
 frontend/assets/images/design_services.png | Bin 441 -> 0 bytes
 frontend/assets/images/handyman.png        | Bin 458 -> 0 bytes
 frontend/assets/images/house.png           | Bin 362 -> 0 bytes
 frontend/assets/images/maps_home_work.png  | Bin 374 -> 0 bytes
 frontend/assets/images/topic.png           | Bin 292 -> 0 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 frontend/assets/images/celebration.png
 delete mode 100644 frontend/assets/images/design_services.png
 delete mode 100644 frontend/assets/images/handyman.png
 delete mode 100644 frontend/assets/images/house.png
 delete mode 100644 frontend/assets/images/maps_home_work.png
 delete mode 100644 frontend/assets/images/topic.png

diff --git a/frontend/assets/images/celebration.png b/frontend/assets/images/celebration.png
deleted file mode 100644
index c20b13bb7d10102da68a906c8652de35bd042857..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{&r6n$B+ufy+H?g4;k=mnW3Ou($XVf_JZRk
z%Zvp%2RI}Zl?|NS8hCqj*PYN(ROGjKd1ckRx$CbB{FORm!<jDC+A+sa<B)-h*u5T4
zk+?HCVUOo|9_!ZHap;J$@1;t8N25oJ1*?B|nr@7LocU(fj;)ms)wxa;FLN>FJZlsv
zlkcO}!C$c~ChO6O_ZvK~`Ne&YZaz|)@`^FqZsC?K)-lehW#aQ%s(&dt9y8PZct-iS
i7@Oe!6BqY?WH{>{{Q2Kmp~*lmFnGH9xvX<aXaWGuU~26E

diff --git a/frontend/assets/images/design_services.png b/frontend/assets/images/design_services.png
deleted file mode 100644
index 8bd27158db421e1d900f7ff61eeb01622eee001f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0ZvIoK~#7F%~CsV
zgFq1F+f$|_Hy{lXqT&Q0CkQ@4WDpXa@d3b_6WG2%(j}GU2Fm0H@ey2ufV@Gw)*6wt
z$w&jUv-94(on1xwYt!XLk|a-_=e_y9e^XV}yS$fWneDpn2llPHu8$(Gi6D;S)i4YU
z;Y;855y-YOLEE+){A_qmwIXjwH94G>Ww`{{0U41frfII5rg`kTZlUYCjl6@p2)@2j
zpsMPgHqtb8px}u01Byd{zla>*4M+m6Fu33*GuQ!ikKzD+2Kc~b3mX;67)@RjMG>L%
zD>@x!z-M%RRwkxR6F76uLt9Fp=mS-&UkT`{cxOun)0v@c!3VpYC6K`Oq=^Mp7Dz&n
ze9~ZLk_*8Mm^$BznHYw_Frzz7(`eA4D3ag76dW+dPKZhNj!5tyADP16z?Fg@z@yRa
jpzEG@Ug9cq<=@yhE6BZSE=I|O00000NkvXXu0mjf9Spgy

diff --git a/frontend/assets/images/handyman.png b/frontend/assets/images/handyman.png
deleted file mode 100644
index cdcbe4465f7477200d09fd69a855956acb1229cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0bfZ(K~#7Ftx~&j
zgFq1Fqui9B4(v>$3{_yc1E~W>Kx~vbfk73>uE3%K$q|GOoe5_SF~or1lkYTVe4|J^
zbHnZ1eed>zVO-OqC~|c8YPEXA@pLguUVPu*)^&Xh!|-lMrZ&!P5CpDP0OWb!_X}K|
zwr%%nC8lY*I0szauIu)E=$}9w$2%mw2+V1k#+3<(%^=R$m_8p;MJy$8fzJ|Whor6A
z3dAe*Rf@=&n1;si!ZVWYZQGvFXIl`-fZbS@wLvSaV3Q<CsufU0L<O0s@MNCnjrmQ}
zwA2bPVKf?zIW*3OWMU)?bFCr3wV})-$(#qt5)&)^W9E=-{O(-Zk^@95uL>5S_qBBF
z3*-`2tU>;Q$Q-`>H{9uTYUFwTb`}sTc^Z&s?71k4YBHH*8j){^6sH*=Sn9|U;GGy_
z0;=F2&J{rE1B#yzau9gXO<PuiVY(vc-MEJR084+*N*>u}O#lD@07*qoM6N<$g1@!F
A;Q#;t

diff --git a/frontend/assets/images/house.png b/frontend/assets/images/house.png
deleted file mode 100644
index ee55c8d5a4d33c9b150bce5e02cb41060fca3915..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{(nyw$B+ufvw^z<nGFT*UagQ=Bt6xEQ;*Tg
zK(;`VZ|*~mi61&S4qm)?FqVA=p9^b1Q$dUDi^}qIpT6hm6+D`I@l4%4cWuGBB{xn!
zb~wMQu6oyv;|0=|v-jK)evl<%El_J5;PusT_ukXO>#loVn{daV(j<YOWz+ZPP8{Z2
z4Z~G*1lSn9O8=NGn)6WS+4H3j^j|YpyY0DVBNg10v0qH}eER=z#qvbmgzoU}qklG^
zeR`nO`$&fJlf?%Fl_f*wrabW8_>xVH_fUb2>yi80x?_Gj_U~!+uQm9uVRm(|nR?{$
z^KHq?E0_I0e`m+Mh02dJ8t01k7>4$IEMIE#_SJkh9YzVEf}2aMUa|v&g2B_(&t;uc
GLK6TubdgU0

diff --git a/frontend/assets/images/maps_home_work.png b/frontend/assets/images/maps_home_work.png
deleted file mode 100644
index c40b4ace8f25c98e363f736ad8f6050c62a1c3ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0Sie)K~#7F#Zo&?
z!$1(7H$;jn@DY3j=LS9koB*dIl_^OVDnu$8M7oF*a0EC4H(-xoQ8|%3liA3L9Lsi+
zDo@(qyq($iMoV;Qpo<7UULpm)l_=`C;&@n$xT^pKK~DXM%3^psXhyFW^NdJhDvD<W
z!AMuDnT4}T?vGzhRkFLkR}d~|;mzXp%aY&hm<sSG>vi`3@bt*4V@r0T`UxBL2T}P=
z%<r<zuYc8&#(wXM);YB}hwt-PdYa|sdOn{_9RqjNP{71xOve#zXOWx$trG(}17f|g
z<^E7X1J*S7!Ikd=ZZb`q@$P@n0&8|!0{sg5U=|Y8{=k)T?hCjRa$Rc-@=F)T2GWUP
U0&>;STL1t607*qoM6N<$f==d_H~;_u

diff --git a/frontend/assets/images/topic.png b/frontend/assets/images/topic.png
deleted file mode 100644
index e5daec223abae15a8c5c0ba42f0f5301b005cd3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{!UL9$B+ufvq8Ig4=V`RPPkjml0T{E0k2a3
z1Aj;H<%=E8JP6$5c|uBL!eOBx5qVBOVf)VekMBJ$VL!0{;G;B|<C}}u^`)QN8R(@O
z$yR&ce@9H`Z_n)7-&q$*@1Bv^eZX!@hF$Rw+2sbJ?{(5PRlN6g3VE0j*V*eBIc@Ef
zO95GmF1c&}<}@&t>u4?IFPC1Y@F=Q@TXq$v+zO>hjhZ5z*EelUYnW=jLB2m!+W)YD
j$&Gzl;j(suGEDwof(;usIOJ6UJ;C7V>gTe~DWM4fjA?22


From 79b8743d3386269e7a8c3577a5d17a74609c4408 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Tue, 3 Dec 2024 07:26:52 -0500
Subject: [PATCH 15/18] Undoing of the Temporary File Name Changes

---
 frontend/assets/images/celebration2.png     | Bin 290 -> 0 bytes
 frontend/assets/images/design_services2.png | Bin 441 -> 0 bytes
 frontend/assets/images/handyman2.png        | Bin 458 -> 0 bytes
 frontend/assets/images/house2.png           | Bin 362 -> 0 bytes
 frontend/assets/images/maps_home_work2.png  | Bin 374 -> 0 bytes
 frontend/assets/images/topic2.png           | Bin 292 -> 0 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 frontend/assets/images/celebration2.png
 delete mode 100644 frontend/assets/images/design_services2.png
 delete mode 100644 frontend/assets/images/handyman2.png
 delete mode 100644 frontend/assets/images/house2.png
 delete mode 100644 frontend/assets/images/maps_home_work2.png
 delete mode 100644 frontend/assets/images/topic2.png

diff --git a/frontend/assets/images/celebration2.png b/frontend/assets/images/celebration2.png
deleted file mode 100644
index c20b13bb7d10102da68a906c8652de35bd042857..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{&r6n$B+ufy+H?g4;k=mnW3Ou($XVf_JZRk
z%Zvp%2RI}Zl?|NS8hCqj*PYN(ROGjKd1ckRx$CbB{FORm!<jDC+A+sa<B)-h*u5T4
zk+?HCVUOo|9_!ZHap;J$@1;t8N25oJ1*?B|nr@7LocU(fj;)ms)wxa;FLN>FJZlsv
zlkcO}!C$c~ChO6O_ZvK~`Ne&YZaz|)@`^FqZsC?K)-lehW#aQ%s(&dt9y8PZct-iS
i7@Oe!6BqY?WH{>{{Q2Kmp~*lmFnGH9xvX<aXaWGuU~26E

diff --git a/frontend/assets/images/design_services2.png b/frontend/assets/images/design_services2.png
deleted file mode 100644
index 8bd27158db421e1d900f7ff61eeb01622eee001f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0ZvIoK~#7F%~CsV
zgFq1F+f$|_Hy{lXqT&Q0CkQ@4WDpXa@d3b_6WG2%(j}GU2Fm0H@ey2ufV@Gw)*6wt
z$w&jUv-94(on1xwYt!XLk|a-_=e_y9e^XV}yS$fWneDpn2llPHu8$(Gi6D;S)i4YU
z;Y;855y-YOLEE+){A_qmwIXjwH94G>Ww`{{0U41frfII5rg`kTZlUYCjl6@p2)@2j
zpsMPgHqtb8px}u01Byd{zla>*4M+m6Fu33*GuQ!ikKzD+2Kc~b3mX;67)@RjMG>L%
zD>@x!z-M%RRwkxR6F76uLt9Fp=mS-&UkT`{cxOun)0v@c!3VpYC6K`Oq=^Mp7Dz&n
ze9~ZLk_*8Mm^$BznHYw_Frzz7(`eA4D3ag76dW+dPKZhNj!5tyADP16z?Fg@z@yRa
jpzEG@Ug9cq<=@yhE6BZSE=I|O00000NkvXXu0mjf9Spgy

diff --git a/frontend/assets/images/handyman2.png b/frontend/assets/images/handyman2.png
deleted file mode 100644
index cdcbe4465f7477200d09fd69a855956acb1229cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0bfZ(K~#7Ftx~&j
zgFq1Fqui9B4(v>$3{_yc1E~W>Kx~vbfk73>uE3%K$q|GOoe5_SF~or1lkYTVe4|J^
zbHnZ1eed>zVO-OqC~|c8YPEXA@pLguUVPu*)^&Xh!|-lMrZ&!P5CpDP0OWb!_X}K|
zwr%%nC8lY*I0szauIu)E=$}9w$2%mw2+V1k#+3<(%^=R$m_8p;MJy$8fzJ|Whor6A
z3dAe*Rf@=&n1;si!ZVWYZQGvFXIl`-fZbS@wLvSaV3Q<CsufU0L<O0s@MNCnjrmQ}
zwA2bPVKf?zIW*3OWMU)?bFCr3wV})-$(#qt5)&)^W9E=-{O(-Zk^@95uL>5S_qBBF
z3*-`2tU>;Q$Q-`>H{9uTYUFwTb`}sTc^Z&s?71k4YBHH*8j){^6sH*=Sn9|U;GGy_
z0;=F2&J{rE1B#yzau9gXO<PuiVY(vc-MEJR084+*N*>u}O#lD@07*qoM6N<$g1@!F
A;Q#;t

diff --git a/frontend/assets/images/house2.png b/frontend/assets/images/house2.png
deleted file mode 100644
index ee55c8d5a4d33c9b150bce5e02cb41060fca3915..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{(nyw$B+ufvw^z<nGFT*UagQ=Bt6xEQ;*Tg
zK(;`VZ|*~mi61&S4qm)?FqVA=p9^b1Q$dUDi^}qIpT6hm6+D`I@l4%4cWuGBB{xn!
zb~wMQu6oyv;|0=|v-jK)evl<%El_J5;PusT_ukXO>#loVn{daV(j<YOWz+ZPP8{Z2
z4Z~G*1lSn9O8=NGn)6WS+4H3j^j|YpyY0DVBNg10v0qH}eER=z#qvbmgzoU}qklG^
zeR`nO`$&fJlf?%Fl_f*wrabW8_>xVH_fUb2>yi80x?_Gj_U~!+uQm9uVRm(|nR?{$
z^KHq?E0_I0e`m+Mh02dJ8t01k7>4$IEMIE#_SJkh9YzVEf}2aMUa|v&g2B_(&t;uc
GLK6TubdgU0

diff --git a/frontend/assets/images/maps_home_work2.png b/frontend/assets/images/maps_home_work2.png
deleted file mode 100644
index c40b4ace8f25c98e363f736ad8f6050c62a1c3ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0Sie)K~#7F#Zo&?
z!$1(7H$;jn@DY3j=LS9koB*dIl_^OVDnu$8M7oF*a0EC4H(-xoQ8|%3liA3L9Lsi+
zDo@(qyq($iMoV;Qpo<7UULpm)l_=`C;&@n$xT^pKK~DXM%3^psXhyFW^NdJhDvD<W
z!AMuDnT4}T?vGzhRkFLkR}d~|;mzXp%aY&hm<sSG>vi`3@bt*4V@r0T`UxBL2T}P=
z%<r<zuYc8&#(wXM);YB}hwt-PdYa|sdOn{_9RqjNP{71xOve#zXOWx$trG(}17f|g
z<^E7X1J*S7!Ikd=ZZb`q@$P@n0&8|!0{sg5U=|Y8{=k)T?hCjRa$Rc-@=F)T2GWUP
U0&>;STL1t607*qoM6N<$f==d_H~;_u

diff --git a/frontend/assets/images/topic2.png b/frontend/assets/images/topic2.png
deleted file mode 100644
index e5daec223abae15a8c5c0ba42f0f5301b005cd3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{!UL9$B+ufvq8Ig4=V`RPPkjml0T{E0k2a3
z1Aj;H<%=E8JP6$5c|uBL!eOBx5qVBOVf)VekMBJ$VL!0{;G;B|<C}}u^`)QN8R(@O
z$yR&ce@9H`Z_n)7-&q$*@1Bv^eZX!@hF$Rw+2sbJ?{(5PRlN6g3VE0j*V*eBIc@Ef
zO95GmF1c&}<}@&t>u4?IFPC1Y@F=Q@TXq$v+zO>hjhZ5z*EelUYnW=jLB2m!+W)YD
j$&Gzl;j(suGEDwof(;usIOJ6UJ;C7V>gTe~DWM4fjA?22


From cfb88d4d5de236355c4a237195c10865a107c44c Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Tue, 3 Dec 2024 08:06:14 -0500
Subject: [PATCH 16/18] Removing Hard Coded Values

---
 .../src/screens/portfolio/PortfolioScreen.tsx | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/frontend/src/screens/portfolio/PortfolioScreen.tsx b/frontend/src/screens/portfolio/PortfolioScreen.tsx
index 31e54ae..f5c02f8 100644
--- a/frontend/src/screens/portfolio/PortfolioScreen.tsx
+++ b/frontend/src/screens/portfolio/PortfolioScreen.tsx
@@ -1,5 +1,5 @@
 //Change loading page and if a portfolio cant be loaded page
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Image, Text, View, TouchableOpacity } from 'react-native';
 import { NavigationScreenProp } from 'react-navigation';
 import { styled } from 'nativewind';
@@ -8,7 +8,7 @@ import PortfolioItem from './components/PortfolioItem';
 import PortfolioDetails from './components/PortfolioDetails';
 import UpdateCard from './components/PortfolioUpdateCard';
 import { useProjectTotalFunded, useAllProjects, useProjectPosts } from "../../services/project";
-import {useInvestorPortfolio} from "../../services/investor";
+import {useInvestorHistory, useInvestorPortfolio} from "../../services/investor";
 
 
 
@@ -65,15 +65,37 @@ function netPortfolioValue(projects) {
     return value / 100;
 }
 
+function calculateMarketValue(investments) {
+  let marketValue = 0;
+
+  investments.forEach(investment => {
+      marketValue = marketValue + investment.fundedCents
+  });
+
+  return marketValue/100;
+}
+
+const [totalInvested, setTotalInvested] = useState(0);
+  const { portfolio } = useInvestorPortfolio();
+
+  useEffect(() => {
+    if (portfolio) {
+      const total = Object.values(portfolio).reduce((sum, value) => sum + value, 0);
+      setTotalInvested(total);
+    }
+  }, [portfolio]);
+
+
 export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
   const [activeTab, setActiveTab] = useState('Your Projects');
 
   const { portfolio, isLoading: portfolioLoading } = useInvestorPortfolio();
   const { allProjects, isLoading: projectsLoading } = useAllProjects();
+  const {history, isLoading: historyLoading } = useInvestorHistory(1, 1000); //dont know what to put for the pages - maybe change later?
 
   console.log(portfolio);
 
-  if (portfolioLoading || projectsLoading) {
+  if (portfolioLoading || projectsLoading || historyLoading) {
     return (
       <StyledView className='flex-1 justify-center bg-surfaceBG overflow-auto'>
       <StyledView className='flex w-93 h-150 items-center shrink-0'></StyledView>
@@ -121,8 +143,8 @@ export default function PorfolioScreen({ navigation }: PortfolioScreenProps) {
         <PortfolioDetails 
         netPortfolioValue={netPortfolioValue(allProjects)} 
         portfolioChangeAmount={350} // HARD CODED VALUE
-        marketValue={10000} // HARD CODED VALUE 
-        cashValue={2345.67} //HARD CODED VALUE
+        marketValue={calculateMarketValue(history)}
+        cashValue={totalInvested}
         totalProjects={allProjects.length} 
         expMaturity={calculateExpMaturity(allProjects)}>
 

From 660ca46e734a5b5f0bc21a7feb056b7b56154e34 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Tue, 3 Dec 2024 08:22:31 -0500
Subject: [PATCH 17/18] Removing Unused Components

---
 .../components/PortfolioUpdateText.tsx        | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 frontend/src/screens/portfolio/components/PortfolioUpdateText.tsx

diff --git a/frontend/src/screens/portfolio/components/PortfolioUpdateText.tsx b/frontend/src/screens/portfolio/components/PortfolioUpdateText.tsx
deleted file mode 100644
index 692212f..0000000
--- a/frontend/src/screens/portfolio/components/PortfolioUpdateText.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-import { View, Text } from 'react-native';
-import { styled } from 'nativewind';
-
-const StyledView = styled(View);
-const StyledText = styled(Text);
-
-interface UpdateTextProps {
-  topText: string;
-  bottomText: string;
-}
-
-const UpdateText = ({ topText, bottomText }: UpdateTextProps) => {
-  return (
-    <StyledView className='flex flexDirection-column alignContent-left justifyContent-space-between p-4 w-8/10 bg-surfaceFG overflow-hidden'>
-      <StyledText className='text-sourceSans3BodyBold'>{topText}</StyledText>
-      <StyledText className='text-body'>{bottomText}</StyledText>
-    </StyledView>
-  );
-};
-
-export default UpdateText;

From 1dbd932ddf882f48b145c6133a355ba6b1a97852 Mon Sep 17 00:00:00 2001
From: abby-stevenson <147872370+abby-stevenson@users.noreply.github.com>
Date: Tue, 3 Dec 2024 08:26:55 -0500
Subject: [PATCH 18/18] Removing unnecessary comments

---
 frontend/src/screens/portfolio/components/PortfolioItem.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/screens/portfolio/components/PortfolioItem.tsx b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
index a98a036..2c79fbc 100644
--- a/frontend/src/screens/portfolio/components/PortfolioItem.tsx
+++ b/frontend/src/screens/portfolio/components/PortfolioItem.tsx
@@ -1,6 +1,3 @@
-//TO DO Add the tag component 
-//TO DO Make the updates page inline with the figma 
-
 import React from 'react';
 import { View, Text, Image } from 'react-native';
 import { styled } from 'nativewind';