From 6e996a1767b5bffb5586969d8c5606c9ed5eb1a3 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Wed, 15 Jul 2020 19:10:25 +0200
Subject: [PATCH] web3modal styling and interaction tweaks

---
 .../molecules/Wallet/Details.module.css       | 10 +--
 src/components/molecules/Wallet/Details.tsx   | 10 +--
 src/components/molecules/Wallet/index.tsx     |  1 +
 src/global/Styles.tsx                         |  1 -
 src/global/_toast.css                         |  2 +
 src/global/_web3modal.css                     | 68 +++++++++++++++++++
 src/global/styles.css                         |  1 +
 src/utils/wallet.ts                           | 11 ++-
 8 files changed, 93 insertions(+), 11 deletions(-)
 create mode 100644 src/global/_web3modal.css

diff --git a/src/components/molecules/Wallet/Details.module.css b/src/components/molecules/Wallet/Details.module.css
index cbeb77a4c..056ec9ef4 100644
--- a/src/components/molecules/Wallet/Details.module.css
+++ b/src/components/molecules/Wallet/Details.module.css
@@ -5,10 +5,6 @@
   max-width: 25rem;
 }
 
-.details > ul {
-  margin-bottom: calc(var(--spacer) / 4);
-}
-
 .balance {
   font-size: var(--font-size-base);
   font-weight: var(--font-weight-bold);
@@ -29,7 +25,11 @@
   border-top: 1px solid var(--brand-grey-lighter);
   margin-top: calc(var(--spacer) / 2);
   padding-top: calc(var(--spacer) / 2);
-  text-align: center;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: var(--font-size-small);
+  color: var(--color-secondary);
 }
 
 .arrow,
diff --git a/src/components/molecules/Wallet/Details.tsx b/src/components/molecules/Wallet/Details.tsx
index 9ed12e191..8e7185f61 100644
--- a/src/components/molecules/Wallet/Details.tsx
+++ b/src/components/molecules/Wallet/Details.tsx
@@ -5,9 +5,10 @@ import { useOcean } from '@oceanprotocol/react'
 import Web3Feedback from './Feedback'
 import { formatNumber } from '../../../utils'
 import { connectWallet } from '../../../utils/wallet'
+import { getInjectedProviderName } from 'web3modal'
 
 export default function Details({ attrs }: { attrs: any }): ReactElement {
-  const { balance, connect, logout } = useOcean()
+  const { balance, connect, logout, web3Provider } = useOcean()
   const oceanBalance = 'Hello Test'
 
   return (
@@ -20,12 +21,13 @@ export default function Details({ attrs }: { attrs: any }): ReactElement {
           <span>ETH</span> {formatNumber(Number(balance))}
         </li>
         <li className={styles.actions}>
+          <span title="Connected provider">{getInjectedProviderName()}</span>
           <Button
             style="text"
             size="small"
-            onClick={async () => {
-              await logout()
-              await connectWallet(connect)
+            onClick={() => {
+              logout()
+              connectWallet(connect)
             }}
           >
             Switch Wallet
diff --git a/src/components/molecules/Wallet/index.tsx b/src/components/molecules/Wallet/index.tsx
index e1d4eb970..11695e696 100644
--- a/src/components/molecules/Wallet/index.tsx
+++ b/src/components/molecules/Wallet/index.tsx
@@ -39,6 +39,7 @@ export default function Wallet(): ReactElement {
       interactive
       interactiveBorder={30}
       trigger="click focus"
+      zIndex={1}
       render={(attrs: any) => (
         <animated.div style={props}>
           <Details attrs={attrs} />
diff --git a/src/global/Styles.tsx b/src/global/Styles.tsx
index 4f96c7b48..23d6bd383 100644
--- a/src/global/Styles.tsx
+++ b/src/global/Styles.tsx
@@ -3,7 +3,6 @@ import { ToastContainer } from 'react-toastify'
 
 import '@oceanprotocol/typographies/css/ocean-typo.css'
 import '../global/styles.css'
-import 'react-toastify/dist/ReactToastify.css'
 
 export default function Styles({
   children
diff --git a/src/global/_toast.css b/src/global/_toast.css
index bb6a895b8..a484fbe15 100644
--- a/src/global/_toast.css
+++ b/src/global/_toast.css
@@ -1,3 +1,5 @@
+@import '../../node_modules/react-toastify/dist/ReactToastify.css';
+
 div.Toastify__toast {
   font-family: var(--font-family-base);
   font-size: var(--font-size-small);
diff --git a/src/global/_web3modal.css b/src/global/_web3modal.css
new file mode 100644
index 000000000..5cf4238cd
--- /dev/null
+++ b/src/global/_web3modal.css
@@ -0,0 +1,68 @@
+div.web3modal-modal-lightbox {
+  background: rgba(255, 255, 255, 0.8);
+  backdrop-filter: blur(3px);
+  overflow-x: hidden;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+  animation: fadeIn 0.2s ease-out backwards;
+}
+
+div.web3modal-modal-card {
+  border-radius: var(--border-radius);
+  padding: var(--spacer);
+  margin: var(--spacer) auto;
+  max-width: var(--break-point--small);
+  border: 1px solid var(--brand-grey-lighter);
+  box-shadow: 0 6px 15px 0 rgba(0, 0, 0, 0.05);
+  animation: moveUp 0.2s ease-out backwards;
+  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+}
+
+div.web3modal-provider-wrapper {
+  border: none;
+  padding: 0;
+}
+
+div.web3modal-provider-container {
+  padding: var(--spacer);
+}
+
+div.web3modal-provider-icon {
+  filter: grayscale(1) contrast(150%);
+  transition: filter 0.2s ease-out;
+}
+
+div.web3modal-provider-wrapper:hover div.web3modal-provider-icon {
+  filter: none;
+}
+
+div.web3modal-provider-name {
+  font-size: var(--font-size-large);
+  font-weight: var(--font-weight-bold);
+  font-family: var(--font-family-title);
+}
+
+div.web3modal-provider-description {
+  font-size: var(--font-size-base);
+  margin-top: 0;
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes moveUp {
+  from {
+    transform: translate3d(0, 1rem, 0);
+  }
+
+  to {
+    transform: translate3d(0, 0, 0);
+  }
+}
diff --git a/src/global/styles.css b/src/global/styles.css
index ae2a8acfc..a63445413 100644
--- a/src/global/styles.css
+++ b/src/global/styles.css
@@ -134,3 +134,4 @@ fieldset {
 
 @import '_code.css';
 @import '_toast.css';
+@import '_web3modal.css';
diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts
index 1e40b2632..7b49359f5 100644
--- a/src/utils/wallet.ts
+++ b/src/utils/wallet.ts
@@ -1,12 +1,21 @@
 import { OceanProviderValue } from '@oceanprotocol/react'
 import { networks, infuraProjectId } from '../../app.config'
 
+const web3ModalTheme = {
+  background: 'var(--brand-white)',
+  main: 'var(--brand-black)',
+  secondary: 'var(--brand-grey-light)',
+  border: 'var(--brand-grey-lighter)',
+  hover: 'var(--brand-grey-dimmed)'
+}
+
 export async function connectWallet(
   connect: OceanProviderValue['connect']
 ): Promise<void> {
   const { default: WalletConnectProvider } = await import(
     '@walletconnect/web3-provider'
   )
+
   const providerOptions = {
     /* See Provider Options Section */
     walletconnect: {
@@ -17,7 +26,7 @@ export async function connectWallet(
     }
   }
 
-  await connect({ cacheProvider: true, providerOptions })
+  await connect({ cacheProvider: true, providerOptions, theme: web3ModalTheme })
 }
 
 export function isCorrectNetwork(chainId: number): boolean {