Payments add card update with setup intent

packages/files-ui/package.json

@@ -6,12 +6,14 @@
     "@babel/core": "^7.12.10",
     "@babel/runtime": "^7.0.0",
     "@chainsafe/browser-storage-hooks": "^1.0.1",
-    "@chainsafe/files-api-client": "^1.18.5",
+    "@chainsafe/files-api-client": "^1.18.9",
     "@chainsafe/web3-context": "1.1.4",
     "@lingui/core": "^3.7.2",
     "@lingui/react": "^3.7.2",
     "@material-ui/core": "^4.12.3",
     "@sentry/react": "^5.28.0",
+    "@stripe/react-stripe-js": "^1.4.1",
+    "@stripe/stripe-js": "^1.18.0",
     "@tkey/default": "3.12.0",
     "@tkey/security-questions": "3.12.0",
     "@tkey/web-storage": "3.12.0",

packages/files-ui/src/Components/Modules/Settings/ProfileTab/index.tsx

@@ -216,7 +216,7 @@ const ProfileView = () => {
       await updateProfile(firstName, lastName)
       addToast({ title: t`Profile updated`, type: "success" })
       setUpdatingProfile(false)
-    } catch (error) {
+    } catch (error: any) {
       addToast({ title: error, type: "error" })
       setUpdatingProfile(false)
     }

packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/AddCardModal.tsx

@@ -1,16 +1,17 @@
-import { Button, Grid, TextInput, Typography, useToasts } from "@chainsafe/common-components"
-import { createStyles, makeStyles } from "@chainsafe/common-theme"
-import React, { useState, useCallback } from "react"
+import React, { useState } from "react"
+import { Button, Grid, Typography, useToasts } from "@chainsafe/common-components"
+import { createStyles, makeStyles, useTheme } from "@chainsafe/common-theme"
 import { CSFTheme } from "../../../../Themes/types"
 import CustomModal from "../../../Elements/CustomModal"
 import CustomButton from "../../../Elements/CustomButton"
-import { t, Trans } from "@lingui/macro"
-import CardInputs from "../../../Elements/CardInputs"
-import { getCardNumberError, getCVCError, getExpiryDateError } from "../../../Elements/CardInputs/utils/validator"
+import { Trans } from "@lingui/macro"
+import { useStripe, useElements, CardNumberElement, CardExpiryElement, CardCvcElement } from "@stripe/react-stripe-js"
+import { useFilesApi } from "../../../../Contexts/FilesApiContext"
 import { useBilling } from "../../../../Contexts/BillingContext"
+import clsx from "clsx"
 
 const useStyles = makeStyles(
-  ({ breakpoints, constants, typography, zIndex }: CSFTheme) => {
+  ({ breakpoints, constants, typography, zIndex, palette, animation }: CSFTheme) => {
     return createStyles({
       root: {
         padding: constants.generalUnit * 4,
@@ -55,71 +56,104 @@ const useStyles = makeStyles(
       },
       footer: {
         marginTop: constants.generalUnit * 4
+      },
+      cardNumberInputs: {
+        marginBottom: constants.generalUnit * 2,
+        [breakpoints.down("md")]: {
+          marginBottom: constants.generalUnit * 2
+        }
+      },
+      cardInputs: {
+        border: `1px solid ${palette.additional["gray"][6]}`,
+        borderRadius: 2,
+        padding: constants.generalUnit * 1.5,
+        transitionDuration: `${animation.transform}ms`,
+        "&:hover": {
+          borderColor: palette.primary.border
+        }
+      },
+      cardInputsFocus: {
+        borderColor: palette.primary.border,
+        boxShadow: constants.addCard.shadow
+      },
+      expiryCvcContainer: {
+        display: "grid",
+        gridTemplateColumns: "1fr 1fr",
+        marginTop: constants.generalUnit,
+        gridColumnGap: constants.generalUnit,
+        [breakpoints.down("md")]: {
+          gridTemplateColumns: "1fr",
+          gridRowGap: constants.generalUnit * 2
+        }
+      },
+      error: {
+        marginTop: constants.generalUnit * 2,
+        color: palette.error.main
       }
     })
   }
 )
 
-interface ICreateFolderModalProps {
+interface IAddCardModalProps {
   isModalOpen: boolean
   onClose: () => void
 }
 
-const CreateFolderModal = ({ isModalOpen, onClose }: ICreateFolderModalProps) => {
+const AddCardModal = ({ isModalOpen, onClose }: IAddCardModalProps) => {
   const classes = useStyles()
-  const [cardInputs, setCardInputs] = useState({
-    cardNumber: "",
-    cardExpiry: "",
-    cardCvc: ""
-  })
-  const [cardName, setCardName] = useState("")
-  const [error, setError] = useState("")
-  const [loading, setLoading] = useState(false)
-  const { addCard, getCardTokenFromStripe } = useBilling()
+  const stripe = useStripe()
+  const elements = useElements()
   const { addToast } = useToasts()
+  const { filesApiClient } = useFilesApi()
+  const { refreshDefaultCard } = useBilling()
+  const [focusElement, setFocusElement] = useState<"number" | "expiry" | "cvc" | undefined>(undefined)
+  const [isInputError, setInputError] = useState(false)
+  const theme: CSFTheme = useTheme()
 
-  const onCloseModal = useCallback(() => {
-    setCardInputs({ cardNumber: "", cardExpiry: "", cardCvc: "" })
-    setCardName("")
-    setError("")
+  const [loadingPaymentMethodAdd, setLoadingPaymentMethodAdd] = useState(false)
+
+  const handlePaymentError = (error: any) => {
+    console.error(error)
     onClose()
-  }, [onClose])
+    setLoadingPaymentMethodAdd(false)
+    addToast({ title: "Failed to add payment method", type: "error" })
+  }
 
-  const onSubmitCard = useCallback((e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault()
-    const error = !cardName
-      ? t`Name on card is required`
-      : getCardNumberError(cardInputs.cardNumber) ||
-      getExpiryDateError(cardInputs.cardExpiry) ||
-      getCVCError(cardInputs.cardCvc, cardInputs.cardNumber)
+  const handleSubmitPaymentMethod = async (event: any) => {
+    event.preventDefault()
+    if (!stripe || !elements) return
+    try {
+      const cardNumberElement = elements.getElement(CardNumberElement)
+      if (!cardNumberElement) return
 
-    if (error) {
-      setError(error)
-      return
-    }
-    setError("")
+      setLoadingPaymentMethodAdd(true)
+      const { error, paymentMethod } = await stripe.createPaymentMethod({
+        type: "card",
+        card: cardNumberElement
+      })
 
-    setLoading(true)
-    // get token from stripe
-    getCardTokenFromStripe(cardInputs).then((resp) => {
-      // send stripe token to API
-      addCard(resp.data.id)
-        .then(() => {
-          onCloseModal()
-          addToast({
-            title: t`Card added successfully`,
-            type: "success"
-          })
-        }).catch((e) => {
-          setError(t`Something went wrong, please try again`)
-          console.error(e)
-        }).finally(() => setLoading(false))
-    }).catch((err) => {
-      console.error(err)
-      setError(t`Card details could not be validated`)
-      setLoading(false)
-    })
-  }, [cardName, cardInputs, getCardTokenFromStripe, addCard, onCloseModal, addToast])
+      if (error || !paymentMethod) {
+        setInputError(true)
+        return
+      }
+
+      const setupIntent = await filesApiClient.createSetupIntent()
+      const setupIntentResult = await stripe.confirmCardSetup(setupIntent.secret, {
+        payment_method: paymentMethod.id
+      })
+
+      if (setupIntentResult.error || !setupIntentResult.setupIntent) {
+        handlePaymentError(setupIntentResult.error)
+        return
+      }
+      refreshDefaultCard()
+      onClose()
+      setLoadingPaymentMethodAdd(false)
+      addToast({ title: "Payment method added", type: "success" })
+    } catch (error) {
+      handlePaymentError(error)
+    }
+  }
 
   return (
     <CustomModal
@@ -131,7 +165,7 @@ const CreateFolderModal = ({ isModalOpen, onClose }: ICreateFolderModalProps) =>
       closePosition="none"
       maxWidth="sm"
     >
-      <form onSubmit={onSubmitCard}>
+      <form onSubmit={handleSubmitPaymentMethod}>
         <div
           className={classes.root}
           data-cy="modal-create-folder"
@@ -149,30 +183,57 @@ const CreateFolderModal = ({ isModalOpen, onClose }: ICreateFolderModalProps) =>
               <Trans>Add a credit card</Trans>
             </Typography>
           </Grid>
-          <Grid
-            item
-            xs={12}
-            sm={12}
-          >
-            <TextInput
-              value={cardName}
-              onChange={(val) =>
-                setCardName(val?.toString() || "")
+          <CardNumberElement
+            className={clsx(
+              classes.cardInputs,
+              classes.cardNumberInputs,
+              focusElement === "number" && classes.cardInputsFocus
+            )}
+            options={{ showIcon: true, style: {
+              base: {
+                color: theme.constants.addCard.color
               }
-              size="large"
-              placeholder={t`Name on card`}
-              label={t`Name on card`}
+            } }}
+            onFocus={() => setFocusElement("number")}
+            onBlur={() => setFocusElement(undefined)}
+          />
+          <div className={classes.expiryCvcContainer}>
+            <CardExpiryElement
+              className={clsx(
+                classes.cardInputs,
+                focusElement === "expiry" && classes.cardInputsFocus
+              )}
+              onFocus={() => setFocusElement("expiry")}
+              onBlur={() => setFocusElement(undefined)}
+              options={{ style: {
+                base: {
+                  color: theme.constants.addCard.color
+                }
+              } }}
             />
-            <CardInputs
-              cardNumber={cardInputs.cardNumber}
-              cardExpiry={cardInputs.cardExpiry}
-              cardCvc={cardInputs.cardCvc}
-              handleChangeCardNumber={(value) => setCardInputs({ ...cardInputs, cardNumber: value })}
-              handleChangeCardExpiry={(value) => setCardInputs({ ...cardInputs, cardExpiry: value })}
-              handleChangeCardCvc={(value) => setCardInputs({ ...cardInputs, cardCvc: value })}
-              error={error}
+            <CardCvcElement
+              className={clsx(
+                classes.cardInputs,
+                focusElement === "cvc" && classes.cardInputsFocus
+              )}
+              onFocus={() => setFocusElement("cvc")}
+              onBlur={() => setFocusElement(undefined)}
+              options={{ style: {
+                base: {
+                  color: theme.constants.addCard.color
+                }
+              } }}
             />
-          </Grid>
+          </div>
+          {isInputError &&
+            <Typography
+              component="p"
+              variant="body1"
+              className={classes.error}
+            >
+              <Trans>Card inputs could not be validated</Trans>
+            </Typography>
+          }
           <Grid
             item
             flexDirection="row"
@@ -181,12 +242,12 @@ const CreateFolderModal = ({ isModalOpen, onClose }: ICreateFolderModalProps) =>
           >
             <CustomButton
               data-cy="button-cancel-create-folder"
-              onClick={onCloseModal}
+              onClick={onClose}
               size="medium"
               className={classes.cancelButton}
               variant="outline"
               type="button"
-              disabled={loading}
+              disabled={loadingPaymentMethodAdd}
             >
               <Trans>Cancel</Trans>
             </CustomButton>
@@ -196,8 +257,8 @@ const CreateFolderModal = ({ isModalOpen, onClose }: ICreateFolderModalProps) =>
               variant="primary"
               type="submit"
               className={classes.okButton}
-              loading={loading}
-              disabled={loading}
+              loading={loadingPaymentMethodAdd}
+              disabled={loadingPaymentMethodAdd || isInputError}
             >
               <Trans>Add card</Trans>
             </Button>
@@ -208,4 +269,4 @@ const CreateFolderModal = ({ isModalOpen, onClose }: ICreateFolderModalProps) =>
   )
 }
 
-export default CreateFolderModal
+export default AddCardModal

packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/index.tsx

@@ -4,6 +4,8 @@ import CurrentCard from "./CurrentCard"
 import { Divider, Typography } from "@chainsafe/common-components"
 import { makeStyles, createStyles, ITheme } from "@chainsafe/common-theme"
 import { Trans } from "@lingui/macro"
+import { Elements } from "@stripe/react-stripe-js"
+import { loadStripe } from "@stripe/stripe-js"
 
 const useStyles = makeStyles(({ constants }: ITheme) =>
   createStyles({
@@ -13,22 +15,26 @@ const useStyles = makeStyles(({ constants }: ITheme) =>
   })
 )
 
+const stripePromise = loadStripe(process.env.REACT_APP_STRIPE_PK || "")
+
 const PlanView: React.FC = () => {
   const classes = useStyles()
 
   return (
-    <div>
-      <Typography
-        variant="h3"
-        component="h3"
-        className={classes.heading}
-      >
-        <Trans>Payment and Subscriptions</Trans>
-      </Typography>
-      <Divider />
-      <CurrentProduct />
-      <CurrentCard />
-    </div>
+    <Elements stripe={stripePromise}>
+      <div>
+        <Typography
+          variant="h3"
+          component="h3"
+          className={classes.heading}
+        >
+          <Trans>Payment and Subscriptions</Trans>
+        </Typography>
+        <Divider />
+        <CurrentProduct />
+        <CurrentCard />
+      </div>
+    </Elements>
   )
 }