From a2e91ef326a74f3512a07114bf89aef35d84efee Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Tue, 19 Sep 2023 08:50:51 +0100
Subject: [PATCH 1/2] Removing email

---
 src/renderer/Web3AuthInstance.tsx  |   2 +-
 src/renderer/components/Wallet.tsx | 135 +----------------------------
 2 files changed, 2 insertions(+), 135 deletions(-)

diff --git a/src/renderer/Web3AuthInstance.tsx b/src/renderer/Web3AuthInstance.tsx
index fc93dbc..aea5c28 100644
--- a/src/renderer/Web3AuthInstance.tsx
+++ b/src/renderer/Web3AuthInstance.tsx
@@ -24,7 +24,7 @@ export const web3AuthInstance = new Web3Auth({
   web3AuthNetwork: 'cyan',
   // @ts-ignore
   chainConfig,
-  authMode: 'WALLET',
+  authMode: 'DAPP',
   uiConfig: {
     theme: 'light',
     appName: 'FLock Client',
diff --git a/src/renderer/components/Wallet.tsx b/src/renderer/components/Wallet.tsx
index 8b2640e..e251890 100644
--- a/src/renderer/components/Wallet.tsx
+++ b/src/renderer/components/Wallet.tsx
@@ -35,8 +35,6 @@ function Wallet() {
   const { disconnect: wagmiDisconnect } = useDisconnect();
   const { nativeTokenBalance, flockTokenBalance } = useContext(WalletContext);
   const [privateKey, setPrivateKey] = useState('');
-  const [userEmail, setUserEmail] = useState('');
-  const [showEmailImport, setShowEmailImport] = useState(false);
 
   const handleConnect = async () => {
     setIsWalletOpen(false);
@@ -53,66 +51,9 @@ function Wallet() {
       await connectAsync({
         connector: connectors[1],
       });
-    } catch (error) {
-      toast.error('Invalid private key');
-    }
-  };
-
-  const loadEmail = async () => {
-    try {
-      const res = await fetch(
-        `https://us-central1-flock-demo-design.cloudfunctions.net/getEmailFromDB?wallet=${address}`,
-        {
-          method: 'GET',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-        }
-      );
-
-      const { email } = await res.json();
-      if (email) {
-        setUserEmail(email);
-        setShowWalletImport(false);
-      } else {
-        setShowWalletImport(false);
-        setShowEmailImport(true);
-      }
-    } catch (error) {
       setShowWalletImport(false);
-    }
-  };
-
-  const importEmail = async () => {
-    try {
-      const response = await fetch(
-        'https://us-central1-flock-demo-design.cloudfunctions.net/postEmailToDB',
-        {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            email: userEmail,
-            wallet: address,
-          }),
-        }
-      );
-      if (response.ok) {
-        setShowEmailImport(false);
-      } else {
-        const data = await response.json();
-        console.log(data);
-        if (
-          data.error.includes(
-            'Unique constraint failed on the fields: (`email`)'
-          )
-        ) {
-          toast.error('Email already exists');
-        }
-      }
     } catch (error) {
-      console.error('Error importing email:', error);
+      toast.error('Invalid private key');
     }
   };
 
@@ -135,31 +76,6 @@ function Wallet() {
     oAuthAccessToken?: string;
   }
 
-  const loadUserInfo = async () => {
-    try {
-      if (pendingConnector?.id === 'web3auth') {
-        const user = await web3AuthInstance.getUserInfo();
-
-        await fetch(
-          'https://us-central1-flock-demo-design.cloudfunctions.net/postEmailToDB',
-          {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-              Authorization: `Bearer ${user.idToken}`,
-            },
-            body: JSON.stringify({
-              email: user.email,
-              wallet: address,
-            }),
-          }
-        );
-      }
-    } catch (error) {
-      console.error('Error loading user info:', error);
-    }
-  };
-
   const { data: dataTransfer, writeAsync: writeAsyncApprove } =
     useContractWrite({
       address: FLOCK_ADDRESS as `0x${string}`,
@@ -193,13 +109,6 @@ function Wallet() {
     }
   }, [isSuccessTransfer]);
 
-  useEffect(() => {
-    if (address) {
-      loadEmail();
-      loadUserInfo();
-    }
-  }, [address, isSuccess]);
-
   if (showWalletSettings) {
     return (
       <Layer onEsc={() => setShowWalletSettings(false)} full>
@@ -335,48 +244,6 @@ function Wallet() {
     );
   }
 
-  if (showEmailImport) {
-    return (
-      <Layer onEsc={() => setShowEmailImport(false)} full>
-        <Box
-          align="center"
-          justify="center"
-          height="100vh"
-          pad="large"
-          gap="medium"
-        >
-          <Heading level="3">Enter your email</Heading>
-          <Text>This email will be used for claiming OAT</Text>
-          <TextInput
-            value={userEmail}
-            onChange={(event) => setUserEmail(event.target.value)}
-          />
-          <Box direction="row" alignSelf="center" gap="small">
-            <Button
-              primary
-              label="Enter"
-              pad="xsmall"
-              disabled={!userEmail}
-              onClick={importEmail}
-            />
-          </Box>
-        </Box>
-        <ToastContainer
-          position="bottom-left"
-          autoClose={5000}
-          hideProgressBar={false}
-          newestOnTop
-          closeOnClick
-          rtl={false}
-          pauseOnFocusLoss
-          draggable
-          pauseOnHover
-          theme="light"
-        />
-      </Layer>
-    );
-  }
-
   return (
     <DropButton
       primary

From 8ab0360c19c8d38220623f845a285ca949ed3687 Mon Sep 17 00:00:00 2001
From: Vadzim Mahilny <magilnyy.vadimo@gmail.com>
Date: Tue, 19 Sep 2023 19:19:38 +0100
Subject: [PATCH 2/2] Disable external wallets

---
 src/renderer/Web3AuthInstance.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/Web3AuthInstance.tsx b/src/renderer/Web3AuthInstance.tsx
index aea5c28..fc93dbc 100644
--- a/src/renderer/Web3AuthInstance.tsx
+++ b/src/renderer/Web3AuthInstance.tsx
@@ -24,7 +24,7 @@ export const web3AuthInstance = new Web3Auth({
   web3AuthNetwork: 'cyan',
   // @ts-ignore
   chainConfig,
-  authMode: 'DAPP',
+  authMode: 'WALLET',
   uiConfig: {
     theme: 'light',
     appName: 'FLock Client',