Fixed issues with frequencies (I think)

2 files changed, 11 insertions, 3 deletions

diff --git a/internal/client/ui/core/frequencylist/frequencylist.go b/internal/client/ui/core/frequencylist/frequencylist.go
index a0d6cb7..80d350b 100644
--- a/internal/client/ui/core/frequencylist/frequencylist.go
+++ b/internal/client/ui/core/frequencylist/frequencylist.go
@@ -119,13 +119,17 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 		case "j":
 			m.index = min(m.FrequenciesLength()-1, m.index+1)
 
-		case "ctrl+d":
-			if len(m.Network().Frequencies) == 1 {
+		case "x":
+			frequenciesCount := len(m.Network().Frequencies)
+			if frequenciesCount == 1 {
 				// Don't delete the last frequency!
 				return m, nil
 			}
 			// TODO: consider adding a confirmation popup
 			frequencyId := m.Network().Frequencies[m.index].ID
+			if m.index == frequenciesCount-1 {
+				m.index--
+			}
 			return m, gateway.Send(&packet.DeleteFrequency{
 				Frequency: frequencyId,
 			})
diff --git a/internal/server/api/api.go b/internal/server/api/api.go
index 7998d18..9f29ad7 100644
--- a/internal/server/api/api.go
+++ b/internal/server/api/api.go
@@ -325,7 +325,11 @@ func SwapFrequencies(ctx context.Context, sess *session.Session, request *packet
 		return &ErrInternalError
 	}
 
-	return request
+	return &packet.SwapFrequencies{
+		Network: request.Network,
+		Pos1:    request.Pos1,
+		Pos2:    request.Pos2,
+	}
 }
 
 func DeleteFrequency(ctx context.Context, sess *session.Session, request *packet.DeleteFrequency) packet.Payload {