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

[#592] Add export logs to debug menu (#621) 

Closes #592

- Export logs feature moved to separate reducer - `ExportLogsReducer`.
- New reducer is used in debug screen and in settings.
This commit is contained in:
Michal Fousek 2023-03-07 14:01:22 +01:00 committed by GitHub
parent b7baaf16aa
commit 082e058055
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 226 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
secant.xcodeproj/project.pbxproj
View File

@ -151,7 +151,6 @@
0D26AF27299E8196005260EE /* WalletStorageInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EB863982923935B003D0F8B /* WalletStorageInterface.swift */; };
0D26AF28299E8196005260EE /* StandardButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66DC733E271D88CC0053CBB6 /* StandardButtonStyle.swift */; };
0D26AF2A299E8196005260EE /* ActiveButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 663FAB9B271D874D00E495F8 /* ActiveButton.swift */; };
0D26AF2B299E8196005260EE /* UIShareDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E612C6E2987A9B100D09B09 /* UIShareDialog.swift */; };
0D26AF2C299E8196005260EE /* DatabaseFilesLiveKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EBDF952291E5E86000A1A05 /* DatabaseFilesLiveKey.swift */; };
0D26AF2D299E8196005260EE /* DebugMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E2F1C832809B606004E65FE /* DebugMenu.swift */; };
0D26AF2E299E8196005260EE /* MnemonicInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E153A5E2920CD5100112F41 /* MnemonicInterface.swift */; };
@ -324,6 +323,10 @@
34BF09092927C98000222134 /* Memo+toString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34BF09082927C98000222134 /* Memo+toString.swift */; };
34C4329029B62D8D00F74045 /* L10n.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C4328F29B62D8D00F74045 /* L10n.swift */; };
34C4329129B62D8D00F74045 /* L10n.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C4328F29B62D8D00F74045 /* L10n.swift */; };
34C5658229B60C1C002F3A7C /* UIShareDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5658129B60C1C002F3A7C /* UIShareDialog.swift */; };
34C5658329B60C1C002F3A7C /* UIShareDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5658129B60C1C002F3A7C /* UIShareDialog.swift */; };
34C5658529B60C8B002F3A7C /* ExportLogsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5658429B60C8B002F3A7C /* ExportLogsStore.swift */; };
34C5658629B60C8B002F3A7C /* ExportLogsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34C5658429B60C8B002F3A7C /* ExportLogsStore.swift */; };
34DA414728E4385800F8CC61 /* TransactionSendingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34DA414628E4385800F8CC61 /* TransactionSendingView.swift */; };
34DA414928E439CD00F8CC61 /* sendingTransaction.json in Resources */ = {isa = PBXBuildFile; fileRef = 34DA414828E439CD00F8CC61 /* sendingTransaction.json */; };
34E0AF1128DEE5220034CF37 /* Wedge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E0AF1028DEE5220034CF37 /* Wedge.swift */; };
@ -397,7 +400,6 @@
9E5BF648282277BE00BA3F17 /* NotificationCenterInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E5BF647282277BE00BA3F17 /* NotificationCenterInterface.swift */; };
9E5BF64F2823E94900BA3F17 /* TransactionAddressTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E5BF64D2823E94900BA3F17 /* TransactionAddressTextField.swift */; };
9E5BF6502823E94900BA3F17 /* TransactionAddressTextFieldStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E5BF64E2823E94900BA3F17 /* TransactionAddressTextFieldStore.swift */; };
9E612C6F2987A9B100D09B09 /* UIShareDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E612C6E2987A9B100D09B09 /* UIShareDialog.swift */; };
9E612C7229880E9200D09B09 /* LogsHandlerInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E612C7129880E9200D09B09 /* LogsHandlerInterface.swift */; };
9E612C7429880F2200D09B09 /* LogsHandlerLive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E612C7329880F2200D09B09 /* LogsHandlerLive.swift */; };
9E612C7629880FC900D09B09 /* LogsHandlerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E612C7529880FC900D09B09 /* LogsHandlerTest.swift */; };
@ -650,6 +652,8 @@
346D41E328DF0B8600963F36 /* CheckCircle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckCircle.swift; sourceTree = "<group>"; };
34BF09082927C98000222134 /* Memo+toString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Memo+toString.swift"; sourceTree = "<group>"; };
34C4328F29B62D8D00F74045 /* L10n.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = L10n.swift; sourceTree = "<group>"; };
34C5658129B60C1C002F3A7C /* UIShareDialog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIShareDialog.swift; sourceTree = "<group>"; };
34C5658429B60C8B002F3A7C /* ExportLogsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportLogsStore.swift; sourceTree = "<group>"; };
34DA414628E4385800F8CC61 /* TransactionSendingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionSendingView.swift; sourceTree = "<group>"; };
34DA414828E439CD00F8CC61 /* sendingTransaction.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = sendingTransaction.json; sourceTree = "<group>"; };
34E0AF1028DEE5220034CF37 /* Wedge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Wedge.swift; sourceTree = "<group>"; };
@ -716,7 +720,6 @@
9E5BF647282277BE00BA3F17 /* NotificationCenterInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationCenterInterface.swift; sourceTree = "<group>"; };
9E5BF64D2823E94900BA3F17 /* TransactionAddressTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionAddressTextField.swift; sourceTree = "<group>"; };
9E5BF64E2823E94900BA3F17 /* TransactionAddressTextFieldStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionAddressTextFieldStore.swift; sourceTree = "<group>"; };
9E612C6E2987A9B100D09B09 /* UIShareDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIShareDialog.swift; sourceTree = "<group>"; };
9E612C7129880E9200D09B09 /* LogsHandlerInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogsHandlerInterface.swift; sourceTree = "<group>"; };
9E612C7329880F2200D09B09 /* LogsHandlerLive.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogsHandlerLive.swift; sourceTree = "<group>"; };
9E612C7529880FC900D09B09 /* LogsHandlerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogsHandlerTest.swift; sourceTree = "<group>"; };
@ -1189,6 +1192,23 @@
path = CheckCircle;
sourceTree = "<group>";
};
34C5657F29B60BDF002F3A7C /* ExportLogs */ = {
isa = PBXGroup;
children = (
34C5658429B60C8B002F3A7C /* ExportLogsStore.swift */,
34C5658029B60C1C002F3A7C /* UIKitBridge */,
);
path = ExportLogs;
sourceTree = "<group>";
};
34C5658029B60C1C002F3A7C /* UIKitBridge */ = {
isa = PBXGroup;
children = (
34C5658129B60C1C002F3A7C /* UIShareDialog.swift */,
);
path = UIKitBridge;
sourceTree = "<group>";
};
34F039B129ABCE8500CF0053 /* WalletConfigProviderTests */ = {
isa = PBXGroup;
children = (
@ -1223,6 +1243,7 @@
children = (
9E7CB61B2874140900A02233 /* AddressDetails */,
9E6713F2289BC51200A6796F /* BalanceBreakdown */,
34C5657F29B60BDF002F3A7C /* ExportLogs */,
F93874EC273C4DE200F0E875 /* Home */,
9E2DF99727CF704D00649636 /* ImportWallet */,
3448CB3028E4764E006ADEDB /* NotEnoughFreeSpace */,
@ -1457,7 +1478,6 @@
isa = PBXGroup;
children = (
346731A129AE3A5100974482 /* UIMailDialog.swift */,
9E612C6E2987A9B100D09B09 /* UIShareDialog.swift */,
);
path = UIKitBridge;
sourceTree = "<group>";
@ -2603,6 +2623,7 @@
0D26AEE4299E8196005260EE /* CurrencySelectionView.swift in Sources */,
0D26AEE5299E8196005260EE /* RecoveryPhraseRandomizerTestKey.swift in Sources */,
0D26AEE7299E8196005260EE /* TransactionAddressTextFieldStore.swift in Sources */,
34C5658629B60C8B002F3A7C /* ExportLogsStore.swift in Sources */,
0D26AEE8299E8196005260EE /* NumberFormatterInterface.swift in Sources */,
0D26AEE9299E8196005260EE /* WithStateBinding.swift in Sources */,
0D26AEEA299E8196005260EE /* Date+Readable.swift in Sources */,
@ -2628,6 +2649,7 @@
0D26AEFE299E8196005260EE /* NavigationLinks.swift in Sources */,
0D26AEFF299E8196005260EE /* SandboxView.swift in Sources */,
0D26AF00299E8196005260EE /* View+WhenDraggable.swift in Sources */,
34C5658329B60C1C002F3A7C /* UIShareDialog.swift in Sources */,
0D26AF01299E8196005260EE /* RecoveryPhraseDisplayView.swift in Sources */,
0D26AF02299E8196005260EE /* URIParser.swift in Sources */,
0D26AF03299E8196005260EE /* URIParserLive.swift in Sources */,
@ -2670,7 +2692,6 @@
0D26AF27299E8196005260EE /* WalletStorageInterface.swift in Sources */,
0D26AF28299E8196005260EE /* StandardButtonStyle.swift in Sources */,
0D26AF2A299E8196005260EE /* ActiveButton.swift in Sources */,
0D26AF2B299E8196005260EE /* UIShareDialog.swift in Sources */,
0D26AF2C299E8196005260EE /* DatabaseFilesLiveKey.swift in Sources */,
0D26AF2D299E8196005260EE /* DebugMenu.swift in Sources */,
0D26AF2E299E8196005260EE /* MnemonicInterface.swift in Sources */,
@ -2824,6 +2845,7 @@
2E8719CD27FB0D3B0082C926 /* CurrencySelectionView.swift in Sources */,
9EB863A729239DCB003D0F8B /* RecoveryPhraseRandomizerTestKey.swift in Sources */,
9E5BF6502823E94900BA3F17 /* TransactionAddressTextFieldStore.swift in Sources */,
34C5658529B60C8B002F3A7C /* ExportLogsStore.swift in Sources */,
9EB863932922D036003D0F8B /* NumberFormatterInterface.swift in Sources */,
F9EEB8162742C2210032EEB8 /* WithStateBinding.swift in Sources */,
9E7FE0D3282D274E00C374E8 /* Date+Readable.swift in Sources */,
@ -2849,6 +2871,7 @@
F9322DC0273B555C00C105B5 /* NavigationLinks.swift in Sources */,
9EAFEB8F2808183D00199FC9 /* SandboxView.swift in Sources */,
0D7CE63427349B5D0020E050 /* View+WhenDraggable.swift in Sources */,
34C5658229B60C1C002F3A7C /* UIShareDialog.swift in Sources */,
0D3D04082728B3440032ABC1 /* RecoveryPhraseDisplayView.swift in Sources */,
9EB863A2292398A8003D0F8B /* URIParser.swift in Sources */,
9EB863C12923C779003D0F8B /* URIParserLive.swift in Sources */,
@ -2891,7 +2914,6 @@
9EB8639B2923935B003D0F8B /* WalletStorageInterface.swift in Sources */,
66DC733F271D88CC0053CBB6 /* StandardButtonStyle.swift in Sources */,
663FAB9C271D874D00E495F8 /* ActiveButton.swift in Sources */,
9E612C6F2987A9B100D09B09 /* UIShareDialog.swift in Sources */,
9EBDF956291E5E86000A1A05 /* DatabaseFilesLiveKey.swift in Sources */,
9E2F1C842809B606004E65FE /* DebugMenu.swift in Sources */,
9E153A5F2920CE2700112F41 /* MnemonicInterface.swift in Sources */,

104
secant/Features/ExportLogs/ExportLogsStore.swift Normal file
View File

@ -0,0 +1,104 @@
//
// ExportLogsStore.swift
// secant
//
// Created by Michal Fousek on 06.03.2023.
//
import Combine
import ComposableArchitecture
import Foundation
import ZcashLightClientKit
typealias ExportLogsStore = Store<ExportLogsReducer.State, ExportLogsReducer.Action>
typealias ExportLogsViewStore = ViewStore<ExportLogsReducer.State, ExportLogsReducer.Action>
struct ExportLogsReducer: ReducerProtocol {
struct State: Equatable {
@BindingState var alert: AlertState<ExportLogsReducer.Action>?
var exportLogsDisabled = false
var isSharingLogs = false
var tempSDKDir: URL {
let tempDir = FileManager.default.temporaryDirectory
let sdkFileName = "sdkLogs.txt"
return tempDir.appendingPathComponent(sdkFileName)
}
var tempTCADir: URL {
let tempDir = FileManager.default.temporaryDirectory
let sdkFileName = "tcaLogs.txt"
return tempDir.appendingPathComponent(sdkFileName)
}
var tempWalletDir: URL {
let tempDir = FileManager.default.temporaryDirectory
let sdkFileName = "walletLogs.txt"
return tempDir.appendingPathComponent(sdkFileName)
}
}
indirect enum Action: Equatable, BindableAction {
case binding(BindingAction<ExportLogsReducer.State>)
case dismissAlert
case start
case finished
case failed(String)
case shareFinished
}
@Dependency(\.logsHandler) var logsHandler
var body: some ReducerProtocol<State, Action> {
BindingReducer()
Reduce { state, action in
switch action {
case .binding:
return .none
case .dismissAlert:
state.exportLogsDisabled = false
state.isSharingLogs = false
state.alert = nil
return .none
case .start:
state.exportLogsDisabled = true
return .run { [state] send in
do {
try await logsHandler.exportAndStoreLogs(state.tempSDKDir, state.tempTCADir, state.tempWalletDir)
await send(.finished)
} catch {
await send(.failed(error.localizedDescription))
}
}
case .finished:
state.exportLogsDisabled = false
state.isSharingLogs = true
return .none
case let .failed(errorDescription):
// TODO: [#527] address the error here https://github.com/zcash/secant-ios-wallet/issues/527
state.alert = AlertState(
title: TextState("Error when exporting logs"),
message: TextState("Error: \(errorDescription)"),
dismissButton: .default(TextState("Ok"), action: .send(.dismissAlert))
)
return .none
case .shareFinished:
state.isSharingLogs = false
return .none
}
}
}
}
// MARK: Placeholders
extension ExportLogsReducer.State {
static var placeholder: Self {
.init()
}
}

0
secant/Features/Settings/UIKitBridge/UIShareDialog.swift → secant/Features/ExportLogs/UIKitBridge/UIShareDialog.swift
View File

2
secant/Features/Root/RootDestination.swift
View File

@ -135,7 +135,7 @@ extension RootReducer {
return .none
case .home, .initialization, .onboarding, .phraseDisplay, .phraseValidation, .sandbox, .updateStateAfterConfigUpdate,
.welcome, .binding, .nukeWalletFailed, .nukeWalletSucceeded, .debug, .walletConfigLoaded, .dismissAlert:
.welcome, .binding, .nukeWalletFailed, .nukeWalletSucceeded, .debug, .walletConfigLoaded, .dismissAlert, .exportLogs:
return .none
}

2
secant/Features/Root/RootInitialization.swift
View File

@ -319,7 +319,7 @@ extension RootReducer {
return .none
case .home, .destination, .onboarding, .phraseDisplay, .phraseValidation, .sandbox,
.welcome, .binding, .debug:
.welcome, .binding, .debug, .exportLogs:
return .none
}
}

7
secant/Features/Root/RootStore.swift
View File

@ -14,6 +14,7 @@ struct RootReducer: ReducerProtocol {
var appInitializationState: InitializationState = .uninitialized
var debugState: DebugState
var destinationState: DestinationState
var exportLogsState: ExportLogsReducer.State
var homeState: HomeReducer.State
var onboardingState: OnboardingFlowReducer.State
var phraseValidationState: RecoveryPhraseValidationFlowReducer.State
@ -29,6 +30,7 @@ struct RootReducer: ReducerProtocol {
case debug(DebugAction)
case dismissAlert
case destination(DestinationAction)
case exportLogs(ExportLogsReducer.Action)
case home(HomeReducer.Action)
case initialization(InitializationAction)
case nukeWalletFailed
@ -62,6 +64,10 @@ struct RootReducer: ReducerProtocol {
HomeReducer()
}
Scope(state: \.exportLogsState, action: /Action.exportLogs) {
ExportLogsReducer()
}
Scope(state: \.onboardingState, action: /Action.onboarding) {
OnboardingFlowReducer()
}
@ -178,6 +184,7 @@ extension RootReducer.State {
.init(
debugState: .placeholder,
destinationState: .placeholder,
exportLogsState: .placeholder,
homeState: .placeholder,
onboardingState: .init(
walletConfig: .default,

33
secant/Features/Root/RootView.swift
View File

@ -80,6 +80,8 @@ struct RootView: View {
}
.onOpenURL(perform: { viewStore.goToDeeplink($0) })
.alert(self.store.scope(state: \.alert), dismiss: .dismissAlert)
shareLogsView(viewStore)
}
}
}
@ -99,6 +101,25 @@ private struct FeatureFlagWrapper: Identifiable, Equatable, Comparable {
}
private extension RootView {
@ViewBuilder func shareLogsView(_ viewStore: RootViewStore) -> some View {
if viewStore.exportLogsState.isSharingLogs {
UIShareDialogView(
activityItems: [
viewStore.exportLogsState.tempSDKDir,
viewStore.exportLogsState.tempWalletDir,
viewStore.exportLogsState.tempTCADir
]
) {
viewStore.send(.exportLogs(.shareFinished))
}
// UIShareDialogView only wraps UIActivityViewController presentation
// so frame is set to 0 to not break SwiftUIs layout
.frame(width: 0, height: 0)
} else {
EmptyView()
}
}
@ViewBuilder func debugView(_ viewStore: RootViewStore) -> some View {
VStack(alignment: .leading) {
if viewStore.destinationState.previousDestination == .home {
@ -132,6 +153,11 @@ private extension RootView {
viewStore.send(.debug(.testCrashReporter))
}
Button("Export logs") {
viewStore.send(.exportLogs(.start))
}
.disabled(viewStore.exportLogsState.exportLogsDisabled)
Button("Rescan Blockchain") {
viewStore.send(.debug(.rescanBlockchain))
}
@ -166,6 +192,13 @@ private extension RootView {
}
}
.alert(self.store.scope(state: \.destinationState.alert), dismiss: .destination(.dismissAlert))
.alert(
self.store.scope(
state: \.exportLogsState.alert,
action: { (_: ExportLogsReducer.Action) in return .exportLogs(.dismissAlert) }
),
dismiss: .dismissAlert
)
.confirmationDialog(
store.scope(state: \.debugState.rescanDialog),
dismiss: .debug(.cancelRescan)

57
secant/Features/Settings/SettingsStore.swift
View File

@ -13,29 +13,10 @@ struct SettingsReducer: ReducerProtocol {
@BindingState var alert: AlertState<SettingsReducer.Action>?
var destination: Destination?
var exportLogsDisabled = false
var exportLogsState: ExportLogsReducer.State
@BindingState var isCrashReportingOn: Bool
var isSharingLogs = false
var phraseDisplayState: RecoveryPhraseDisplayReducer.State
var supportData: SupportData?
var tempSDKDir: URL {
let tempDir = FileManager.default.temporaryDirectory
let sdkFileName = "sdkLogs.txt"
return tempDir.appendingPathComponent(sdkFileName)
}
var tempTCADir: URL {
let tempDir = FileManager.default.temporaryDirectory
let sdkFileName = "tcaLogs.txt"
return tempDir.appendingPathComponent(sdkFileName)
}
var tempWalletDir: URL {
let tempDir = FileManager.default.temporaryDirectory
let sdkFileName = "walletLogs.txt"
return tempDir.appendingPathComponent(sdkFileName)
}
}
enum Action: BindableAction, Equatable {
@ -43,10 +24,7 @@ struct SettingsReducer: ReducerProtocol {
case backupWalletAccessRequest
case binding(BindingAction<SettingsReducer.State>)
case dismissAlert
case exportLogs
case logsExported
case logsExportFailed(String)
case logsShareFinished
case exportLogs(ExportLogsReducer.Action)
case onAppear
case phraseDisplay(RecoveryPhraseDisplayReducer.Action)
case sendSupportMail
@ -108,32 +86,6 @@ struct SettingsReducer: ReducerProtocol {
return .none
case .exportLogs:
state.exportLogsDisabled = true
return .run { [state] send in
do {
try await logsHandler.exportAndStoreLogs(state.tempSDKDir, state.tempTCADir, state.tempWalletDir)
await send(.logsExported)
} catch {
await send(.logsExportFailed(error.localizedDescription))
}
}
case .logsExported:
state.exportLogsDisabled = false
state.isSharingLogs = true
return .none
case let .logsExportFailed(errorDescription):
// TODO: [#527] address the error here https://github.com/zcash/secant-ios-wallet/issues/527
state.alert = AlertState(
title: TextState("Error when exporting logs"),
message: TextState("Error: \(errorDescription)"),
dismissButton: .default(TextState("Ok"), action: .send(.dismissAlert))
)
return .none
case .logsShareFinished:
state.isSharingLogs = false
return .none
case .phraseDisplay:
@ -172,6 +124,10 @@ struct SettingsReducer: ReducerProtocol {
Scope(state: \.phraseDisplayState, action: /Action.phraseDisplay) {
RecoveryPhraseDisplayReducer()
}
Scope(state: \.exportLogsState, action: /Action.exportLogs) {
ExportLogsReducer()
}
}
}
@ -208,6 +164,7 @@ extension SettingsStore {
extension SettingsReducer.State {
static let placeholder = SettingsReducer.State(
exportLogsState: .placeholder,
isCrashReportingOn: true,
phraseDisplayState: RecoveryPhraseDisplayReducer.State(
phrase: .placeholder

45
secant/Features/Settings/SettingsView.swift
View File

@ -19,9 +19,9 @@ struct SettingsView: View {
.frame(height: 50)
Button(
action: { viewStore.send(.exportLogs) },
action: { viewStore.send(.exportLogs(.start)) },
label: {
if viewStore.exportLogsDisabled {
if viewStore.exportLogsState.exportLogsDisabled {
HStack {
ProgressView()
Text(L10n.Settings.exporting)
@ -33,7 +33,7 @@ struct SettingsView: View {
)
.activeButtonStyle
.frame(height: 50)
.disabled(viewStore.exportLogsDisabled)
.disabled(viewStore.exportLogsState.exportLogsDisabled)
Button(
action: { viewStore.send(.sendSupportMail) },
@ -55,17 +55,15 @@ struct SettingsView: View {
)
.onAppear { viewStore.send(.onAppear) }
.alert(self.store.scope(state: \.alert), dismiss: .dismissAlert)
if viewStore.isSharingLogs {
UIShareDialogView(
activityItems: [viewStore.tempSDKDir, viewStore.tempWalletDir, viewStore.tempTCADir]
) {
viewStore.send(.logsShareFinished)
}
// UIShareDialogView only wraps UIActivityViewController presentation
// so frame is set to 0 to not break SwiftUIs layout
.frame(width: 0, height: 0)
}
.alert(
self.store.scope(
state: \.exportLogsState.alert,
action: { (_: ExportLogsReducer.Action) in return .exportLogs(.dismissAlert) }
),
dismiss: .dismissAlert
)
shareLogsView(viewStore)
if let supportData = viewStore.supportData {
UIMailDialogView(
@ -80,6 +78,25 @@ struct SettingsView: View {
}
}
}
@ViewBuilder func shareLogsView(_ viewStore: SettingsViewStore) -> some View {
if viewStore.exportLogsState.isSharingLogs {
UIShareDialogView(
activityItems: [
viewStore.exportLogsState.tempSDKDir,
viewStore.exportLogsState.tempWalletDir,
viewStore.exportLogsState.tempTCADir
]
) {
viewStore.send(.exportLogs(.shareFinished))
}
// UIShareDialogView only wraps UIActivityViewController presentation
// so frame is set to 0 to not break SwiftUIs layout
.frame(width: 0, height: 0)
} else {
EmptyView()
}
}
}
// MARK: - Previews

1
secantTests/RecoveryPhraseValidationTests/RecoveryPhraseValidationFlowFeatureFlagTests.swift
View File

@ -163,6 +163,7 @@ class RecoveryPhraseValidationFlowFeatureFlagTests: XCTestCase {
let appState = RootReducer.State(
debugState: .placeholder,
destinationState: .placeholder,
exportLogsState: .placeholder,
homeState: .placeholder,
onboardingState: .init(
walletConfig: .default,

1
secantTests/RootTests/AppInitializationTests.swift
View File

@ -70,6 +70,7 @@ class AppInitializationTests: XCTestCase {
let appState = RootReducer.State(
debugState: .placeholder,
destinationState: .placeholder,
exportLogsState: .placeholder,
homeState: .placeholder,
onboardingState: .init(
walletConfig: .default,

20
secantTests/SettingsTests/SettingsTests.swift
View File

@ -46,6 +46,7 @@ class SettingsTests: XCTestCase {
let store = TestStore(
initialState: SettingsReducer.State(
exportLogsState: .placeholder,
isCrashReportingOn: false,
phraseDisplayState: RecoveryPhraseDisplayReducer.State(phrase: nil)
),
@ -84,6 +85,7 @@ class SettingsTests: XCTestCase {
let store = TestStore(
initialState: SettingsReducer.State(
destination: nil,
exportLogsState: .placeholder,
isCrashReportingOn: false,
phraseDisplayState: .init()
),
@ -92,13 +94,13 @@ class SettingsTests: XCTestCase {
store.dependencies.logsHandler = LogsHandlerClient(exportAndStoreLogs: { _, _, _ in })
await store.send(.exportLogs) { state in
state.exportLogsDisabled = true
await store.send(.exportLogs(.start)) { state in
state.exportLogsState.exportLogsDisabled = true
}
await store.receive(.logsExported) { state in
state.exportLogsDisabled = false
state.isSharingLogs = true
await store.receive(.exportLogs(.finished)) { state in
state.exportLogsState.exportLogsDisabled = false
state.exportLogsState.isSharingLogs = true
}
}
@ -106,15 +108,17 @@ class SettingsTests: XCTestCase {
let store = TestStore(
initialState: SettingsReducer.State(
destination: nil,
exportLogsState: ExportLogsReducer.State(
isSharingLogs: true
),
isCrashReportingOn: false,
isSharingLogs: true,
phraseDisplayState: .init()
),
reducer: SettingsReducer()
)
await store.send(.logsShareFinished) { state in
state.isSharingLogs = false
await store.send(.exportLogs(.shareFinished)) { state in
state.exportLogsState.isSharingLogs = false
}
}
}