diff --git a/src/server/locale/CA/mutations/short_term_q.js b/src/server/locale/CA/mutations/short_term_q.js
index bd10412b2a..90298255b2 100644
--- a/src/server/locale/CA/mutations/short_term_q.js
+++ b/src/server/locale/CA/mutations/short_term_q.js
@@ -141,11 +141,7 @@ export default {
                 headline: [
                     {
                         tag: 'medium',
-                        br: ['payments', 'versements'],
-                        replace: [
-                            ['00.', '00'],
-                            ['00 $.', '00 $']
-                        ]
+                        br: ['payments', 'versements']
                     },
                     {
                         tag: 'xsmall.2',
@@ -165,11 +161,7 @@ export default {
                 headline: [
                     {
                         tag: 'medium',
-                        br: ['payments', 'versements'],
-                        replace: [
-                            ['00.', '00'],
-                            ['00 $.', '00 $']
-                        ]
+                        br: ['payments', 'versements']
                     },
                     {
                         tag: 'xsmall.2',
diff --git a/utils/devServerProxy/lib/devAccountDetails.js b/utils/devServerProxy/lib/devAccountDetails.js
index 9a2c1580bc..1ee5b062d3 100644
--- a/utils/devServerProxy/lib/devAccountDetails.js
+++ b/utils/devServerProxy/lib/devAccountDetails.js
@@ -20,6 +20,24 @@ const selectBestOffer = (offers = [], amount) =>
         undefined
     );
 
+const selectMessageThreshold = (messageThresholds, amount) => {
+    const numberAmount = Number(amount);
+
+    if (amount === undefined || amount === '' || Number.isNaN(numberAmount)) {
+        return messageThresholds.find(({ amount: minAmount }) => minAmount === 0) ?? messageThresholds[0];
+    }
+
+    return (
+        messageThresholds.reduce(
+            (selected, threshold) =>
+                threshold.amount <= numberAmount && (!selected || threshold.amount > selected.amount)
+                    ? threshold
+                    : selected,
+            undefined
+        ) ?? messageThresholds[0]
+    );
+};
+
 /**
  * @description Get labels based on country
  * @param {string} country
@@ -121,10 +139,7 @@ export default function getDevAccountDetails({ account, amount, buyerCountry })
 
     if (devAccountMapV2[account]) {
         const { country, modalViews, messageThresholds, offers } = devAccountMapV2[account];
-        const selectedMessage =
-            messageThresholds.findLast(
-                ({ amount: minAmount }) => (amount === undefined && amount === minAmount) || minAmount <= amount
-            ) ?? messageThresholds[0];
+        const selectedMessage = selectMessageThreshold(messageThresholds, amount);
 
         const messageTemplate =
             buyerCountry && buyerCountry !== country && selectedMessage.templateXB