Code review fixes

RiotSwiftUI/Modules/UserSessions/UserSessionCardView/UserSessionCardView.swift

@@ -52,7 +52,6 @@ struct UserSessionCardView: View {
     }
     
     var body: some View {
-        VStack() {
         VStack(alignment: .center, spacing: 12) {
             DeviceAvatarView(viewData: viewData.deviceAvatarViewData)
             
@@ -125,7 +124,6 @@ struct UserSessionCardView: View {
             }
         }
         .padding(24)
-        }
         .frame(maxWidth: .infinity)
         .background(theme.colors.background)
         .clipShape(self.backgroundShape)

RiotSwiftUI/Modules/UserSessions/UserSessionCardView/UserSessionCardViewData.swift

@@ -51,7 +51,7 @@ struct UserSessionCardViewData {
          sessionDisplayName: String?,
          deviceType: DeviceType,
          isVerified: Bool,
-         lastActivityDate: TimeInterval?,
+         lastActivityTimestamp: TimeInterval?,
          lastSeenIP: String?,
          isCurrentSessionDisplayMode: Bool = false) {
         self.sessionId = sessionId
@@ -60,8 +60,8 @@ struct UserSessionCardViewData {
         
         var lastActivityDateString: String?
         
-        if let lastActivityDate = lastActivityDate {
+        if let lastActivityTimestamp = lastActivityTimestamp {
-            lastActivityDateString = Self.lastActivityDateFormatter.lastActivityDateString(from: lastActivityDate)
+            lastActivityDateString = Self.lastActivityDateFormatter.lastActivityDateString(from: lastActivityTimestamp)
         }
         
         self.lastActivityDateString = lastActivityDateString
@@ -75,6 +75,6 @@ struct UserSessionCardViewData {
 extension UserSessionCardViewData {
         
     init(userSessionInfo: UserSessionInfo, isCurrentSessionDisplayMode: Bool = false) {
-        self.init(sessionId: userSessionInfo.sessionId, sessionDisplayName: userSessionInfo.sessionName, deviceType: userSessionInfo.deviceType, isVerified: userSessionInfo.isVerified, lastActivityDate: userSessionInfo.lastSeenTimestamp, lastSeenIP: userSessionInfo.lastSeenIP, isCurrentSessionDisplayMode: isCurrentSessionDisplayMode)
+        self.init(sessionId: userSessionInfo.sessionId, sessionDisplayName: userSessionInfo.sessionName, deviceType: userSessionInfo.deviceType, isVerified: userSessionInfo.isVerified, lastActivityTimestamp: userSessionInfo.lastSeenTimestamp, lastSeenIP: userSessionInfo.lastSeenIP, isCurrentSessionDisplayMode: isCurrentSessionDisplayMode)
     }
 }

RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionsOverview.swift

@@ -24,39 +24,9 @@ struct UserSessionsOverview: View {
     
     @Environment(\.theme) private var theme: ThemeSwiftUI
     
-    // MARK: Public
+    @ViewBuilder
-    
+    private var currentSessionsSection: some View {
-    @ObservedObject var viewModel: UserSessionsOverviewViewModel.Context
-    
-    var body: some View {
-        ScrollView {
-            
-            // Security recommendations section
-            if viewModel.viewState.unverifiedSessionsViewData.isEmpty == false || viewModel.viewState.inactiveSessionsViewData.isEmpty == false {
-                
-                // TODO:
-            }
-            
-            // Current session section
         if let currentSessionViewData = viewModel.viewState.currentSessionViewData {
-                self.currentSessionsSection(currentSessionViewData: currentSessionViewData)
-            }
-            
-            // Other sessions section
-            if viewModel.viewState.otherSessionsViewData.isEmpty == false {
-                self.otherSessionsSection
-            }
-        }
-        .background(theme.colors.system.ignoresSafeArea())
-        .frame(maxHeight: .infinity)
-        .navigationTitle(VectorL10n.userSessionsOverviewTitle)
-        .activityIndicator(show: viewModel.viewState.showLoadingIndicator)
-        .onAppear() {
-            viewModel.send(viewAction: .viewAppeared)
-        }
-    }
-    
-    private func currentSessionsSection(currentSessionViewData: UserSessionCardViewData) -> some View {
             SwiftUI.Section {
                 UserSessionCardView(viewData: currentSessionViewData, onVerifyAction: { _ in
                     viewModel.send(viewAction: .verifyCurrentSession)
@@ -74,6 +44,37 @@ struct UserSessionsOverview: View {
                     .padding(.bottom, 11)
             }
         }
+    }
+    
+    // MARK: Public
+    
+    @ObservedObject var viewModel: UserSessionsOverviewViewModel.Context
+    
+    var body: some View {
+        ScrollView {
+            
+            // Security recommendations section
+            if viewModel.viewState.unverifiedSessionsViewData.isEmpty == false || viewModel.viewState.inactiveSessionsViewData.isEmpty == false {
+                
+                // TODO:
+            }
+            
+            // Current session section
+            currentSessionsSection
+            
+            // Other sessions section
+            if viewModel.viewState.otherSessionsViewData.isEmpty == false {
+                self.otherSessionsSection
+            }
+        }
+        .background(theme.colors.system.ignoresSafeArea())
+        .frame(maxHeight: .infinity)
+        .navigationTitle(VectorL10n.userSessionsOverviewTitle)
+        .activityIndicator(show: viewModel.viewState.showLoadingIndicator)
+        .onAppear() {
+            viewModel.send(viewAction: .viewAppeared)
+        }
+    }
     
     private var otherSessionsSection: some View {