mirror of
https://github.com/status-im/MyCrypto.git
synced 2025-01-10 11:05:47 +00:00
e761b9d1fb
* Add a new route for AddressBook * Further templating of the AddressBook view * Add initial functionality to handle a table of existing address labels * Make the linter happy * Adjust paths * Factor out TableRow and add common functionality * Add initial Redux boilerplate for addressBook | fix minor linting issues * Swap out terminology and types * Connect up to Redux * Connect data for AddressBookTable to Redux * Use temporary fields for addition * Remove alignment and index column * Stopping point * Adjust the sizing of rows to be consistent * Initial implementation of a dropdown for the address field * Minor styling to dropdown * Stopping point * Apply a focus concept onto the factory * Add keyboard controls for the address field dropdown * Adjust label of address field when it matches an addressBook entry * Properly handle attempting to blur a non-existent component * Minor styling changes on dropdown box * Standardize address casing, add accessibility to dropdown * Create an addressLabel component * Pass refs correctly and fix some typings * Exact version * Add module name mapping for shared/keycodes * addressBook reducer tests * Add functionality to DeterministicModal * Minor changes / Add test for addressBook selectors * Move out AddressBookTable to a component * Typing, translation and restructuring * More typing and translation fixes * More linting fixes * More type changes * Variable name for dropdown background * Fix TS type errors, lint errors, remove unused props * Used a different selector and removed method: AddressBookTable * Linter was mad * Linter mad again :( * Add a translation and adjust styling of AddressBookTable * Move the onBlur to a class method * Prevent the default behavior of up/down/enter for dropdown * Let's do it this way instead * Adjust the styling on DeterministicWalletModal labels * Change `AddressBookTable` into a pseudo-table using section and div * Use readable keys vs. keycodes * Put the dropdown in InputFactory and position it correctly * Sanitation of label adding and changing * Prevent duplicate labels in AddressBook and Row * Add a box shadow and use `invalid` class insted of custom * Use emphasis vs strong for address in dropdown * Display the label undernearth the input vs. changing it * Isolate AccountAddress into its own component * Introduce interactivity to AccountAddress * Fully incorporate with Redux * Validation for AccountAddress * Add validation notifications for address field on AddressBookTable * Minor formatting * Adjust wrappage for optimal flexboxxing * Make AddressBookTable responsive * Show an invalid input in "real time" instead of only on submit * Real time input validation for AddressBookTableRow * Responsive-ize the To address dropdown * Hide identicons instead at small enough screen sizes * Fix repsonsiveness of dropdown further * Fix responsiveness of table rows and inputs * Truncate account info and switch identicons to the right for consistency * Use classnames instead of targetting element directly for DWM * Display a notice if the entered query doesnt match a label and isnt an addr * Don't show an error on the To address if its a label entry * Display an error under AddressBookTableRow in real time * Display errors in real time for AddressBookTable temp inputs * Add realtime validation to AccountAddress * Ensure toChecksumAddress is used when entering labels to address manager * Show errors even after blurring. * Create a ducks/ implementation for addressBook * Duck-ize notifications * Duck-ize customTokens * Duck-ize deterministicWallets * Only show errors on address/label entry if they have been blurred * On certain inputs, show an invalid input immediately * spec files in same directory * Rename top-level redux directory * Duck-ize gas * Add displayed errors for labels with 0x and labels containing ens * Move ENS checking validation out * Add a saga for addLabelForAddress * Completely revamp the redux side of Address Manager and test it all * Adjust components to use new redux addressBook * Incorporate new redux into AddressBookTableRow and clean up for linter * Make linter and tests happy * Another reduxy overhaul * Still fixing it * More redux updates * Finalize redux stuff. * Incorporate new reduxy way into AddressBookTable & Row * Incorporate redux changes into Account Address * Small tests fix * Add and fix some selector tests * Addressing Will's comments * Shortened visibility class for line length reasons. * Incorporate ducks pattern on updates addressBook * Fix typeerror * Migrate messages to ducks * For Henry * Duckify onboardStatus * Duckify paritySigner * Duckify rates * Duckify transactions * Duckerize wallet * Reduckerate config * Adjust exports and tests of every duck so far * Duckify ENS * Duckerificate schedule * Duckificate swap * Actually use the new sagas; fix a circular dependency problem. * Duckify transaction (phew) * Add basics to redux/ directory * Remove non-ducked redux stuff * First sweep of redux/ directory * Combine redundant imports * Fix more linting stuff. * A few more type fixes * Welp... now I know not to use index. * Sweep components/ * Sweep through containers/ * Im really starting to get frustrated * The dawn of a new age. * Linter fixes. * De-flatten config/ reducers * Do my thang on config selectors * Adjust all references to config * Split up ens reducers * Wrap up de-nesting ENS * Big boy refactor * Split transaction into its reducers * Fix reducers in transaction/ * Stopping point * Adjust references to transaction from components * Fix references to selectors * Nest broadcast actions * Nest field actions * Nest meta actions * Nest network actions * Nest sign actions * Nest broadcast types * Nested fields types * Nest meta types * Nested network types * Nested sign types * Implement transaction saga changes * Huh? No prepush problems? * Update snappshot * Reintroduce deleted tests * A few missing tests found * Found three missing transaction tests * Found more tests * Found the rest of the tests, woohoo. * Renamed TypeKeys in TRANSACTION * Specify TRANSACTION_BROADCAST * Pretty up these imports * Specify TRANSACTION_FIELDS * Specify TRANSACTION_META * Specify TRANSACTION_NETWORK * Specify TRANSACTION_SIGN * Adjust imports and add translations * Update config snapshot * Post-merge * Temporary fix for DW/Config sagas so Daniel can continue smoke testing * Remove first circulat dependency * Fix more circular dependencies * Properly structure config indices * Further restructure config * Prepare for idea * Target directly from within features/ * Remove that circular dependency -- woohoo * Remove the circular dependency from Web3Wallet, temporarily comment some tests pending assistance * Un-comment the component-in-redux phenomenon * Move onLoad to the store file * Adjust addressBook imports/exports * Adjusted imports/exports for customTokens * Adjust imports/exports of deterministicWallets * Adjust imports/exports of ens * Restructure imports/exports of gas * Restructure imports/exports for message * Adjust imports/exports of notifications * Restructure onboardStatus imports/exports * Restructure paritySigner imports/exports * Restructure rates imports/exports * Restructure schedule imports/exports * Fix broadcastweb3handler test * Restructure swap imports/exports/ * Restructure transactionS imports/exports * Restructured wallet imports and exports * Hoist all necessary selectors aside from config/**/* and transaction/**/* * Hoist all top-level selectors from transaction * [Fix] Estimate Gas on Value Field Change (#1942) @ skubakdj * Implement right-click context menu (#1780) @ bryanwb * No Private Keys Online (#1466) @ wbobeirne * Fix Stuck Node on Metamask Logout (#1951) @ wbobeirne * [Fix] Make ENS Value Consistent (#1956) @ skubakdj * Auto token add (#1808) @ HenryNguyen5 * Electron Ledger + Trezor Support (#1836) @ wbobeirne * Fix Context Menu Popup Parameters (#1957) * Add RSK network w/ network agnostic refactors (#1939) @ wbobeirne * Change displayed notification back in helpers.tsx * Remove newline on shell files * Re-add newlines * Remove newling on .travis.yml * Prettier two files * Re-add index.scss import in OnboardModal * Restructure transaction subdirectories * Everything in transaction/ except for sagas * Restructure transaction imports/exports * Nest broadcast sagas * Nest fields * Nest meta * Nest network * Nest sign * Use generic names for reduxy stuff in the same directory to save space * Do everything every in the whole wide world
454 lines
14 KiB
TypeScript
454 lines
14 KiB
TypeScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import { exists, SuccessConfig, FailConfig } from 'mycrypto-eth-exists';
|
|
|
|
import translate, { translateRaw } from 'translations';
|
|
import { CustomNetworkConfig } from 'types/network';
|
|
import { CustomNodeConfig } from 'types/node';
|
|
import { AppState } from 'features/reducers';
|
|
import {
|
|
getCustomNetworkConfigs,
|
|
getStaticNetworkConfigs,
|
|
getCustomNodeConfigs,
|
|
AddCustomNodeAction,
|
|
TAddCustomNetwork,
|
|
addCustomNetwork
|
|
} from 'features/config';
|
|
import { Input, Dropdown } from 'components/ui';
|
|
import Modal, { IButton } from 'components/ui/Modal';
|
|
import './CustomNodeModal.scss';
|
|
|
|
const CUSTOM = { label: 'Custom', value: 'custom' };
|
|
|
|
interface OwnProps {
|
|
isOpen: boolean;
|
|
addCustomNode(payload: AddCustomNodeAction['payload']): void;
|
|
handleClose(): void;
|
|
}
|
|
|
|
interface DispatchProps {
|
|
addCustomNetwork: TAddCustomNetwork;
|
|
}
|
|
|
|
interface StateProps {
|
|
customNodes: AppState['config']['nodes']['customNodes'];
|
|
customNetworks: AppState['config']['networks']['customNetworks'];
|
|
staticNetworks: AppState['config']['networks']['staticNetworks'];
|
|
}
|
|
|
|
interface State {
|
|
name: string;
|
|
url: string;
|
|
network: string;
|
|
customNetworkId: string;
|
|
customNetworkUnit: string;
|
|
customNetworkChainId: string;
|
|
hasAuth: boolean;
|
|
username: string;
|
|
password: string;
|
|
defaultNodes: ((SuccessConfig | FailConfig) & { display: string; index: number })[];
|
|
}
|
|
|
|
type Props = OwnProps & StateProps & DispatchProps;
|
|
|
|
class CustomNodeModal extends React.Component<Props, State> {
|
|
public INITIAL_STATE: State = {
|
|
name: '',
|
|
url: '',
|
|
network: Object.keys(this.props.staticNetworks)[0],
|
|
customNetworkId: '',
|
|
customNetworkUnit: '',
|
|
customNetworkChainId: '',
|
|
hasAuth: false,
|
|
username: '',
|
|
password: '',
|
|
defaultNodes: []
|
|
};
|
|
|
|
public state: State = this.INITIAL_STATE;
|
|
|
|
private timer: number | null;
|
|
|
|
constructor(props: Props) {
|
|
super(props);
|
|
this.pollForDefaultNodes();
|
|
}
|
|
|
|
public componentDidUpdate(prevProps: Props) {
|
|
// Reset state when modal opens
|
|
if (!prevProps.isOpen && prevProps.isOpen !== this.props.isOpen) {
|
|
this.setState(this.INITIAL_STATE);
|
|
}
|
|
}
|
|
|
|
public componentWillUnmount() {
|
|
if (this.timer) {
|
|
window.clearInterval(this.timer);
|
|
}
|
|
this.timer = null;
|
|
}
|
|
|
|
public render() {
|
|
const { customNetworks, handleClose, staticNetworks, isOpen } = this.props;
|
|
const { network, customNetworkChainId } = this.state;
|
|
const isHttps = window.location.protocol.includes('https');
|
|
const invalids = this.getInvalids();
|
|
|
|
const buttons: IButton[] = [
|
|
{
|
|
type: 'primary',
|
|
text: translate('NODE_CTA'),
|
|
onClick: this.saveAndAdd,
|
|
disabled: !!Object.keys(invalids).length
|
|
},
|
|
{
|
|
type: 'default',
|
|
text: translate('ACTION_2'),
|
|
onClick: handleClose
|
|
}
|
|
];
|
|
|
|
const nameConflictNode = this.getNameConflictNode();
|
|
const chainidConflictNetwork =
|
|
network === CUSTOM.value && this.getChainIdCollisionNetwork(customNetworkChainId);
|
|
|
|
const staticNetwrks = Object.keys(staticNetworks).map(net => {
|
|
return { label: net, value: net };
|
|
});
|
|
const customNetwrks = Object.entries(customNetworks).map(([id, net]) => {
|
|
return { label: net.name + ' (Custom)', value: id };
|
|
});
|
|
const options = [...staticNetwrks, ...customNetwrks, CUSTOM];
|
|
return (
|
|
<Modal
|
|
title={translateRaw('NODE_TITLE')}
|
|
isOpen={isOpen}
|
|
buttons={buttons}
|
|
handleClose={handleClose}
|
|
maxWidth={580}
|
|
>
|
|
{isHttps && <div className="alert alert-warning small">{translate('NODE_WARNING')}</div>}
|
|
|
|
{nameConflictNode && (
|
|
<div className="alert alert-warning small">
|
|
{translate('CUSTOM_NODE_NAME_CONFLICT', { $node: nameConflictNode.name })}
|
|
</div>
|
|
)}
|
|
|
|
{this.renderDefaultNodeDropdown()}
|
|
|
|
<form className="CustomNodeModal">
|
|
<div className="flex-wrapper">
|
|
<label className="col-sm-9 input-group flex-grow-1">
|
|
<div className="input-group-header">{translate('CUSTOM_NODE_NAME')}</div>
|
|
<Input
|
|
isValid={!(this.state.name && invalids.name)}
|
|
type="text"
|
|
placeholder="My Node"
|
|
value={this.state.name}
|
|
onChange={e => this.setState({ name: e.currentTarget.value })}
|
|
/>
|
|
</label>
|
|
<label className="col-sm-3 input-group">
|
|
<div className="input-group-header">{translate('CUSTOM_NETWORK')}</div>
|
|
<Dropdown
|
|
value={network}
|
|
options={options}
|
|
clearable={false}
|
|
onChange={(e: { label: string; value: string }) =>
|
|
this.setState({ network: e.value })
|
|
}
|
|
/>
|
|
</label>
|
|
</div>
|
|
|
|
{network === CUSTOM.value && (
|
|
<div className="flex-wrapper">
|
|
<label className="col-sm-6 input-group input-group-inline">
|
|
<div className="input-group-header">{translate('CUSTOM_NETWORK_NAME')}</div>
|
|
<Input
|
|
isValid={!(this.state.customNetworkId && invalids.customNetworkId)}
|
|
type="text"
|
|
placeholder="My Custom Network"
|
|
value={this.state.customNetworkId}
|
|
onChange={e => this.setState({ customNetworkId: e.currentTarget.value })}
|
|
/>
|
|
</label>
|
|
<label className="col-sm-3 input-group input-group-inline">
|
|
<div className="input-group-header">{translate('CUSTOM_NETWORK_CURRENCY')}</div>
|
|
<Input
|
|
isValid={!(this.state.customNetworkUnit && invalids.customNetworkUnit)}
|
|
type="text"
|
|
placeholder="ETH"
|
|
value={this.state.customNetworkUnit}
|
|
onChange={e => this.setState({ customNetworkUnit: e.currentTarget.value })}
|
|
/>
|
|
</label>
|
|
<label className="col-sm-3 input-group input-group-inline">
|
|
<div className="input-group-header">{translate('CUSTOM_NETWORK_CHAIN_ID')}</div>
|
|
<Input
|
|
isValid={!(this.state.customNetworkChainId && invalids.customNetworkChainId)}
|
|
type="text"
|
|
placeholder="1"
|
|
value={this.state.customNetworkChainId}
|
|
onChange={e => this.setState({ customNetworkChainId: e.currentTarget.value })}
|
|
/>
|
|
</label>
|
|
</div>
|
|
)}
|
|
{chainidConflictNetwork && (
|
|
<div className="alert alert-warning small">
|
|
{translate('CUSTOM_NODE_CHAINID_CONFLICT', { $network: chainidConflictNetwork.name })}
|
|
</div>
|
|
)}
|
|
|
|
<label className="input-group input-group-inline">
|
|
<div className="input-group-header">{translate('CUSTOM_NETWORK_URL')}</div>
|
|
<Input
|
|
isValid={!(this.state.url && invalids.url)}
|
|
type="text"
|
|
placeholder="https://127.0.0.1:8545/"
|
|
value={this.state.url}
|
|
onChange={e => this.setState({ url: e.currentTarget.value })}
|
|
autoComplete="off"
|
|
/>
|
|
</label>
|
|
|
|
<label>
|
|
<input
|
|
type="checkbox"
|
|
name="hasAuth"
|
|
checked={this.state.hasAuth}
|
|
onChange={() => this.setState({ hasAuth: !this.state.hasAuth })}
|
|
/>
|
|
<span>{translate('CUSTOM_NETWORK_HTTP_AUTH')}</span>
|
|
</label>
|
|
|
|
{this.state.hasAuth && (
|
|
<div className="flex-wrapper ">
|
|
<label className="col-sm-6 input-group input-group-inline">
|
|
<div className="input-group-header">{translate('INPUT_USERNAME_LABEL')}</div>
|
|
<Input
|
|
isValid={!(this.state.username && invalids.username)}
|
|
type="text"
|
|
value={this.state.username}
|
|
onChange={e => this.setState({ username: e.currentTarget.value })}
|
|
/>
|
|
</label>
|
|
<label className="col-sm-6 input-group input-group-inline">
|
|
<div className="input-group-header">{translate('INPUT_PASSWORD_LABEL')}</div>
|
|
<Input
|
|
isValid={!(this.state.password && invalids.password)}
|
|
type="password"
|
|
value={this.state.password}
|
|
onChange={e => this.setState({ password: e.currentTarget.value })}
|
|
/>
|
|
</label>
|
|
</div>
|
|
)}
|
|
</form>
|
|
</Modal>
|
|
);
|
|
}
|
|
|
|
private pollForDefaultNodes() {
|
|
const pollingInterval = 3000;
|
|
this.timer = window.setInterval(async () => {
|
|
const results = await exists(
|
|
[
|
|
// tslint:disable-next-line:no-http-string
|
|
{ type: 'http', addr: 'http://localhost', port: 8545, timeout: 3000 }
|
|
],
|
|
{ includeDefaults: false }
|
|
);
|
|
if (!this.timer) {
|
|
return;
|
|
}
|
|
this.setState({
|
|
defaultNodes: results.filter(r => r.success).map((r, index) => ({
|
|
...r,
|
|
display: `${r.addr}:${r.port}`,
|
|
index
|
|
}))
|
|
});
|
|
}, pollingInterval);
|
|
}
|
|
|
|
private renderDefaultNodeDropdown() {
|
|
const { defaultNodes } = this.state;
|
|
if (!defaultNodes.length) {
|
|
return null;
|
|
}
|
|
|
|
return (
|
|
<label className="col-sm-12 input-group">
|
|
<div className="input-group-header"> {'Default Nodes Found'}</div>
|
|
<Dropdown
|
|
options={this.state.defaultNodes.map(n => ({ label: n.display, value: n.index }))}
|
|
onChange={({ value }: { value: string }) => {
|
|
const result = this.state.defaultNodes.find(d => d.index === +value);
|
|
if (!result) {
|
|
return;
|
|
}
|
|
const { addr, port } = result;
|
|
this.setState({ url: `${addr}:${port}`, name: 'MyDefaultNode' });
|
|
}}
|
|
/>
|
|
</label>
|
|
);
|
|
}
|
|
|
|
private getInvalids(): { [key: string]: boolean } {
|
|
const {
|
|
url,
|
|
hasAuth,
|
|
username,
|
|
password,
|
|
network,
|
|
customNetworkId,
|
|
customNetworkUnit,
|
|
customNetworkChainId
|
|
} = this.state;
|
|
const required: (keyof State)[] = ['name', 'url', 'network'];
|
|
const invalids: { [key: string]: boolean } = {};
|
|
|
|
// Required fields
|
|
required.forEach(field => {
|
|
if (!this.state[field]) {
|
|
invalids[field] = true;
|
|
}
|
|
});
|
|
|
|
// Parse the URL, and make sure what they typed isn't parsed as relative.
|
|
// Not a perfect regex, just checks for protocol + any char
|
|
if (!/^https?:\/\/.+/i.test(url)) {
|
|
invalids.url = true;
|
|
}
|
|
|
|
// If they have auth, make sure it's provided
|
|
if (hasAuth) {
|
|
if (!username) {
|
|
invalids.username = true;
|
|
}
|
|
if (!password) {
|
|
invalids.password = true;
|
|
}
|
|
}
|
|
|
|
// If they have a custom network, make sure info is provided
|
|
if (network === CUSTOM.value) {
|
|
if (!customNetworkId) {
|
|
invalids.customNetworkId = true;
|
|
}
|
|
if (!customNetworkUnit) {
|
|
invalids.customNetworkUnit = true;
|
|
}
|
|
|
|
// Numeric chain ID
|
|
if (this.getChainIdCollisionNetwork(customNetworkChainId)) {
|
|
invalids.customNetworkChainId = true;
|
|
} else {
|
|
const iChainId = parseInt(customNetworkChainId, 10);
|
|
if (!customNetworkChainId || !iChainId || iChainId < 0) {
|
|
invalids.customNetworkChainId = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
return invalids;
|
|
}
|
|
|
|
private getChainIdCollisionNetwork(chainId: string) {
|
|
if (!chainId) {
|
|
return false;
|
|
}
|
|
|
|
const chainIdInt = parseInt(chainId, 10);
|
|
const allNetworks = [
|
|
...Object.values(this.props.staticNetworks),
|
|
...Object.values(this.props.customNetworks)
|
|
];
|
|
return allNetworks.reduce(
|
|
(collision, network) => (network.chainId === chainIdInt ? network : collision),
|
|
null
|
|
);
|
|
}
|
|
|
|
private makeCustomNetworkConfigFromState(): CustomNetworkConfig {
|
|
const similarNetworkConfig = Object.values(this.props.staticNetworks).find(
|
|
n => n.chainId === +this.state.customNetworkChainId
|
|
);
|
|
const dPathFormats = similarNetworkConfig ? similarNetworkConfig.dPathFormats : null;
|
|
|
|
return {
|
|
isCustom: true,
|
|
id: this.state.customNetworkChainId,
|
|
name: this.state.customNetworkId,
|
|
unit: this.state.customNetworkUnit,
|
|
chainId: parseInt(this.state.customNetworkChainId, 10),
|
|
dPathFormats
|
|
};
|
|
}
|
|
|
|
private makeCustomNodeConfigFromState(): CustomNodeConfig {
|
|
const { network, url, name, username, password } = this.state;
|
|
|
|
const networkId =
|
|
network === CUSTOM.value
|
|
? this.makeCustomNetworkId(this.makeCustomNetworkConfigFromState())
|
|
: network;
|
|
|
|
return {
|
|
isCustom: true,
|
|
service: 'your custom node',
|
|
id: url,
|
|
name: name.trim(),
|
|
url,
|
|
network: networkId,
|
|
...(this.state.hasAuth
|
|
? {
|
|
auth: {
|
|
username,
|
|
password
|
|
}
|
|
}
|
|
: {})
|
|
};
|
|
}
|
|
|
|
private getNameConflictNode(): CustomNodeConfig | undefined {
|
|
const { customNodes } = this.props;
|
|
const config = this.makeCustomNodeConfigFromState();
|
|
|
|
return customNodes[config.id];
|
|
}
|
|
|
|
private saveAndAdd = () => {
|
|
const node = this.makeCustomNodeConfigFromState();
|
|
|
|
if (this.state.network === CUSTOM.value) {
|
|
const network = this.makeCustomNetworkConfigFromState();
|
|
|
|
this.props.addCustomNetwork(network);
|
|
}
|
|
|
|
this.props.addCustomNode(node);
|
|
};
|
|
|
|
private makeCustomNetworkId(config: CustomNetworkConfig): string {
|
|
return config.chainId.toString();
|
|
}
|
|
}
|
|
|
|
const mapStateToProps = (state: AppState): StateProps => ({
|
|
customNetworks: getCustomNetworkConfigs(state),
|
|
customNodes: getCustomNodeConfigs(state),
|
|
staticNetworks: getStaticNetworkConfigs(state)
|
|
});
|
|
|
|
const mapDispatchToProps: DispatchProps = {
|
|
addCustomNetwork
|
|
};
|
|
|
|
export default connect(mapStateToProps, mapDispatchToProps)(CustomNodeModal);
|