res: merge conflict

hack3r-0m · Sep 15, 2021 · e7046bb · e7046bb
2 parents f65fb9e + 684f34e
commit e7046bb
Show file tree

Hide file tree

Showing 6 changed files with 1,426 additions and 372 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,4 @@
-[![Netlify Status](https://api.netlify.com/api/v1/badges/724754ea-953f-4f6e-b502-4c64e1c0e474/deploy-status)](https://app.netlify.com/sites/polygon-nft-minter/deploys)
-
-<p align="center"><img src="public/logo.svg" align="center" width="250"></p>
+<p align="center"><img src="client/public/logo.svg" align="center" width="250"></p>
 <h2 align="center">NFT Minter</h2>
 
 <p align="center"><b>🏗️ Mint ERC721 or ERC1155 standard tokens on Polygon (Previously Matic Network)</b></p>

diff --git a/client/components/ConnectWallet.jsx b/client/components/ConnectWallet.jsx
@@ -76,7 +76,7 @@ const ConnectWallet = ({
       const externalProvider = await web3Modal.connect();
 
       const biconomy = new Biconomy(
-        new Web3.providers.HttpProvider("https://rpc-mainnet.maticvigil.com"),
+        new Web3.providers.HttpProvider("https://matic-mainnet-full-rpc.bwarelabs.com"),
         { apiKey: process.env.biconomy_api_key, debug: true }
       );
       setBiconomyProvider(new Web3(biconomy));

diff --git a/client/next.config.js b/client/next.config.js
@@ -3,6 +3,7 @@ module.exports = {
     base_url: 'http://localhost:8080',
     pinata_api_key: process.env.pinata_api_key,
     pinata_secret_api_key: process.env.pinata_secret_api_key,
-    biconomy_api_key: process.env.biconomy_api_key
+    biconomy_api_key: process.env.biconomy_api_key,
+    covalent_key: process.env.covalent_key
   },
 }