1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 04:46:10 +01:00
Commit Graph

854 Commits

Author SHA1 Message Date
Dan Finlay
6b100163e9 Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm 2017-03-23 13:46:09 -07:00
Dan Finlay
e7a3330b98 Combine pending-tx-details component into pending-tx-details
These were only separated originally so we could make the notification-based TX approval work, which provided its own buttons.

This two templates are logically highly coupled, and keeping them working while separate has been difficult at times, and has even required resorting to dubious practices, like using React's `refs` pattern.

This combines them into one fairly large component, but I think it's ok, we can still break this up into components, just not the separation that it had previously.
2017-03-23 13:44:09 -07:00
Kevin Serrano
b8500d384b Merge branch 'master' into i1234-HardGasLimits-BrowserForm 2017-03-23 12:05:42 -07:00
Kevin Serrano
525c32ae60
Enable etherscan linking on Kovan transaction list items. 2017-03-23 11:26:39 -04:00
Dan Finlay
86f9be06eb Merge branch 'master' into i1234-HardGasLimits-BrowserForm 2017-03-22 16:00:11 -07:00
Kevin Serrano
45cdf6bdea Merge branch 'master' into i238-kovan 2017-03-22 15:51:52 -07:00
Kevin Serrano
c55c768cde Merge branch 'master' into hide-password 2017-03-22 15:46:50 -07:00
Kevin Serrano
457611d8f8 Merge branch 'master' into i1234-HardGasLimits-BrowserForm 2017-03-22 15:41:47 -07:00
Kevin Serrano
463eb01d1d Merge branch 'master' into hide-password 2017-03-22 15:41:24 -07:00
Dan Finlay
9545ef3ba8 Merge branch 'master' into i1193-errorstylefix 2017-03-22 15:39:20 -07:00
Dan Finlay
72e979909c Merge branch 'master' into i238-kovan 2017-03-22 15:37:33 -07:00
Dan Finlay
18414f5cbd Merge branch 'master' into i1234-HardGasLimits-BrowserForm 2017-03-22 15:25:15 -07:00
Dan Finlay
77907038ff Got basic validations working 2017-03-22 15:17:57 -07:00
Kevin Serrano
41e276b036
Hide the password in the private key retrieval screen. 2017-03-22 17:46:51 -04:00
Kevin Serrano
5d14925842
Fix styling of error message. 2017-03-22 16:54:10 -04:00
Kevin Serrano
b26c53452e
Add Kovan test network to our application. 2017-03-22 16:05:04 -04:00
Kevin Serrano
34f3889eb0
Add kovan to drop-menu-item 2017-03-22 16:04:28 -04:00
Kevin Serrano
4757858df0
Add conditional kovan to current network component. 2017-03-22 16:03:51 -04:00
Kevin Serrano
b3dfc4e639
Add kovan conditional to config screen. 2017-03-22 16:03:02 -04:00
Kevin Serrano
c00544de91
Add conditional kovan logic to etherscan link generators. 2017-03-22 16:02:17 -04:00
Kevin Serrano
4116b37d32
Modify css rule for unused hollow diamond. 2017-03-22 16:01:38 -04:00
Dan Finlay
9f1f0bff1e Some progress 2017-03-22 10:35:02 -07:00
kumavis
9ac2ce1744 Merge branch 'master' into i1033-spinnerfix 2017-03-22 09:57:15 -07:00
Kevin Serrano
f2e40e85b7 Add one more loading indication. 2017-03-22 12:18:13 -04:00
Kevin Serrano
b0c0c30689 Uncomment lines relating to showing indicator. 2017-03-21 13:38:27 -07:00
Kevin Serrano
605c2a7404 Remove redundant removal of loading indicator. Integrate loading indicator disappear with display warning. 2017-03-21 09:15:12 -07:00
Kevin Serrano
0e43606b16 Adjust private key confirmation style and logic. 2017-03-21 08:53:34 -07:00
Kevin Serrano
889132b16c Add action to hide loading indication on an incorrect pw. 2017-03-21 06:57:49 -07:00
Dan Finlay
35c05607b0 Improve personal_sign style
textarea was not resizing the way I'd expected, so made it permanently larger, to accomodate larger messages.
2017-03-16 12:23:12 -07:00
Kevin Serrano
a186e40d17 Merge branch 'master' into i1165-predictive 2017-03-14 17:52:03 -07:00
Kevin Serrano
311b80adf3 Merge branch 'master' into i1211-currencyretention 2017-03-14 17:09:21 -07:00
Kevin Serrano
37ffcfcf0e Rename variables to proper currency state variables. 2017-03-14 17:06:16 -07:00
Kevin Serrano
fcee7723e9 Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into i1165-predictive 2017-03-14 14:05:28 -07:00
Kevin Serrano
1ec7930c75 Minor change in removing opts object. 2017-03-14 14:04:52 -07:00
kumavis
c759300d4c Merge branch 'master' into i1165-predictive 2017-03-14 13:11:03 -07:00
Kevin Serrano
b10f370c74 Render config screen from unlock. 2017-03-13 16:43:34 -07:00
Kevin Serrano
e4feb50f6f Display Custom RPC on lock screen. 2017-03-13 16:41:25 -07:00
Kevin Serrano
2ab86b001d Add comments. 2017-03-10 09:34:13 -08:00
Kevin Serrano
b34ee4daa1 Allow for adding recently used addresses to address book. 2017-03-09 15:10:27 -08:00
Kevin Serrano
9f6c040554
Create persistence address book. 2017-03-09 13:58:42 -08:00
Kevin Serrano
d270cbc9d2
Create distinct labels and names for addresses. 2017-03-09 13:07:38 -08:00
Kevin Serrano
1ca6fff317
Display owned addresses in datalist. 2017-03-09 11:31:00 -08:00
Dan Finlay
42e4a0621b Add ENS click to copy
Also bump ethjs-ens version to get proper error for unregistered names.
2017-03-08 15:38:22 -08:00
Dan Finlay
e3f6c010ab Get basic ENS working
& merge master into ENS branch.
2017-03-08 15:19:33 -08:00
Kevin Serrano
6f980cfe10
Add more informative message 2017-03-08 10:46:17 -08:00
Kevin Serrano
21769a008c
Fix typo, switch to log.error 2017-03-08 09:35:31 -08:00
Kevin Serrano
0ee8ca178e
Remove unneeded setrpc method. 2017-03-08 09:08:28 -08:00
Kevin Serrano
cf2268c3d2
Nodeify and promisify calls to background. 2017-03-08 09:06:41 -08:00
Kevin Serrano
e7e024bcdd
Refactor of code into separate reducers and actions. 2017-03-07 16:01:51 -08:00
Kevin Serrano
08ca7dac5a
Merge branch 'master' into i1144-moarrpc 2017-03-07 10:37:31 -08:00