Upgrade the UX in Daita scenarios #6745
Conversation
rablador
force-pushed
the
upgrade-the-ux-in-daita-scenarios-ios-804
branch
from
869bcd7
to
20f1158
Compare
There was a problem hiding this comment.
To more easily test the singlehop scenario you need to turn off the "smart routing" that's behind the debug flags in single hop picker in RelaySelectorPicker.swift.
Reviewable status: 0 of 8 files reviewed, all discussions resolved
There was a problem hiding this comment.
Reviewed 7 of 8 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @rablador)
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift line 59 at r2 (raw file):
var tunnelSettings = tunnelSettings tunnelSettings.daita = settings
Is this not mutating the instance variable tunnelSettings?
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsViewController.swift line 227 at r2 (raw file):
case .daitaSettingIncompatibleWithMultihop: """ DAITA isn’t available on the current entry server. After enabling, please go to \
Should this not be 2 different NSLocalizedStrings?
There was a problem hiding this comment.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @pinkisemils)
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift line 59 at r2 (raw file):
Previously, pinkisemils (Emīls Piņķis) wrote…
Is this not mutating the instance variable
tunnelSettings?
No, self.tunnelSettings is a struct, so it'll be copied on assignment.
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsViewController.swift line 227 at r2 (raw file):
Previously, pinkisemils (Emīls Piņķis) wrote…
Should this not be 2 different
NSLocalizedStrings?
These strings are used in localized strings in AlertPresentation below. I didn't want to make them both NSLocalizedString because it bloats the function body somewhat.
There was a problem hiding this comment.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @pinkisemils)
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift line 59 at r2 (raw file):
Previously, rablador (Jon Petersson) wrote…
No, self.tunnelSettings is a struct, so it'll be copied on assignment.
No, I'm wrong.
There was a problem hiding this comment.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @pinkisemils)
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift line 59 at r2 (raw file):
Previously, rablador (Jon Petersson) wrote…
No, I'm wrong.
No, I'm right. :D
There was a problem hiding this comment.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @pinkisemils)
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift line 59 at r2 (raw file):
Previously, rablador (Jon Petersson) wrote…
No, I'm right. :D
Since .daita prop is a struct too it's assigned as a copy. Had .daita prop been a class it would have been as you say.
There was a problem hiding this comment.
Reviewed 7 of 8 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @pinkisemils and @rablador)
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift line 61 at r2 (raw file):
tunnelSettings.daita = settings let selectedRelays = try? tunnelManager.selectRelays(tunnelSettings: tunnelSettings)
We're starting to add quite some logic in that interactor, I think it would be nice to have some tests for it.
There was a problem hiding this comment.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @rablador)
There was a problem hiding this comment.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @buggmagnet)
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift line 61 at r2 (raw file):
Previously, buggmagnet wrote…
We're starting to add quite some logic in that interactor, I think it would be nice to have some tests for it.
Do you want it to be done in this PR? (since it has already been approved by two reviewers)
There was a problem hiding this comment.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @rablador)
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift line 61 at r2 (raw file):
Previously, rablador (Jon Petersson) wrote…
Do you want it to be done in this PR? (since it has already been approved by two reviewers)
We can leave it for another PR since we're bug bashing it tomorrow
There was a problem hiding this comment.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @buggmagnet)
ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift line 61 at r2 (raw file):
Previously, buggmagnet wrote…
We can leave it for another PR since we're bug bashing it tomorrow
Done.
buggmagnet
force-pushed
the
upgrade-the-ux-in-daita-scenarios-ios-804
branch
from
20f1158
to
1d42b45
Compare
|
🚨 End to end tests failed. Please check the failed workflow run. |
After discussing with the stakeholders, and the design team, we want to ship Daita with an improved UX, which will behave as following:
The copy that is shown for the warning text is aware of multihop, and will have a different text accordingly.
This change is