refactor(textual): Remove msg header screen

x/tx/textual/any.go

@@ -26,6 +26,8 @@ func NewAnyValueRenderer(t *SignModeHandler) ValueRenderer {
 // Format implements the ValueRenderer interface.
 func (ar anyValueRenderer) Format(ctx context.Context, v protoreflect.Value) ([]Screen, error) {
 	msg := v.Message().Interface()
+	omitHeader := 0
+
 	anymsg, ok := msg.(*anypb.Any)
 	if !ok {
 		return nil, fmt.Errorf("expected Any, got %T", msg)
@@ -45,10 +47,16 @@ func (ar anyValueRenderer) Format(ctx context.Context, v protoreflect.Value) ([]
 		return nil, err
 	}
 
-	screens := make([]Screen, 1+len(subscreens))
+	// The Any value renderer suppresses emission of the object header
+	_, isMsgRender := vr.(*messageValueRenderer)
+	if isMsgRender && subscreens[0].Content == fmt.Sprintf("%s object", internalMsg.ProtoReflect().Descriptor().Name()) {
+		omitHeader = 1
+	}
+
+	screens := make([]Screen, (1-omitHeader)+len(subscreens))
 	screens[0].Content = anymsg.GetTypeUrl()
-	for i, subscreen := range subscreens {
-		subscreen.Indent++
+	for i, subscreen := range subscreens[omitHeader:] {
+		subscreen.Indent += 1 - omitHeader
 		screens[i+1] = subscreen
 	}
 
@@ -82,6 +90,16 @@ func (ar anyValueRenderer) Parse(ctx context.Context, screens []Screen) (protore
 		subscreens[i-1].Indent--
 	}
 
+	// Prepend with a "%s object" if the message goes through the default
+	// messageValueRenderer.
+	if _, found := ar.tr.messages[msgType.Descriptor().FullName()]; !found {
+		for i := range subscreens {
+			subscreens[i].Indent++
+		}
+
+		subscreens = append([]Screen{{Content: fmt.Sprintf("%s object", msgType.Descriptor().Name())}}, subscreens...)
+	}
+
 	internalMsg, err := vr.Parse(ctx, subscreens)
 	if err != nil {
 		return nilValue, err

x/tx/textual/internal/testdata/any.json

@@ -4,8 +4,7 @@
             "@type": "/Foo"
         },
         "screens": [
-            {"content": "/Foo"},
-            {"content": "Foo object", "indent": 1}
+            {"content": "/Foo"}
         ]
     },
     {
@@ -15,8 +14,7 @@
         },
         "screens": [
             {"content": "/Foo"},
-            {"content": "Foo object", "indent": 1},
-            {"title": "Full name", "content": "testing", "indent": 2}
+            {"title": "Full name", "content": "testing", "indent": 1}
         ]
     },
     {
@@ -38,8 +36,7 @@
         },
         "screens": [
             {"content": "/google.protobuf.Any"},
-            {"content": "/Foo", "indent": 1},
-            {"content": "Foo object", "indent": 2}
+            {"content": "/Foo", "indent": 1}
         ]
     },
     {
@@ -53,8 +50,7 @@
         "screens": [
             {"content": "/google.protobuf.Any"},
             {"content": "/Foo", "indent": 1},
-            {"content": "Foo object", "indent": 2},
-            {"title": "Full name", "content": "testing", "indent": 3}
+            {"title": "Full name", "content": "testing", "indent": 2}
         ]
     },
     {
@@ -67,10 +63,8 @@
         },
         "screens": [
             {"content": "/A"},
-            {"content": "A object", "indent": 1},
-            {"title": "ANY", "content": "/Foo", "indent": 2},
-            {"content": "Foo object", "indent": 3},
-            {"title": "Full name", "content": "testing", "indent": 4}
+            {"title": "ANY", "content": "/Foo", "indent": 1},
+            {"title": "Full name", "content": "testing", "indent": 2}
         ]
     }
 ]