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
5 changes: 5 additions & 0 deletions .changeset/huge-waves-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"mpesa2csv": minor
---

feat: add money in/out sheets
44 changes: 16 additions & 28 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
overrides:
js-yaml@<3.14.2: '>=3.14.2'
tar@<=7.5.2: '>=7.5.3'
tar@<=7.5.3: '>=7.5.4'
vite@>=7.1.0 <=7.1.10: '>=7.1.11'
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"windows": [
{
"title": "mpesa2csv - Convert M-PESA Statements to CSV/Excel",
"width": 640,
"height": 730,
"width": 750,
"height": 850,
"minWidth": 500,
"minHeight": 400,
"resizable": true
Expand Down Expand Up @@ -68,8 +68,8 @@
"y": 170
},
"windowSize": {
"width": 660,
"height": 730
"width": 750,
"height": 850
}
}
},
Expand Down
39 changes: 20 additions & 19 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -493,38 +493,39 @@ function App() {
/>
</div>
) : status === FileStatus.PROCESSING ? (
<div className="p-6 text-center flex flex-col items-center justify-center transition-all duration-300 min-h-[300px]">
<div className="relative mb-6 w-20 h-20">
<div className="w-20 h-20 rounded-full bg-primary/20 animate-ping absolute"></div>
<div className="w-20 h-20 rounded-full bg-primary/40 animate-pulse absolute"></div>
<div className="w-20 h-20 rounded-full bg-primary flex items-center justify-center relative">
<div className="p-8 text-center flex flex-col items-center justify-center min-h-[400px]">
{/* Spinner */}
<div className="relative w-20 h-20 mb-6">
<div className="w-20 h-20 rounded-full border-[3px] border-primary/20"></div>
<div className="absolute inset-0 w-20 h-20 rounded-full border-[3px] border-transparent border-t-primary animate-spin"></div>
<div className="absolute inset-0 flex items-center justify-center">
<span className="text-2xl">📊</span>
</div>
</div>

<div className="space-y-2">
<p className="text-lg font-semibold">
Processing Your Statements
</p>
<p className="text-sm text-muted-foreground">
File {currentFileIndex + 1} of {files.length}
</p>

{/* Progress bar */}
<div className="w-64 h-2 bg-muted rounded-full overflow-hidden">
<h3 className="text-lg font-semibold mb-2">
Processing Your Statements
</h3>

<p className="text-sm text-muted-foreground mb-8">
File {currentFileIndex + 1} of {files.length}
</p>

{/* Progress bar */}
<div className="w-64 mb-4">
<div className="h-1.5 bg-muted rounded-full overflow-hidden">
<div
className="h-full bg-primary transition-all duration-300"
style={{
width: `${
((currentFileIndex + 1) / files.length) * 100
}%`,
width: `${((currentFileIndex + 1) / files.length) * 100}%`,
}}
></div>
</div>
</div>

{/* Current file */}
{files[currentFileIndex] && (
<p className="text-xs text-muted-foreground mt-4 truncate max-w-full px-4">
<p className="text-xs text-muted-foreground truncate max-w-xs">
{files[currentFileIndex].name}
</p>
)}
Expand Down
11 changes: 11 additions & 0 deletions src/components/export-options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,17 @@ const SHEET_OPTIONS = [
description:
"Top 20 people/entities you send money to and receive money from, with totals and transaction counts. Excludes charges and fees.",
},
{
key: "includeMoneyInSheet" as keyof ExportOptionsType,
name: "Money In",
description: "Separate sheet with all transactions where money was received",
},
{
key: "includeMoneyOutSheet" as keyof ExportOptionsType,
name: "Money Out",
description: "Separate sheet with all transactions where money was spent",
},

];

export default function ExportOptions({
Expand Down
14 changes: 14 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@

@custom-variant dark (&:is(.dark *));

/* Custom animations */
@keyframes shimmer {
0% {
transform: translateX(-100%);
}
100% {
transform: translateX(100%);
}
}

.animate-shimmer {
animation: shimmer 2s infinite;
}

/* Dark mode support */
@media (prefers-color-scheme: dark) {
:root {
Expand Down
2 changes: 2 additions & 0 deletions src/services/exports/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ export { addMonthlyWeeklyBreakdownSheet } from "./monthlyWeeklyBreakdownSheet";
export { addDailyBalanceTrackerSheet } from "./dailyBalanceTrackerSheet";
export { addTransactionAmountDistributionSheet } from "./transactionAmountDistributionSheet";
export { addTopContactsSheet } from "./topContactsSheet";
export { addMoneyInSheet } from "./moneyInSheet";
export { addMoneyOutSheet } from "./moneyOutSheet";
Loading