Skip to content

Commit

Permalink
Merge pull request #764 from meshtastic/remove-channellist-selection
Browse files Browse the repository at this point in the history
Remove channel list selection that is breaking ios18
  • Loading branch information
garthvh authored Jul 9, 2024
2 parents 483e0ec + 7596294 commit 6ea2f24
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Meshtastic.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.15;
MARKETING_VERSION = 2.3.16;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
Expand Down Expand Up @@ -1488,7 +1488,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.15;
MARKETING_VERSION = 2.3.16;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
Expand Down Expand Up @@ -1520,7 +1520,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.15;
MARKETING_VERSION = 2.3.16;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1553,7 +1553,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.15;
MARKETING_VERSION = 2.3.16;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
2 changes: 1 addition & 1 deletion Meshtastic/Views/Messages/ChannelList.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ struct ChannelList: View {
VStack {
// Display Contacts for the rest of the non admin channels
if let node, let myInfo = node.myInfo, let channels = myInfo.channels?.array as? [ChannelEntity] {
List(channels, id: \.self, selection: $channelSelection) { (channel: ChannelEntity) in
List(channels, id: \.self) { (channel: ChannelEntity) in
if !restrictedChannels.contains(channel.name?.lowercased() ?? "") {
makeNavigationLink(myInfo: myInfo, channel: channel)
.frame(height: 62)
Expand Down

0 comments on commit 6ea2f24

Please sign in to comment.