Merge pull request #697 from PolymathNetwork/develop

FahdW · web-flow · commit 9feb9f18c5a9 · 2020-01-20T12:44:29.000-05:00
2.4.1
diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
     ]
   },
   "engines": {
-    "node": ">=8.11.4 <=10.17.0",
-    "yarn": ">=1.12.3 <=1.19.1",
+    "node": "8.x || 10.x",
+    "yarn": "1.x",
     "npm": "6.11.3"
   },
   "version": "1.0.0-beta.0",
diff --git a/packages/new-polymath-ui/src/components/Footer/Footer.tsx b/packages/new-polymath-ui/src/components/Footer/Footer.tsx
@@ -25,7 +25,7 @@ export const Footer = (props: FooterProps) => {
               <Link
                 href={
                   props.termsOfServiceUrl ||
-                  'https://polymath.network/termsofservice.html'
+                  'https://polymath.network/terms-of-service'
                 }
               >
                 Terms Of Service
@@ -35,7 +35,7 @@ export const Footer = (props: FooterProps) => {
               <Link
                 href={
                   props.privacyPolicyUrl ||
-                  'https://polymath.network/privacypolicy.html'
+                  'https://polymath.network/privacy-policy'
                 }
               >
                 Privacy Policy
diff --git a/packages/polymath-issuer/public/providers/advisory/bg/img-bitcoin-suisse.png b/packages/polymath-issuer/public/providers/advisory/bg/img-bitcoin-suisse.png
diff --git a/packages/polymath-issuer/public/providers/advisory/bitcoin-suisse.png b/packages/polymath-issuer/public/providers/advisory/bitcoin-suisse.png
diff --git a/packages/polymath-issuer/public/providers/custody/bg/img-koine.png b/packages/polymath-issuer/public/providers/custody/bg/img-koine.png
diff --git a/packages/polymath-issuer/public/providers/custody/koine.png b/packages/polymath-issuer/public/providers/custody/koine.png
diff --git a/packages/polymath-issuer/public/providers/legal/bg/img-nelliskatz.png b/packages/polymath-issuer/public/providers/legal/bg/img-nelliskatz.png
diff --git a/packages/polymath-issuer/public/providers/legal/nelliskatz.png b/packages/polymath-issuer/public/providers/legal/nelliskatz.png
diff --git a/packages/polymath-issuer/src/components/Dashboard.js b/packages/polymath-issuer/src/components/Dashboard.js
@@ -43,7 +43,6 @@ type StateProps = {|
 type DispatchProps = {|
   fetchToken: (ticker: string) => any,
   fetchProviders: (ticker: string) => any,
-  fetchLegacyToken: (ticker: string) => any,
 |};
 
 const mapStateToProps = (state: RootState): StateProps => ({
@@ -57,7 +56,6 @@ const mapStateToProps = (state: RootState): StateProps => ({
 const mapDispatchToProps: DispatchProps = {
   fetchToken,
   fetchProviders,
-  fetchLegacyToken,
 };
 
 type Props = {|
@@ -74,7 +72,6 @@ class Dashboard extends Component<Props> {
   componentDidMount() {
     const ticker = this.props.match.params.id;
 
-    this.props.fetchLegacyToken(ticker);
     this.props.fetchToken(ticker);
     this.props.fetchProviders(ticker);
   }
diff --git a/packages/polymath-issuer/src/pages/home/index.js b/packages/polymath-issuer/src/pages/home/index.js
@@ -12,21 +12,20 @@ class HomePage extends Component {
         <div className="splash-background" />
         <div>
           <h1 className="pui-h0">
-            The Next Mega-Trend
+            Start Your Security Token
             <br />
-            in Crypto is the Emergence
-            <br /> of Securities Tokens
+            Journey Here
           </h1>
           <h3 className="pui-h3">
-            Polymath enables trillions of dollars of securities to be issued
-            <br /> and traded on the blockchain.
+            Easily reserve your ticker, mint your tokens, and <br />
+            prepare distribution of your STO.
           </h3>
           <br />
           <br />
           <p>
             <Link to="/account">
               <Button id="create-token-btn" icon="arrow--right">
-                Configure your security token
+                Connect Metamask
               </Button>
             </Link>
           </p>
diff --git a/packages/polymath-issuer/src/pages/providers/ApplyForm.js b/packages/polymath-issuer/src/pages/providers/ApplyForm.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form, Button } from 'carbon-components-react';
+import { Form, Button, InlineNotification } from 'carbon-components-react';
 import { connect } from 'react-redux';
 import { withFormik } from 'formik';
 import {
@@ -70,6 +70,21 @@ export const ApplyFormComponent = props => {
   return (
     <Form onSubmit={handleSubmit}>
       <Grid>
+        {networkId !== 1 && (
+          <InlineNotification
+            hideCloseButton
+            title="You are using Token Studio in a testnet environment. When you
+            click submit, an email WILL NOT be sent to the providers you have
+            selected. To send an email to the selected providers, please log
+            into Token Studio with mainnet.
+            
+            None of this information is stored on Polymath servers, only your
+            browser's cache. To clear this information, simply clear your
+            browser's cache."
+            subtitle=""
+            kind="warning"
+          />
+        )}
         <FormItem name="companyName">
           <FormItem.Label>Company Name</FormItem.Label>
           <FormItem.Input
@@ -142,37 +157,18 @@ export const ApplyFormComponent = props => {
           Cancel
         </Button>
         <Button type="submit" style={{ width: '154px' }}>
-          Submit
+          {networkId === 1 ? 'Submit' : 'Send test email'}
         </Button>
       </p>
 
-      {/*
-        We are not going to compare networkId to MAINNET_NETWORK_ID constant.
-        The former is a number and the later is a string. Fortunately, mainnet ID is 1 and will always be 1 
-      */}
-      {networkId === 1 ? (
+      {networkId === 1 && (
         <p className="pui-input-hint">
           When you click submit, an email which contains the information entered
           on that screen will be sent to the Advisory firm(s) you have selected.
           None of this information is stored on Polymath servers, only your
           browser&apos;s cache. To clear this information, simply clear your
           browser&apos;s cache.
         </p>
-      ) : (
-        <p className="pui-input-hint">
-          <strong>
-            <em>
-              You are using Token Studio in a testnet environment. When you
-              click submit, an email WILL NOT be sent to the providers you have
-              selected. To send an email to the selected providers, please log
-              into Token Studio with mainnet.
-              <br />
-              None of this information is stored on Polymath servers, only your
-              browser&apos;s cache. To clear this information, simply clear your
-              browser&apos;s cache.
-            </em>
-          </strong>
-        </p>
       )}
       <br />
     </Form>
diff --git a/packages/polymath-issuer/src/pages/providers/data.js b/packages/polymath-issuer/src/pages/providers/data.js
@@ -124,7 +124,7 @@ const providers: Array<ServiceProvider> = [
       'and communications while our Corporate team focuses on the interaction with our technology ecosystem.',
   },
   {
-    id: 23,
+    id: 58,
     cat: 0,
     title: 'Chain Partners',
     logo: '/providers/advisory/chain-par.png',
@@ -262,6 +262,21 @@ const providers: Array<ServiceProvider> = [
       investing in the U.S., Latin America, Africa, and the Caribbean, Logos Capital is based in Miami, FL and comprised of \
       personnel from around the world.',
   },
+  {
+    id: 56,
+    cat: 0,
+    title: 'Bitcoin Suisse AG',
+    logo: '/providers/advisory/bitcoin-suisse.png',
+    background: '/providers/advisory/bg/img-bitcoin-suisse.png',
+    desc:
+      "Founded in 2013, Bitcoin Suisse AG (BTCS) has been a pioneer in providing crypto-financial services. \
+      It has helped to shape the crypto- and blockchain-ecosystem in Switzerland and has been a driving force \
+      in the development of the 'Crypto Valley' and 'Crypto Nation Switzerland'. As a regulated Swiss financial \
+      intermediary (SRO – VQF member) since 2014, BTCS has become a market leader in prime brokerage, storage, \
+      lending, staking, tokenization, and other crypto-financial services catered to the needs of private, institutional, \
+      and corporate clients. BTCS built a team of over 110 highly qualified experts at its locations in Zug, Copenhagen, \
+      and Liechtenstein.",
+  },
 
   // LEGAL
   {
@@ -453,6 +468,20 @@ const providers: Array<ServiceProvider> = [
       managers as well as for exchanges, trading facilities, trade repositories, representative \
       offices or applications to self-regulatory organizations for anti-money laundering compliance.',
   },
+  {
+    id: 59,
+    cat: 1,
+    title: 'Nellis & Katz LLP',
+    logo: '/providers/legal/nelliskatz.png',
+    background: '/providers/legal/bg/img-nelliskatz.png',
+    desc:
+      'Nellis & Katz LLP is a team of Wall Street trained lawyers with years of experience.  \
+    Our passion is helping clients build better businesses.  As seasoned securities lawyers, we work \
+    alongside our clients in helping them achieve their fundraising and business goals.  As an evolving practice, \
+    we advise our clients in respect of both traditional and innovative fundraising platforms, which has led to the \
+    establishment of our blockchain and digital securities practice.  Our knowledge of securities law and deep engagement \
+    with new technology positions us to be a valued provider to issuers and platforms for digital securities.',
+  },
 
   // KYC/AML
   {
@@ -729,6 +758,19 @@ const providers: Array<ServiceProvider> = [
       maximum user-friendliness with the highest security levels available in the market. \
       \nFinoa is aiming to become a regulated custodial institution starting in 2020.',
   },
+  {
+    id: 57,
+    cat: 4,
+    title: 'Koine',
+    logo: '/providers/custody/koine.png',
+    background: '/providers/custody/bg/img-koine.png',
+    desc:
+      "Headquartered in London, Koine is regulated by the FCA exclusively as a payment institution for the issuance of electronic money. \
+      Koine's offer also includes custody, distribution and DVP settlement of digital assets and FIAT to institutional investors, brokers \
+      and non-security token issuers. Following the best practices of traditional custodians and thanks to a blend of ground-up architecture, \
+      governance, team and systems, Koine model eliminates settlement and counterparty risks by enforcing DVP, responding to the needs of the \
+      institutional world.",
+  },
 
   // TOKEN SALE PLATFORMS
   {
diff --git a/packages/polymath-issuer/src/pages/providers/style.scss b/packages/polymath-issuer/src/pages/providers/style.scss
@@ -1,5 +1,6 @@
 .tag-my-own {
   background-color: #5596e6 !important;
+  margin-top: 5px;
 }
 
 .providers-controls {
@@ -125,7 +126,6 @@
 
     .bx--tabs__nav-link {
       padding: 16px 24px 36px 24px;
-      width: 200px;
       font-size: 16px;
       font-weight: 600;
       color: #5a6872;
@@ -135,8 +135,9 @@
       }
 
       div {
-        display: inline-flex;
+        display: flex;
         align-items: center;
+        flex-direction: column;
       }
     }
 
diff --git a/packages/polymath-issuer/src/pages/sto/components/STOTemplate/Component.js b/packages/polymath-issuer/src/pages/sto/components/STOTemplate/Component.js
@@ -2,7 +2,7 @@
 /* eslint-disable jsx-a11y/label-has-for */
 
 import React, { Component, Fragment } from 'react';
-import { Button, Icon } from 'carbon-components-react';
+import { Button, Icon, InlineNotification } from 'carbon-components-react';
 import {
   Box,
   Grid,
@@ -41,6 +41,24 @@ export default class STOTemplateComponent extends Component<Props> {
         <Paragraph>{stoModule.description}</Paragraph>
       </LabeledItem>
     );
+    const investorsNote = (
+      <InlineNotification
+        hideCloseButton
+        title={
+          <p>
+            Please make note to your investors that they may need to{' '}
+            <a href="https://metamask.zendesk.com/hc/en-us/articles/360015488771-How-to-Adjust-Gas-Price-and-Gas-Limit-">
+              adjust the gas limit in metamask
+            </a>{' '}
+            to 450000 in order to successfully participate in your STO. If gas
+            limit of 450,000 does not work, please ask them to increase the
+            limit slightly by 150,000 until the transaction goes through.'
+          </p>
+        }
+        subtitle=""
+        kind="warning"
+      />
+    );
     const verifiedOnEtherscan = (
       <LabeledItem>
         <LabeledItem.Label>Verified on Etherscan</LabeledItem.Label>
@@ -99,6 +117,7 @@ export default class STOTemplateComponent extends Component<Props> {
             <Grid.Col gridSpan={[12, 8]}>
               {authorAddress}
               {desc}
+              {investorsNote}
             </Grid.Col>
             <Grid.Col gridColumn={['1 / 13', '9 / span 4', '10 / span 3']}>
               {verifiedOnEtherscan}
diff --git a/packages/polymath-js/src/contracts/Contract.js b/packages/polymath-js/src/contracts/Contract.js
@@ -257,9 +257,12 @@ export default class Contract {
     };
 
     try {
-      receipt = await method.send(params);
-      const { transactionHash } = receipt;
-      Contract._params.txHashCallback(transactionHash);
+      receipt = await method.send(params, (error, hash) => {
+        if (!error) {
+          txHash = hash;
+          Contract._params.txHashCallback(hash);
+        }
+      });
     } catch (e) {
       if (e.message.includes('not mined within 50 blocks')) {
         return new Promise(resolve => {
diff --git a/packages/polymath-js/src/contracts/CountTransferManager.js b/packages/polymath-js/src/contracts/CountTransferManager.js
@@ -28,6 +28,6 @@ export default class CountTransferManager extends Contract {
   }
 
   async changeHolderCount(count: number): Promise<Web3Receipt> {
-    return this._tx(this._methods.changeHolderCount(count));
+    return this._tx(this._methods.changeHolderCount(count), null, 1.5, 15);
   }
 }
diff --git a/packages/polymath-js/src/contracts/SecurityTokenRegistry.js b/packages/polymath-js/src/contracts/SecurityTokenRegistry.js
@@ -237,7 +237,7 @@ class SecurityTokenRegistry extends Contract {
           token.isDivisible
         ),
         null,
-        1.05,
+        1.5,
         15
       );
     }
@@ -251,7 +251,7 @@ class SecurityTokenRegistry extends Contract {
         0 // if _protocolVersion == 0 then latest version of securityToken will be generated
       ),
       null,
-      1.05,
+      1.5,
       15
     );
   }
diff --git a/packages/polymath-ui/src/components/Footer/Footer.js b/packages/polymath-ui/src/components/Footer/Footer.js
@@ -83,7 +83,7 @@ const Footer = (props: Props) => {
               <a
                 href={
                   props.termsOfService ||
-                  'https://polymath.network/termsofservice.html'
+                  'https://polymath.network/terms-of-service'
                 }
                 target="_blank"
                 rel="noopener noreferrer"
@@ -95,7 +95,7 @@ const Footer = (props: Props) => {
               <a
                 href={
                   props.privacyPolicy ||
-                  'https://polymath.network/privacypolicy.html'
+                  'https://polymath.network/privacy-policy'
                 }
                 target="_blank"
                 rel="noopener noreferrer"
diff --git a/packages/polymath-ui/src/components/Footer/__tests__/__snapshots__/Footer.js.snap b/packages/polymath-ui/src/components/Footer/__tests__/__snapshots__/Footer.js.snap
@@ -92,7 +92,7 @@ exports[`renders without crashing 1`] = `
         class="pui-footer-text"
       >
         © 
-        2019
+        2020
          
         Polymath
       </span>
@@ -101,7 +101,7 @@ exports[`renders without crashing 1`] = `
       >
         <li>
           <a
-            href="https://polymath.network/termsofservice.html"
+            href="https://polymath.network/terms-of-service"
             rel="noopener noreferrer"
             target="_blank"
           >
@@ -110,7 +110,7 @@ exports[`renders without crashing 1`] = `
         </li>
         <li>
           <a
-            href="https://polymath.network/privacypolicy.html"
+            href="https://polymath.network/privacy-policy"
             rel="noopener noreferrer"
             target="_blank"
           >
diff --git a/packages/polymath-ui/src/components/SignUpPage/SignUpForm.js b/packages/polymath-ui/src/components/SignUpPage/SignUpForm.js
@@ -71,7 +71,7 @@ class SignUpForm extends Component<Props> {
                 I accept the&nbsp;
                 <Link
                   target="_blank"
-                  href="https://polymath.network/termsofservice.html"
+                  href="https://polymath.network/terms-of-service"
                 >
                   Terms of Service
                 </Link>

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export const Footer = (props: FooterProps) => {`
`25`	`25`	`<Link`
`26`	`26`	`href={`
`27`	`27`	`props.termsOfServiceUrl \|\|`
`28`		`- 'https://polymath.network/termsofservice.html'`
	`28`	`+ 'https://polymath.network/terms-of-service'`
`29`	`29`	`}`
`30`	`30`	`>`
`31`	`31`	`Terms Of Service`
`@@ -35,7 +35,7 @@ export const Footer = (props: FooterProps) => {`
`35`	`35`	`<Link`
`36`	`36`	`href={`
`37`	`37`	`props.privacyPolicyUrl \|\|`
`38`		`- 'https://polymath.network/privacypolicy.html'`
	`38`	`+ 'https://polymath.network/privacy-policy'`
`39`	`39`	`}`
`40`	`40`	`>`
`41`	`41`	`Privacy Policy`