Commit graph

12,212 commits

Author SHA1 Message Date
Jean-Baptiste Dominguez
efd5ecac58
Merge pull request #161 from Bitcoin-com/wallet/sprint/17
Update 354
2018-06-04 14:40:31 +09:00
Jean-Baptiste Dominguez
437bd77ba4
Merge pull request #153 from Bitcoin-com/wallet/task/358
Improvement - 358 - Workflow camera permission
2018-06-04 14:30:52 +09: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
Jean-Baptiste Dominguez
a1c09fe010 Migrate bitcoincashjs to bitcoincashjs-fork. 2018-06-01 17:42:29 +09: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
b20f670953 iPhone X fixes 2018-05-31 15:36:17 +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
Jean-Baptiste Dominguez
385e26dc3c
Merge pull request #154 from Bitcoin-com/wallet/prod
Wallet/prod
2018-05-30 14:16:33 +09: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
Jean-Baptiste Dominguez
dae994007e Improvement - 335 - Automation build macos 2018-05-29 18:18:14 +09:00
Jean-Baptiste Dominguez
13cc248c1d Improvement - 335 - update macos script 2018-05-29 10:23:27 +09:00
Jean-Baptiste Dominguez
b24319128f Improvement - 335 - Automation 2018-05-29 10:21:39 +09:00
Sebastiaan Pasma
edc398015a
Merge branch 'wallet/sprint/17' into wallet/task/358 2018-05-28 13:55:31 +02: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
fff89cfe62
Merge pull request #152 from Bitcoin-com/wallet/sprint/17
Update my task branch
2018-05-28 15:09:37 +09:00
Jean-Baptiste Dominguez
a48eb19a02
Merge pull request #149 from Bitcoin-com/wallet/dev 4.11-rc1
Merge wallet/dev for the rc-1
2018-05-25 19:02:55 +09: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
9b3520aa37 Merge branch 'wallet/task/335' of https://github.com/Bitcoin-com/Wallet into wallet/task/335 2018-05-24 15:33:28 +09:00