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.

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

V7.7.5 Upstream Changes #124

Merged
merged 12 commits into from Feb 25, 2020
Next

Update data on Approve screen after updating custom spend limit (#7918)

After updating the custom spend limit on the approve screen, the data
for the transaction was not being updated. Instead it showed the
original transaction data. The transaction data was being updated
correctly in the final transaction though.

The approve screen has been updated to ensure changes to the custom
spend limit are reflected correctly in the data shown.
  • Loading branch information
Gudahtt authored and ryanml committed Jan 28, 2020
commit 06e78ed069b8da573238555a7e7087a1166d6389
@@ -75,6 +75,10 @@ export default class ConfirmApprove extends Component {
? Number(calcTokenAmount(tokenTrackerBalance, decimals)).toPrecision(9)
: ''

const customData = customPermissionAmount
? getCustomTxParamsData(data, { customPermissionAmount, tokenAmount, decimals })
: null

return (
<ConfirmTransactionBase
toAddress={toAddress}
@@ -94,17 +98,14 @@ export default class ConfirmApprove extends Component {
tokenBalance={tokenBalance}
showCustomizeGasModal={() => showCustomizeGasModal(txData)}
showEditApprovalPermissionModal={showEditApprovalPermissionModal}
data={data}
data={customData || data}
toAddress={toAddress}
currentCurrency={currentCurrency}
ethTransactionTotal={ethTransactionTotal}
fiatTransactionTotal={fiatTransactionTotal}
/>}
hideSenderToRecipient
customTxParamsData={customPermissionAmount
? getCustomTxParamsData(data, { customPermissionAmount, tokenAmount, decimals })
: null
}
customTxParamsData={customData}
{...restProps}
/>
)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.