Merge pull request #16 from SuperNETorg/v0.25

beer, pizza test coins

react/src/actions/actions/addCoin.js

@@ -39,7 +39,7 @@ export function activeHandle() {
           'Error',
           'error'
         )
-      )
+      );
     })
     .then(response => response.json())
     .then(json => {
@@ -150,7 +150,7 @@ export function shepherdHerd(coin, mode, path, startupParams) {
       '-daemon=0',
       '-server',
       `-ac_name=${coin}`,
-      '-addnode=78.47.196.146',
+      coin === 'BEER' || coin === 'PIZZA' ? '-addnode=24.54.206.138' : '-addnode=78.47.196.146',
     ],
   };
 

react/src/components/addcoin/addcoinOptionsAC.js

@@ -22,12 +22,14 @@ const addCoinOptionsAC = () => {
     'wlc',
     'axo',
     'etomic',
-    'btch'
+    'btch',
+    'beer',
+    'pizza'
   ];
   let _items = [];
 
   for (let i = 0; i < _assetChains.length; i++) {
-    let availableModes = _assetChains[i] !== 'kv' && _assetChains[i] !== 'axo' && _assetChains[i] !== 'etomic' ? 'spv|native' : 'native';
+    let availableModes = _assetChains[i] !== 'kv' && _assetChains[i] !== 'axo' && _assetChains[i] !== 'etomic' && _assetChains[i] !== 'beer' && _assetChains[i] !== 'pizza' ? 'spv|native' : 'native';
 
     if (mainWindow.arch !== 'x64') {
       availableModes = 'spv';

react/src/components/addcoin/payload.js

@@ -24,6 +24,8 @@ export function checkAC(coinVal) {
 			coinVal === 'AXO' ||
 			coinVal === 'ETOMIC' ||
 			coinVal === 'BTCH' ||
+			coinVal === 'BEER' ||
+			coinVal === 'PIZZA' ||
 			coinVal === 'USD' ||
 			coinVal === 'RON' ||
 			coinVal === 'EUR' ||
@@ -118,7 +120,9 @@ export function checkCoinType(coin) {
 			coin === 'MNZ' ||
 			coin === 'AXO' ||
 			coin === 'ETOMIC' ||
-			coin === 'BTCH') {
+			coin === 'BTCH' ||
+			coin === 'BEER' ||
+			coin === 'PIZZA') {
 		return 'ac';
 	}
 
@@ -201,6 +205,12 @@ export function startAssetChain(confpath, coin, mode, getSuppyOnly) {
 		BTCH: {
 			supply: 20998641,
 		},
+		BEER: {
+			supply: 100000000,
+		},
+		PIZZA: {
+			supply: 100000000,
+		},
 	};
 
 	if (mode === '-1') {

react/src/components/dashboard/sendCoin/sendCoin.render.js

@@ -53,7 +53,8 @@ export const _SendFormRender = function() {
       <div className="row">
         <div className="col-xlg-12 form-group form-material">
           { this.props.ActiveCoin.mode === 'spv' &&
-            <button type="button"
+            <button
+              type="button"
               className="btn btn-default btn-send-self"
               onClick={ this.setSendToSelf }>
               { translate('SEND.SELF') }
@@ -75,7 +76,8 @@ export const _SendFormRender = function() {
         </div>
         <div className="col-lg-12 form-group form-material">
           { this.props.ActiveCoin.mode === 'spv' &&
-            <button type="button"
+            <button
+              type="button"
               className="btn btn-default btn-send-self"
               onClick={ this.setSendAmountAll }>
               { translate('SEND.ALL') }

react/src/components/dashboard/tools/tools.js

@@ -663,14 +663,14 @@ class Tools extends React.Component {
                   <div className="col-sm-12 form-group form-material no-padding-left">
                     <label
                       className="control-label col-sm-1 no-padding-left"
-                      htmlFor="kmdWalletSendTo">Address</label>
+                      htmlFor="kmdWalletSendTo">WIF</label>
                     <input
                       type="text"
                       className="form-control col-sm-3"
                       name="w2wWif"
                       onChange={ this.updateInput }
                       value={ this.state.w2wWif }
-                      placeholder={ translate('SEND.ENTER_ADDRESS') }
+                      placeholder="Enter a WIF"
                       autoComplete="off"
                       required />
                   </div>
@@ -712,14 +712,14 @@ class Tools extends React.Component {
                   <div className="col-sm-12 form-group form-material no-padding-left">
                     <label
                       className="control-label col-sm-1 no-padding-left"
-                      htmlFor="kmdWalletSendTo">Address</label>
+                      htmlFor="kmdWalletSendTo">Passphrase</label>
                     <input
                       type="text"
                       className="form-control col-sm-3"
                       name="s2wSeed"
                       onChange={ this.updateInput }
                       value={ this.state.s2wSeed }
-                      placeholder={ translate('SEND.ENTER_ADDRESS') }
+                      placeholder="Enter a passphrase"
                       autoComplete="off"
                       required />
                   </div>

react/src/components/login/login.render.js

@@ -24,7 +24,6 @@ const LoginRender = function() {
               height="160"
               alt="SuperNET Agama" />
           </div>
-
           <div className="login-settings-dropdown margin-bottom-30">
             <div>
               <span
@@ -207,7 +206,9 @@ const LoginRender = function() {
               </button>
               <button
                 className="btn btn-lg btn-flat btn-block waves-effect hide"
-                id="logint-another-wallet">{ translate('INDEX.LOGIN_ANOTHER_WALLET') }</button>
+                id="logint-another-wallet">
+                { translate('INDEX.LOGIN_ANOTHER_WALLET') }
+              </button>
               <button
                 className="btn btn-lg btn-flat btn-block waves-effect margin-top-20"
                 id="register-btn"
@@ -421,12 +422,16 @@ const LoginRender = function() {
               <button
                 type="button"
                 className="btn btn-primary btn-block"
-                onClick={ this.handleRegisterWallet }>{ translate('INDEX.REGISTER') }</button>
+                onClick={ this.handleRegisterWallet }>
+                { translate('INDEX.REGISTER') }
+              </button>
               <div className="form-group form-material floating">
                 <button
                   className="btn btn-lg btn-flat btn-block waves-effect"
                   id="register-back-btn"
-                  onClick={ () => this.updateActiveLoginSection('login') }>{ translate('INDEX.BACK_TO_LOGIN') }</button>
+                  onClick={ () => this.updateActiveLoginSection('login') }>
+                  { translate('INDEX.BACK_TO_LOGIN') }
+                </button>
               </div>
             </div>
           </div>

react/src/translate/en.js

@@ -845,6 +845,8 @@ export const LANG_EN = {
     'AXO': 'AXO (AXO)',
     'ETOMIC': 'ETOMIC (ETOMIC)',
     'BTCH': 'BTCH (BTCH)',
+    'BEER': 'BEER (Test coin)',
+    'PIZZA': 'PIZZA (Test coin)',
   },
   'DEX': {
     'GEN_NEW_PASSPHRASE': 'Generate a new passphrase',

react/src/util/coinHelper.js

@@ -6,6 +6,14 @@ export function getCoinTitle(coin) {
   let hideTitle = false;
 
   switch (coin) {
+    case 'BEER':
+      coinlogo = 'beer';
+      coinname = 'BEER (Test coin)';
+      break;
+    case 'PIZZA':
+      coinlogo = 'pizza';
+      coinname = 'PIZZA (Test coin)';
+      break;
     case 'XMY':
       coinlogo = 'xmy';
       coinname = 'Myriad';