Skip to content
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

Jump to bottom

[PWN-9345] Fix Wallet screen state #1496

Merged
merged 1 commit into from
Jul 25, 2023
Merged

[PWN-9345] Fix Wallet screen state #1496

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
"version" : "2.3.1"
"revision" : "c22f76b709dc4bb6d274398259e75c191e50998a",
"version" : "2.3.0"
}
},
{
Expand Down Expand Up @@ -365,8 +365,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio.git",
"state" : {
"revision" : "5f542894dd8efbd766d8adf73ef2f947b0cd5e21",
"version" : "2.56.0"
"revision" : "324bc65a28323660fad8a36a7a37f0c2c78eeb9a",
"version" : "2.55.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion p2p_wallet/Scenes/Main/NewHome/HomeCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ final class HomeCoordinator: Coordinator<Void> {
let viewModel = HomeViewModel()
let homeView = HomeView(
viewModel: viewModel,
viewModelWithTokens: tokensViewModel!,
accountsViewModel: tokensViewModel!,
emptyViewModel: emptyViewModel
).asViewController() as! UIHostingControllerWithoutNavigation<HomeView>

Expand Down
10 changes: 3 additions & 7 deletions p2p_wallet/Scenes/Main/NewHome/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,17 @@ struct HomeView: View {
@StateObject var viewModel: HomeViewModel
@StateObject var globalAppState: GlobalAppState = .shared

let viewModelWithTokens: HomeAccountsViewModel
let accountsViewModel: HomeAccountsViewModel
let emptyViewModel: HomeEmptyViewModel

var body: some View {
ZStack {
switch viewModel.state {
case .pending:
HomeSkeletonView()
case .withTokens:
case .wallet:
navigation {
HomeAccountsView(viewModel: viewModelWithTokens)
}
case .empty:
navigation {
HomeEmptyView(viewModel: emptyViewModel)
HomeAccountsView(viewModel: accountsViewModel)
}
}

Expand Down
9 changes: 2 additions & 7 deletions p2p_wallet/Scenes/Main/NewHome/HomeViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@ private extension HomeViewModel {
partialResult = partialResult + account.amountInFiatDouble
}

let hasAnyTokenWithPositiveBalance =
solanaState.value.contains(where: { account in (account.lamports ?? 0) > 0 }) ||
ethereumState.value.contains(where: { account in account.balance > 0 })

// TODO: Bad place
self.updateAddressIfNeeded()

Expand All @@ -183,7 +179,7 @@ private extension HomeViewModel {
case .initializing:
self.state = .pending
default:
self.state = hasAnyTokenWithPositiveBalance ? .withTokens : .empty
self.state = .wallet

// log
self.analyticsManager.log(parameter: .userHasPositiveBalance(solanaTotalBalance > 0))
Expand All @@ -208,8 +204,7 @@ private extension HomeViewModel {
extension HomeViewModel {
enum State {
case pending
case withTokens
case empty
case wallet
}
}

Expand Down
Loading