Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Fix/14950 Update homescreen when app becomes active #5096

Merged
merged 8 commits into from
Mar 16, 2023
Merged

Fix/14950 Update homescreen when app becomes active #5096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e63ff56
update homescreen when app becomes active
30mar Mar 15, 2023
f105387
fix tests
30mar Mar 15, 2023
21c9ef6
Merge branch 'release/ramp-down.x' into fix/14950-Home-screen-is-not-…
30mar Mar 16, 2023
5c62ae5
Update src/xcode/ENA/ENA/Source/Scenes/Home/HomeTableViewController.s…
30mar Mar 16, 2023
6cd1e14
Update src/xcode/ENA/ENA/Source/Scenes/Home/HomeTableViewController.s…
30mar Mar 16, 2023
310ceb5
reverse changes
30mar Mar 16, 2023
d8daeb4
Merge branch 'fix/14950-Home-screen-is-not-actualized-in-background-a…
30mar Mar 16, 2023
eca495e
Merge branch 'release/ramp-down.x' into fix/14950-Home-screen-is-not-…
30mar Mar 16, 2023
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
17 changes: 7 additions & 10 deletions src/xcode/ENA/ENA/Source/Scenes/Home/HomeTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,24 +106,16 @@ class HomeTableViewController: UITableViewController, NavigationBarOpacityDelega
viewModel.cclService.shouldShowNoticeTile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this deletion we would ignore the CCL config for App Closure Notice. I know it makes sense, because we show either the notice or the thank-you tile. But is it aligned with the Tech Spec?

.receive(on: DispatchQueue.OCombine(.main))
.sink { [weak self] shouldShowNoticeTile in
let isHibernationState = CWAHibernationProvider.shared.isHibernationState
self?.viewModel.isHibernationState = isHibernationState
self?.viewModel.shouldShowAppClosureNotice = shouldShowNoticeTile
self?.tableView.reloadSections(
[
HomeTableViewModel.Section.appClosureNotice.rawValue,
HomeTableViewModel.Section.endOfLifeThankYou.rawValue,
HomeTableViewModel.Section.exposureLogging.rawValue,
HomeTableViewModel.Section.riskAndTestResults.rawValue,
HomeTableViewModel.Section.statistics.rawValue,
HomeTableViewModel.Section.testRegistration.rawValue,
HomeTableViewModel.Section.traceLocations.rawValue,
HomeTableViewModel.Section.moreInfo.rawValue
HomeTableViewModel.Section.appClosureNotice.rawValue
],
with: .none
)
}
.store(in: &subscriptions)

}

@available(*, unavailable)
Expand Down Expand Up @@ -1134,6 +1126,11 @@ class HomeTableViewController: UITableViewController, NavigationBarOpacityDelega
@objc
private func onDidBecomeActiveNotification() {
setupRightBarButtonItem()

viewModel.isHibernationState = CWAHibernationProvider.shared.isHibernationState
DispatchQueue.main.async { [weak self] in
self?.tableView.reloadData()
}
}

// swiftlint:disable:next file_length
Expand Down
1 change: 0 additions & 1 deletion src/xcode/ENA/ENA/Source/Scenes/Home/__tests__/HomeTableViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ class HomeTableViewModelTests: CWATestCase {
// Is hibernation and should show app closure notice
sut.isHibernationState = true
sut.shouldShowAppClosureNotice = true

// THEN

// Number of Sections
Expand Down