Merge fa49b39 into 119551a

poanetwork · Aug 28, 2018 · 1d4bebd · 1d4bebd
2 parents 119551a + fa49b39
commit 1d4bebd
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/src/components/Common/NoWeb3.js b/src/components/Common/NoWeb3.js
@@ -7,9 +7,13 @@ export default class NoWeb3 extends Component {
         <section className="home">
           <div className="crowdsale">
             <div className="container">
-              <h1 className="title">MetaMask Not Found</h1>
+              <h1 className="title">Wallet Not Found</h1>
               <p className="description">
-                You don't have MetaMask installed. Check Token Wizard GitHub for{' '}
+                You don't have
+                <a href="https://chrome.google.com/webstore/detail/nifty-wallet/jbdaocneiiinmjbjlgalhcelgbejmnid">
+                  a Wallet
+                </a>
+                installed. Check Token Wizard GitHub for{' '}
                 <a href="https://github.com/poanetwork/token-wizard" target="blank">
                   the instruction
                 </a>.

diff --git a/src/components/contribute/ContributeForm.js b/src/components/contribute/ContributeForm.js
@@ -83,7 +83,7 @@ export const ContributeForm = inject('contributeStore', 'tokenStore')(
             onChange={e => updateContributeThrough(e.target.value)}
           >
             <option disabled={!web3Available} value={CONTRIBUTION_OPTIONS.METAMASK}>
-              Metamask {!web3Available ? ' (not available)' : null}
+              Wallet {!web3Available ? ' (not available)' : null}
             </option>
             <option value={CONTRIBUTION_OPTIONS.QR}>QR</option>
           </select>

diff --git a/src/components/contribute/index.js b/src/components/contribute/index.js
@@ -670,9 +670,13 @@ export class Contribute extends React.Component {
             </div>
             <p className="contribute-title">Contribute page</p>
             <p className="contribute-description">
-              {
-                'Here you can contribute in the crowdsale campaign. At the moment, you need Metamask client to contribute into the crowdsale.'
-              }
+              {'Here you can contribute in the crowdsale campaign. At the moment, you need' +
+                (
+                  <a href="https://chrome.google.com/webstore/detail/nifty-wallet/jbdaocneiiinmjbjlgalhcelgbejmnid">
+                    a Wallet
+                  </a>
+                ) +
+                'client to contribute into the crowdsale.'}
             </p>
           </div>
           <div className={rightColumnClasses}>

diff --git a/src/utils/alerts.js b/src/utils/alerts.js
@@ -1,20 +1,20 @@
 import sweetAlert2 from 'sweetalert2'
 import { weiToGwei } from './utils'
 import { DEPLOYMENT_VALUES, LIMIT_RESERVED_ADDRESSES, LIMIT_WHITELISTED_ADDRESSES } from './constants'
-
 export function noMetaMaskAlert() {
   sweetAlert2({
     title: 'Warning',
     html:
-      "You don't have Metamask installed. Check Token Wizard GitHub for <a href='https://github.com/poanetwork/token-wizard' target='blank'>the instruction</a>.",
+      "You don't have  <a href='https://chrome.google.com/webstore/detail/nifty-wallet/jbdaocneiiinmjbjlgalhcelgbejmnid'>" +
+      "a Wallet </a> installed. Check Token Wizard GitHub for <a href='https://github.com/poanetwork/token-wizard' target='blank'>the instruction</a>.",
     type: 'warning'
   })
 }
 
 export function MetaMaskIsLockedAlert() {
   sweetAlert2({
     title: 'Warning',
-    html: 'You signed out from Metamask. Open Metamask extension and sign in.',
+    html: 'You signed out from your Wallet. Open your Wallet extension and sign in.',
     type: 'warning'
   })
 }
@@ -103,7 +103,7 @@ export function incorrectNetworkAlert(correctNetworkName, incorrectNetworkName)
       correctNetworkName +
       ' network</b>. But you are connected to <b>' +
       incorrectNetworkName +
-      ' network</b>. Please, change connection in MetaMask plugin.',
+      ' network</b>. Please, change connection in your Wallet extension.',
     type: 'warning'
   })
 }
@@ -125,7 +125,7 @@ export function warningOnMainnetAlert(tiersCount, priceSelected, reservedCount,
 
   sweetAlert2({
     title: 'Warning',
-    html: `You are about to sign ${estimatedTxsCount} TXs. You will see an individual Metamask windows for each of it.
+    html: `You are about to sign ${estimatedTxsCount} TXs. You will see an individual Wallet windows for each of it.
      Please don't open two or more instances of Wizard in one browser. Token Wizard will create ${tiersCount}-tier(s)
      crowdsale for you. The total cost will be around ${estimatedCost.toFixed(2)} ETH. Are you sure you want to
      proceed?`,

diff --git a/src/utils/blockchainHelpers.js b/src/utils/blockchainHelpers.js
@@ -485,7 +485,7 @@ export let getCurrentAccount = () => {
   const { web3 } = web3Store
   return new Promise((resolve, reject) => {
     if (!web3) {
-      reject('no MetaMask')
+      reject('no Wallet')
     }
     web3.eth.getAccounts().then(accounts => {
       if (accounts.length === 0) {

diff --git a/test/components/contribute/__snapshots__/ContributeForm.spec.js.snap b/test/components/contribute/__snapshots__/ContributeForm.spec.js.snap
@@ -405,7 +405,7 @@ exports[`ContributeForm should render ContributeForm component 1`] = `
         disabled={false}
         value="metamask"
       >
-        Metamask 
+        Wallet 
       </option>
       <option
         value="qr"
@@ -498,7 +498,7 @@ exports[`ContributeForm should render ContributeForm component and its children
         disabled={false}
         value="metamask"
       >
-        Metamask 
+        Wallet 
       </option>
       <option
         value="qr"