WIP

src/App.js

@@ -137,6 +137,11 @@ const config = {
         },
       },
     },
+    CheckoutNav: {
+      screens: {
+        CheckoutPaygreenReturn: 'paygreen/return',
+      },
+    },
   },
 };
 

src/navigation/checkout/PaygreenReturn.js

@@ -0,0 +1,23 @@
+import React, { useEffect } from 'react';
+import { Text } from 'native-base';
+import { useNavigation, useRoute } from '@react-navigation/native';
+import { useDispatch } from 'react-redux';
+
+import { checkout } from '../../redux/Checkout/actions';
+
+export default () => {
+
+  const route = useRoute();
+  const dispatch = useDispatch();
+
+  const paymentOrderId = route.params.po_id;
+
+  useEffect(() => {
+    dispatch(checkout('', null, false, route.params.po_id));
+  }, []);
+
+  // TODO Add a waiting text
+  return (
+    <Text>LOADING</Text>
+  )
+}

src/navigation/index.js

@@ -50,6 +50,7 @@ import CheckoutMoreInfos from './checkout/MoreInfos';
 import CheckoutPayment from './checkout/Payment';
 import CheckoutProductDetails from './checkout/ProductDetails';
 import CheckoutSummary from './checkout/Summary';
+import CheckoutPaygreenReturn from './checkout/PaygreenReturn';
 
 import CheckoutLoopeat from './checkout/Loopeat';
 import CheckoutRestaurant from './checkout/Restaurant';
@@ -108,6 +109,7 @@ export default {
   CheckoutPaymentMethodCashOnDelivery,
   CheckoutPaymentMethodEdenred,
   CheckoutLoopeat,
+  CheckoutPaygreenReturn,
   AccountHome,
   AccountAddressesPage,
   AccountOrdersPage,

src/navigation/navigators/CheckoutNavigator.js

@@ -352,6 +352,13 @@ const DefaultNav = () => {
           title: i18n.t('ZERO_WASTE'),
         }}
       />
+      <RootStack.Screen
+        name="CheckoutPaygreenReturn"
+        component={screens.CheckoutPaygreenReturn}
+        options={{
+          title: i18n.t('PAYGREEN_RETURN'),
+        }}
+      />
     </RootStack.Navigator>
   );
 };

src/redux/Checkout/actions.js

@@ -1113,24 +1113,6 @@ export function checkout(
 
     const httpClient = selectHttpClient(getState());
 
-    if (!validateCart(cart)) {
-      dispatch(checkoutFailure());
-      NavigationHolder.dispatch(
-        CommonActions.navigate({
-          name: 'Cart',
-        }),
-      );
-      dispatch(
-        setModal({
-          show: true,
-          skippable: true,
-          content: 'An error occurred, please try again later',
-          type: 'error',
-        }),
-      );
-      return;
-    }
-
     if (paygreenPaymentOrderID) {
       httpClient
         .put(
@@ -1146,8 +1128,8 @@ export function checkout(
             ),
           },
         )
-        .then(o => dispatch(handleSuccessNav(o)))
-        .catch(e => dispatch(checkoutFailure(e)));
+        .then(o => dispatch(handlePaymentSuccess(o)))
+        .catch(e => dispatch(handlePaymentFailed(e)));
 
       return;
     }