diff --git a/blocks/identity-block/components/social-sign-on/utils/useSocialSignIn.js b/blocks/identity-block/components/social-sign-on/utils/useSocialSignIn.js index 23c885edd8..ac00d1312f 100644 --- a/blocks/identity-block/components/social-sign-on/utils/useSocialSignIn.js +++ b/blocks/identity-block/components/social-sign-on/utils/useSocialSignIn.js @@ -47,6 +47,9 @@ function useSocialSignIn(redirectURL, onError = () => {}, isOIDC) { Identity.signInWithGoogle(credentialResponse).then(() => { if (isOIDC) { loginByOIDC(); + } else { + const validatedURL = validateURL(redirectURL); + window.location = validatedURL; } }), auto_select: true, diff --git a/blocks/identity-block/features/login/default.jsx b/blocks/identity-block/features/login/default.jsx index 7780ceadaf..9d47f717eb 100644 --- a/blocks/identity-block/features/login/default.jsx +++ b/blocks/identity-block/features/login/default.jsx @@ -50,7 +50,7 @@ const Login = ({ customFields }) => { loginByOIDC(); } else { const validatedURL = validateURL(loginRedirect); - window.location = validateURL; + window.location = validatedURL; } }) .catch(() => setError(phrases.t("identity-block.login-form-error"))) diff --git a/blocks/subscriptions-block/components/ContactInfo/google.svg b/blocks/subscriptions-block/components/ContactInfo/google.svg deleted file mode 100644 index b917237b3c..0000000000 --- a/blocks/subscriptions-block/components/ContactInfo/google.svg +++ /dev/null @@ -1,26 +0,0 @@ - - Google - - - - - - diff --git a/blocks/subscriptions-block/components/ContactInfo/index.jsx b/blocks/subscriptions-block/components/ContactInfo/index.jsx index c31a729268..384ce4c365 100644 --- a/blocks/subscriptions-block/components/ContactInfo/index.jsx +++ b/blocks/subscriptions-block/components/ContactInfo/index.jsx @@ -2,7 +2,6 @@ import React, { useRef } from "react"; import { usePhrases, Heading, Input, Button, Stack, Image, Icon } from "@wpmedia/arc-themes-components"; import countryCodes from "./countryCodes"; -import GoogleIcon from "./google.svg"; const ContactInfo = ({ callback, user, signedInIdentity, logoutCallback, className }) => { const formRef = useRef(); @@ -50,8 +49,7 @@ const ContactInfo = ({ callback, user, signedInIdentity, logoutCallback, classNa case "google": return (
- {/* {TO-DO: Change the Icon to Google } */} - Google + {phrases.t("checkout-block.identity-social", { email: user.email, diff --git a/blocks/subscriptions-block/components/OfferCard/index.jsx b/blocks/subscriptions-block/components/OfferCard/index.jsx index b9560cd448..7cd4adb89d 100644 --- a/blocks/subscriptions-block/components/OfferCard/index.jsx +++ b/blocks/subscriptions-block/components/OfferCard/index.jsx @@ -29,7 +29,7 @@ const OfferCard = ({ className={`${className}__card--features--feature-item`} key={`feat-${feat.featureText}`} > - + ))} diff --git a/blocks/subscriptions-block/utils/currency.js b/blocks/subscriptions-block/utils/currency.js index 841f4bebaa..73d4858efd 100644 --- a/blocks/subscriptions-block/utils/currency.js +++ b/blocks/subscriptions-block/utils/currency.js @@ -9,6 +9,8 @@ const CURRECY_MAP = { KRW: "₩", MXN: "$", BRL: "R$", + CAD: "CA$", + GBP: "£" }; const currency = (name) => CURRECY_MAP[name] || null;