From f39785096d03733897699fddba5b64a5ee9ef60f Mon Sep 17 00:00:00 2001 From: 2ro <17595647+2ro@users.noreply.github.com> Date: Tue, 7 Jul 2026 01:17:46 -0400 Subject: [PATCH] goblin: revert Pay header to original goblin mark Restore the Pay tab header top-left rendering to the original goblin mark (goblin-logo2.svg tinted to the header ink at 40px), reverting the GoblinPay badge/wordmark theme-split lockup introduced by f768907 (UI pack 153, merged via build154). Matches the owner reference: the plain black goblin girlhead silhouette on the yellow header, no badge, no wordmark. The two badge assets added by that commit are no longer referenced anywhere after the revert, so remove them: img/goblinpay-badge-black.svg img/goblinpay-wordmark.svg Scope is strictly the Pay header hunk; the Home wordmark sizing from the same UI pack is untouched. --- img/goblinpay-badge-black.svg | 48 --------------------------------- img/goblinpay-wordmark.svg | 51 ----------------------------------- src/gui/views/goblin/mod.rs | 23 +++++----------- 3 files changed, 6 insertions(+), 116 deletions(-) delete mode 100644 img/goblinpay-badge-black.svg delete mode 100644 img/goblinpay-wordmark.svg diff --git a/img/goblinpay-badge-black.svg b/img/goblinpay-badge-black.svg deleted file mode 100644 index bbef89af..00000000 --- a/img/goblinpay-badge-black.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - Pay - diff --git a/img/goblinpay-wordmark.svg b/img/goblinpay-wordmark.svg deleted file mode 100644 index 2248bf2a..00000000 --- a/img/goblinpay-wordmark.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - diff --git a/src/gui/views/goblin/mod.rs b/src/gui/views/goblin/mod.rs index 4847107c..3bae9c2e 100644 --- a/src/gui/views/goblin/mod.rs +++ b/src/gui/views/goblin/mod.rs @@ -2007,23 +2007,12 @@ impl GoblinWalletView { .unwrap_or_else(|| ("N".to_string(), String::new())); let header_tex = self.handle_tex(ui.ctx(), wallet, &header_handle); ui.horizontal(|ui| { - // Official GoblinPay lockup (left): the black Apple-Pay-style badge on - // light surfaces, the white wordmark on dark. Owner-specified brand mark. - if t.dark_base { - ui.add( - egui::Image::new(egui::include_image!( - "../../../../img/goblinpay-wordmark.svg" - )) - .fit_to_exact_size(Vec2::new(84.0, 33.0)), - ); - } else { - ui.add( - egui::Image::new(egui::include_image!( - "../../../../img/goblinpay-badge-black.svg" - )) - .fit_to_exact_size(Vec2::new(98.0, 40.0)), - ); - } + // Goblin mark (left), sized to match the right-side controls. + ui.add( + egui::Image::new(egui::include_image!("../../../../img/goblin-logo2.svg")) + .tint(t.text) + .fit_to_exact_size(Vec2::splat(40.0)), + ); // Right cluster: scan QR (black, no background) then the profile // picture at the far right; all three controls about the same size. ui.with_layout(Layout::right_to_left(Align::Center), |ui| {