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

12,003 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan Pasma
80299cd99d Merge remote-tracking branch 'origin/wallet/task/351' into wallet/task/366 2018-06-06 14:23:59 +02:00
Brendon Duncan
16b5054ea2 Now including app version is profile. 2018-06-05 11:34:14 +12:00
Brendon Duncan
cc45e91680 Covered all the migration cases. 2018-06-04 20:23:01 +12:00
Brendon Duncan
afe433d909 Starting to migrate profile storage. 2018-06-04 15:31:51 +12:00
Brendon Duncan
adf7115c9c Merging profiles. 2018-06-04 14:38:15 +12:00
Brendon Duncan
3aa9bef803 The localStorageService now returns errors when they happen. 2018-06-04 14:37:54 +12:00
Brendon Duncan
4109d4743f Loading profiles from all sources, in preparation for merge. 2018-06-04 09:47:02 +12:00
Sebastiaan Pasma
7c5a61a88b desktopSecureStorageService update 2018-06-01 13:54:46 +02:00
Sebastiaan Pasma
e4983d3604 Merge remote-tracking branch 'origin/wallet/task/351' into wallet/task/366 
# Conflicts:
#	src/js/services/storageService.js
 2018-06-01 10:20:20 +02:00
Brendon Duncan
4ba821e983
 		Merge pull request #158 from Bitcoin-com/wallet/task/365 
Wallet/task/365. JB indicated the code review will be performed when we merge the main 351 branch.
 2018-06-01 18:04:32 +12:00
Brendon Duncan
90d2e13456 Merge commit 'cc2f5f6a14' into wallet/task/365 
# Conflicts:
#	app-template/config-template.xml
#	src/js/services/storageService.js
 2018-06-01 15:33:09 +12:00
Brendon Duncan
8d94a244bc Removed some debug messages. 2018-06-01 15:25:08 +12:00
Brendon Duncan
c5121afd7c Placeholder desktopSecureStorageService. 2018-06-01 15:04:52 +12:00
Brendon Duncan
f483fd81d8 Removed deleteProfile() as it is not used. 2018-06-01 11:53:04 +12:00
Brendon Duncan
17685dd810 Fixed some issues after the refactor. 2018-06-01 10:42:38 +12:00
Brendon Duncan
aaad6a1b4a Refactored to have the mobile and desktop secure storage contained with a more generic secure storage service. 2018-06-01 10:19:26 +12:00
Brendon Duncan
fdc9a8c37b Tidy up. 2018-06-01 09:31:14 +12:00
Sebastiaan Pasma
f70e8607ea DesktopSecureStorageService 2018-05-31 16:13:24 +02:00
Brendon Duncan
4e6eb3295d Now works on Android too. 2018-05-31 18:08:04 +12:00
Brendon Duncan
90d321033b Working pretty roughly on iOS with cordova-plugin-secure-storage. 2018-05-31 17:53:58 +12:00
Brendon Duncan
cc2f5f6a14 Rudimentarily working with getting and setting the profile in the Keychain on iOS. 2018-05-30 16:28:32 +12:00
Sebastiaan Pasma
4c4c213786 Merge remote-tracking branch 'origin/wallet/sprint/17' into wallet/sprint/17 
# Conflicts:
#	src/js/controllers/tab-scan.js
 2018-05-28 13:48:26 +02:00
Sebastiaan Pasma
a0b0f1a30b Check if permission has been granted, if so, activate the camera 2018-05-28 10:52:31 +02:00
Jean-Baptiste Dominguez
63c76fe13e Update version and show rc-beta 2018-05-25 18:15:02 +09:00
Jean-Baptiste Dominguez
e9e3ee7ddc
 		Merge pull request #147 from Bitcoin-com/wallet/sprint/16 
Wallet/sprint/16
 2018-05-25 14:13:56 +09:00
Sam Cheng Hung
7588307f77
 		Merge pull request #146 from Bitcoin-com/wallet/task/356 
Fix - 356 - Remove vibration
 2018-05-25 11:37:43 +08:00
Jean-Baptiste Dominguez
2e7d1c2cc8 Fix - 356 - Remove vibration 2018-05-25 12:14:49 +09:00
Jean-Baptiste Dominguez
ae38e6efbf
 		Merge pull request #144 from Bitcoin-com/wallet/task/357 
Wallet/task/357
 2018-05-25 11:55:36 +09:00
Jean-Baptiste Dominguez
706ba298fb
 		Merge pull request #145 from Bitcoin-com/wallet/task/319 
Wallet/task/319
 2018-05-25 11:50:30 +09:00
Jean-Baptiste Dominguez
16550d3b9a
 		Remove parenthesis 2018-05-25 11:50:00 +09:00
Jean-Baptiste Dominguez
a1e321a764
 		Remove parenthesis 2018-05-25 11:49:34 +09:00
Jean-Baptiste Dominguez
9f1223fd94
 		Remove console.log 2018-05-25 11:40:57 +09:00
Brendon Duncan
576bb2098a Moved the fix for reading the QR code higher up the call stack, so it would only be used when needed. 2018-05-24 18:56:05 -07:00
Brendon Duncan
6ec9a3af68 Fix for reading QR code. 2018-05-24 18:43:14 -07:00
Brendon Duncan
e7e578f20c Manually reversing 2 commits. 2018-05-24 18:36:20 -07:00
Brendon Duncan
c3347931ef The wallet list in the Confirm screen nows displays balances according to the Price Display setting. 2018-05-24 15:54:47 -07:00
Brendon Duncan
e0511ccb53 Dislaying fiat amounts in Send tab, according to Price Display setting. 2018-05-24 15:29:59 -07:00
Brendon Duncan
05a8952f87 Displaying fiat amounts in wallet selector in Receive tab. 2018-05-24 14:36:51 -07:00
Brendon Duncan
e5734cf083 Wallet balance display on the Receive tab now adheres to the Price Display setting. 2018-05-24 11:54:58 -07:00
Jean-Baptiste Dominguez
e6da8056da
 		Merge pull request #141 from Bitcoin-com/wallet/task/347 
Adds faucet link
 2018-05-24 21:39:02 +09:00
Sam Cheng Hung
170a7f9c6e
 		Merge pull request #142 from Bitcoin-com/wallet/task/346 
Fix - 346 - Move the card bitcoin store
 2018-05-24 16:38:45 +08:00
Sam Cheng Hung
73944ea126 Moves faucet link to the bottom, update buy.bitcoin.com icon style 2018-05-24 16:35:37 +08:00
Jean-Baptiste Dominguez
6f4302e0f7 Fix - 346 - Move the card bitcoin store 2018-05-24 17:33:03 +09:00
Sam Cheng Hung
e03aab0962 Adds faucet link 2018-05-24 14:57:34 +08:00
Jean-Baptiste Dominguez
f87c43de20
 		Merge pull request #139 from Bitcoin-com/wallet/task/355 
Improvement - 355 - Use External Link Service
 2018-05-24 14:41:32 +09:00
Jean-Baptiste Dominguez
8f5f01eea1
 		Merge pull request #137 from Bitcoin-com/wallet/task/346 
Store banner on Home tab
 2018-05-24 12:10:12 +09:00
Brendon Duncan
429e9c8446 In Recent Transactions it displays the crypto amount if the fiat display setting is selected but the fiat amount is not ready yet. 2018-05-23 18:04:42 -07:00
Sebastiaan Pasma
7643ea02cb Use External Link Service 2018-05-23 11:35:19 +02:00
Sebastiaan Pasma
af5a843e8a Use externalLinkService 2018-05-23 11:16:10 +02:00
Jean-Baptiste Dominguez
a0462a1e1e
 		Merge pull request #136 from davidshares/master 4.11-beta1 
Fixing two links
 2018-05-23 14:54:20 +09:00