mirror of
https://github.com/status-im/MyCrypto.git
synced 2025-01-25 02:20:24 +00:00
08d4ccbdae
* 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
248 lines
7.1 KiB
TypeScript
248 lines
7.1 KiB
TypeScript
import {
|
|
setWallet,
|
|
TSetWallet,
|
|
unlockKeystore,
|
|
TUnlockKeystore,
|
|
unlockMnemonic,
|
|
TUnlockMnemonic,
|
|
unlockPrivateKey,
|
|
TUnlockPrivateKey,
|
|
unlockWeb3,
|
|
TUnlockWeb3,
|
|
resetWallet,
|
|
TResetWallet
|
|
} from 'actions/wallet';
|
|
import { reset, TReset } from 'actions/transaction';
|
|
import isEmpty from 'lodash/isEmpty';
|
|
import map from 'lodash/map';
|
|
import React, { Component } from 'react';
|
|
import { connect } from 'react-redux';
|
|
import translate from 'translations';
|
|
import KeystoreDecrypt from './Keystore';
|
|
import LedgerNanoSDecrypt from './LedgerNano';
|
|
import MnemonicDecrypt from './Mnemonic';
|
|
import PrivateKeyDecrypt, { PrivateKeyValue } from './PrivateKey';
|
|
import TrezorDecrypt from './Trezor';
|
|
import ViewOnlyDecrypt from './ViewOnly';
|
|
import { AppState } from 'reducers';
|
|
import Web3Decrypt from './Web3';
|
|
import Help from 'components/ui/Help';
|
|
import { knowledgeBaseURL } from 'config/data';
|
|
import NavigationPrompt from './NavigationPrompt';
|
|
import { IWallet } from 'libs/wallet';
|
|
|
|
type UnlockParams = {} | PrivateKeyValue;
|
|
|
|
interface Props {
|
|
resetTransactionState: TReset;
|
|
unlockKeystore: TUnlockKeystore;
|
|
unlockMnemonic: TUnlockMnemonic;
|
|
unlockPrivateKey: TUnlockPrivateKey;
|
|
setWallet: TSetWallet;
|
|
unlockWeb3: TUnlockWeb3;
|
|
resetWallet: TResetWallet;
|
|
wallet: IWallet;
|
|
hidden?: boolean;
|
|
offline: boolean;
|
|
allowReadOnly?: boolean;
|
|
}
|
|
|
|
interface State {
|
|
selectedWalletKey: string;
|
|
value: UnlockParams;
|
|
}
|
|
|
|
export class WalletDecrypt extends Component<Props, State> {
|
|
public WALLETS = {
|
|
web3: {
|
|
lid: 'x_MetaMask',
|
|
component: Web3Decrypt,
|
|
initialParams: {},
|
|
unlock: this.props.unlockWeb3,
|
|
helpLink: `${knowledgeBaseURL}/migration/moving-from-private-key-to-metamask`
|
|
},
|
|
'ledger-nano-s': {
|
|
lid: 'x_Ledger',
|
|
component: LedgerNanoSDecrypt,
|
|
initialParams: {},
|
|
unlock: this.props.setWallet,
|
|
helpLink:
|
|
'https://ledger.zendesk.com/hc/en-us/articles/115005200009-How-to-use-MyEtherWallet-with-Ledger'
|
|
},
|
|
trezor: {
|
|
lid: 'x_Trezor',
|
|
component: TrezorDecrypt,
|
|
initialParams: {},
|
|
unlock: this.props.setWallet,
|
|
helpLink: 'https://doc.satoshilabs.com/trezor-apps/mew.html'
|
|
},
|
|
'keystore-file': {
|
|
lid: 'x_Keystore2',
|
|
component: KeystoreDecrypt,
|
|
initialParams: {
|
|
file: '',
|
|
password: ''
|
|
},
|
|
unlock: this.props.unlockKeystore,
|
|
helpLink: `${
|
|
knowledgeBaseURL
|
|
}/private-keys-passwords/difference-beween-private-key-and-keystore-file.html`
|
|
},
|
|
'mnemonic-phrase': {
|
|
lid: 'x_Mnemonic',
|
|
component: MnemonicDecrypt,
|
|
initialParams: {},
|
|
unlock: this.props.unlockMnemonic,
|
|
helpLink: `${
|
|
knowledgeBaseURL
|
|
}/private-keys-passwords/difference-beween-private-key-and-keystore-file.html`
|
|
},
|
|
'private-key': {
|
|
lid: 'x_PrivKey2',
|
|
component: PrivateKeyDecrypt,
|
|
initialParams: {
|
|
key: '',
|
|
password: ''
|
|
},
|
|
unlock: this.props.unlockPrivateKey,
|
|
helpLink: `${
|
|
knowledgeBaseURL
|
|
}/private-keys-passwords/difference-beween-private-key-and-keystore-file.html`
|
|
},
|
|
'view-only': {
|
|
lid: 'View with Address Only',
|
|
component: ViewOnlyDecrypt,
|
|
initialParams: {},
|
|
unlock: this.props.setWallet,
|
|
helpLink: ''
|
|
}
|
|
};
|
|
public state: State = {
|
|
selectedWalletKey: 'keystore-file',
|
|
value: this.WALLETS['keystore-file'].initialParams
|
|
};
|
|
|
|
public getDecryptionComponent() {
|
|
const { selectedWalletKey, value } = this.state;
|
|
const selectedWallet = this.WALLETS[selectedWalletKey];
|
|
|
|
if (!selectedWallet) {
|
|
return null;
|
|
}
|
|
return (
|
|
<selectedWallet.component value={value} onChange={this.onChange} onUnlock={this.onUnlock} />
|
|
);
|
|
}
|
|
|
|
public isOnlineRequiredWalletAndOffline(selectedWalletKey) {
|
|
const onlineRequiredWallets = ['trezor', 'ledger-nano-s'];
|
|
return this.props.offline && onlineRequiredWallets.includes(selectedWalletKey);
|
|
}
|
|
|
|
public buildWalletOptions() {
|
|
return map(this.WALLETS, (wallet, key) => {
|
|
const { helpLink } = wallet;
|
|
const isSelected = this.state.selectedWalletKey === key;
|
|
const isDisabled =
|
|
this.isOnlineRequiredWalletAndOffline(key) ||
|
|
(!this.props.allowReadOnly && wallet.component === ViewOnlyDecrypt);
|
|
|
|
return (
|
|
<label className="radio" key={key}>
|
|
<input
|
|
aria-flowto={`aria-${key}`}
|
|
aria-labelledby={`${key}-label`}
|
|
type="radio"
|
|
name="decryption-choice-radio-group"
|
|
value={key}
|
|
checked={isSelected}
|
|
disabled={isDisabled}
|
|
onChange={this.handleDecryptionChoiceChange}
|
|
/>
|
|
<span id={`${key}-label`}>{translate(wallet.lid)}</span>
|
|
{helpLink ? <Help link={helpLink} /> : null}
|
|
</label>
|
|
);
|
|
});
|
|
}
|
|
|
|
public handleDecryptionChoiceChange = (event: React.SyntheticEvent<HTMLInputElement>) => {
|
|
const wallet = this.WALLETS[(event.target as HTMLInputElement).value];
|
|
|
|
if (!wallet) {
|
|
return;
|
|
}
|
|
|
|
this.setState({
|
|
selectedWalletKey: (event.target as HTMLInputElement).value,
|
|
value: wallet.initialParams
|
|
});
|
|
};
|
|
|
|
public render() {
|
|
const { wallet, hidden } = this.props;
|
|
const decryptionComponent = this.getDecryptionComponent();
|
|
const unlocked = !!wallet;
|
|
return (
|
|
<div>
|
|
<NavigationPrompt when={unlocked} onConfirm={this.props.resetWallet} />
|
|
{!hidden && (
|
|
<article className="Tab-content-pane row">
|
|
<section className="col-md-4 col-sm-6">
|
|
<h4>{translate('decrypt_Access')}</h4>
|
|
|
|
{this.buildWalletOptions()}
|
|
</section>
|
|
|
|
{decryptionComponent}
|
|
{!!(this.state.value as PrivateKeyValue).valid && (
|
|
<section className="col-md-4 col-sm-6">
|
|
<h4 id="uploadbtntxt-wallet">{translate('ADD_Label_6')}</h4>
|
|
<div className="form-group">
|
|
<a
|
|
tabIndex={0}
|
|
role="button"
|
|
className="btn btn-primary btn-block"
|
|
onClick={this.onUnlock}
|
|
>
|
|
{translate('ADD_Label_6_short')}
|
|
</a>
|
|
</div>
|
|
</section>
|
|
)}
|
|
</article>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
public onChange = (value: UnlockParams) => {
|
|
this.setState({ value });
|
|
};
|
|
|
|
public onUnlock = (payload: any) => {
|
|
// some components (TrezorDecrypt) don't take an onChange prop, and thus this.state.value will remain unpopulated.
|
|
// in this case, we can expect the payload to contain the unlocked wallet info.
|
|
const unlockValue = this.state.value && !isEmpty(this.state.value) ? this.state.value : payload;
|
|
this.WALLETS[this.state.selectedWalletKey].unlock(unlockValue);
|
|
this.props.resetTransactionState();
|
|
};
|
|
}
|
|
|
|
function mapStateToProps(state: AppState) {
|
|
return {
|
|
offline: state.config.offline,
|
|
wallet: state.wallet.inst
|
|
};
|
|
}
|
|
|
|
export default connect(mapStateToProps, {
|
|
unlockKeystore,
|
|
unlockMnemonic,
|
|
unlockPrivateKey,
|
|
unlockWeb3,
|
|
setWallet,
|
|
resetWallet,
|
|
resetTransactionState: reset
|
|
})(WalletDecrypt);
|