From 1a7556cf30035d403c704ad2c326119cbe8ffac1 Mon Sep 17 00:00:00 2001
From: G <idouattara@ldfgroupe.com>
Date: Wed, 11 Sep 2024 11:44:32 +0000
Subject: [PATCH] updated with the card created for the moment

---
 src/screens/HomePageWithPaymentOptions.tsx | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
 src/screens/UserProfileScreen.tsx          | 25 +++++++++++++++----------
 2 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/src/screens/HomePageWithPaymentOptions.tsx b/src/screens/HomePageWithPaymentOptions.tsx
index e91785c..16724e3 100644
--- a/src/screens/HomePageWithPaymentOptions.tsx
+++ b/src/screens/HomePageWithPaymentOptions.tsx
@@ -1,12 +1,15 @@
 import type { PaymentStackScreenComponentProps } from "@/navigations/Types";
 import getPaymentTypes from "@/utils/requests/getPaymentTypes";
 import BarWithBeasyAndNotificationsIcon from "@components/BarWithBeasyAndNotificationsIcon";
+import PaymentOption from "@components/PaymentOption";
 import Box from "@components/bases/Box";
+import WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight from "@components/wrappers/WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight";
 import { LOG } from "@logger";
+import Card from "@re-card";
+import Text from "@re-text";
 import { useQuery } from "@tanstack/react-query";
 import { useMemo } from "react";
 import { Dimensions } from "react-native";
-import { SafeAreaView } from "react-native-safe-area-context";
 
 const log = LOG.extend("HomePageWithPaymentOptions");
 
@@ -33,55 +36,57 @@ const HomePageWithPaymentOptions: PaymentStackScreenComponentProps<"homePageWith
 
 		return (
 			// <BeasyDefaultBackgroundWrapper>
-			<SafeAreaView>
-				<Box style={{ height: "100%" }}>
+			<WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight>
+				<Box style={{ height: "100%" }} flexDirection={"column"}>
 					<BarWithBeasyAndNotificationsIcon />
+					<Card
+						variant={"curvedTopContainer"}
+						height={Dimensions.get("window").height / 2 + 150}
+						// marginTop={"auto"}
+						style={{ marginTop: "auto" }}
+						padding={"l"}
+					>
+						<Box height={100}>
+							<Text fontSize={20} fontWeight={"bold"}>
+								Types de paiement
+							</Text>
+						</Box>
+
+						<Box
+							flex={1}
+							flexDirection={"row"}
+							justifyContent={"space-between"}
+							flexWrap={"wrap"}
+							rowGap={"m"}
+						>
+							{isLoading && (
+								<Box flex={1}>
+									<Text textAlign={"center"}>
+										Chargement des méthodes de paiement...
+									</Text>
+								</Box>
+							)}
+							{!isLoading &&
+								!error &&
+								paymentTypesWithActiveStatus.map((paymentType) => (
+									<PaymentOptionContainer key={paymentType.id}>
+										<PaymentOption
+											onPress={() =>
+												navigation.navigate("paymentAmountInputScreen", {
+													paymentType: paymentType.code,
+												})
+											}
+											paymentMethod={paymentType.code}
+										/>
+									</PaymentOptionContainer>
+								))}
+						</Box>
+					</Card>
 					{/* <Box height={150} alignItems={"center"} justifyContent={"center"}>
 							<BalanceContainer balance={78000} label="Total des ventes" />
 						</Box> */}
-
-					{/* <Box flex={1} p={"l"}>
-							<Box height={100}>
-								<Text fontSize={20} fontWeight={"bold"}>
-									Types de paiement
-								</Text>
-							</Box>
-
-							<Box
-								flex={1}
-								flexDirection={"row"}
-								justifyContent={"space-between"}
-								flexWrap={"wrap"}
-								rowGap={"m"}
-							>
-								{isLoading && (
-									<Box flex={1}>
-										<Text textAlign={"center"}>
-											Chargement des méthodes de paiement...
-										</Text>
-									</Box>
-								)}
-								{!isLoading &&
-									!error &&
-									paymentTypesWithActiveStatus.map((paymentType) => (
-										<PaymentOptionContainer key={paymentType.id}>
-											<PaymentOption
-												onPress={() =>
-													navigation.navigate(
-														"paymentAmountInputScreen",
-														{
-															paymentType: paymentType.code,
-														},
-													)
-												}
-												paymentMethod={paymentType.code}
-											/>
-										</PaymentOptionContainer>
-									))}
-							</Box>
-						</Box> */}
 				</Box>
-			</SafeAreaView>
+			</WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight>
 			// </BeasyDefaultBackgroundWrapper>
 		);
 	};
diff --git a/src/screens/UserProfileScreen.tsx b/src/screens/UserProfileScreen.tsx
index 0677808..099b94c 100644
--- a/src/screens/UserProfileScreen.tsx
+++ b/src/screens/UserProfileScreen.tsx
@@ -1,12 +1,11 @@
-import Box from "@components/bases/Box";
-import {} from "react";
-import {} from "react-native";
-
 import { useUserAuthenticationContext } from "@/contexts/UserAuthenticationContext";
+import BarWithBeasyAndNotificationsIcon from "@components/BarWithBeasyAndNotificationsIcon";
 import Button from "@components/Button";
-import BackgroundWithBeasyIconAndWhiteContentArea from "@components/backgrounds/BackgroundWithBeasyIconAndWhiteContentArea";
+import Box from "@components/bases/Box";
 import Text from "@components/bases/Text";
+import WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight from "@components/wrappers/WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight";
 import { LOG } from "@logger";
+import Card from "@re-card";
 
 const log = LOG.extend("UserProfileScreen");
 const UserProfileScreen = () => {
@@ -17,10 +16,16 @@ const UserProfileScreen = () => {
 	const { userInformations } = useUserAuthenticationContext();
 
 	return (
-		<BackgroundWithBeasyIconAndWhiteContentArea>
+		<WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight>
 			<>
-				<Box px={"m"} mt={"m"} gap={"m"}>
-					{/* User Informations */}
+				<BarWithBeasyAndNotificationsIcon />
+				<Card
+					variant="curvedTopContainer"
+					height={"100%"}
+					padding={"m"}
+					gap={"m"}
+					marginTop={"m"}
+				>
 					<Box
 						width={"100%"}
 						// height={200}
@@ -163,9 +168,9 @@ const UserProfileScreen = () => {
 							<Text textAlign={"center"}>{userInformations.marchand.url_echec}</Text>
 						</Box>
 					</Box>
-				</Box>
+				</Card>
 			</>
-		</BackgroundWithBeasyIconAndWhiteContentArea>
+		</WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight>
 	);
 };
 
--
libgit2 0.27.1