Commit graph

12,043 commits

Author SHA1 Message Date
Sebastiaan Pasma
5f2a60968b Renamed overlay images as they're not icons 2018-06-22 10:04:25 +02:00
Sebastiaan Pasma
94dade8463 changed qr icons to include white border 2018-06-20 14:09:43 +02:00
Sebastiaan Pasma
fd312be7c7 QR-code icons + class update + sass update 2018-06-19 15:23:59 +02:00
Sam Cheng Hung
099db37cb6 Merge branch 'wallet/dev' into wallet/prod 4.12-rc1 2018-06-12 13:11:23 +05:30
Sam Cheng Hung
4fb375187b Increment Android version 2018-06-12 13:11:04 +05:30
Sam Cheng Hung
27be28ba3e Merge branch 'wallet/dev' into wallet/prod 2018-06-12 11:36:50 +05:30
Sam Cheng Hung
f06f65a107 Merge branch 'wallet/sprint/17' into wallet/dev 2018-06-12 11:35:40 +05:30
Sam Cheng Hung
494b0d9429 Merge branch 'wallet/dev' into wallet/prod 2018-06-12 10:51:01 +05:30
Sam Cheng Hung
1d9bf3d7c5 Increment version 2018-06-12 10:49:55 +05:30
Sam Cheng Hung
9c26d1bec6
Merge pull request #172 from Bitcoin-com/wallet/hotfix/372
Wallet/hotfix/372
2018-06-12 10:44:30 +05:30
Sebastiaan Pasma
d22f489794
Merge pull request #160 from Bitcoin-com/wallet/task/354
iPhone X software home bar fixes
2018-06-11 18:05:11 +02:00
Sebastiaan Pasma
5da9f7c835
Merge pull request #165 from Bitcoin-com/wallet/task/369
Secure Storage on mobile devices
2018-06-11 14:14:10 +02:00
Sebastiaan Pasma
244144b7dd
Merge pull request #168 from Bitcoin-com/wallet/task/361
wallet/task/361: Changes icon design and color scheme for default wallet colors
2018-06-11 10:31:59 +02:00
Brendon Duncan
7209800b3c Tests for storing profile on mobile. 2018-06-11 14:21:15 +12:00
Brendon Duncan
149b956b7c Storing profile on desktop without using secure storage. 2018-06-11 14:09:39 +12:00
Brendon Duncan
c9c27e838c Corrected the name on some things. 2018-06-11 12:39:25 +12:00
Brendon Duncan
435c2cacd4 Desktop using local storage only. 2018-06-11 12:23:39 +12:00
Sam Cheng Hung
078f5bd61d Update: Changes shadow specification for wallet icons 2018-06-08 12:20:37 +05:30
Sam Cheng Hung
12990d7f71 Update: Changes icon design and color scheme for default wallet colors 2018-06-08 12:06:12 +05:30
Brendon Duncan
18581e9608 Test for secureStorageService on mobile and browser. 2018-06-08 16:24:15 +12:00
Brendon Duncan
f4642b1953 All tests for secure storage service on desktop. 2018-06-08 16:19:50 +12:00
Brendon Duncan
da9559433f First test for the secureStorageService. 2018-06-08 15:06:56 +12:00
Brendon Duncan
522a7cd3cf Migration tests for desktop. 2018-06-08 14:49:01 +12:00
Brendon Duncan
a09069463a Checking key names in tests. 2018-06-08 14:31:35 +12:00
Brendon Duncan
3aa9e70e64 All tests for profile migration. 2018-06-08 14:07:46 +12:00
Brendon Duncan
e52242bb1b Testing profile merge. 2018-06-08 13:38:02 +12:00
Brendon Duncan
02460bd3c5 Uses the current app version when needed, when checking the appVersion of a profile. 2018-06-08 08:23:28 +12:00
Brendon Duncan
0003604017 Better use of mocks. 2018-06-08 08:12:24 +12:00
Brendon Duncan
accfea64b0 Test for getting from old storage. 2018-06-07 21:47:49 +12:00
Brendon Duncan
84f9035159 One test passing on storageService. 2018-06-07 20:56:24 +12:00
Brendon Duncan
6eef985180 Merge from wallet/task/351. 2018-06-07 18:30:32 +12:00
Brendon Duncan
35da3a5151 One test. 2018-06-06 19:53:57 +12:00
Jean-Baptiste Dominguez
9b307558fe
Merge pull request #164 from Bitcoin-com/wallet/task/367
Migrate bitcoincashjs to bitcoincashjs-fork.
2018-06-06 15:44:55 +09:00
Jean-Baptiste Dominguez
2e8f277816
Merge pull request #163 from Bitcoin-com/wallet/task/368
Wallet/task/368
2018-06-06 15:43:10 +09:00
Sebastiaan Pasma
6c6d90ebfe Cleaner way without redundant code 2018-06-05 11:15:33 +02:00
Brendon Duncan
16b5054ea2 Now including app version is profile. 2018-06-05 11:34:14 +12:00
Sebastiaan Pasma
1e1f5deb2a iOS 9.3 fix 2018-06-04 21:37:36 +02:00
Sebastiaan Pasma
ddbc969de2 Merge remote-tracking branch 'origin/wallet/sprint/17' into wallet/sprint/17 2018-06-04 21:04:02 +02:00
Brendon Duncan
cc45e91680 Covered all the migration cases. 2018-06-04 20:23:01 +12:00
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