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
Dan Finlay
7b1bbb7a19
Show conf screen after send request
2016-09-01 11:30:42 -07:00
Dan Finlay
7f947f8ab2
Skip loading indication from send screen
2016-09-01 11:29:17 -07:00
Dan Finlay
c15eef9425
Make element enumeration Edge compatible
2016-08-29 17:34:29 -07:00
Dan Finlay
fb6476224f
Add tolerance for failed form persisting
2016-08-29 16:40:57 -07:00
Dan Finlay
a804629606
Show custom rpc menu item always
2016-08-29 12:36:47 -07:00
Dan Finlay
62179a37f7
Fix spelling error
2016-08-26 15:08:02 -07:00
Frankie
ae33586660
make the back button its own function
2016-08-26 11:30:07 -07:00
Frankie
547894ed39
Merge branch 'master' into i#563forgotPassword
2016-08-25 16:06:54 -07:00
Frankie
250cf8cc23
Change style on back button to be more like the rest of the app
2016-08-25 16:05:44 -07:00
Dan Finlay
8b81009a30
Merge branch 'master' into PopupNotifications
2016-08-25 15:42:35 -07:00
Dan Finlay
6f082dd9e7
Linted
2016-08-25 14:23:41 -07:00
Dan Finlay
a8e40ffe7a
Persist shapeshift form input values
2016-08-25 14:19:09 -07:00
Frankie
11c6c63d76
Merge branch 'master' into i#563forgotPassword
2016-08-25 14:17:29 -07:00
Frankie
483a7fee0a
Add a back button on lock screen to go back to init menu
2016-08-25 14:13:32 -07:00
Dan Finlay
b39bd5333b
Persist send tx form field values
2016-08-25 14:10:07 -07:00
Dan Finlay
2026b674c5
Remove log
2016-08-25 14:09:54 -07:00
Dan Finlay
d81bde9f6c
Make restore vault form persist
2016-08-25 12:18:04 -07:00
Dan Finlay
6eb09c1a79
Add persistent form class
2016-08-25 12:17:21 -07:00
Dan Finlay
793ad6b8d8
Merge branch 'master' into PopupNotifications
2016-08-24 16:59:22 -07:00
Dan Finlay
8c06463e80
Linted
2016-08-24 15:46:31 -07:00
Dan Finlay
44ff75c7e1
Improve msg signing padding
2016-08-24 15:43:00 -07:00
Dan Finlay
4f78ae56b2
Fix empty sign message bug
2016-08-24 15:40:40 -07:00
Dan Finlay
bc43e3d140
Merge branch 'master' into PopupNotifications
2016-08-23 16:02:06 -07:00
Dan Finlay
65f7656487
Linted
2016-08-23 15:48:16 -07:00
Dan Finlay
671ca33abb
Close notification on opening main UI
2016-08-23 15:44:50 -07:00
Kevin Serrano
4bceda37a8
Merge branch 'master' into fox-sub
2016-08-23 14:51:09 -07:00
Kevin Serrano
6363a80b49
Linting.
2016-08-23 14:32:12 -07:00
Kevin Serrano
5168232481
Created option to pass in static file for fallback for logo.
2016-08-23 14:11:25 -07:00
Dan Finlay
4fb49dfb4b
Close popup even if last tx is dismissed from main UI
2016-08-23 11:40:08 -07:00
Dan Finlay
49ab51d825
Merge branch 'master' into PopupNotifications
2016-08-22 20:06:59 -07:00
Dan Finlay
5d24621b56
More linting
2016-08-22 17:37:16 -07:00
Dan Finlay
a9b53530b6
Fix back button hiding on popup
2016-08-22 17:29:47 -07:00
Dan Finlay
17f3f90d80
Linted
2016-08-22 17:21:54 -07:00
Dan Finlay
6e1000f361
Merge branch 'master' into PopupNotifications
2016-08-22 15:03:36 -07:00
Dan Finlay
f57cbe59fc
Removed view more button, added account info button.
...
Also:
- Also fixed bug that caused React warning when rendering the tx history.
- Renamed 'Transactions' to 'History', since it now has more than that.
2016-08-22 14:36:21 -07:00
Dan Finlay
3d451ddf3e
Merge branch 'master' into i390-TransactionLimit
2016-08-22 11:59:08 -07:00
Kevin Serrano
cec88cc9ac
Merge branch 'master' into fox-sub
2016-08-22 11:58:59 -07:00
Frankie
edfb0eb968
Fix issue where if given a balance that does not need to be parsed will not be parsed
2016-08-19 17:18:11 -07:00
Kevin Serrano
7a466697d3
Modify logic for component update.
2016-08-19 16:59:04 -07:00
Kevin Serrano
43e28788d7
Create replacement logo for non-webgl
2016-08-19 14:47:49 -07:00
Dan Finlay
8592ffd855
Merge branch 'master' into i390-TransactionLimit
2016-08-19 07:57:35 -07:00
Dan Finlay
9cd85aea2f
Merge branch 'master' into shapeshiftTx
2016-08-19 07:50:57 -07:00
Frankie
e3e5538ddc
Remove "+" from shapeshift tx and change wording in CHANGELOG
2016-08-18 20:24:17 -07:00
Dan Finlay
fe5fff3248
Change 'View More' to 'Show More'
2016-08-18 17:47:42 -07:00
Frankie
98dab0ffd2
Make ballance teal for shapeshift tx and add to change log
2016-08-18 16:30:13 -07:00
Dan Finlay
4f857e297b
Linted
2016-08-18 16:27:25 -07:00
Dan Finlay
bd9d89826c
Added view more button to transaction list
...
Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
2016-08-18 16:23:12 -07:00
Kevin Serrano
683651e75d
Lint and changelog.
2016-08-18 16:01:40 -07:00
Kevin Serrano
4cebf12bb5
Fix rounding issues.
2016-08-18 15:59:37 -07:00
Frankie
3525dc0801
Create a ShapeShift tx in tx History
2016-08-18 15:20:26 -07:00
Frankie
23aeb1c5c1
Add api Public key
2016-08-18 12:20:24 -07:00
Frankie
efa61f2cf8
Merge branch 'master' into shapeshiftTx
2016-08-18 11:06:32 -07:00
Frankie
752d16f6c0
WIP: ShapeShift tx
2016-08-18 11:04:28 -07:00
Dan Finlay
dfaac78e39
Linted
2016-08-16 17:50:51 -07:00
Dan Finlay
a167bbc5a0
MVP Popup Notifications Working
...
I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both.
In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways:
- Hide the menu bar
- Hide the back button from the notifications view.
- When confirming the last tx, close the window.
2016-08-16 17:32:54 -07:00
