Merge pull request #27 from degica/task/MOB-1

[MOB-1] Render instruction pages when instructions URL is available
degica · Jul 4, 2024 · 466c460 · 466c460
2 parents 3eb014b + 32b3dec
commit 466c460
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 5 deletions.
diff --git a/payment_sdk/src/KomojuProvider.tsx b/payment_sdk/src/KomojuProvider.tsx
@@ -261,6 +261,22 @@ export const MainStateProvider = (props: KomojuProviderIprops) => {
               handleWebViewNavigationStateChange(newNavState, paymentType),
           },
         });
+      } else if (
+        paymentType === PaymentType.KONBINI &&
+        response?.payment?.payment_details?.instructions_url
+      ) {
+        dispatch({
+          type: Actions.SET_WEBVIEW_LINK,
+          payload: {
+            link: response?.payment?.payment_details?.instructions_url,
+            onNavChange: (newNavState: newNavStateProps) =>
+              handleWebViewNavigationStateChange(newNavState, paymentType),
+          },
+        });
+        dispatch({
+          type: Actions.SET_PAYMENT_STATE,
+          payload: ResponseScreenStatuses.COMPLETE,
+        });
       } else if (response?.status === PaymentStatuses.SUCCESS) {
         onPaymentSuccess();
       } else {

diff --git a/payment_sdk/src/__tests__/validator.test.ts b/payment_sdk/src/__tests__/validator.test.ts
@@ -13,7 +13,7 @@ describe("isCardNumberValid", () => {
   });
 
   it("returns false for input exceeding max card length", () => {
-    expect(isCardNumberValid("12345678901234567")).toBe(false);
+    expect(isCardNumberValid("12345678901234567890")).toBe(false);
   });
 
   it("returns false for input with non-numeric characters", () => {
@@ -25,7 +25,7 @@ describe("isCardNumberValid", () => {
   });
 
   it("returns false for card number with spaces but exceeding max length", () => {
-    expect(isCardNumberValid("1234 5678 1234 5678 90")).toBe(false);
+    expect(isCardNumberValid("1234 5678 1234 5678 9012")).toBe(false);
   });
 
   it("returns false for input length not matching numeric conversion", () => {

diff --git a/payment_sdk/src/components/Sheet.tsx b/payment_sdk/src/components/Sheet.tsx
@@ -192,13 +192,18 @@ const Sheet: ForwardRefRenderFunction<SheetRefProps, SheetProps> = (
           <TouchableOpacity
             style={styles.crossBtn}
             onPress={() =>
-              closeSheet(paymentState !== ResponseScreenStatuses.SUCCESS)
+              closeSheet(
+                !(
+                  paymentState === ResponseScreenStatuses.SUCCESS ||
+                  paymentState === ResponseScreenStatuses.COMPLETE
+                )
+              )
             }
           >
             <Image source={closeIcon} />
           </TouchableOpacity>
         </RNAnimated.View>
-        {paymentState ? (
+        {paymentState && paymentState !== ResponseScreenStatuses.COMPLETE ? (
           <ResponseScreen
             status={paymentState}
             onPress={ctaOnPress}

diff --git a/payment_sdk/src/util/types.ts b/payment_sdk/src/util/types.ts
@@ -61,8 +61,12 @@ export enum TokenResponseStatuses {
 }
 
 export enum ResponseScreenStatuses {
+  /** When a payment is fully complete Displaying success screen immediately and disabling the cancel payment popup */
   SUCCESS = "success",
+  /** Displaying failed screen immediately */
   FAILED = "failed",
+  /** For displaying payment instruction screens and disabling the cancel payment popup */
+  COMPLETE = "complete",
 }
 
 export enum CurrencySign {
@@ -106,6 +110,9 @@ export type newNavStateProps = {
 export type SessionPayResponseType = {
   redirect_url: string;
   status: string;
+  payment: {
+    payment_details: { instructions_url: string };
+  };
 };
 
 export type sessionShowPaymentMethodType = {

diff --git a/payment_sdk/src/util/validator.ts b/payment_sdk/src/util/validator.ts
@@ -6,7 +6,7 @@ import {
   SessionShowResponseType,
 } from "./types";
 
-const MAX_CARD_LENGTH = 16;
+const MAX_CARD_LENGTH = 19;
 
 export const isCardNumberValid = (cardString: string) => {
   const text = cardString.replaceAll(" ", "");