diff --git a/components/Ethereum/ETHAddressInput.js b/components/Ethereum/ETHAddressInput.js index 84648232a..74568a544 100644 --- a/components/Ethereum/ETHAddressInput.js +++ b/components/Ethereum/ETHAddressInput.js @@ -26,12 +26,12 @@ const ETHAddressInput = (props) => { return (
- Invalid address + Invalid Address
); } - if (!connectedMetaMask && ethAccountIsValid) { + if (ethAccount && !connectedMetaMask && ethAccountIsValid) { return (
diff --git a/components/Modals/WithdrawalModal.js b/components/Modals/WithdrawalModal.js index aa27db4e4..657c7d320 100644 --- a/components/Modals/WithdrawalModal.js +++ b/components/Modals/WithdrawalModal.js @@ -23,7 +23,7 @@ import API from "~/config/api"; import { Helpers } from "@quantfive/js-web-config"; import colors, { alertColors } from "~/config/themes/colors"; -import { sanitizeNumber, formatBalance } from "~/config/utils/form"; +import { sanitizeNumber } from "~/config/utils/form"; import { getEtherscanLink, getBasescanLink, @@ -106,7 +106,7 @@ class WithdrawalModal extends Component { if (this.props.address !== prevProps.address) { this.setState({ ethAccount: this.props.address, - ethAccountIsValid: true, + ethAccountIsValid: false, }); } if (!this.state.buttonEnabled && this.state.userBalance) { @@ -609,8 +609,8 @@ class WithdrawalModal extends Component { )} > {value === "BASE" - ? "Recommended network for most users" - : "Legacy option"} + ? "Recommended network for low fees" + : "Higher fees, with increased decentralization"}
)}
@@ -696,9 +696,7 @@ class WithdrawalModal extends Component { Learn more about fees.
-
- {formatBalance(transactionFee)} -
+
{transactionFee}
@@ -707,9 +705,7 @@ class WithdrawalModal extends Component { The total RSC transferred after fees.
-
- {formatBalance(amount - transactionFee)} -
+
{amount - transactionFee}
{isUnderInvestigation && (