fix: pr changes

jwplayer · Jun 16, 2023 · 935748a · 935748a
1 parent ab610b9
commit 935748a
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 5 deletions.
diff --git a/public/locales/en/account.json b/public/locales/en/account.json
@@ -8,8 +8,8 @@
   },
   "checkout": {
     "applicable_tax": "Applicable tax ({{taxRate}}%)",
+    "card_holder_name": "Cardholder name",
     "close": "Close",
-    "save": "Save",
     "continue": "Continue",
     "coupon_applied": "Your coupon code has been applied",
     "coupon_discount": "Coupon discount",
@@ -37,6 +37,7 @@
     "periods_trial_one": "You will be charged after one {{period}}.",
     "periods_trial_other": "You will be charged after {{count}} {{period}}.",
     "redeem_coupon": "Redeem coupon",
+    "save": "Save",
     "start_watching": "Start watching ({{countdown}})",
     "total_price": "Total",
     "upgrade_error": "Failed to update subscription!",
@@ -95,6 +96,7 @@
   "payment": {
     "back_to_profile": "Back to profile",
     "credit_card": "Credit card",
+    "edit_card": "Edit card",
     "paypal": "PayPal",
     "update_payment_details": "Update payment details",
     "update_payment_success": "Your payment details have been updated"

diff --git a/public/locales/en/user.json b/public/locales/en/user.json
@@ -65,6 +65,7 @@
   },
   "payment": {
     "access_granted": "access granted",
+    "add_card_details": "Add card details",
     "annual_subscription": "Annual subscription",
     "cancel_subscription": "Cancel subscription",
     "card_number": "Card number",

diff --git a/public/locales/es/account.json b/public/locales/es/account.json
@@ -8,6 +8,7 @@
   },
   "checkout": {
     "applicable_tax": "Impuesto aplicable ({{taxRate}}%)",
+    "card_holder_name": "Nombre del titular de la tarjeta",
     "close": "Cerrar",
     "continue": "Continuar",
     "coupon_applied": "Se ha aplicado tu código de cupón",
@@ -39,6 +40,7 @@
     "periods_trial_many": "",
     "periods_trial_other": "Se te cobrará después de {{count}} {{period}}.",
     "redeem_coupon": "Canjear cupón",
+    "save": "Ahorrar",
     "start_watching": "Comenzar a ver ({{countdown}})",
     "total_price": "Total",
     "upgrade_error": "No se pudo actualizar la suscripción!",
@@ -100,6 +102,7 @@
   "payment": {
     "back_to_profile": "Volver al perfil",
     "credit_card": "Credit card",
+    "edit_card": "Editar tarjeta",
     "paypal": "PayPal",
     "update_payment_details": "Actualizar detalles de pago",
     "update_payment_success": "Sus detalles de pago han sido actualizados"

diff --git a/public/locales/es/user.json b/public/locales/es/user.json
@@ -65,6 +65,7 @@
   },
   "payment": {
     "access_granted": "acceso concedido",
+    "add_card_details": "Agregar detalles de la tarjeta",
     "annual_subscription": "Suscripción anual",
     "cancel_subscription": "Cancelar suscripción",
     "card_number": "Número de tarjeta",

diff --git a/src/components/EditCardPaymentForm/EditCardPaymentForm.tsx b/src/components/EditCardPaymentForm/EditCardPaymentForm.tsx
@@ -77,7 +77,7 @@ const EditCardPaymentForm: React.FC<Props> = ({ onCancel, setUpdatingCardDetails
     <div className={styles.paymentForm}>
       <div>
         <TextField
-          label="Cardholder name"
+          label={t('checkout.card_holder_name')}
           name="cardholderName"
           value={paymentData?.values?.cardholderName}
           onChange={paymentData?.handleChange}

diff --git a/src/components/EditForm/EditCardDetailsForm.tsx b/src/components/EditForm/EditCardDetailsForm.tsx
@@ -18,7 +18,7 @@ const EditCardDetailsForm: React.FC<Props> = ({ renderPaymentMethod, submitting,
   return (
     <div>
       <div className={styles.title}>
-        <h1>t('user:payments.add_card_details')</h1>
+        <h1>{t('user:payment.add_card_details')}</h1>
       </div>
       <div>{renderPaymentMethod ? renderPaymentMethod() : null}</div>
       <Button onClick={onCancel} className={styles.cancelButton} fullWidth label={t('common:confirmation_dialog.close')} />

diff --git a/src/components/PaymentForm/PaymentForm.tsx b/src/components/PaymentForm/PaymentForm.tsx
@@ -63,7 +63,7 @@ const PaymentForm: React.FC<Props> = ({ couponCode, setUpdatingOrder }) => {
     <div className={styles.paymentForm}>
       <div>
         <TextField
-          label="Cardholder name"
+          label={t('checkout.card_holder_name')}
           name="cardholderName"
           value={paymentData?.values?.cardholderName}
           onChange={paymentData?.handleChange}

diff --git a/src/stores/AccountController.ts b/src/stores/AccountController.ts
@@ -375,7 +375,6 @@ export const updateCardDetails = async ({
     return await useService(async ({ subscriptionService, sandbox = true }) => {
       const response = await subscriptionService?.updateCardDetails({ cardName, cardNumber, cvc, expMonth, expYear, currency }, sandbox);
       const activePayment = (await subscriptionService?.getActivePayment({ sandbox, customerId })) || null;
-      useAccountStore.setState({ loading: true });
       useAccountStore.setState({
         loading: false,
         activePayment,