diff --git a/Meshtastic/Views/Messages/ChannelList.swift b/Meshtastic/Views/Messages/ChannelList.swift index 956c733b..ae1cc04d 100644 --- a/Meshtastic/Views/Messages/ChannelList.swift +++ b/Meshtastic/Views/Messages/ChannelList.swift @@ -17,6 +17,7 @@ struct ChannelList: View { @State private var channelSelection: ChannelEntity? // Nothing selected by default. @State private var isPresentingDeleteChannelMessagesConfirm: Bool = false + @State private var isPresentingTraceRouteSentAlert = false var body: some View { @@ -145,7 +146,6 @@ struct ChannelList: View { .padding([.top, .bottom]) } } - .listStyle(.grouped) .navigationTitle("channels") } } diff --git a/Meshtastic/Views/Messages/Messages.swift b/Meshtastic/Views/Messages/Messages.swift index ad173e60..b818e5a9 100644 --- a/Meshtastic/Views/Messages/Messages.swift +++ b/Meshtastic/Views/Messages/Messages.swift @@ -80,17 +80,9 @@ struct Messages: View { } } content: { - - ChannelList() - UserList() } detail: { - if let user = userSelection { - UserMessageList(user: user) - } else { - Text("select.contact") - } } } } diff --git a/Meshtastic/Views/Messages/UserList.swift b/Meshtastic/Views/Messages/UserList.swift index cbe41f6c..694cb3f7 100644 --- a/Meshtastic/Views/Messages/UserList.swift +++ b/Meshtastic/Views/Messages/UserList.swift @@ -27,8 +27,6 @@ struct UserList: View { let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMdd", options: 0, locale: Locale.current) let dateFormatString = (localeDateFormat ?? "MM/dd/YY") List { - - ForEach(users) { (user: UserEntity) in let mostRecent = user.messageList.last @@ -143,25 +141,6 @@ struct UserList: View { } } } - .listStyle(.grouped) .navigationTitle("contacts") - .onAppear { - self.bleManager.context = context - if UserDefaults.preferredPeripheralId.count > 0 { - let fetchNodeInfoRequest: NSFetchRequest = NSFetchRequest.init(entityName: "NodeInfoEntity") - fetchNodeInfoRequest.predicate = NSPredicate(format: "num == %lld", Int64(bleManager.connectedPeripheral?.num ?? -1)) - do { - guard let fetchedNode = try context.fetch(fetchNodeInfoRequest) as? [NodeInfoEntity] else { - return - } - // Found a node, check it for a region - if !fetchedNode.isEmpty { - node = fetchedNode[0] - } - } catch { - - } - } - } } }