Merge branch '138_onbordingUI_enhancements' of https://github.com/LukasKorba/secant-ios-wallet into 138_onbordingUI_enhancements
This commit is contained in:
commit
64146e2ac5
|
@ -36,7 +36,7 @@ Please provide a general summary of the issue you're experiencing
|
||||||
Tell us what should happen
|
Tell us what should happen
|
||||||
|
|
||||||
### Actual behaviour + errors
|
### Actual behaviour + errors
|
||||||
Tell us what happens instead including any noticable error output (any messages
|
Tell us what happens instead including any noticeable error output (any messages
|
||||||
displayed on-screen when e.g. a crash occurred)
|
displayed on-screen when e.g. a crash occurred)
|
||||||
<!-- Note: please do not include sensitive information. blur, scratch or annotate any
|
<!-- Note: please do not include sensitive information. blur, scratch or annotate any
|
||||||
information like addresses, usernames, amounts or anything other that you might consider sensitive and it's not relevant to the problem you are reporting. -->
|
information like addresses, usernames, amounts or anything other that you might consider sensitive and it's not relevant to the problem you are reporting. -->
|
||||||
|
|
|
@ -75,7 +75,7 @@ extension RecoveryPhraseValidationState {
|
||||||
/// Given an array of RecoveryPhraseStepCompletion, missing indices, original phrase and the number of groups it was split into,
|
/// Given an array of RecoveryPhraseStepCompletion, missing indices, original phrase and the number of groups it was split into,
|
||||||
/// assembly the resulting phrase. This comes up with the "proposed solution" for the recovery phrase validation challenge.
|
/// assembly the resulting phrase. This comes up with the "proposed solution" for the recovery phrase validation challenge.
|
||||||
/// - returns:an array of String containing the recovery phrase words ordered by the original phrase order, or `nil`
|
/// - returns:an array of String containing the recovery phrase words ordered by the original phrase order, or `nil`
|
||||||
/// if a resulting phrase can't be formed becasue the validation state is not complete.
|
/// if a resulting phrase can't be formed because the validation state is not complete.
|
||||||
var resultingPhrase: [String]? {
|
var resultingPhrase: [String]? {
|
||||||
guard missingIndices.count == validationWords.count else { return nil }
|
guard missingIndices.count == validationWords.count else { return nil }
|
||||||
|
|
||||||
|
|
|
@ -28,13 +28,13 @@ protocol Funds {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Wallet Balance that condenses transpant, Sapling and Orchard funds
|
Wallet Balance that condenses transparent, Sapling and Orchard funds
|
||||||
*/
|
*/
|
||||||
protocol WalletBalance {
|
protocol WalletBalance {
|
||||||
/**
|
/**
|
||||||
Transparent funds. This is the sum of the UTXOs of the user found at a given time
|
Transparent funds. This is the sum of the UTXOs of the user found at a given time
|
||||||
*/
|
*/
|
||||||
var transaparent: Funds { get }
|
var transparent: Funds { get }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Funds on the Sapling shielded pool for a given user.
|
Funds on the Sapling shielded pool for a given user.
|
||||||
|
@ -70,18 +70,18 @@ protocol WalletBalance {
|
||||||
extension WalletBalance {
|
extension WalletBalance {
|
||||||
static var nullBalance: WalletBalance {
|
static var nullBalance: WalletBalance {
|
||||||
Balance(
|
Balance(
|
||||||
transaparent: ZcashFunds.noFunds,
|
transparent: ZcashFunds.noFunds,
|
||||||
sapling: ZcashFunds.noFunds,
|
sapling: ZcashFunds.noFunds,
|
||||||
orchard: ZcashFunds.noFunds
|
orchard: ZcashFunds.noFunds
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
var totalAvailableBalance: Int64 {
|
var totalAvailableBalance: Int64 {
|
||||||
transaparent.confirmed + sapling.confirmed + orchard.confirmed
|
transparent.confirmed + sapling.confirmed + orchard.confirmed
|
||||||
}
|
}
|
||||||
|
|
||||||
var totalUnconfirmedBalance: Int64 {
|
var totalUnconfirmedBalance: Int64 {
|
||||||
transaparent.unconfirmed + sapling.unconfirmed + orchard.unconfirmed
|
transparent.unconfirmed + sapling.unconfirmed + orchard.unconfirmed
|
||||||
}
|
}
|
||||||
|
|
||||||
var totalBalance: Int64 {
|
var totalBalance: Int64 {
|
||||||
|
@ -93,7 +93,7 @@ extension WalletBalance {
|
||||||
Concrete Wallet Balance.
|
Concrete Wallet Balance.
|
||||||
*/
|
*/
|
||||||
struct Balance: WalletBalance {
|
struct Balance: WalletBalance {
|
||||||
var transaparent: Funds
|
var transparent: Funds
|
||||||
var sapling: Funds
|
var sapling: Funds
|
||||||
var orchard: Funds
|
var orchard: Funds
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
//
|
//
|
||||||
// Created by Francisco Gindre on 8/6/21.
|
// Created by Francisco Gindre on 8/6/21.
|
||||||
//
|
//
|
||||||
// TODO: Move this to diferent Target when real functionality is developed.
|
// TODO: Move this to different Target when real functionality is developed.
|
||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
// swiftlint:disable line_length
|
// swiftlint:disable line_length
|
||||||
|
|
|
@ -93,7 +93,7 @@ public enum ZcashSDK {
|
||||||
public static var defaultRetrie: Int = 5
|
public static var defaultRetrie: Int = 5
|
||||||
|
|
||||||
/**
|
/**
|
||||||
The default maximum amount of time to wait during retry backoff intervals. Failed loops will never wait longer than this before retyring.
|
The default maximum amount of time to wait during retry backoff intervals. Failed loops will never wait longer than this before retrying.
|
||||||
*/
|
*/
|
||||||
public static var defaultMaxBackoffInterval: TimeInterval = 600
|
public static var defaultMaxBackoffInterval: TimeInterval = 600
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue