-
-
-
-
-
-
Ethereum
-
- {balance}
- ETH
-
-
+
- {+fromWei(tx.value)} ETH
+ {token.amount} {token.symbol}
@@ -116,7 +72,7 @@ class Signer extends Component {
{tx.to}
-
+
diff --git a/packages/light-react/src/Send/TokenBalance/TokenBalance.js b/packages/light-react/src/Send/TokenBalance/TokenBalance.js
new file mode 100644
index 0000000000000000000000000000000000000000..f588b01b7d4ebe8f94fc404badb5616d39f1f697
--- /dev/null
+++ b/packages/light-react/src/Send/TokenBalance/TokenBalance.js
@@ -0,0 +1,48 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import React, { Component } from 'react';
+import abi from '@parity/shared/lib/contracts/abi/eip20';
+import { defaultAccount$, makeContract$, myBalance$ } from '@parity/light.js';
+import { fromWei } from '@parity/api/lib/util/wei';
+import light from 'light-hoc';
+import { map, switchMap } from 'rxjs/operators';
+import PropTypes from 'prop-types';
+
+@light({
+ balance: ({ token: { address, decimals } }) =>
+ address === 'ETH'
+ ? myBalance$().pipe(map(value => fromWei(value).toFixed(6))) // Get balance for Eth
+ : defaultAccount$().pipe(
+ switchMap(
+ defaultAccount =>
+ makeContract$(address, abi).balanceOf$(defaultAccount) // Call ERC20 contract for token
+ ),
+ map(value => value.div(10 ** decimals).toFixed(6))
+ )
+})
+class TokenBalance extends Component {
+ static propTypes = {
+ token: PropTypes.object.isRequired
+ };
+
+ render () {
+ const { balance, token } = this.props;
+ return (
+
+
+
+
+
{token.name}
+
+ {balance}
+ {token.symbol}
+
+
+ );
+ }
+}
+
+export default TokenBalance;
diff --git a/packages/light-react/src/Tokens/TokensList/BalanceLayout/index.js b/packages/light-react/src/Send/TokenBalance/index.js
similarity index 61%
rename from packages/light-react/src/Tokens/TokensList/BalanceLayout/index.js
rename to packages/light-react/src/Send/TokenBalance/index.js
index b7448e7b912bdc2c45e689804a6f9a479d582aa4..967cc1796f3c60e94885ff487ced891ee59904fc 100644
--- a/packages/light-react/src/Tokens/TokensList/BalanceLayout/index.js
+++ b/packages/light-react/src/Send/TokenBalance/index.js
@@ -3,6 +3,6 @@
//
// SPDX-License-Identifier: MIT
-import BalanceLayout from './BalanceLayout';
+import TokenBalance from './TokenBalance';
-export default BalanceLayout;
+export default TokenBalance;
diff --git a/packages/light-react/src/Send/TxForm/TxForm.js b/packages/light-react/src/Send/TxForm/TxForm.js
new file mode 100644
index 0000000000000000000000000000000000000000..84ba02a306e274551d3b70826fb63caa709d2f6e
--- /dev/null
+++ b/packages/light-react/src/Send/TxForm/TxForm.js
@@ -0,0 +1,148 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import React, { Component } from 'react';
+import { defaultAccount$ } from '@parity/light.js';
+import { fromWei, toWei } from '@parity/api/lib/util/wei'; // TODO @parity/api's wei util should have Gwei as an unit
+import { inject, observer } from 'mobx-react';
+import light from 'light-hoc';
+import { Link } from 'react-router-dom';
+
+import TokenBalance from '../TokenBalance';
+
+const MAX_GAS_PRICE = 40; // In Gwei
+const MIN_GAS_PRICE = 3; // Safelow gas price from GasStation, in Gwei
+
+@light({
+ defaultAccount: defaultAccount$
+})
+@inject('sendStore')
+@observer
+class Send extends Component {
+ state = {
+ amount: 0.01, // In Ether or in token
+ gasPrice: 4, // in Gwei
+ to: '0x00Ae02834e91810B223E54ce3f9B7875258a1747'
+ };
+
+ handleChangeAmount = ({ target: { value } }) =>
+ this.setState({ amount: value });
+
+ handleChangeGasPrice = ({ target: { value } }) =>
+ this.setState({ gasPrice: value });
+
+ handleChangeTo = ({ target: { value } }) => {
+ this.setState({ to: value }, () => {
+ // Estimate the gas to this address.
+ this.props.sendStore.estimateGas(this.state);
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+ const { defaultAccount, history, sendStore } = this.props;
+ const { amount, gasPrice, to } = this.state;
+
+ // Post a request to the transaction. There is a next step to sign this
+ // request.
+ sendStore.postTx({
+ from: defaultAccount,
+ gasPrice: toWei(gasPrice, 'shannon'), // shannon == gwei
+ to,
+ value: toWei(amount)
+ });
+
+ history.push('/send/signer');
+ };
+
+ render () {
+ const {
+ sendStore: { estimated, token }
+ } = this.props;
+ const { amount, gasPrice, to } = this.state;
+
+ return (
+
+
+
+
+ );
+ }
+}
+
+export default Send;
diff --git a/packages/light-react/src/Send/TxForm/index.js b/packages/light-react/src/Send/TxForm/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..f63a12f9fdeca77472c7e69ef8f7eacb0ec2bf4c
--- /dev/null
+++ b/packages/light-react/src/Send/TxForm/index.js
@@ -0,0 +1,8 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import TxForm from './TxForm';
+
+export default TxForm;
diff --git a/packages/light-react/src/Tokens/TokensList/BalanceLayout/BalanceLayout.js b/packages/light-react/src/Tokens/TokensList/BalanceLayout/BalanceLayout.js
deleted file mode 100644
index d662b1b695d5c6f1cf74e40c79c1339840663e22..0000000000000000000000000000000000000000
--- a/packages/light-react/src/Tokens/TokensList/BalanceLayout/BalanceLayout.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-//
-// SPDX-License-Identifier: MIT
-
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const BalanceLayout = ({ balance, token }) => (
-
-
-
-
-
{token.name}
-
- {Number.isFinite(balance) ? balance.toFixed(2) : '...'}{' '}
- {token.symbol}
-
-
-);
-
-BalanceLayout.propTypes = {
- balance: PropTypes.number
-};
-
-export default BalanceLayout;
diff --git a/packages/light-react/src/Tokens/TokensList/EthBalance/EthBalance.js b/packages/light-react/src/Tokens/TokensList/EthBalance/EthBalance.js
deleted file mode 100644
index 6fff3f9368682d571dcfa62659aff0e42b2e58c8..0000000000000000000000000000000000000000
--- a/packages/light-react/src/Tokens/TokensList/EthBalance/EthBalance.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-//
-// SPDX-License-Identifier: MIT
-
-import React, { PureComponent } from 'react';
-import { fromWei } from '@parity/api/lib/util/wei';
-import light from 'light-hoc';
-import { Link } from 'react-router-dom';
-import { map } from 'rxjs/operators';
-import { myBalance$ } from '@parity/light.js';
-import PropTypes from 'prop-types';
-
-import BalanceLayout from '../BalanceLayout';
-
-@light({
- balance: () => myBalance$().pipe(map(value => +fromWei(value)))
-})
-class EthBalance extends PureComponent {
- static propTypes = {
- token: PropTypes.object.isRequired
- };
-
- render () {
- return (
-
-
-
- );
- }
-}
-
-export default EthBalance;
diff --git a/packages/light-react/src/Tokens/TokensList/TokenBalance/TokenBalance.js b/packages/light-react/src/Tokens/TokensList/TokenBalance/TokenBalance.js
index cc8287b860b52df6ce70ce14b566f78be4fadddc..14b8643f63d941d8765e3b4548f7ea6b4b8c765a 100644
--- a/packages/light-react/src/Tokens/TokensList/TokenBalance/TokenBalance.js
+++ b/packages/light-react/src/Tokens/TokensList/TokenBalance/TokenBalance.js
@@ -5,33 +5,57 @@
import React, { Component } from 'react';
import abi from '@parity/shared/lib/contracts/abi/eip20';
-import { defaultAccount$, makeContract$ } from '@parity/light.js';
+import { defaultAccount$, makeContract$, myBalance$ } from '@parity/light.js';
+import { fromWei } from '@parity/api/lib/util/wei';
+import { inject } from 'mobx-react';
import light from 'light-hoc';
-import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router-dom';
import { map, switchMap } from 'rxjs/operators';
import PropTypes from 'prop-types';
-import BalanceLayout from '../BalanceLayout';
-
@light({
balance: ({ token: { address, decimals } }) =>
- defaultAccount$().pipe(
- switchMap(defaultAccount =>
- makeContract$(address, abi).balanceOf$(defaultAccount)
- ),
- map(value => +value.div(10 ** decimals))
- )
+ address === 'ETH'
+ ? myBalance$().pipe(map(value => +fromWei(value)))
+ : defaultAccount$().pipe(
+ switchMap(defaultAccount =>
+ makeContract$(address, abi).balanceOf$(defaultAccount)
+ ),
+ map(value => +value.div(10 ** decimals))
+ )
})
+@inject('sendStore')
+@withRouter
class TokenBalance extends Component {
static propTypes = {
token: PropTypes.object.isRequired
};
+ handleClick = () => {
+ const {
+ history,
+ sendStore,
+ token: { address }
+ } = this.props;
+ sendStore.setTokenAddress(address);
+ history.push('/send');
+ };
+
render () {
+ const { balance, token } = this.props;
return (
-
-
-
+
+
+
+
+
+
{token.name}
+
+ {Number.isFinite(balance) ? balance.toFixed(2) : '...'}{' '}
+ {token.symbol}
+
+
);
}
}
diff --git a/packages/light-react/src/Tokens/TokensList/TokensList.js b/packages/light-react/src/Tokens/TokensList/TokensList.js
index b197dd67dbb68cd0079b29e0833fa4e8277552ff..c6f6c369ab2a9622d6585274f057f8d5ddeb382f 100644
--- a/packages/light-react/src/Tokens/TokensList/TokensList.js
+++ b/packages/light-react/src/Tokens/TokensList/TokensList.js
@@ -6,26 +6,23 @@
import React, { Component } from 'react';
import { inject, observer } from 'mobx-react';
-import EthBalance from './EthBalance';
import TokenBalance from './TokenBalance';
@inject('tokensStore')
@observer
class Tokens extends Component {
render () {
- const { tokensStore: { tokensArray } } = this.props;
+ const {
+ tokensStore: { tokensArray }
+ } = this.props;
return (
- {tokensArray.map(token =>
- -
- {token.address === 'ETH'
- ?
- : }
-
- )}
+ {tokensArray.map(token => (
+ - {}
+ ))}
diff --git a/packages/light-react/src/assets/img/icons/check.svg b/packages/light-react/src/assets/img/icons/check.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9676f1d27f157595b86564da6fa4a1a121371d00
--- /dev/null
+++ b/packages/light-react/src/assets/img/icons/check.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/packages/light-react/src/assets/sass/shared/_basics.scss b/packages/light-react/src/assets/sass/shared/_basics.scss
index dac04efd041147b5a968476b7415abf6431f9ae2..c8b0d1fcc94c6759a71207c46ba61a2506197f8c 100644
--- a/packages/light-react/src/assets/sass/shared/_basics.scss
+++ b/packages/light-react/src/assets/sass/shared/_basics.scss
@@ -5,8 +5,8 @@ html {
body {
user-select: none;
- background-color: #A5BFDA;
- background-image: linear-gradient(#A5BFDA, #BFCDDC);
+ background-color: #a5bfda;
+ background-image: linear-gradient(#a5bfda, #bfcddc);
background-repeat: no-repeat;
background-size: cover;
color: $black;
@@ -21,7 +21,9 @@ body {
display: none;
}
-a, a:link, a:visited {
+a,
+a:link,
+a:visited {
color: $black;
text-decoration: none;
&:hover {
diff --git a/packages/light-react/src/assets/sass/shared/_box.scss b/packages/light-react/src/assets/sass/shared/_box.scss
index 8b298563b1a3670ecc1c5ad3eb6fef288b98c221..df927c7def615455f02324a0ca9736f41824a619 100644
--- a/packages/light-react/src/assets/sass/shared/_box.scss
+++ b/packages/light-react/src/assets/sass/shared/_box.scss
@@ -9,17 +9,17 @@
background-color: $eggshell;
border: 0px solid $eggshell;
overflow: hidden;
- box-shadow: 0 0.125rem 0.5rem rgba($black,0.125);
+ box-shadow: 0 0.125rem 0.5rem rgba($black, 0.125);
&.-clickable {
transition: box-shadow ease 0.125s;
&:hover {
border-color: $blue;
- box-shadow: 0 0.125rem 0.675rem rgba($black,0.175);
+ box-shadow: 0 0.125rem 0.675rem rgba($black, 0.175);
cursor: default;
}
&:active {
border-color: $blue;
- box-shadow: 0 0.125rem 0.325rem rgba($black,0.175);
+ box-shadow: 0 0.125rem 0.325rem rgba($black, 0.175);
cursor: default;
}
}
@@ -28,9 +28,9 @@
&.-card-drawer {
margin: 1rem -2rem -2rem;
padding: 1rem 2rem 2rem;
- border-top: 1px solid lighten($faint,1.25%);
- box-shadow: 0 0.125rem 0.325rem rgba($black,0.075) inset;
- background-color: darken($eggshell,0.75%);
+ border-top: 1px solid lighten($faint, 1.25%);
+ box-shadow: 0 0.125rem 0.325rem rgba($black, 0.075) inset;
+ background-color: darken($eggshell, 0.75%);
}
&.-scroller {
diff --git a/packages/light-react/src/assets/sass/shared/_button.scss b/packages/light-react/src/assets/sass/shared/_button.scss
index d42aa665bc092c602be9b34820d7abf9c3105802..db41ba9d00078a0c8fa70170c3abe3da8a80332d 100644
--- a/packages/light-react/src/assets/sass/shared/_button.scss
+++ b/packages/light-react/src/assets/sass/shared/_button.scss
@@ -15,7 +15,7 @@
}
&:active {
- background-color: darken($blue,2.5%);
+ background-color: darken($blue, 2.5%);
color: $white;
}
@@ -58,7 +58,7 @@
font-size: ms(-3);
border-width: 0;
background-color: $faint;
- color: rgba($black,0.75);
+ color: rgba($black, 0.75);
padding: 0.175rem 0.325rem 0.125rem;
opacity: 0.8;
border-radius: 1rem;
@@ -68,7 +68,7 @@
}
&:active {
- opacity: 1.0;
+ opacity: 1;
}
&.-good {
@@ -86,7 +86,7 @@
font-size: ms(-2);
border-width: 0;
background-color: $faint;
- color: rgba($black,0.75);
+ color: rgba($black, 0.75);
padding: 0.25rem 0.75rem;
opacity: 0.8;
border-radius: 1rem;
@@ -96,7 +96,7 @@
}
&:active {
- opacity: 1.0;
+ opacity: 1;
}
}
diff --git a/packages/light-react/src/assets/sass/shared/_form.scss b/packages/light-react/src/assets/sass/shared/_form.scss
index e28c6b2a6a0159c561ab63a8ddcd4d5bab227f46..5980bbd9e8da350bd6fef73ab2634df0d6c9d293 100644
--- a/packages/light-react/src/assets/sass/shared/_form.scss
+++ b/packages/light-react/src/assets/sass/shared/_form.scss
@@ -1,7 +1,7 @@
.form_field {
margin: 0.5rem 0;
border-radius: 0.25rem;
- background: rgba($faint,0.25);
+ background: rgba($faint, 0.25);
position: relative;
label {
@@ -10,7 +10,7 @@
color: $black;
opacity: 0.75;
padding: 0.5rem 0.5rem 0;
- display: block
+ display: block;
}
.form_field_value {
@@ -25,14 +25,19 @@
word-wrap: break-word;
}
- input[type="text"], input[type="number"], input[type="tel"], input[type="email"], input[type="password"], textarea {
+ input[type='text'],
+ input[type='number'],
+ input[type='tel'],
+ input[type='email'],
+ input[type='password'],
+ textarea {
border: 0;
background: transparent;
font-size: ms(0);
font-weight: 400;
font-family: $mono;
line-height: ms(0) * 1.3;
- width: calc(100% - 1rem;);
+ width: calc(100% - 1rem);
opacity: 0.75;
padding: 0.5rem;
margin-top: -0.25rem;
@@ -41,12 +46,12 @@
}
}
- input[type="range"] {
+ input[type='range'] {
-webkit-appearance: none;
width: calc(100% - 1rem);
height: 0.5rem;
border-radius: 0.5rem;
- background: rgba($faint,0.5);
+ background: rgba($faint, 0.5);
outline: none;
padding: 0;
margin: 0.5rem;
@@ -58,7 +63,7 @@
border-radius: 50%;
background: $grey;
cursor: pointer;
- transition: background .15s ease;
+ transition: background 0.15s ease;
&:hover {
background: $black;
@@ -96,7 +101,8 @@ input.form_field_amount[type='number'] {
text-align: center;
-webkit-appearance: none;
- &::-webkit-inner-spin-button, &::-webkit-outer-spin-button {
+ &::-webkit-inner-spin-button,
+ &::-webkit-outer-spin-button {
opacity: 1;
-webkit-appearance: none;
}
@@ -133,6 +139,6 @@ nav.range-nav {
display: block;
width: 8rem;
text-align: center;
- color: $black
+ color: $black;
}
}
diff --git a/packages/light-react/src/assets/sass/shared/_text.scss b/packages/light-react/src/assets/sass/shared/_text.scss
index a39b6915a96dea990af3f79875f99ad24091f72d..6c0e49d291657310aeb1e5afcc02a67099e3e4ae 100644
--- a/packages/light-react/src/assets/sass/shared/_text.scss
+++ b/packages/light-react/src/assets/sass/shared/_text.scss
@@ -1,5 +1,8 @@
.text {
- p, ul, ol, blockquote {
+ p,
+ ul,
+ ol,
+ blockquote {
margin: 1rem 0;
&:first-child {
margin-top: 0;
@@ -22,6 +25,10 @@
font-size: ms(-1);
}
+ &.-underline {
+ text-decoration: underline;
+ }
+
strong {
font-weight: 500;
}
@@ -30,7 +37,7 @@
user-select: text;
font-family: $mono;
padding: 0.5rem;
- background: rgba($faint,0.25);
+ background: rgba($faint, 0.25);
color: $black;
margin: 0.5rem 0;
font-size: ms(-1);
diff --git a/packages/light-react/src/stores/index.js b/packages/light-react/src/stores/index.js
index 16f1178c62a0fb1744e24266637f17bfcc52f865..b013e638bd52fd1dec09e588d793d218a1a0ae24 100644
--- a/packages/light-react/src/stores/index.js
+++ b/packages/light-react/src/stores/index.js
@@ -7,7 +7,7 @@ import createAccountStore from './createAccountStore';
import healthStore from './healthStore';
import onboardingStore from './onboardingStore';
import parityStore from './parityStore';
-import signerStore from './signerStore';
+import sendStore from './sendStore';
import tokensStore from './tokensStore';
export default {
@@ -15,6 +15,6 @@ export default {
healthStore,
onboardingStore,
parityStore,
- signerStore,
+ sendStore,
tokensStore
};
diff --git a/packages/light-react/src/stores/parityStore.js b/packages/light-react/src/stores/parityStore.js
index b5c7c9e5457e48a49cab6ef060815091128325d0..82e639495f0e57233eb2d52cc76f84004a050565 100644
--- a/packages/light-react/src/stores/parityStore.js
+++ b/packages/light-react/src/stores/parityStore.js
@@ -76,8 +76,8 @@ class ParityStore {
this.api = api;
// TODO This is not working
- // api.on('connected', () => console.log('ehdsfa'));
- // api.on('disconnected', () => console.log('ehdsfa'));
+ // api.on('connected', () => ...);
+ // api.on('disconnected', () => ...);
// So instead, we poll every 1s
setInterval(() => {
this.setIsApiConnected(api.isConnected);
diff --git a/packages/light-react/src/stores/sendStore.js b/packages/light-react/src/stores/sendStore.js
new file mode 100644
index 0000000000000000000000000000000000000000..0db483bb40d0ae5f27ccba65a1cb6799950a73bc
--- /dev/null
+++ b/packages/light-react/src/stores/sendStore.js
@@ -0,0 +1,128 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import { action, computed, observable } from 'mobx';
+import { blockNumber$, post$ } from '@parity/light.js';
+import { isAddress } from '@parity/api/lib/util/address';
+import noop from 'lodash/noop';
+
+import parityStore from './parityStore';
+import tokensStore from './tokensStore';
+
+const DEFAULT_GAS = 21000; // Default gas amount to show
+
+class SendStore {
+ @observable blockNumber; // Current block number, used to calculate confirmations.
+ @observable estimated = DEFAULT_GAS; // Estimated gas amount for this transaction.
+ tx; // The actual tx we are sending. No need to be observable.
+ @observable txStatus; // Status of the tx, see wiki for details.
+
+ constructor () {
+ this.api = parityStore.api;
+ }
+
+ acceptRequest = password => {
+ // Avoid calling this method from a random place
+ if (!this.requestId) {
+ return Promise.reject(
+ new Error('The requestId has not been generated yet.')
+ );
+ }
+
+ // Since we accepted this request, we also start to listen to blockNumber,
+ // to calculate the number of confirmations
+ blockNumber$().subscribe(this.setBlockNumber);
+
+ return this.api.signer.confirmRequest(this.requestId, null, password);
+ };
+
+ /**
+ * Get the number of confirmations our transaction has.
+ */
+ @computed
+ get confirmations () {
+ if (!this.txStatus.confirmed) {
+ return -1;
+ }
+ return this.blockNumber - +this.txStatus.confirmed.blockNumber;
+ }
+
+ /**
+ * Estimate the amount of gas for a particular transaction. Note: at the time
+ * we're estimating, this.tx has not been set yet (only set at postTx stage),
+ * that's why we're not using this.tx here, but a tx passed as argument.
+ */
+ estimateGas = tx => {
+ // We only estimate txs to a correct address
+ if (!tx || !isAddress(tx.to)) {
+ return Promise.resolve(DEFAULT_GAS);
+ }
+ return this.api.eth
+ .estimateGas(tx)
+ .then(this.setEstimated)
+ .catch(noop);
+ };
+
+ /**
+ * Create a transaction.
+ */
+ postTx = tx => {
+ if (!tx) {
+ return;
+ }
+ this.setTx(tx);
+
+ // Subscribe to this transaction's status
+ post$(tx).subscribe(txStatus => {
+ if (txStatus.requested) {
+ this.requestId = txStatus.requested;
+ }
+ this.setTxStatus(txStatus);
+ });
+ };
+
+ rejectRequest = (requestId, password) => {
+ // Avoid calling this method from a random place
+ if (!this.requestId) {
+ return Promise.reject(
+ new Error('The requestId has not been generated yet.')
+ );
+ }
+ return this.api.signer.rejectRequest(this.requestId);
+ };
+
+ @computed
+ get token () {
+ return tokensStore.tokens.get(this.tokenAddress);
+ }
+
+ setTokenAddress = tokenAddress => {
+ this.tokenAddress = tokenAddress;
+ };
+
+ setTx = tx => {
+ this.tx = tx;
+ };
+
+ @action
+ setBlockNumber = blockNumber => {
+ this.blockNumber = blockNumber;
+ };
+
+ @action
+ setEstimated = estimated => {
+ // Since estimateGas is not always accurate, we add a 120% factor for buffer.
+ const GAS_MULT_FACTOR = 1.2;
+
+ this.estimated = +estimated * GAS_MULT_FACTOR; // Don't store as BigNumber
+ };
+
+ @action
+ setTxStatus = txStatus => {
+ this.txStatus = txStatus;
+ };
+}
+
+export default new SendStore();
diff --git a/packages/light-react/src/stores/signerStore.js b/packages/light-react/src/stores/signerStore.js
deleted file mode 100644
index dcf8bc39bb34c91d7d0c413e6bd7408c3e457ef0..0000000000000000000000000000000000000000
--- a/packages/light-react/src/stores/signerStore.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-//
-// SPDX-License-Identifier: MIT
-
-import { action, computed, observable } from 'mobx';
-
-import parityStore from './parityStore';
-
-class SignerStore {
- @observable pending = [];
-
- constructor () {
- this.api = parityStore.api;
-
- if (parityStore.isApiConnected) {
- this.subscribePending();
- } else {
- // TODO This .on() is not working, so we poll every second
- // this.api.on('connected', this.subscribePending);
- this.interval = setInterval(() => {
- if (parityStore.isApiConnected && this.api) {
- this.subscribePending();
- clearInterval(this.interval);
- }
- }, 1000);
- }
- }
-
- acceptRequest = (requestId, password) =>
- this.api.signer.confirmRequest(requestId, null, password);
-
- rejectRequest = (requestId, password) =>
- this.api.signer.rejectRequest(requestId, null, password);
-
- @computed
- get requests () {
- const mapping = {}; // requestId -> request mapping
- this.pending.forEach(request => {
- mapping[request.id] = request;
- });
- return mapping;
- }
-
- @action
- setPending = (pending = []) => {
- this.pending = pending;
- };
-
- subscribePending = () => {
- const callback = (err, pending) => {
- if (err) {
- throw new Error(err);
- }
-
- this.setPending(pending);
- };
-
- this.api
- .subscribe('signer_requestsToConfirm', callback)
- .then(() => this.api.signer.requestsToConfirm())
- .then(pending => callback(null, pending))
- .catch(callback);
- };
-}
-
-export default new SignerStore();
diff --git a/packages/light-react/yarn.lock b/packages/light-react/yarn.lock
index 4eeb73d10c2b430b41dbd464aff84b8ddfae3cb0..a24f557439cdadbe860b8075656d2dd7d9ececfb 100644
--- a/packages/light-react/yarn.lock
+++ b/packages/light-react/yarn.lock
@@ -124,9 +124,9 @@
u2f-api "0.0.9"
u2f-api-polyfill "0.4.3"
-"@parity/light.js@https://github.com/parity-js/light.js#24ed8bed60917207a84d85cd5622636f8489fd7a":
+"@parity/light.js@https://github.com/parity-js/light.js#99ee612acd7ee69554839a09d6c094251043bc3b":
version "1.0.0"
- resolved "https://github.com/parity-js/light.js#24ed8bed60917207a84d85cd5622636f8489fd7a"
+ resolved "https://github.com/parity-js/light.js#99ee612acd7ee69554839a09d6c094251043bc3b"
dependencies:
"@babel/runtime" "^7.0.0-beta.49"
"@parity/api" "^2.1.23"
@@ -7176,7 +7176,7 @@ sockjs@0.3.18:
faye-websocket "^0.10.0"
uuid "^2.0.2"
-"solc@github:ngotchac/solc-js":
+solc@ngotchac/solc-js:
version "0.4.4"
resolved "https://codeload.github.com/ngotchac/solc-js/tar.gz/04eb38cc3003fba8cb3656653a7941ed36408818"
dependencies: