Merge pull request #588 from PolymathNetwork/release

Bugfixes and copy changes, 1.6

Author: FahdW

packages/polymath-issuer/src/pages/compliance/components/ImportWhitelistModal.js

@@ -107,7 +107,8 @@ class ImportWhitelistModal extends Component<Props> {
         <Modal.Header>Import Whitelist</Modal.Header>
         <h4 className="pui-h4">
           Add multiple addresses to the whitelist by uploading a comma separated
-          .CSV file. The format should be as follows:
+          .CSV file. <strong>You may add up to 40 addresses per .CSV file</strong>. The
+          format should be as follows:
           <br />• ETH Address (address to whitelist);
           <br />• Sell Restriction Date: <strong>mm/dd/yyyy</strong> (date when
           the resale restrictions should be lifted for that address);
@@ -197,7 +198,7 @@ class ImportWhitelistModal extends Component<Props> {
           />
         ) : (
           <Remark title="Reminder">
-            Investors must be approved before they are added to the whitelist.
+            Investors must be approved before they are added to the whitelist. <br />Your file cannot exceed 40 addresses. If you have more than 40 addresses on your whitelist, upload multiple files.
           </Remark>
         )}
         <Modal.Footer>

packages/polymath-issuer/src/pages/sto/components/ConfigureSTOForm/forms/USDTieredSTO/TierModal.js

@@ -83,7 +83,7 @@ class TierModal extends Component {
   render() {
     const {
       field: { name, value },
-      form: { values },
+      form: { errors, values },
       ticker,
       isOpen,
       onClose,
@@ -104,6 +104,7 @@ class TierModal extends Component {
         onClose={onClose}
         actionButtonText={tierData ? `Save` : `Add new`}
         onSubmit={tierData ? this.handleOnEdit : this.handleOnAdd}
+        isActionDisabled={!!get(errors, name)}
         maxWidth={740}
       >
         <ActionModal.Header>
@@ -117,7 +118,7 @@ class TierModal extends Component {
             token. Provide the necessary information below to add a new
             investment tier.
           </Paragraph>
-          <Grid gridAutoFlow="column" gridAutoColumns="1fr">
+          <Grid gridAutoFlow="column" gridAutoColumns="1fr" mb={4}>
             <FormItem name={`${name}.tokensAmount`}>
               <FormItem.Label>
                 <Tooltip triggerText="Number of tokens">

packages/polymath-issuer/src/pages/token/components/MintTokens.js

@@ -271,7 +271,7 @@ class MintTokens extends Component<Props> {
             <br />• Number of tokens to mint for the ETH address (integer).
             <br />
             <Remark title="Note">
-              40 is the maximum number of addresses per transaction.
+              Your file cannot exceed 40 addresses. If you have more than 40 addresses on your whitelist, upload multiple files.
             </Remark>
           </h4>
           <h5 className="pui-h5">

packages/polymath-ui/src/components/Modal/styles.js

@@ -74,6 +74,9 @@ export const modalStyle = css`
 
   // TODO @grsmto: remove hack once we refactored ConfirmModal Redux actions:
   // the action should not pass an hardcoded class name
+  &.pui-confirm-modal .pui-modal {
+    width: 500px;
+  }
   &.pui-large-confirm-modal .pui-modal {
     width: 700px;
   }

packages/polymath-ui/src/redux/account/actions.js

@@ -368,6 +368,18 @@ export const faucet = (message: string, amount?: number = 100500) => async (
           » button below to receive {thousandsDelimiter(amount)} test POLY
           in your wallet.
         </p>
+        <p>
+          To receive your Kovan Testnet POLY, you’ll need a supply of KETH
+          (Kovan Testnet ETH) to pay for gas fees. To receive your KETH,{' '}
+          <a
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://github.com/kovan-testnet/faucet#kovan-faucet"
+          >
+            click here
+          </a>{' '}
+          and follow the steps to receive your KETH.
+        </p>
         <br />
         <Remark title="Note">
           This option is not available on the Mainnet.
@@ -394,7 +406,7 @@ export const faucet = (message: string, amount?: number = 100500) => async (
       },
       title,
       buttonLabel,
-      '',
+      'pui-large-confirm-modal',
       headerLabel
     )
   );