Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions platforms/ecurrency/api/src/controllers/CurrencyController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ export class CurrencyController {
return res.status(401).json({ error: "Authentication required" });
}

const { name, description, groupId, allowNegative, maxNegativeBalance } = req.body;
const { name, description, groupId, allowNegative, maxNegativeBalance, allowNegativeGroupOnly } = req.body;

if (!name || !groupId) {
return res.status(400).json({ error: "Name and groupId are required" });
}

const allowNegativeFlag = Boolean(allowNegative);
const allowNegativeGroupOnlyFlag = Boolean(allowNegativeGroupOnly);
let normalizedMaxNegative: number | null = null;

if (maxNegativeBalance !== undefined && maxNegativeBalance !== null && maxNegativeBalance !== "") {
Expand All@@ -48,7 +49,8 @@ export class CurrencyController {
req.user.id,
allowNegativeFlag,
normalizedMaxNegative,
description
description,
allowNegativeGroupOnlyFlag
);

res.status(201).json({
Expand All@@ -58,6 +60,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -81,6 +84,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand DownExpand Up@@ -108,6 +112,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -130,6 +135,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ export class LedgerController {
name: b.currency.name,
ename: b.currency.ename,
allowNegative: b.currency.allowNegative,
allowNegativeGroupOnly: b.currency.allowNegativeGroupOnly,
},
balance: b.balance,
})));
Expand Down
3 changes: 3 additions & 0 deletions platforms/ecurrency/api/src/database/entities/Currency.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,9 @@ export class Currency {
@Column("decimal", { precision: 18, scale: 2, nullable: true })
maxNegativeBalance!: number | null;

@Column({ default: false })
allowNegativeGroupOnly!: boolean;

@Column()
createdBy!: string;

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddAllowNegativeGroupOnly1771523000000 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" ADD "allowNegativeGroupOnly" boolean NOT NULL DEFAULT false`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" DROP COLUMN "allowNegativeGroupOnly"`);
}
}
8 changes: 7 additions & 1 deletion platforms/ecurrency/api/src/services/CurrencyService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ export class CurrencyService {
createdBy: string,
allowNegative: boolean = false,
maxNegativeBalance: number | null = null,
description?: string
description?: string,
allowNegativeGroupOnly: boolean = false
): Promise<Currency> {
Comment thread
Bekiboo marked this conversation as resolved.
// Verify user is group admin
const isAdmin = await this.groupService.isGroupAdmin(groupId, createdBy);
Expand All@@ -46,6 +47,10 @@ export class CurrencyService {
}
}

if (allowNegativeGroupOnly && !allowNegative) {
throw new Error("Cannot restrict overdraft to group members when negative balances are disabled");
}

const currency = this.currencyRepository.create({
name,
description,
Expand All@@ -54,6 +59,7 @@ export class CurrencyService {
createdBy,
allowNegative,
maxNegativeBalance,
allowNegativeGroupOnly,
});

const savedCurrency = await this.currencyRepository.save(currency);
Expand Down
14 changes: 14 additions & 0 deletions platforms/ecurrency/api/src/services/GroupService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -234,5 +234,19 @@ export class GroupService {
if (!group) return false;
return group.admins.some(admin => admin.id === userId);
}

async isUserInGroup(groupId: string, userId: string): Promise<boolean> {
const group = await this.groupRepository.findOne({
where: { id: groupId },
relations: ["members", "participants", "admins"]
});
if (!group) return false;

// Check if user is the owner, a member, participant, or admin
return group.owner === userId ||
group.members.some(m => m.id === userId) ||
group.participants.some(p => p.id === userId) ||
group.admins.some(a => a.id === userId);
}
}

45 changes: 36 additions & 9 deletions platforms/ecurrency/api/src/services/LedgerService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,18 @@ import { Currency } from "../database/entities/Currency";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { TransactionNotificationService } from "./TransactionNotificationService";
import { GroupService } from "./GroupService";
import crypto from "crypto";

export class LedgerService {
ledgerRepository: Repository<Ledger>;
currencyRepository: Repository<Currency>;
groupService: GroupService;

constructor() {
this.ledgerRepository = AppDataSource.getRepository(Ledger);
this.currencyRepository = AppDataSource.getRepository(Currency);
this.groupService = new GroupService();
}

private computeHash(payload: any): string {
Expand All@@ -28,6 +31,23 @@ export class LedgerService {
return prev?.hash ?? null;
}

/**
* Validates whether a debit of `amount` from `currentBalance` is allowed
* given the currency's negative-balance settings.
*/
private validateNegativeAllowance(currency: Currency, currentBalance: number, amount: number): void {
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
}
}
}

async getAccountBalance(currencyId: string, accountId: string, accountType: AccountType): Promise<number> {
const latestEntry = await this.ledgerRepository.findOne({
where: {
Expand DownExpand Up@@ -132,16 +152,23 @@ export class LedgerService {

const currentBalance = await this.getAccountBalance(currencyId, fromAccountId, fromAccountType);

// Validate debit bounds
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
// Validate debit bounds.
// When allowNegativeGroupOnly is true, only group members may overdraft;
// non-members are limited to their current balance. Note: the invariant
// allowNegativeGroupOnly ⇒ allowNegative is enforced at creation time
// in CurrencyService.createCurrency.
if (currency.allowNegativeGroupOnly && fromAccountType === AccountType.USER) {
const isMember = await this.groupService.isUserInGroup(currency.groupId, fromAccountId);

if (!isMember) {
if (currentBalance < amount) {
throw new Error("Insufficient balance. Only group members can have negative balances for this currency.");
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}

// Create debit entry (from sender's account)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
const [description, setDescription] = useState("");
const [groupId, setGroupId] = useState("");
const [allowNegative, setAllowNegative] = useState(false);
const [allowNegativeGroupOnly, setAllowNegativeGroupOnly] = useState(false);
const [maxNegativeInput, setMaxNegativeInput] = useState("");
const [error, setError] = useState<string | null>(null);
const queryClient = useQueryClient();
Expand All@@ -28,6 +29,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description?: string;
groupId: string;
allowNegative: boolean;
allowNegativeGroupOnly: boolean;
maxNegativeBalance: number | null;
}) => {
const response = await apiClient.post("/api/currencies", data);
Expand All@@ -40,6 +42,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
setDescription("");
setGroupId("");
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
setError(null);
onOpenChange(false);
Expand DownExpand Up@@ -91,6 +94,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description,
groupId,
allowNegative,
allowNegativeGroupOnly,
maxNegativeBalance: maxNegativeValue,
});
}}
Expand DownExpand Up@@ -142,6 +146,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
type="button"
onClick={() => {
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
}}
className={`p-4 border-2 rounded-lg text-left transition-all ${
Expand DownExpand Up@@ -173,8 +178,24 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
</div>

{allowNegative && (
<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<>
<div>
<label className="flex items-center gap-2 cursor-pointer">
<input
type="checkbox"
checked={allowNegativeGroupOnly}
onChange={(e) => setAllowNegativeGroupOnly(e.target.checked)}
className="w-4 h-4 rounded border-gray-300"
/>
<span className="text-sm font-medium">Restrict overdraft to group members only</span>
</label>
<p className="text-xs text-muted-foreground mt-1 ml-6">
When enabled, only users who are members of the currency's group can have negative balances. Non-members must maintain a positive balance.
</p>
</div>

<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<input
type="number"
min={0}
Expand All@@ -189,6 +210,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
Limit how far any account can go below zero (max {MAX_NEGATIVE_LIMIT.toLocaleString()}).
</p>
</div>
</>
)}

{error && (
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,9 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
)}
{fromCurrencyData && fromCurrencyData.allowNegative && (
<p className="text-sm text-muted-foreground mt-1">
Negative balances are allowed for this currency
{fromCurrencyData.allowNegativeGroupOnly
? "Negative balances allowed for group members"
: "Negative balances are allowed for this currency"}
</p>
)}
</div>
Expand DownExpand Up@@ -353,15 +355,6 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
</div>
)}

{/* Mutation Error */}
{transferMutation.isError && (
<div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg">
{transferMutation.error instanceof Error
? transferMutation.error.message
: "An error occurred while processing the transfer"}
</div>
)}

<div className="flex gap-2 justify-end pt-4">
<button
type="button"
Expand Down
4 changes: 3 additions & 1 deletion platforms/ecurrency/client/client/src/pages/dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,9 @@ export default function Dashboard() {
<div className="text-xs text-white/80 mt-1">{formatEName(balance.currency.ename)}</div>
{balance.currency.allowNegative !== undefined && (
<div className="text-xs px-2 py-0.5 rounded bg-white/20 text-white/90 mt-1 inline-block">
{balance.currency.allowNegative ? "Negative Allowed" : "No Negative"}
{balance.currency.allowNegative
? (balance.currency.allowNegativeGroupOnly ? "Negative Allowed (Members only)" : "Negative Allowed")
: "No Negative"}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion platforms/ecurrency/client/vite.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import path from "path";

const envDir = path.resolve(import.meta.dirname, "../../");
const envDir = path.resolve(import.meta.dirname, "../../../");
console.log("🔍 Vite envDir:", envDir);

export default defineConfig({
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions platforms/ecurrency/api/src/controllers/CurrencyController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ export class CurrencyController {
return res.status(401).json({ error: "Authentication required" });
}

const { name, description, groupId, allowNegative, maxNegativeBalance } = req.body;
const { name, description, groupId, allowNegative, maxNegativeBalance, allowNegativeGroupOnly } = req.body;

if (!name || !groupId) {
return res.status(400).json({ error: "Name and groupId are required" });
}

const allowNegativeFlag = Boolean(allowNegative);
const allowNegativeGroupOnlyFlag = Boolean(allowNegativeGroupOnly);
let normalizedMaxNegative: number | null = null;

if (maxNegativeBalance !== undefined && maxNegativeBalance !== null && maxNegativeBalance !== "") {
Expand All@@ -48,7 +49,8 @@ export class CurrencyController {
req.user.id,
allowNegativeFlag,
normalizedMaxNegative,
description
description,
allowNegativeGroupOnlyFlag
);

res.status(201).json({
Expand All@@ -58,6 +60,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -81,6 +84,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand DownExpand Up@@ -108,6 +112,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -130,6 +135,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ export class LedgerController {
name: b.currency.name,
ename: b.currency.ename,
allowNegative: b.currency.allowNegative,
allowNegativeGroupOnly: b.currency.allowNegativeGroupOnly,
},
balance: b.balance,
})));
Expand Down
3 changes: 3 additions & 0 deletions platforms/ecurrency/api/src/database/entities/Currency.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,9 @@ export class Currency {
@Column("decimal", { precision: 18, scale: 2, nullable: true })
maxNegativeBalance!: number | null;

@Column({ default: false })
allowNegativeGroupOnly!: boolean;

@Column()
createdBy!: string;

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddAllowNegativeGroupOnly1771523000000 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" ADD "allowNegativeGroupOnly" boolean NOT NULL DEFAULT false`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" DROP COLUMN "allowNegativeGroupOnly"`);
}
}
8 changes: 7 additions & 1 deletion platforms/ecurrency/api/src/services/CurrencyService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ export class CurrencyService {
createdBy: string,
allowNegative: boolean = false,
maxNegativeBalance: number | null = null,
description?: string
description?: string,
allowNegativeGroupOnly: boolean = false
): Promise<Currency> {
Comment thread
Bekiboo marked this conversation as resolved.
// Verify user is group admin
const isAdmin = await this.groupService.isGroupAdmin(groupId, createdBy);
Expand All@@ -46,6 +47,10 @@ export class CurrencyService {
}
}

if (allowNegativeGroupOnly && !allowNegative) {
throw new Error("Cannot restrict overdraft to group members when negative balances are disabled");
}

const currency = this.currencyRepository.create({
name,
description,
Expand All@@ -54,6 +59,7 @@ export class CurrencyService {
createdBy,
allowNegative,
maxNegativeBalance,
allowNegativeGroupOnly,
});

const savedCurrency = await this.currencyRepository.save(currency);
Expand Down
14 changes: 14 additions & 0 deletions platforms/ecurrency/api/src/services/GroupService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -234,5 +234,19 @@ export class GroupService {
if (!group) return false;
return group.admins.some(admin => admin.id === userId);
}

async isUserInGroup(groupId: string, userId: string): Promise<boolean> {
const group = await this.groupRepository.findOne({
where: { id: groupId },
relations: ["members", "participants", "admins"]
});
if (!group) return false;

// Check if user is the owner, a member, participant, or admin
return group.owner === userId ||
group.members.some(m => m.id === userId) ||
group.participants.some(p => p.id === userId) ||
group.admins.some(a => a.id === userId);
}
}

45 changes: 36 additions & 9 deletions platforms/ecurrency/api/src/services/LedgerService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,18 @@ import { Currency } from "../database/entities/Currency";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { TransactionNotificationService } from "./TransactionNotificationService";
import { GroupService } from "./GroupService";
import crypto from "crypto";

export class LedgerService {
ledgerRepository: Repository<Ledger>;
currencyRepository: Repository<Currency>;
groupService: GroupService;

constructor() {
this.ledgerRepository = AppDataSource.getRepository(Ledger);
this.currencyRepository = AppDataSource.getRepository(Currency);
this.groupService = new GroupService();
}

private computeHash(payload: any): string {
Expand All@@ -28,6 +31,23 @@ export class LedgerService {
return prev?.hash ?? null;
}

/**
* Validates whether a debit of `amount` from `currentBalance` is allowed
* given the currency's negative-balance settings.
*/
private validateNegativeAllowance(currency: Currency, currentBalance: number, amount: number): void {
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
}
}
}

async getAccountBalance(currencyId: string, accountId: string, accountType: AccountType): Promise<number> {
const latestEntry = await this.ledgerRepository.findOne({
where: {
Expand DownExpand Up@@ -132,16 +152,23 @@ export class LedgerService {

const currentBalance = await this.getAccountBalance(currencyId, fromAccountId, fromAccountType);

// Validate debit bounds
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
// Validate debit bounds.
// When allowNegativeGroupOnly is true, only group members may overdraft;
// non-members are limited to their current balance. Note: the invariant
// allowNegativeGroupOnly ⇒ allowNegative is enforced at creation time
// in CurrencyService.createCurrency.
if (currency.allowNegativeGroupOnly && fromAccountType === AccountType.USER) {
const isMember = await this.groupService.isUserInGroup(currency.groupId, fromAccountId);

if (!isMember) {
if (currentBalance < amount) {
throw new Error("Insufficient balance. Only group members can have negative balances for this currency.");
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}

// Create debit entry (from sender's account)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
const [description, setDescription] = useState("");
const [groupId, setGroupId] = useState("");
const [allowNegative, setAllowNegative] = useState(false);
const [allowNegativeGroupOnly, setAllowNegativeGroupOnly] = useState(false);
const [maxNegativeInput, setMaxNegativeInput] = useState("");
const [error, setError] = useState<string | null>(null);
const queryClient = useQueryClient();
Expand All@@ -28,6 +29,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description?: string;
groupId: string;
allowNegative: boolean;
allowNegativeGroupOnly: boolean;
maxNegativeBalance: number | null;
}) => {
const response = await apiClient.post("/api/currencies", data);
Expand All@@ -40,6 +42,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
setDescription("");
setGroupId("");
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
setError(null);
onOpenChange(false);
Expand DownExpand Up@@ -91,6 +94,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description,
groupId,
allowNegative,
allowNegativeGroupOnly,
maxNegativeBalance: maxNegativeValue,
});
}}
Expand DownExpand Up@@ -142,6 +146,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
type="button"
onClick={() => {
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
}}
className={`p-4 border-2 rounded-lg text-left transition-all ${
Expand DownExpand Up@@ -173,8 +178,24 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
</div>

{allowNegative && (
<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<>
<div>
<label className="flex items-center gap-2 cursor-pointer">
<input
type="checkbox"
checked={allowNegativeGroupOnly}
onChange={(e) => setAllowNegativeGroupOnly(e.target.checked)}
className="w-4 h-4 rounded border-gray-300"
/>
<span className="text-sm font-medium">Restrict overdraft to group members only</span>
</label>
<p className="text-xs text-muted-foreground mt-1 ml-6">
When enabled, only users who are members of the currency's group can have negative balances. Non-members must maintain a positive balance.
</p>
</div>

<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<input
type="number"
min={0}
Expand All@@ -189,6 +210,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
Limit how far any account can go below zero (max {MAX_NEGATIVE_LIMIT.toLocaleString()}).
</p>
</div>
</>
)}

{error && (
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,9 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
)}
{fromCurrencyData && fromCurrencyData.allowNegative && (
<p className="text-sm text-muted-foreground mt-1">
Negative balances are allowed for this currency
{fromCurrencyData.allowNegativeGroupOnly
? "Negative balances allowed for group members"
: "Negative balances are allowed for this currency"}
</p>
)}
</div>
Expand DownExpand Up@@ -353,15 +355,6 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
</div>
)}

{/* Mutation Error */}
{transferMutation.isError && (
<div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg">
{transferMutation.error instanceof Error
? transferMutation.error.message
: "An error occurred while processing the transfer"}
</div>
)}

<div className="flex gap-2 justify-end pt-4">
<button
type="button"
Expand Down
4 changes: 3 additions & 1 deletion platforms/ecurrency/client/client/src/pages/dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,9 @@ export default function Dashboard() {
<div className="text-xs text-white/80 mt-1">{formatEName(balance.currency.ename)}</div>
{balance.currency.allowNegative !== undefined && (
<div className="text-xs px-2 py-0.5 rounded bg-white/20 text-white/90 mt-1 inline-block">
{balance.currency.allowNegative ? "Negative Allowed" : "No Negative"}
{balance.currency.allowNegative
? (balance.currency.allowNegativeGroupOnly ? "Negative Allowed (Members only)" : "Negative Allowed")
: "No Negative"}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion platforms/ecurrency/client/vite.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import path from "path";

const envDir = path.resolve(import.meta.dirname, "../../");
const envDir = path.resolve(import.meta.dirname, "../../../");
console.log("🔍 Vite envDir:", envDir);

export default defineConfig({
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions platforms/ecurrency/api/src/controllers/CurrencyController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ export class CurrencyController {
return res.status(401).json({ error: "Authentication required" });
}

const { name, description, groupId, allowNegative, maxNegativeBalance } = req.body;
const { name, description, groupId, allowNegative, maxNegativeBalance, allowNegativeGroupOnly } = req.body;

if (!name || !groupId) {
return res.status(400).json({ error: "Name and groupId are required" });
}

const allowNegativeFlag = Boolean(allowNegative);
const allowNegativeGroupOnlyFlag = Boolean(allowNegativeGroupOnly);
let normalizedMaxNegative: number | null = null;

if (maxNegativeBalance !== undefined && maxNegativeBalance !== null && maxNegativeBalance !== "") {
Expand All@@ -48,7 +49,8 @@ export class CurrencyController {
req.user.id,
allowNegativeFlag,
normalizedMaxNegative,
description
description,
allowNegativeGroupOnlyFlag
);

res.status(201).json({
Expand All@@ -58,6 +60,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -81,6 +84,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand DownExpand Up@@ -108,6 +112,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -130,6 +135,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ export class LedgerController {
name: b.currency.name,
ename: b.currency.ename,
allowNegative: b.currency.allowNegative,
allowNegativeGroupOnly: b.currency.allowNegativeGroupOnly,
},
balance: b.balance,
})));
Expand Down
3 changes: 3 additions & 0 deletions platforms/ecurrency/api/src/database/entities/Currency.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,9 @@ export class Currency {
@Column("decimal", { precision: 18, scale: 2, nullable: true })
maxNegativeBalance!: number | null;

@Column({ default: false })
allowNegativeGroupOnly!: boolean;

@Column()
createdBy!: string;

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddAllowNegativeGroupOnly1771523000000 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" ADD "allowNegativeGroupOnly" boolean NOT NULL DEFAULT false`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" DROP COLUMN "allowNegativeGroupOnly"`);
}
}
8 changes: 7 additions & 1 deletion platforms/ecurrency/api/src/services/CurrencyService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ export class CurrencyService {
createdBy: string,
allowNegative: boolean = false,
maxNegativeBalance: number | null = null,
description?: string
description?: string,
allowNegativeGroupOnly: boolean = false
): Promise<Currency> {
Comment thread
Bekiboo marked this conversation as resolved.
// Verify user is group admin
const isAdmin = await this.groupService.isGroupAdmin(groupId, createdBy);
Expand All@@ -46,6 +47,10 @@ export class CurrencyService {
}
}

if (allowNegativeGroupOnly && !allowNegative) {
throw new Error("Cannot restrict overdraft to group members when negative balances are disabled");
}

const currency = this.currencyRepository.create({
name,
description,
Expand All@@ -54,6 +59,7 @@ export class CurrencyService {
createdBy,
allowNegative,
maxNegativeBalance,
allowNegativeGroupOnly,
});

const savedCurrency = await this.currencyRepository.save(currency);
Expand Down
14 changes: 14 additions & 0 deletions platforms/ecurrency/api/src/services/GroupService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -234,5 +234,19 @@ export class GroupService {
if (!group) return false;
return group.admins.some(admin => admin.id === userId);
}

async isUserInGroup(groupId: string, userId: string): Promise<boolean> {
const group = await this.groupRepository.findOne({
where: { id: groupId },
relations: ["members", "participants", "admins"]
});
if (!group) return false;

// Check if user is the owner, a member, participant, or admin
return group.owner === userId ||
group.members.some(m => m.id === userId) ||
group.participants.some(p => p.id === userId) ||
group.admins.some(a => a.id === userId);
}
}

45 changes: 36 additions & 9 deletions platforms/ecurrency/api/src/services/LedgerService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,18 @@ import { Currency } from "../database/entities/Currency";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { TransactionNotificationService } from "./TransactionNotificationService";
import { GroupService } from "./GroupService";
import crypto from "crypto";

export class LedgerService {
ledgerRepository: Repository<Ledger>;
currencyRepository: Repository<Currency>;
groupService: GroupService;

constructor() {
this.ledgerRepository = AppDataSource.getRepository(Ledger);
this.currencyRepository = AppDataSource.getRepository(Currency);
this.groupService = new GroupService();
}

private computeHash(payload: any): string {
Expand All@@ -28,6 +31,23 @@ export class LedgerService {
return prev?.hash ?? null;
}

/**
* Validates whether a debit of `amount` from `currentBalance` is allowed
* given the currency's negative-balance settings.
*/
private validateNegativeAllowance(currency: Currency, currentBalance: number, amount: number): void {
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
}
}
}

async getAccountBalance(currencyId: string, accountId: string, accountType: AccountType): Promise<number> {
const latestEntry = await this.ledgerRepository.findOne({
where: {
Expand DownExpand Up@@ -132,16 +152,23 @@ export class LedgerService {

const currentBalance = await this.getAccountBalance(currencyId, fromAccountId, fromAccountType);

// Validate debit bounds
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
// Validate debit bounds.
// When allowNegativeGroupOnly is true, only group members may overdraft;
// non-members are limited to their current balance. Note: the invariant
// allowNegativeGroupOnly ⇒ allowNegative is enforced at creation time
// in CurrencyService.createCurrency.
if (currency.allowNegativeGroupOnly && fromAccountType === AccountType.USER) {
const isMember = await this.groupService.isUserInGroup(currency.groupId, fromAccountId);

if (!isMember) {
if (currentBalance < amount) {
throw new Error("Insufficient balance. Only group members can have negative balances for this currency.");
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}

// Create debit entry (from sender's account)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
const [description, setDescription] = useState("");
const [groupId, setGroupId] = useState("");
const [allowNegative, setAllowNegative] = useState(false);
const [allowNegativeGroupOnly, setAllowNegativeGroupOnly] = useState(false);
const [maxNegativeInput, setMaxNegativeInput] = useState("");
const [error, setError] = useState<string | null>(null);
const queryClient = useQueryClient();
Expand All@@ -28,6 +29,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description?: string;
groupId: string;
allowNegative: boolean;
allowNegativeGroupOnly: boolean;
maxNegativeBalance: number | null;
}) => {
const response = await apiClient.post("/api/currencies", data);
Expand All@@ -40,6 +42,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
setDescription("");
setGroupId("");
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
setError(null);
onOpenChange(false);
Expand DownExpand Up@@ -91,6 +94,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description,
groupId,
allowNegative,
allowNegativeGroupOnly,
maxNegativeBalance: maxNegativeValue,
});
}}
Expand DownExpand Up@@ -142,6 +146,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
type="button"
onClick={() => {
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
}}
className={`p-4 border-2 rounded-lg text-left transition-all ${
Expand DownExpand Up@@ -173,8 +178,24 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
</div>

{allowNegative && (
<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<>
<div>
<label className="flex items-center gap-2 cursor-pointer">
<input
type="checkbox"
checked={allowNegativeGroupOnly}
onChange={(e) => setAllowNegativeGroupOnly(e.target.checked)}
className="w-4 h-4 rounded border-gray-300"
/>
<span className="text-sm font-medium">Restrict overdraft to group members only</span>
</label>
<p className="text-xs text-muted-foreground mt-1 ml-6">
When enabled, only users who are members of the currency's group can have negative balances. Non-members must maintain a positive balance.
</p>
</div>

<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<input
type="number"
min={0}
Expand All@@ -189,6 +210,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
Limit how far any account can go below zero (max {MAX_NEGATIVE_LIMIT.toLocaleString()}).
</p>
</div>
</>
)}

{error && (
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,9 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
)}
{fromCurrencyData && fromCurrencyData.allowNegative && (
<p className="text-sm text-muted-foreground mt-1">
Negative balances are allowed for this currency
{fromCurrencyData.allowNegativeGroupOnly
? "Negative balances allowed for group members"
: "Negative balances are allowed for this currency"}
</p>
)}
</div>
Expand DownExpand Up@@ -353,15 +355,6 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
</div>
)}

{/* Mutation Error */}
{transferMutation.isError && (
<div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg">
{transferMutation.error instanceof Error
? transferMutation.error.message
: "An error occurred while processing the transfer"}
</div>
)}

<div className="flex gap-2 justify-end pt-4">
<button
type="button"
Expand Down
4 changes: 3 additions & 1 deletion platforms/ecurrency/client/client/src/pages/dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,9 @@ export default function Dashboard() {
<div className="text-xs text-white/80 mt-1">{formatEName(balance.currency.ename)}</div>
{balance.currency.allowNegative !== undefined && (
<div className="text-xs px-2 py-0.5 rounded bg-white/20 text-white/90 mt-1 inline-block">
{balance.currency.allowNegative ? "Negative Allowed" : "No Negative"}
{balance.currency.allowNegative
? (balance.currency.allowNegativeGroupOnly ? "Negative Allowed (Members only)" : "Negative Allowed")
: "No Negative"}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion platforms/ecurrency/client/vite.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import path from "path";

const envDir = path.resolve(import.meta.dirname, "../../");
const envDir = path.resolve(import.meta.dirname, "../../../");
console.log("🔍 Vite envDir:", envDir);

export default defineConfig({
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions platforms/ecurrency/api/src/controllers/CurrencyController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ export class CurrencyController {
return res.status(401).json({ error: "Authentication required" });
}

const { name, description, groupId, allowNegative, maxNegativeBalance } = req.body;
const { name, description, groupId, allowNegative, maxNegativeBalance, allowNegativeGroupOnly } = req.body;

if (!name || !groupId) {
return res.status(400).json({ error: "Name and groupId are required" });
}

const allowNegativeFlag = Boolean(allowNegative);
const allowNegativeGroupOnlyFlag = Boolean(allowNegativeGroupOnly);
let normalizedMaxNegative: number | null = null;

if (maxNegativeBalance !== undefined && maxNegativeBalance !== null && maxNegativeBalance !== "") {
Expand All@@ -48,7 +49,8 @@ export class CurrencyController {
req.user.id,
allowNegativeFlag,
normalizedMaxNegative,
description
description,
allowNegativeGroupOnlyFlag
);

res.status(201).json({
Expand All@@ -58,6 +60,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -81,6 +84,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand DownExpand Up@@ -108,6 +112,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -130,6 +135,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ export class LedgerController {
name: b.currency.name,
ename: b.currency.ename,
allowNegative: b.currency.allowNegative,
allowNegativeGroupOnly: b.currency.allowNegativeGroupOnly,
},
balance: b.balance,
})));
Expand Down
3 changes: 3 additions & 0 deletions platforms/ecurrency/api/src/database/entities/Currency.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,9 @@ export class Currency {
@Column("decimal", { precision: 18, scale: 2, nullable: true })
maxNegativeBalance!: number | null;

@Column({ default: false })
allowNegativeGroupOnly!: boolean;

@Column()
createdBy!: string;

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddAllowNegativeGroupOnly1771523000000 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" ADD "allowNegativeGroupOnly" boolean NOT NULL DEFAULT false`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" DROP COLUMN "allowNegativeGroupOnly"`);
}
}
8 changes: 7 additions & 1 deletion platforms/ecurrency/api/src/services/CurrencyService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ export class CurrencyService {
createdBy: string,
allowNegative: boolean = false,
maxNegativeBalance: number | null = null,
description?: string
description?: string,
allowNegativeGroupOnly: boolean = false
): Promise<Currency> {
Comment thread
Bekiboo marked this conversation as resolved.
// Verify user is group admin
const isAdmin = await this.groupService.isGroupAdmin(groupId, createdBy);
Expand All@@ -46,6 +47,10 @@ export class CurrencyService {
}
}

if (allowNegativeGroupOnly && !allowNegative) {
throw new Error("Cannot restrict overdraft to group members when negative balances are disabled");
}

const currency = this.currencyRepository.create({
name,
description,
Expand All@@ -54,6 +59,7 @@ export class CurrencyService {
createdBy,
allowNegative,
maxNegativeBalance,
allowNegativeGroupOnly,
});

const savedCurrency = await this.currencyRepository.save(currency);
Expand Down
14 changes: 14 additions & 0 deletions platforms/ecurrency/api/src/services/GroupService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -234,5 +234,19 @@ export class GroupService {
if (!group) return false;
return group.admins.some(admin => admin.id === userId);
}

async isUserInGroup(groupId: string, userId: string): Promise<boolean> {
const group = await this.groupRepository.findOne({
where: { id: groupId },
relations: ["members", "participants", "admins"]
});
if (!group) return false;

// Check if user is the owner, a member, participant, or admin
return group.owner === userId ||
group.members.some(m => m.id === userId) ||
group.participants.some(p => p.id === userId) ||
group.admins.some(a => a.id === userId);
}
}

45 changes: 36 additions & 9 deletions platforms/ecurrency/api/src/services/LedgerService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,18 @@ import { Currency } from "../database/entities/Currency";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { TransactionNotificationService } from "./TransactionNotificationService";
import { GroupService } from "./GroupService";
import crypto from "crypto";

export class LedgerService {
ledgerRepository: Repository<Ledger>;
currencyRepository: Repository<Currency>;
groupService: GroupService;

constructor() {
this.ledgerRepository = AppDataSource.getRepository(Ledger);
this.currencyRepository = AppDataSource.getRepository(Currency);
this.groupService = new GroupService();
}

private computeHash(payload: any): string {
Expand All@@ -28,6 +31,23 @@ export class LedgerService {
return prev?.hash ?? null;
}

/**
* Validates whether a debit of `amount` from `currentBalance` is allowed
* given the currency's negative-balance settings.
*/
private validateNegativeAllowance(currency: Currency, currentBalance: number, amount: number): void {
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
}
}
}

async getAccountBalance(currencyId: string, accountId: string, accountType: AccountType): Promise<number> {
const latestEntry = await this.ledgerRepository.findOne({
where: {
Expand DownExpand Up@@ -132,16 +152,23 @@ export class LedgerService {

const currentBalance = await this.getAccountBalance(currencyId, fromAccountId, fromAccountType);

// Validate debit bounds
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
// Validate debit bounds.
// When allowNegativeGroupOnly is true, only group members may overdraft;
// non-members are limited to their current balance. Note: the invariant
// allowNegativeGroupOnly ⇒ allowNegative is enforced at creation time
// in CurrencyService.createCurrency.
if (currency.allowNegativeGroupOnly && fromAccountType === AccountType.USER) {
const isMember = await this.groupService.isUserInGroup(currency.groupId, fromAccountId);

if (!isMember) {
if (currentBalance < amount) {
throw new Error("Insufficient balance. Only group members can have negative balances for this currency.");
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}

// Create debit entry (from sender's account)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
const [description, setDescription] = useState("");
const [groupId, setGroupId] = useState("");
const [allowNegative, setAllowNegative] = useState(false);
const [allowNegativeGroupOnly, setAllowNegativeGroupOnly] = useState(false);
const [maxNegativeInput, setMaxNegativeInput] = useState("");
const [error, setError] = useState<string | null>(null);
const queryClient = useQueryClient();
Expand All@@ -28,6 +29,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description?: string;
groupId: string;
allowNegative: boolean;
allowNegativeGroupOnly: boolean;
maxNegativeBalance: number | null;
}) => {
const response = await apiClient.post("/api/currencies", data);
Expand All@@ -40,6 +42,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
setDescription("");
setGroupId("");
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
setError(null);
onOpenChange(false);
Expand DownExpand Up@@ -91,6 +94,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description,
groupId,
allowNegative,
allowNegativeGroupOnly,
maxNegativeBalance: maxNegativeValue,
});
}}
Expand DownExpand Up@@ -142,6 +146,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
type="button"
onClick={() => {
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
}}
className={`p-4 border-2 rounded-lg text-left transition-all ${
Expand DownExpand Up@@ -173,8 +178,24 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
</div>

{allowNegative && (
<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<>
<div>
<label className="flex items-center gap-2 cursor-pointer">
<input
type="checkbox"
checked={allowNegativeGroupOnly}
onChange={(e) => setAllowNegativeGroupOnly(e.target.checked)}
className="w-4 h-4 rounded border-gray-300"
/>
<span className="text-sm font-medium">Restrict overdraft to group members only</span>
</label>
<p className="text-xs text-muted-foreground mt-1 ml-6">
When enabled, only users who are members of the currency's group can have negative balances. Non-members must maintain a positive balance.
</p>
</div>

<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<input
type="number"
min={0}
Expand All@@ -189,6 +210,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
Limit how far any account can go below zero (max {MAX_NEGATIVE_LIMIT.toLocaleString()}).
</p>
</div>
</>
)}

{error && (
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,9 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
)}
{fromCurrencyData && fromCurrencyData.allowNegative && (
<p className="text-sm text-muted-foreground mt-1">
Negative balances are allowed for this currency
{fromCurrencyData.allowNegativeGroupOnly
? "Negative balances allowed for group members"
: "Negative balances are allowed for this currency"}
</p>
)}
</div>
Expand DownExpand Up@@ -353,15 +355,6 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
</div>
)}

{/* Mutation Error */}
{transferMutation.isError && (
<div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg">
{transferMutation.error instanceof Error
? transferMutation.error.message
: "An error occurred while processing the transfer"}
</div>
)}

<div className="flex gap-2 justify-end pt-4">
<button
type="button"
Expand Down
4 changes: 3 additions & 1 deletion platforms/ecurrency/client/client/src/pages/dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,9 @@ export default function Dashboard() {
<div className="text-xs text-white/80 mt-1">{formatEName(balance.currency.ename)}</div>
{balance.currency.allowNegative !== undefined && (
<div className="text-xs px-2 py-0.5 rounded bg-white/20 text-white/90 mt-1 inline-block">
{balance.currency.allowNegative ? "Negative Allowed" : "No Negative"}
{balance.currency.allowNegative
? (balance.currency.allowNegativeGroupOnly ? "Negative Allowed (Members only)" : "Negative Allowed")
: "No Negative"}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion platforms/ecurrency/client/vite.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import path from "path";

const envDir = path.resolve(import.meta.dirname, "../../");
const envDir = path.resolve(import.meta.dirname, "../../../");
console.log("🔍 Vite envDir:", envDir);

export default defineConfig({
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions platforms/ecurrency/api/src/controllers/CurrencyController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ export class CurrencyController {
return res.status(401).json({ error: "Authentication required" });
}

const { name, description, groupId, allowNegative, maxNegativeBalance } = req.body;
const { name, description, groupId, allowNegative, maxNegativeBalance, allowNegativeGroupOnly } = req.body;

if (!name || !groupId) {
return res.status(400).json({ error: "Name and groupId are required" });
}

const allowNegativeFlag = Boolean(allowNegative);
const allowNegativeGroupOnlyFlag = Boolean(allowNegativeGroupOnly);
let normalizedMaxNegative: number | null = null;

if (maxNegativeBalance !== undefined && maxNegativeBalance !== null && maxNegativeBalance !== "") {
Expand All@@ -48,7 +49,8 @@ export class CurrencyController {
req.user.id,
allowNegativeFlag,
normalizedMaxNegative,
description
description,
allowNegativeGroupOnlyFlag
);

res.status(201).json({
Expand All@@ -58,6 +60,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -81,6 +84,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand DownExpand Up@@ -108,6 +112,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -130,6 +135,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ export class LedgerController {
name: b.currency.name,
ename: b.currency.ename,
allowNegative: b.currency.allowNegative,
allowNegativeGroupOnly: b.currency.allowNegativeGroupOnly,
},
balance: b.balance,
})));
Expand Down
3 changes: 3 additions & 0 deletions platforms/ecurrency/api/src/database/entities/Currency.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,9 @@ export class Currency {
@Column("decimal", { precision: 18, scale: 2, nullable: true })
maxNegativeBalance!: number | null;

@Column({ default: false })
allowNegativeGroupOnly!: boolean;

@Column()
createdBy!: string;

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddAllowNegativeGroupOnly1771523000000 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" ADD "allowNegativeGroupOnly" boolean NOT NULL DEFAULT false`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" DROP COLUMN "allowNegativeGroupOnly"`);
}
}
8 changes: 7 additions & 1 deletion platforms/ecurrency/api/src/services/CurrencyService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ export class CurrencyService {
createdBy: string,
allowNegative: boolean = false,
maxNegativeBalance: number | null = null,
description?: string
description?: string,
allowNegativeGroupOnly: boolean = false
): Promise<Currency> {
Comment thread
Bekiboo marked this conversation as resolved.
// Verify user is group admin
const isAdmin = await this.groupService.isGroupAdmin(groupId, createdBy);
Expand All@@ -46,6 +47,10 @@ export class CurrencyService {
}
}

if (allowNegativeGroupOnly && !allowNegative) {
throw new Error("Cannot restrict overdraft to group members when negative balances are disabled");
}

const currency = this.currencyRepository.create({
name,
description,
Expand All@@ -54,6 +59,7 @@ export class CurrencyService {
createdBy,
allowNegative,
maxNegativeBalance,
allowNegativeGroupOnly,
});

const savedCurrency = await this.currencyRepository.save(currency);
Expand Down
14 changes: 14 additions & 0 deletions platforms/ecurrency/api/src/services/GroupService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -234,5 +234,19 @@ export class GroupService {
if (!group) return false;
return group.admins.some(admin => admin.id === userId);
}

async isUserInGroup(groupId: string, userId: string): Promise<boolean> {
const group = await this.groupRepository.findOne({
where: { id: groupId },
relations: ["members", "participants", "admins"]
});
if (!group) return false;

// Check if user is the owner, a member, participant, or admin
return group.owner === userId ||
group.members.some(m => m.id === userId) ||
group.participants.some(p => p.id === userId) ||
group.admins.some(a => a.id === userId);
}
}

45 changes: 36 additions & 9 deletions platforms/ecurrency/api/src/services/LedgerService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,18 @@ import { Currency } from "../database/entities/Currency";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { TransactionNotificationService } from "./TransactionNotificationService";
import { GroupService } from "./GroupService";
import crypto from "crypto";

export class LedgerService {
ledgerRepository: Repository<Ledger>;
currencyRepository: Repository<Currency>;
groupService: GroupService;

constructor() {
this.ledgerRepository = AppDataSource.getRepository(Ledger);
this.currencyRepository = AppDataSource.getRepository(Currency);
this.groupService = new GroupService();
}

private computeHash(payload: any): string {
Expand All@@ -28,6 +31,23 @@ export class LedgerService {
return prev?.hash ?? null;
}

/**
* Validates whether a debit of `amount` from `currentBalance` is allowed
* given the currency's negative-balance settings.
*/
private validateNegativeAllowance(currency: Currency, currentBalance: number, amount: number): void {
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
}
}
}

async getAccountBalance(currencyId: string, accountId: string, accountType: AccountType): Promise<number> {
const latestEntry = await this.ledgerRepository.findOne({
where: {
Expand DownExpand Up@@ -132,16 +152,23 @@ export class LedgerService {

const currentBalance = await this.getAccountBalance(currencyId, fromAccountId, fromAccountType);

// Validate debit bounds
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
// Validate debit bounds.
// When allowNegativeGroupOnly is true, only group members may overdraft;
// non-members are limited to their current balance. Note: the invariant
// allowNegativeGroupOnly ⇒ allowNegative is enforced at creation time
// in CurrencyService.createCurrency.
if (currency.allowNegativeGroupOnly && fromAccountType === AccountType.USER) {
const isMember = await this.groupService.isUserInGroup(currency.groupId, fromAccountId);

if (!isMember) {
if (currentBalance < amount) {
throw new Error("Insufficient balance. Only group members can have negative balances for this currency.");
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}

// Create debit entry (from sender's account)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
const [description, setDescription] = useState("");
const [groupId, setGroupId] = useState("");
const [allowNegative, setAllowNegative] = useState(false);
const [allowNegativeGroupOnly, setAllowNegativeGroupOnly] = useState(false);
const [maxNegativeInput, setMaxNegativeInput] = useState("");
const [error, setError] = useState<string | null>(null);
const queryClient = useQueryClient();
Expand All@@ -28,6 +29,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description?: string;
groupId: string;
allowNegative: boolean;
allowNegativeGroupOnly: boolean;
maxNegativeBalance: number | null;
}) => {
const response = await apiClient.post("/api/currencies", data);
Expand All@@ -40,6 +42,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
setDescription("");
setGroupId("");
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
setError(null);
onOpenChange(false);
Expand DownExpand Up@@ -91,6 +94,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description,
groupId,
allowNegative,
allowNegativeGroupOnly,
maxNegativeBalance: maxNegativeValue,
});
}}
Expand DownExpand Up@@ -142,6 +146,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
type="button"
onClick={() => {
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
}}
className={`p-4 border-2 rounded-lg text-left transition-all ${
Expand DownExpand Up@@ -173,8 +178,24 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
</div>

{allowNegative && (
<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<>
<div>
<label className="flex items-center gap-2 cursor-pointer">
<input
type="checkbox"
checked={allowNegativeGroupOnly}
onChange={(e) => setAllowNegativeGroupOnly(e.target.checked)}
className="w-4 h-4 rounded border-gray-300"
/>
<span className="text-sm font-medium">Restrict overdraft to group members only</span>
</label>
<p className="text-xs text-muted-foreground mt-1 ml-6">
When enabled, only users who are members of the currency's group can have negative balances. Non-members must maintain a positive balance.
</p>
</div>

<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<input
type="number"
min={0}
Expand All@@ -189,6 +210,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
Limit how far any account can go below zero (max {MAX_NEGATIVE_LIMIT.toLocaleString()}).
</p>
</div>
</>
)}

{error && (
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,9 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
)}
{fromCurrencyData && fromCurrencyData.allowNegative && (
<p className="text-sm text-muted-foreground mt-1">
Negative balances are allowed for this currency
{fromCurrencyData.allowNegativeGroupOnly
? "Negative balances allowed for group members"
: "Negative balances are allowed for this currency"}
</p>
)}
</div>
Expand DownExpand Up@@ -353,15 +355,6 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
</div>
)}

{/* Mutation Error */}
{transferMutation.isError && (
<div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg">
{transferMutation.error instanceof Error
? transferMutation.error.message
: "An error occurred while processing the transfer"}
</div>
)}

<div className="flex gap-2 justify-end pt-4">
<button
type="button"
Expand Down
4 changes: 3 additions & 1 deletion platforms/ecurrency/client/client/src/pages/dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,9 @@ export default function Dashboard() {
<div className="text-xs text-white/80 mt-1">{formatEName(balance.currency.ename)}</div>
{balance.currency.allowNegative !== undefined && (
<div className="text-xs px-2 py-0.5 rounded bg-white/20 text-white/90 mt-1 inline-block">
{balance.currency.allowNegative ? "Negative Allowed" : "No Negative"}
{balance.currency.allowNegative
? (balance.currency.allowNegativeGroupOnly ? "Negative Allowed (Members only)" : "Negative Allowed")
: "No Negative"}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion platforms/ecurrency/client/vite.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import path from "path";

const envDir = path.resolve(import.meta.dirname, "../../");
const envDir = path.resolve(import.meta.dirname, "../../../");
console.log("🔍 Vite envDir:", envDir);

export default defineConfig({
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions platforms/ecurrency/api/src/controllers/CurrencyController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ export class CurrencyController {
return res.status(401).json({ error: "Authentication required" });
}

const { name, description, groupId, allowNegative, maxNegativeBalance } = req.body;
const { name, description, groupId, allowNegative, maxNegativeBalance, allowNegativeGroupOnly } = req.body;

if (!name || !groupId) {
return res.status(400).json({ error: "Name and groupId are required" });
}

const allowNegativeFlag = Boolean(allowNegative);
const allowNegativeGroupOnlyFlag = Boolean(allowNegativeGroupOnly);
let normalizedMaxNegative: number | null = null;

if (maxNegativeBalance !== undefined && maxNegativeBalance !== null && maxNegativeBalance !== "") {
Expand All@@ -48,7 +49,8 @@ export class CurrencyController {
req.user.id,
allowNegativeFlag,
normalizedMaxNegative,
description
description,
allowNegativeGroupOnlyFlag
);

res.status(201).json({
Expand All@@ -58,6 +60,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -81,6 +84,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand DownExpand Up@@ -108,6 +112,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -130,6 +135,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ export class LedgerController {
name: b.currency.name,
ename: b.currency.ename,
allowNegative: b.currency.allowNegative,
allowNegativeGroupOnly: b.currency.allowNegativeGroupOnly,
},
balance: b.balance,
})));
Expand Down
3 changes: 3 additions & 0 deletions platforms/ecurrency/api/src/database/entities/Currency.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,9 @@ export class Currency {
@Column("decimal", { precision: 18, scale: 2, nullable: true })
maxNegativeBalance!: number | null;

@Column({ default: false })
allowNegativeGroupOnly!: boolean;

@Column()
createdBy!: string;

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddAllowNegativeGroupOnly1771523000000 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" ADD "allowNegativeGroupOnly" boolean NOT NULL DEFAULT false`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" DROP COLUMN "allowNegativeGroupOnly"`);
}
}
8 changes: 7 additions & 1 deletion platforms/ecurrency/api/src/services/CurrencyService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ export class CurrencyService {
createdBy: string,
allowNegative: boolean = false,
maxNegativeBalance: number | null = null,
description?: string
description?: string,
allowNegativeGroupOnly: boolean = false
): Promise<Currency> {
Comment thread
Bekiboo marked this conversation as resolved.
// Verify user is group admin
const isAdmin = await this.groupService.isGroupAdmin(groupId, createdBy);
Expand All@@ -46,6 +47,10 @@ export class CurrencyService {
}
}

if (allowNegativeGroupOnly && !allowNegative) {
throw new Error("Cannot restrict overdraft to group members when negative balances are disabled");
}

const currency = this.currencyRepository.create({
name,
description,
Expand All@@ -54,6 +59,7 @@ export class CurrencyService {
createdBy,
allowNegative,
maxNegativeBalance,
allowNegativeGroupOnly,
});

const savedCurrency = await this.currencyRepository.save(currency);
Expand Down
14 changes: 14 additions & 0 deletions platforms/ecurrency/api/src/services/GroupService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -234,5 +234,19 @@ export class GroupService {
if (!group) return false;
return group.admins.some(admin => admin.id === userId);
}

async isUserInGroup(groupId: string, userId: string): Promise<boolean> {
const group = await this.groupRepository.findOne({
where: { id: groupId },
relations: ["members", "participants", "admins"]
});
if (!group) return false;

// Check if user is the owner, a member, participant, or admin
return group.owner === userId ||
group.members.some(m => m.id === userId) ||
group.participants.some(p => p.id === userId) ||
group.admins.some(a => a.id === userId);
}
}

45 changes: 36 additions & 9 deletions platforms/ecurrency/api/src/services/LedgerService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,18 @@ import { Currency } from "../database/entities/Currency";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { TransactionNotificationService } from "./TransactionNotificationService";
import { GroupService } from "./GroupService";
import crypto from "crypto";

export class LedgerService {
ledgerRepository: Repository<Ledger>;
currencyRepository: Repository<Currency>;
groupService: GroupService;

constructor() {
this.ledgerRepository = AppDataSource.getRepository(Ledger);
this.currencyRepository = AppDataSource.getRepository(Currency);
this.groupService = new GroupService();
}

private computeHash(payload: any): string {
Expand All@@ -28,6 +31,23 @@ export class LedgerService {
return prev?.hash ?? null;
}

/**
* Validates whether a debit of `amount` from `currentBalance` is allowed
* given the currency's negative-balance settings.
*/
private validateNegativeAllowance(currency: Currency, currentBalance: number, amount: number): void {
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
}
}
}

async getAccountBalance(currencyId: string, accountId: string, accountType: AccountType): Promise<number> {
const latestEntry = await this.ledgerRepository.findOne({
where: {
Expand DownExpand Up@@ -132,16 +152,23 @@ export class LedgerService {

const currentBalance = await this.getAccountBalance(currencyId, fromAccountId, fromAccountType);

// Validate debit bounds
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
// Validate debit bounds.
// When allowNegativeGroupOnly is true, only group members may overdraft;
// non-members are limited to their current balance. Note: the invariant
// allowNegativeGroupOnly ⇒ allowNegative is enforced at creation time
// in CurrencyService.createCurrency.
if (currency.allowNegativeGroupOnly && fromAccountType === AccountType.USER) {
const isMember = await this.groupService.isUserInGroup(currency.groupId, fromAccountId);

if (!isMember) {
if (currentBalance < amount) {
throw new Error("Insufficient balance. Only group members can have negative balances for this currency.");
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}

// Create debit entry (from sender's account)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
const [description, setDescription] = useState("");
const [groupId, setGroupId] = useState("");
const [allowNegative, setAllowNegative] = useState(false);
const [allowNegativeGroupOnly, setAllowNegativeGroupOnly] = useState(false);
const [maxNegativeInput, setMaxNegativeInput] = useState("");
const [error, setError] = useState<string | null>(null);
const queryClient = useQueryClient();
Expand All@@ -28,6 +29,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description?: string;
groupId: string;
allowNegative: boolean;
allowNegativeGroupOnly: boolean;
maxNegativeBalance: number | null;
}) => {
const response = await apiClient.post("/api/currencies", data);
Expand All@@ -40,6 +42,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
setDescription("");
setGroupId("");
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
setError(null);
onOpenChange(false);
Expand DownExpand Up@@ -91,6 +94,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description,
groupId,
allowNegative,
allowNegativeGroupOnly,
maxNegativeBalance: maxNegativeValue,
});
}}
Expand DownExpand Up@@ -142,6 +146,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
type="button"
onClick={() => {
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
}}
className={`p-4 border-2 rounded-lg text-left transition-all ${
Expand DownExpand Up@@ -173,8 +178,24 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
</div>

{allowNegative && (
<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<>
<div>
<label className="flex items-center gap-2 cursor-pointer">
<input
type="checkbox"
checked={allowNegativeGroupOnly}
onChange={(e) => setAllowNegativeGroupOnly(e.target.checked)}
className="w-4 h-4 rounded border-gray-300"
/>
<span className="text-sm font-medium">Restrict overdraft to group members only</span>
</label>
<p className="text-xs text-muted-foreground mt-1 ml-6">
When enabled, only users who are members of the currency's group can have negative balances. Non-members must maintain a positive balance.
</p>
</div>

<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<input
type="number"
min={0}
Expand All@@ -189,6 +210,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
Limit how far any account can go below zero (max {MAX_NEGATIVE_LIMIT.toLocaleString()}).
</p>
</div>
</>
)}

{error && (
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,9 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
)}
{fromCurrencyData && fromCurrencyData.allowNegative && (
<p className="text-sm text-muted-foreground mt-1">
Negative balances are allowed for this currency
{fromCurrencyData.allowNegativeGroupOnly
? "Negative balances allowed for group members"
: "Negative balances are allowed for this currency"}
</p>
)}
</div>
Expand DownExpand Up@@ -353,15 +355,6 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
</div>
)}

{/* Mutation Error */}
{transferMutation.isError && (
<div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg">
{transferMutation.error instanceof Error
? transferMutation.error.message
: "An error occurred while processing the transfer"}
</div>
)}

<div className="flex gap-2 justify-end pt-4">
<button
type="button"
Expand Down
4 changes: 3 additions & 1 deletion platforms/ecurrency/client/client/src/pages/dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,9 @@ export default function Dashboard() {
<div className="text-xs text-white/80 mt-1">{formatEName(balance.currency.ename)}</div>
{balance.currency.allowNegative !== undefined && (
<div className="text-xs px-2 py-0.5 rounded bg-white/20 text-white/90 mt-1 inline-block">
{balance.currency.allowNegative ? "Negative Allowed" : "No Negative"}
{balance.currency.allowNegative
? (balance.currency.allowNegativeGroupOnly ? "Negative Allowed (Members only)" : "Negative Allowed")
: "No Negative"}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion platforms/ecurrency/client/vite.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import path from "path";

const envDir = path.resolve(import.meta.dirname, "../../");
const envDir = path.resolve(import.meta.dirname, "../../../");
console.log("🔍 Vite envDir:", envDir);

export default defineConfig({
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions platforms/ecurrency/api/src/controllers/CurrencyController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ export class CurrencyController {
return res.status(401).json({ error: "Authentication required" });
}

const { name, description, groupId, allowNegative, maxNegativeBalance } = req.body;
const { name, description, groupId, allowNegative, maxNegativeBalance, allowNegativeGroupOnly } = req.body;

if (!name || !groupId) {
return res.status(400).json({ error: "Name and groupId are required" });
}

const allowNegativeFlag = Boolean(allowNegative);
const allowNegativeGroupOnlyFlag = Boolean(allowNegativeGroupOnly);
let normalizedMaxNegative: number | null = null;

if (maxNegativeBalance !== undefined && maxNegativeBalance !== null && maxNegativeBalance !== "") {
Expand All@@ -48,7 +49,8 @@ export class CurrencyController {
req.user.id,
allowNegativeFlag,
normalizedMaxNegative,
description
description,
allowNegativeGroupOnlyFlag
);

res.status(201).json({
Expand All@@ -58,6 +60,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -81,6 +84,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand DownExpand Up@@ -108,6 +112,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -130,6 +135,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ export class LedgerController {
name: b.currency.name,
ename: b.currency.ename,
allowNegative: b.currency.allowNegative,
allowNegativeGroupOnly: b.currency.allowNegativeGroupOnly,
},
balance: b.balance,
})));
Expand Down
3 changes: 3 additions & 0 deletions platforms/ecurrency/api/src/database/entities/Currency.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,9 @@ export class Currency {
@Column("decimal", { precision: 18, scale: 2, nullable: true })
maxNegativeBalance!: number | null;

@Column({ default: false })
allowNegativeGroupOnly!: boolean;

@Column()
createdBy!: string;

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddAllowNegativeGroupOnly1771523000000 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" ADD "allowNegativeGroupOnly" boolean NOT NULL DEFAULT false`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" DROP COLUMN "allowNegativeGroupOnly"`);
}
}
8 changes: 7 additions & 1 deletion platforms/ecurrency/api/src/services/CurrencyService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ export class CurrencyService {
createdBy: string,
allowNegative: boolean = false,
maxNegativeBalance: number | null = null,
description?: string
description?: string,
allowNegativeGroupOnly: boolean = false
): Promise<Currency> {
Comment thread
Bekiboo marked this conversation as resolved.
// Verify user is group admin
const isAdmin = await this.groupService.isGroupAdmin(groupId, createdBy);
Expand All@@ -46,6 +47,10 @@ export class CurrencyService {
}
}

if (allowNegativeGroupOnly && !allowNegative) {
throw new Error("Cannot restrict overdraft to group members when negative balances are disabled");
}

const currency = this.currencyRepository.create({
name,
description,
Expand All@@ -54,6 +59,7 @@ export class CurrencyService {
createdBy,
allowNegative,
maxNegativeBalance,
allowNegativeGroupOnly,
});

const savedCurrency = await this.currencyRepository.save(currency);
Expand Down
14 changes: 14 additions & 0 deletions platforms/ecurrency/api/src/services/GroupService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -234,5 +234,19 @@ export class GroupService {
if (!group) return false;
return group.admins.some(admin => admin.id === userId);
}

async isUserInGroup(groupId: string, userId: string): Promise<boolean> {
const group = await this.groupRepository.findOne({
where: { id: groupId },
relations: ["members", "participants", "admins"]
});
if (!group) return false;

// Check if user is the owner, a member, participant, or admin
return group.owner === userId ||
group.members.some(m => m.id === userId) ||
group.participants.some(p => p.id === userId) ||
group.admins.some(a => a.id === userId);
}
}

45 changes: 36 additions & 9 deletions platforms/ecurrency/api/src/services/LedgerService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,18 @@ import { Currency } from "../database/entities/Currency";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { TransactionNotificationService } from "./TransactionNotificationService";
import { GroupService } from "./GroupService";
import crypto from "crypto";

export class LedgerService {
ledgerRepository: Repository<Ledger>;
currencyRepository: Repository<Currency>;
groupService: GroupService;

constructor() {
this.ledgerRepository = AppDataSource.getRepository(Ledger);
this.currencyRepository = AppDataSource.getRepository(Currency);
this.groupService = new GroupService();
}

private computeHash(payload: any): string {
Expand All@@ -28,6 +31,23 @@ export class LedgerService {
return prev?.hash ?? null;
}

/**
* Validates whether a debit of `amount` from `currentBalance` is allowed
* given the currency's negative-balance settings.
*/
private validateNegativeAllowance(currency: Currency, currentBalance: number, amount: number): void {
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
}
}
}

async getAccountBalance(currencyId: string, accountId: string, accountType: AccountType): Promise<number> {
const latestEntry = await this.ledgerRepository.findOne({
where: {
Expand DownExpand Up@@ -132,16 +152,23 @@ export class LedgerService {

const currentBalance = await this.getAccountBalance(currencyId, fromAccountId, fromAccountType);

// Validate debit bounds
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
// Validate debit bounds.
// When allowNegativeGroupOnly is true, only group members may overdraft;
// non-members are limited to their current balance. Note: the invariant
// allowNegativeGroupOnly ⇒ allowNegative is enforced at creation time
// in CurrencyService.createCurrency.
if (currency.allowNegativeGroupOnly && fromAccountType === AccountType.USER) {
const isMember = await this.groupService.isUserInGroup(currency.groupId, fromAccountId);

if (!isMember) {
if (currentBalance < amount) {
throw new Error("Insufficient balance. Only group members can have negative balances for this currency.");
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}

// Create debit entry (from sender's account)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
const [description, setDescription] = useState("");
const [groupId, setGroupId] = useState("");
const [allowNegative, setAllowNegative] = useState(false);
const [allowNegativeGroupOnly, setAllowNegativeGroupOnly] = useState(false);
const [maxNegativeInput, setMaxNegativeInput] = useState("");
const [error, setError] = useState<string | null>(null);
const queryClient = useQueryClient();
Expand All@@ -28,6 +29,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description?: string;
groupId: string;
allowNegative: boolean;
allowNegativeGroupOnly: boolean;
maxNegativeBalance: number | null;
}) => {
const response = await apiClient.post("/api/currencies", data);
Expand All@@ -40,6 +42,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
setDescription("");
setGroupId("");
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
setError(null);
onOpenChange(false);
Expand DownExpand Up@@ -91,6 +94,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description,
groupId,
allowNegative,
allowNegativeGroupOnly,
maxNegativeBalance: maxNegativeValue,
});
}}
Expand DownExpand Up@@ -142,6 +146,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
type="button"
onClick={() => {
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
}}
className={`p-4 border-2 rounded-lg text-left transition-all ${
Expand DownExpand Up@@ -173,8 +178,24 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
</div>

{allowNegative && (
<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<>
<div>
<label className="flex items-center gap-2 cursor-pointer">
<input
type="checkbox"
checked={allowNegativeGroupOnly}
onChange={(e) => setAllowNegativeGroupOnly(e.target.checked)}
className="w-4 h-4 rounded border-gray-300"
/>
<span className="text-sm font-medium">Restrict overdraft to group members only</span>
</label>
<p className="text-xs text-muted-foreground mt-1 ml-6">
When enabled, only users who are members of the currency's group can have negative balances. Non-members must maintain a positive balance.
</p>
</div>

<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<input
type="number"
min={0}
Expand All@@ -189,6 +210,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
Limit how far any account can go below zero (max {MAX_NEGATIVE_LIMIT.toLocaleString()}).
</p>
</div>
</>
)}

{error && (
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,9 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
)}
{fromCurrencyData && fromCurrencyData.allowNegative && (
<p className="text-sm text-muted-foreground mt-1">
Negative balances are allowed for this currency
{fromCurrencyData.allowNegativeGroupOnly
? "Negative balances allowed for group members"
: "Negative balances are allowed for this currency"}
</p>
)}
</div>
Expand DownExpand Up@@ -353,15 +355,6 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
</div>
)}

{/* Mutation Error */}
{transferMutation.isError && (
<div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg">
{transferMutation.error instanceof Error
? transferMutation.error.message
: "An error occurred while processing the transfer"}
</div>
)}

<div className="flex gap-2 justify-end pt-4">
<button
type="button"
Expand Down
4 changes: 3 additions & 1 deletion platforms/ecurrency/client/client/src/pages/dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,9 @@ export default function Dashboard() {
<div className="text-xs text-white/80 mt-1">{formatEName(balance.currency.ename)}</div>
{balance.currency.allowNegative !== undefined && (
<div className="text-xs px-2 py-0.5 rounded bg-white/20 text-white/90 mt-1 inline-block">
{balance.currency.allowNegative ? "Negative Allowed" : "No Negative"}
{balance.currency.allowNegative
? (balance.currency.allowNegativeGroupOnly ? "Negative Allowed (Members only)" : "Negative Allowed")
: "No Negative"}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion platforms/ecurrency/client/vite.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import path from "path";

const envDir = path.resolve(import.meta.dirname, "../../");
const envDir = path.resolve(import.meta.dirname, "../../../");
console.log("🔍 Vite envDir:", envDir);

export default defineConfig({
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions platforms/ecurrency/api/src/controllers/CurrencyController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ export class CurrencyController {
return res.status(401).json({ error: "Authentication required" });
}

const { name, description, groupId, allowNegative, maxNegativeBalance } = req.body;
const { name, description, groupId, allowNegative, maxNegativeBalance, allowNegativeGroupOnly } = req.body;

if (!name || !groupId) {
return res.status(400).json({ error: "Name and groupId are required" });
}

const allowNegativeFlag = Boolean(allowNegative);
const allowNegativeGroupOnlyFlag = Boolean(allowNegativeGroupOnly);
let normalizedMaxNegative: number | null = null;

if (maxNegativeBalance !== undefined && maxNegativeBalance !== null && maxNegativeBalance !== "") {
Expand All@@ -48,7 +49,8 @@ export class CurrencyController {
req.user.id,
allowNegativeFlag,
normalizedMaxNegative,
description
description,
allowNegativeGroupOnlyFlag
);

res.status(201).json({
Expand All@@ -58,6 +60,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -81,6 +84,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand DownExpand Up@@ -108,6 +112,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand All@@ -130,6 +135,7 @@ export class CurrencyController {
ename: currency.ename,
groupId: currency.groupId,
allowNegative: currency.allowNegative,
allowNegativeGroupOnly: currency.allowNegativeGroupOnly,
maxNegativeBalance: currency.maxNegativeBalance,
createdBy: currency.createdBy,
createdAt: currency.createdAt,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,6 +51,7 @@ export class LedgerController {
name: b.currency.name,
ename: b.currency.ename,
allowNegative: b.currency.allowNegative,
allowNegativeGroupOnly: b.currency.allowNegativeGroupOnly,
},
balance: b.balance,
})));
Expand Down
3 changes: 3 additions & 0 deletions platforms/ecurrency/api/src/database/entities/Currency.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,9 @@ export class Currency {
@Column("decimal", { precision: 18, scale: 2, nullable: true })
maxNegativeBalance!: number | null;

@Column({ default: false })
allowNegativeGroupOnly!: boolean;

@Column()
createdBy!: string;

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class AddAllowNegativeGroupOnly1771523000000 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" ADD "allowNegativeGroupOnly" boolean NOT NULL DEFAULT false`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "currencies" DROP COLUMN "allowNegativeGroupOnly"`);
}
}
8 changes: 7 additions & 1 deletion platforms/ecurrency/api/src/services/CurrencyService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ export class CurrencyService {
createdBy: string,
allowNegative: boolean = false,
maxNegativeBalance: number | null = null,
description?: string
description?: string,
allowNegativeGroupOnly: boolean = false
): Promise<Currency> {
Comment thread
Bekiboo marked this conversation as resolved.
// Verify user is group admin
const isAdmin = await this.groupService.isGroupAdmin(groupId, createdBy);
Expand All@@ -46,6 +47,10 @@ export class CurrencyService {
}
}

if (allowNegativeGroupOnly && !allowNegative) {
throw new Error("Cannot restrict overdraft to group members when negative balances are disabled");
}

const currency = this.currencyRepository.create({
name,
description,
Expand All@@ -54,6 +59,7 @@ export class CurrencyService {
createdBy,
allowNegative,
maxNegativeBalance,
allowNegativeGroupOnly,
});

const savedCurrency = await this.currencyRepository.save(currency);
Expand Down
14 changes: 14 additions & 0 deletions platforms/ecurrency/api/src/services/GroupService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -234,5 +234,19 @@ export class GroupService {
if (!group) return false;
return group.admins.some(admin => admin.id === userId);
}

async isUserInGroup(groupId: string, userId: string): Promise<boolean> {
const group = await this.groupRepository.findOne({
where: { id: groupId },
relations: ["members", "participants", "admins"]
});
if (!group) return false;

// Check if user is the owner, a member, participant, or admin
return group.owner === userId ||
group.members.some(m => m.id === userId) ||
group.participants.some(p => p.id === userId) ||
group.admins.some(a => a.id === userId);
}
}

45 changes: 36 additions & 9 deletions platforms/ecurrency/api/src/services/LedgerService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,15 +5,18 @@ import { Currency } from "../database/entities/Currency";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { TransactionNotificationService } from "./TransactionNotificationService";
import { GroupService } from "./GroupService";
import crypto from "crypto";

export class LedgerService {
ledgerRepository: Repository<Ledger>;
currencyRepository: Repository<Currency>;
groupService: GroupService;

constructor() {
this.ledgerRepository = AppDataSource.getRepository(Ledger);
this.currencyRepository = AppDataSource.getRepository(Currency);
this.groupService = new GroupService();
}

private computeHash(payload: any): string {
Expand All@@ -28,6 +31,23 @@ export class LedgerService {
return prev?.hash ?? null;
}

/**
* Validates whether a debit of `amount` from `currentBalance` is allowed
* given the currency's negative-balance settings.
*/
private validateNegativeAllowance(currency: Currency, currentBalance: number, amount: number): void {
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
}
}
}

async getAccountBalance(currencyId: string, accountId: string, accountType: AccountType): Promise<number> {
const latestEntry = await this.ledgerRepository.findOne({
where: {
Expand DownExpand Up@@ -132,16 +152,23 @@ export class LedgerService {

const currentBalance = await this.getAccountBalance(currencyId, fromAccountId, fromAccountType);

// Validate debit bounds
if (!currency.allowNegative && currentBalance < amount) {
throw new Error("Insufficient balance. This currency does not allow negative balances.");
}

if (currency.allowNegative && currency.maxNegativeBalance !== null && currency.maxNegativeBalance !== undefined) {
const newBalance = currentBalance - amount;
if (newBalance < Number(currency.maxNegativeBalance)) {
throw new Error(`Insufficient balance. This currency allows negative balances down to ${currency.maxNegativeBalance}.`);
// Validate debit bounds.
// When allowNegativeGroupOnly is true, only group members may overdraft;
// non-members are limited to their current balance. Note: the invariant
// allowNegativeGroupOnly ⇒ allowNegative is enforced at creation time
// in CurrencyService.createCurrency.
if (currency.allowNegativeGroupOnly && fromAccountType === AccountType.USER) {
const isMember = await this.groupService.isUserInGroup(currency.groupId, fromAccountId);

if (!isMember) {
if (currentBalance < amount) {
throw new Error("Insufficient balance. Only group members can have negative balances for this currency.");
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}
} else {
this.validateNegativeAllowance(currency, currentBalance, amount);
}

// Create debit entry (from sender's account)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
const [description, setDescription] = useState("");
const [groupId, setGroupId] = useState("");
const [allowNegative, setAllowNegative] = useState(false);
const [allowNegativeGroupOnly, setAllowNegativeGroupOnly] = useState(false);
const [maxNegativeInput, setMaxNegativeInput] = useState("");
const [error, setError] = useState<string | null>(null);
const queryClient = useQueryClient();
Expand All@@ -28,6 +29,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description?: string;
groupId: string;
allowNegative: boolean;
allowNegativeGroupOnly: boolean;
maxNegativeBalance: number | null;
}) => {
const response = await apiClient.post("/api/currencies", data);
Expand All@@ -40,6 +42,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
setDescription("");
setGroupId("");
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
setError(null);
onOpenChange(false);
Expand DownExpand Up@@ -91,6 +94,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
description,
groupId,
allowNegative,
allowNegativeGroupOnly,
maxNegativeBalance: maxNegativeValue,
});
}}
Expand DownExpand Up@@ -142,6 +146,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
type="button"
onClick={() => {
setAllowNegative(false);
setAllowNegativeGroupOnly(false);
setMaxNegativeInput("");
}}
className={`p-4 border-2 rounded-lg text-left transition-all ${
Expand DownExpand Up@@ -173,8 +178,24 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
</div>

{allowNegative && (
<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<>
<div>
<label className="flex items-center gap-2 cursor-pointer">
<input
type="checkbox"
checked={allowNegativeGroupOnly}
onChange={(e) => setAllowNegativeGroupOnly(e.target.checked)}
className="w-4 h-4 rounded border-gray-300"
/>
<span className="text-sm font-medium">Restrict overdraft to group members only</span>
</label>
<p className="text-xs text-muted-foreground mt-1 ml-6">
When enabled, only users who are members of the currency's group can have negative balances. Non-members must maintain a positive balance.
</p>
</div>

<div>
<label className="block text-sm font-medium mb-1">Max negative balance (absolute value)</label>
<input
type="number"
min={0}
Expand All@@ -189,6 +210,7 @@ export default function CreateCurrencyModal({ open, onOpenChange, groups }: Crea
Limit how far any account can go below zero (max {MAX_NEGATIVE_LIMIT.toLocaleString()}).
</p>
</div>
</>
)}

{error && (
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,7 +244,9 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
)}
{fromCurrencyData && fromCurrencyData.allowNegative && (
<p className="text-sm text-muted-foreground mt-1">
Negative balances are allowed for this currency
{fromCurrencyData.allowNegativeGroupOnly
? "Negative balances allowed for group members"
: "Negative balances are allowed for this currency"}
</p>
)}
</div>
Expand DownExpand Up@@ -353,15 +355,6 @@ export default function TransferModal({ open, onOpenChange, fromCurrencyId, acco
</div>
)}

{/* Mutation Error */}
{transferMutation.isError && (
<div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg">
{transferMutation.error instanceof Error
? transferMutation.error.message
: "An error occurred while processing the transfer"}
</div>
)}

<div className="flex gap-2 justify-end pt-4">
<button
type="button"
Expand Down
4 changes: 3 additions & 1 deletion platforms/ecurrency/client/client/src/pages/dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,9 @@ export default function Dashboard() {
<div className="text-xs text-white/80 mt-1">{formatEName(balance.currency.ename)}</div>
{balance.currency.allowNegative !== undefined && (
<div className="text-xs px-2 py-0.5 rounded bg-white/20 text-white/90 mt-1 inline-block">
{balance.currency.allowNegative ? "Negative Allowed" : "No Negative"}
{balance.currency.allowNegative
? (balance.currency.allowNegativeGroupOnly ? "Negative Allowed (Members only)" : "Negative Allowed")
: "No Negative"}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion platforms/ecurrency/client/vite.config.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import path from "path";

const envDir = path.resolve(import.meta.dirname, "../../");
const envDir = path.resolve(import.meta.dirname, "../../../");
console.log("🔍 Vite envDir:", envDir);

export default defineConfig({
Expand Down