adapt messaging for wallet types, output wallet type

client/src/components/atoms/Account.module.scss

@@ -2,10 +2,12 @@
 
 .account {
     display: flex;
+    flex-wrap: wrap;
     align-items: center;
     text-align: left;
 
     > div {
+        flex: 0 0 80%;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -14,6 +16,12 @@
     }
 }
 
+.accountType {
+    width: 100%;
+    margin-left: calc(1.5rem + #{$spacer / 3});
+    font-size: $font-size-mini;
+}
+
 .blockies {
     width: 1.5rem;
     height: 1.5rem;

client/src/components/atoms/Account.tsx

@@ -3,13 +3,22 @@ import Dotdotdot from 'react-dotdotdot'
 import { toDataUrl } from 'ethereum-blockies'
 import styles from './Account.module.scss'
 
-const Account = ({ account }: { account: string }) => {
+const Account = ({
+    account,
+    isBurner
+}: {
+    account: string
+    isBurner: boolean
+}) => {
     const blockies = account && toDataUrl(account)
 
     return account && blockies ? (
         <div className={styles.account}>
             <img className={styles.blockies} src={blockies} alt="Blockies" />
             <Dotdotdot clamp={2}>{account}</Dotdotdot>
+            {isBurner && (
+                <span className={styles.accountType}>Burner Wallet</span>
+            )}
         </div>
     ) : (
         <em>No account selected</em>

client/src/components/molecules/AccountStatus/Popover.module.scss

@@ -50,6 +50,10 @@ $popoverWidth: 18rem;
     margin-left: $spacer / 2;
     white-space: nowrap;
 
+    strong {
+        color: $brand-grey-lighter;
+    }
+
     &:first-child {
         margin-left: 0;
     }

client/src/components/molecules/AccountStatus/Popover.tsx

@@ -4,11 +4,17 @@ import { User } from '../../../context'
 import styles from './Popover.module.scss'
 
 export default class Popover extends PureComponent<{
-    forwardedRef: (ref: HTMLElement | null) => void
+    forwardedRef?: (ref: HTMLElement | null) => void
-    style: React.CSSProperties
+    style?: React.CSSProperties
 }> {
     public render() {
-        const { account, balance, network, isOceanNetwork } = this.context
+        const {
+            account,
+            balance,
+            network,
+            isOceanNetwork,
+            isBurner
+        } = this.context
 
         return (
             <div
@@ -19,7 +25,7 @@ export default class Popover extends PureComponent<{
                 {
                     <>
                         <div className={styles.popoverInfoline}>
-                            <Account account={account} />
+                            <Account account={account} isBurner={isBurner} />
                         </div>
 
                         {account && balance && (

client/src/components/molecules/VersionNumbers/index.module.scss

@@ -1,12 +1,9 @@
 @import '../../../styles/variables';
 
-.versions {
-    margin-top: $spacer * 2;
-}
-
 .versionsTitle {
     font-size: $font-size-large;
     margin-bottom: $spacer / 2;
+    margin-top: $spacer * 2;
 }
 
 .versionsMinimal {

client/src/components/molecules/VersionNumbers/index.tsx

@@ -149,13 +149,13 @@ export default class VersionNumbers extends PureComponent<
         return minimal ? (
             <this.MinimalOutput />
         ) : (
-            <div className={styles.versions} id="#oceanversions">
+            <>
-                <h2 className={styles.versionsTitle}>
+                <h2 className={styles.versionsTitle} id="#oceanversions">
                     Ocean Components Status
                 </h2>
                 <VersionStatus status={this.state.status} />
                 <VersionTable data={this.state} />
-            </div>
+            </>
         )
     }
 }

client/src/components/organisms/Header.tsx

@@ -2,7 +2,6 @@ import React, { PureComponent } from 'react'
 import { NavLink } from 'react-router-dom'
 import { ReactComponent as Logo } from '@oceanprotocol/art/logo/logo.svg'
 import AccountStatus from '../molecules/AccountStatus'
-import WalletSelector from './WalletSelector'
 import styles from './Header.module.scss'
 
 import menu from '../../data/menu.json'
@@ -33,7 +32,6 @@ export default class Header extends PureComponent {
                         {menu.map(item => (
                             <MenuItem key={item.title} item={item} />
                         ))}
-                        <WalletSelector />
                         <AccountStatus className={styles.accountStatus} />
                     </nav>
                 </div>

client/src/components/organisms/WalletSelector.module.scss

@@ -1,13 +1,9 @@
 @import '../../styles/variables';
 
-.actions {
-    text-align: right;
-    margin-top: $spacer;
-}
-
 .openLink {
     margin: 0;
-    font-size: $font-size-small;
+    margin-top: $spacer / 2;
+    margin-left: $spacer;
 }
 
 .info {

client/src/components/organisms/WalletSelector.tsx

@@ -6,10 +6,10 @@ import Button from '../atoms/Button'
 
 export default class WalletSelector extends PureComponent<
     {},
-    {
+    { isModalOpen: boolean }
-        isModalOpen: boolean
-    }
 > {
+    public static contextType = User
+
     public state = {
         isModalOpen: false
     }
@@ -25,12 +25,13 @@ export default class WalletSelector extends PureComponent<
 
     private loginMetamask = () => {
         this.context.loginMetamask()
+        this.context.logoutBurnerWallet()
         this.toggleModal()
     }
 
     public render() {
         return (
-            <div className={styles.actions}>
+            <>
                 <Button
                     link
                     className={styles.openLink}
@@ -53,9 +54,7 @@ export default class WalletSelector extends PureComponent<
                         </button>
                     </div>
                 </Modal>
-            </div>
+            </>
         )
     }
 }
-
-WalletSelector.contextType = User

client/src/components/organisms/Web3message.module.scss

@@ -11,12 +11,14 @@
     text-align: left;
 }
 
-.warnings {
+.text {
-    padding-left: $spacer;
+    margin-left: $spacer;
+    display: inline-block;
 }
 
 .status {
-    margin-left: -($spacer);
+    position: absolute;
-    margin-right: $spacer / 2;
+    left: 0;
+    top: $spacer / 1.5;
     padding: 0;
 }

client/src/components/organisms/Web3message.tsx

@@ -7,33 +7,39 @@ import WalletSelector from './WalletSelector'
 import content from '../../data/web3message.json'
 
 export default class Web3message extends PureComponent {
-    private message = (message: string, account?: string) => (
+    public static contextType = User
-        <div className={styles.message}>
+
-            {account ? (
+    private message = () => {
-                <Account account={account} />
+        const { isOceanNetwork, isLogged, isBurner } = this.context
-            ) : (
+
-                <div className={styles.warnings}>
+        return !isOceanNetwork && !isBurner
-                    <AccountStatus className={styles.status} />
+            ? content.wrongNetwork
-                    <span dangerouslySetInnerHTML={{ __html: message }} />{' '}
+            : !isLogged
-                    <WalletSelector />
+            ? content.noAccount
-                </div>
+            : isBurner
-            )}
+            ? content.hasBurnerWallet
-        </div>
+            : isLogged
-    )
+            ? content.hasMetaMaskWallet
+            : ''
+    }
 
     public render() {
-        const { isOceanNetwork, isLogged, isBurner, account } = this.context
+        return (
-
+            <div className={styles.message}>
-        return !isOceanNetwork
+                {this.context.account ? (
-            ? this.message(content.wrongNetwork)
+                    <Account
-            : !isLogged
+                        account={this.context.account}
-            ? this.message(content.noAccount)
+                        isBurner={this.context.isBurner}
-            : isBurner
+                    />
-            ? this.message(content.burnerWallet)
+                ) : (
-            : isLogged
+                    <AccountStatus className={styles.status} />
-            ? this.message(content.hasAccount, account)
+                )}
-            : null
+                <em
+                    className={styles.text}
+                    dangerouslySetInnerHTML={{ __html: this.message() }}
+                />{' '}
+                <WalletSelector />
+            </div>
+        )
     }
 }
-
-Web3message.contextType = User

client/src/context/BurnerWalletProvider.ts

@@ -1,7 +1,7 @@
 import Web3 from 'web3'
 import { nodeUri } from '../config'
-import bip39 from 'bip39'
 import HDWalletProvider from 'truffle-hdwallet-provider'
+const bip39 = require('bip39') // eslint-disable-line @typescript-eslint/no-var-requires
 
 export class BurnerWalletProvider {
     private web3: Web3

client/src/context/UserProvider.tsx

@@ -62,6 +62,7 @@ interface UserProviderState {
     requestFromFaucet(account: string): Promise<FaucetResponse>
     loginMetamask(): Promise<any>
     loginBurnerWallet(): Promise<any>
+    logoutBurnerWallet(): Promise<any>
     message: string
 }
 
@@ -98,6 +99,11 @@ export default class UserProvider extends PureComponent<{}, UserProviderState> {
         )
     }
 
+    private logoutBurnerWallet = async () => {
+        const burnerwalletProvider = new BurnerWalletProvider()
+        await burnerwalletProvider.logout()
+    }
+
     public state = {
         isLogged: false,
         isBurner: false,
@@ -114,6 +120,7 @@ export default class UserProvider extends PureComponent<{}, UserProviderState> {
         requestFromFaucet: () => requestFromFaucet(''),
         loginMetamask: () => this.loginMetamask(),
         loginBurnerWallet: () => this.loginBurnerWallet(),
+        logoutBurnerWallet: () => this.logoutBurnerWallet(),
         message: 'Connecting to Ocean...'
     }
 

client/src/data/web3message.json

@@ -1,6 +1,6 @@
 {
   "noAccount": "No wallet selected. For publishing and downloading an asset you need to use one.",
-  "burnerWallet": "You are using temporary burner wallet. Improve your security by migrating to Metamask",
+  "hasBurnerWallet": "<p>We created a temporary burner wallet for you, allowing you to use all Commons functionality without any setup on your side. This wallet will persist in your browser across sessions, but not across different browsers or devices.</p>To personalize your experience and improve your security, <a href='https://docs.oceanprotocol.com/tutorials/metamask-setup/'>migrate to MetaMask</a>.",
-  "hasAccount": "",
+  "hasMetaMaskWallet": "Connected with MetaMask.",
   "wrongNetwork": "Not connected to Pacific network.<br />Please connect in MetaMask with Custom RPC <code>https://pacific.oceanprotocol.com</code>"
 }

client/src/routes/About.tsx

@@ -2,6 +2,8 @@ import React, { Component } from 'react'
 import Route from '../components/templates/Route'
 import Content from '../components/atoms/Content'
 import VersionNumbers from '../components/molecules/VersionNumbers'
+import Web3message from '../components/organisms/Web3message'
+import stylesVersionNumbers from '../components/molecules/VersionNumbers/index.module.scss'
 
 class About extends Component {
     public render() {
@@ -37,6 +39,10 @@ class About extends Component {
                 </Content>
 
                 <Content>
+                    <h2 className={stylesVersionNumbers.versionsTitle}>
+                        Your Web3 Account Status
+                    </h2>
+                    <Web3message />
                     <VersionNumbers />
                 </Content>
             </Route>

client/src/styles/global.scss

@@ -140,6 +140,11 @@ em,
     font-style: italic;
 }
 
+small {
+    font-size: $font-size-small;
+    display: inline-block;
+}
+
 abbr[title],
 dfn {
     text-transform: none;