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

NetP Design Review minus errors #1923

Merged
merged 29 commits into from
Aug 18, 2023
Merged

NetP Design Review minus errors #1923

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b242a64
Slide in invite success view
graeme Aug 15, 2023
bd58df7
Fix Share Feedback button color
graeme Aug 15, 2023
79e32f9
Removes AppTP from the settings
graeme Aug 15, 2023
840419d
Remove AppTP from Alpha builds
graeme Aug 15, 2023
4e9ca53
Include PacketTunnelProvider in Alpha builds
graeme Aug 15, 2023
4f4cbf8
Fix server info cell wrapping problem
graeme Aug 15, 2023
39b6feb
Fix toggle connecting state
graeme Aug 15, 2023
ed0b70a
Pad the header beyond the default inset
graeme Aug 15, 2023
dba3e87
Make text the correct colour
graeme Aug 15, 2023
760e521
Don't expose netP to iOS 14
graeme Aug 15, 2023
51a0c15
Hide parts of the networkprotectiondebugviewcontroller
graeme Aug 16, 2023
8d051b8
Go a little less wild on the AppTP deletion
graeme Aug 16, 2023
6858487
Tweak spacing between header elements
graeme Aug 16, 2023
1b4e529
Invite submit button should say Continue
graeme Aug 16, 2023
ead5f66
Fix primary button state
graeme Aug 16, 2023
a8849bb
Revert "Fix primary button state"
graeme Aug 16, 2023
ddf66f3
Add forgotten Localizable.strings file
graeme Aug 16, 2023
42ff0f1
Fix standard button colors
graeme Aug 16, 2023
3724e1a
Fix button disabled state
graeme Aug 16, 2023
1ee4054
On submit don't disable, prevent calling twice
graeme Aug 17, 2023
6f5019f
No press color change when disabled
graeme Aug 17, 2023
715494b
Fix icons
graeme Aug 17, 2023
1d65f07
Remove as yet unneeded strings
graeme Aug 18, 2023
50976fe
Revert "Include PacketTunnelProvider in Alpha builds"
graeme Aug 18, 2023
f3e362c
Revert "Revert "Include PacketTunnelProvider in Alpha builds""
graeme Aug 18, 2023
116a213
Package.resolve in case it helps
graeme Aug 18, 2023
de9c38a
Try removing test as a stab in the dark
graeme Aug 18, 2023
99135f7
Revert "Try removing test as a stab in the dark"
graeme Aug 18, 2023
0d90349
Fix hanging tests
graeme Aug 18, 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
Prev Previous commit
Fix hanging tests
  • Loading branch information
@graeme
graeme committed Aug 18, 2023
commit 0d90349ada8970e192cd30ffbaa6da1f63e97729
4 changes: 2 additions & 2 deletions DuckDuckGoTests/NetworkProtectionStatusViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ final class NetworkProtectionStatusViewModelTests: XCTestCase {
}

private func whenStatusUpdate_notConnected() {
let nonConnectedCases: [ConnectionStatus] = [.connecting, .disconnected, .disconnecting, .notConfigured, .reasserting]
let nonConnectedCases: [ConnectionStatus] = [.disconnected, .disconnecting, .notConfigured, .reasserting]
for current in nonConnectedCases {
statusObserver.subject.send(current)
waitFor(condition: !self.viewModel.isNetPEnabled)
Expand All @@ -198,6 +198,6 @@ final class NetworkProtectionStatusViewModelTests: XCTestCase {
condition()
}
let expectation = XCTNSPredicateExpectation(predicate: predicate, object: nil)
wait(for: [expectation])
wait(for: [expectation], timeout: 5)
}
}