From 1b05addd97412ce02c7d12697772ae7f48b509a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alvaro=20Fari=C3=B1a?= Date: Thu, 5 Nov 2020 14:04:17 -0300 Subject: [PATCH 1/3] feat: adds support for new metamask with window.ethereum --- src/services/Web3Service.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/services/Web3Service.ts b/src/services/Web3Service.ts index 2af2326b..b785305c 100644 --- a/src/services/Web3Service.ts +++ b/src/services/Web3Service.ts @@ -88,11 +88,22 @@ export const getNetworkInfoFromWeb3 = async ( return networkInfo } +const getWeb3Provider = (): any => { + // New Metamask + if (window.ethereum) return window.ethereum + + // Older versions of Metamask or other + if (window.web3) return window.web3.currentProvider + return undefined +} + +/* eslint-disable complexity */ export const getAvailableProviders = (): ProviderInfo[] | undefined => { const result: ProviderInfo[] = [] - if (!window.web3) return undefined - const currentProvider = window.web3.currentProvider as any + const currentProvider = getWeb3Provider() + + if (!currentProvider) return undefined if (currentProvider.isMetaMask) { // Nifty is also MetaMask From 3e09ad8c1c07c651a592bac299f640926989b2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alvaro=20Fari=C3=B1a?= Date: Thu, 5 Nov 2020 14:30:09 -0300 Subject: [PATCH 2/3] refactor: better typing for logo --- src/components/atoms/Logo.tsx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/atoms/Logo.tsx b/src/components/atoms/Logo.tsx index 807d89be..9c691d51 100644 --- a/src/components/atoms/Logo.tsx +++ b/src/components/atoms/Logo.tsx @@ -1,10 +1,8 @@ import React, { FC } from 'react' import { logoFullWhite } from '../../assets/images' -interface LogoProps extends React.Props { - alt?: string -} - -const Logo: FC = ({ alt = 'RIF OS logo', ...rest }) => {alt} +const Logo: FC> = ( + { alt = 'RIF OS logo', ...rest }, +) => {alt} export default Logo From 4ddae3dd776db7954a3b6d5e7a73027a255df4e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alvaro=20Fari=C3=B1a?= Date: Thu, 5 Nov 2020 14:30:23 -0300 Subject: [PATCH 3/3] feat: adds new logo --- src/assets/images/logos/logoBlackAndBlue.svg | 173 ++++++++++++------- src/assets/images/logos/logoFullWhite.svg | 84 ++++----- 2 files changed, 154 insertions(+), 103 deletions(-) diff --git a/src/assets/images/logos/logoBlackAndBlue.svg b/src/assets/images/logos/logoBlackAndBlue.svg index f212e0df..ca380f12 100644 --- a/src/assets/images/logos/logoBlackAndBlue.svg +++ b/src/assets/images/logos/logoBlackAndBlue.svg @@ -1,74 +1,123 @@ - + +RIF_Logo_Phase1_RGB_NoTagline - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/logos/logoFullWhite.svg b/src/assets/images/logos/logoFullWhite.svg index cc38f2ed..ee976693 100644 --- a/src/assets/images/logos/logoFullWhite.svg +++ b/src/assets/images/logos/logoFullWhite.svg @@ -1,46 +1,48 @@ - - + + - - - - - - - - - - - - + + + +