Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Custom Gas + Data hotfixes #1687

Merged
merged 9 commits into from
Jul 17, 2020
Merged

Custom Gas + Data hotfixes #1687

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67ff9b2
CustomGas: fix crash when navigating back to advanced gas during error
EtDu Jul 9, 2020
502dfd0
TransactionReviewData: fix data not displaying
EtDu Jul 9, 2020
8057897
fix snapshit test
EtDu Jul 9, 2020
2cb552b
TransactionReviewData: fix data not scrollable
EtDu Jul 10, 2020
bf623d9
snapsho
EtDu Jul 10, 2020
29a74a1
SendFlow: fix total fiat to be text component when passed down to Tra…
EtDu Jul 10, 2020
e69bb5f
snapshotsssss baby
EtDu Jul 10, 2020
a75c33b
TransactionReviewInformation: fix totalFiat is now a Text component
EtDu Jul 15, 2020
b0c1bd7
Merge branch 'develop' into customGas-hotfixes
EtDu Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions app/components/UI/CustomGas/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,10 @@ class CustomGas extends PureComponent {
gasSlowSelected: false,
selected: 'average',
ready: false,
customGasPrice: Math.round(this.props.basicGasEstimates.averageGwei),
customGasPrice: '10',
customGasLimit: fromWei(this.props.gas, 'wei'),
customGasPriceBN: this.props.gasPrice,
customGasPriceBNWei: this.props.gasPrice,
customGasPriceBN: new BN(Math.round(this.props.basicGasEstimates.averageGwei)),
customGasLimitBN: this.props.gas,
warningGasLimit: '',
warningGasPrice: '',
Expand All @@ -329,7 +330,7 @@ class CustomGas extends PureComponent {
gasSlowSelected: false,
selected: 'fast',
customGasPrice: fastGwei,
customGasPriceBN: gasPriceBN
customGasPriceBNWei: gasPriceBN
});
};

Expand All @@ -346,7 +347,7 @@ class CustomGas extends PureComponent {
gasSlowSelected: false,
selected: 'average',
customGasPrice: averageGwei,
customGasPriceBN: gasPriceBN
customGasPriceBNWei: gasPriceBN
});
};

Expand All @@ -363,7 +364,7 @@ class CustomGas extends PureComponent {
gasSlowSelected: true,
selected: 'slow',
customGasPrice: safeLowGwei,
customGasPriceBN: gasPriceBN
customGasPriceBNWei: gasPriceBN
});
};

Expand Down Expand Up @@ -427,9 +428,9 @@ class CustomGas extends PureComponent {
};

onGasLimitChange = value => {
const { customGasPriceBN } = this.state;
const { customGasPriceBNWei } = this.state;
const bnValue = new BN(value);
const warningSufficientFunds = this.hasSufficientFunds(bnValue, customGasPriceBN);
const warningSufficientFunds = this.hasSufficientFunds(bnValue, customGasPriceBNWei);
let warningGasLimit;
if (!value || value === '' || !isDecimal(value)) warningGasLimit = strings('transaction.invalid_gas');
else if (bnValue && !isBN(bnValue)) warningGasLimit = strings('transaction.invalid_gas');
Expand All @@ -448,15 +449,17 @@ class CustomGas extends PureComponent {
const { customGasLimitBN } = this.state;
//Added because apiEstimateModifiedToWEI doesn't like empty strings
const gasPrice = value === '' ? '0' : value;
const gasPriceBN = apiEstimateModifiedToWEI(gasPrice);
const warningSufficientFunds = this.hasSufficientFunds(customGasLimitBN, gasPriceBN);
const gasPriceBN = new BN(gasPrice);
const gasPriceBNWei = apiEstimateModifiedToWEI(gasPrice);
const warningSufficientFunds = this.hasSufficientFunds(customGasLimitBN, gasPriceBNWei);
let warningGasPrice;
if (value < this.props.basicGasEstimates.safeLowGwei) warningGasPrice = strings('transaction.low_gas_price');
if (!value || value === '' || !isDecimal(value) || value <= 0)
warningGasPrice = strings('transaction.invalid_gas_price');
if (gasPriceBN && !isBN(gasPriceBN)) warningGasPrice = strings('transaction.invalid_gas_price');
if (gasPriceBNWei && !isBN(gasPriceBNWei)) warningGasPrice = strings('transaction.invalid_gas_price');
this.setState({
customGasPrice: value,
customGasPrice: gasPrice,
customGasPriceBNWei: gasPriceBNWei,
customGasPriceBN: gasPriceBN,
warningGasPrice,
warningSufficientFunds
Expand Down Expand Up @@ -569,9 +572,9 @@ class CustomGas extends PureComponent {
};

renderCustomGasInput = () => {
const { customGasPrice, customGasLimitBN, customGasPriceBN } = this.state;
const { customGasLimitBN, customGasPriceBNWei, customGasPriceBN } = this.state;
const { generateTransform } = this.props;
const totalGas = customGasLimitBN.mul(customGasPriceBN);
const totalGas = customGasLimitBN.mul(customGasPriceBNWei);
const ticker = getTicker(this.props.ticker);
return (
<Animated.View
Expand Down Expand Up @@ -605,7 +608,7 @@ class CustomGas extends PureComponent {
keyboardType="numeric"
style={styles.gasInput}
onChangeText={this.onGasPriceChange}
value={customGasPrice.toString()}
value={customGasPriceBN.toString()}
/>
</View>
</Animated.View>
Expand Down
4 changes: 3 additions & 1 deletion app/components/UI/TransactionReview/TransactionReviewData/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ class TransactionReviewData extends PureComponent {

render = () => {
const {
transaction: { data },
transaction: {
transaction: { data }
},
actionKey,
toggleDataView
} = this.props;
Expand Down
4 changes: 3 additions & 1 deletion app/components/UI/TransactionReview/TransactionReviewData/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ describe('TransactionReviewData', () => {
}
},
transaction: {
transaction: {
data: ''
},
value: '',
data: '',
from: '0x1',
gas: '',
gasPrice: '',
Expand Down