status-im/MyCrypto
2
0
Fork 0
mirror of https://github.com/status-im/MyCrypto.git synced 2025-01-25 02:20:24 +00:00
Code Issues Projects Releases Wiki Activity
1,249 Commits 56 Branches 27 Tags 12 MiB
Commit Graph

1249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Connor Bryan
04b6523c22
Merge branch 'develop' into patch-2 2018-08-15 15:46:54 -05:00
Connor Bryan
f3f1d12084
Merge pull request #2009 from akx20000a/develop 
Remove ETC Chainkorea from the list
 2018-08-15 15:44:42 -05:00
Connor Bryan
71c76e8afc
Merge branch 'develop' into develop 2018-08-15 15:30:43 -05:00
Connor Bryan
5e86dba13b
Merge pull request #2079 from MyCryptoHQ/reorder-wallet-unlock 
Change order of wallet unlock options
 2018-08-15 15:30:05 -05:00
Connor Bryan
c02570d6a8
Merge branch 'develop' into reorder-wallet-unlock 2018-08-15 15:09:51 -05:00
Connor Bryan
6330698862
Merge pull request #2106 from MyCryptoHQ/bug/enable-empty-trezor-passphrase 
Remove empty check
 2018-08-15 15:06:01 -05:00
Connor Bryan
c4b615a8ce Merge branch 'bug/enable-empty-trezor-passphrase' of github.com:MyCryptoHQ/MyCrypto into bug/enable-empty-trezor-passphrase 2018-08-15 14:51:00 -05:00
Connor Bryan
b6ae484f86 CI 2018-08-15 14:50:49 -05:00
Connor Bryan
aec34948d0
Merge branch 'develop' into bug/enable-empty-trezor-passphrase 2018-08-15 14:16:26 -05:00
Connor Bryan
fd7cd01262
Merge pull request #2104 from PrimaBlock/develop 
Added GoChain testnet support
 2018-08-15 14:15:07 -05:00
Connor Bryan
8dfe44c386 Remove empty check 2018-08-15 14:11:47 -05:00
Connor Bryan
58dbbc7d50
Merge branch 'develop' into patch-2 2018-08-15 14:06:14 -05:00
Connor Bryan
d9084dbc87
Merge branch 'develop' into reorder-wallet-unlock 2018-08-15 14:02:47 -05:00
Connor Bryan
3980650e21
Merge branch 'develop' into develop 2018-08-15 14:01:03 -05:00
Connor Bryan
1591b3a7c4
Merge pull request #2102 from wtzb/update-gbx-decimals 
Update GBX token decimal
 2018-08-14 18:42:10 -05:00
CLINT
45dbed950d
Update eth.json 
Fix whitespace formatting
 2018-08-10 16:08:20 +10:00
CLINT
6f9527882d
Update eth.json 
Removed extra " to make valid JSON
 2018-08-10 15:31:11 +10:00
Wietze Bronkema
9e7a5533dd
Update GBX decimal 
https://etherscan.io/token/0x12fcd6463e66974cf7bbc24ffc4d40d6be458283
 2018-08-08 20:49:01 +02:00
CLINT
6b94dd7a08
Add Havven Contract and Havven Mintr ABI 2018-08-08 16:37:39 +10:00
Deams51
2a1fce3f3e Added GoChain testnet support 2018-08-05 20:01:43 +02:00
mwbailey
48304699a1 Discard signed message after leaving tab (#2056) 2018-07-18 15:05:41 -07:00
Connor Bryan
4853ca2a14 Change pluralization 2018-07-17 16:01:07 -05:00
Connor Bryan
aa1c5383f8 Adjust ordering of wallet unlocks. 2018-07-17 15:56:29 -05:00
Daniel Ternyak
e242d0960c
Update Version to 1.2.2 2018-07-17 12:47:07 -07:00
Jean-Christophe Rona
96798e71fa Add support for the Archos Safe-T mini hardware wallet (#1963) 
* Add support for the Archos Safe-T mini

* Safe-T mini: Fix version requirements

* Fix fade-in animation is not hitting the 5th wallet option

* Disable safe-t on electron:
 2018-07-17 12:46:41 -07:00
Daniel Ternyak
5505097c03
Update Version to 1.2.1 2018-07-13 18:23:18 -07:00
Danny Skubak
4db281bc9a Jenkins - use yarn for building (#2067) 2018-07-13 18:14:34 -07:00
Taylor Monahan
97bfbba51f Add Margin to Wallet Decrypt (#2048) 
Screenshot of new spacing: https://i.imgur.com/6FHf1nq.png

before on left. after on right.
1.2.0 		2018-07-11 18:36:27 -05:00
Connor Bryan
6fc6d9e074 Enable login for TREZOR with passphrase (#2052) 
* Replicate PIN functionality for Passphrase

* Typo...

* Lol, really?

* Removed _ from passphrase event callback

* Change passphrase input to password

* Test for daniel

* Small fixes

* Change passphrase on input, not on blur

* Be obvious about focused buttons
 2018-07-11 18:22:02 -05:00
Connor Bryan
3f57520bca Handle back-to-back similar transactions (#2038) 
* Catch errors from <Amounts /> field a level up.

* Move up the componentDidCatch to <Fields />

* ...
 2018-07-10 14:59:31 -05:00
Scott Bigelow
18ddb9b22f REP Token Address Change (#2046) 2018-07-10 13:03:11 -05:00
Daniel Ternyak
e4debe341a
Disable local node polling (need to allow user to disable polling) (#2034) 
* Only check for custom nodes locally once

* Add polling warning for console snoopers

* disable local node polling until we allow the user to disable from the client
 2018-07-06 18:45:25 -05:00
Connor Bryan
2af3e3475c Adjust translation algorithm (#2033) 2018-07-06 18:39:46 -05:00
Daniel Ternyak
06c8ae6e5b
Prep 1.2.0 Release (#2028) 2018-07-06 16:11:16 -05:00
Daniel Ternyak
047b5d1e05
Update ethereum-blockies-base64 (#2030) 2018-07-06 16:09:57 -05:00
Maciej Hirsz
4aa74a4087 [Parity Signer] Add future support for ERC-681 (#1945) 
* Add future support for ERC-681

* Use `addHexPrefix`
 2018-07-06 16:04:31 -05:00
mwbailey
fbe792a58f Allow contract value to be cleared (#1997) 2018-07-06 14:08:27 -05:00
Connor Bryan
062d25145c Make SimpleGas default to recommended gas price on initial load (#2020) 
* Add a check to make sure a network even exists on the web3Wallet instance

* Format snap files

* Prevent onChange from firing due to being out-of-bounds
 2018-07-06 14:07:34 -05:00
Daniel Ternyak
7ce2f72b8e
Update Tokens (July 9th, 2018) (#2027) 2018-07-06 13:57:28 -05:00
Connor Bryan
f3bcc99603 Grey out disabled swap options (#2026) 
* Adjust emailTo to desired email addresses

* Prettierize SupportFooter

* Add monero swap support

* Adjust styling and wording for the PaymentInfo screen for XMR

* Only show warning on XMR swaps (duh)

* Replicate comment

* Fix styling for rates and payment info

* Add a Monero donation address and use it as the placeholder for the ReceivingAddress Input

* Add a public method for the ShapeShift service to add unavailable coins to coin list

* Show unavailable swap options in a sorted manner.

* Test implementation
 2018-07-06 13:56:54 -05:00
Connor Bryan
3ae3622ff4 Add Monero swap support (#1985) 
* Adjust emailTo to desired email addresses

* Prettierize SupportFooter

* Add monero swap support

* Adjust styling and wording for the PaymentInfo screen for XMR

* Only show warning on XMR swaps (duh)

* Replicate comment

* Fix styling for rates and payment info

* Add a Monero donation address and use it as the placeholder for the ReceivingAddress Input
 2018-07-06 13:29:16 -05:00
James Prado
0fa1b7004d Sitemap (#2008) 
* Add sitemap generator script

* Add sitemap & robots.txt

* Revert "Add sitemap generator script"

This reverts commit 99c5779b7846d8c7aff39565880b513815f342d7.

* Add robots.txt & sitemap to build

* Update robots.txt
 2018-07-06 12:10:36 -05:00
Daniel Ternyak
5d841ce1bd
Remove Desktop Alpha Warnings (#2024) 2018-07-06 12:00:23 -05:00
Daniel Ternyak
9114f69051
Remove Alpha Banner on Electron (#2023) 2018-07-06 11:10:15 -05:00
Danny Skubak
e17c94333b MC-01-004: Prevent Navigation on Main Electron Window (#2022) 2018-07-06 11:02:33 -05:00
Alejandro Cavallero
e5e5dd8274 Hide unsupported tabs by RSK (#2011) 
* Hides unsupported tabs by RSK

* Allows swap
 2018-07-06 10:13:26 -05:00
James Prado
425655ee05 Fix meta tag link (#2006) 
* Fix meta tag link

* fix path
 2018-07-06 08:29:39 -05:00
Danny Skubak
e0c2b10d86 MC-01-003: Add CSP to Meta Tag (#2019) 
* add meta content security policy

* inject meta csp based on production status

* use correct var

* rollback devtoll modification
 2018-07-06 08:15:08 -05:00
Danny Skubak
012a89bd62
Merge pull request #2017 from MyCryptoHQ/fix-metamask-poll-again 
Check for `web3` before polling network status for MetaMask
 2018-07-05 16:37:06 -04:00
Connor Bryan
eb9f651465 Added a preliminary check before polling 2018-07-05 15:04:28 -05:00