diff --git a/navigation/index.js b/navigation/index.js
index cae5c7c..5717d51 100644
--- a/navigation/index.js
+++ b/navigation/index.js
@@ -444,7 +444,6 @@ const HomeStackScreen = ({ theme }) => {
-
@@ -471,7 +470,6 @@ const ProductsStackScreen = ({ theme }) => {
>
-
@@ -489,10 +487,11 @@ const VODStackScreen = ({ theme }) => {
theme === "light" ? Colors.theme1.white : Colors.theme1.dark,
},
}}
+ initialRouteName="VOD"
+
>
-
);
@@ -509,6 +508,7 @@ const CARTStackScreen = ({ theme }) => {
theme === "light" ? Colors.theme1.white : Colors.theme1.dark,
},
}}
+ initialRouteName="ShoppingCart"
>
diff --git a/planning 4-2-1401.xlsx b/planning 4-2-1401.xlsx
new file mode 100644
index 0000000..cc58d54
Binary files /dev/null and b/planning 4-2-1401.xlsx differ
diff --git a/src/screens/Product/components/Book.js b/src/screens/Product/components/Book.js
index 32558aa..4c4650f 100644
--- a/src/screens/Product/components/Book.js
+++ b/src/screens/Product/components/Book.js
@@ -87,21 +87,30 @@ function Book({
if (whichTypeAdded === "video" && videoAvailabileInCart) {
asyncAwesomeAlert("", "به سبد خرید اضافه شد", {
showCancelButton: true,
- onConfirm: () => navigation.push("ShoppingCart"),
+ onConfirm: () =>
+ navigation.navigate("ShoppingCartTab", {
+ screen: "ShoppingCart",
+ }),
confirmText: "مشاهده سبد خرید",
cancelText: "ادامه خرید",
});
} else if (whichTypeAdded === "physical" && physicalAvailabileInCart) {
asyncAwesomeAlert("", "به سبد خرید اضافه شد", {
showCancelButton: true,
- onConfirm: () => navigation.push("ShoppingCart"),
+ onConfirm: () =>
+ navigation.navigate("ShoppingCartTab", {
+ screen: "ShoppingCart",
+ }),
confirmText: "مشاهده سبد خرید",
cancelText: "ادامه خرید",
});
} else if (whichTypeAdded === "digital" && digitalAvailabileInCart) {
asyncAwesomeAlert("", "به سبد خرید اضافه شد", {
showCancelButton: true,
- onConfirm: () => navigation.push("ShoppingCart"),
+ onConfirm: () =>
+ navigation.navigate("ShoppingCartTab", {
+ screen: "ShoppingCart",
+ }),
confirmText: "مشاهده سبد خرید",
cancelText: "ادامه خرید",
});
@@ -271,7 +280,8 @@ function Book({
{
borderWidth: 1,
borderColor: Colors.theme1.greenCF,
- backgroundColor: theme === 'light' ? Colors.theme1.greenFF + "0a" : null,
+ backgroundColor:
+ theme === "light" ? Colors.theme1.greenFF + "0a" : null,
},
]}
onPress={() =>
@@ -340,8 +350,9 @@ function Book({
tw("flex flex-row-reverse justify-between px-2 py-3 mb-4"),
{
borderWidth: 1,
- borderColor: Colors.theme1.greenCF,
- backgroundColor: theme === 'light' ? Colors.theme1.greenFF + "0a" : null,
+ borderColor: Colors.theme1.greenCF,
+ backgroundColor:
+ theme === "light" ? Colors.theme1.greenFF + "0a" : null,
width: width - 32 - 8 - (fontSize.sm * 6 + 18),
},
]}
@@ -411,7 +422,8 @@ function Book({
{
borderWidth: 1,
borderColor: Colors.theme1.greenCF,
- backgroundColor: theme === 'light' ? Colors.theme1.greenFF + "0a" : null,
+ backgroundColor:
+ theme === "light" ? Colors.theme1.greenFF + "0a" : null,
width: fontSize.sm * 6 + 18,
},
]}
@@ -422,7 +434,9 @@ function Book({
fontFamily: "bold",
fontSize: fontSize.xs,
color:
- theme === "light" ? Colors.theme1.green79 : Colors.theme1.greenCF,
+ theme === "light"
+ ? Colors.theme1.green79
+ : Colors.theme1.greenCF,
paddingVertical: 4,
}}
@@ -437,7 +451,8 @@ function Book({
{
borderWidth: 1,
borderColor: Colors.theme1.greenCF,
- backgroundColor: theme === 'light' ? Colors.theme1.greenFF + "0a" : null,
+ backgroundColor:
+ theme === "light" ? Colors.theme1.greenFF + "0a" : null,
width: width - 32 - 8 - (fontSize.sm * 6 + 18),
},
]}
@@ -506,7 +521,8 @@ function Book({
{
borderWidth: 1,
borderColor: Colors.theme1.greenCF,
- backgroundColor: theme === 'light' ? Colors.theme1.greenFF + "0a" : null,
+ backgroundColor:
+ theme === "light" ? Colors.theme1.greenFF + "0a" : null,
width: fontSize.sm * 6 + 18,
},
]}
@@ -517,7 +533,9 @@ function Book({
fontFamily: "bold",
fontSize: fontSize.xs,
color:
- theme === "light" ? Colors.theme1.green79 : Colors.theme1.greenCF,
+ theme === "light"
+ ? Colors.theme1.green79
+ : Colors.theme1.greenCF,
paddingVertical: 4,
}}
@@ -567,7 +585,7 @@ function Book({
style={[
{
fontSize: fontSize.tiny,
- color: theme === 'light' ? "#275077" : Colors.theme1.white,
+ color: theme === "light" ? "#275077" : Colors.theme1.white,
fontFamily: "regular",
},
tw(""),
diff --git a/src/screens/Video/index.js b/src/screens/Video/index.js
index 581e518..f89f9ed 100644
--- a/src/screens/Video/index.js
+++ b/src/screens/Video/index.js
@@ -197,7 +197,7 @@ function Product({
}
/>
-
+
{seasons
?.sort((a, b) => a[0]?.categoryId - b[0]?.categoryId)
?.map((season, index) => (