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
67 changes: 62 additions & 5 deletions app/src/components/BalanceCodesSection.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState, useEffect, useCallback } from "react";
import { useAuth } from "../hooks/useAuth";
import { Ticket, TicketCheck, TicketSlash } from "lucide-react";
import { RedeemedTransferBalanceCode } from "../services/types";
import { fetchNetworkTransferBalanceCodes } from "../services/api";
import { RedeemedTransferBalanceCode, SubscriptionBalanceResponse } from "../services/types";
import { fetchNetworkTransferBalanceCodes, fetchSubscriptionBalance } from "../services/api";
import RedeemTransferBalanceCodeModal from "./RedeemTransferBalanceCodeModal";

const BalanceCodesSection: React.FC = () => {
Expand Down Expand Up @@ -53,7 +53,9 @@ const BalanceCodesSection: React.FC = () => {
const [transferBalanceCodes, setTransferBalanceCodes] = useState<RedeemedTransferBalanceCode[]>([]);
const [isAddTransferBalanceCodeModalOpen, setIsAddTransferBalanceCodeModalOpen] = useState(false);
const [isLoadingTransferBalanceCodes, setIsLoadingTransferBalanceCodes] = useState(true);

const [isLoadingSubscriptionBalance, setIsLoadingSubscriptionBalance] = useState(true);
const [subscriptionBalance, setSubscriptionBalance] = useState<SubscriptionBalanceResponse | null>(null);

const loadTransferBalanceCodes = useCallback(async () => {
if (!token) {
setIsLoadingTransferBalanceCodes(false);
Expand All @@ -74,9 +76,34 @@ const BalanceCodesSection: React.FC = () => {
}
}, [token]);

const loadSubscriptionBalance = useCallback(async () => {

if (!token) {
setIsLoadingSubscriptionBalance(false);
return;
}

setIsLoadingSubscriptionBalance(true);

try {
const response = await fetchSubscriptionBalance(token);
if (response && 'error' in response) {
console.error('Error fetching subscription balance:', response.error.message);
return;
}
setSubscriptionBalance(response);
} catch (error) {
console.error('Failed to fetch subscription balance:', error);
} finally {
setIsLoadingSubscriptionBalance(false);
}

}, [token]);

useEffect(() => {
loadTransferBalanceCodes();
}, [token, loadTransferBalanceCodes]);
loadSubscriptionBalance();
}, [token, loadTransferBalanceCodes, loadSubscriptionBalance]);

const maskSecret = (secret: string) => {
if (!secret || secret.length <= 6) return secret;
Expand All @@ -88,6 +115,19 @@ const BalanceCodesSection: React.FC = () => {
return date.toLocaleString();
};

const formatDataBalance = (bytes: number) => {
if (typeof bytes !== "number" || isNaN(bytes)) return "-";
const TIB = 1099511627776;
const GIB = 1073741824;
if (bytes < TIB) {
const gib = bytes / GIB;
return `${gib.toFixed(2)} GiB`;
} else {
const tib = bytes / TIB;
return `${tib.toFixed(2)} TiB`;
}
};

return (
<div className="space-y-8">
<div className="flex flex-col md:flex-row md:items-center justify-between gap-4 animate-staggerFadeUp" style={{ animationDelay: '0.05s' }}>
Expand All @@ -104,7 +144,6 @@ const BalanceCodesSection: React.FC = () => {
</div>
</div>


<div className="bg-slate-800 rounded-xl shadow-2xl overflow-hidden border border-gray-700 animate-staggerFadeUp" style={{ animationDelay: '0.1s' }}>
<div className={colorClasses.headerBg}>
<div className="flex items-center gap-3">
Expand All @@ -116,20 +155,38 @@ const BalanceCodesSection: React.FC = () => {
</div>
</div>

<div className="px-6 py-4 border-b border-gray-700">
<p>
Total Data Balance:
<span className="ml-1">
{isLoadingSubscriptionBalance
? " Loading..."
: subscriptionBalance
? formatDataBalance(subscriptionBalance.balance_byte_count)
: "-"
}
</span>
</p>
</div>

{transferBalanceCodes.length > 0 ? (
<div className="max-h-80 overflow-y-auto">
<table className="min-w-full divide-y divide-gray-700">
<thead className="bg-gray-900 sticky top-0 z-10">
<tr>
<th className="px-6 py-3 text-left text-xs font-medium text-gray-300 uppercase tracking-wider">Secret</th>
<th className="px-6 py-3 text-left text-xs font-medium text-gray-300 uppercase tracking-wider">Data</th>
<th className="px-6 py-3 text-left text-xs font-medium text-gray-300 uppercase tracking-wider">Redeemed</th>
<th className="px-6 py-3 text-left text-xs font-medium text-gray-300 uppercase tracking-wider">Valid Until</th>
</tr>
</thead>
<tbody className="bg-gray-800 divide-y divide-gray-700">
{transferBalanceCodes.map((code) => (
<tr key={code.balance_code_id}>
<td className="px-6 py-4 whitespace-nowrap">{maskSecret(code.secret)}</td>
<td className="px-6 py-4 whitespace-nowrap">{`+${formatDataBalance(code.balance_byte_count)}`}</td>
<td className="px-6 py-4 whitespace-nowrap">{formatDate(code.redeem_time)}</td>
<td className="px-6 py-4 whitespace-nowrap">{formatDate(code.end_time)}</td>
</tr>
))}
</tbody>
Expand Down
43 changes: 43 additions & 0 deletions app/src/services/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import type {
NetworkReliabilityResponse,
RedeemedTransferBalanceCodesResponse,
RedeemTransferBalanceCodeResponse,
SubscriptionBalanceResponse,
} from "./types";

const API_BASE_URL = import.meta.env.VITE_API_BASE ?? "https://api.bringyour.com";
Expand Down Expand Up @@ -980,6 +981,48 @@ export const redeemTransferBalanceCode = async (
}
};

/**
* Get subscription balance
* @param token - JWT authentication token
* @returns SubscriptionBalanceResponse with balance info
*/
export const fetchSubscriptionBalance = async (
token: string
): Promise<SubscriptionBalanceResponse|{ error: { message: string } }> => {
try {
const response = await fetch(`${API_BASE_URL}/subscription/balance`, {
method: "GET",
headers: {
Authorization: `Bearer ${token}`,
Accept: "*/*",
},
});

if (!response.ok) {
return {
error: {
message: `HTTP error! status: ${response.status}`,
},
};
}

const data = await safeJsonParse<SubscriptionBalanceResponse>(response);

return data;

} catch (error) {
console.error("Fetch subscription balance error:", error);
return {
error: {
message:
error instanceof Error
? error.message
: "Failed to fetch subscription balance",
},
};
}
};

// Export types for convenience
export type {
AuthResponse,
Expand Down
29 changes: 29 additions & 0 deletions app/src/services/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -562,4 +562,33 @@ export interface RedeemedTransferBalanceCodesResponse {
*/
export interface RedeemTransferBalanceCodeResponse {
error?: { message: string };
}

/**
* Response from fetching subscription balance
*/
export interface SubscriptionBalanceResponse {
start_balance_byte_count: number;
balance_byte_count: number;
open_transfer_byte_count: number;
current_subscription: CurrentSubscription;
pending_payout_usd_nano_cents: number;
update_time: string;
active_transfer_balances: TransferBalance[];
}

export interface CurrentSubscription {
subscription_id: string;
store: string; // e.g., "apple", "google"
plan: string;
}

export interface TransferBalance {
balance_id: string;
network_id: string;
start_time: string;
end_time: string;
start_balance_byte_count: number;
net_revenue: number;
balance_byte_count: number;
}