Skip to content

Commit 00d35a4

Browse files
Fix FWEO-1394 - Transaction field disclosure should be clickable on the full row, not only the chevron icon
1 parent 3d0044c commit 00d35a4

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

lib_nbgl/src/nbgl_layout.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,16 +2133,18 @@ int nbgl_layoutAddTagValueList(nbgl_layout_t *layout, const nbgl_layoutTagValueL
21332133
fullHeight += valueTextArea->obj.area.height + valueTextArea->obj.alignmentMarginY;
21342134
if (valueIcon != NULL) {
21352135
nbgl_image_t *image = (nbgl_image_t *) nbgl_objPoolGet(IMAGE, layoutInt->layer);
2136-
layoutObj_t *obj = layoutAddCallbackObj(
2137-
layoutInt, (nbgl_obj_t *) image, list->token, TUNE_TAP_CASUAL);
2136+
// set the container as touchable, not only the image
2137+
layoutObj_t *obj = layoutAddCallbackObj(
2138+
layoutInt, (nbgl_obj_t *) container, list->token, TUNE_TAP_CASUAL);
21382139
obj->index = i;
21392140
image->foregroundColor = BLACK;
21402141
image->buffer = valueIcon;
21412142
image->obj.alignment = RIGHT_TOP;
21422143
image->obj.alignmentMarginX = 12;
21432144
image->obj.alignTo = (nbgl_obj_t *) valueTextArea;
2144-
image->obj.touchMask = (1 << TOUCHED);
2145-
image->obj.touchId = VALUE_BUTTON_1_ID + i;
2145+
// set the container as touchable, not only the image
2146+
container->obj.touchMask = (1 << TOUCHED);
2147+
container->obj.touchId = VALUE_BUTTON_1_ID + i;
21462148

21472149
container->children[container->nbChildren] = (nbgl_obj_t *) image;
21482150
container->nbChildren++;

tests/screenshots/flows/wallet/app-sdk/flow_w3c_dapp.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"name": "w3c-disabled-clear-dapp-03",
4141
"targets": [
4242
{
43-
"object": "VALUE_BUTTON_2",
43+
"object": "CONTROLS,0",
4444
"page": "w3c-disabled-clear-dapp-04"
4545
},
4646
{
@@ -112,7 +112,7 @@
112112
"name": "w3c-no-threat-clear-dapp-04",
113113
"targets": [
114114
{
115-
"object": "VALUE_BUTTON_2",
115+
"object": "CONTROLS,0",
116116
"page": "w3c-no-threat-clear-dapp-05"
117117
},
118118
{
@@ -206,7 +206,7 @@
206206
"name": "w3c-threat-clear-dapp-06",
207207
"targets": [
208208
{
209-
"object": "VALUE_BUTTON_2",
209+
"object": "CONTROLS,0",
210210
"page": "w3c-threat-clear-dapp-07"
211211
},
212212
{
@@ -298,7 +298,7 @@
298298
"name": "w3c-issue-clear-dapp-05",
299299
"targets": [
300300
{
301-
"object": "VALUE_BUTTON_2",
301+
"object": "CONTROLS,0",
302302
"page": "w3c-issue-clear-dapp-06"
303303
}
304304
]

0 commit comments

Comments
 (0)