Merge branch 'master' into development_tri/implementasi_raja_ongkir

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx

1 files changed, 9 insertions, 5 deletions

diff --git a/src/lib/auth/components/RegisterDesktop.jsx b/src/lib/auth/components/RegisterDesktop.jsx
index 482a9ce3..f624fba7 100644
--- a/src/lib/auth/components/RegisterDesktop.jsx
+++ b/src/lib/auth/components/RegisterDesktop.jsx
@@ -4,6 +4,7 @@ import Link from '@/core/components/elements/Link/Link'
 import Alert from '@/core/components/elements/Alert/Alert'
 import PageContent from '@/lib/content/components/PageContent'
 import BottomPopup from '@/core/components/elements/Popup/BottomPopup'
+import ReCAPTCHA from 'react-google-recaptcha'
 
 const RegisterDesktop = () => {
   const {
@@ -16,6 +17,7 @@ const RegisterDesktop = () => {
     fullnameRef,
     emailRef,
     passwordRef,
+    recaptchaRef,
     tnd,
     setTnd
   } = useRegister()
@@ -89,6 +91,7 @@ const RegisterDesktop = () => {
                   placeholder='••••••••••••'
                 />
               </div>
+              <ReCAPTCHA ref={recaptchaRef} sitekey={process.env.NEXT_PUBLIC_RECAPTCHA_GOOGLE} />
               <div class='flex items-center mt-4 '>
                 <input
                   type='checkbox'
@@ -96,11 +99,12 @@ const RegisterDesktop = () => {
                   className='form-input flex items-start w-fit mr-2'
                   required
                 />
-                <label
-                  onClick={() => setTnd(true)}
-                  className='inline cursor-pointer text-danger-500'
-                >
-                  Syarat dan Ketentuan
+                <label className='inline'>
+                  Dengan ini saya menyetujui{' '}
+                  <span onClick={() => setTnd(true)} className='cursor-pointer text-danger-500'>
+                    syarat dan ketentuan
+                  </span>{' '}
+                  yang berlaku
                 </label>
               </div>
               <button