Merge pull request #219 from aesirxio/develop

Deploy to master
aesirxio · Jul 12, 2024 · 87df9b5 · 87df9b5
2 parents 896c9f4 + d7d8418
commit 87df9b5
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "socket.io-client": "^4.7.2",
     "viem": "^1.0.0",
     "bowser": "^2.11.0",
-    "wagmi": "^1.4.13",
+    "wagmi": "^1.3.2",
     "yup": "^1.3.2"
   },
   "tsup": {

diff --git a/src/SSOButton/Providers/Concordium/sign.tsx b/src/SSOButton/Providers/Concordium/sign.tsx
@@ -116,8 +116,15 @@ const SignMessageConcordium = ({
       const nationality: string =
         accountInfo?.accountCredentials[0]?.value?.contents?.commitments?.cmmAttributes
           ?.nationality;
+      const countryOfResidence: string =
+        accountInfo?.accountCredentials[0]?.value?.contents?.commitments?.cmmAttributes
+          ?.countryOfResidence;
       if (!nationality) {
-        statement[0].attributeTag = 'countryOfResidence';
+        if (countryOfResidence) {
+          statement[0].attributeTag = 'countryOfResidence';
+        } else {
+          statement[0].attributeTag = 'idDocIssuer';
+        }
       }
       const proof = await provider.requestIdProof(account ?? '', statement, challenge);
       const re = await verifyProof(challenge, proof);

diff --git a/src/SSOButton/Providers/CreateAccount/index.tsx b/src/SSOButton/Providers/CreateAccount/index.tsx
@@ -58,6 +58,11 @@ const CreateAccount = ({
   isRequireEmail,
   hideDefaultProduct = false,
   isRequireConcordium = false,
+  alertButton = {
+    isShow: false,
+    handleClick: undefined,
+    alertWarning: undefined,
+  },
 }: any) => {
   const [sending, setSending] = useState(false);
   const [captcha, setCaptcha] = useState<any>();
@@ -428,8 +433,15 @@ const CreateAccount = ({
       const nationality: string =
         accountInfo?.accountCredentials[0]?.value?.contents?.commitments?.cmmAttributes
           ?.nationality;
+      const countryOfResidence: string =
+        accountInfo?.accountCredentials[0]?.value?.contents?.commitments?.cmmAttributes
+          ?.countryOfResidence;
       if (!nationality) {
-        statement[0].attributeTag = 'countryOfResidence';
+        if (countryOfResidence) {
+          statement[0].attributeTag = 'countryOfResidence';
+        } else {
+          statement[0].attributeTag = 'idDocIssuer';
+        }
       }
       const proof = await provider.requestIdProof(
         walletState?.accountAddress ?? '',
@@ -595,7 +607,10 @@ const CreateAccount = ({
                 );
               })}
             </Row>
-            <p className="fst-italic mb-3 fs-7">Disclaimer : The ID @Username is public</p>
+            <p className="fst-italic mb-3 fs-7">
+              Disclaimer: The ID @Username is public and helps anonymize and pseudonymize data to
+              protect your privacy.
+            </p>
             <Form.Check className="mb-10px fs-7" type="checkbox" id="check-subsribe">
               <Form.Check.Input type="checkbox" required />
               <Form.Check.Label>
@@ -685,6 +700,14 @@ const CreateAccount = ({
                     >
                       {sending ? 'Sending' : 'Send inquiry'}
                     </Button>
+                  ) : alertButton?.isShow && alertButton?.handleClick ? (
+                    <Button
+                      onClick={alertButton?.handleClick}
+                      variant="success"
+                      className="fw-semibold text-white px-4 py-13px lh-sm w-100"
+                    >
+                      Send inquiry
+                    </Button>
                   ) : (
                     <div key={product?.sku}>
                       <Button
@@ -728,6 +751,7 @@ const CreateAccount = ({
                       </Button>
                     </div>
                   )}
+                  {alertButton?.alertWarning && alertButton?.alertWarning}
                 </>
               )}
             </div>

diff --git a/src/SSOConfig/index.tsx b/src/SSOConfig/index.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { Col, Row } from 'react-bootstrap';
 import Concordium from './Concordium';
 import { useUserContext, UserContextProvider } from '../SSOButton/Providers/user';
-import MetaMask from './MetaMask';
 import { useGlobalContext, GlobalContextProvider } from '../SSOButton/Providers/global';
 import { connectWallet, removeWallet } from '../utils/index';
 import DeleteModal from './DeleteModal';
@@ -13,6 +12,7 @@ import Social from './Social';
 import Web3ContextProvider from '../SSOButton/Providers/web3';
 import { Spinner } from '../components/Spinner';
 import { notify } from '../components/Toast';
+const MetaMask = React.lazy(() => import('./MetaMask'));
 
 const SSO = () => {
   return (