MyCrypto/common/utils/formatters.ts

112 lines
3.3 KiB
TypeScript
Raw Normal View History

Replace bignumber.js with bn.js (#319) * Add definition file for bn.js * Remove types-bn * 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 * Clean up prop handling in UnitDisplay * Change instanceof to typeof check, change boolean of displayBalance * Fix tsc errors * Fix token row displaying wrong decimals * Fix deterministic modal token display * 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
2017-11-12 19:45:52 +00:00
import { Wei } from 'libs/units';
Migrate to Typescript (#224) * Refactor babel/types * Refactor entry point * Refactor actions * Refactor api * Full project refactor -- Broad type fixing sweep * - completely fix merge conflicts - handle various type errors * Add tslint to package.json * Dependency cleanup * Fix module resolution * Work on type definitions for untyped libs * progress commit * Add more definition typing * various type additions * Add unit types * Fix sagaiterator + unit types * various types added * additional type additions * Fix typing on Sagas * remove flowfixmes; swap translate for translateRaw * Get rid of contracts - awaiting Henry's contract PR * Remove contracts from routing * Fix most of actions/reducers * refactor actions directory structure * fix reducer action type imports * Fix most of type errors pre-actions refactor * fix action creator imports in containers * Refactor more * Refactor index of actions * fix action imports; use module level index export * package-lock.json updated * Use action types in props * Type up action creators * Fix most of connect errors * Typefixing progress * More types * Fix run-time errors * Caching improvements for webpack * Remove path resolve from webpack * Update non-breaking packages to latest version * Fix token typing * Remove unused color code * Fix wallet decrypt dispatch * Set redux-form related props/functions to ANY, since we're stripping it out later on * Revert BigNumber.js package changes * Extend window to custom object for Perf * Format Navigation * Typecase keystore errors as any (since we shouldnt touch this) * Push wallet context fix * - find/replace value->payload in swap - properly type swap state properties - extract inline reducer into reducer function * - type local storage retrieved items as generic * - bind all RPCClient methods with fat arrow * - reformat * Change to enums for constants * Change state into any * Fix swap errors * ensure that seconds are passed into state as integers * Fix rest of errors * use parseInt explicitly instead of type coercion * Fix derivation-checker, remove flow command, add tslint command, add tslint-react, tell travis to use tslint instead of flow. * Whoops, remove those tests. * Remove unsupported (yet) config option. * Fix precommit to target ts and tsx files. * Fix some errors, ignore some silly rules. * Revert jest to v19, use ts-jest and make all tests typescript. Fixes all but one. * Get rid of saga tests * Fix tslint errors
2017-09-25 02:06:28 +00:00
export function toFixedIfLarger(num: number, fixedSize: number = 6): string {
return parseFloat(num.toFixed(fixedSize)).toString();
}
export function combineAndUpper(...args: string[]) {
return args.reduce((acc, item) => acc.concat(item.toUpperCase()), '');
}
Replace bignumber.js with bn.js (#319) * Add definition file for bn.js * Remove types-bn * 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 * Clean up prop handling in UnitDisplay * Change instanceof to typeof check, change boolean of displayBalance * Fix tsc errors * Fix token row displaying wrong decimals * Fix deterministic modal token display * 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
2017-11-12 19:45:52 +00:00
const toFixed = (num: string, digits: number = 3) => {
const [integerPart, fractionPart = ''] = num.split('.');
if (fractionPart.length === digits) {
return num;
}
if (fractionPart.length < digits) {
return `${integerPart}.${fractionPart.padEnd(digits, '0')}`;
}
let decimalPoint = integerPart.length;
const formattedFraction = fractionPart.slice(0, digits);
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
const integerArr = `${integerPart}${formattedFraction}`.split('').map(str => +str);
Replace bignumber.js with bn.js (#319) * Add definition file for bn.js * Remove types-bn * 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 * Clean up prop handling in UnitDisplay * Change instanceof to typeof check, change boolean of displayBalance * Fix tsc errors * Fix token row displaying wrong decimals * Fix deterministic modal token display * 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
2017-11-12 19:45:52 +00:00
let carryOver = Math.floor((+fractionPart[digits] + 5) / 10);
// grade school addition / rounding
for (let i = integerArr.length - 1; i >= 0; i--) {
const currVal = integerArr[i] + carryOver;
const newVal = currVal % 10;
carryOver = Math.floor(currVal / 10);
integerArr[i] = newVal;
if (i === 0 && carryOver > 0) {
integerArr.unshift(0);
decimalPoint++;
i++;
}
}
const strArr = integerArr.map(n => n.toString());
strArr.splice(decimalPoint, 0, '.');
if (strArr[strArr.length - 1] === '.') {
strArr.pop();
}
return strArr.join('');
};
// Use in place of angular number filter
Replace bignumber.js with bn.js (#319) * Add definition file for bn.js * Remove types-bn * 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 * Clean up prop handling in UnitDisplay * Change instanceof to typeof check, change boolean of displayBalance * Fix tsc errors * Fix token row displaying wrong decimals * Fix deterministic modal token display * 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
2017-11-12 19:45:52 +00:00
export function formatNumber(num: string, digits?: number): string {
const parts = toFixed(num, digits).split('.');
// Remove trailing zeroes on decimal (If there is a decimal)
if (parts[1]) {
parts[1] = parts[1].replace(/0+$/, '');
// If there's nothing left, remove decimal altogether
if (!parts[1]) {
parts.pop();
}
}
// Commafy the whole numbers
parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
return parts.join('.');
}
// TODO: Comment up this function to make it clear what's happening here.
Replace bignumber.js with bn.js (#319) * Add definition file for bn.js * Remove types-bn * 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 * Clean up prop handling in UnitDisplay * Change instanceof to typeof check, change boolean of displayBalance * Fix tsc errors * Fix token row displaying wrong decimals * Fix deterministic modal token display * 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
2017-11-12 19:45:52 +00:00
export function formatGasLimit(limit: Wei, transactionUnit: string = 'ether') {
let limitStr = limit.toString();
// I'm guessing this is some known off-by-one-error from the node?
// 21k is only the limit for ethereum though, so make sure they're
// sending ether if we're going to fix it for them.
if (limitStr === '21001' && transactionUnit === 'ether') {
limitStr = '21000';
}
// If they've exceeded the gas limit per block, make it -1
// TODO: Explain why not cap at limit?
// TODO: Make this dynamic, potentially. Would require promisifying this fn.
// TODO: Figure out if this is only true for ether. Do other currencies have
// this limit?
Replace bignumber.js with bn.js (#319) * Add definition file for bn.js * Remove types-bn * 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 * Clean up prop handling in UnitDisplay * Change instanceof to typeof check, change boolean of displayBalance * Fix tsc errors * Fix token row displaying wrong decimals * Fix deterministic modal token display * 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
2017-11-12 19:45:52 +00:00
if (limit.gten(4000000)) {
limitStr = '-1';
}
return limitStr;
}
2017-12-15 01:08:24 +00:00
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
// Regex modified from this stackoverflow answer
// https://stackoverflow.com/a/10805198, with the comma character added as a
2017-12-15 01:08:24 +00:00
// delimiter (in the case of csv style mnemonic phrases) as well as any stray
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
// space characters. it should be fairly easy to add new delimiters as required
2017-12-15 01:08:24 +00:00
export function formatMnemonic(phrase: string) {
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
return phrase.replace(/(\r\n|\n|\r|\s+|,)/gm, ' ').trim();
}
export function bytesToHuman(bytes: number) {
if (bytes <= 0) {
return '0 b';
}
const sizes = ['b', 'kb', 'mb', 'gb', 'tb'];
const i = Math.round(Math.floor(Math.log(bytes) / Math.log(1024)));
return Math.round(bytes / Math.pow(1024, i)) + ' ' + sizes[i];
}