Merge remote-tracking branch 'origin/fix-app-info-bugs'

3 files changed, 10 insertions, 16 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/AppInfoView.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/AppInfoView.tsx
index ef24719981..c31a683dd1 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/AppInfoView.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/AppInfoView.tsx
@@ -1,6 +1,5 @@
 import { messages } from '../../../../shared/gettext';
 import { Flex } from '../../../lib/components';
-import { Animate } from '../../../lib/components/animate';
 import { useHistory } from '../../../lib/history';
 import { AppNavigationHeader } from '../../';
 import { BackAction } from '../../KeyboardNavigation';
@@ -31,14 +30,9 @@ export function AppInfoView() {
               <SettingsHeader>
                 <HeaderTitle>{messages.pgettext('app-info-view', 'App info')}</HeaderTitle>
               </SettingsHeader>
-              <Animate
-                present={showUpdateAvailable}
-                animations={[{ type: 'fade' }, { type: 'wipe', direction: 'vertical' }]}>
-                <Flex $margin={{ bottom: 'medium' }}>
-                  <UpdateAvailableListItem />
-                </Flex>
-              </Animate>
+
               <Flex $flexDirection="column" $gap="medium">
+                {showUpdateAvailable && <UpdateAvailableListItem />}
                 <Flex $flexDirection="column">
                   <VersionListItem />
                   <ChangelogListItem />
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/changelog-list-item/ChangelogListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/changelog-list-item/ChangelogListItem.tsx
index 437cae4d37..dc09b3865c 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/changelog-list-item/ChangelogListItem.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/changelog-list-item/ChangelogListItem.tsx
@@ -8,8 +8,8 @@ export function ChangelogListItem() {
 
   return (
     <ListItem>
-      <ListItem.Item>
-        <ListItem.Trigger onClick={pushChangelog}>
+      <ListItem.Trigger onClick={pushChangelog}>
+        <ListItem.Item>
           <ListItem.Content>
             <ListItem.Label>
               {
@@ -19,8 +19,8 @@ export function ChangelogListItem() {
             </ListItem.Label>
             <Icon icon="chevron-right" />
           </ListItem.Content>
-        </ListItem.Trigger>
-      </ListItem.Item>
+        </ListItem.Item>
+      </ListItem.Trigger>
     </ListItem>
   );
 }
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/update-available-list-item/UpdateAvailableListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/update-available-list-item/UpdateAvailableListItem.tsx
index 0e0ee8fba4..416336d37a 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/update-available-list-item/UpdateAvailableListItem.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/update-available-list-item/UpdateAvailableListItem.tsx
@@ -20,8 +20,8 @@ export function UpdateAvailableListItem() {
 
   return (
     <ListItem>
-      <ListItem.Item>
-        <ListItem.Trigger onClick={handleClick}>
+      <ListItem.Trigger onClick={handleClick}>
+        <ListItem.Item>
           <ListItem.Content>
             <Flex $flexDirection="column">
               <ListItem.Label>
@@ -37,8 +37,8 @@ export function UpdateAvailableListItem() {
               <Icon icon={isLinux ? 'external' : 'chevron-right'} />
             </ListItem.Group>
           </ListItem.Content>
-        </ListItem.Trigger>
-      </ListItem.Item>
+        </ListItem.Item>
+      </ListItem.Trigger>
     </ListItem>
   );
 }