Skip to content

Commit 268d923

Browse files
committed
fix: added code review suggestions
1 parent d185b24 commit 268d923

File tree

2 files changed

+12
-38
lines changed

2 files changed

+12
-38
lines changed

BDKSwiftExampleWallet/View/Home/ActivityHomeHeaderView.swift

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct ActivityHomeHeaderView: View {
2323
Spacer()
2424

2525
HStack {
26-
if case let .fullSyncing(inspectedScripts) = state {
26+
if needsFullScan {
2727
Text("\(inspectedScripts)")
2828
.padding(.trailing, -5.0)
2929
.fontWeight(.semibold)
@@ -34,8 +34,7 @@ struct ActivityHomeHeaderView: View {
3434
.font(.caption2)
3535
.fontWeight(.thin)
3636
.animation(.easeInOut, value: inspectedScripts)
37-
}
38-
if case let .syncing(progress, inspectedScripts, totalScripts) = state {
37+
} else if walletSyncState == .syncing {
3938
HStack {
4039
if progress < 1.0 {
4140
Text("\(inspectedScripts)")
@@ -72,15 +71,15 @@ struct ActivityHomeHeaderView: View {
7271
}
7372
HStack {
7473
HStack(spacing: 5) {
75-
state.syncImageIndicator
74+
self.syncImageIndicator()
7675
}
7776
.contentTransition(.symbolEffect(.replace.offUp))
7877

7978
}
8079
.foregroundStyle(.secondary)
8180
.font(.caption)
8281

83-
if case .synced = state {
82+
if walletSyncState == .synced {
8483
Button {
8584
self.showAllTransactions()
8685
} label: {
@@ -96,33 +95,30 @@ struct ActivityHomeHeaderView: View {
9695
}
9796
.fontWeight(.bold)
9897
}
99-
}
100-
101-
102-
fileprivate extension ActivityHomeHeaderView.State {
10398

104-
var syncImageIndicator: some View {
105-
switch self {
99+
@ViewBuilder
100+
private func syncImageIndicator() -> some View {
101+
switch walletSyncState {
106102
case .synced:
107-
return AnyView(
103+
AnyView(
108104
Image(systemName: "checkmark.circle.fill")
109105
.foregroundStyle(.green)
110106
)
111107

112-
case .syncing(_, _, _), .fullSyncing(_):
113-
return AnyView(
108+
case .syncing:
109+
AnyView(
114110
Image(systemName: "slowmo")
115111
.symbolEffect(
116112
.variableColor.cumulative
117113
)
118114
)
119115

120116
case .notStarted:
121-
return AnyView(
117+
AnyView(
122118
Image(systemName: "arrow.clockwise")
123119
)
124120
default:
125-
return AnyView(
121+
AnyView(
126122
Image(
127123
systemName: "person.crop.circle.badge.exclamationmark"
128124
)

BDKSwiftExampleWallet/View/WalletView.swift

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -185,28 +185,6 @@ struct WalletView: View {
185185
}
186186
}
187187

188-
fileprivate extension WalletViewModel {
189-
190-
var activityHeaderStateSync: ActivityHomeHeaderView.State {
191-
let walletSyncState = walletSyncState
192-
let needsFullScan = bdkClient.needsFullScan()
193-
194-
if needsFullScan {
195-
return .fullSyncing(inspectedScripts: inspectedScripts)
196-
} else if walletSyncState == .synced {
197-
return .synced
198-
} else if walletSyncState == .syncing {
199-
return .syncing(
200-
progress: progress,
201-
inspectedScripts: inspectedScripts,
202-
totalScripts: totalScripts
203-
)
204-
} else {
205-
return .notStarted
206-
}
207-
}
208-
}
209-
210188
#if DEBUG
211189
#Preview("WalletView - en") {
212190
WalletView(

0 commit comments

Comments
 (0)