Dan Finlay
34fd23803d
Merge branch 'master' into i566-NoPopupWhenOpen
2016-09-01 11:34:38 -07:00
Dan Finlay
4f614d0852
Linted
2016-09-01 11:31:39 -07:00
Dan Finlay
47b2ae1c5f
Do not open popup for internally produced txs
2016-09-01 11:26:27 -07:00
kumavis
532737a101
inpage - remap ids on response
2016-08-31 15:40:05 -07:00
Dan Finlay
44545e0f47
Add metamask route to infura urls
...
Fixes #597
Allows metamask-specific RPC metrics.
2016-08-31 11:10:25 -07:00
Dan Finlay
fd5dad136f
Remove old notification cleanup code
2016-08-29 17:33:56 -07:00
Dan Finlay
742a0e0dfe
Make popup a type Edge supports
2016-08-29 17:33:35 -07:00
Dan Finlay
1b617402ec
Add extra edge compatibility
2016-08-29 17:33:18 -07:00
Dan Finlay
b36b760338
Fix console.error references
...
Microsoft edge does not support console.error.bind, nor is that call necessary here.
2016-08-29 17:32:39 -07:00
Dan Finlay
6838027c65
Remove bind calls from console errors
2016-08-29 16:49:58 -07:00
Frankie
547894ed39
Merge branch 'master' into i#563forgotPassword
2016-08-25 16:06:54 -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
793ad6b8d8
Merge branch 'master' into PopupNotifications
2016-08-24 16:59:22 -07:00
Dan Finlay
eee08457e5
Merge branch 'master' into i484PersistPendingSignatures
2016-08-24 16:15:43 -07:00
Dan Finlay
3febbdae57
Linted
2016-08-24 16:02:22 -07:00
Dan Finlay
abb5b2013d
Fix bug where unconfirmed message sig is lost when locked.
...
Fixes #484
Adds unsigned messages to the in-memory message list before showing the unlock message.
2016-08-24 15:58:08 -07:00
Kevin Serrano
c82a494b4b
Implement usage of nock.
2016-08-24 13:58:50 -07:00
Kevin Serrano
d3d634d09c
Added mock option to function.
2016-08-24 13:28:06 -07:00
Dan Finlay
671ca33abb
Close notification on opening main UI
2016-08-23 15:44:50 -07:00
Dan Finlay
b3887ffd0a
Skip popup dismissal in tests
2016-08-23 11:48:46 -07:00
Dan Finlay
983f3938da
Linted
2016-08-23 11:42:54 -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
e5ca83d2bf
Emit updates to all listeners on pending tx updates
...
Previously the metamask controller only supported a single UI event listener, which wasn't useful for having a separate notification UI open at the same time.
Also reduced the notification's complexity down to a single method, which is heavily re-used.
Still has an outstanding bug where if the plugin ui dismisses the last tx, it does not close the notification popup.
2016-08-23 11:15:56 -07:00
Dan Finlay
49ab51d825
Merge branch 'master' into PopupNotifications
2016-08-22 20:06:59 -07:00
kumavis
c97866e367
Merge branch 'master' into kumavis-patch-1
2016-08-22 19:23:01 -07:00
kumavis
8b9999b71e
inpage - cleanContextForImports fix
...
set to undefined instead of deleting
updates #447
2016-08-22 19:22:12 -07:00
kumavis
5c9ca21ba3
Merge branch 'master' into i390-TransactionLimit
2016-08-22 19:19:53 -07:00
kumavis
b8077983d6
inpage provider - reassign incomming ids
2016-08-22 18:59:15 -07:00
Dan Finlay
361e26fad7
Limit to one popup, re-focus on additional notifications.
2016-08-22 17:18:14 -07:00
Dan Finlay
6e1000f361
Merge branch 'master' into PopupNotifications
2016-08-22 15:03:36 -07:00
Dan Finlay
3d451ddf3e
Merge branch 'master' into i390-TransactionLimit
2016-08-22 11:59:08 -07:00
Dan Finlay
7389f9d0a0
Enforce tx history limit
2016-08-18 15:40:56 -07:00
Frankie
3525dc0801
Create a ShapeShift tx in tx History
2016-08-18 15:20:26 -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
Dan Finlay
030bdec27a
Unify notification and popup ui files
2016-08-16 16:46:44 -07:00
Dan Finlay
4ba90969ee
Merge branch 'master' into PopupNotifications
2016-08-16 15:41:11 -07:00
Dan Finlay
5479509618
Set up MVP for popup-based notifications.
2016-08-16 15:39:40 -07:00
Kevin Serrano
666f3cd66c
Added compliance for tests and properly accounts for N/A conversions.
2016-08-16 15:11:40 -07:00
Kevin Serrano
d43ac808ff
Fix uncalled fn.
2016-08-16 14:28:32 -07:00
Kevin Serrano
6041ba1ed2
Add fallback to API failure.
2016-08-16 14:07:06 -07:00
Kevin Serrano
58e3042a3b
Remove logging. Clean up duplicate entries in currency list.
2016-08-16 13:21:16 -07:00
Kevin Serrano
6895d330ff
Merge master.
2016-08-15 10:50:53 -07:00
Dan Finlay
e826eb932c
Remove ethereum classic provider
...
Fixes #542
2016-08-14 18:41:05 -07:00
kumavis
0b660f4ac8
deps - extracted ensnare to module
2016-08-12 13:25:38 -07:00
Kevin Serrano
b1f68ec9cd
Add global var for background.
2016-08-11 19:44:59 -07:00
Kevin Serrano
1e54a1b5e8
Merge github.com:MetaMask/metamask-plugin into logging-fix
2016-08-11 19:05:22 -07:00
