diff options
| author | Oliver <oliver@mohlin.dev> | 2025-02-11 14:37:00 +0100 |
|---|---|---|
| committer | Oliver Mohlin <oliver@mohlin.dev> | 2025-02-25 09:36:34 +0100 |
| commit | 29e0bdca7270c2f44eab7843717843551ffef1bf (patch) | |
| tree | b78d1b9768ed2dfa08a14ba0f0e9c81fe7f6e7b8 | |
| parent | 4b5e3b6e110dba1032d9424972238a6039b52b92 (diff) | |
| download | mullvadvpn-29e0bdca7270c2f44eab7843717843551ffef1bf.tar.xz mullvadvpn-29e0bdca7270c2f44eab7843717843551ffef1bf.zip | |
Fix spacing when no results in split tunneling view
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx index df3bbda3ed..c80d7a1276 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx @@ -495,45 +495,44 @@ export function SplitTunnelingSettings(props: IPlatformSplitTunnelingSettingsPro <StyledSearchBar searchTerm={searchTerm} onSearch={setSearchTerm} /> )} + {canEditSplitTunneling && searchTerm !== '' && !showSplitSection && !showNonSplitSection && ( + <StyledNoResult> + <StyledNoResultText> + {formatHtml( + sprintf(messages.gettext('No result for <b>%(searchTerm)s</b>.'), { searchTerm }), + )} + </StyledNoResultText> + <StyledNoResultText>{messages.gettext('Try a different search.')}</StyledNoResultText> + </StyledNoResult> + )} + <Flex $flexDirection="column" - $gap={Spacings.spacing6} + $gap={Spacings.spacing5} $margin={{ bottom: measurements.verticalViewMargin }}> - <Flex $flexDirection="column" $gap={Spacings.spacing5}> - <Accordion expanded={showSplitSection}> - <Cell.Section sectionTitle={excludedTitle}> - <ApplicationList - data-testid="split-applications" - applications={filteredSplitApplications} - rowRenderer={excludedRowRenderer} - /> - </Cell.Section> - </Accordion> - - <Accordion expanded={showNonSplitSection}> - <Cell.Section sectionTitle={allTitle}> - <ApplicationList - data-testid="non-split-applications" - applications={filteredNonSplitApplications} - rowRenderer={includedRowRenderer} - /> - </Cell.Section> - </Accordion> - </Flex> + {(showSplitSection || showNonSplitSection) && ( + <Flex $flexDirection="column" $gap={Spacings.spacing5}> + <Accordion expanded={showSplitSection}> + <Cell.Section sectionTitle={excludedTitle}> + <ApplicationList + data-testid="split-applications" + applications={filteredSplitApplications} + rowRenderer={excludedRowRenderer} + /> + </Cell.Section> + </Accordion> - {canEditSplitTunneling && - searchTerm !== '' && - !showSplitSection && - !showNonSplitSection && ( - <StyledNoResult> - <StyledNoResultText> - {formatHtml( - sprintf(messages.gettext('No result for <b>%(searchTerm)s</b>.'), { searchTerm }), - )} - </StyledNoResultText> - <StyledNoResultText>{messages.gettext('Try a different search.')}</StyledNoResultText> - </StyledNoResult> - )} + <Accordion expanded={showNonSplitSection}> + <Cell.Section sectionTitle={allTitle}> + <ApplicationList + data-testid="non-split-applications" + applications={filteredNonSplitApplications} + rowRenderer={includedRowRenderer} + /> + </Cell.Section> + </Accordion> + </Flex> + )} {canEditSplitTunneling && ( <Container size="3"> |