zec
/
secant-ios-wallet
mirror of https://github.com/zcash/secant-ios-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes and improvements 

- bugfix after testing
- sending json for the light/dark mode
- hola for the spanish HI

FFI-preview

- code cleaned up
- FFI bumped up
This commit is contained in:
Lukas Korba 2024-11-14 19:25:31 +01:00
parent d9cc27cad0
commit b508c38cb9
17 changed files with 177 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
modules/Package.swift
View File

@ -89,7 +89,8 @@ let package = Package(
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"),
.package(url: "https://github.com/pointfreeco/swift-url-routing", from: "0.6.2"),
.package(url: "https://github.com/zcash-hackworks/MnemonicSwift", from: "2.2.4"),
.package(url: "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", from: "2.2.6"),
// .package(url: "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", from: "2.2.6"),
.package(url: "https://github.com/LukasKorba/ZcashLightClientKit", branch: "note_management-preview"),
.package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.27.0"),
.package(url: "https://github.com/flexa/flexa-ios.git", from: "1.0.5"),
.package(url: "https://github.com/pacu/zcash-swift-payment-uri", from: "0.1.0-beta.9"),
@ -130,7 +131,7 @@ let package = Package(
"Utils",
"WalletStorage",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/AddressBookClient"
),
@ -142,7 +143,7 @@ let package = Package(
"UIComponents",
"Utils",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/AddressDetails"
),
@ -185,7 +186,7 @@ let package = Package(
"WalletStorage",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/BalanceBreakdown"
),
@ -195,7 +196,7 @@ let package = Package(
"Generated",
"Utils",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/BalanceFormatter"
),
@ -233,7 +234,7 @@ let package = Package(
"FileManager",
"Utils",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/DatabaseFiles"
),
@ -250,7 +251,7 @@ let package = Package(
"DerivationTool",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "URLRouting", package: "swift-url-routing"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/Deeplink"
),
@ -271,7 +272,7 @@ let package = Package(
"UIComponents",
"Utils",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/DeleteWallet"
),
@ -280,7 +281,7 @@ let package = Package(
dependencies: [
"Utils",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/DerivationTool"
),
@ -298,7 +299,7 @@ let package = Package(
"UserPreferencesStorage",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/ExchangeRate"
),
@ -309,7 +310,7 @@ let package = Package(
"LogsHandler",
"Utils",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/ExportLogs"
),
@ -335,7 +336,7 @@ let package = Package(
"PartnerKeys",
"UserDefaults",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk"),
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit"),
.product(name: "Flexa", package: "flexa-ios")
],
path: "Sources/Dependencies/FlexaHandler"
@ -360,7 +361,7 @@ let package = Package(
"WalletBalances",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/Home"
),
@ -375,7 +376,7 @@ let package = Package(
"WalletStorage",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/ImportWallet"
),
@ -441,7 +442,7 @@ let package = Package(
"SecurityWarning",
"UIComponents",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/OnboardingFlow"
),
@ -498,7 +499,7 @@ let package = Package(
"UIComponents",
"Utils",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/Receive"
),
@ -513,7 +514,7 @@ let package = Package(
"Utils",
"WalletStorage",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/RecoveryPhraseDisplay"
),
@ -533,7 +534,7 @@ let package = Package(
"Utils",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk"),
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit"),
.product(name: "ZcashPaymentURI", package: "zcash-swift-payment-uri")
],
path: "Sources/Features/RequestZec"
@ -594,7 +595,7 @@ let package = Package(
"Welcome",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/Root"
),
@ -610,7 +611,7 @@ let package = Package(
"ZcashSDKEnvironment",
.product(name: "ZcashPaymentURI", package: "zcash-swift-payment-uri"),
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/Scan"
),
@ -621,7 +622,7 @@ let package = Package(
"Models",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/SDKSynchronizer"
),
@ -672,7 +673,7 @@ let package = Package(
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "Lottie", package: "lottie-spm"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/SendConfirmation"
),
@ -704,7 +705,7 @@ let package = Package(
"WalletBalances",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/SendFlow"
),
@ -717,7 +718,7 @@ let package = Package(
"UserPreferencesStorage",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/ServerSetup"
),
@ -742,7 +743,7 @@ let package = Package(
"UIComponents",
"WhatsNew",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk"),
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit"),
.product(name: "Flexa", package: "flexa-ios")
],
path: "Sources/Features/Settings"
@ -796,7 +797,7 @@ let package = Package(
"UserPreferencesStorage",
"ZecKeyboard",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/Tabs"
),
@ -813,7 +814,7 @@ let package = Package(
"Utils",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/TransactionList"
),
@ -841,7 +842,7 @@ let package = Package(
"Models",
.product(name: "ZcashPaymentURI", package: "zcash-swift-payment-uri"),
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/URIParser"
),
@ -857,14 +858,14 @@ let package = Package(
dependencies: [
"UserDefaults",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/UserPreferencesStorage"
),
.target(
name: "Utils",
dependencies: [
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk"),
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit"),
.product(name: "CasePaths", package: "swift-case-paths"),
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
],
@ -882,7 +883,7 @@ let package = Package(
"Utils",
"ZcashSDKEnvironment",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Features/WalletBalances"
),
@ -903,7 +904,7 @@ let package = Package(
"MnemonicClient",
"Models",
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk")
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit")
],
path: "Sources/Dependencies/WalletStorage"
),
@ -941,7 +942,7 @@ let package = Package(
"Generated",
"UserDefaults",
"UserPreferencesStorage",
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk"),
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit"),
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
],
path: "Sources/Dependencies/ZcashSDKEnvironment"
@ -953,7 +954,7 @@ let package = Package(
"Models",
"UIComponents",
"Utils",
.product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk"),
.product(name: "ZcashLightClientKit", package: "ZcashLightClientKit"),
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
],
path: "Sources/Features/ZecKeyboard"

3
modules/Sources/Features/RecoveryPhraseDisplay/RecoveryPhraseDisplayView.swift
View File

@ -178,10 +178,11 @@ public struct RecoveryPhraseDisplayView: View {
.zFont(.semiBold, size: 24, style: Design.Text.primary)
.padding(.top, 40)
.multilineTextAlignment(.center)
.zashiBackV2()
}
}
.onAppear { store.send(.onAppear) }
.alert($store.scope(state: \.alert, action: \.alert))
.zashiBack(false, hidden: !store.showBackButton)
.overlayPreferenceValue(BirthdayPreferenceKey.self) { preferences in
if store.isBirthdayHintVisible {
GeometryReader { geometry in

17
modules/Sources/Features/SendConfirmation/SendConfirmationStore.swift
View File

@ -151,8 +151,10 @@ public struct SendConfirmation {
}
@Dependency(\.addressBook) var addressBook
@Dependency(\.audioServices) var audioServices
@Dependency(\.localAuthentication) var localAuthentication
@Dependency(\.derivationTool) var derivationTool
@Dependency(\.mainQueue) var mainQueue
@Dependency(\.mnemonic) var mnemonic
@Dependency(\.sdkSynchronizer) var sdkSynchronizer
@Dependency(\.walletStorage) var walletStorage
@ -317,7 +319,20 @@ public struct SendConfirmation {
case .updateResult(let result):
state.result = result
return .none
if let result {
if result == .success {
audioServices.systemSoundVibrate()
return .none
} else {
return .run { _ in
audioServices.systemSoundVibrate()
try? await mainQueue.sleep(for: .seconds(1.0))
audioServices.systemSoundVibrate()
}
}
} else {
return .none
}
case let .updateFailedData(code, desc):
state.failedCode = code

12
modules/Sources/Features/SendConfirmation/SendingView.swift
View File

@ -16,8 +16,11 @@ import PartialProposalError
import Lottie
public struct SendingView: View {
@Environment(\.colorScheme) var colorScheme
private enum Constants {
static let lottieName = "sending"
static let lottieNameLight = "sending"
static let lottieNameDark = "sending-dark"
}
@Perception.Bindable var store: StoreOf<SendConfirmation>
@ -31,9 +34,12 @@ public struct SendingView: View {
public var body: some View {
WithPerceptionTracking {
VStack(spacing: 0) {
LottieView(animation: .named(Constants.lottieName))
LottieView(animation: .named(
colorScheme == .light ? Constants.lottieNameLight : Constants.lottieNameDark
))
.resizable()
.looping()
.frame(width: 200, height: 200)
.frame(width: 110, height: 110)
Text(L10n.Send.sending)
.zFont(.semiBold, size: 28, style: Design.Text.primary)

2
modules/Sources/Features/SendFlow/SendFlowStore.swift
View File

@ -319,8 +319,6 @@ public struct SendFlow {
return .send(.getProposal(.send))
case .getProposal(let confirmationType):
state.address = "u12pgnsjq2c2k5q6wuc7z4068xlcuqcw93wujlar47pwv9rrl6ujp2sjumtpnwxdemvg52t86cwu8hk740v7p2at7neq5delmtjk502q0xrnaz0kfyextpm8l687wsk0m3zqzdvynme2d".redacted
state.amount = .zero
return .run { [state, confirmationType] send in
do {
let recipient = try Recipient(state.address.data, network: zcashSDKEnvironment.network.networkType)

3
modules/Sources/Features/TransactionList/TransactionListStore.swift
View File

@ -9,6 +9,7 @@ import SDKSynchronizer
import ReadTransactionsStorage
import ZcashSDKEnvironment
import AddressBookClient
import UIComponents
@Reducer
public struct TransactionList {
@ -23,6 +24,7 @@ public struct TransactionList {
public var latestTransactionId = ""
public var latestTransactionList: [TransactionState] = []
public var requiredTransactionConfirmations = 0
@Shared(.inMemory(.toast)) public var toast: Toast.Edge? = nil
public var transactionList: IdentifiedArrayOf<TransactionState>
public init(
@ -209,6 +211,7 @@ public struct TransactionList {
case .copyToPastboard(let value):
pasteboard.setString(value)
state.toast = .top(L10n.General.copiedToTheClipboard)
return .none
case .transactionCollapseRequested(let id):

1
modules/Sources/Features/TransactionList/Views/TapToCopyTransactionDataView.swift
View File

@ -31,7 +31,6 @@ struct TapToCopyTransactionDataView: View {
Text(L10n.General.tapToCopy)
.zFont(.semiBold, size: 14, style: Design.Btns.Tertiary.fg)
.lineLimit(1)
.minimumScaleFactor(0.5)
}
}
.buttonStyle(.borderless)

24
modules/Sources/Features/Welcome/WelcomeView.swift
View File

@ -13,6 +13,22 @@ import NumberFormatter
public struct WelcomeView: View {
@Perception.Bindable var store: StoreOf<Welcome>
var hiHeight: CGFloat {
var potentialCountryCode: String?
if #available(iOS 16, *) {
potentialCountryCode = Locale.current.language.languageCode?.identifier
} else {
potentialCountryCode = Locale.current.languageCode
}
if let potentialCountryCode, potentialCountryCode == "es" {
return 0.6
} else {
return 0.35
}
}
public init(store: StoreOf<Welcome>) {
self.store = store
@ -30,8 +46,12 @@ public struct WelcomeView: View {
)
Asset.Assets.splashHi.image
.zImage(width: 246, height: 213, color: .white)
.scaleEffect(0.35)
.resizable()
.renderingMode(.template)
.aspectRatio(contentMode: .fit)
.frame(height: 213)
.foregroundColor(.white)
.scaleEffect(hiHeight)
.position(
x: proxy.frame(in: .local).midX,
y: proxy.frame(in: .local).midY * 0.8

8
modules/Sources/Generated/Resources/Assets.xcassets/SplashHi.imageset/Contents.json vendored
View File

@ -3,10 +3,18 @@
{
"filename" : "splashHi.png",
"idiom" : "universal"
},
{
"filename" : "Text.png",
"idiom" : "universal",
"locale" : "es"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"localizable" : true
}
}

BIN
modules/Sources/Generated/Resources/Assets.xcassets/SplashHi.imageset/Text.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

6
modules/Sources/Models/FeatureFlags.swift
View File

@ -14,10 +14,10 @@ public struct FeatureFlags: Equatable {
public init(
addUAtoMemo: Bool = false,
appLaunchBiometric: Bool = false,
appLaunchBiometric: Bool = true,
flexa: Bool = false,
selectText: Bool = false,
sendingScreen: Bool = false
selectText: Bool = true,
sendingScreen: Bool = true
) {
self.addUAtoMemo = addUAtoMemo
self.appLaunchBiometric = appLaunchBiometric

24
modules/Sources/UIComponents/Overlays/SplashView.swift
View File

@ -177,6 +177,22 @@ struct SplashView: View {
default: return ""
}
}
var hiHeight: CGFloat {
var potentialCountryCode: String?
if #available(iOS 16, *) {
potentialCountryCode = Locale.current.language.languageCode?.identifier
} else {
potentialCountryCode = Locale.current.languageCode
}
if let potentialCountryCode, potentialCountryCode == "es" {
return 0.6
} else {
return 0.35
}
}
var body: some View {
if splashManager.isOn && !isHidden {
@ -191,8 +207,12 @@ struct SplashView: View {
)
Asset.Assets.splashHi.image
.zImage(width: 246, height: 213, color: .white)
.scaleEffect(0.35)
.resizable()
.renderingMode(.template)
.aspectRatio(contentMode: .fit)
.frame(height: 213)
.foregroundColor(.white)
.scaleEffect(hiHeight)
.position(
x: proxy.frame(in: .local).midX,
y: proxy.frame(in: .local).midY * 0.8

48
secant.xcodeproj/project.pbxproj
View File

@ -112,6 +112,16 @@
9E5AB47C2C94777800065483 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 9EDDAF6C2BA2D71700A69A07 /* PrivacyInfo.xcprivacy */; };
9E5AB47D2C94777800065483 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9E5AAEBF2A67CEC4003F283D /* Colors.xcassets */; };
9E5B8E742B46E04E00CA3616 /* RestoreWalletTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E5B8E732B46E04E00CA3616 /* RestoreWalletTests.swift */; };
9E5CFD0F2CE61B7200C95713 /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD0E2CE61B7200C95713 /* sending.json */; };
9E5CFD102CE61B7200C95713 /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD0E2CE61B7200C95713 /* sending.json */; };
9E5CFD112CE61B7200C95713 /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD0E2CE61B7200C95713 /* sending.json */; };
9E5CFD122CE61B7200C95713 /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD0E2CE61B7200C95713 /* sending.json */; };
9E5CFD132CE61B7200C95713 /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD0E2CE61B7200C95713 /* sending.json */; };
9E5CFD152CE6215500C95713 /* sending-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD142CE6215500C95713 /* sending-dark.json */; };
9E5CFD162CE6215500C95713 /* sending-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD142CE6215500C95713 /* sending-dark.json */; };
9E5CFD172CE6215500C95713 /* sending-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD142CE6215500C95713 /* sending-dark.json */; };
9E5CFD182CE6215500C95713 /* sending-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD142CE6215500C95713 /* sending-dark.json */; };
9E5CFD192CE6215500C95713 /* sending-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E5CFD142CE6215500C95713 /* sending-dark.json */; };
9E683E472B0377F0002E7B5D /* WalletNukeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E683E462B0377F0002E7B5D /* WalletNukeTests.swift */; };
9E6C98492BF4C65F00EACDCB /* whatsNew.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E6C98472BF4C65F00EACDCB /* whatsNew.json */; };
9E6C984A2BF4C65F00EACDCB /* whatsNew.json in Resources */ = {isa = PBXBuildFile; fileRef = 9E6C98472BF4C65F00EACDCB /* whatsNew.json */; };
@ -131,11 +141,6 @@
9EB35D632A31F1DD00A2149B /* Root in Frameworks */ = {isa = PBXBuildFile; productRef = 9EB35D622A31F1DD00A2149B /* Root */; };
9EB35D6A2A3A2D7B00A2149B /* Utils in Frameworks */ = {isa = PBXBuildFile; productRef = 9EB35D692A3A2D7B00A2149B /* Utils */; };
9EB35D6C2A3A2D9200A2149B /* Utils in Frameworks */ = {isa = PBXBuildFile; productRef = 9EB35D6B2A3A2D9200A2149B /* Utils */; };
9EBAAABD2CD14919005B026F /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9EBAAABC2CD14919005B026F /* sending.json */; };
9EBAAABE2CD14919005B026F /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9EBAAABC2CD14919005B026F /* sending.json */; };
9EBAAABF2CD14919005B026F /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9EBAAABC2CD14919005B026F /* sending.json */; };
9EBAAAC02CD14919005B026F /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9EBAAABC2CD14919005B026F /* sending.json */; };
9EBAAAC12CD14919005B026F /* sending.json in Resources */ = {isa = PBXBuildFile; fileRef = 9EBAAABC2CD14919005B026F /* sending.json */; };
9EDDAF6D2BA2D71700A69A07 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 9EDDAF6C2BA2D71700A69A07 /* PrivacyInfo.xcprivacy */; };
9EDDAF6E2BA2D71700A69A07 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 9EDDAF6C2BA2D71700A69A07 /* PrivacyInfo.xcprivacy */; };
9EDDAF6F2BA2D71700A69A07 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 9EDDAF6C2BA2D71700A69A07 /* PrivacyInfo.xcprivacy */; };
@ -210,6 +215,8 @@
9E5BF643281FEC9900BA3F17 /* SendTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendTests.swift; sourceTree = "<group>"; };
9E5CFBB12CE38EF000C95713 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Localizable.strings; sourceTree = "<group>"; };
9E5CFBB42CE38EF000C95713 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = Localizable.strings; sourceTree = "<group>"; };
9E5CFD0E2CE61B7200C95713 /* sending.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = sending.json; sourceTree = "<group>"; };
9E5CFD142CE6215500C95713 /* sending-dark.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "sending-dark.json"; sourceTree = "<group>"; };
9E60E3D32C65F49F00B16C3E /* secant-distrib.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "secant-distrib.entitlements"; sourceTree = "<group>"; };
9E612C7829913F3600D09B09 /* SensitiveDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SensitiveDataTests.swift; sourceTree = "<group>"; };
9E66129D288938A300C75B70 /* SettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTests.swift; sourceTree = "<group>"; };
@ -235,7 +242,6 @@
9EAFEB812805793200199FC9 /* RootTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootTests.swift; sourceTree = "<group>"; };
9EAFEB852805A23100199FC9 /* SecItemClientTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecItemClientTests.swift; sourceTree = "<group>"; };
9EB7D14A2A20C6BC00F35E03 /* modules */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = modules; sourceTree = "<group>"; };
9EBAAABC2CD14919005B026F /* sending.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = sending.json; sourceTree = "<group>"; };
9ECDD9512CA687B300D81CA0 /* secant-mainnet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "secant-mainnet.entitlements"; sourceTree = "<group>"; };
9ECDD9522CA6B2B400D81CA0 /* zashi-internal.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "zashi-internal.entitlements"; sourceTree = "<group>"; };
9EDDAF6C2BA2D71700A69A07 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
@ -735,7 +741,8 @@
9EBAAAB52CD14889005B026F /* Lotties */ = {
isa = PBXGroup;
children = (
9EBAAABC2CD14919005B026F /* sending.json */,
9E5CFD0E2CE61B7200C95713 /* sending.json */,
9E5CFD142CE6215500C95713 /* sending-dark.json */,
);
path = Lotties;
sourceTree = "<group>";
@ -1004,12 +1011,13 @@
files = (
0D26AF84299E8196005260EE /* Preview Assets.xcassets in Resources */,
0D26AF88299E8196005260EE /* LaunchScreen.storyboard in Resources */,
9EBAAABD2CD14919005B026F /* sending.json in Resources */,
9E89DF732CD27344002E5317 /* whatsNew_es.json in Resources */,
9E90751F2A269BE300269308 /* Assets.xcassets in Resources */,
9E599F332C3EEEF3000E4997 /* PartnerKeys.plist in Resources */,
9E6C984A2BF4C65F00EACDCB /* whatsNew.json in Resources */,
9E5CFD132CE61B7200C95713 /* sending.json in Resources */,
0D26AF8C299E8196005260EE /* GoogleService-Info.plist in Resources */,
9E5CFD182CE6215500C95713 /* sending-dark.json in Resources */,
9EDDAF6E2BA2D71700A69A07 /* PrivacyInfo.xcprivacy in Resources */,
9E5AAEC12A67CEC4003F283D /* Colors.xcassets in Resources */,
);
@ -1021,12 +1029,13 @@
files = (
0D4E7A1026B364180058B01E /* Preview Assets.xcassets in Resources */,
9E2F1C8C280ED6A7004E65FE /* LaunchScreen.storyboard in Resources */,
9EBAAABE2CD14919005B026F /* sending.json in Resources */,
9E89DF742CD27344002E5317 /* whatsNew_es.json in Resources */,
9E90751E2A269BE300269308 /* Assets.xcassets in Resources */,
9E599F322C3EEEF3000E4997 /* PartnerKeys.plist in Resources */,
9E6C98492BF4C65F00EACDCB /* whatsNew.json in Resources */,
9E5CFD102CE61B7200C95713 /* sending.json in Resources */,
0D3B01EC298DAF89007EBCDA /* GoogleService-Info.plist in Resources */,
9E5CFD162CE6215500C95713 /* sending-dark.json in Resources */,
9EDDAF6D2BA2D71700A69A07 /* PrivacyInfo.xcprivacy in Resources */,
9E5AAEC02A67CEC4003F283D /* Colors.xcassets in Resources */,
);
@ -1052,12 +1061,13 @@
files = (
9E41FFAF2CB2814500783CFD /* Preview Assets.xcassets in Resources */,
9E41FFB02CB2814500783CFD /* LaunchScreen.storyboard in Resources */,
9EBAAAC12CD14919005B026F /* sending.json in Resources */,
9E89DF702CD27344002E5317 /* whatsNew_es.json in Resources */,
9E41FFB12CB2814500783CFD /* Assets.xcassets in Resources */,
9E41FFB22CB2814500783CFD /* PartnerKeys.plist in Resources */,
9E41FFB32CB2814500783CFD /* whatsNew.json in Resources */,
9E5CFD122CE61B7200C95713 /* sending.json in Resources */,
9E41FFB42CB2814500783CFD /* GoogleService-Info.plist in Resources */,
9E5CFD152CE6215500C95713 /* sending-dark.json in Resources */,
9E41FFB52CB2814500783CFD /* PrivacyInfo.xcprivacy in Resources */,
9E41FFB62CB2814500783CFD /* Colors.xcassets in Resources */,
);
@ -1069,12 +1079,13 @@
files = (
9E4AB2AF2BA1BEE900F5D6DB /* Preview Assets.xcassets in Resources */,
9E4AB2B02BA1BEE900F5D6DB /* LaunchScreen.storyboard in Resources */,
9EBAAAC02CD14919005B026F /* sending.json in Resources */,
9E89DF712CD27344002E5317 /* whatsNew_es.json in Resources */,
9E4AB2B12BA1BEE900F5D6DB /* Assets.xcassets in Resources */,
9E599F342C3EEEF3000E4997 /* PartnerKeys.plist in Resources */,
9E6C984B2BF4C65F00EACDCB /* whatsNew.json in Resources */,
9E5CFD112CE61B7200C95713 /* sending.json in Resources */,
9E4AB2B22BA1BEE900F5D6DB /* GoogleService-Info.plist in Resources */,
9E5CFD192CE6215500C95713 /* sending-dark.json in Resources */,
9EDDAF6F2BA2D71700A69A07 /* PrivacyInfo.xcprivacy in Resources */,
9E4AB2B32BA1BEE900F5D6DB /* Colors.xcassets in Resources */,
);
@ -1086,12 +1097,13 @@
files = (
9E5AB4762C94777800065483 /* Preview Assets.xcassets in Resources */,
9E5AB4772C94777800065483 /* LaunchScreen.storyboard in Resources */,
9EBAAABF2CD14919005B026F /* sending.json in Resources */,
9E89DF722CD27344002E5317 /* whatsNew_es.json in Resources */,
9E5AB4782C94777800065483 /* Assets.xcassets in Resources */,
9E5AB4792C94777800065483 /* PartnerKeys.plist in Resources */,
9E5AB47A2C94777800065483 /* whatsNew.json in Resources */,
9E5CFD0F2CE61B7200C95713 /* sending.json in Resources */,
9E5AB47B2C94777800065483 /* GoogleService-Info.plist in Resources */,
9E5CFD172CE6215500C95713 /* sending-dark.json in Resources */,
9E5AB47C2C94777800065483 /* PrivacyInfo.xcprivacy in Resources */,
9E5AB47D2C94777800065483 /* Colors.xcassets in Resources */,
);
@ -2482,7 +2494,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "zashi-internal.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
DEVELOPMENT_TEAM = RLPRR8CPQG;
@ -2495,7 +2507,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.4.4;
MARKETING_VERSION = 0.4.5;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "co.electriccoin.secant-testnet";
PRODUCT_NAME = "$(TARGET_NAME)";
@ -2513,7 +2525,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "zashi-internal.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
DEVELOPMENT_TEAM = RLPRR8CPQG;
ENABLE_BITCODE = NO;
@ -2525,7 +2537,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.4.4;
MARKETING_VERSION = 0.4.5;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "co.electriccoin.secant-testnet";
PRODUCT_NAME = "$(TARGET_NAME)";
@ -2543,7 +2555,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "zashi-internal.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
DEVELOPMENT_TEAM = RLPRR8CPQG;
ENABLE_BITCODE = NO;
@ -2555,7 +2567,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.4.4;
MARKETING_VERSION = 0.4.5;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "co.electriccoin.secant-testnet";
PRODUCT_NAME = "$(TARGET_NAME)";

36
secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -311,8 +311,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-types",
"state" : {
"revision" : "ae67c8178eb46944fd85e4dc6dd970e1f3ed6ccd",
"version" : "1.3.0"
"revision" : "ef18d829e8b92d731ad27bb81583edd2094d1ce3",
"version" : "1.3.1"
}
},
{
@ -347,8 +347,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio.git",
"state" : {
"revision" : "665206000b8307cab5ac51203d29b0f232d7e31b",
"version" : "2.74.0"
"revision" : "914081701062b11e3bb9e21accc379822621995e",
"version" : "2.76.1"
}
},
{
@ -356,8 +356,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-extras.git",
"state" : {
"revision" : "d1ead62745cc3269e482f1c51f27608057174379",
"version" : "1.24.0"
"revision" : "2e9746cfc57554f70b650b021b6ae4738abef3e6",
"version" : "1.24.1"
}
},
{
@ -374,8 +374,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
"revision" : "7b84abbdcef69cc3be6573ac12440220789dcd69",
"version" : "2.27.2"
"revision" : "c7e95421334b1068490b5d41314a50e70bab23d1",
"version" : "2.29.0"
}
},
{
@ -383,8 +383,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-transport-services.git",
"state" : {
"revision" : "dbace16f126fdcd80d58dc54526c561ca17327d7",
"version" : "1.22.0"
"revision" : "bbd5e63cf949b7db0c9edaf7a21e141c52afe214",
"version" : "1.23.0"
}
},
{
@ -428,8 +428,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system.git",
"state" : {
"revision" : "d2ba781702a1d8285419c15ee62fd734a9437ff5",
"version" : "1.3.2"
"revision" : "c8a44d836fe7913603e246acab7c528c2e780168",
"version" : "1.4.0"
}
},
{
@ -482,8 +482,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Electric-Coin-Company/zcash-light-client-ffi",
"state" : {
"revision" : "7029804dc30d33b689fb8da712c1172daf8e402e",
"version" : "0.10.2"
"branch" : "feature/note_management-preview",
"revision" : "641722dbc012e379654a84f6af105753ff3b7665"
}
},
{
@ -496,12 +496,12 @@
}
},
{
"identity" : "zcash-swift-wallet-sdk",
"identity" : "zcashlightclientkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk",
"location" : "https://github.com/LukasKorba/ZcashLightClientKit",
"state" : {
"revision" : "ce25f074b480d46d76c1fc20f0f0fe37d879a2c9",
"version" : "2.2.6"
"branch" : "note_management-preview",
"revision" : "280712fc17b921d26cd6ec7f3a076af627ea4709"
}
}
],

1
secant/Resources/Lotties/sending-dark.json Normal file
View File

File diff suppressed because one or more lines are too long

2
secant/Resources/Lotties/sending.json
View File

File diff suppressed because one or more lines are too long

12
secant/SecantApp.swift
View File

@ -96,11 +96,13 @@ extension SecantApp {
sendingScreen: true
)
#else
featureFlags = FeatureFlags(
appLaunchBiometric: true,
flexa: true,
sendingScreen: true
)
featureFlags = FeatureFlags()
// featureFlags = FeatureFlags(
// appLaunchBiometric: true,
// flexa: false,
// selectText: true,
// sendingScreen: true
// )
#endif
}
}