From 0505a1eded9e259870a2fed8f97452dca73d8f2f Mon Sep 17 00:00:00 2001
From: lza_menace <lza_menace@protonmail.com>
Date: Sun, 2 Jan 2022 21:04:59 -0800
Subject: [PATCH] rework some javascript bits

---
 suchwowx/static/js/main.js               | 48 -----------------
 suchwowx/static/js/metamask.js           |  7 ++-
 suchwowx/templates/includes/scripts.html |  4 +-
 suchwowx/templates/includes/web3.html    | 69 ++++++++++++++++++++++++
 suchwowx/templates/meme.html             |  1 -
 suchwowx/templates/profile.html          |  2 +-
 6 files changed, 79 insertions(+), 52 deletions(-)

diff --git a/suchwowx/static/js/main.js b/suchwowx/static/js/main.js
index 992760e..e46f41c 100644
--- a/suchwowx/static/js/main.js
+++ b/suchwowx/static/js/main.js
@@ -8,51 +8,3 @@ async function notif(s, t) {
   }).show();
   return
 }
-
-async function confirmAvalanche(){
-  let debug = true;
-  let chainId;
-  let rpcUrl;
-  let explorerUrl;
-  let name;
-  if (debug) {
-    name = 'Avalance Testnet';
-    chainId = '0xA869';
-    rpcUrl = 'https://api.avax-test.network/ext/bc/C/rpc';
-    explorerUrl = 'https://testnet.snowtrace.io';
-  } else {
-    name = 'Avalanche Mainnet';
-    chainId = '0xA86A';
-    rpcUrl = 'https://api.avax.network/ext/bc/C/rpc';
-    explorerUrl = 'https://snowtrace.io';
-  }
-  try {
-    await ethereum.request({
-      method: 'wallet_switchEthereumChain',
-      params: [{ chainId: chainId }],
-    });
-  } catch (switchError) {
-    // This error code indicates that the chain has not been added to MetaMask.
-    if (switchError.code === 4902) {
-      try {
-        await ethereum.request({
-          method: 'wallet_addEthereumChain',
-          params: [{
-            chainId: chainId,
-            chainName: name,
-            nativeCurrency: {
-              name: 'Avalanche',
-              symbol: 'AVAX',
-              decimals: 18,
-            },
-            rpcUrls: [rpcUrl],
-            blockExplorerUrls: [explorerUrl],
-          }],
-        });
-      } catch (addError) {
-        // handle "add" error
-      }
-    }
-    // handle other "switch" errors
-  }
-}
diff --git a/suchwowx/static/js/metamask.js b/suchwowx/static/js/metamask.js
index 6f0beb8..901bcc1 100644
--- a/suchwowx/static/js/metamask.js
+++ b/suchwowx/static/js/metamask.js
@@ -30,10 +30,11 @@ async function onboardMetaMask(){
       onboarding.stopOnboarding();
     } else {
       onboardButton.onclick = async () => {
+        try {
         onboardButton.classList.add('is-loading');
         onboardButton.disabled = true;
         let userExists;
-        await confirmAvalanche();
+        await addAvalancheNetwork();
         const allAccounts = await window.ethereum.request({
           method: 'eth_requestAccounts',
         });
@@ -74,7 +75,11 @@ async function onboardMetaMask(){
                 window.location.href = '/';
               }
           })
+        } catch(e) {
+          console.log(e);
+          onboardButton.classList.remove('is-loading');
         }
+      }
     }
   };
 
diff --git a/suchwowx/templates/includes/scripts.html b/suchwowx/templates/includes/scripts.html
index af6439d..7edc457 100644
--- a/suchwowx/templates/includes/scripts.html
+++ b/suchwowx/templates/includes/scripts.html
@@ -1,5 +1,6 @@
-<script src="/static/js/vendor/noty-3.2.0.js"></script>
+
 <script src="/static/js/main.js"></script>
+{% include 'includes/web3.html' %}
 {% if not current_user.is_authenticated %}
 <script src="/static/js/vendor/metamask-onboarding-1.0.1.bundle.js"></script>
 <script src="/static/js/metamask.js"></script>
@@ -7,6 +8,7 @@
 
 {% with messages = get_flashed_messages(with_categories=true) %}
   {% if messages %}
+  <script src="/static/js/vendor/noty-3.2.0.js"></script>
   <script type="text/javascript">
     {% for category, message in messages %}
       {% if category == None %}{% set category = 'info' %}{% endif %}
diff --git a/suchwowx/templates/includes/web3.html b/suchwowx/templates/includes/web3.html
index 30a37ad..5d86631 100644
--- a/suchwowx/templates/includes/web3.html
+++ b/suchwowx/templates/includes/web3.html
@@ -13,6 +13,75 @@
     return account
   }
 
+  async function addWOWX() {
+    let tokenAddress;
+    if ('{{ config.CONTRACT_TESTNET }}' == 'True') {
+      tokenAddress = '0xc6B039b1e0be1ba0B433f319898438E782E5dEBA';
+    } else {
+      tokenAddress = '0xba5dc7e77d150816b758e9826fcad2d74820e379';
+    }
+    try {
+      await ethereum.request({
+        method: 'wallet_watchAsset',
+        params: {
+          type: 'ERC20',
+          options: {
+            address: tokenAddress.toLowerCase(),
+            symbol: 'WOWX',
+            decimals: 18,
+            image: 'https://github.com/wownerox/meta/raw/main/logo.png'
+          }
+        },
+      });
+    } catch(e) {
+      console.log(e);
+    }
+  }
+
+  async function addAvalancheNetwork(){
+    let chainId, rpcUrl, explorerUrl, name;
+    if ('{{ config.CONTRACT_TESTNET }}' == 'True') {
+      name = 'Avalanche Testnet';
+      chainId = '0xA869';
+      rpcUrl = 'https://api.avax-test.network/ext/bc/C/rpc';
+      explorerUrl = 'https://testnet.snowtrace.io';
+    } else {
+      name = 'Avalanche Mainnet';
+      chainId = '0xA86A';
+      rpcUrl = 'https://api.avax.network/ext/bc/C/rpc';
+      explorerUrl = 'https://snowtrace.io';
+    }
+    try {
+      await ethereum.request({
+        method: 'wallet_switchEthereumChain',
+        params: [{ chainId: chainId }],
+      });
+    } catch (switchError) {
+      // This error code indicates that the chain has not been added to MetaMask.
+      if (switchError.code === 4902) {
+        try {
+          await ethereum.request({
+            method: 'wallet_addEthereumChain',
+            params: [{
+              chainId: chainId,
+              chainName: name,
+              nativeCurrency: {
+                name: 'Avalanche',
+                symbol: 'AVAX',
+                decimals: 18,
+              },
+              rpcUrls: [rpcUrl],
+              blockExplorerUrls: [explorerUrl],
+            }],
+          });
+        } catch (addError) {
+          // handle "add" error
+        }
+      }
+      // handle other "switch" errors
+    }
+  }
+
   async function getTokenID(ipfsHash) {
     if (ipfsHash != '') {
       const tokenId = await contract.methods.metadataTokenId(ipfsHash).call();
diff --git a/suchwowx/templates/meme.html b/suchwowx/templates/meme.html
index 522a1d3..1bec73e 100644
--- a/suchwowx/templates/meme.html
+++ b/suchwowx/templates/meme.html
@@ -94,7 +94,6 @@
   </section>
   {% include 'includes/footer.html' %}
   {% if meme.approved %}
-  {% include 'includes/web3.html' %}
   <script type="text/javascript">
     window.addEventListener('DOMContentLoaded', async () => {
       let minted = await isMinted('{{ meme.meta_ipfs_hash }}');
diff --git a/suchwowx/templates/profile.html b/suchwowx/templates/profile.html
index 01c2ea1..a436f63 100644
--- a/suchwowx/templates/profile.html
+++ b/suchwowx/templates/profile.html
@@ -70,7 +70,7 @@
     </div>
   </section>
   {% include 'includes/footer.html' %}
-  {% include 'includes/web3.html' %}
+  
   <script type="text/javascript">
     async function saveDB() {
       await fetch('{{ url_for("api.update_user"	) }}', {