mirror of
https://github.com/status-im/MyCrypto.git
synced 2025-03-03 12:10:41 +00:00
* export conditional input and hoc * Move typings and fields out of send transaction * Move fields into their own component for decoupled handling, use conditional inputs to simplify disabled components * Handle hex and non hex strings automatically in BN conversion * Fix handling of strings and numbers for BN * add web3 fixes & comments * Display short balances on deterministic modals * add more tests, fix rounding * Add spacer to balance sidebar network name * Fix tsc error * Add offline render CB * Make more render callbacks * Transform NonceField into its self contained component * Remove styling from nonce field * Better network handling in nonce cb * Move network nonce initialization to componentDidMount * Remove unessesary conditional input * Make nonce component return a BN * Simplify Query render cb * Add gas query and token query render cbs * Re-write address field component, strip out ENS name functionality for now * Add address and data as unit types * Cleanup Address Field component * Export gas query * Re-write gas field component * Cleanup gas estimation check * Re-write Data field * Transaction field skeleton * Export transaction field actions * Rename fields to map to ethtx fields * Make reducers for fields * Fix reducer module exports * Export reducer * Formatting fix * Type return of GasQuery * Add transaction field getter / setter component * Make transaction fields more flexible * Formatting fix * Split transaction fields component into two * Remove erroneous prop * Fix field naming to follow ethereum transaction fields * Merge valid prop into componeent * Change address field to be redux based * Convert nonce field to redux based * Make component for passing in current transaction * Re-write Gas component to use redux state * Reduxify data field component * seperate transaction fields redux state into field data and meta data * Rename SetTransactionFields to be singular * Make render callback components for getting/setting meta fields * Add non-zero option prop for token balance render cb * re-write unit dropdown component to be redux based * Make ether the first option * Fix tsc error on tokenquery * Handle query string default values in unit drop down * Add thunks to package * Add helper function for encoding transfer data * Handle co-dependencies between fields via thunks, seperate value fields into ether and token based * Fix wrong typing * Add token metafield as export * Start scaffolding out amount field component * Make render cbs for conditional selection of value and balance * Make render callbacks nullable * Progress commit -- get dynaming swapping between tokens and ether working * Get gas estimation working between ether and tokens * Remove nonce from breaking gas estimation * Add better validation for amount field * Add 500ms debounce to gas saga * Self contain custom message component * Add web3 awareness to wallet render cb * Add render cb for checking if wallet is unlocked * Cleanup inline typing * export available params * Add render cb to render component when a query string exists * Add boolean callback param that check that the transaction is filled by user * Remove uneeded typings from send transaction * Fix misnomer * Self contain generate transaction button * Compartmentalize more send transaction components * Add query string warning, custom message and generate tx button to fields * Cleanup send tx component with new components * export render callbacks * saga transaction scaffolding * make gas saga fully declarative * transaction lib renaming * Seperate gasprice into its own generator * Make action creators for tx sign actions * Clean up signing saga, introduce reducer for signing, make HW wallet libs compatible with new tx format, fix some typing with ethereumjs-tx * Add TransactionComparison component * Add pushTx * Progress commit -- Streamline web3 and local signing / broadcasting flows. Need to still implement reducers for broadcasting and notifications * Get local transaction broadcasting working * re-write confirmation modal to be redux based * Fix spacing and import * Move confirmation modal to be attached to send button, create send button * Properly handle broadcasting for conf modal * Handle gas cost > balance for send everything * Add signing status as its own component (#454) * Fix ledger errors not showing on notifs * Make dedicated actions for swapping from tokens to ether and ether to tokens * Split actionTypes file * Cleanup comments * Cleanup comments * Fix various tsc errors * Lay down infrastructure for saving configurations per-wallet. * Add pending and rejected states properly to token values. * Add custom token form improvements. * Fix metamask transaction errors * Fix send entire balance estimation * Fix add token form from never being enabled. * Initial pass at account tab with send and view wallet tabs. * Fix inactive tab. * Hide private key, toggling * Progress commit -- Replacing render callbacks with selectors, put validation logic in sagas * Moved the restore keystore functionality to view wallet info, and put it in a modal / util file. * Fix navigation link active * Force read only wallets to info tab. * Remove commented code * Saga-ify send everything * Scan for new tokens, track saved tokens, only request tracked tokens on initial load. * Add custom token to current wallets tracked tokens. * Rework remove token icon. * Adjust button margin * Remove the rest of the needless render callbacks for selectors, sagaify nonce * Bug fix send transaction * remove unused redux-thunk * Move fields to general components * Clean up saga structure * Refactor broadcast tx * Implement better validation logic, get contract deploy working * PR feedback. * Convert tokenbalances component to connected redux component. * Addressed feedback from Henry. * Progress commit -- Implement Interact logic, needs manual testing * Get rid of commented code * move exports after declarations * add tests, rough draft * Get contract method calls working * Bugfix contracts * Cleanup hex prefixing * Reset transaction state on wallet change * Get rid of old send transaction component * Disable sign transaction button when network request is underway * Flatten send button tree, make nonce human readable in confirmation modal * Add ghetto cost breakdown component, fix token field validation * Create Generic SubTab and use in Send * MVP of mnemonics with sub-tabs in Create Wallet view. * Do dynamic revalidation * move exports after declarations * add forgotten signing tests * update token spec * update currentValue spec * update validationHelpers spec * Address TODO - use injected history to push navigation state instead of hardcoding window.location * Use SubTabs in Contracts * Fix revertPath prop for AcceptOrRedirectModal * Use subtabs in SignAndVerifyMessage * Routing for subtabs * Fix routes, adjust sizing. * Remove unused import * Request nonce in base 10 * Add offline override to unit display * Make cost breakdown less buggy * Add non standard transaction warning * Fix amount validity * Cleanup datafield validity * Display notif on gas estimation failure * Add post-signing verification against fields, clean up gas price * Fix tsc errors * Code cleanup * add exports to functions * add specs for sendEverything and reset sagas * delete duplicate files * make tslint happy * Merge develop * Fix develop regressions * Delegate nonce pulling to wallet being set * Clarify non standard transaction * Make address a buffer to avoid leading 0's bug * Clarify validation helper comment * Increase debounce time, add console error * Better validation for non-standard transactions * Add verification skipping for broadcasting txs * Fix state and wallet resetting for contract tabs * Fix some spec files, remove contract.spec * Remove broadcasting specs from wallet * Close DeterministicWalletModal on confirm * Revert "Close DeterministicWalletModal on confirm" This reverts commit 16c860e854ca29e9de754164d8be5e24f722cbad. * Reset hardware wallet state on unlocking. Dont render walletdecrypt content when its hidden. * Fix client side broadcast checking * Add more state resetters in error scenarios * Fix gas estimation * Add validation for value transactions to contract creation * Add transaction comparaision differentiation depending on wallet type * Fix token row display balance showing twice * Properly handle failed transactions * Handle bad error messages * fix broken tests * fix broken test * Progress commit -- Implement generic subtab types * Remove react router v3 * Remove unused routes * Clean up Tabbing code, add onTabChange handler * Fix tests * Add nav fix * revert opinionated sub-tab implementation * additional reverts * Add decimal validation * Make gas price single source of truth, dont save any transaction state other than gas price * Get rid of old wallet.spec reducer tests * Add decimal validation when re-validating gasCost * remove utilities view * Remove cost breakdown * Remove local gas estimation warning * Create getShownTokenBalances selector; use in UnitDropDown and Equivalent Values * Convert reducers to switch case * Clean tsc errors * Fix failing test * fix tscheck error * Add number validation to gas field * Fix misaligned input dropdown * Revert "Fix misaligned input dropdown" This reverts commit a40a4c0e8d52471dea01e6727f741a737b798695. * Set window timeout long enough for node switch to be persisted to state * Transaction Refactor Style Fixes (#615) * Fix unit dropdown alignment by rendering it in AmountField, and fixing a missed bootstrap case. * Fix modal amount and gas text. * Fix misaligned dropdown * Update conditions for NavLink is-active class
317 lines
8.9 KiB
TypeScript
317 lines
8.9 KiB
TypeScript
import {
|
|
DeterministicWalletData,
|
|
getDeterministicWallets,
|
|
GetDeterministicWalletsAction,
|
|
GetDeterministicWalletsArgs,
|
|
setDesiredToken,
|
|
SetDesiredTokenAction
|
|
} from 'actions/deterministicWallets';
|
|
import Modal, { IButton } from 'components/ui/Modal';
|
|
import { AppState } from 'reducers';
|
|
import { NetworkConfig } from 'config/data';
|
|
import { isValidPath } from 'libs/validators';
|
|
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import { getNetworkConfig } from 'selectors/config';
|
|
import { getTokens, MergedToken } from 'selectors/wallet';
|
|
import { UnitDisplay } from 'components/ui';
|
|
import './DeterministicWalletsModal.scss';
|
|
|
|
const WALLETS_PER_PAGE = 5;
|
|
|
|
interface Props {
|
|
// Passed props
|
|
isOpen?: boolean;
|
|
walletType?: string;
|
|
dPath: string;
|
|
dPaths: { label: string; value: string }[];
|
|
publicKey?: string;
|
|
chainCode?: string;
|
|
seed?: string;
|
|
|
|
// Redux state
|
|
wallets: DeterministicWalletData[];
|
|
desiredToken: string;
|
|
network: NetworkConfig;
|
|
tokens: MergedToken[];
|
|
|
|
// Redux actions
|
|
getDeterministicWallets(args: GetDeterministicWalletsArgs): GetDeterministicWalletsAction;
|
|
setDesiredToken(tkn: string | undefined): SetDesiredTokenAction;
|
|
|
|
onCancel(): void;
|
|
onConfirmAddress(address: string, addressIndex: number): void;
|
|
onPathChange(path: string): void;
|
|
}
|
|
|
|
interface State {
|
|
selectedAddress: string;
|
|
selectedAddrIndex: number;
|
|
isCustomPath: boolean;
|
|
customPath: string;
|
|
page: number;
|
|
}
|
|
|
|
class DeterministicWalletsModal extends React.Component<Props, State> {
|
|
public state = {
|
|
selectedAddress: '',
|
|
selectedAddrIndex: 0,
|
|
isCustomPath: false,
|
|
customPath: '',
|
|
page: 0
|
|
};
|
|
|
|
public componentDidMount() {
|
|
this.getAddresses();
|
|
}
|
|
|
|
public componentWillReceiveProps(nextProps) {
|
|
const { publicKey, chainCode, seed, dPath } = this.props;
|
|
if (
|
|
nextProps.publicKey !== publicKey ||
|
|
nextProps.chainCode !== chainCode ||
|
|
nextProps.dPath !== dPath ||
|
|
nextProps.seed !== seed
|
|
) {
|
|
this.getAddresses(nextProps);
|
|
}
|
|
}
|
|
|
|
public render() {
|
|
const {
|
|
wallets,
|
|
desiredToken,
|
|
network,
|
|
tokens,
|
|
dPath,
|
|
dPaths,
|
|
onCancel,
|
|
walletType
|
|
} = this.props;
|
|
const { selectedAddress, isCustomPath, customPath, page } = this.state;
|
|
const validPathClass = isValidPath(customPath) ? 'is-valid' : 'is-invalid';
|
|
|
|
const buttons: IButton[] = [
|
|
{
|
|
text: 'Unlock this Address',
|
|
type: 'primary',
|
|
onClick: this.handleConfirmAddress,
|
|
disabled: !selectedAddress
|
|
},
|
|
{
|
|
text: 'Cancel',
|
|
type: 'default',
|
|
onClick: onCancel
|
|
}
|
|
];
|
|
|
|
return (
|
|
<Modal
|
|
title={`Unlock your ${walletType || ''} Wallet`}
|
|
isOpen={this.props.isOpen}
|
|
buttons={buttons}
|
|
handleClose={onCancel}
|
|
>
|
|
<div className="DWModal">
|
|
<form className="DWModal-path form-group-sm" onSubmit={this.handleSubmitCustomPath}>
|
|
<span className="DWModal-path-label">Addresses for</span>
|
|
<select
|
|
className="form-control"
|
|
onChange={this.handleChangePath}
|
|
value={isCustomPath ? 'custom' : dPath}
|
|
>
|
|
{dPaths.map(dp => (
|
|
<option key={dp.value} value={dp.value}>
|
|
{dp.label}
|
|
</option>
|
|
))}
|
|
<option value="custom">Custom path...</option>
|
|
</select>
|
|
{isCustomPath && (
|
|
<input
|
|
className={`form-control ${validPathClass}`}
|
|
value={customPath}
|
|
placeholder="m/44'/60'/0'/0"
|
|
onChange={this.handleChangeCustomPath}
|
|
/>
|
|
)}
|
|
</form>
|
|
|
|
<div className="DWModal-addresses">
|
|
<table className="DWModal-addresses-table table table-striped table-hover">
|
|
<thead>
|
|
<tr>
|
|
<td>#</td>
|
|
<td>Address</td>
|
|
<td>{network.unit}</td>
|
|
<td>
|
|
<select
|
|
className="DWModal-addresses-table-token"
|
|
value={desiredToken}
|
|
onChange={this.handleChangeToken}
|
|
>
|
|
<option value="">-Token-</option>
|
|
{tokens.map(t => (
|
|
<option key={t.symbol} value={t.symbol}>
|
|
{t.symbol}
|
|
</option>
|
|
))}
|
|
</select>
|
|
</td>
|
|
<td>More</td>
|
|
</tr>
|
|
</thead>
|
|
<tbody>{wallets.map(wallet => this.renderWalletRow(wallet))}</tbody>
|
|
</table>
|
|
|
|
<div className="DWModal-addresses-nav">
|
|
<button
|
|
className="DWModal-addresses-nav-btn btn btn-sm btn-default"
|
|
disabled={page === 0}
|
|
onClick={this.prevPage}
|
|
>
|
|
← Back
|
|
</button>
|
|
<button
|
|
className="DWModal-addresses-nav-btn btn btn-sm btn-default"
|
|
onClick={this.nextPage}
|
|
>
|
|
More →
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</Modal>
|
|
);
|
|
}
|
|
|
|
private getAddresses(props: Props = this.props) {
|
|
const { dPath, publicKey, chainCode, seed } = props;
|
|
|
|
if (dPath && ((publicKey && chainCode) || seed) && isValidPath(dPath)) {
|
|
this.props.getDeterministicWallets({
|
|
seed,
|
|
dPath,
|
|
publicKey,
|
|
chainCode,
|
|
limit: WALLETS_PER_PAGE,
|
|
offset: WALLETS_PER_PAGE * this.state.page
|
|
});
|
|
}
|
|
}
|
|
|
|
private handleChangePath = (ev: React.SyntheticEvent<HTMLSelectElement>) => {
|
|
const { value } = ev.target as HTMLSelectElement;
|
|
|
|
if (value === 'custom') {
|
|
this.setState({ isCustomPath: true });
|
|
} else {
|
|
this.setState({ isCustomPath: false });
|
|
if (this.props.dPath !== value) {
|
|
this.props.onPathChange(value);
|
|
}
|
|
}
|
|
};
|
|
|
|
private handleChangeCustomPath = (ev: React.SyntheticEvent<HTMLInputElement>) => {
|
|
this.setState({ customPath: (ev.target as HTMLInputElement).value });
|
|
};
|
|
|
|
private handleSubmitCustomPath = (ev: React.SyntheticEvent<HTMLFormElement>) => {
|
|
ev.preventDefault();
|
|
if (!isValidPath(this.state.customPath)) {
|
|
return;
|
|
}
|
|
this.props.onPathChange(this.state.customPath);
|
|
};
|
|
|
|
private handleChangeToken = (ev: React.SyntheticEvent<HTMLSelectElement>) => {
|
|
this.props.setDesiredToken((ev.target as HTMLSelectElement).value || undefined);
|
|
};
|
|
|
|
private handleConfirmAddress = () => {
|
|
if (this.state.selectedAddress) {
|
|
this.props.onConfirmAddress(this.state.selectedAddress, this.state.selectedAddrIndex);
|
|
}
|
|
};
|
|
|
|
private selectAddress(selectedAddress, selectedAddrIndex) {
|
|
this.setState({ selectedAddress, selectedAddrIndex });
|
|
}
|
|
|
|
private nextPage = () => {
|
|
this.setState({ page: this.state.page + 1 }, this.getAddresses);
|
|
};
|
|
|
|
private prevPage = () => {
|
|
this.setState({ page: Math.max(this.state.page - 1, 0) }, this.getAddresses);
|
|
};
|
|
|
|
private renderWalletRow(wallet: DeterministicWalletData) {
|
|
const { desiredToken, network } = this.props;
|
|
const { selectedAddress } = this.state;
|
|
|
|
// Get renderable values, but keep 'em short
|
|
const token = wallet.tokenValues[desiredToken];
|
|
|
|
return (
|
|
<tr
|
|
key={wallet.address}
|
|
onClick={this.selectAddress.bind(this, wallet.address, wallet.index)}
|
|
>
|
|
<td>{wallet.index + 1}</td>
|
|
<td className="DWModal-addresses-table-address">
|
|
<input
|
|
type="radio"
|
|
name="selectedAddress"
|
|
checked={selectedAddress === wallet.address}
|
|
value={wallet.address}
|
|
/>
|
|
{wallet.address}
|
|
</td>
|
|
<td>
|
|
<UnitDisplay
|
|
unit={'ether'}
|
|
value={wallet.value}
|
|
symbol={network.unit}
|
|
displayShortBalance={true}
|
|
checkOffline={true}
|
|
/>
|
|
</td>
|
|
<td>
|
|
{token ? (
|
|
<UnitDisplay
|
|
decimal={token.decimal}
|
|
value={token.value}
|
|
symbol={desiredToken}
|
|
displayShortBalance={true}
|
|
checkOffline={true}
|
|
/>
|
|
) : (
|
|
'???'
|
|
)}
|
|
</td>
|
|
<td>
|
|
<a target="_blank" href={`https://ethplorer.io/address/${wallet.address}`}>
|
|
<i className="DWModal-addresses-table-more" />
|
|
</a>
|
|
</td>
|
|
</tr>
|
|
);
|
|
}
|
|
}
|
|
|
|
function mapStateToProps(state: AppState) {
|
|
return {
|
|
wallets: state.deterministicWallets.wallets,
|
|
desiredToken: state.deterministicWallets.desiredToken,
|
|
network: getNetworkConfig(state),
|
|
tokens: getTokens(state)
|
|
};
|
|
}
|
|
|
|
export default connect(mapStateToProps, {
|
|
getDeterministicWallets,
|
|
setDesiredToken
|
|
})(DeterministicWalletsModal);
|