From b4bb8cfcf3cf3c00623bcd654909683c2c98d361 Mon Sep 17 00:00:00 2001
From: G <idouattara@ldfgroupe.com>
Date: Fri, 26 Apr 2024 15:37:15 +0000
Subject: [PATCH] all are type checked as part of the stack navigation. screens beside the home of the stack include a go back button

---
 src/screens/HomePageWithPaymentOptions.tsx   | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 src/screens/NumberAndOtpForPaymentScreen.tsx |  5 ++++-
 src/screens/PaymentAmountInputScreen.tsx     |  7 ++++++-
 3 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/src/screens/HomePageWithPaymentOptions.tsx b/src/screens/HomePageWithPaymentOptions.tsx
index 764aa06..3f27bb5 100644
--- a/src/screens/HomePageWithPaymentOptions.tsx
+++ b/src/screens/HomePageWithPaymentOptions.tsx
@@ -1,3 +1,4 @@
+import type { PaymentStackScreenComponentProps } from "@/navigations/Types";
 import BalanceContainer from "@components/BalanceContainer";
 import BeasyLogoIcon from "@components/BeasyLogoIcon";
 import NotificationIconButton from "@components/NotificationIconButton";
@@ -7,60 +8,66 @@ import Box from "@components/bases/Box";
 import Text from "@components/bases/Text";
 import { SafeAreaView } from "react-native-safe-area-context";
 
-const HomePageWithPaymentOptions = () => {
-	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"}>
-						<BalanceContainer balance={78000} label="Total des ventes" />
-					</Box>
-					<Box flex={1} p={"l"}>
-						<Box height={100}>
-							<Text fontSize={20} fontWeight={"bold"}>
-								Méthode de paiement
-							</Text>
-						</Box>
+const HomePageWithPaymentOptions: PaymentStackScreenComponentProps<"homePageWithPaymentOptions"> =
+	({ navigation }) => {
+		return (
+			<BackgroundGreenWhiteContentArea>
+				<SafeAreaView>
+					<Box style={{ height: "100%" }}>
 						<Box
+							px={"l"}
 							flexDirection={"row"}
-							style={{ flexWrap: "wrap" }}
-							gap={"s"}
 							justifyContent={"space-between"}
+							alignItems={"center"}
 						>
-							{/* Payment Modes */}
-							<Box style={{ width: "48%", height: "26%" }}>
-								<PaymentOption onPress={() => {}} paymentMethod={"OrangeMoney"} />
-							</Box>
-							<Box style={{ width: "48%", height: "26%" }}>
-								<PaymentOption onPress={() => {}} paymentMethod={"MtnMoney"} />
+							<BeasyLogoIcon />
+							<NotificationIconButton />
+						</Box>
+						<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"}>
+									Méthode de paiement
+								</Text>
 							</Box>
+							<Box
+								flexDirection={"row"}
+								style={{ flexWrap: "wrap" }}
+								gap={"s"}
+								justifyContent={"space-between"}
+							>
+								{/* Payment Modes */}
+								<Box style={{ width: "48%", height: "26%" }}>
+									<PaymentOption
+										onPress={() =>
+											navigation.navigate("paymentAmountInputScreen")
+										}
+										paymentMethod={"OrangeMoney"}
+									/>
+								</Box>
+								<Box style={{ width: "48%", height: "26%" }}>
+									<PaymentOption onPress={() => {}} paymentMethod={"MtnMoney"} />
+								</Box>
 
-							<Box style={{ width: "48%", height: "26%" }}>
-								<PaymentOption onPress={() => {}} paymentMethod={"MoovMoney"} />
-							</Box>
+								<Box style={{ width: "48%", height: "26%" }}>
+									<PaymentOption onPress={() => {}} paymentMethod={"MoovMoney"} />
+								</Box>
 
-							<Box style={{ width: "48%", height: "26%" }}>
-								<PaymentOption onPress={() => {}} paymentMethod={"WaveMoney"} />
-							</Box>
+								<Box style={{ width: "48%", height: "26%" }}>
+									<PaymentOption onPress={() => {}} paymentMethod={"WaveMoney"} />
+								</Box>
 
-							<Box style={{ width: "48%", height: "26%" }}>
-								<PaymentOption onPress={() => {}} paymentMethod={"VisaCard"} />
+								<Box style={{ width: "48%", height: "26%" }}>
+									<PaymentOption onPress={() => {}} paymentMethod={"VisaCard"} />
+								</Box>
 							</Box>
 						</Box>
 					</Box>
-				</Box>
-			</SafeAreaView>
-		</BackgroundGreenWhiteContentArea>
-	);
-};
+				</SafeAreaView>
+			</BackgroundGreenWhiteContentArea>
+		);
+	};
 
 export default HomePageWithPaymentOptions;
diff --git a/src/screens/NumberAndOtpForPaymentScreen.tsx b/src/screens/NumberAndOtpForPaymentScreen.tsx
index 6ae3e40..e85c339 100644
--- a/src/screens/NumberAndOtpForPaymentScreen.tsx
+++ b/src/screens/NumberAndOtpForPaymentScreen.tsx
@@ -1,3 +1,4 @@
+import type { PaymentStackScreenComponentProps } from "@/navigations/Types";
 import BeasyLogoIcon from "@components/BeasyLogoIcon";
 import Button from "@components/Button";
 import Input from "@components/Input";
@@ -7,7 +8,9 @@ import Box from "@components/bases/Box";
 import Text from "@components/bases/Text";
 import { SafeAreaView } from "react-native-safe-area-context";
 
-const NumberAndOtpForPaymentScreen = () => {
+const NumberAndOtpForPaymentScreen: PaymentStackScreenComponentProps<
+	"numberAndOtpForPaymentScreen"
+> = ({ navigation }) => {
 	return (
 		<BackgroundGreenWhiteContentArea>
 			<SafeAreaView>
diff --git a/src/screens/PaymentAmountInputScreen.tsx b/src/screens/PaymentAmountInputScreen.tsx
index 7d5b6d6..1c87e2d 100644
--- a/src/screens/PaymentAmountInputScreen.tsx
+++ b/src/screens/PaymentAmountInputScreen.tsx
@@ -1,12 +1,16 @@
+import type { PaymentStackScreenComponentProps } from "@/navigations/Types";
 import BalanceContainer from "@components/BalanceContainer";
 import BeasyLogoIcon from "@components/BeasyLogoIcon";
 import Button from "@components/Button";
+import GoBackIconButton from "@components/GoBackIconButton";
 import Input from "@components/Input";
 import BackgroundGreenWhiteContentArea from "@components/backgrounds/BackgroundGreenWhiteContentArea";
 import Box from "@components/bases/Box";
 import { SafeAreaView } from "react-native-safe-area-context";
 
-const PaymentAmountInputScreen = () => {
+const PaymentAmountInputScreen: PaymentStackScreenComponentProps<"paymentAmountInputScreen"> = ({
+	navigation,
+}) => {
 	return (
 		<BackgroundGreenWhiteContentArea>
 			<SafeAreaView>
@@ -19,6 +23,7 @@ const PaymentAmountInputScreen = () => {
 						mb={"l"}
 					>
 						<BeasyLogoIcon />
+						<GoBackIconButton onPress={() => navigation.goBack()} />
 					</Box>
 					<Box height={150} alignItems={"center"} justifyContent={"center"}>
 						<BalanceContainer balance={78000} label="Total des ventes" />
--
libgit2 0.27.1