remove loading screen in navigation stack when display name screen shows

pull/891/head
Ryan Zhao 2 years ago
parent 1231de2caa
commit 8eb12b7bdc

@ -79,8 +79,10 @@ struct LoadingView: View {
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sinkUntilComplete( .sinkUntilComplete(
receiveValue: { displayName in receiveValue: { displayName in
if displayName?.isEmpty == false {
finishLoading(success: true) finishLoading(success: true)
} }
}
) )
} }
@ -88,7 +90,11 @@ struct LoadingView: View {
guard success else { guard success else {
let viewController: SessionHostingViewController = SessionHostingViewController(rootView: DisplayNameView(flow: flow)) let viewController: SessionHostingViewController = SessionHostingViewController(rootView: DisplayNameView(flow: flow))
viewController.setUpNavBarSessionIcon() viewController.setUpNavBarSessionIcon()
self.host.controller?.navigationController?.pushViewController(viewController, animated: true) if let navigationController = self.host.controller?.navigationController {
let index = navigationController.viewControllers.count - 1
navigationController.pushViewController(viewController, animated: true)
navigationController.viewControllers.remove(at: index)
}
return return
} }
self.animationTimer?.invalidate() self.animationTimer?.invalidate()

Loading…
Cancel
Save