anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity
12,409 commits 154 branches 37 tags 83 MiB
Commit graph

1,428 commits

Author SHA1 Message Date
Brendon Duncan
ae6dcea81a Fix for getting Shapeshift working. 2018-08-08 18:58:26 +12:00
Jean-Baptiste Dominguez
037c00ec9e
 		Merge branch 'wallet/sprint/20' into wallet/task/514 2018-08-08 11:23:35 +09:00
Jean-Baptiste Dominguez
7f0946b390
 		Merge branch 'wallet/sprint/20' into wallet/task/441 2018-08-08 10:56:26 +09:00
Jean-Baptiste Dominguez
ecad91d328
 		Merge pull request #237 from Bitcoin-com/wallet/task/439 
439 - Enter Amount screen modifications
 2018-08-08 10:53:59 +09:00
Jean-Baptiste Dominguez
75843c68ff
 		Merge pull request #231 from Bitcoin-com/wallet/task/505 
505 - BitAnalytics 0.2.1 with GA
 2018-08-08 10:53:01 +09:00
Jean-Baptiste Dominguez
699d1dddf2
 		Merge pull request #220 from Bitcoin-com/wallet/task/426 
Improvement - 426 - New Payment Sent screen
 2018-08-08 10:51:51 +09:00
Jean-Baptiste Dominguez
9420b63728 Fix shapeshift, remove the cancelTx. Remove the timer with the getStatus 2018-08-07 20:11:21 +09:00
Sebastiaan Pasma
52ca7bafd7
 		Merge remote-tracking branch 'origin/wallet/task/514' into wallet/task/514 2018-08-07 09:54:43 +02:00
Sebastiaan Pasma
83b1977a6f
 		Shapeshift controller useless functions removed 2018-08-07 09:47:37 +02:00
Jean-Baptiste Dominguez
d26a96500b eGifter incomingData 2018-08-07 15:30:28 +09:00
Brendon Duncan
9b4b3996ae Merge. Also invoice name from third party data. 2018-08-07 17:58:35 +12:00
Jean-Baptiste Dominguez
886204d8b0 incomingData time for bch 2018-08-07 14:34:02 +09:00
Jean-Baptiste Dominguez
a9711c2575 Fix incomingData, expires different depending on btc or bch (bitpay...) 2018-08-07 14:02:53 +09:00
Jean-Baptiste Dominguez
c800e8efe5 incomingData, bip70 & bitpay 2018-08-07 13:56:56 +09:00
Brendon Duncan
d183077a20 Countdown timer for BIP70 invoices. 2018-08-07 09:39:48 +12:00
Sebastiaan Pasma
caafec4625
 		shapeshift controller 2018-08-06 18:06:10 +02:00
Jean-Baptiste Dominguez
470868ade9 Review screen, cleaning in the same time 2018-08-06 23:19:46 +09:00
Jean-Baptiste Dominguez
3652419b0d Fix double id 2018-08-06 22:21:40 +09:00
Jean-Baptiste Dominguez
bb3b00ae8d Fix incomingData toAddress, mistake 2018-08-06 22:20:51 +09:00
Jean-Baptiste Dominguez
59b9167ff0 Merge 2018-08-06 22:17:15 +09:00
Jean-Baptiste Dominguez
cc213956d0 header bitpay on the wallet selector, incoming data fix, clean a bit 2018-08-06 22:12:33 +09:00
Sebastiaan Pasma
ec354bd340
 		header css 2018-08-06 11:25:29 +02:00
Brendon Duncan
f1f8f6e0f5 Tidied up third party data from BIP70 Payment Protocol. 2018-08-06 20:31:06 +12:00
Brendon Duncan
b0e46f18a1 The Origin screen can now display payment requests properly. 2018-08-06 16:45:00 +12:00
Brendon Duncan
4203a449d9 Displaying requested amount in origin screen. 2018-08-06 13:39:03 +12:00
Brendon Duncan
fb4bc1563c Starting to integrate BIP70 payment protocol into new send flow. 2018-08-06 12:04:14 +12:00
Sebastiaan Pasma
cebe9507f1
 		Make the "to"-address field work in new style + BTC transactions fix 2018-08-03 13:13:29 +02:00
Brendon Duncan
e649da69ef In WalletService, createAddress now terminated properly, preventing double callback. 2018-08-03 17:11:47 +12:00
Sebastiaan Pasma
eef84b25f8
 		update to txp creation. merged and refactored many features from confirm.js 2018-08-02 18:30:35 +02:00
Sebastiaan Pasma
01dd774fae
 		thirdParty updates + shapeshift screens + merged with review transaction 2018-08-02 15:15:23 +02:00
Sebastiaan Pasma
5372ba3dac
 		Merge remote-tracking branch 'origin/wallet/task/439' into wallet/task/514 
# Conflicts:
#	src/js/controllers/amount.js
 2018-08-01 11:16:59 +02:00
Sebastiaan Pasma
42d77903e1
 		Third Party Service integration (Shapeshift) (CSS + translations + wallet selector + routes) 2018-07-31 17:21:56 +02:00
Jean-Baptiste Dominguez
bba85794ac BitAnalytics 0.2.1 with GA 2018-07-25 16:17:42 +09:00
Sebastiaan Pasma
fd4adbfb57
 		wallet to wallet case worked out. Also fixed routes and some css 2018-07-24 14:24:22 +02:00
Sebastiaan Pasma
3604ee3c3c
 		routes, renames and flow 2018-07-23 16:58:32 +02:00
Sebastiaan Pasma
893dbe5c6f
 		"has no funds" case 2018-07-23 14:20:46 +02:00
Sebastiaan Pasma
713bbf71ca
 		currency format service + remove bottom amount in request amount screen 2018-07-20 10:06:59 +02:00
Brendon Duncan
0db57f997a First successful test, instantiating an amountController. 2018-07-18 18:24:49 +12:00
Brendon Duncan
ef121f52fa Merged wallet/sprint20 into wallet/task/475. 
# Conflicts:
#	src/js/services/bitcoincomService.js
 2018-07-18 10:47:43 +12:00
Sebastiaan Pasma
6463d5df34
 		Merge branch 'wallet/sprint/20' into wallet/task/426 2018-07-17 13:41:09 +02:00
Sebastiaan Pasma
4aca23194d
 		Merge remote-tracking branch 'origin/wallet/task/401' into wallet/sprint/19 2018-07-17 12:18:46 +02:00
Jean-Baptiste Dominguez
882d4f1e82
 		Merge pull request #221 from Bitcoin-com/wallet/task/416 
Wallet/task/416 Hotfix
 2018-07-17 18:40:11 +09:00
Jean-Baptiste Dominguez
e18e446eef => Unsupported uglify 2018-07-17 18:37:46 +09:00
Brendon Duncan
4cbaef5af6
 		Merge pull request #217 from Bitcoin-com/wallet/task/416 
Improvement - 416 - New Send Tab screen
 2018-07-17 19:13:13 +12:00
Jean-Baptiste Dominguez
7459fcffd2 416 - Fix : Show the menu only if we are on the scan tab. 2018-07-17 13:43:47 +09:00
Brendon Duncan
ee09085343 Services get the new translations. 2018-07-17 11:17:20 +12:00
Brendon Duncan
63d0ed39ad Made strings in Home tab translatable for "Explore Bitcoin.com", "Services", and "Community". 2018-07-17 11:00:33 +12:00
Brendon Duncan
9a0cfdbcfd
 		Merge pull request #215 from Bitcoin-com/wallet/task/474 
474 - Link updated for Analytics
 2018-07-17 10:36:46 +12:00
Sebastiaan Pasma
1871992303
 		Use native navigator clipboard over element data clipboard function 2018-07-16 17:42:15 +02:00
Brendon Duncan
85e910dc46 Make the Cash Games link work again. 2018-07-16 17:55:21 +12:00