summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2023-10-29 21:11:05 +0100
committerOskar Nyberg <oskar@mullvad.net>2023-10-30 18:02:26 +0100
commit17de249b6b4ab6f417d9b3b97c9764a09170f2ba (patch)
treebbb0f579808d2960a7c6b322615b472ab659b44c
parent87ce1ee93ec7b58f350b87a3fd0c61c91c45165e (diff)
downloadmullvadvpn-17de249b6b4ab6f417d9b3b97c9764a09170f2ba.tar.xz
mullvadvpn-17de249b6b4ab6f417d9b3b97c9764a09170f2ba.zip
Fix no result text in split tunneling view
-rw-r--r--gui/src/renderer/components/SplitTunnelingSettings.tsx16
-rw-r--r--gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx1
2 files changed, 16 insertions, 1 deletions
diff --git a/gui/src/renderer/components/SplitTunnelingSettings.tsx b/gui/src/renderer/components/SplitTunnelingSettings.tsx
index c8242cdd88..9b674df4fc 100644
--- a/gui/src/renderer/components/SplitTunnelingSettings.tsx
+++ b/gui/src/renderer/components/SplitTunnelingSettings.tsx
@@ -173,7 +173,21 @@ function LinuxSplitTunnelingSettings(props: IPlatformSplitTunnelingSettingsProps
</SettingsHeader>
<StyledSearchBar searchTerm={searchTerm} onSearch={setSearchTerm} />
- <ApplicationList applications={filteredApplications} rowRenderer={rowRenderer} />
+ {filteredApplications !== undefined && filteredApplications.length > 0 && (
+ <ApplicationList applications={filteredApplications} rowRenderer={rowRenderer} />
+ )}
+
+ {searchTerm !== '' &&
+ (filteredApplications === undefined || filteredApplications.length === 0) && (
+ <StyledNoResult>
+ <StyledNoResultText>
+ {formatHtml(
+ sprintf(messages.gettext('No result for <b>%(searchTerm)s</b>.'), { searchTerm }),
+ )}
+ </StyledNoResultText>
+ <StyledNoResultText>{messages.gettext('Try a different search.')}</StyledNoResultText>
+ </StyledNoResult>
+ )}
<StyledBrowseButton onClick={launchWithFilePicker}>
{messages.pgettext('split-tunneling-view', 'Find another app')}
diff --git a/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx b/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx
index 028fac30a3..61a1606b2e 100644
--- a/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx
+++ b/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx
@@ -93,6 +93,7 @@ export const StyledNoResult = styled(Cell.CellFooter)({
flexDirection: 'column',
paddingTop: 0,
marginTop: 0,
+ marginBottom: '69px',
});
export const StyledNoResultText = styled(Cell.CellFooterText)({