From 952cbd661ec106d97dcfc90946c32ce68fe99010 Mon Sep 17 00:00:00 2001
From: CrypticaScriptura <7396812+CrypticaScriptura@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:25:54 -0400
Subject: [PATCH 1/2] chore: v9.0.0-rc.1 (#1661)

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f57679a..3af6df84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "lamassu-server",
-  "version": "9.0.0-beta.11",
+  "version": "9.0.0-rc.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2290875a..6e868546 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "lamassu-server",
   "description": "bitcoin atm client server protocol module",
   "keywords": [],
-  "version": "9.0.0-beta.11",
+  "version": "9.0.0-rc.1",
   "license": "./LICENSE",
   "author": "Lamassu (https://lamassu.is)",
   "dependencies": {

From 6d0e510d60b9f085bcd42e9221f3e1ed9fc5a9bb Mon Sep 17 00:00:00 2001
From: Rafael Taranto <rafael.taranto@protonmail.com>
Date: Mon, 18 Mar 2024 09:48:34 +0000
Subject: [PATCH 2/2] fix: profit display on admin

---
 .env.sample                                   |  1 -
 .sample.env                                   |  3 -
 lib/options-loader.js                         | 66 -------------------
 .../src/pages/Transactions/DetailsCard.js     |  4 +-
 tools/build-dev-env.js                        |  1 -
 5 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 .env.sample
 delete mode 100644 lib/options-loader.js

diff --git a/.env.sample b/.env.sample
deleted file mode 100644
index db93e716..00000000
--- a/.env.sample
+++ /dev/null
@@ -1 +0,0 @@
-LAMASSU_DB=DEV
\ No newline at end of file
diff --git a/.sample.env b/.sample.env
index 6f867352..c2c02bf5 100644
--- a/.sample.env
+++ b/.sample.env
@@ -1,8 +1,5 @@
 ## Database variables
 
-# Used to describe which database to use. Possible values include: DEV, RELEASE, STRESS_TEST
-LAMASSU_DB=
-
 # Postgres related environment variables
 POSTGRES_USER=
 POSTGRES_PASSWORD=
diff --git a/lib/options-loader.js b/lib/options-loader.js
deleted file mode 100644
index ba10ffc7..00000000
--- a/lib/options-loader.js
+++ /dev/null
@@ -1,66 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const os = require('os')
-const argv = require('minimist')(process.argv.slice(2))
-const _ = require('lodash/fp')
-
-require('./environment-helper')
-
-const DATABASE = process.env.LAMASSU_DB ?? 'PROD'
-const dbMapping = psqlConf => ({
-  STRESS_TEST: _.replace('lamassu', 'lamassu_stress', psqlConf),
-  PAZUZ: _.replace('lamassu', 'lamassu_pazuz', psqlConf),
-  RELEASE: _.replace('lamassu', 'lamassu_release', psqlConf),
-  DEV: _.replace('lamassu', 'lamassu', psqlConf),
-  PROD: _.replace('lamassu', 'lamassu', psqlConf)
-})
-
-/**
- * @return {{path: string, opts: any}}
- */
-function load () {
-  if (process.env.LAMASSU_CONFIG) {
-    const configPath = process.env.LAMASSU_CONFIG
-    return {
-      path: configPath,
-      opts: JSON.parse(fs.readFileSync(configPath))
-    }
-  }
-
-  if (argv.f) {
-    const configPath = argv.f
-    return {
-      path: configPath,
-      opts: JSON.parse(fs.readFileSync(configPath))
-    }
-  }
-
-  try {
-    const globalConfigPath = path.resolve('/etc', 'lamassu', 'lamassu.json')
-    const config = {
-      path: globalConfigPath,
-      opts: JSON.parse(fs.readFileSync(globalConfigPath))
-    }
-
-    config.opts.postgresql = dbMapping(config.opts.postgresql)[DATABASE]
-
-    return config
-  } catch (_) {
-    try {
-      const homeConfigPath = path.resolve(os.homedir(), '.lamassu', 'lamassu.json')
-      const config = {
-        path: homeConfigPath,
-        opts: JSON.parse(fs.readFileSync(homeConfigPath))
-      }
-
-      config.opts.postgresql = dbMapping(config.opts.postgresql)[DATABASE]
-
-      return config
-    } catch (_) {
-      console.error("Couldn't open lamassu.json config file.")
-      process.exit(1)
-    }
-  }
-}
-
-module.exports = load
diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
index afd2ad7b..57f07785 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
@@ -130,9 +130,7 @@ const DetailsRow = ({ it: tx, timezone }) => {
     }
   )
 
-  const commission = BigNumber(tx.profit)
-    .abs()
-    .toFixed(2, 1) // ROUND_DOWN
+  const commission = BigNumber(tx.profit).toFixed(2, 1) // ROUND_DOWN
   const commissionPercentage =
     Number.parseFloat(tx.commissionPercentage, 2) * 100
   const cashInFee = isCashIn ? Number.parseFloat(tx.cashInFee) : 0
diff --git a/tools/build-dev-env.js b/tools/build-dev-env.js
index ddc89de2..05b45b37 100644
--- a/tools/build-dev-env.js
+++ b/tools/build-dev-env.js
@@ -6,7 +6,6 @@ const setEnvVariable = require('./set-env-var')
 
 fs.copyFileSync(path.resolve(__dirname, '../.sample.env'), path.resolve(__dirname, '../.env'))
 
-setEnvVariable('LAMASSU_DB', 'DEV')
 setEnvVariable('POSTGRES_USER', 'postgres')
 setEnvVariable('POSTGRES_PASSWORD', 'postgres123')
 setEnvVariable('POSTGRES_HOST', 'localhost')