Dan Finlay
4eef2c57cf
Show loading indication when selecting ShapeShift
2016-09-15 20:58:18 -07:00
Frankie
cf484d735f
Clean up some of the code
2016-09-15 14:31:45 -07:00
kumavis
1325990726
css - smaller balance warning
2016-09-15 13:04:09 -07:00
kumavis
f0d83813d6
confTx - add insufficient balance warning message
2016-09-15 12:56:40 -07:00
kumavis
5005fc143b
confTx - show disabled accept btn + add colors
2016-09-15 12:42:35 -07:00
Frankie
8ea086290b
Merge branch 'master' into i#519buyButtonTxConf
2016-09-15 10:26:02 -07:00
Frankie
ef0b535d94
Drop the buy button in the confTx view if account does not have enough eth
2016-09-15 10:24:05 -07:00
Dan Finlay
a0bfdfe409
Do not show user rejection errors within our UI.
2016-09-14 14:34:54 -07:00
Frankie
19c1b1fd8e
Merge branch 'master' into qrCode
2016-09-13 12:18:19 -07:00
kumavis
f7794d9949
PendingTxDetails - partially remove imagify support
2016-09-13 10:18:57 -07:00
kumavis
c477411ce0
Merge branch 'library' of github.com:MetaMask/metamask-plugin into library
2016-09-13 00:37:41 -07:00
kumavis
8a5007a396
ui - remove unused currentDomain prop
2016-09-12 21:30:04 -07:00
Frankie
4aa5114019
Remove unused code in qr actions
2016-09-12 17:32:49 -07:00
Frankie
fc292627e4
Merge branch 'master' into qrCode
2016-09-12 17:30:54 -07:00
Frankie
218f380d87
Add qrcode-npm to package.json and swap out Qr Code generator api for node-module
2016-09-12 17:27:14 -07:00
Dan Finlay
784856532c
Ensure loading indication covers fox
2016-09-12 14:37:17 -07:00
Dan Finlay
2caac3c7d7
Fix single account list formatting
2016-09-12 14:27:26 -07:00
Dan Finlay
0d11eab8cb
Add accounts back to metamask state
2016-09-12 14:22:06 -07:00
Frankie
c37c050c8a
Revert "Add new eth-lightwallet salting to vault."
2016-09-12 10:34:06 -07:00
Dan Finlay
c2105c4070
Fix account list formatting when only a single item.
...
- Makes account list items no longer flex larger than they should be.
- Makes the add account button not flex larger than it should be.
- Adds a line under the add account button to define its size.
2016-09-12 08:39:38 -07:00
Dan Finlay
6d6130e2a6
Camelcase dataset key for react
2016-09-10 11:23:11 -07:00
Kevin Serrano
69aa2ed25f
Merge branch 'master' into FixLogoPasswordFollow
2016-09-09 09:40:35 -07:00
Dan Finlay
a4e4c85453
Fix fox logo password following
...
The new lightweight svg logo was not following text quite right.
The new `lookAt` method was not using the same logic the module was using internally on mouse movement.
I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.
2016-09-08 20:31:42 -07:00
Dan Finlay
7b6c018c39
Show loading indication during unlocking.
2016-09-08 19:53:54 -07:00
Dan Finlay
4a7eab5b1a
Merge branch 'master' into FixLogoLeak
2016-09-08 15:43:51 -07:00
Dan Finlay
6c05c221cd
Fix new logo related errors
...
Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method.
Also tuned up the logo to more closely resemble the old behavior.
- Overlaps the title text
- Points nose at cursor, not just front of eyes
- Cursor is more "distant" from fox, to avoid extreme angles on edges.
2016-09-08 15:41:21 -07:00
Frankie
3f64095eed
Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue
2016-09-08 14:56:19 -07:00
Frankie
ece1ecb90b
Fix wording in changelog and bug
2016-09-08 14:53:49 -07:00
Frankie
079c1a8972
Merge branch 'master' into i#589pendingTxsIssue
2016-09-08 13:45:27 -07:00
Frankie
0d4bfe8038
Remove console.log
2016-09-08 13:44:32 -07:00
Frankie
7d8491de10
Add to CHANGELOG.md and Remove unnecessary catch
2016-09-08 13:13:43 -07:00
Frankie
69580480bc
Merge branch 'master' into i#589pendingTxsIssue
2016-09-08 12:56:48 -07:00
Frankie
6f86c5f8ee
Add network checks for unconfirmed Txs
2016-09-08 12:56:04 -07:00
Dan Finlay
762bf2f48a
Merge branch 'master' into AddNewLogo
2016-09-08 12:49:57 -07:00
Dan Finlay
20ae4c2689
Fix logo usage for metamask-logo v2.0.0
...
- No longer need to check for webGL compliance (svg rendered!)
- logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element.
Otherwise, worked with very little effort!!
Fixes #624
2016-09-08 11:22:04 -07:00
Dan Finlay
ab3b409438
Restore broken variable reference
2016-09-08 11:03:47 -07:00
Dan Finlay
c42b37a6e7
Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance
2016-09-08 10:57:31 -07:00
Dan Finlay
c3dbcb5b02
Fix double tooltip
2016-09-08 10:57:10 -07:00
Dan Finlay
d1e91766da
Merge branch 'master' into ModularFiatBalance
2016-09-08 10:50:05 -07:00
Frankie
5f8d3085d7
Filter out pending txs based on network from tx history
2016-09-07 20:56:51 -07:00
John Weldon
d6619a25e9
Fix typo
2016-09-07 14:44:56 -07:00
Dan Finlay
2ca58f5bf7
Merge branch 'master' into ModularFiatBalance
2016-09-06 19:36:40 -07:00
Dan Finlay
0186e05a0d
Linted
2016-09-06 17:30:38 -07:00
Dan Finlay
1537e3f5da
Add fiat balances to tx conf view
2016-09-06 17:28:25 -07:00
Dan Finlay
c46de79c10
Got basic fiat display modularized
2016-09-06 17:08:56 -07:00
Dan Finlay
90638f95c0
Fix fiat-value
2016-09-06 16:55:52 -07:00
Dan Finlay
09dd854a96
Nearly finished factoring fiat value into eth-balance
2016-09-06 16:45:06 -07:00
Kevin Serrano
f4e131da0a
Fix capitalization.
2016-09-06 11:04:54 -07:00
Kevin Serrano
f213ca695c
Fix typos and refine wording.
2016-09-06 10:03:10 -07:00
Dan Finlay
b2ebb6032d
Continuing fiat balance modularization
2016-09-03 14:20:27 -07:00
