Merge pull request #1246 from RafaelTaranto/backport/blacklist-message

LAM-629 backport: blacklist message
lamassu · Nov 29, 2024 · 6cdb40e · 6cdb40e
2 parents bedd930 + ce2fcf1
commit 6cdb40e
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 14 deletions.
diff --git a/i18n/ui/lbm-ui_en-US.po b/i18n/ui/lbm-ui_en-US.po
@@ -702,10 +702,6 @@ msgstr "Yes, verify phone"
 msgid "Suspicious address"
 msgstr "Suspicious address"
 
-#: On screen: suspicious-address
-msgid "This address may be associated with a deceptive offer or a prohibited group. Please make sure you're using an address from your own wallet."
-msgstr "This address may be associated with a deceptive offer or a prohibited group. Please make sure you're using an address from your own wallet."
-
 #: On screen: booting
 msgid "Booting up..."
 msgstr "Booting up..."
@@ -1074,6 +1070,10 @@ msgstr "Discount added (%s off commissions)"
 msgid "An error occurred, try again."
 msgstr "An error occurred, try again."
 
+#: On screen: dynamic
+msgid "This address may be associated with a deceptive offer or a prohibited group. Please make sure you\'re using an address from your own wallet."
+msgstr "This address may be associated with a deceptive offer or a prohibited group. Please make sure you\'re using an address from your own wallet."
+
 #: On screen: coins
 msgid "Bitcoin"
 msgstr "Bitcoin"

diff --git a/lib/brain.js b/lib/brain.js
@@ -2806,7 +2806,7 @@ Brain.prototype._handleScan = function _handleScan (address) {
 
       if (it.blacklisted) {
         return setTimeout(() => {
-          this._timedState('suspiciousAddress')
+          this._timedState('suspiciousAddress', { data: { blacklistMessage: it.blacklistMessage } })
         }, remaining)
       }
 

diff --git a/ui/html/suspicious-address.html b/ui/html/suspicious-address.html
@@ -10,8 +10,7 @@
   <main>
     <h3 class="js-i18n xs-margin-bottom">Suspicious address</h3>
     <div class="text-content sm-margin-top">
-      <p class="js-i18n d2">
-        This address may be associated with a deceptive offer or a prohibited group. Please make sure you're using an address from your own wallet.
+      <p id="suspicious-address-message" class="d2">
       </p>
     </div>
   </main>

diff --git a/ui/js/app.js b/ui/js/app.js
diff --git a/ui/js/app.js.map b/ui/js/app.js.map
diff --git a/ui/js/docker-app.js b/ui/js/docker-app.js
diff --git a/ui/src/app.js b/ui/src/app.js
@@ -300,6 +300,10 @@ function processData (data) {
       clearTimeout(complianceTimeout)
       externalCompliance(data.externalComplianceUrl)
       break
+    case 'suspiciousAddress':
+      suspiciousAddress(data.blacklistMessage)
+      setState('suspicious_address')
+      break
     case 'rates':
       setState('rates')
       break
@@ -2097,6 +2101,14 @@ function externalCompliance (url) {
   return setScreen('external_compliance')
 }
 
+function suspiciousAddress (blacklistMessage) {
+  if (blacklistMessage) {
+    $(`#suspicious-address-message`).html(blacklistMessage)
+  } else {
+    $(`#suspicious-address-message`).html(translate("This address may be associated with a deceptive offer or a prohibited group. Please make sure you\'re using an address from your own wallet."))
+  }
+}
+
 function setScreenOptions (opts) {
   (opts.rates && opts.rates.active) ? $('#rates-section').show() : $('#rates-section').hide()
 }

diff --git a/ui/start-docker.html b/ui/start-docker.html
@@ -2506,8 +2506,7 @@ <h3 class="js-i18n nm-margin-bottom">Verify phone to continue</h3>
       <main>
         <h3 class="js-i18n xs-margin-bottom">Suspicious address</h3>
         <div class="text-content sm-margin-top">
-          <p class="js-i18n d2">
-            This address may be associated with a deceptive offer or a prohibited group. Please make sure you're using an address from your own wallet.
+          <p id="suspicious-address-message" class="d2">
           </p>
         </div>
       </main>

diff --git a/ui/start-test.html b/ui/start-test.html
@@ -2506,8 +2506,7 @@ <h3 class="js-i18n nm-margin-bottom">Verify phone to continue</h3>
       <main>
         <h3 class="js-i18n xs-margin-bottom">Suspicious address</h3>
         <div class="text-content sm-margin-top">
-          <p class="js-i18n d2">
-            This address may be associated with a deceptive offer or a prohibited group. Please make sure you're using an address from your own wallet.
+          <p id="suspicious-address-message" class="d2">
           </p>
         </div>
       </main>

diff --git a/ui/start.html b/ui/start.html
@@ -2506,8 +2506,7 @@ <h3 class="js-i18n nm-margin-bottom">Verify phone to continue</h3>
       <main>
         <h3 class="js-i18n xs-margin-bottom">Suspicious address</h3>
         <div class="text-content sm-margin-top">
-          <p class="js-i18n d2">
-            This address may be associated with a deceptive offer or a prohibited group. Please make sure you're using an address from your own wallet.
+          <p id="suspicious-address-message" class="d2">
           </p>
         </div>
       </main>