Add checksumming to payment request & confirmation modal (#1428)

* Add checksum to payment request to address

* add checksum to confirmation modal
This commit is contained in:
Daniel Ternyak 2018-04-02 14:38:54 -05:00 committed by GitHub
parent 05bf8df492
commit a4872e6558
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions

View File

@ -3,13 +3,15 @@ import { AddressFieldFactory } from './AddressFieldFactory';
import { donationAddressMap } from 'config'; import { donationAddressMap } from 'config';
import translate from 'translations'; import translate from 'translations';
import { Input } from 'components/ui'; import { Input } from 'components/ui';
import { toChecksumAddress } from 'ethereumjs-util';
interface Props { interface Props {
isReadOnly?: boolean; isReadOnly?: boolean;
isSelfAddress?: boolean; isSelfAddress?: boolean;
isCheckSummed?: boolean;
} }
export const AddressField: React.SFC<Props> = ({ isReadOnly, isSelfAddress }) => ( export const AddressField: React.SFC<Props> = ({ isReadOnly, isSelfAddress, isCheckSummed }) => (
<AddressFieldFactory <AddressFieldFactory
isSelfAddress={isSelfAddress} isSelfAddress={isSelfAddress}
withProps={({ currentTo, isValid, onChange, readOnly }) => ( withProps={({ currentTo, isValid, onChange, readOnly }) => (
@ -21,7 +23,7 @@ export const AddressField: React.SFC<Props> = ({ isReadOnly, isSelfAddress }) =>
<Input <Input
className={`input-group-input ${isValid ? '' : 'invalid'}`} className={`input-group-input ${isValid ? '' : 'invalid'}`}
type="text" type="text"
value={currentTo.raw} value={isCheckSummed ? toChecksumAddress(currentTo.raw) : currentTo.raw}
placeholder={donationAddressMap.ETH} placeholder={donationAddressMap.ETH}
readOnly={!!(isReadOnly || readOnly)} readOnly={!!(isReadOnly || readOnly)}
spellCheck={false} spellCheck={false}

View File

@ -39,7 +39,9 @@ class AddressesClass extends Component<StateProps> {
<h5 className="tx-modal-address-from-title"> <h5 className="tx-modal-address-from-title">
{translate('CONFIRM_TX_FROM')}{' '} {translate('CONFIRM_TX_FROM')}{' '}
</h5> </h5>
<h5 className="tx-modal-address-from-address small">{from}</h5> <h5 className="tx-modal-address-from-address small">
{toChecksumAddress(from)}
</h5>
</div> </div>
</React.Fragment> </React.Fragment>
)} )}
@ -57,7 +59,7 @@ class AddressesClass extends Component<StateProps> {
className="small tx-modal-address-tkn-contract-link" className="small tx-modal-address-tkn-contract-link"
href={ETHAddressExplorer(to)} href={ETHAddressExplorer(to)}
> >
{to} {toChecksumAddress(to)}
</a> </a>
</div> </div>
</div> </div>

View File

@ -94,7 +94,7 @@ class RequestPayment extends React.Component<Props, {}> {
return ( return (
<div className="RequestPayment"> <div className="RequestPayment">
<div className="Tab-content-pane"> <div className="Tab-content-pane">
<AddressField isReadOnly={true} /> <AddressField isReadOnly={true} isCheckSummed={true} />
<div className="row form-group"> <div className="row form-group">
<div className="col-xs-12"> <div className="col-xs-12">