From 0cd14ba3986abb350ed66ec1008ae573e6284cdc Mon Sep 17 00:00:00 2001
From: Cesar <26280794+csrapr@users.noreply.github.com>
Date: Thu, 17 Dec 2020 16:00:39 +0000
Subject: [PATCH] Fix: blacklist modal not opening

Fix: no more fetching of non operator added addresses for blacklisted
addresses table.

Fix: trim address white spaces before sending it to database query
---
 lib/blacklist.js                                        | 4 ++--
 new-lamassu-admin/src/pages/Blacklist/Blacklist.js      | 2 +-
 new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/blacklist.js b/lib/blacklist.js
index 4415675f..1e1d91d7 100644
--- a/lib/blacklist.js
+++ b/lib/blacklist.js
@@ -1,8 +1,8 @@
 const db = require('./db')
 
-// Get all blacklist rows from the DB "blacklist" table
+// Get all blacklist rows from the DB "blacklist" table that were manually inserted by the operator
 const getBlacklist = () => {
-  return db.any('select * from blacklist').then(res =>
+  return db.any(`SELECT * FROM blacklist WHERE created_by_operator = 't'`).then(res =>
     res.map(item => ({
       cryptoCode: item.crypto_code,
       address: item.address,
diff --git a/new-lamassu-admin/src/pages/Blacklist/Blacklist.js b/new-lamassu-admin/src/pages/Blacklist/Blacklist.js
index ce91ef55..f40c8bfc 100644
--- a/new-lamassu-admin/src/pages/Blacklist/Blacklist.js
+++ b/new-lamassu-admin/src/pages/Blacklist/Blacklist.js
@@ -121,7 +121,7 @@ const Blacklist = () => {
   return (
     <>
       <TitleSection title="Blacklisted addresses">
-        <Link onClick={() => setShowModal(false)}>Blacklist new addresses</Link>
+        <Link onClick={() => setShowModal(true)}>Blacklist new addresses</Link>
       </TitleSection>
       <Grid container className={classes.grid}>
         <Sidebar
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js
index 1e6877e2..1e07df41 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js
+++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js
@@ -45,7 +45,7 @@ const BlackListModal = ({ onClose, selectedCoin, addToBlacklist }) => {
             .required('An address is required')
         })}
         onSubmit={({ address }, { resetForm }) => {
-          handleAddToBlacklist(address)
+          handleAddToBlacklist(address.trim())
           resetForm()
         }}>
         <Form id="address-form">