mirror of
https://github.com/status-im/MyCrypto.git
synced 2025-01-10 19:16:10 +00:00
0da409cd12
* Wipe tx modal clean & Update the subcomponents * Add Amounts & Address styles * Forgot to pass onlyIncludeLoader to GasLimitLoading component * Add currency conversion * Update styles * Change SENDModal_Yes & _No messages * Add visual summary * Update fonts & add Roboto Mono * Add details to tx-modal * Display contract addr when sending tokens * Add inline styles back to identicon (for paper wallet) * Remove inline styles * Update USD conversion conditions * Display token to usd conversion * Update styles * Update modal styles * Animate modals * Add a fade effect when modal overflows * Improve styles for mobile * Remove dead code * Update unlockHeader close button * Update text overflow fade styles * Fix invalid inline css prop * Fix issue with 'isToken' condition * Add table layout & update styles * Remove unsupported styles * Remove formatting diff * update styles * Update tx modal fixes (#999) * chore(package): update @types/lodash to version 4.14.101 (#992) * ENS Resolving (#942) * Refactor BaseNode to be an interface INode * Initial contract commit * Remove redundant fallback ABI function * First working iteration of Contract generator to be used in ENS branch * Hide abi to clean up logging output * Strip 0x prefix from output decode * Handle unnamed output params * Implement ability to supply output mappings to ABI functions * Fix null case in outputMapping * Add flow typing * Add .call method to functions * Partial commit for type refactor * Temp contract type fix -- waiting for NPM modularization * Remove empty files * Cleanup contract * Add call request to node interface * Fix output mapping types * Revert destructuring overboard * Add sendCallRequest to rpcNode class and add typing * Use enum for selecting ABI methods * Add transaction capability to contracts * Cleanup privaite/public members * Remove broadcasting step from a contract transaction * Cleanup uneeded types * Refactor ens-base to typescript and add typings for ENS smart contracts * Migrate ens-name-search to TS * Add IResolveDomainRequest * Fix rest of TSC errors * Add definition file for bn.js * Remove types-bn * Fix some typings * make isBN a static property * progress commit -- swap out bignumber.js for bn.js * Swap out bignumber for bn in vendor * Change modn to number return * Start to strip out units lib for a string manipulation based lib * Convert codebase to only base units * Get rid of useless component * Handle only wei in values * Use unit conversion in sidebar * Automatically strip hex prefix, and handle decimal edge case * Handle base 16 wei in transactions * Make a render callback component for dealing with unit conversion * Switch contracts to use bn.js, and get transaction values from signedTx instead of state * Get send transaction working with bn.js * Remove redundant hex stripping, return base value of tokens * Cleanup unit file * Re-implement toFixed for strings * Use formatNumber in codebase * Cleanup code * Undo package test changes * Update snapshot and remove console logs * Use TokenValue / Wei more consistently where applicable * Add typing to deterministicWallets, fix confirmation modal, make UnitDisplay more flexible * Split different ENS modes into their own components * Fix Abi typedef * Remove redundant moment type package * Add Aux helper component * Split out resolve components * Make 'to' parameter optional * Change import type * Change typing to be base domain request * Split handling of resolving into object handler * Fix countdown component * Adjust element spacing * Implement reveal search functionality * Add unit display for highest bidder * Fill out forbidden/NYA modes * ENS wallet component skeleton * Clean up prop handling in UnitDisplay * Change instanceof to typeof check, change boolean of displayBalance * Add ENS wallet component * Cleanup spacing * Convert ConfModal for bidding in ENS * Make ui component for placing bids * Fix destructure in placeBid * Pass through entire wallet * Remove text center * Display inline notification ENS isValid & add some ENS tests * Add export of Aux * Reformat with prettier * progress... * Add ENSUnlockLayout * Add RevealBid component * organize NameResolve components * Merge ENS with transaction-refactor changes * Fix address resolution * Update styles * convert ens name to lowercase before checking * Add overflow-y:scroll to table * update ens snapshots & tests * cast 'undefined' state argument as any for testing * clean up components * Connect unitconverter to redux state * remove unnecessary type assertion * fix spinner size * remove old bidmodal * validate bidmask before opening modal * progress... * Update styles * Add saga / actions for placing a bid * Update types & clean up dead code * Delete old test * Dispatch PlaceBidRequested acitons * Progress commit -- get ENS bidding ready for tx generation via sagas * Seperate ENS action creators and types * Add reducer & actions for ENS fields * Add preliminary sagas for bid mask and bid value * Fix ts errors * Get bidding fields connected with some validation * Clean up generate bid * Hook up generate bid to redux state * Get bid data generation working * Add support for bidding on already open auctions * Move bid generation states to redux, improve default field values * Remove generate bid component * Throttle bid generation * Progress commit -- Bid Modal * Hook bidmodal component up to bidding component * Update template modal to handle custom confirm behavior * Remove old redux bidding actions, add new one for downloaded bids * Save downloaded bids to local storage * Finish bidding modal * Fix gas estimation bug * Fix typing * Remove bidding related functionality * Get passing unit tests * Make previous test more comprehensive * Fix ts errors * Remove commented code * Fix invalid return * Remove implementation of revealing bid * Update snapshot * Fix tests * Delegate bidding to V3 * Update react-markdown to the latest version 🚀 (#986) * fix(package): update react-markdown to version 3.1.5 * Fix tsc errors, match original behaviour of V2 as closely as possible * Add tooltip to gas slider (#997) * Prevent invalid gas price states (#996) * Slider using value instead of raw to prevent errors. Dont show empty gas price as invalid. Clamp slider values to min / max on mount. * Remove gas price from local storage. * Update @types/react to the latest version 🚀 (#912) * chore(package): update @types/react to version 16.0.35 * Add stricter typing via function overloads * Fix rest of aria translations * Make implementation of confirmation modal template * Address github comments for #928 * Make modal state setting more explicit * Fix infinite loop of state setting on modal * Fix transaction rebroadcasting for modal display
142 lines
3.9 KiB
TypeScript
142 lines
3.9 KiB
TypeScript
import React from 'react';
|
|
import Modal, { IButton } from 'components/ui/Modal';
|
|
import Spinner from 'components/ui/Spinner';
|
|
import { connect } from 'react-redux';
|
|
import { getWalletType, IWalletType } from 'selectors/wallet';
|
|
import { getLanguageSelection } from 'selectors/config';
|
|
import {
|
|
broadcastLocalTransactionRequested,
|
|
TBroadcastLocalTransactionRequested,
|
|
broadcastWeb3TransactionRequested,
|
|
TBroadcastWeb3TransactionRequested
|
|
} from 'actions/transaction';
|
|
import { currentTransactionBroadcasting } from 'selectors/transaction';
|
|
import { translateRaw } from 'translations';
|
|
import './ConfirmationModalTemplate.scss';
|
|
import { AppState } from 'reducers';
|
|
|
|
interface DispatchProps {
|
|
broadcastLocalTransactionRequested: TBroadcastLocalTransactionRequested;
|
|
broadcastWeb3TransactionRequested: TBroadcastWeb3TransactionRequested;
|
|
}
|
|
|
|
interface StateProps {
|
|
lang: string;
|
|
walletTypes: IWalletType;
|
|
transactionBroadcasting: boolean;
|
|
}
|
|
|
|
export interface ConfirmButtonCBProps {
|
|
type: IButton['type'];
|
|
timeLocked: boolean;
|
|
timeLeft: number;
|
|
timePrefix: string;
|
|
defaultText: string;
|
|
onConfirm: ConfirmationModalTemplateClass['confirm'];
|
|
}
|
|
|
|
export interface OwnProps {
|
|
isOpen?: boolean;
|
|
Body: React.ReactElement<any>;
|
|
withConfirmButton?(props: ConfirmButtonCBProps): IButton;
|
|
onClose(): void;
|
|
}
|
|
|
|
interface State {
|
|
timeToRead: number;
|
|
}
|
|
|
|
type Props = DispatchProps & StateProps & OwnProps;
|
|
|
|
class ConfirmationModalTemplateClass extends React.Component<Props, State> {
|
|
private readTimer = 0;
|
|
public constructor(props: Props) {
|
|
super(props);
|
|
this.state = {
|
|
timeToRead: 5
|
|
};
|
|
}
|
|
|
|
// Count down 5 seconds before allowing them to confirm
|
|
public componentDidMount() {
|
|
this.readTimer = window.setInterval(() => {
|
|
if (this.state.timeToRead > 0) {
|
|
this.setState({ timeToRead: this.state.timeToRead - 1 });
|
|
} else {
|
|
window.clearInterval(this.readTimer);
|
|
}
|
|
}, 1000);
|
|
}
|
|
|
|
public render() {
|
|
const { onClose, transactionBroadcasting, isOpen } = this.props;
|
|
const { timeToRead } = this.state;
|
|
const buttonPrefix = timeToRead > 0 ? `(${timeToRead}) ` : '';
|
|
const defaultConfirmButton = {
|
|
text: buttonPrefix + translateRaw('SENDModal_Yes'),
|
|
type: 'primary' as IButton['type'],
|
|
disabled: timeToRead > 0,
|
|
onClick: this.confirm
|
|
};
|
|
|
|
const confirmButton: IButton = this.props.withConfirmButton
|
|
? this.props.withConfirmButton({
|
|
onConfirm: defaultConfirmButton.onClick,
|
|
timeLeft: timeToRead,
|
|
timePrefix: buttonPrefix,
|
|
timeLocked: defaultConfirmButton.disabled,
|
|
defaultText: translateRaw('SENDModal_Yes'),
|
|
type: defaultConfirmButton.type
|
|
})
|
|
: defaultConfirmButton;
|
|
|
|
const buttons: IButton[] = [
|
|
confirmButton,
|
|
{
|
|
text: translateRaw('SENDModal_No'),
|
|
type: 'default',
|
|
onClick: onClose
|
|
}
|
|
];
|
|
|
|
return (
|
|
<Modal
|
|
title="Confirm Transaction"
|
|
buttons={buttons}
|
|
handleClose={onClose}
|
|
disableButtons={transactionBroadcasting}
|
|
isOpen={isOpen}
|
|
>
|
|
{transactionBroadcasting ? (
|
|
<React.Fragment>
|
|
<Spinner size="x5" />
|
|
</React.Fragment>
|
|
) : (
|
|
<React.Fragment>{this.props.Body}</React.Fragment>
|
|
)}
|
|
</Modal>
|
|
);
|
|
}
|
|
|
|
public componentWillUnmount() {
|
|
window.clearInterval(this.readTimer);
|
|
}
|
|
|
|
private confirm = () => {
|
|
if (this.state.timeToRead < 1) {
|
|
this.props.walletTypes.isWeb3Wallet
|
|
? this.props.broadcastWeb3TransactionRequested()
|
|
: this.props.broadcastLocalTransactionRequested();
|
|
}
|
|
};
|
|
}
|
|
|
|
export const ConfirmationModalTemplate = connect(
|
|
(state: AppState) => ({
|
|
transactionBroadcasting: currentTransactionBroadcasting(state),
|
|
lang: getLanguageSelection(state),
|
|
walletTypes: getWalletType(state)
|
|
}),
|
|
{ broadcastLocalTransactionRequested, broadcastWeb3TransactionRequested }
|
|
)(ConfirmationModalTemplateClass);
|