From 29387b9972ec45685f60c2166ee653aed5a3e35e Mon Sep 17 00:00:00 2001
From: G <idouattara@ldfgroupe.com>
Date: Wed, 11 Sep 2024 11:16:53 +0000
Subject: [PATCH] renamed again since i'll need a folder named wrapper

---
 src/components/backgrounds/BackgroundWithBeasyIconAndWhiteContentArea.tsx |  2 +-
 src/components/backgrounds/BeasyDefaultBackground.tsx                     | 14 ++++++++++++++
 src/components/backgrounds/BeasyDefaultBackgroundWrapper.tsx              | 17 -----------------
 src/screens/HomePageWithPaymentOptions.tsx                                | 40 ++++++++++++++--------------------------
 src/screens/PaymentAmountInputScreen.tsx                                  |  2 +-
 src/screens/PaymentResultScreen.tsx                                       |  2 +-
 src/screens/UserLoginScreen.tsx                                           |  2 +-
 7 files changed, 32 insertions(+), 47 deletions(-)
 create mode 100644 src/components/backgrounds/BeasyDefaultBackground.tsx
 delete mode 100644 src/components/backgrounds/BeasyDefaultBackgroundWrapper.tsx

diff --git a/src/components/backgrounds/BackgroundWithBeasyIconAndWhiteContentArea.tsx b/src/components/backgrounds/BackgroundWithBeasyIconAndWhiteContentArea.tsx
index c52287b..a440727 100644
--- a/src/components/backgrounds/BackgroundWithBeasyIconAndWhiteContentArea.tsx
+++ b/src/components/backgrounds/BackgroundWithBeasyIconAndWhiteContentArea.tsx
@@ -4,7 +4,7 @@ import WrapperTopEdgeCurved from "@components/WrapperTopEdgeCurved";
 import Box from "@components/bases/Box";
 import { useNavigation } from "@react-navigation/native";
 import type { ReactElement } from "react";
-import BackgroundDefault from "./BeasyDefaultBackgroundWrapper";
+import BackgroundDefault from "./BeasyDefaultBackground";
 
 const BackgroundWithBeasyIconAndWhiteContentArea = ({
 	children,
diff --git a/src/components/backgrounds/BeasyDefaultBackground.tsx b/src/components/backgrounds/BeasyDefaultBackground.tsx
new file mode 100644
index 0000000..3e54f17
--- /dev/null
+++ b/src/components/backgrounds/BeasyDefaultBackground.tsx
@@ -0,0 +1,14 @@
+import { images } from "@styles/Commons";
+import { ImageBackground } from "react-native";
+
+type Props = { children: React.ReactNode };
+
+const BeasyDefaultBackground = ({ children }: Props) => {
+	return (
+		<ImageBackground source={require("../../../assets/background.png")} style={images.cover}>
+			{children}
+		</ImageBackground>
+	);
+};
+
+export default BeasyDefaultBackground;
diff --git a/src/components/backgrounds/BeasyDefaultBackgroundWrapper.tsx b/src/components/backgrounds/BeasyDefaultBackgroundWrapper.tsx
deleted file mode 100644
index 5f11d8d..0000000
--- a/src/components/backgrounds/BeasyDefaultBackgroundWrapper.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { images } from "@styles/Commons";
-import { ImageBackground } from "react-native";
-
-type Props = { children: React.ReactNode };
-
-const BackgroundDefault = ({ children }: Props) => {
-	return (
-		<ImageBackground
-			source={require("../../../assets/background.png")}
-			style={images.background}
-		>
-			{children}
-		</ImageBackground>
-	);
-};
-
-export default BackgroundDefault;
diff --git a/src/screens/HomePageWithPaymentOptions.tsx b/src/screens/HomePageWithPaymentOptions.tsx
index a5f6a8d..e91785c 100644
--- a/src/screens/HomePageWithPaymentOptions.tsx
+++ b/src/screens/HomePageWithPaymentOptions.tsx
@@ -1,12 +1,7 @@
 import type { PaymentStackScreenComponentProps } from "@/navigations/Types";
 import getPaymentTypes from "@/utils/requests/getPaymentTypes";
-import BalanceContainer from "@components/BalanceContainer";
-import BeasyLogoIcon from "@components/BeasyLogoIcon";
-import NotificationIconButton from "@components/NotificationIconButton";
-import PaymentOption from "@components/PaymentOption";
-import BackgroundGreenWhiteContentArea from "@components/backgrounds/BackgroundGreenWhiteContentArea";
+import BarWithBeasyAndNotificationsIcon from "@components/BarWithBeasyAndNotificationsIcon";
 import Box from "@components/bases/Box";
-import Text from "@components/bases/Text";
 import { LOG } from "@logger";
 import { useQuery } from "@tanstack/react-query";
 import { useMemo } from "react";
@@ -37,28 +32,21 @@ const HomePageWithPaymentOptions: PaymentStackScreenComponentProps<"homePageWith
 		);
 
 		return (
-			<BackgroundGreenWhiteContentArea>
-				<SafeAreaView>
-					<Box style={{ height: "100%" }}>
-						<Box
-							px={"l"}
-							flexDirection={"row"}
-							justifyContent={"space-between"}
-							alignItems={"center"}
-						>
-							<BeasyLogoIcon />
-							<NotificationIconButton />
-						</Box>
-						<Box height={150} alignItems={"center"} justifyContent={"center"}>
+			// <BeasyDefaultBackgroundWrapper>
+			<SafeAreaView>
+				<Box style={{ height: "100%" }}>
+					<BarWithBeasyAndNotificationsIcon />
+					{/* <Box height={150} alignItems={"center"} justifyContent={"center"}>
 							<BalanceContainer balance={78000} label="Total des ventes" />
-						</Box>
-						<Box flex={1} p={"l"}>
+						</Box> */}
+
+					{/* <Box flex={1} p={"l"}>
 							<Box height={100}>
 								<Text fontSize={20} fontWeight={"bold"}>
 									Types de paiement
 								</Text>
 							</Box>
-							{/* <Box flexDirection={"row"} justifyContent={"space-between"} mb={"s"}> */}
+
 							<Box
 								flex={1}
 								flexDirection={"row"}
@@ -91,10 +79,10 @@ const HomePageWithPaymentOptions: PaymentStackScreenComponentProps<"homePageWith
 										</PaymentOptionContainer>
 									))}
 							</Box>
-						</Box>
-					</Box>
-				</SafeAreaView>
-			</BackgroundGreenWhiteContentArea>
+						</Box> */}
+				</Box>
+			</SafeAreaView>
+			// </BeasyDefaultBackgroundWrapper>
 		);
 	};
 
diff --git a/src/screens/PaymentAmountInputScreen.tsx b/src/screens/PaymentAmountInputScreen.tsx
index 6c57f8c..94460c6 100644
--- a/src/screens/PaymentAmountInputScreen.tsx
+++ b/src/screens/PaymentAmountInputScreen.tsx
@@ -5,7 +5,7 @@ import Button from "@components/Button";
 import GoBackIconButton from "@components/GoBackIconButton";
 import InputWithTopLabel from "@components/InputWithTopLabel";
 import PaymentOption from "@components/PaymentOption";
-import BeasyDefaultBackgroundWrapper from "@components/backgrounds/BeasyDefaultBackgroundWrapper";
+import BeasyDefaultBackgroundWrapper from "@components/backgrounds/BeasyDefaultBackground";
 import Box from "@components/bases/Box";
 import Text from "@components/bases/Text";
 import useOrangeMoney from "@hooks/useOrangeMoney";
diff --git a/src/screens/PaymentResultScreen.tsx b/src/screens/PaymentResultScreen.tsx
index 8c22698..292cf1c 100644
--- a/src/screens/PaymentResultScreen.tsx
+++ b/src/screens/PaymentResultScreen.tsx
@@ -2,7 +2,7 @@ import type { MainStackScreenComponentProps } from "@/navigations/Types";
 import BeasyLogoIcon from "@components/BeasyLogoIcon";
 import Button from "@components/Button";
 import GoBackIconButton from "@components/GoBackIconButton";
-import BeasyDefaultBackgroundWrapper from "@components/backgrounds/BeasyDefaultBackgroundWrapper";
+import BeasyDefaultBackgroundWrapper from "@components/backgrounds/BeasyDefaultBackground";
 import Box from "@components/bases/Box";
 import Text from "@components/bases/Text";
 import CheckIcon from "@components/icons/CheckIcon";
diff --git a/src/screens/UserLoginScreen.tsx b/src/screens/UserLoginScreen.tsx
index ec143db..7108595 100644
--- a/src/screens/UserLoginScreen.tsx
+++ b/src/screens/UserLoginScreen.tsx
@@ -3,7 +3,7 @@ import type { MainStackScreenComponentProps } from "@/navigations/Types";
 import Button from "@components/Button";
 import ContainerBorderTopCurved from "@components/ContainerBorderTopCurved";
 import InputWithTopLabel from "@components/InputWithTopLabel";
-import BeasyDefaultBackgroundWrapper from "@components/backgrounds/BeasyDefaultBackgroundWrapper";
+import BeasyDefaultBackgroundWrapper from "@components/backgrounds/BeasyDefaultBackground";
 import Box from "@components/bases/Box";
 import Text from "@components/bases/Text";
 import { Fontisto } from "@expo/vector-icons";
--
libgit2 0.27.1