From b6404775e27caad762e99e4ae7ae06925b5609ba Mon Sep 17 00:00:00 2001
From: Sander Declerck <sander@sdsoftware.be>
Date: Thu, 11 Sep 2025 14:49:54 +0200
Subject: [PATCH] PR Comments: use safeChainArgs and use defined constants

---
 .../safe-chain/src/config/cliArguments.js     | 31 ++++++++++++++-----
 packages/safe-chain/src/config/settings.js    |  2 +-
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/safe-chain/src/config/cliArguments.js b/packages/safe-chain/src/config/cliArguments.js
index 2bf546b..87abb7b 100644
--- a/packages/safe-chain/src/config/cliArguments.js
+++ b/packages/safe-chain/src/config/cliArguments.js
@@ -12,22 +12,39 @@ export function initializeCliArguments(args) {
   const remainingArgs = [];
 
   for (const arg of args) {
-    if (arg.startsWith(SAFE_CHAIN_ARG_PREFIX)) {
+    if (arg.toLowerCase().startsWith(SAFE_CHAIN_ARG_PREFIX)) {
       safeChainArgs.push(arg);
-
-      if (arg.startsWith(SAFE_CHAIN_ARG_PREFIX + "malware-action=")) {
-        state.malwareAction = arg.substring(
-          (SAFE_CHAIN_ARG_PREFIX + "malware-action=").length
-        );
-      }
     } else {
       remainingArgs.push(arg);
     }
   }
 
+  setMalwareAction(safeChainArgs);
+
   return remainingArgs;
 }
 
+function setMalwareAction(args) {
+  const safeChainMalwareActionArg = SAFE_CHAIN_ARG_PREFIX + "malware-action=";
+
+  const action = getLastArgEqualsValue(args, safeChainMalwareActionArg);
+  if (!action) {
+    return;
+  }
+  state.malwareAction = action.toLowerCase();
+}
+
+function getLastArgEqualsValue(args, prefix) {
+  for (var i = args.length - 1; i >= 0; i--) {
+    const arg = args[i];
+    if (arg.toLowerCase().startsWith(prefix)) {
+      return arg.substring(prefix.length);
+    }
+  }
+
+  return undefined;
+}
+
 export function getMalwareAction() {
   return state.malwareAction;
 }
diff --git a/packages/safe-chain/src/config/settings.js b/packages/safe-chain/src/config/settings.js
index 53c8fb5..ed2cae2 100644
--- a/packages/safe-chain/src/config/settings.js
+++ b/packages/safe-chain/src/config/settings.js
@@ -7,7 +7,7 @@ export function getMalwareAction() {
     return MALWARE_ACTION_PROMPT;
   }
 
-  return "block";
+  return MALWARE_ACTION_BLOCK;
 }
 
 export const MALWARE_ACTION_BLOCK = "block";