2017-07-04 03:28:56 +00:00
|
|
|
import React, { Component } from 'react';
|
2018-06-18 01:53:00 +00:00
|
|
|
import { Store } from 'redux';
|
2018-03-02 01:24:14 +00:00
|
|
|
import { Provider, connect } from 'react-redux';
|
2018-06-11 21:46:03 +00:00
|
|
|
import { withRouter, Switch, HashRouter, Route, BrowserRouter } from 'react-router-dom';
|
2018-06-18 01:53:00 +00:00
|
|
|
|
|
|
|
import { AppState } from 'features/reducers';
|
|
|
|
import { getNetworkUnit } from 'features/config';
|
|
|
|
import { transactionMetaActions } from 'features/transaction';
|
2017-09-29 02:09:01 +00:00
|
|
|
// Components
|
2017-10-17 04:01:28 +00:00
|
|
|
import Contracts from 'containers/Tabs/Contracts';
|
2017-09-29 02:09:01 +00:00
|
|
|
import ENS from 'containers/Tabs/ENS';
|
|
|
|
import GenerateWallet from 'containers/Tabs/GenerateWallet';
|
|
|
|
import SendTransaction from 'containers/Tabs/SendTransaction';
|
|
|
|
import Swap from 'containers/Tabs/Swap';
|
2017-10-30 19:10:25 +00:00
|
|
|
import SignAndVerifyMessage from 'containers/Tabs/SignAndVerifyMessage';
|
2017-10-23 20:48:55 +00:00
|
|
|
import BroadcastTx from 'containers/Tabs/BroadcastTx';
|
2018-02-16 16:57:23 +00:00
|
|
|
import CheckTransaction from 'containers/Tabs/CheckTransaction';
|
2018-04-16 23:30:58 +00:00
|
|
|
import SupportPage from 'containers/Tabs/SupportPage';
|
2017-12-08 06:16:27 +00:00
|
|
|
import ErrorScreen from 'components/ErrorScreen';
|
2018-01-02 00:37:41 +00:00
|
|
|
import PageNotFound from 'components/PageNotFound';
|
2018-01-04 16:31:22 +00:00
|
|
|
import LogOutPrompt from 'components/LogOutPrompt';
|
2018-04-13 04:34:30 +00:00
|
|
|
import QrSignerModal from 'containers/QrSignerModal';
|
2018-05-11 15:15:32 +00:00
|
|
|
import OnboardModal from 'containers/OnboardModal';
|
|
|
|
import WelcomeModal from 'components/WelcomeModal';
|
2018-04-25 03:29:34 +00:00
|
|
|
import NewAppReleaseModal from 'components/NewAppReleaseModal';
|
2018-01-22 12:24:05 +00:00
|
|
|
import { RouteNotFound } from 'components/RouteNotFound';
|
2018-02-09 04:02:56 +00:00
|
|
|
import { RedirectWithQuery } from 'components/RedirectWithQuery';
|
2018-02-08 17:51:15 +00:00
|
|
|
import 'what-input';
|
2017-04-12 05:04:27 +00:00
|
|
|
|
2018-03-02 01:24:14 +00:00
|
|
|
interface OwnProps {
|
2017-12-30 20:29:04 +00:00
|
|
|
store: Store<AppState>;
|
2017-09-25 02:06:28 +00:00
|
|
|
}
|
2017-04-12 05:04:27 +00:00
|
|
|
|
2018-03-02 01:24:14 +00:00
|
|
|
interface StateProps {
|
|
|
|
networkUnit: string;
|
|
|
|
}
|
|
|
|
|
|
|
|
interface DispatchProps {
|
2018-06-18 01:53:00 +00:00
|
|
|
setUnitMeta: transactionMetaActions.TSetUnitMeta;
|
2018-03-02 01:24:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type Props = OwnProps & StateProps & DispatchProps;
|
|
|
|
|
2017-12-08 06:16:27 +00:00
|
|
|
interface State {
|
2017-12-16 02:53:27 +00:00
|
|
|
error: Error | null;
|
2017-12-08 06:16:27 +00:00
|
|
|
}
|
|
|
|
|
2018-03-02 01:24:14 +00:00
|
|
|
class RootClass extends Component<Props, State> {
|
2017-12-08 06:16:27 +00:00
|
|
|
public state = {
|
2017-12-16 02:53:27 +00:00
|
|
|
error: null
|
2017-12-08 06:16:27 +00:00
|
|
|
};
|
|
|
|
|
2018-01-11 18:04:11 +00:00
|
|
|
public componentDidMount() {
|
2018-03-02 01:24:14 +00:00
|
|
|
this.props.setUnitMeta(this.props.networkUnit);
|
2018-04-16 23:30:58 +00:00
|
|
|
this.addBodyClasses();
|
2018-01-11 18:04:11 +00:00
|
|
|
}
|
|
|
|
|
2017-12-19 22:46:34 +00:00
|
|
|
public componentDidCatch(error: Error) {
|
2017-12-16 02:53:27 +00:00
|
|
|
this.setState({ error });
|
2017-12-08 06:16:27 +00:00
|
|
|
}
|
|
|
|
|
2017-09-25 02:06:28 +00:00
|
|
|
public render() {
|
2017-12-30 16:22:28 +00:00
|
|
|
const { store } = this.props;
|
2017-12-16 02:53:27 +00:00
|
|
|
const { error } = this.state;
|
|
|
|
|
|
|
|
if (error) {
|
|
|
|
return <ErrorScreen error={error} />;
|
|
|
|
}
|
|
|
|
|
2018-01-22 12:24:05 +00:00
|
|
|
const CaptureRouteNotFound = withRouter(({ children, location }) => {
|
|
|
|
return location && location.state && location.state.error ? (
|
|
|
|
<PageNotFound />
|
|
|
|
) : (
|
|
|
|
(children as JSX.Element)
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
2017-12-30 16:22:28 +00:00
|
|
|
const routes = (
|
2018-01-22 12:24:05 +00:00
|
|
|
<CaptureRouteNotFound>
|
|
|
|
<Switch>
|
|
|
|
<Route path="/account" component={SendTransaction} />
|
2018-01-24 22:23:20 +00:00
|
|
|
<Route path="/generate" component={GenerateWallet} />
|
2018-01-22 12:24:05 +00:00
|
|
|
<Route path="/swap" component={Swap} />
|
|
|
|
<Route path="/contracts" component={Contracts} />
|
2018-02-08 17:30:30 +00:00
|
|
|
<Route path="/ens" component={ENS} exact={true} />
|
2018-01-22 12:24:05 +00:00
|
|
|
<Route path="/sign-and-verify-message" component={SignAndVerifyMessage} />
|
2018-02-16 16:57:23 +00:00
|
|
|
<Route path="/tx-status" component={CheckTransaction} exact={true} />
|
2018-01-22 12:24:05 +00:00
|
|
|
<Route path="/pushTx" component={BroadcastTx} />
|
2018-04-16 23:30:58 +00:00
|
|
|
<Route path="/support-us" component={SupportPage} exact={true} />
|
2018-06-11 21:46:03 +00:00
|
|
|
<RedirectWithQuery exactArg={true} from="/" to="/account" />
|
2018-01-22 12:24:05 +00:00
|
|
|
<RouteNotFound />
|
|
|
|
</Switch>
|
|
|
|
</CaptureRouteNotFound>
|
2017-12-30 16:22:28 +00:00
|
|
|
);
|
2018-01-04 16:31:22 +00:00
|
|
|
|
2018-01-22 23:38:06 +00:00
|
|
|
const Router =
|
|
|
|
process.env.BUILD_DOWNLOADABLE && process.env.NODE_ENV === 'production'
|
|
|
|
? HashRouter
|
|
|
|
: BrowserRouter;
|
2018-01-04 16:31:22 +00:00
|
|
|
|
2017-12-16 02:53:27 +00:00
|
|
|
return (
|
2018-04-16 23:30:58 +00:00
|
|
|
<React.Fragment>
|
|
|
|
<Provider store={store} key={Math.random()}>
|
|
|
|
<Router key={Math.random()}>
|
|
|
|
<React.Fragment>
|
|
|
|
{routes}
|
|
|
|
<LegacyRoutes />
|
|
|
|
<LogOutPrompt />
|
|
|
|
<QrSignerModal />
|
2018-04-25 03:29:34 +00:00
|
|
|
{process.env.BUILD_ELECTRON && <NewAppReleaseModal />}
|
2018-05-11 15:15:32 +00:00
|
|
|
{!process.env.DOWNLOADABLE_BUILD && (
|
|
|
|
<React.Fragment>
|
|
|
|
<OnboardModal />
|
2018-05-14 16:54:49 +00:00
|
|
|
{!process.env.BUILD_ELECTRON && <WelcomeModal />}
|
2018-05-11 15:15:32 +00:00
|
|
|
</React.Fragment>
|
|
|
|
)}
|
2018-04-16 23:30:58 +00:00
|
|
|
</React.Fragment>
|
|
|
|
</Router>
|
|
|
|
</Provider>
|
|
|
|
<div id="ModalContainer" />
|
|
|
|
</React.Fragment>
|
2017-07-04 03:28:56 +00:00
|
|
|
);
|
|
|
|
}
|
2018-04-16 23:30:58 +00:00
|
|
|
|
|
|
|
private addBodyClasses() {
|
|
|
|
const classes = [];
|
|
|
|
|
|
|
|
if (process.env.BUILD_ELECTRON) {
|
|
|
|
classes.push('is-electron');
|
|
|
|
|
|
|
|
if (navigator.appVersion.includes('Win')) {
|
|
|
|
classes.push('is-windows');
|
|
|
|
} else if (navigator.appVersion.includes('Mac')) {
|
|
|
|
classes.push('is-osx');
|
|
|
|
} else {
|
|
|
|
classes.push('is-linux');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
document.body.className += ` ${classes.join(' ')}`;
|
|
|
|
}
|
2017-04-12 05:04:27 +00:00
|
|
|
}
|
2017-10-29 08:24:28 +00:00
|
|
|
|
|
|
|
const LegacyRoutes = withRouter(props => {
|
|
|
|
const { history } = props;
|
2018-02-09 04:02:56 +00:00
|
|
|
const { pathname } = props.location;
|
|
|
|
let { hash } = props.location;
|
2017-10-29 08:24:28 +00:00
|
|
|
|
|
|
|
if (pathname === '/') {
|
2018-02-09 04:02:56 +00:00
|
|
|
hash = hash.split('?')[0];
|
2017-10-29 08:24:28 +00:00
|
|
|
switch (hash) {
|
|
|
|
case '#send-transaction':
|
|
|
|
case '#offline-transaction':
|
2018-02-09 04:02:56 +00:00
|
|
|
return <RedirectWithQuery from={pathname} to={'account/send'} />;
|
2017-10-29 08:24:28 +00:00
|
|
|
case '#generate-wallet':
|
|
|
|
history.push('/');
|
|
|
|
break;
|
|
|
|
case '#swap':
|
|
|
|
history.push('/swap');
|
|
|
|
break;
|
|
|
|
case '#contracts':
|
|
|
|
history.push('/contracts');
|
|
|
|
break;
|
|
|
|
case '#ens':
|
|
|
|
history.push('/ens');
|
|
|
|
break;
|
|
|
|
case '#view-wallet-info':
|
Productionize Transaction Stack (#456)
* 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
2017-12-18 21:23:31 +00:00
|
|
|
history.push('/account/info');
|
2017-10-29 08:24:28 +00:00
|
|
|
break;
|
|
|
|
case '#check-tx-status':
|
2018-02-16 16:57:23 +00:00
|
|
|
return <RedirectWithQuery from={pathname} to={'/tx-status'} />;
|
2017-10-29 08:24:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return (
|
|
|
|
<Switch>
|
2018-02-09 04:02:56 +00:00
|
|
|
<RedirectWithQuery from="/signmsg.html" to="/sign-and-verify-message" />
|
|
|
|
<RedirectWithQuery from="/helpers.html" to="/helpers" />
|
|
|
|
<RedirectWithQuery from="/send-transaction" to={'/account/send'} />
|
2017-10-29 08:24:28 +00:00
|
|
|
</Switch>
|
|
|
|
);
|
|
|
|
});
|
2018-03-02 01:24:14 +00:00
|
|
|
|
|
|
|
const mapStateToProps = (state: AppState) => {
|
|
|
|
return {
|
|
|
|
networkUnit: getNetworkUnit(state)
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
export default connect(mapStateToProps, {
|
2018-06-18 01:53:00 +00:00
|
|
|
setUnitMeta: transactionMetaActions.setUnitMeta
|
2018-03-02 01:24:14 +00:00
|
|
|
})(RootClass);
|