Merge pull request #843 from setlife-network/or/issue-842/send-bonuse…

…s-button-not-show-UI Send bonuses button does not show in UI
setlife-network · Jul 5, 2023 · f5e5426 · f5e5426
2 parents 56a79ce + 22b2085
commit f5e5426
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.env.example b/.env.example
@@ -21,12 +21,12 @@ BTCPAYSERVER_WALLET_ID=
 BTCPAYSERVER_SECRET=
 OAUTH_REDIRECT_NEW_USERS=
 OAUTH_REDIRECT_EXISTING_USERS=
-TEMP_AUTHORIZED_SUPERUSER_ID=
 
 # Frontend environment variables (/src)
 # require `REACT_APP_` prefix
 REACT_APP_API_URL=localhost:6001
 REACT_APP_SITE_URL=localhost:6002
+REACT_APP_TEMP_AUTHORIZED_SUPERUSER_ID=
 
 # Required only for running tests
 TESTCAFE_ROLE_GITHUB_EMAIL=

diff --git a/api/config/constants.js b/api/config/constants.js
@@ -1,7 +1,7 @@
 require('dotenv').config()
 
 module.exports = {
-    TEMP_AUTHORIZED_SUPERUSER_ID: process.env.TEMP_AUTHORIZED_SUPERUSER_ID,
+    TEMP_AUTHORIZED_SUPERUSER_ID: process.env.REACT_APP_TEMP_AUTHORIZED_SUPERUSER_ID,
     GITHUB_OAUTH_URL: 'https://github.com/login/oauth/access_token',
     INVOICELY_CSV_PATH: `${process.env.INVOICELY_CSV_PATH}`,
     SITE_ROOT: process.env.NODE_ENV == 'production'

diff --git a/api/schema/resolvers/PaymentResolver.js b/api/schema/resolvers/PaymentResolver.js
@@ -153,7 +153,10 @@ module.exports = {
             }
         },
         sendPayment: async (root, { contributors }, { cookies, models }) => {
-            if (cookies.userSession === TEMP_AUTHORIZED_SUPERUSER_ID) {
+            if (
+                cookies.userSession &&
+                cookies.userSession.toString() === TEMP_AUTHORIZED_SUPERUSER_ID?.toString()
+            ) {
                 const results = []
                 const onChainAddresses = []
 

diff --git a/srcv2/pages/ProjectDetailPage.js b/srcv2/pages/ProjectDetailPage.js
@@ -28,6 +28,8 @@ const ProjectDetailPage = (props) => {
     const [openAddContributorOverlay, setOpenAddContributorOverlay] = useState(false)
     const [screenIndex, setScreenIndex] = useState(0)
 
+    const isSuperUser = process.env.REACT_APP_TEMP_AUTHORIZED_SUPERUSER_ID
+
     const {
         data: dataProject,
         loading: loadingProject,
@@ -183,7 +185,7 @@ const ProjectDetailPage = (props) => {
                             Active Contributors
                         </p>
                     </div>
-                    {sessionUser().id === TEMP_AUTHORIZED_SUPERUSER_ID &&
+                    {sessionUser().id == isSuperUser &&
                         <button
                             type='button'
                             className='border-2 border-setlife text-setlife rounded-full py-1 mb-4 w-fit h-fit px-2 ml-auto'