@powerhousedao/contributor-billing 0.1.4 → 0.1.6

package/dist/editors/expense-report/hooks/useWalletSync.js

@@ -20,47 +20,45 @@ export function useWalletSync(wallets) {
             if (!wallet.billingStatements || wallet.billingStatements.length === 0) {
                 return; // No billing statements to sync
             }
-            // Get current line items count and total for this wallet
-            const currentLineItemsCount = wallet.lineItems?.length || 0;
-            let currentTotal = 0;
+            // Get current aggregated totals by category from wallet line items
+            const currentCategoryTotals = new Map();
             wallet.lineItems?.forEach((item) => {
-                currentTotal += item?.actuals || 0;
+                if (item?.group) {
+                    const currentTotal = currentCategoryTotals.get(item.group) || 0;
+                    currentCategoryTotals.set(item.group, currentTotal + (item.actuals || 0));
+                }
             });
-            // Calculate what the line items should be based on billing statements
-            let expectedLineItemsCount = 0;
-            let expectedTotal = 0;
-            const expectedTags = new Set();
+            // Calculate expected aggregated totals by category from billing statements
+            const expectedCategoryTotals = new Map();
+            const expectedCategoryLabels = new Set();
             wallet.billingStatements.forEach((statementId) => {
                 if (!statementId)
                     return;
                 const statement = billingStatements.get(statementId);
                 if (statement?.state?.global?.lineItems) {
-                    expectedLineItemsCount += statement.state.global.lineItems.length;
                     statement.state.global.lineItems.forEach((item) => {
-                        expectedTotal += item.totalPriceCash || 0;
-                        // Collect tags from billing statement
+                        // Find expense-account tag
                         const expenseAccountTag = item.lineItemTag?.find((tag) => tag.dimension === "expense-account");
                         if (expenseAccountTag?.label) {
-                            expectedTags.add(expenseAccountTag.label);
+                            expectedCategoryLabels.add(expenseAccountTag.label);
+                            const currentTotal = expectedCategoryTotals.get(expenseAccountTag.label) || 0;
+                            expectedCategoryTotals.set(expenseAccountTag.label, currentTotal + (item.totalPriceCash || 0));
                         }
                     });
                 }
             });
-            // Check current tags in wallet line items
-            const currentTags = new Set();
-            wallet.lineItems?.forEach((item) => {
-                if (item?.group) {
-                    // We need to map the group ID back to label to compare
-                    // This is a simplified check - just checking if tags exist
-                    currentTags.add(item.group);
-                }
-            });
-            // Check if wallet needs sync (count or total mismatch)
-            const needsQuantitySync = currentLineItemsCount !== expectedLineItemsCount ||
-                Math.abs(currentTotal - expectedTotal) > 0.01; // Account for floating point precision
-            // Check if tags have changed (size mismatch suggests tag changes)
-            const hasTagChanges = expectedTags.size > 0 && currentTags.size !== expectedTags.size;
-            if (needsQuantitySync || hasTagChanges) {
+            // Check if categories have changed
+            const currentCategories = new Set(currentCategoryTotals.keys());
+            const hasTagChanges = currentCategories.size !== expectedCategoryLabels.size;
+            // Check if totals per category have changed
+            let hasTotalMismatch = false;
+            // We need to check if the aggregated totals match
+            // Since wallet stores group IDs but billing statements have labels,
+            // we need to sum up all line items regardless of category structure
+            const currentTotalActuals = Array.from(currentCategoryTotals.values()).reduce((sum, total) => sum + total, 0);
+            const expectedTotalActuals = Array.from(expectedCategoryTotals.values()).reduce((sum, total) => sum + total, 0);
+            hasTotalMismatch = Math.abs(currentTotalActuals - expectedTotalActuals) > 0.01;
+            if (hasTagChanges || hasTotalMismatch) {
                 if (wallet.wallet) {
                     outdatedWallets.push(wallet.wallet);
                     if (hasTagChanges) {

package/dist/editors/invoice/legalEntity/bankSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bankSection.d.ts","sourceRoot":"","sources":["../../../../editors/invoice/legalEntity/bankSection.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EAOtB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAG5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAMtE,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAC5C,qBAAqB,CAAC,KAAK,CAAC,EAC5B,UAAU,CACX,GAAG;IACF,QAAQ,CAAC,KAAK,EAAE,wBAAwB,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAC7D,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrD,QAAQ,CAAC,cAAc,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClD,QAAQ,CAAC,aAAa,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACjD,QAAQ,CAAC,uBAAuB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3D,QAAQ,CAAC,kBAAkB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACtD,QAAQ,CAAC,uBAAuB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAmCF,eAAO,MAAM,sBAAsB,qIA6hBlC,CAAC"}
+{"version":3,"file":"bankSection.d.ts","sourceRoot":"","sources":["../../../../editors/invoice/legalEntity/bankSection.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EAOtB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAG5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAMtE,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAC5C,qBAAqB,CAAC,KAAK,CAAC,EAC5B,UAAU,CACX,GAAG;IACF,QAAQ,CAAC,KAAK,EAAE,wBAAwB,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAC7D,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrD,QAAQ,CAAC,cAAc,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClD,QAAQ,CAAC,aAAa,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACjD,QAAQ,CAAC,uBAAuB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3D,QAAQ,CAAC,kBAAkB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACtD,QAAQ,CAAC,uBAAuB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAmCF,eAAO,MAAM,sBAAsB,qIAoiBlC,CAAC"}

package/dist/editors/invoice/legalEntity/bankSection.js

@@ -79,24 +79,24 @@ export const LegalEntityBankSection = forwardRef(function LegalEntityBankSection
     }
     const SEPA_SWIFT_CURRENCIES = ["EUR", "DKK", "GBP", "CHF", "JPY"];
     const usdIbanPayment = useMemo(() => isValidIBAN(localState.accountNum ?? "") && currency === "USD", [localState.accountNum, currency]);
-    return (_jsxs("div", { ...divProps, className: twMerge("rounded-lg border border-gray-200 bg-white p-6", props.className), ref: ref, children: [_jsx("h3", { className: "mb-4 text-lg font-semibold text-gray-900", children: "Banking Information" }), _jsxs("div", { className: "space-y-6", children: [_jsxs("div", { className: "space-y-4", children: [_jsx("div", { className: "space-y-2", children: _jsx(InputField
-                                // input={localState.accountNum ?? ""}
-                                , { 
-                                    // input={localState.accountNum ?? ""}
-                                    value: localState.accountNum ?? "", label: "Account Number", placeholder: "Account Number", onBlur: createBlurHandler("accountNum"), handleInputChange: createInputHandler("accountNum"), className: "h-10 w-full text-md mb-2", validation: 
-                                    // Prefer the first failing validation between IBAN and generic account number
-                                    (() => {
-                                        const firstInvalid = (ibanvalidation &&
-                                            !ibanvalidation.isValid &&
-                                            ibanvalidation) ||
-                                            (accountNumbervalidation &&
-                                                !accountNumbervalidation.isValid &&
-                                                accountNumbervalidation);
-                                        return (firstInvalid ||
-                                            ibanvalidation ||
-                                            accountNumbervalidation ||
-                                            null);
-                                    })() }) }), _jsx("div", { className: "space-y-2", children: _jsxs("div", { className: "grid grid-cols-2 gap-4", children: [_jsx("div", { className: "space-y-2", children: _jsx(Select, { className: "h-10 w-full text-md mb-2", label: "Account Type", options: ACCOUNT_TYPES.map((type) => ({
+    return (_jsxs("div", { ...divProps, className: twMerge("rounded-lg border border-gray-200 bg-white p-6", props.className), ref: ref, children: [_jsx("h3", { className: "mb-4 text-lg font-semibold text-gray-900", children: "Banking Information" }), _jsxs("div", { className: "space-y-6", children: [_jsxs("div", { className: "space-y-4", children: [_jsx("div", { className: "space-y-2", children: _jsxs("div", { children: [_jsxs("label", { className: "block text-sm font-medium text-gray-700 mb-1", children: ["Account Number", isValidIBAN(localState.accountNum ?? "") && (_jsx("span", { className: "ml-2 text-green-600 font-medium", children: "IBAN" }))] }), _jsx(InputField
+                                        // input={localState.accountNum ?? ""}
+                                        , { 
+                                            // input={localState.accountNum ?? ""}
+                                            value: localState.accountNum ?? "", placeholder: "Account Number", onBlur: createBlurHandler("accountNum"), handleInputChange: createInputHandler("accountNum"), className: "h-10 w-full text-md mb-2", validation: 
+                                            // Prefer the first failing validation between IBAN and generic account number
+                                            (() => {
+                                                const firstInvalid = (ibanvalidation &&
+                                                    !ibanvalidation.isValid &&
+                                                    ibanvalidation) ||
+                                                    (accountNumbervalidation &&
+                                                        !accountNumbervalidation.isValid &&
+                                                        accountNumbervalidation);
+                                                return (firstInvalid ||
+                                                    ibanvalidation ||
+                                                    accountNumbervalidation ||
+                                                    null);
+                                            })() })] }) }), _jsx("div", { className: "space-y-2", children: _jsxs("div", { className: "grid grid-cols-2 gap-4", children: [_jsx("div", { className: "space-y-2", children: _jsx(Select, { className: "h-10 w-full text-md mb-2", label: "Account Type", options: ACCOUNT_TYPES.map((type) => ({
                                                     label: type,
                                                     value: type,
                                                 })), value: localState.accountType ?? "", onChange: (value) => {

package/dist/editors/invoice/lineItemTags/lineItemTags.js

@@ -49,7 +49,7 @@ export function LineItemTagsTable({ lineItems, onClose, dispatch, paymentAccount
                                                     id: item.id,
                                                     description: e.target.value,
                                                 }));
-                                            } }) }), _jsx("td", { className: "border-b border-gray-200 w-48", children: _jsx(DatePicker, { name: "period", dateFormat: "YYYY-MM", autoClose: true, placeholder: "Select Period", value: item.lineItemTag.find((tag) => tag.dimension === "accounting-period")?.label || "", onChange: (e) => dispatch(actions.setLineItemTag({
+                                            } }) }), _jsx("td", { className: "border-b border-gray-200 w-48", children: _jsx(DatePicker, { name: "period", dateFormat: "YYYY-MM-DD", autoClose: true, placeholder: "Select Period", value: item.lineItemTag.find((tag) => tag.dimension === "accounting-period")?.label || "", onChange: (e) => dispatch(actions.setLineItemTag({
                                                 lineItemId: item.id,
                                                 dimension: "accounting-period",
                                                 value: new Date(e.target.value)

package/dist/style.css

@@ -310,6 +310,9 @@
   .inset-0 {
     inset: calc(var(--spacing) * 0);
   }
+  .top-0 {
+    top: calc(var(--spacing) * 0);
+  }
   .top-1\/2 {
     top: calc(1/2 * 100%);
   }
@@ -352,6 +355,9 @@
       max-width: 96rem;
     }
   }
+  .mx-4 {
+    margin-inline: calc(var(--spacing) * 4);
+  }
   .mx-auto {
     margin-inline: auto;
   }
@@ -421,6 +427,9 @@
   .inline {
     display: inline;
   }
+  .inline-block {
+    display: inline-block;
+  }
   .inline-flex {
     display: inline-flex;
   }
@@ -473,6 +482,9 @@
   .h-full {
     height: 100%;
   }
+  .max-h-20 {
+    max-height: calc(var(--spacing) * 20);
+  }
   .max-h-32 {
     max-height: calc(var(--spacing) * 32);
   }
@@ -533,6 +545,9 @@
   .w-72 {
     width: calc(var(--spacing) * 72);
   }
+  .w-96 {
+    width: calc(var(--spacing) * 96);
+  }
   .w-\[200px\] {
     width: 200px;
   }
@@ -569,6 +584,9 @@
   .min-w-0 {
     min-width: calc(var(--spacing) * 0);
   }
+  .min-w-\[4rem\] {
+    min-width: 4rem;
+  }
   .min-w-\[142px\] {
     min-width: 142px;
   }
@@ -810,6 +828,9 @@
     --tw-border-style: dashed;
     border-style: dashed;
   }
+  .border-amber-200 {
+    border-color: var(--color-amber-200);
+  }
   .border-blue-100 {
     border-color: var(--color-blue-100);
   }
@@ -831,6 +852,9 @@
   .border-gray-500 {
     border-color: var(--color-gray-500);
   }
+  .border-gray-900 {
+    border-color: var(--color-gray-900);
+  }
   .border-green-500 {
     border-color: var(--color-green-500);
   }
@@ -861,6 +885,12 @@
       background-color: color-mix(in oklab, var(--color-black) 30%, transparent);
     }
   }
+  .bg-black\/50 {
+    background-color: color-mix(in srgb, #000 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      background-color: color-mix(in oklab, var(--color-black) 50%, transparent);
+    }
+  }
   .bg-blue-50 {
     background-color: var(--color-blue-50);
   }
@@ -885,9 +915,6 @@
   .bg-gray-300 {
     background-color: var(--color-gray-300);
   }
-  .bg-gray-400 {
-    background-color: var(--color-gray-400);
-  }
   .bg-gray-500 {
     background-color: var(--color-gray-500);
   }
@@ -927,6 +954,9 @@
   .p-0 {
     padding: calc(var(--spacing) * 0);
   }
+  .p-0\.5 {
+    padding: calc(var(--spacing) * 0.5);
+  }
   .p-1 {
     padding: calc(var(--spacing) * 1);
   }
@@ -999,9 +1029,15 @@
   .pt-6 {
     padding-top: calc(var(--spacing) * 6);
   }
+  .pr-3 {
+    padding-right: calc(var(--spacing) * 3);
+  }
   .pb-2 {
     padding-bottom: calc(var(--spacing) * 2);
   }
+  .pl-6 {
+    padding-left: calc(var(--spacing) * 6);
+  }
   .pl-11 {
     padding-left: calc(var(--spacing) * 11);
   }
@@ -1014,6 +1050,9 @@
   .text-right {
     text-align: right;
   }
+  .align-top {
+    vertical-align: top;
+  }
   .font-mono {
     font-family: var(--font-mono);
   }
@@ -1061,18 +1100,21 @@
     --tw-tracking: var(--tracking-wider);
     letter-spacing: var(--tracking-wider);
   }
+  .break-words {
+    overflow-wrap: break-word;
+  }
   .break-all {
     word-break: break-all;
   }
   .whitespace-nowrap {
     white-space: nowrap;
   }
-  .whitespace-pre-wrap {
-    white-space: pre-wrap;
-  }
   .text-amber-600 {
     color: var(--color-amber-600);
   }
+  .text-amber-800 {
+    color: var(--color-amber-800);
+  }
   .text-black {
     color: var(--color-black);
   }
@@ -1139,9 +1181,6 @@
   .uppercase {
     text-transform: uppercase;
   }
-  .italic {
-    font-style: italic;
-  }
   .ordinal {
     --tw-ordinal: ordinal;
     font-variant-numeric: var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,);
@@ -1154,9 +1193,6 @@
       color: var(--color-gray-500);
     }
   }
-  .opacity-0 {
-    opacity: 0%;
-  }
   .opacity-50 {
     opacity: 50%;
   }
@@ -1238,10 +1274,10 @@
     --tw-outline-style: none;
     outline-style: none;
   }
-  .group-hover\:opacity-100 {
+  .group-hover\:bg-blue-50 {
     &:is(:where(.group):hover *) {
       @media (hover: hover) {
-        opacity: 100%;
+        background-color: var(--color-blue-50);
       }
     }
   }
@@ -1325,13 +1361,6 @@
       }
     }
   }
-  .hover\:bg-gray-500 {
-    &:hover {
-      @media (hover: hover) {
-        background-color: var(--color-gray-500);
-      }
-    }
-  }
   .hover\:bg-gray-600 {
     &:hover {
       @media (hover: hover) {
@@ -1430,6 +1459,13 @@
       }
     }
   }
+  .hover\:text-red-800 {
+    &:hover {
+      @media (hover: hover) {
+        color: var(--color-red-800);
+      }
+    }
+  }
   .hover\:opacity-80 {
     &:hover {
       @media (hover: hover) {
@@ -1601,6 +1637,16 @@
       }
     }
   }
+  .dark\:border-amber-800 {
+    &:where(.dark, .dark *) {
+      border-color: var(--color-amber-800);
+    }
+  }
+  .dark\:border-gray-100 {
+    &:where(.dark, .dark *) {
+      border-color: var(--color-gray-100);
+    }
+  }
   .dark\:border-gray-500 {
     &:where(.dark, .dark *) {
       border-color: var(--color-gray-500);
@@ -1668,6 +1714,11 @@
       }
     }
   }
+  .dark\:text-amber-200 {
+    &:where(.dark, .dark *) {
+      color: var(--color-amber-200);
+    }
+  }
   .dark\:text-amber-400 {
     &:where(.dark, .dark *) {
       color: var(--color-amber-400);
@@ -1710,6 +1761,18 @@
       }
     }
   }
+  .dark\:group-hover\:bg-blue-900\/20 {
+    &:where(.dark, .dark *) {
+      &:is(:where(.group):hover *) {
+        @media (hover: hover) {
+          background-color: color-mix(in srgb, oklch(37.9% 0.146 265.522) 20%, transparent);
+          @supports (color: color-mix(in lab, red, red)) {
+            background-color: color-mix(in oklab, var(--color-blue-900) 20%, transparent);
+          }
+        }
+      }
+    }
+  }
   .dark\:hover\:border-gray-600 {
     &:where(.dark, .dark *) {
       &:hover {
@@ -1836,6 +1899,15 @@
       }
     }
   }
+  .dark\:hover\:text-red-300 {
+    &:where(.dark, .dark *) {
+      &:hover {
+        @media (hover: hover) {
+          color: var(--color-red-300);
+        }
+      }
+    }
+  }
   .dark\:focus\:ring-blue-400 {
     &:where(.dark, .dark *) {
       &:focus {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/contributor-billing",
   "description": "Document models that help contributors of open organisations get paid anonymously for their work on a monthly basis.",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [
@@ -93,6 +93,7 @@
     "@powerhousedao/reactor-local": "^5.0.0-staging.30",
     "@powerhousedao/scalars": "^1.33.1-staging.5",
     "@powerhousedao/switchboard": "^5.0.0-staging.30",
+    "@powerhousedao/vetra": "5.0.0-staging.30",
     "@tailwindcss/cli": "^4.1.4",
     "@testing-library/react": "^16.3.0",
     "@types/node": "^22.14.1",