fixup! refactor(core): improved Stellar transaction signing interface for a more streamlined user experience.

ibz · ibz · commit d9f3df5890d7 · 2025-08-18T09:58:52.000+02:00
diff --git a/core/src/trezor/ui/layouts/delizia/__init__.py b/core/src/trezor/ui/layouts/delizia/__init__.py
@@ -1143,10 +1143,7 @@ async def confirm_trade(
             )
         menu = Menu.root(menu_items, TR.send__cancel_sign)
 
-<<<<<<< HEAD
         await confirm_with_menu(trade_layout, menu, "confirm_trade")
-=======
-        await confirm_with_menu(main_layout, menu, "confirm_payment_request")
 
         for sell_amount, buy_amount, t_address, t_account, t_account_path in trades:
             await confirm_trade(

Original file line number	Diff line number	Diff line change
`@@ -1143,10 +1143,7 @@ async def confirm_trade(`
`1143`	`1143`	`)`
`1144`	`1144`	`menu = Menu.root(menu_items, TR.send__cancel_sign)`
`1145`	`1145`
`1146`		`-<<<<<<< HEAD`
`1147`	`1146`	`await confirm_with_menu(trade_layout, menu, "confirm_trade")`
`1148`		`-=======`
`1149`		`- await confirm_with_menu(main_layout, menu, "confirm_payment_request")`
`1150`	`1147`
`1151`	`1148`	`for sell_amount, buy_amount, t_address, t_account, t_account_path in trades:`
`1152`	`1149`	`await confirm_trade(`