diff --git a/packages/react-app/src/components/Navbar/Wallet.jsx b/packages/react-app/src/components/Navbar/Wallet.jsx
index aa3f211..898e162 100644
--- a/packages/react-app/src/components/Navbar/Wallet.jsx
+++ b/packages/react-app/src/components/Navbar/Wallet.jsx
@@ -1,24 +1,379 @@
-import React, { useContext } from 'react'
+/* eslint-disable max-lines */
+/* eslint-disable max-lines-per-function */
+import React, { useContext,useEffect,useState } from 'react'
+import { KeyOutlined, QrcodeOutlined, SendOutlined, WalletOutlined } from '@ant-design/icons'
+import { Button, Modal, Spin, Tooltip, Typography } from 'antd'
+import { ethers } from 'ethers'
+import QR from 'qrcode.react'
 
+import AddressInput from '../../components/AddressInput'
+import Address from '../../components/common/Address.jsx'
+import EtherInput from '../../components/EtherInput'
+import Balance from '../../components/Navbar/Balance.jsx'
 import { NetworkContext } from '../../contexts/NetworkContext'
+import { Transactor } from '../../helpers'
 import { StyledButton } from '../common/StyledButton'
 
 import InfoText from './InfoText'
 
-const Wallet = ({ isPledged }) => {
-  const { address, connectToWallet } = useContext(NetworkContext)
+const { Text, Paragraph } = Typography
+
+/**
+  ~ What it does? ~
+  Displays a wallet where you can specify address and send USD/ETH, with options to
+  scan address, to convert between USD and ETH, to see and generate private keys,
+  to send, receive and extract the burner wallet
+  ~ How can I use? ~
+  <Wallet
+    provider={userProvider}
+    address={address}
+    ensProvider={mainnetProvider}
+    price={price}
+    color='red'
+  />
+  ~ Features ~
+  - Provide provider={userProvider} to display a wallet
+  - Provide address={address} if you want to specify address, otherwise
+                                                    your default address will be used
+  - Provide ensProvider={mainnetProvider} and your address will be replaced by ENS name
+              (ex. "0xa870" => "user.eth") or you can enter directly ENS name instead of address
+  - Provide price={price} of ether and easily convert between USD and ETH
+  - Provide color to specify the color of wallet icon
+**/
+
+export default function Wallet(props, isPledged) {
+  const [signerAddress, setSignerAddress] = useState()
+  const { address, connectToWallet, web3Modal, disconnectWallet } = useContext(NetworkContext)
+
+  useEffect(() => {
+    async function getAddress() {
+      if (props.signer) {
+        const newAddress = await props.signer.getAddress()
+
+        setSignerAddress(newAddress)
+      }
+    }
+
+    getAddress()
+  }, [props.signer])
+
+  const selectedAddress = props.address || signerAddress
+
+  const [open, setOpen] = useState()
+  const [qr, setQr] = useState()
+  const [amount, setAmount] = useState()
+  const [toAddress, setToAddress] = useState()
+  const [pk, setPK] = useState()
+
+  const providerSend = props.provider ? (
+    <Tooltip title="Wallet">
+      <WalletOutlined
+        onClick={() => {
+          setOpen(!open)
+        }}
+        rotate={-90}
+        style={{
+          padding: props.padding ? props.padding : 7,
+          color: props.color ? props.color : '',
+          cursor: 'pointer',
+          fontSize: props.size ? props.size : 28,
+          verticalAlign: 'middle',
+
+        }}
+      />
+    </Tooltip>
+  ) : (
+    ''
+  )
+
+  let display
+  let receiveButton
+  let privateKeyButton
+
+  if (qr) {
+    display = (
+      <div>
+        <div>
+          <Text copyable>{selectedAddress}</Text>
+        </div>
+        <QR
+          value={selectedAddress}
+          size="450"
+          level="H"
+          includeMargin
+          renderAs="svg"
+          imageSettings={{ excavate: false }}
+        />
+      </div>
+    )
+    receiveButton = (
+      <Button
+        key="hide"
+        onClick={() => {
+          setQr('')
+        }}
+      >
+        <QrcodeOutlined /> Hide
+      </Button>
+    )
+    privateKeyButton = (
+      <Button
+        key="hide"
+        onClick={() => {
+          setPK(selectedAddress)
+          setQr('')
+        }}
+      >
+        <KeyOutlined /> Private Key
+      </Button>
+    )
+  } else if (pk) {
+    const pk = localStorage.getItem('metaPrivateKey')
+    const wallet = new ethers.Wallet(pk)
+
+    if (wallet.address !== selectedAddress)
+      display = (
+        <div>
+          <b>*injected account*, private key unknown</b>
+        </div>
+      )
+     else {
+      const extraPkDisplayAdded = {}
+      const extraPkDisplay = []
+
+      extraPkDisplayAdded[wallet.address] = true
+      extraPkDisplay.push(
+        <div style={{ fontSize: 16, padding: 2, backgroundStyle: '#89e789' }}>
+          <a href={`/pk#${pk}`}>
+            <Address minimized address={wallet.address} ensProvider={props.ensProvider} /> {wallet.address.substr(0, 6)}
+          </a>
+        </div>,
+      )
+
+      for (const key in localStorage)
+        if (key.indexOf('metaPrivateKey_backup') >= 0) {
+          console.log(key)
+
+          const pastpk = localStorage.getItem(key)
+          const pastwallet = new ethers.Wallet(pastpk)
+
+          if (!extraPkDisplayAdded[pastwallet.address] /* && selectedAddress!=pastwallet.address */) {
+            extraPkDisplayAdded[pastwallet.address] = true
+            extraPkDisplay.push(
+              <div style={{ fontSize: 16 }}>
+                <a href={`/pk#${pastpk}`}>
+                  <Address minimized address={pastwallet.address} ensProvider={props.ensProvider} />{' '}
+                  {pastwallet.address.substr(0, 6)}
+                </a>
+              </div>,
+            )
+          }
+        }
+
+
+      display = (
+        <div>
+          <b>Private Key:</b>
+
+          <div>
+            <Text copyable>{pk}</Text>
+          </div>
+
+          <hr />
+
+          <i>
+            Point your camera phone at qr code to open in
+            <a target="_blank" href={`https://xdai.io/${pk}`} rel="noopener noreferrer">
+              burner wallet
+            </a>
+            :
+          </i>
+          <QR
+            value={`https://xdai.io/${pk}`}
+            size="450"
+            level="H"
+            includeMargin
+            renderAs="svg"
+            imageSettings={{ excavate: false }}
+          />
+
+          <Paragraph style={{ fontSize: '16' }} copyable>
+            {`https://xdai.io/${pk}`}
+          </Paragraph>
+
+          {extraPkDisplay ? (
+            <div>
+              <h3>Known Private Keys:</h3>
+              {extraPkDisplay}
+              <Button
+                onClick={() => {
+                  const currentPrivateKey = window.localStorage.getItem('metaPrivateKey')
+
+                  if (currentPrivateKey)
+                    window.localStorage.setItem(`metaPrivateKey_backup${Date.now()}`, currentPrivateKey)
+
+
+                  const randomWallet = ethers.Wallet.createRandom()
+                  const { privateKey } = randomWallet._signingKey()
+
+                  window.localStorage.setItem('metaPrivateKey', privateKey)
+                  window.location.reload()
+                }}
+              >
+                Generate
+              </Button>
+            </div>
+          ) : (
+            ''
+          )}
+        </div>
+      )
+    }
+
+    receiveButton = (
+      <Button
+        key="receive"
+        onClick={() => {
+          setQr(selectedAddress)
+          setPK('')
+        }}
+      >
+        <QrcodeOutlined /> Receive
+      </Button>
+    )
+    privateKeyButton = (
+      <Button
+        key="hide"
+        onClick={() => {
+          setPK('')
+          setQr('')
+        }}
+      >
+        <KeyOutlined /> Hide
+      </Button>
+    )
+  } else {
+    const inputStyle = {
+      padding: 10,
+    }
+
+    display = (
+      <div>
+        <div style={inputStyle}>
+          <AddressInput
+            autoFocus
+            ensProvider={props.ensProvider}
+            placeholder="to address"
+            address={toAddress}
+            onChange={setToAddress}
+          />
+        </div>
+        <div style={inputStyle}>
+          <EtherInput
+            price={props.price}
+            value={amount}
+            onChange={value => {
+              setAmount(value)
+            }}
+          />
+        </div>
+      </div>
+    )
+    receiveButton = (
+      <Button
+        key="receive"
+        onClick={() => {
+          setQr(selectedAddress)
+          setPK('')
+        }}
+      >
+        <QrcodeOutlined /> Receive
+      </Button>
+    )
+    privateKeyButton = (
+      <Button
+        key="hide"
+        onClick={() => {
+          setPK(selectedAddress)
+          setQr('')
+        }}
+      >
+        <KeyOutlined /> Private Key
+      </Button>
+    )
+  }
+
+
+
 
   return (
+
     <>
-      {!address ? (
-        <StyledButton $type="secondary" style={{ marginTop: '4px' }} onClick={() => connectToWallet()}>
-          Connect
-        </StyledButton>
-      ) : (
-        <InfoText backgroundColor={'#4299E1'} text={address} isPlant={isPledged} />
-      )}
+
+
+
+
+
+<div style={{ display: 'flex' }}>
+{providerSend}{address && <InfoText backgroundColor={'#4299E1'} text={address} isPlant={isPledged} />}
+    </div>
+      <Modal
+        visible={open}
+        title={
+          <div>
+            {selectedAddress ? <Address address={selectedAddress} ensProvider={props.ensProvider} /> : <Spin />}
+            <div style={{ float: 'right', paddingRight: 25 }}>
+              <Balance address={selectedAddress} provider={props.provider} dollarMultiplier={props.price} />
+            </div>
+          </div>
+        }
+        onOk={() => {
+          setQr()
+          setPK()
+          setOpen(!open)
+        }}
+        onCancel={() => {
+          setQr()
+          setPK()
+          setOpen(!open)
+        }}
+        footer={[
+          privateKeyButton,
+          receiveButton,
+          <Button
+            key="submit"
+            type="primary"
+            disabled={!amount || !toAddress || qr}
+            loading={false}
+            onClick={() => {
+              const tx = Transactor(props.signer || props.provider)
+
+              let value
+
+              try {
+                value = ethers.utils.parseEther(`${amount}`)
+              } catch (e) {
+                // failed to parseEther, try something else
+                value = ethers.utils.parseEther(`${parseFloat(amount).toFixed(8)}`)
+              }
+
+              tx({
+                to: toAddress,
+                value,
+              })
+              setOpen(!open)
+              setQr()
+            }}
+          >
+            <SendOutlined /> Send
+          </Button>,
+        ]}
+      >
+        {display}
+      </Modal>
+
+
+
     </>
   )
 }
-
-export default Wallet
diff --git a/packages/react-app/src/components/Navbar/index.jsx b/packages/react-app/src/components/Navbar/index.jsx
index 96adf99..9685359 100644
--- a/packages/react-app/src/components/Navbar/index.jsx
+++ b/packages/react-app/src/components/Navbar/index.jsx
@@ -1,5 +1,6 @@
 import { useContext, useEffect, useState } from 'react'
 import { useHistory } from 'react-router-dom'
+import { PropertySafetyFilled } from '@ant-design/icons'
 import { Col, Menu, Row } from 'antd'
 import styled from 'styled-components'
 
@@ -24,7 +25,7 @@ const Index = ({ navbarRef, NETWORKCHECK }) => {
   const router = useHistory()
   const [path, setPath] = useState(router.pathname)
   const { isPledged } = useContext(WalletContext)
-  const { disconnectWallet, userSigner } = useContext(NetworkContext)
+  const { disconnectWallet, userSigner, mainnetProvider, address, connectToWallet, web3Modal, injectedProvider } = useContext(NetworkContext)
 
   useEffect(() => {
     setPath(router.pathname)
@@ -34,6 +35,8 @@ const Index = ({ navbarRef, NETWORKCHECK }) => {
     router.push(url)
   }
 
+
+
   return (
     <Row ref={navbarRef} className="menu-row" justify="space-between">
       <Col>
@@ -60,14 +63,21 @@ const Index = ({ navbarRef, NETWORKCHECK }) => {
           <Col>
             <Balance />
           </Col>
-          <Col>
-            <Wallet isPledged={isPledged} />
+          <Col >
+            <Wallet isPledged={isPledged} provider={userSigner} address={address} ensProvider={mainnetProvider}  />
           </Col>
           {userSigner && (
             <Col>
-              <StyledButton $type="secondary" onClick={disconnectWallet} style={{ marginTop: 1.6 }}>
-                Logout
-              </StyledButton>
+            {injectedProvider ? (
+      <StyledButton $type="secondary" onClick={() => disconnectWallet()} style={{ marginTop: 1.6 }}>
+      Logout
+    </StyledButton>
+  ) : (
+<StyledButton $type="secondary" style={{ marginTop: '4px' }} onClick={() => connectToWallet()}>
+    Connect
+  </StyledButton>
+  )}
+
             </Col>
           )}
         </Row>
@@ -80,3 +90,4 @@ const Index = ({ navbarRef, NETWORKCHECK }) => {
 }
 
 export default Index
+
diff --git a/packages/react-app/src/contexts/NetworkContext.js b/packages/react-app/src/contexts/NetworkContext.js
index 8865359..50ae39d 100644
--- a/packages/react-app/src/contexts/NetworkContext.js
+++ b/packages/react-app/src/contexts/NetworkContext.js
@@ -7,7 +7,7 @@ import { useStaticJsonRPC } from '../hooks'
 
 const { ethers } = require('ethers')
 
-const USE_BURNER_WALLET = false
+const USE_BURNER_WALLET = true
 
 const providers = [
   'https://eth-mainnet.gateway.pokt.network/v1/lb/611156b4a585a20035148406',
@@ -58,7 +58,7 @@ export const NetworkContextProvider = ({ children }) => {
 
     if (injectedProvider && injectedProvider.provider && typeof injectedProvider.provider.disconnect === 'function')
       await injectedProvider.provider.disconnect()
-
+      await localProvider
 
     setTimeout(() => {
       window.location.reload()