Merge pull request #681 from PolymathNetwork/release

v2.4

Author: FahdW

config/contractDocs.config.js

@@ -168,7 +168,7 @@ const config = {
     SecurityToken: {
       description: stripIndent`
         The security token smart contract. It defines the behavior of the
-        Security Tokens created through Polymath.
+        Security Tokens configured through Polymath.
 
         Only the token's owner and the attached STO module (if there is one) can
         mint tokens.
@@ -180,9 +180,9 @@ const config = {
         Keeps track of all the Security Tokens that exist in the network.
         Keeps record of the tickers reserved by users.
 
-        Through this contract Security Tokens can be created and Tickers can be registered.
+        Through this contract Security Tokens can be configured and Tickers can be registered.
         It requires an allowance (of at least the registration fee) to be set to be able
-        to create a Security Token
+        to configure a Security Token
       `,
       methods: SecurityTokenRegistryMethods,
     },

packages/new-polymath-sdk/src/browserUtils.ts

@@ -14,6 +14,7 @@ interface Ethereum extends HttpProvider {
   networkVersion: string;
   _metamask?: {
     isApproved: () => Promise<boolean>;
+    isUnlocked: () => Promise<boolean>;
   };
   enable(): Promise<any>;
 }
@@ -117,14 +118,10 @@ export async function getCurrentAddress() {
   const support = getBrowserSupport();
 
   if (isModern(win)) {
-    // Special check for Metamask to know if it is locked or not
     if (win.ethereum._metamask) {
-      const isApproved = await win.ethereum._metamask.isApproved();
-      if (isApproved) {
-        accounts = await web3.eth.getAccounts();
-        if (!accounts.length) {
-          throw new PolymathError({ code: ErrorCodes.WalletIsLocked });
-        }
+      const isUnlocked = await win.ethereum._metamask.isUnlocked();
+      if (!isUnlocked) {
+        throw new PolymathError({ code: ErrorCodes.WalletIsLocked });
       }
     }
     await enableWallet();

packages/polymath-issuer/public/providers/advisory/bg/img-logos.png

@@ -0,0 +1,17 @@
+import { SecurityTokenRegistry } from '@polymathnetwork/js';
+
+export const TICKER_LIST = 'account/TICKER_LIST';
+export const getTickerList = tickers => ({
+  type: TICKER_LIST,
+  tickers,
+});
+
+export const fetchTickerList = () => async (
+  dispatch: Function,
+  getState: GetState
+) => {
+  const str = await SecurityTokenRegistry.create();
+  const walletAddress = getState().session.wallet.address;
+  const newTokens = await str.getTickersByOwner(walletAddress);
+  dispatch(getTickerList(newTokens));
+};

packages/polymath-issuer/public/providers/advisory/logos.png

@@ -121,7 +121,7 @@ export const fetch = () => async (dispatch: Function, getState: GetState) => {
   try {
     const { token } = getState().token;
 
-    // No token created yet
+    // No token configured yet
     if (!token || !token.contract) {
       dispatch(ui.fetched());
       return;

packages/polymath-issuer/src/actions/account.js

@@ -209,15 +209,15 @@ export const issue = (values: Object) => async (
     ui.confirm(
       <div>
         <p>
-          Completion of your token creation will require{' '}
+          Completion of your token configuration will require{' '}
           {limitInvestors ? 'three' : !isApproved ? 'two' : 'one'} wallet
           transaction(s).
         </p>
         {!isApproved ? (
           <div>
             <p>
               • The first transaction will be used to prepare for the payment of
-              the token creation cost of:
+              the token configuration cost of:
             </p>
             <div className="bx--details poly-cost">{feeView} POLY</div>
           </div>
@@ -226,8 +226,8 @@ export const issue = (values: Object) => async (
         )}
         <p>
           • {!isApproved ? 'The second' : 'This'} transaction will be used to
-          pay for the token creation cost (POLY + mining fee) to complete the
-          creation of your token.
+          pay for the token configuration cost (POLY + mining fee) to complete
+          the configuration of your token.
         </p>
         {limitInvestors && (
           <p>
@@ -239,19 +239,19 @@ export const issue = (values: Object) => async (
         )}
         <p>
           Please hit &laquo;CONFIRM&raquo; when you are ready to proceed. Once
-          you hit &laquo;CONFIRM&raquo;, your security token will be created on
-          the blockchain.
+          you hit &laquo;CONFIRM&raquo;, your security token will be configured
+          on the blockchain.
           <br />
-          If you do not wish to pay the token creation fee or wish to review
-          your information, simply select &laquo;CANCEL&raquo;.
+          If you do not wish to pay the token configuration fee or wish to
+          review your information, simply select &laquo;CANCEL&raquo;.
         </p>
       </div>,
       async () => {
         // $FlowFixMe
         if (getState().pui.account.balance.lt(fee)) {
           dispatch(
             ui.faucet(
-              `The creation of a security token has a fixed cost of ${feeView} POLY.`
+              `The configuration of a security token has a fixed cost of ${feeView} POLY.`
             )
           );
           return;
@@ -263,7 +263,7 @@ export const issue = (values: Object) => async (
         // );
 
         //Skip approve transaction if transfer is already allowed
-        let title = ['Creating Security Token'];
+        let title = ['Configuring Security Token'];
 
         if (!isApproved) {
           title.unshift('Approving POLY Spend');
@@ -303,11 +303,11 @@ export const issue = (values: Object) => async (
             `/dashboard/${ticker}`,
             undefined,
             false,
-            ticker.toUpperCase() + ' Token Creation'
+            ticker.toUpperCase() + ' Token Configuration'
           )
         );
       },
-      `Before you Proceed with Your ${ticker.toUpperCase()} Token Creation`,
+      `Before you Proceed with Your ${ticker.toUpperCase()} Token Configuration`,
       undefined,
       'pui-large-confirm-modal'
     )

packages/polymath-issuer/src/actions/sto.js

@@ -231,8 +231,8 @@ class MigrateTokenPage extends Component<{| handleClick: Function |}> {
               <p>
                 The cost of this migration is the gas fee required to complete
                 the simple 2-step process to migrate your tokens from v1.3.0 to
-                v2.0.0. The cost of creating the security token will be borne by
-                Polymath.
+                v2.0.0. The cost of configuring the security token will be borne
+                by Polymath.
               </p>
             </AccordionItem>
             <AccordionItem title="What benefits would I get by moving to v2.0.0?">

packages/polymath-issuer/src/actions/token.js

@@ -0,0 +1,23 @@
+import React, { Component } from 'react';
+import { PageCentered, Button, Toaster, notify } from '@polymathnetwork/ui';
+import { Link } from 'react-router-dom';
+
+export default class TickerCard extends Component {
+  render() {
+    const { ticker } = this.props;
+    return (
+      <div className="token-symbol-wrapper">
+        <div className="pui-page-box">
+          <h3>Configure New Security Token</h3>
+          <div style={{ height: '140px' }} />
+          <br />
+          <Link to="/ticker">
+            <Button kind="secondary" className="export-tokens-list-btn">
+              Get Started
+            </Button>
+          </Link>
+        </div>
+      </div>
+    );
+  }
+}

packages/polymath-issuer/src/components/MigrateTokenPage.js

@@ -0,0 +1,36 @@
+import React, { Component } from 'react';
+import { PageCentered, Button, Toaster, notify } from '@polymathnetwork/ui';
+import { Link } from 'react-router-dom';
+
+export default class TickerCard extends Component {
+  render() {
+    const { ticker } = this.props;
+    return (
+      <div className="token-symbol-wrapper">
+        <div className="pui-page-box">
+          <div className="ticker-field">
+            <div className="bx--form-item">
+              <label htmlFor="ticker" className="bx--label">
+                Token Symbol
+              </label>
+              <input
+                type="text"
+                name="ticker"
+                value={ticker}
+                id="ticker"
+                readOnly
+                className="bx--text-input bx--text__input"
+              />
+            </div>
+          </div>
+          <br />
+          <Link to={`/dashboard/${ticker}`}>
+            <Button kind="secondary" className="export-tokens-list-btn">
+              Open Dashboard
+            </Button>
+          </Link>
+        </div>
+      </div>
+    );
+  }
+}