Merge branch 'develop' into 'feature/5203_us01_add_federation_room_overview'

# Conflicts: # Config/BWIBuildSettings.swift
2026-04-25 02:52:45 +02:00 · 2023-11-02 14:55:09 +00:00
parent a213954135 be45b997da
commit c6c874cf43
12 changed files with 102 additions and 32 deletions
@@ -2494,12 +2494,6 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
            MXStrongifyAndReturnIfNil(self);
            self->currentAlert = nil;
        }]];
-        
-        [errorAlert addAction:[UIAlertAction actionWithTitle:[BWIL10n bwiOutdatedVersionLogoutButton]
-                                                       style:UIAlertActionStyleDefault
-                                                     handler:^(UIAlertAction * action) {
-            [self logout];
-        }]];

        [self presentViewController:errorAlert animated:YES completion:nil];
    }