[beta] UI backports (#4809)

* Update Wallet to new Wallet Code (#4805)

* Update Wallet Version

* Update Wallet Library

* Update Wallets Bytecodes

* Typo

* Separate Deploy in Contract API

* Use the new Wallet ABI // Update wallet code

* WIP .// Deploy from Wallet

* Update Wallet contract

* Contract Deployment for Wallet

* Working deployments for Single Owned Wallet contracts

* Linting

* Create a Wallet from a Wallet

* Linting

* Fix Signer transactions // Add Gas Used for transactions

* Deploy wallet contract fix

* Fix too high gas estimate for Wallet Contract Deploys

* Final piece ; deploying from Wallet owned by wallet

* Update Wallet Code

* Updated the Wallet Codes

* Fixing Wallet Deployments

* Add Support for older wallets

* Linting

* SMS Faucet (#4774)

* Faucet

* Remove flakey button-index testing

* Only display faucet when sms verified (mainnet)

* simplify availability checks

* WIP

* Resuest from verified -> verified

* Update endpoint, display response text

* Error icon on errors

* Parse hash text response

* Use /api/:address endpoint

* hash -> data

* Adjust sms-certified message

* Fix SectionList hovering issue (#4749)

* Fix SectionList Items hover when <3 items

* Even easier...

* lint (new)

js/src/modals/DeployContract/deployContract.js

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { pick, omitBy } from 'lodash';
+import { pick } from 'lodash';
 import { observer } from 'mobx-react';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
@@ -23,6 +23,7 @@ import { connect } from 'react-redux';
 import { BusyStep, Button, CompletedStep, CopyToClipboard, GasPriceEditor, IdentityIcon, Portal, TxHash, Warning } from '~/ui';
 import { CancelIcon, DoneIcon } from '~/ui/Icons';
 import { ERRORS, validateAbi, validateCode, validateName } from '~/util/validation';
+import { deploy, deployEstimateGas } from '~/util/tx';
 
 import DetailsStep from './DetailsStep';
 import ParametersStep from './ParametersStep';
@@ -73,7 +74,7 @@ class DeployContract extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired,
     store: PropTypes.object.isRequired
-  }
+  };
 
   static propTypes = {
     accounts: PropTypes.object.isRequired,
@@ -422,9 +423,9 @@ class DeployContract extends Component {
       from: fromAddress
     };
 
-    api
-      .newContract(abiParsed)
-      .deployEstimateGas(options, params)
+    const contract = api.newContract(abiParsed);
+
+    deployEstimateGas(contract, options, params)
       .then(([gasEst, gas]) => {
         this.gasStore.setEstimated(gasEst.toFixed(0));
         this.gasStore.setGas(gas.toFixed(0));
@@ -490,6 +491,17 @@ class DeployContract extends Component {
     const { api, store } = this.context;
     const { source } = this.props;
     const { abiParsed, code, description, name, params, fromAddress } = this.state;
+
+    const metadata = {
+      abi: abiParsed,
+      contract: true,
+      deleted: false,
+      timestamp: Date.now(),
+      name,
+      description,
+      source
+    };
+
     const options = {
       data: code,
       from: fromAddress
@@ -499,28 +511,25 @@ class DeployContract extends Component {
 
     const contract = api.newContract(abiParsed);
 
-    contract
-      .deploy(options, params, this.onDeploymentState)
+    deploy(contract, options, params, metadata, this.onDeploymentState)
       .then((address) => {
-        const blockNumber = contract._receipt
+        // No contract address given, might need some confirmations
+        // from the wallet owners...
+        if (!address || /^(0x)?0*$/.test(address)) {
+          return false;
+        }
+
+        metadata.blockNumber = contract._receipt
           ? contract.receipt.blockNumber.toNumber()
           : null;
 
         return Promise.all([
           api.parity.setAccountName(address, name),
-          api.parity.setAccountMeta(address, {
-            abi: abiParsed,
-            contract: true,
-            timestamp: Date.now(),
-            deleted: false,
-            blockNumber,
-            description,
-            source
-          })
+          api.parity.setAccountMeta(address, metadata)
         ])
         .then(() => {
           console.log(`contract deployed at ${address}`);
-          this.setState({ step: 'DEPLOYMENT', address });
+          this.setState({ step: 'COMPLETED', address });
         });
       })
       .catch((error) => {
@@ -589,6 +598,17 @@ class DeployContract extends Component {
         });
         return;
 
+      case 'confirmationNeeded':
+        this.setState({
+          deployState: (
+            <FormattedMessage
+              id='deployContract.state.confirmationNeeded'
+              defaultMessage='The operation needs confirmations from the other owners of the contract'
+            />
+          )
+        });
+        return;
+
       case 'completed':
         this.setState({
           deployState: (
@@ -614,17 +634,14 @@ class DeployContract extends Component {
 function mapStateToProps (initState, initProps) {
   const { accounts } = initProps;
 
-  // Skip Wallet accounts : they can't create Contracts
-  const _accounts = omitBy(accounts, (a) => a.wallet);
-
-  const fromAddresses = Object.keys(_accounts);
+  const fromAddresses = Object.keys(accounts);
 
   return (state) => {
     const balances = pick(state.balances.balances, fromAddresses);
     const { gasLimit } = state.nodeStatus;
 
     return {
-      accounts: _accounts,
+      accounts,
       balances,
       gasLimit
     };