Fixing issues on Identity and Subs blocks (#1808)

fixing issues on Identity and Subs blocks
WPMedia · Nov 27, 2023 · 14a1b74 · 14a1b74
1 parent d2e952e
commit 14a1b74
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 31 deletions.
diff --git 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
@@ -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
diff --git 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 (
 						<div className={`${className}__identity-row`}>
-							{/* {TO-DO: Change the Icon to Google <Icon name="Google"/> } */}
-							<Image alt="Google" title="Google" src={GoogleIcon} />
+							<Icon name="GoogleColor"/>
 							<span>
 								{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
@@ -29,7 +29,7 @@ const OfferCard = ({
 						className={`${className}__card--features--feature-item`}
 						key={`feat-${feat.featureText}`}
 					>
-						<Icon name="ChevronRight" />
+						<Icon name="Check" />
 						<span dangerouslySetInnerHTML={{ __html: feat.featureText }} />
 					</li>
 				))}

diff --git 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;