From 10481e09afa2b7c95ae9ef958c56932d6f78b4d5 Mon Sep 17 00:00:00 2001
From: Adrien Denat <adrien.denat@gmail.com>
Date: Thu, 28 Mar 2019 17:50:13 +0000
Subject: [PATCH 1/9] chore(new-ui): basic poc

---
 .../src/components/Tooltip/Tooltip.tsx             |  1 +
 .../inputs/CurrencySelect/CurrencySelect.tsx       | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/packages/new-polymath-ui/src/components/Tooltip/Tooltip.tsx b/packages/new-polymath-ui/src/components/Tooltip/Tooltip.tsx
index e7ac08f03..577dfb86f 100644
--- a/packages/new-polymath-ui/src/components/Tooltip/Tooltip.tsx
+++ b/packages/new-polymath-ui/src/components/Tooltip/Tooltip.tsx
@@ -27,6 +27,7 @@ export class TooltipComponent extends React.Component<TooltipProps> {
       title: popover,
       html: true,
       container: document.body,
+      boundariesElement: 'viewport',
       popperOptions: {
         modifiers: {
           setState: {
diff --git a/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx b/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx
index 60d07676b..9783e49c3 100644
--- a/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx
+++ b/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx
@@ -21,6 +21,7 @@ import { SvgPax } from '~/images/icons/pax';
 import { withTheme, ThemeInterface, styled } from '~/styles';
 import { Box } from '~/components/Box';
 import { Icon } from '~/components/Icon';
+import { TooltipPrimary } from '~/components/TooltipPrimary';
 import { InputProps } from '~/components/inputs/types';
 import { Label } from './Label';
 import * as sc from './styles';
@@ -60,6 +61,7 @@ export const CURRENCY_OPTIONS: OptionType[] = [
     label: (
       <Label text="ERC20 Token" Asset={SvgErc20} token={types.Tokens.Erc20} />
     ),
+    isDisabled: true,
   },
   {
     value: types.Tokens.Gusd,
@@ -186,6 +188,17 @@ const ClearIndicator: FC<CustomIndicatorProps> = props => {
   );
 };
 
+const Option = ({ children, isDisabled, ...props }) => {
+  return (
+    <components.Option isDisabled={isDisabled} {...props}>
+      {children}
+      {isDisabled && (
+        <TooltipPrimary>Only available on Main Net.</TooltipPrimary>
+      )}
+    </components.Option>
+  );
+};
+
 interface SelectValueProps {
   label: ReactNode;
   value: types.Tokens;
@@ -287,6 +300,7 @@ class CurrencySelectPrimitiveBase extends React.Component<SelectProps> {
               DropdownIndicator,
               ClearIndicator,
               IndicatorSeparator: null,
+              Option,
             }}
             options={filteredOptions}
             value={selectedValues}

From 2a3d2fd2f3ba1ccdc99dc0f1e58650077a6cda8b Mon Sep 17 00:00:00 2001
From: Adrien Denat <adrien.denat@gmail.com>
Date: Fri, 29 Mar 2019 13:28:38 +0000
Subject: [PATCH 2/9] feat(new-ui): component Tooltip now accepts tooltip.js
 props

---
 .../src/components/Tooltip/Tooltip.tsx               | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/new-polymath-ui/src/components/Tooltip/Tooltip.tsx b/packages/new-polymath-ui/src/components/Tooltip/Tooltip.tsx
index 577dfb86f..5b2f72cb4 100644
--- a/packages/new-polymath-ui/src/components/Tooltip/Tooltip.tsx
+++ b/packages/new-polymath-ui/src/components/Tooltip/Tooltip.tsx
@@ -5,9 +5,10 @@ import TooltipJS, { Options } from 'tooltip.js';
 import { styled } from '~/styles';
 import * as sc from './styles';
 
-export interface TooltipProps {
+export interface TooltipProps extends Options {
   role?: string;
   placement?: PopperJS.Placement;
+  className?: string;
 }
 
 export class TooltipComponent extends React.Component<TooltipProps> {
@@ -19,7 +20,7 @@ export class TooltipComponent extends React.Component<TooltipProps> {
   private popper?: TooltipJS;
 
   public getOptions = (): Options => {
-    const { placement } = this.props;
+    const { placement, role, children, ...otherProps } = this.props;
     const popover = this.getPopover() as HTMLElement;
 
     return {
@@ -27,7 +28,6 @@ export class TooltipComponent extends React.Component<TooltipProps> {
       title: popover,
       html: true,
       container: document.body,
-      boundariesElement: 'viewport',
       popperOptions: {
         modifiers: {
           setState: {
@@ -37,6 +37,7 @@ export class TooltipComponent extends React.Component<TooltipProps> {
           },
         },
       },
+      ...otherProps,
     };
   };
 
@@ -79,10 +80,13 @@ export class TooltipComponent extends React.Component<TooltipProps> {
   }
 
   public render() {
+    const { role, children, className } = this.props;
     return (
       <Fragment>
         <sc.GlobalStyles />
-        {<div {...this.props} />}
+        <div className={className} role={role}>
+          {children}
+        </div>
       </Fragment>
     );
   }

From cbd2148a86169901b52fe060b0144af5c4c59178 Mon Sep 17 00:00:00 2001
From: Adrien Denat <adrien.denat@gmail.com>
Date: Fri, 29 Mar 2019 13:29:06 +0000
Subject: [PATCH 3/9] chore(new-ui): component Tooltip now defines explicit
 z-index

---
 packages/new-polymath-ui/src/components/Tooltip/styles.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/new-polymath-ui/src/components/Tooltip/styles.ts b/packages/new-polymath-ui/src/components/Tooltip/styles.ts
index a9bdfd483..9e68133ed 100644
--- a/packages/new-polymath-ui/src/components/Tooltip/styles.ts
+++ b/packages/new-polymath-ui/src/components/Tooltip/styles.ts
@@ -9,6 +9,7 @@ export const GlobalStyles = createGlobalStyle`
     position: absolute;
     box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1);
     text-align: center;
+    z-index: ${({ theme }) => theme.zIndexes.tooltips};
   }
 
   .popper .popper__arrow,

From 89a92a31a2556ffbd6dd10cf55fb9c6cee4b82d5 Mon Sep 17 00:00:00 2001
From: Adrien Denat <adrien.denat@gmail.com>
Date: Fri, 29 Mar 2019 13:29:54 +0000
Subject: [PATCH 4/9] fix(new-ui): fix style of input text/placeholder color
 not matching

---
 .../src/components/inputs/BaseInput/index.tsx              | 7 ++++++-
 packages/new-polymath-ui/src/styles/GlobalStyles.ts        | 4 ++++
 packages/new-polymath-ui/src/styles/theme.ts               | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/new-polymath-ui/src/components/inputs/BaseInput/index.tsx b/packages/new-polymath-ui/src/components/inputs/BaseInput/index.tsx
index e844c6139..a9b98ad06 100644
--- a/packages/new-polymath-ui/src/components/inputs/BaseInput/index.tsx
+++ b/packages/new-polymath-ui/src/components/inputs/BaseInput/index.tsx
@@ -20,7 +20,7 @@ const Input = styled.input<BaseInputProps & StyledProps<any>>`
   height: 2.5rem;
   padding: 0 1rem;
   font-size: ${({ theme }) => theme.fontSizes.baseText};
-  color: ${({ theme }) => theme.colors.baseText};
+  color: ${({ theme }) => theme.colors.highlightText};
   font-family: ${({ theme }) => theme.fontFamilies.baseText};
   background-color: ${({ theme }) => theme.colors.gray[1]};
   border: none;
@@ -33,6 +33,11 @@ const Input = styled.input<BaseInputProps & StyledProps<any>>`
     background-color: ${({ theme }) => theme.colors.gray[0]};
   }
 
+  ::placeholder {
+    opacity: 1;
+    color: ${({ theme }) => theme.colors.baseText};
+  }
+
   /* Remove ugly handles on Chrome/Mozilla for number inputs (until mouse hover) */
   /* Only on desktop */
 
diff --git a/packages/new-polymath-ui/src/styles/GlobalStyles.ts b/packages/new-polymath-ui/src/styles/GlobalStyles.ts
index 75d8e3a73..954beb3dd 100644
--- a/packages/new-polymath-ui/src/styles/GlobalStyles.ts
+++ b/packages/new-polymath-ui/src/styles/GlobalStyles.ts
@@ -51,4 +51,8 @@ export const GlobalStyles = createGlobalStyle`
       opacity: 0.5;
     }
   }
+
+  input {
+    font-weight: ${({ theme }) => theme.fontWeights.normal};
+  }
 `;
diff --git a/packages/new-polymath-ui/src/styles/theme.ts b/packages/new-polymath-ui/src/styles/theme.ts
index 60510160a..bf7752e90 100644
--- a/packages/new-polymath-ui/src/styles/theme.ts
+++ b/packages/new-polymath-ui/src/styles/theme.ts
@@ -69,6 +69,7 @@ const zIndexes = {
   sidebar: 100,
   modals: 120,
   selects: 140,
+  tooltips: 160,
 };
 
 const colors = {

From e4decc2042ab8caf99437bee493731c719521a0a Mon Sep 17 00:00:00 2001
From: Adrien Denat <adrien.denat@gmail.com>
Date: Fri, 29 Mar 2019 13:33:18 +0000
Subject: [PATCH 5/9] chore(new-ui): refactor CurrencySelect so it accepts any
 options props

---
 .../inputs/CurrencySelect/CurrencySelect.mdx  |  1 +
 .../inputs/CurrencySelect/CurrencySelect.tsx  | 40 ++++++++++---------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.mdx b/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.mdx
index d4d1381cf..b828a4333 100644
--- a/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.mdx
+++ b/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.mdx
@@ -23,6 +23,7 @@ import { FormItem } from '../../FormItem';
     return (
       <CurrencySelectPrimitive
         placeholder="Raise in"
+        disabledOptionText="Not available on test network"
         value={values}
         onChange={(values) => { console.log(values); }}
       />
diff --git a/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx b/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx
index 9783e49c3..844654252 100644
--- a/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx
+++ b/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx
@@ -1,8 +1,8 @@
 import React, { FC, Fragment, ReactNode } from 'react';
 import Select, { components } from 'react-select';
 import { IndicatorProps } from 'react-select/lib/components/indicators';
+import { OptionProps } from 'react-select/lib/components/option';
 import { Styles } from 'react-select/lib/styles';
-import { intersectionWith, filter, includes } from 'lodash';
 import { types } from '@polymathnetwork/new-shared';
 import {
   FormikProxy,
@@ -29,13 +29,14 @@ import * as sc from './styles';
 interface OptionType {
   value: types.Tokens;
   label: ReactNode;
+  isDisabled?: boolean;
 }
 
 type Value = types.Tokens | types.Tokens[];
 
 interface ExternalProps extends EnhancedComponentProps<Value> {
   theme: ThemeInterface;
-  options: types.Tokens[];
+  options: OptionType[];
   placeholder?: string;
 }
 
@@ -61,7 +62,6 @@ export const CURRENCY_OPTIONS: OptionType[] = [
     label: (
       <Label text="ERC20 Token" Asset={SvgErc20} token={types.Tokens.Erc20} />
     ),
-    isDisabled: true,
   },
   {
     value: types.Tokens.Gusd,
@@ -90,11 +90,12 @@ export const CURRENCY_OPTIONS: OptionType[] = [
 interface SelectProps
   extends Pick<InputProps, 'onChange' | 'error' | 'name' | 'autoComplete'> {
   theme: ThemeInterface;
-  options: types.Tokens[];
+  options: OptionType[];
   value: types.Tokens | types.Tokens[];
   // Override because ReactSelect does not provide the event
   onBlur: () => void;
   placeholder?: string;
+  disabledOptionText?: string;
 }
 
 const getStyles = (theme: ThemeInterface): Styles => ({
@@ -188,12 +189,14 @@ const ClearIndicator: FC<CustomIndicatorProps> = props => {
   );
 };
 
-const Option = ({ children, isDisabled, ...props }) => {
+const Option: FC<OptionProps<OptionType>> = ({ children, ...props }) => {
   return (
-    <components.Option isDisabled={isDisabled} {...props}>
+    <components.Option {...props}>
       {children}
-      {isDisabled && (
-        <TooltipPrimary>Only available on Main Net.</TooltipPrimary>
+      {props.isDisabled && props.selectProps.disabledOptionText && (
+        <TooltipPrimary boundariesElement="viewport">
+          {props.selectProps.disabledOptionText}
+        </TooltipPrimary>
       )}
     </components.Option>
   );
@@ -266,13 +269,12 @@ class CurrencySelectPrimitiveBase extends React.Component<SelectProps> {
   public render() {
     const { value, options, onChange, onBlur, theme, ...rest } = this.props;
 
-    const filteredOptions = intersectionWith(
-      CURRENCY_OPTIONS,
-      options,
-      (currency, symbol) => {
-        return currency.value === symbol;
-      }
-    );
+    const mergedOptions = options.map(option => {
+      return {
+        ...CURRENCY_OPTIONS.find(currency => option.value === currency.value),
+        ...option,
+      };
+    });
 
     const valueIsArray = Array.isArray(value);
     let arrayValue: types.Tokens[];
@@ -283,8 +285,8 @@ class CurrencySelectPrimitiveBase extends React.Component<SelectProps> {
       arrayValue = value;
     }
 
-    const selectedValues = filter(filteredOptions, ({ value: currencyType }) =>
-      includes(arrayValue, currencyType)
+    const selectedValues = mergedOptions.filter(({ value: currencyType }) =>
+      arrayValue.includes(currencyType)
     );
 
     return (
@@ -302,7 +304,7 @@ class CurrencySelectPrimitiveBase extends React.Component<SelectProps> {
               IndicatorSeparator: null,
               Option,
             }}
-            options={filteredOptions}
+            options={mergedOptions}
             value={selectedValues}
             onChange={this.handleChange}
             onMenuClose={onBlur}
@@ -310,7 +312,7 @@ class CurrencySelectPrimitiveBase extends React.Component<SelectProps> {
           />
         </SelectWrapper>
         {arrayValue.map(val => {
-          const option = filteredOptions.find(
+          const option = mergedOptions.find(
             ({ value: currencyType }) => currencyType === val
           );
           return option ? (

From 97367b0b99f8592506e2191a7b923cedc84c6849 Mon Sep 17 00:00:00 2001
From: Adrien Denat <adrien.denat@gmail.com>
Date: Fri, 29 Mar 2019 13:38:24 +0000
Subject: [PATCH 6/9] chore(new-issuer): refactor how placeholder prop is
 passed to form item input

---
 .../src/pages/DividendsWizard/Step-3/index.tsx        | 11 ++++++-----
 .../src/pages/SecurityTokensDividends/Presenter.tsx   |  4 +++-
 .../src/components/FormItem/Input/index.tsx           |  1 -
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx b/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx
index e717a4428..bf6b3f4b2 100644
--- a/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx
+++ b/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx
@@ -330,9 +330,9 @@ const Step3Base: FC<Props> = ({
                   <FormItem.Label>Dividend Distribution Name</FormItem.Label>
                   <FormItem.Input
                     component={TextInput}
-                    placeholder="Enter the name"
                     inputProps={{
                       maxLength: dividendsTitleLength,
+                      placeholder: 'Enter the name',
                     }}
                   />
                   <FormItem.Error />
@@ -359,7 +359,6 @@ const Step3Base: FC<Props> = ({
                           : selectedCurrency
                       )
                     }
-                    placeholder="Choose currency"
                   />
                   <FormItem.Error />
                 </FormItem>
@@ -409,7 +408,9 @@ const Step3Base: FC<Props> = ({
                           // do nothing
                         }
                       }}
-                      placeholder={'Enter ERC20 token contract address'}
+                      inputProps={{
+                        placeholder: 'Enter ERC20 token contract address',
+                      }}
                     />
                     <FormItem.Error />
                   </FormItem>
@@ -419,16 +420,16 @@ const Step3Base: FC<Props> = ({
                     <FormItem.Label>Dividend Amount</FormItem.Label>
                     <FormItem.Input
                       component={NumberInput}
-                      placeholder="Enter the value"
                       inputProps={{
                         min: new BigNumber(0),
                         max: new BigNumber('1000000000000000000'),
-                        maxDecimals:2,
+                        maxDecimals: 2,
                         unit:
                           currency === types.Tokens.Erc20
                             ? erc20TokenSymbol
                             : currency,
                         useBigNumbers: true,
+                        placeholder: 'Enter the value',
                       }}
                       onChange={updateDividendAmount}
                     />
diff --git a/packages/new-polymath-issuer/src/pages/SecurityTokensDividends/Presenter.tsx b/packages/new-polymath-issuer/src/pages/SecurityTokensDividends/Presenter.tsx
index 0ac63b4e8..73acb3b96 100644
--- a/packages/new-polymath-issuer/src/pages/SecurityTokensDividends/Presenter.tsx
+++ b/packages/new-polymath-issuer/src/pages/SecurityTokensDividends/Presenter.tsx
@@ -234,7 +234,9 @@ export const Presenter: FC<Props> = ({
                 <FormItem.Label>Wallet Address</FormItem.Label>
                 <FormItem.Input
                   component={TextInput}
-                  placeholder="Wallet address"
+                  inputProps={{
+                    placeholder: 'Wallet address',
+                  }}
                 />
                 <FormItem.Error />
               </FormItem>
diff --git a/packages/new-polymath-ui/src/components/FormItem/Input/index.tsx b/packages/new-polymath-ui/src/components/FormItem/Input/index.tsx
index 8445d8012..7db4c86c5 100644
--- a/packages/new-polymath-ui/src/components/FormItem/Input/index.tsx
+++ b/packages/new-polymath-ui/src/components/FormItem/Input/index.tsx
@@ -6,7 +6,6 @@ import { Context } from '../Context';
 export interface Props
   extends typeHelpers.Omit<FieldConfig, 'name' | 'component'> {
   FormikComponent: React.ComponentType<FieldConfig>;
-  placeholder?: string;
   component: React.ComponentType<any>;
   inputProps?: { [key: string]: any };
   onChange?: (value: any) => void;

From 41a170f020d297792626722f821b21679da53311 Mon Sep 17 00:00:00 2001
From: Adrien Denat <adrien.denat@gmail.com>
Date: Fri, 29 Mar 2019 13:38:48 +0000
Subject: [PATCH 7/9] chore(new-issuer): disable tokens that are unavailable in
 testnet

---
 .../pages/DividendsWizard/Step-3/index.tsx    | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx b/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx
index bf6b3f4b2..cf68595ac 100644
--- a/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx
+++ b/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx
@@ -343,14 +343,34 @@ const Step3Base: FC<Props> = ({
                     component={CurrencySelect}
                     inputProps={{
                       options: [
-                        types.Tokens.Erc20,
-                        types.Tokens.Dai,
-                        types.Tokens.Gusd,
-                        types.Tokens.Pax,
-                        types.Tokens.Poly,
-                        types.Tokens.Usdc,
-                        types.Tokens.Usdt,
+                        {
+                          value: types.Tokens.Erc20,
+                        },
+                        {
+                          value: types.Tokens.Dai,
+                        },
+                        {
+                          value: types.Tokens.Gusd,
+                          isDisabled: networkId === constants.NetworkIds.Kovan,
+                        },
+                        {
+                          value: types.Tokens.Pax,
+                          isDisabled: true,
+                        },
+                        {
+                          value: types.Tokens.Poly,
+                        },
+                        {
+                          value: types.Tokens.Usdc,
+                          isDisabled: networkId === constants.NetworkIds.Kovan,
+                        },
+                        {
+                          value: types.Tokens.Usdt,
+                          isDisabled: networkId === constants.NetworkIds.Kovan,
+                        },
                       ],
+                      placeholder: 'Choose currency',
+                      disabledOptionText: 'Not available on test network',
                     }}
                     onChange={(selectedCurrency: string) =>
                       updateCurrencySymbol(

From b85a567185a89c43389c062da13dcef9d37c3ac0 Mon Sep 17 00:00:00 2001
From: Adrien Denat <adrien.denat@gmail.com>
Date: Fri, 29 Mar 2019 16:01:30 +0000
Subject: [PATCH 8/9] chore(new-ui): fix typing issue (thanks Jere)

---
 .../src/components/inputs/CurrencySelect/CurrencySelect.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx b/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx
index 844654252..90a9aa8e9 100644
--- a/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx
+++ b/packages/new-polymath-ui/src/components/inputs/CurrencySelect/CurrencySelect.tsx
@@ -1,7 +1,7 @@
 import React, { FC, Fragment, ReactNode } from 'react';
 import Select, { components } from 'react-select';
 import { IndicatorProps } from 'react-select/lib/components/indicators';
-import { OptionProps } from 'react-select/lib/components/option';
+import { OptionProps } from 'react-select/lib/components/Option';
 import { Styles } from 'react-select/lib/styles';
 import { types } from '@polymathnetwork/new-shared';
 import {

From 2184980f744e37173c5d9be98c3fd3a728756b99 Mon Sep 17 00:00:00 2001
From: Adrien Denat <adrien.denat@gmail.com>
Date: Mon, 1 Apr 2019 15:13:24 -0300
Subject: [PATCH 9/9] chore(new-issuer): refactor condition test as a variable

---
 .../pages/DividendsWizard/Step-3/index.tsx    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx b/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx
index cf68595ac..6c0507abf 100644
--- a/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx
+++ b/packages/new-polymath-issuer/src/pages/DividendsWizard/Step-3/index.tsx
@@ -127,6 +127,12 @@ const Step3Base: FC<Props> = ({
 
   const [erc20TokenSymbol, setErc20TokenSymbol] = useState('');
 
+  const isTestNet = [
+    constants.NetworkIds.Kovan,
+    constants.NetworkIds.Local,
+    constants.NetworkIds.LocalVm,
+  ].includes(networkId);
+
   useEffect(
     () => {
       const { isSubmitting, submitEvent } = formSubmissionStatus;
@@ -218,12 +224,6 @@ const Step3Base: FC<Props> = ({
           });
 
           const difference = dividendAmount.minus(balance);
-
-          const isTestNet = [
-            constants.NetworkIds.Kovan,
-            constants.NetworkIds.Local,
-            constants.NetworkIds.LocalVm,
-          ].includes(networkId);
           const willUseFaucet = isTestNet && currency === types.Tokens.Poly;
 
           if (!willUseFaucet && difference.gte(0)) {
@@ -351,22 +351,22 @@ const Step3Base: FC<Props> = ({
                         },
                         {
                           value: types.Tokens.Gusd,
-                          isDisabled: networkId === constants.NetworkIds.Kovan,
+                          isDisabled: isTestNet,
                         },
                         {
                           value: types.Tokens.Pax,
-                          isDisabled: true,
+                          isDisabled: isTestNet,
                         },
                         {
                           value: types.Tokens.Poly,
                         },
                         {
                           value: types.Tokens.Usdc,
-                          isDisabled: networkId === constants.NetworkIds.Kovan,
+                          isDisabled: isTestNet,
                         },
                         {
                           value: types.Tokens.Usdt,
-                          isDisabled: networkId === constants.NetworkIds.Kovan,
+                          isDisabled: isTestNet,
                         },
                       ],
                       placeholder: 'Choose currency',