From 5d5e2d0433dff999e3e13fc1179f3b1f6077a6c6 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 06:53:25 +0000
Subject: [PATCH] fix(client/v2): correctly check subcommand short descriptions
 (backport #20330) (#20340)

---
 client/v2/autocli/msg.go   | 4 ++--
 client/v2/autocli/query.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/v2/autocli/msg.go b/client/v2/autocli/msg.go
index 71796b9a49..5bcbd9baa3 100644
--- a/client/v2/autocli/msg.go
+++ b/client/v2/autocli/msg.go
@@ -38,8 +38,8 @@ func (b *Builder) AddMsgServiceCommands(cmd *cobra.Command, cmdDescriptor *autoc
 	for cmdName, subCmdDescriptor := range cmdDescriptor.SubCommands {
 		subCmd := findSubCommand(cmd, cmdName)
 		if subCmd == nil {
-			short := cmdDescriptor.Short
-			if cmdDescriptor.Short == "" {
+			short := subCmdDescriptor.Short
+			if short == "" {
 				short = fmt.Sprintf("Tx commands for the %s service", subCmdDescriptor.Service)
 			}
 			subCmd = topLevelCmd(cmd.Context(), cmdName, short)
diff --git a/client/v2/autocli/query.go b/client/v2/autocli/query.go
index 3775630201..95bfbca78b 100644
--- a/client/v2/autocli/query.go
+++ b/client/v2/autocli/query.go
@@ -41,7 +41,7 @@ func (b *Builder) AddQueryServiceCommands(cmd *cobra.Command, cmdDescriptor *aut
 	for cmdName, subCmdDesc := range cmdDescriptor.SubCommands {
 		subCmd := findSubCommand(cmd, cmdName)
 		if subCmd == nil {
-			short := cmdDescriptor.Short
+			short := subCmdDesc.Short
 			if short == "" {
 				short = fmt.Sprintf("Querying commands for the %s service", subCmdDesc.Service)
 			}