Skip to content

Re-write LightWallet and MWC in Typescript. Using modern packages. #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 985 commits into from
Dec 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
985 commits
Select commit Hold shift + click to select a range
d9f090b
disable blockchain explorer link
eugene-sy Nov 29, 2017
74dde8f
route user to send email or sms after confirm easysend
ferrerrajc Nov 29, 2017
3c81e60
display som einfo about tx on tx details screen
eugene-sy Nov 29, 2017
c964a9e
Package bumps and small tidy-ups.
adilwali Nov 29, 2017
7ac8a93
Bumping versions of cordova packages.
adilwali Nov 29, 2017
7bb51ef
New firebase config. Also, resources directory for iOS.
adilwali Nov 29, 2017
3e239c3
allow sending to phone numbers and email addresses not in contact list
ferrerrajc Nov 29, 2017
c822290
Update packages.
adilwali Nov 29, 2017
eab8d73
More IPs to config.xml.
adilwali Nov 29, 2017
adc8cd2
display amounts and fiat amount on tx details screen for vaults
eugene-sy Nov 30, 2017
54d723f
got rid of edgesRatio in blockheader
tonypizzicato Nov 30, 2017
dc9fd72
clean up code
eugene-sy Nov 30, 2017
0000613
Merge pull request #249 from meritlabs/fix/remove-edges-ratio
mempko Nov 30, 2017
48f9be9
New firebase config. Also, resources directory for iOS.
adilwali Nov 29, 2017
57f57d3
Renew now creates valid transactions.
mempko Dec 1, 2017
c529814
Updating push notification templates.
adilwali Dec 1, 2017
79e811f
Debug output and new version of cordova-ios.
adilwali Dec 1, 2017
7942ae8
Merge branch 'major/modernize' into modernize/export-wallet
favetisov Dec 1, 2017
13627e9
fixed styles through the app
favetisov Dec 1, 2017
436a3b1
Allow multiple contacts to be listed on ios
ferrerrajc Dec 1, 2017
f633cda
Adding pushNotificationService to the bitcore-node runner.
adilwali Dec 1, 2017
aedbf51
Shaping relevant data payload into FCM push notification.
adilwali Dec 1, 2017
e9d0ce7
Version bump for newest cordova-ios; needed for iPhone X.
adilwali Dec 1, 2017
5389cf0
Reshaping notifications within lightWallet to match shape of getNotif…
adilwali Dec 1, 2017
80c4a66
Bumping preconditions, and leaving type checking to TypeScript.
adilwali Dec 2, 2017
cc358da
Rolling up TxNotifications with multiple outputs to the same address.
adilwali Dec 2, 2017
1b56bae
Bumping Ionic Angular version.
adilwali Dec 2, 2017
aa62b03
Fixes #197.
adilwali Dec 2, 2017
216a801
Using NgZone to refresh the wallets view on inbound dataPush events.
adilwali Dec 2, 2017
bde82aa
Tightening up comments and debug output.
adilwali Dec 2, 2017
b634681
Further tightening up debug output.
adilwali Dec 2, 2017
cac775e
Reverting to development URL for BWS. Also, need to return errors in…
adilwali Dec 2, 2017
5a2b89d
Merge pull request #246 from meritlabs/modernize/performance
adilwali Dec 2, 2017
14203ba
Making push notification templates relative to bitcore-node runner.
adilwali Dec 2, 2017
8992d0c
Merge pull request #251 from meritlabs/modernize/performance
adilwali Dec 2, 2017
8bc1855
Merge remote-tracking branch 'origin/major/modernize' into modernize/…
adilwali Dec 2, 2017
105d2a3
Merge pull request #247 from meritlabs/modernize/easysend-sms-and-email
adilwali Dec 2, 2017
bc5b9f1
Merge remote-tracking branch 'origin/major/modernize' into modernize/…
adilwali Dec 3, 2017
36dabbf
Merge pull request #238 from meritlabs/modernize/export-wallet
adilwali Dec 3, 2017
efe8ab8
Merge remote-tracking branch 'origin/feature/vault-actions' into feat…
adilwali Dec 3, 2017
de9c21f
Merge pull request #248 from meritlabs/feature/vault-transaction-details
adilwali Dec 3, 2017
b4668ab
Merge remote-tracking branch 'origin/major/modernize' into modernize/…
adilwali Dec 3, 2017
a1bbb44
Merge pull request #252 from meritlabs/modernize/style-fixes
adilwali Dec 3, 2017
1b729e1
Something quite unfortunate happened to walletService. It has been r…
adilwali Dec 3, 2017
8a47eb9
Merge remote-tracking branch 'origin/feature/vault-actions' into mode…
adilwali Dec 3, 2017
0dca64c
Fixing vault styling based on new wallet styles.
adilwali Dec 3, 2017
98371f8
MWC Interface carryover elimination.
adilwali Dec 3, 2017
0be7ce9
Dealing with async display criteria of features block.
adilwali Dec 3, 2017
b0fd08a
FeaturesBlock criteria.
adilwali Dec 3, 2017
671ba49
Knocking out typed-MWC todo.
adilwali Dec 3, 2017
c5dd15d
Removing unnecessary pipes. Using promise resolution to load recent …
adilwali Dec 3, 2017
e88e955
Merge pull request #253 from meritlabs/modernize/tightness
adilwali Dec 4, 2017
3c10529
new pictures in blue colors
favetisov Dec 4, 2017
f9f4434
style fixed all over the app
favetisov Dec 4, 2017
61251b5
wallets/vaults screen: fix formatting and colors
eugene-sy Dec 4, 2017
753993f
fix script toString when opcode is undefined
eugene-sy Dec 4, 2017
2180752
load VaultsService once
eugene-sy Dec 4, 2017
40360a2
Added buildSpendVaultTx to merit-wallet-client.
mempko Nov 27, 2017
5126e42
convert whitelist entry to spend button
eugene-sy Nov 30, 2017
9118756
recreate default spend amount view in vaults
eugene-sy Nov 30, 2017
bea7553
display vault spend confirm screen
eugene-sy Nov 30, 2017
5c5b7f5
display target wallet/vault
eugene-sy Dec 1, 2017
9bfe397
display wault and vallet info on spend confirmation page
eugene-sy Dec 1, 2017
668ec98
[WIP] trying to build spending tx
eugene-sy Dec 1, 2017
c4a4ddf
show amounts on spend tx confirmation screen
eugene-sy Dec 1, 2017
9f75752
fix whitelist after update
eugene-sy Dec 4, 2017
6bf5db5
fix icons
eugene-sy Dec 4, 2017
96c00d8
create spend transaction for vault
eugene-sy Dec 4, 2017
f115c2d
added contacts list view and contact view
favetisov Nov 28, 2017
fe26d4f
added contacts edit and using device contacts
favetisov Nov 29, 2017
16117d1
Local addressbook integrated with device contact list
favetisov Dec 1, 2017
d401f34
added infinite scroll
favetisov Dec 4, 2017
476e09b
solve addresses problem
eugene-sy Dec 4, 2017
6fc58b9
fix for addresses, search and matching
eugene-sy Dec 4, 2017
223bb86
[WIP] trying to match newly generated address for whitelist on vault …
eugene-sy Dec 4, 2017
42b8e62
update send view to use united MeritContact
ferrerrajc Dec 5, 2017
c88a3b5
Fix loading vaults on startup.
mempko Dec 5, 2017
e233879
Fix altAmoutStr error by adding RateService.
mempko Dec 5, 2017
e17b33b
Add back the return for notification promise in wallet.ts
mempko Dec 5, 2017
8ca94fe
wallets/vaults screen: fix formatting and colors
eugene-sy Dec 4, 2017
a0896f7
fix script toString when opcode is undefined
eugene-sy Dec 4, 2017
d79aa84
load VaultsService once
eugene-sy Dec 4, 2017
fd2f7ae
Added buildSpendVaultTx to merit-wallet-client.
mempko Nov 27, 2017
3012ed7
convert whitelist entry to spend button
eugene-sy Nov 30, 2017
509305d
recreate default spend amount view in vaults
eugene-sy Nov 30, 2017
d0a385a
display vault spend confirm screen
eugene-sy Nov 30, 2017
483b6fb
display target wallet/vault
eugene-sy Dec 1, 2017
3133c6e
display wault and vallet info on spend confirmation page
eugene-sy Dec 1, 2017
c345c61
[WIP] trying to build spending tx
eugene-sy Dec 1, 2017
fb5f280
show amounts on spend tx confirmation screen
eugene-sy Dec 1, 2017
0435e00
fix whitelist after update
eugene-sy Dec 4, 2017
87dae48
fix icons
eugene-sy Dec 4, 2017
2053390
create spend transaction for vault
eugene-sy Dec 4, 2017
8f66102
solve addresses problem
eugene-sy Dec 4, 2017
40250fe
fix for addresses, search and matching
eugene-sy Dec 4, 2017
3496409
[WIP] trying to match newly generated address for whitelist on vault …
eugene-sy Dec 4, 2017
51d866c
Merge branch 'feature/vault-spending' of github.com:meritlabs/lightwa…
mempko Dec 5, 2017
4f73516
Merge pull request #254 from meritlabs/modernize/styling
adilwali Dec 5, 2017
8e3af2a
added contacts list view and contact view
favetisov Nov 28, 2017
efedae1
added contacts edit and using device contacts
favetisov Nov 29, 2017
338ab4b
Local addressbook integrated with device contact list
favetisov Dec 1, 2017
7e3230a
added infinite scroll
favetisov Dec 4, 2017
80930bd
Got whitelist working and fixed create vault and spending transactions.
mempko Dec 5, 2017
758a34c
get rid of master key confirmation
eugene-sy Dec 5, 2017
dd68c56
[WIP] debugging fee problems
eugene-sy Dec 5, 2017
9e509e0
fix typescript compilation
eugene-sy Dec 5, 2017
3591832
merge major/modernize and resolve conflicts
eugene-sy Dec 5, 2017
cf0a8a3
contact list merged with local addressbook, creation/editing updated
favetisov Dec 5, 2017
a0e110e
added send-amount view styling
favetisov Dec 5, 2017
852ad86
Fix several bugs in vault creation and spending tx creation.
mempko Dec 5, 2017
195de65
fixed contact model instantiation
favetisov Dec 5, 2017
98ab049
Returning more semantic notifications object.
adilwali Dec 5, 2017
40e1cd7
Better, and clearer, app startup logic.
adilwali Dec 5, 2017
7bcdd44
Merge branch 'feature/vault-spending' of github.com:meritlabs/lightwa…
mempko Dec 5, 2017
3dbaf25
Spending a vault now works.
mempko Dec 5, 2017
ded5df0
Auto merge was not good.
mempko Dec 6, 2017
0b8ff91
Adding back the Promise resolve.
mempko Dec 6, 2017
19d47a0
Merge pull request #255 from meritlabs/feature/vaults-post-merge-fixes
mempko Dec 6, 2017
89c52e6
Merge branch 'major/modernize' into feature/vault-spending
mempko Dec 6, 2017
758c4c4
Fix merge issue which removed the whitelist during vault creation.
mempko Dec 6, 2017
4a23c76
Tightening up promise chains in getNotifications. Also, better forma…
adilwali Dec 6, 2017
fb31d41
Returning promise resolutions in formatToUsd().
adilwali Dec 6, 2017
77d8ce9
Processing events and conditionally updating status, depending on whe…
adilwali Dec 6, 2017
4e35c31
Merge remote-tracking branch 'origin/major/modernize' into modernize/…
adilwali Dec 6, 2017
d26219d
Some code review fixes.
mempko Dec 6, 2017
21359c4
Adding back try block that was commented out during testing.
mempko Dec 6, 2017
2a2f1a5
Properly retrieving data and resolving promises in Network View.
adilwali Dec 6, 2017
1d45e41
Display tweaks to network view.
adilwali Dec 6, 2017
bfaab9d
Adding ANV properties to wallet.
adilwali Dec 6, 2017
cc3a41a
Code review fixes. More lodash, less lowwalk.
mempko Dec 6, 2017
3fd2538
Merge pull request #239 from meritlabs/feature/vault-spending
ferrerrajc Dec 6, 2017
118b408
implement sendMethod selector on send-amount view
ferrerrajc Dec 5, 2017
a113821
create modal to select sending method
ferrerrajc Dec 6, 2017
21cf1cf
update contact toSendAmount params
ferrerrajc Dec 6, 2017
5297d17
Merge pull request #260 from meritlabs/modernize/select-send-method
favetisov Dec 6, 2017
9a778e2
WIP on properly retrieving ANV and Rewards. Blocked by CLI methods.
adilwali Dec 6, 2017
27bbef9
Re-writing updateAllInfo to process key data concurrently..
adilwali Dec 6, 2017
dcaff8f
refactored contact model creation/storing/editing
favetisov Dec 6, 2017
36b6c26
Styling the confirmation page; showing spinners when data is not loader.
adilwali Dec 6, 2017
c1c1315
Fetching the TxData on the confirm screen, and updating display content.
adilwali Dec 6, 2017
4ace20d
fixes in contact creation process
favetisov Dec 6, 2017
a649879
Better formatting on TX-Confirm screen.
adilwali Dec 6, 2017
23d7b52
Adding send outline image to confirm screen.
adilwali Dec 6, 2017
a899829
More styling to send-confirm.
adilwali Dec 6, 2017
69a7c6c
WIP getting merit address to store on device contact
ferrerrajc Dec 6, 2017
274d3c8
Preparing for merit rpc consistency.
adilwali Dec 6, 2017
71faf31
Updating resources for ios.
adilwali Dec 6, 2017
6509f35
Pre-populating key data for network tab view.
adilwali Dec 6, 2017
9e0afac
Small hack to make refresher work on wallets page.
adilwali Dec 6, 2017
631a337
merge contacts from device storag and in-app storage
ferrerrajc Dec 6, 2017
cf4cdab
save to local storage instead of device contacts on edit
ferrerrajc Dec 6, 2017
80fc300
optimization to avoid traversing device contacts repeatedly
ferrerrajc Dec 6, 2017
9ee289c
addded infinite scroll to addressbook and send views
favetisov Dec 6, 2017
1d84f54
fixed sorting in contacts list
favetisov Dec 6, 2017
8e66376
Merge pull request #265 from meritlabs/modernize/infinite-scroll
ferrerrajc Dec 6, 2017
6c9a591
add unique ids to contacts created in-app
ferrerrajc Dec 6, 2017
81907dc
fixed recipient selection; img removed from contact details page
favetisov Dec 6, 2017
8b42514
remove some commented out code
ferrerrajc Dec 6, 2017
2b63144
Merge remote-tracking branch 'origin/major/modernize' into modernize/…
ferrerrajc Dec 6, 2017
e327bb8
changed structure of send-amount view; added HasFunds check
favetisov Dec 6, 2017
94c0abb
Do not display duplicate notifications on refresh.
adilwali Dec 6, 2017
483c9da
Merge branch 'modernize/contacts-integration' into modernize/send-amo…
favetisov Dec 6, 2017
6803985
fixed has funds check
favetisov Dec 6, 2017
c6e1f77
Merge pull request #266 from meritlabs/modernize/send-amount-restyling
ferrerrajc Dec 6, 2017
22bc5d1
remove some old key-press processing and commented code
ferrerrajc Dec 6, 2017
362f555
fix amount parsing on send-amount view
ferrerrajc Dec 7, 2017
3480156
use safe url sanitizer
ferrerrajc Dec 7, 2017
8b9403c
code review fixes
ferrerrajc Dec 7, 2017
8d5fcf2
Merge pull request #256 from meritlabs/modernize/contacts-integration
mempko Dec 7, 2017
6503e71
Fix vault renew transaction and flow.
mempko Dec 7, 2017
626718c
fixed onboarding styling
favetisov Dec 7, 2017
e8564fa
fixed wallets refresh
favetisov Dec 7, 2017
7555e9a
Fixed default history in wallets
favetisov Dec 7, 2017
9191c8c
removed unnecessary config service import (it made service non-single…
favetisov Dec 7, 2017
aa21fa9
fixed app styling
favetisov Dec 7, 2017
f14f026
fixed color setting in wallet creation
favetisov Dec 7, 2017
c6e7cfb
added buy-and-sell stub
favetisov Dec 7, 2017
6891fec
fix address search
eugene-sy Dec 7, 2017
c51e1ca
Merge pull request #268 from meritlabs/modernize/minor-fixes
tonypizzicato Dec 7, 2017
2c9b053
Creating a notifications sub-view in the settings section of the app.
adilwali Dec 7, 2017
d1511c4
Removing old email service. And adding email validator.
adilwali Dec 7, 2017
5feeb95
Merge pull request #267 from meritlabs/bug/fix-whitelist-rendering-on…
adilwali Dec 7, 2017
58607ab
The send and receive pages assumed merit was returned from rateservic…
mempko Dec 7, 2017
6a08b9d
Merge pull request #269 from meritlabs/bug/receive-wrong-merit-amount
eugene-sy Dec 7, 2017
421dc85
add initial styles for the send confirm page
ferrerrajc Dec 7, 2017
3ec762b
remove shadow from wallet icon on the main screen
eugene-sy Dec 7, 2017
a1a4917
Require vaults to have whitelist in create and renew.
mempko Dec 7, 2017
481cba0
Merge pull request #271 from meritlabs/bug/remove-shadow-from-icons
mempko Dec 7, 2017
29db912
Merge pull request #272 from meritlabs/bug/vaults-must-have-whitelist
eugene-sy Dec 7, 2017
b4fe0af
Fix styling of wallet amount in details page and fix for icon in over…
mempko Dec 7, 2017
d372ffe
added contact removal
favetisov Dec 7, 2017
3777e17
fixed contact build
favetisov Dec 7, 2017
0c03cef
Merge pull request #273 from meritlabs/modernize/contacts-removal
ferrerrajc Dec 7, 2017
fb1314a
remove feeModal and tx desctiption temporarily. Also match style with…
ferrerrajc Dec 7, 2017
15bacc7
remove shadow on wallet icon
ferrerrajc Dec 7, 2017
b4d6047
Merge pull request #270 from meritlabs/modernize/style-send-confirm-view
mempko Dec 7, 2017
b0d003e
Typescript fails compilation because IContactProperties does not have…
mempko Dec 8, 2017
eabda4f
Merge pull request #277 from meritlabs/bug/compilation-fix-contact-bu…
ferrerrajc Dec 8, 2017
8202624
Spending from a vault to wallet picked wrong address.
mempko Dec 8, 2017
a47f73a
Updating formatting for MWC.
adilwali Dec 8, 2017
88a817f
Aggregating rewads for all addresses passed into getRewards().
adilwali Dec 8, 2017
51bf2d6
Adding polling notification service, so we can foll-back to long-poll…
adilwali Dec 8, 2017
9a52352
Using ngZone to effectively update the view when ANV and rewards are …
adilwali Dec 8, 2017
7a2177f
Belt-and-suspenders check inside of insight-api to gracefully handled…
adilwali Dec 8, 2017
563d910
Even more belt-and-surpenders checks for empty addresses in BWS.
adilwali Dec 8, 2017
308e336
fixed rewards in network; refresher added
favetisov Dec 8, 2017
dc1c33b
Merge branch 'major/modernize' into modernize/more-tightness
favetisov Dec 8, 2017
dab4574
added server error handling
favetisov Dec 8, 2017
b3feab9
update vault status on block notification
eugene-sy Dec 8, 2017
c83ce8b
fix double storing of vaults
eugene-sy Dec 8, 2017
cf844f4
clean up debug messages
eugene-sy Dec 8, 2017
405844f
Removing pushNotificationService from app component.
adilwali Dec 8, 2017
da15755
Formatting in package.json.
adilwali Dec 8, 2017
6dada18
Wrapping notification-related services into a module.
adilwali Dec 8, 2017
053b086
Tightening up notifications.
adilwali Dec 8, 2017
ffb13d4
added available amount check on the send-screen
favetisov Dec 8, 2017
157e485
Aligning Android and Apple app store names.
adilwali Dec 8, 2017
12ab531
Better titles for network and send screens.
adilwali Dec 8, 2017
fc69553
Updating app name in appConfig and config.xml.
adilwali Dec 8, 2017
d3efb37
Fallback to long-polling on app-startup.
adilwali Dec 8, 2017
be6686b
Must init push service in app component.
adilwali Dec 8, 2017
246fa4e
Merge pull request #283 from meritlabs/modernize/real-time
adilwali Dec 8, 2017
20e0006
Merge pull request #259 from meritlabs/modernize/more-tightness
adilwali Dec 8, 2017
c6e9ea6
Barrow and steal styling from send page to vault spend confirmation.
mempko Dec 8, 2017
d967dcb
Merge pull request #284 from meritlabs/fix/vault-spend-confirmation-s…
eugene-sy Dec 8, 2017
64dbec5
revert bws url to localhost
eugene-sy Dec 8, 2017
b8f1b1d
Missing vault spend confirm css.
mempko Dec 8, 2017
8b22b0f
Computing actual vault balances from utxos.
mempko Dec 8, 2017
7d32a5c
Merge pull request #285 from meritlabs/feature/real-vault-balance
eugene-sy Dec 8, 2017
4e4eccb
Loading wallets on first load of network view.
adilwali Dec 8, 2017
31a4059
Merge remote-tracking branch 'origin/major/modernize' into modernize/…
adilwali Dec 8, 2017
87c85cb
Properly managing async load of wallets on the receive view.
adilwali Dec 8, 2017
5a880b2
Merge pull request #282 from meritlabs/feature/update-vault-status
mempko Dec 8, 2017
bcef3f9
Removing unnecessary log output.
adilwali Dec 8, 2017
b2002d7
Making insight-api consistent with params for getAnv() and getRewards().
adilwali Dec 8, 2017
d404d36
Consistent handling of address params for insight-API.
adilwali Dec 8, 2017
ca70403
Formatting micros properly on network screen.
adilwali Dec 8, 2017
1e9793e
Promise chaining ANV accumulation in wallets view.
adilwali Dec 8, 2017
b598933
Properly reducing the address-specific rewards response to an aggrega…
adilwali Dec 8, 2017
a1523ec
Fix whitelist selection during vault renew.
mempko Dec 8, 2017
ec67c96
Merge pull request #288 from meritlabs/fix/renew-with-correct-whitelist
eugene-sy Dec 8, 2017
f137421
Juicing up the network view to be clearer and to include fiat informa…
adilwali Dec 8, 2017
07f4a6d
dont call a callback then go back and call a callback
ferrerrajc Dec 8, 2017
075ebae
Merge pull request #291 from meritlabs/bug/unconfirmed-utxos-break-bws
adilwali Dec 9, 2017
6f582e2
Only explicitly getting new information when app loads and when we re…
adilwali Dec 9, 2017
858266a
Resolving promise in updateCredentials(). Better init order.
adilwali Dec 9, 2017
ee8f6dd
Merge pull request #289 from meritlabs/modernize/anv-and-rewards
adilwali Dec 9, 2017
121eda4
Fixing race condition for login in MWC.
adilwali Dec 9, 2017
19a74aa
Consistently resolving promises on send-confirm screen.
adilwali Dec 9, 2017
fe8c8d4
Merge pull request #293 from meritlabs/modernize/recent-txns
adilwali Dec 9, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ clean-bitcore-message:
clean-bitcore-payment-protocol:
rm -rf ./packages/bitcore-payment-protocol/node_modules

.PHONY: clean-lightwallet-2
clean-lightwallet-2:
rm -rf ./packages/lw-2/node_modules

.PHONY: clean-stack
clean-stack: clean-npm \
clean-bitcore-lib \
Expand All @@ -143,7 +147,8 @@ clean-stack: clean-npm \
clean-bitcore-p2p \
clean-bitcore-node \
clean-bitcore-message \
clean-bitcore-payment-protocol
clean-bitcore-payment-protocol \
clean-lightwallet-2

.PHONY: test-bitcoin-rpc
test-bitcoin-rpc:
Expand Down
2 changes: 1 addition & 1 deletion lightwallet/src/js/controllers/backup.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ angular.module('copayApp.controllers').controller('backupController',
var confirm = function(cb) {
$scope.backupError = false;

var customWordList = lodash.pluck($scope.customWords, 'word');
var customWordList = lodash.map($scope.customWords, 'word');

if (!lodash.isEqual($scope.mnemonicWords, customWordList)) {
return cb('Mnemonic string mismatch');
Expand Down
2 changes: 1 addition & 1 deletion lightwallet/src/js/controllers/lockSetup.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('lockSetupController', functio
function processWallets() {
var wallets = profileService.getWallets();
var singleLivenetWallet = wallets.length == 1 && wallets[0].network == 'livenet' && wallets[0].needsBackup;
var atLeastOneLivenetWallet = lodash.any(wallets, function(w) {
var atLeastOneLivenetWallet = lodash.some(wallets, function(w) {
return w.network == 'livenet' && w.needsBackup;
});

Expand Down
2 changes: 1 addition & 1 deletion lightwallet/src/js/controllers/preferencesInformation.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
$scope.basePath = basePath;
$scope.M = c.m;
$scope.N = c.n;
$scope.pubKeys = lodash.pluck(c.publicKeyRing, 'xPubKey');
$scope.pubKeys = lodash.map(c.publicKeyRing, 'xPubKey');
$scope.externalSource = null;

if (wallet.isPrivKeyExternal()) {
Expand Down
31 changes: 31 additions & 0 deletions lightwallet/src/js/controllers/vaultController.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
'use strict';

angular.module('copayApp.controllers').controller('vaultController', function($scope, $rootScope, $state, popupService, bwcService) {

$scope.toAmount = function() {
$state.go('tabs.add.create-vault.amount');
};

$scope.toMasterKey = function() {
$state.go('tabs.add.create-vault.master-key');
};

$scope.toConfirmKey = function() {
popupService.showConfirm('Master key', 'Are you sure that you have copied master key?', 'Yes', 'No', function(ok) {
if (ok) {
$scope.toSummaryView();
}

return;
});
};

$scope.toSummaryView = function() {
$state.go('tabs.add.create-vault.summary');
};

$scope.toVaultWallet = function() {
$state.go('tabs.home');
};

});
36 changes: 36 additions & 0 deletions lightwallet/src/js/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,42 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
},
}
})
.state('tabs.add.create-vault', {
url: '/create-vault',
views: {
'tab-home@tabs': {
templateUrl: 'views/tab-create-vault.html',
controller: 'vaultController'
},
}
})
.state('tabs.add.create-vault.amount', {
url: '/create-vault/amount',
views: {
'tab-home@tabs': {
templateUrl: 'views/vault/amount.html',
controller: 'vaultController'
},
}
})
.state('tabs.add.create-vault.master-key', {
url: '/create-vault/master-key',
views: {
'tab-home@tabs': {
templateUrl: 'views/vault/master-key.html',
controller: 'vaultController'
},
}
})
.state('tabs.add.create-vault.summary', {
url: '/create-vault/summary',
views: {
'tab-home@tabs': {
templateUrl: 'views/vault/summary.html',
controller: 'vaultController'
},
}
})
.state('tabs.add.create-shared', {
url: '/create-shared',
views: {
Expand Down
6 changes: 3 additions & 3 deletions lightwallet/src/js/services/intelTEE.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ angular.module('copayApp.services')
var basePath = hwWallet.getAddressPath(root.description.id, isMultisig, account, txp.network);

var rawTx = bwcService.Client.getRawTx(txp);
var keypaths = lodash.map(lodash.pluck(txp.inputs, 'path'), function(path) {
var keypaths = lodash.map(lodash.map(txp.inputs, 'path'), function(path) {
return path.replace('m', basePath);
});
var publicKeys = lodash.pluck(txp.inputs, 'publicKeys');
var publicKeys = lodash.map(txp.inputs, 'publicKeys');
var changePublicKeys = txp.changeAddress.publicKeys;
publicKeys.push(changePublicKeys);

Expand Down Expand Up @@ -192,4 +192,4 @@ angular.module('copayApp.services')
};

return root;
});
});
2 changes: 1 addition & 1 deletion lightwallet/src/js/services/onGoingProcess.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
ongoingProcess[processName] = isOn;

var name;
root.any = lodash.any(ongoingProcess, function(isOn, processName) {
root.some = lodash.some(ongoingProcess, function(isOn, processName) {
if (isOn)
name = name || processName;
return isOn;
Expand Down
3 changes: 2 additions & 1 deletion lightwallet/src/js/services/profileService.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,12 @@ angular.module('copayApp.services')
return ((config.bwsFor && config.bwsFor[walletId]) || defaults.bws.url);
};


var client = bwcService.getClient(JSON.stringify(credentials), {
bwsurl: getBWSURL(credentials.walletId),
});

window.Client = client;

var skipKeyValidation = shouldSkipValidation(credentials.walletId);
if (!skipKeyValidation)
root.runValidation(client, 500);
Expand Down
2 changes: 1 addition & 1 deletion lightwallet/src/js/services/trezor.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ angular.module('copayApp.services')
return x.pub;
});

return lodash.pluck(sorted, 'xpub');
return lodash.map(sorted, 'xpub');
};

root.signTx = function(xPubKeys, txp, account, callback) {
Expand Down
2 changes: 1 addition & 1 deletion lightwallet/src/js/services/walletService.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
var _signWithTrezor = function(wallet, txp, cb) {
$log.info('Requesting Trezor to sign the transaction');

var xPubKeys = lodash.pluck(wallet.credentials.publicKeyRing, 'xPubKey');
var xPubKeys = lodash.map(wallet.credentials.publicKeyRing, 'xPubKey');
trezor.signTx(xPubKeys, txp, wallet.credentials.account, function(err, result) {
if (err) return cb(err);

Expand Down
1 change: 1 addition & 0 deletions lightwallet/src/sass/views/amount.scss
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
bottom: 0;
width: 100%;
color: $v-mid-gray;
margin: 30px;

.row {
padding: 0 !important;
Expand Down
Loading