Skip to content

face touch id fix #15

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.

Sign up for GitHub

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
podkovyrin merged 1 commit into from
Nov 27, 2018
Merged

face touch id fix #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions DashWallet/DWSettingsViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ - (IBAction)touchIdLimit:(id)sender
[DSEventManager saveEvent:@"settings:touch_id_limit"];
DSAuthenticationManager * authenticationManager = [DSAuthenticationManager sharedInstance];
DSPriceManager * priceManager = [DSPriceManager sharedInstance];
DSChainsManager * chainsManager = [DSChainsManager sharedInstance];

[authenticationManager authenticateWithPrompt:nil andTouchId:NO alertIfLockout:YES completion:^(BOOL authenticated,BOOL cancelled) {
if (authenticated) {
Expand All @@ -310,9 +311,9 @@ - (IBAction)touchIdLimit:(id)sender
[priceManager localCurrencyStringForDashAmount:DUFFS]],
[NSString stringWithFormat:@"%@ (%@)", [priceManager stringForDashAmount:DUFFS*10],
[priceManager localCurrencyStringForDashAmount:DUFFS*10]]];
if (priceManager.spendingLimit > DUFFS*10) priceManager.spendingLimit = DUFFS*10;
self.selectedOption = self.selectorOptions[(log10(priceManager.spendingLimit) < 6) ? 0 :
(NSUInteger)log10(priceManager.spendingLimit) - 6];
if (chainsManager.spendingLimit > DUFFS*10) [chainsManager setSpendingLimitIfAuthenticated:DUFFS*10];
self.selectedOption = self.selectorOptions[(log10(chainsManager.spendingLimit) < 6) ? 0 :
(NSUInteger)log10(chainsManager.spendingLimit) - 6];
self.noOptionsText = nil;
self.selectorController.title = (self.touchId)?NSLocalizedString(@"Touch ID spending limit", nil):NSLocalizedString(@"Face ID spending limit", nil);
[self.navigationController pushViewController:self.selectorController animated:YES];
Expand Down Expand Up @@ -390,6 +391,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
UITableViewCell *cell = nil;

DSPriceManager * priceManager = [DSPriceManager sharedInstance];
DSChainsManager * chainsManager = [DSChainsManager sharedInstance];

if (tableView == self.selectorController.tableView) {
cell = [self.tableView dequeueReusableCellWithIdentifier:selectorOptionCell];
Expand Down Expand Up @@ -425,7 +427,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
if (self.touchId || self.faceId) {
cell = [tableView dequeueReusableCellWithIdentifier:selectorIdent];
cell.textLabel.text = (self.touchId)?NSLocalizedString(@"Touch ID limit", nil):NSLocalizedString(@"Face ID limit", nil);
cell.detailTextLabel.text = [priceManager stringForDashAmount:priceManager.spendingLimit];
cell.detailTextLabel.text = [priceManager stringForDashAmount:chainsManager.spendingLimit];
} else {
goto _switch_cell;
}
Expand Down Expand Up @@ -724,7 +726,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
priceManager.localCurrencyCode = priceManager.currencyCodes[indexPath.row];
}
}
else priceManager.spendingLimit = (indexPath.row > 0) ? pow(10, indexPath.row + 6) : 0;
else [[DSChainsManager sharedInstance] setSpendingLimitIfAuthenticated:(indexPath.row > 0) ? pow(10, indexPath.row + 6) : 0];

if (currencyCodeIndex < self.selectorOptions.count && currencyCodeIndex != indexPath.row) {
[tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:currencyCodeIndex inSection:0], indexPath]
Expand Down