Commit Graph

3936 Commits

Author SHA1 Message Date
Simon Liang 9d36b25c5f extracted transaction list 2017-08-10 14:43:01 +08:00
Simon Liang 72df9746fa removing styling comments 2017-08-10 14:43:01 +08:00
Thomas Huang 4b7fa27ad0 Merge pull request #1894 from MetaMask/3.9.6
v3.9.6
2017-08-09 23:10:40 -07:00
kumavis 2b409fb60b 3.9.6 2017-08-09 23:05:50 -07:00
sdtsui 779be75370 [WIP] Position account potions dropdown correctly and hook up to action creators 2017-08-09 21:42:16 -07:00
sdtsui be116ecfbd Add new selectors for addresses, identities, and accounts 2017-08-09 21:42:16 -07:00
sdtsui 5f74564deb Adjust modal styles to match new modal size, from cancel button tweak 2017-08-09 21:42:16 -07:00
sdtsui 50f8535f7b Switch buy modal 'cancel' from text to button for accessibility 2017-08-09 21:42:16 -07:00
sdtsui 231b8a7542 Vertically center modal in mobile view - @cjeria 2017-08-09 21:42:16 -07:00
sdtsui cba50818c2 Improve layout of buy buttons by tweaking text styles 2017-08-09 21:42:16 -07:00
Thomas Huang 15c84600e7 Merge pull request #1892 from MetaMask/deps-query
deps - bump ethjs-query
2017-08-09 16:23:23 -07:00
kumavis fa6370c68a deps - bump ethjs-query 2017-08-09 16:18:38 -07:00
Thomas Huang 1071a35f7b Merge pull request #1883 from MetaMask/estimateGas-fix
tx utils - detect estimateGas err and set simulationFailed
2017-08-09 14:03:02 -07:00
kumavis 7da65bdb90 Merge pull request #1885 from MetaMask/dharma
Feature - Add Dharma Loans Beta to kovan buy options
2017-08-09 12:50:31 -07:00
kumavis 245125eb18 ui - buy eth - formatting and moved network names to config 2017-08-09 12:25:38 -07:00
Frankie 208b71740b Merge pull request #1884 from MetaMask/waffle-badge
readme - add waffle.io badge
2017-08-09 09:06:13 -04:00
kumavis 052d338b2b lint fix 2017-08-09 01:04:42 -07:00
kumavis 897d00efa0 ui - buy eth - add dharma beta to kovan 2017-08-09 01:00:06 -07:00
kumavis 84c3d3c6db ui - buy button view - refactor 2017-08-09 00:36:18 -07:00
kumavis b6df46337f readme - add waffle.io badge 2017-08-08 23:53:32 -07:00
kumavis b4052cd5e6 tx utils - detect estimateGas err and set simulationFailed 2017-08-08 23:34:18 -07:00
kumavis 0188e7b94d Merge branch 'master' into NewUI-flat 2017-08-08 23:30:58 -07:00
Frankie 57f6fce6b2 Merge pull request #1882 from MetaMask/tx-cont-fixes
Tx cont fixes
2017-08-09 00:16:49 -04:00
kumavis 25f9746dab tx controller - fix error serialization 2017-08-08 21:09:28 -07:00
kumavis 5e6962342d tx controller - fix getBalance fn 2017-08-08 21:08:30 -07:00
kumavis 5418813ed1 util - sufficientBalance - validate input 2017-08-08 21:05:59 -07:00
sdtsui 5e9926b0d0 Fix dropdown z-index value 2017-08-08 19:02:58 -07:00
sdtsui 6be6f56ac5 Add z indicies to settings-variables 2017-08-08 19:01:33 -07:00
Frankie d40bd9a726 Merge pull request #1880 from MetaMask/pendingFix
fix getPendingTransactions function for pendingTxTracker
2017-08-08 22:00:17 -04:00
frankiebee 9c9165e930 filter by network for pending txs 2017-08-08 21:54:26 -04:00
sdtsui 67213e7583 Add backdrop styles and box shadow to new global modal defaults 2017-08-08 18:51:06 -07:00
frankiebee 5bb84f6e21 fix getPendingTransactions function for pendingTxTracker 2017-08-08 21:49:48 -04:00
Thomas Huang 02a6cd255b Merge pull request #1879 from MetaMask/build-err-fix
Build sys - prevent err from being swallowed
2017-08-08 18:44:53 -07:00
sdtsui bdf5436c2d Add minor comments and cleanup for new components 2017-08-08 18:44:20 -07:00
sdtsui c8893fb9ca Hook up 'Buy with Fiat', redirect to Coinbase 2017-08-08 18:37:20 -07:00
sdtsui dc702705bf Move buy view into its own component - BuyOptions 2017-08-08 18:34:04 -07:00
sdtsui eab5718a40 Add an additional font-size breakpoint for buy modal on the largest screens 2017-08-08 18:12:50 -07:00
sdtsui 3072d2d178 Add minor positioning tweaks for buy modal, laptop view 2017-08-08 17:57:47 -07:00
kumavis 59e83d2b80 build - factor watcify into bundler generation 2017-08-08 17:53:34 -07:00
sdtsui b97dcf09ac Move inline styles out into explicitly named BEM classes 2017-08-08 17:51:06 -07:00
sdtsui e260ab46cb Implement utility helper for checking viewport size in js 2017-08-08 17:50:29 -07:00
kumavis 4a4736195f build - fix error swallowing on dev 2017-08-08 17:46:31 -07:00
kumavis 6767430aa2 deps - bump watchify 2017-08-08 17:46:09 -07:00
sdtsui 928adae104 Implement modal content for buy flow - mobile view 2017-08-08 17:11:25 -07:00
Thomas Huang 0e6bc6647e Merge pull request #1854 from MetaMask/greenkeeper/initial
Greenkeeper/initial
2017-08-08 16:32:55 -07:00
kumavis 922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
kumavis 7db1f30590 Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout
Improve layout for legacy buy screen
2017-08-08 15:56:02 -07:00
kumavis cd1437fdd3 Merge pull request #1861 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 2
2017-08-08 15:54:08 -07:00
frankiebee 88b84e3895 add json-rpc-engine && eth-json-rpc-middleware to devDependencies 2017-08-08 18:34:59 -04:00
frankiebee a13643bdb5 fix class names 2017-08-08 18:30:49 -04:00