From 646b24e090841a90ad37e88722590f08aa05f417 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Mon, 29 Jan 2024 22:27:11 +0000
Subject: [PATCH 1/3] Improve boolean formatter check for showMenu() calls

See also #3149
---
 bin/sanitycheck.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/sanitycheck.js b/bin/sanitycheck.js
index 4e6662e4a..78cadc34c 100755
--- a/bin/sanitycheck.js
+++ b/bin/sanitycheck.js
@@ -263,7 +263,7 @@ apps.forEach((app,appIdx) => {
           WARN(`App ${app.id} has a setting file but no corresponding data entry (add \`"data":[{"name":"${app.id}.settings.json"}]\`)`, {file:appDirRelative+file.url});
         }
         // check for manual boolean formatter
-        const m = fileContents.match(/format: *\(\) *=>.*["'](yes|on)["']/i);
+        const m = fileContents.match(/format: *\(?\w*\)? *=>.*["'](yes|on)["']/i);
         if (m) {
           WARN(`Settings for ${app.id} has a boolean formatter - this is handled automatically, the line can be removed`, {file:appDirRelative+file.url, line: fileContents.substr(0, m.index).split("\n").length});
         }

From e17a24e48f335b1fb51e65985efa3afb24974edc Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Mon, 29 Jan 2024 22:27:24 +0000
Subject: [PATCH 2/3] Drop more unnecessary format arguments

---
 apps/mywelcome/settings.js | 1 -
 apps/shadowclk/settings.js | 2 --
 2 files changed, 3 deletions(-)

diff --git a/apps/mywelcome/settings.js b/apps/mywelcome/settings.js
index cf7208d65..e8d294cd4 100644
--- a/apps/mywelcome/settings.js
+++ b/apps/mywelcome/settings.js
@@ -5,7 +5,6 @@
     '': { 'title': 'Welcome App' },
     'Run next boot': {
       value: !settings.welcomed,
-      format: v => v ? 'Yes' : 'No',
       onchange: v => require('Storage').write('mywelcome.json', {welcomed: !v}),
     },
     'Run Now': () => load('mywelcome.app.js'),
diff --git a/apps/shadowclk/settings.js b/apps/shadowclk/settings.js
index 3fb774892..1472cb099 100644
--- a/apps/shadowclk/settings.js
+++ b/apps/shadowclk/settings.js
@@ -130,7 +130,6 @@
       },
       'Date Suffix:': {
         value: appSettings.enableSuffix,
-        format: v => v ? 'Yes' : 'No',
         onchange: v => {
           appSettings.enableSuffix = v;
           writeSettings();
@@ -138,7 +137,6 @@
       },
       'Lead Zero:': {
         value: appSettings.enableLeadingZero,
-        format: v => v ? 'Yes' : 'No',
         onchange: v => {
           appSettings.enableLeadingZero = v;
           writeSettings();

From 08b6a9f16e5fea1763a4f000efa64217830d5f00 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Mon, 5 Feb 2024 22:31:45 +0000
Subject: [PATCH 3/3] Drop more format arguments

---
 apps/aviatorclk/aviatorclk.settings.js | 2 --
 apps/gassist/settings.js               | 1 -
 apps/welcome/settings.js               | 1 -
 3 files changed, 4 deletions(-)

diff --git a/apps/aviatorclk/aviatorclk.settings.js b/apps/aviatorclk/aviatorclk.settings.js
index 6db212ef1..d3ffbaad2 100644
--- a/apps/aviatorclk/aviatorclk.settings.js
+++ b/apps/aviatorclk/aviatorclk.settings.js
@@ -17,7 +17,6 @@
     "< Back" : () => back(),
     'Show Seconds': {
       value: !!settings.showSeconds,  // !! converts undefined to false
-      format: v => v ? "On" : "Off",
       onchange: v => {
         settings.showSeconds = v;
         writeSettings();
@@ -25,7 +24,6 @@
     },
     'Invert Scrolling': {
       value: !!settings.invertScrolling,  // !! converts undefined to false
-      format: v => v ? "On" : "Off",
       onchange: v => {
         settings.invertScrolling = v;
         writeSettings();
diff --git a/apps/gassist/settings.js b/apps/gassist/settings.js
index 987c3fdfc..20634ed5e 100644
--- a/apps/gassist/settings.js
+++ b/apps/gassist/settings.js
@@ -20,7 +20,6 @@
       "< Back": () => back(),
       'Front Tap:': {
         value: (appSettings.enableTap === true),
-        format: v => v ? "On" : "Off",
         onchange: v => {
           appSettings.enableTap = v;
           writeSettings();
diff --git a/apps/welcome/settings.js b/apps/welcome/settings.js
index 27a322c7f..aa374694d 100644
--- a/apps/welcome/settings.js
+++ b/apps/welcome/settings.js
@@ -5,7 +5,6 @@
     '': { 'title': 'Welcome App' },
     'Run next boot': {
       value: !settings.welcomed,
-      format: v => v ? 'Yes' : 'No',
       onchange: v => require('Storage').write('welcome.json', {welcomed: !v}),
     },
     'Run Now': () => load('welcome.app.js'),