Merge remote-tracking branch 'origin/master' into develop

apaillier-ledger · apaillier-ledger · commit bf4177a08304 · 2026-02-19T18:14:23.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [1.22.0](../../compare/1.21.x...1.22.0) - 2026-xx-xx
 
+## [1.21.1](../../compare/1.20.1...1.21.1) - 2026-02-19
+
+### Fixed
+
+- Blind-signing of ERC-20 transfer/approve not working
+
 ## [1.21.0](../../compare/1.20.1...1.21.0) - 2026-02-16
 
 ### Added
diff --git a/src/nbgl/ui_approve_tx.c b/src/nbgl/ui_approve_tx.c
@@ -331,7 +331,7 @@ static bool ux_init(bool fromPlugin, uint8_t title_len, uint8_t finish_len) {
         goto error;
     }
 
-    if (fromPlugin == true) {
+    if (fromPlugin && (dataContext.tokenContext.pluginUiMaxItems > 0)) {
         buf_size = dataContext.tokenContext.pluginUiMaxItems * sizeof(plugin_buffers_t);
         // Allocate the plugin buffers
         if ((plugin_buffers = app_mem_alloc(buf_size)) == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ static bool ux_init(bool fromPlugin, uint8_t title_len, uint8_t finish_len) {`
`331`	`331`	`goto error;`
`332`	`332`	`}`
`333`	`333`
`334`		`- if (fromPlugin == true) {`
	`334`	`+ if (fromPlugin && (dataContext.tokenContext.pluginUiMaxItems > 0)) {`
`335`	`335`	`buf_size = dataContext.tokenContext.pluginUiMaxItems * sizeof(plugin_buffers_t);`
`336`	`336`	`// Allocate the plugin buffers`
`337`	`337`	`if ((plugin_buffers = app_mem_alloc(buf_size)) == NULL) {`