Merge branch 'release' into development

# Conflicts:
#	src/pages/shop/product/variant/[slug].jsx

1 files changed, 15 insertions, 0 deletions

diff --git a/src-migrate/components/ui/re-captcha.tsx b/src-migrate/components/ui/re-captcha.tsx
new file mode 100644
index 00000000..e31aa1e3
--- /dev/null
+++ b/src-migrate/components/ui/re-captcha.tsx
@@ -0,0 +1,15 @@
+import ReCAPTCHA, { ReCAPTCHAProps } from "react-google-recaptcha"
+
+const GOOGLE_RECAPTCHA_KEY = process.env.NEXT_PUBLIC_RECAPTCHA_GOOGLE || ''
+
+export interface ReCaptchaProps extends Omit<ReCAPTCHAProps, 'sitekey'> {
+  sitekey?: string;
+}
+
+export const ReCaptcha = (props: ReCaptchaProps) => {
+  const { sitekey, ...rest } = props
+
+  return (
+    <ReCAPTCHA sitekey={sitekey || GOOGLE_RECAPTCHA_KEY} {...rest} />
+  )
+}