Skip to content

Bkpr Miscellaneous fixes #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 5, 2025
Merged

Bkpr Miscellaneous fixes #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e89f97
Set env var `GENERATE_SOURCEMAP` to false for avoiding sourcemap warn…
ShahanaFarooqui Jun 5, 2025
322fca1
Update git action upload artifact to version 4
ShahanaFarooqui Jun 5, 2025
2100d8b
Account Event timestamp should be set to the latest event timestamp
ShahanaFarooqui Jun 5, 2025
1b118b2
Add space in bkpr tooltip
ShahanaFarooqui Jun 5, 2025
b0629fe
Build with misc fixes
ShahanaFarooqui Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Compress files
run: tar -czf /tmp/clnapp.tar.gz apps/frontend/build apps/backend/dist package.json package-lock.json

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: clnapp-build$VERSION
path: /tmp/clnapp.tar.gz
Expand Down
6 changes: 3 additions & 3 deletions apps/frontend/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.94b1eb52.css",
"main.js": "/static/js/main.07a60e9b.js",
"main.js": "/static/js/main.d3dd4331.js",
"static/css/687.19b1d4d6.chunk.css": "/static/css/687.19b1d4d6.chunk.css",
"static/js/687.c6039462.chunk.js": "/static/js/687.c6039462.chunk.js",
"static/css/648.1c4becff.chunk.css": "/static/css/648.1c4becff.chunk.css",
Expand All @@ -21,7 +21,7 @@
"static/media/Inter-Thin.ttf": "/static/media/Inter-Thin.f341ca512063c66296d1.ttf",
"index.html": "/index.html",
"main.94b1eb52.css.map": "/static/css/main.94b1eb52.css.map",
"main.07a60e9b.js.map": "/static/js/main.07a60e9b.js.map",
"main.d3dd4331.js.map": "/static/js/main.d3dd4331.js.map",
"687.19b1d4d6.chunk.css.map": "/static/css/687.19b1d4d6.chunk.css.map",
"687.c6039462.chunk.js.map": "/static/js/687.c6039462.chunk.js.map",
"648.1c4becff.chunk.css.map": "/static/css/648.1c4becff.chunk.css.map",
Expand All @@ -38,6 +38,6 @@
},
"entrypoints": [
"static/css/main.94b1eb52.css",
"static/js/main.07a60e9b.js"
"static/js/main.d3dd4331.js"
]
}
2 changes: 1 addition & 1 deletion apps/frontend/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="/images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.07a60e9b.js"></script><link href="/static/css/main.94b1eb52.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="/images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.d3dd4331.js"></script><link href="/static/css/main.94b1eb52.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
3 changes: 0 additions & 3 deletions apps/frontend/build/static/js/main.07a60e9b.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions apps/frontend/build/static/js/main.d3dd4331.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...ld/static/js/main.07a60e9b.js.LICENSE.txt → ...ld/static/js/main.d3dd4331.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tend/build/static/js/main.07a60e9b.js.map → ...tend/build/static/js/main.d3dd4331.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...rontend/src/components/bookkeeper/AccountEvents/AccountEventsGraph/AccountEventsGraph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ const AccountEventsGraphTooltip = ({ active, payload, unit }: { active?: boolean
const total = payload.reduce((sum, entry) => sum + (entry.value || 0), 0);
return (
<div className='bkpr-tooltip p-3'>
<p><strong>Period:</strong>{payload[0].payload.period_key}</p>
<p><strong>Total:</strong>{formatCurrency(total, Units.MSATS, unit, false, 0, 'string')}</p>
<p><strong>Period: </strong>{payload[0].payload.period_key}</p>
<p><strong>Total: </strong>{formatCurrency(total, Units.MSATS, unit, false, 0, 'string')}</p>
<hr />
{payload.map((entry, index) => (
<p className='ps-4' key={index} style={{ color: entry.color }}>
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/components/bookkeeper/SatsFlow/SatsFlowGraph/SatsFlowGraph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const SatsFlowGraphTooltip = ({ active, payload, label, unit, periods }: any) =>
if (!period) return null;
return (
<div className='bkpr-tooltip p-3'>
<p><strong>Period:</strong>{period.period_key}</p>
<p><strong>Period: </strong>{period.period_key}</p>
<hr />
<p>Period Inflow: {formatCurrency(period.inflow_msat, Units.MSATS, unit, false, 0, 'string')}</p>
<p>Period Outflow: {formatCurrency(period.outflow_msat, Units.MSATS, unit, false, 0, 'string')}</p>
Expand Down
2 changes: 2 additions & 0 deletions apps/frontend/src/services/data-transform.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ export function transformAccountEventsByPeriods(
existingAccount.balance_msat += currentAccount.balance_msat;
existingAccount.credit_msat += currentAccount.credit_msat;
existingAccount.debit_msat += currentAccount.debit_msat;
// Update timestamp to latest
existingAccount.timestamp = currentAccount.timestamp;
} else {
const newAccount = {...currentAccount};
prevAccounts.set(currentAccount.account, newAccount);
Expand Down
1 change: 1 addition & 0 deletions env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
SETUP=${1:-local}

export GENERATE_SOURCEMAP=false
export APP_BITCOIN_NETWORK="regtest"
export BITCOIN_NETWORK="$APP_BITCOIN_NETWORK"
if [[ "$APP_BITCOIN_NETWORK" == "mainnet" ]]; then
Expand Down