@powerhousedao/contributor-billing 0.0.83 → 0.0.84

package/dist/editors/invoice/invoiceToGnosis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invoiceToGnosis.d.ts","sourceRoot":"","sources":["../../../editors/invoice/invoiceToGnosis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAUxC,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAmQnD,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"invoiceToGnosis.d.ts","sourceRoot":"","sources":["../../../editors/invoice/invoiceToGnosis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAUnD,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA+QnD,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/editors/invoice/invoiceToGnosis.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { actions } from "../../document-models/invoice/index.js";
 import { generateId } from "document-model";
 let GRAPHQL_URL = "http://localhost:4001/graphql/invoice";
@@ -9,12 +9,23 @@ if (!window.document.baseURI.includes("localhost")) {
 const InvoiceToGnosis = ({ docState, dispatch, }) => {
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
-    const [responseData, setResponseData] = useState(null);
     const [invoiceStatusResponse, setInvoiceStatusResponse] = useState(null);
     const [safeTxHash, setsafeTxHash] = useState(null);
+    const [safeAddress, setSafeAddress] = useState(null);
     const currency = docState.currency;
     const chainName = docState.issuer.paymentRouting.wallet.chainName;
     const invoiceStatus = docState.status;
+    useEffect(() => {
+        // set safeADdress from processorRef
+        if (docState.payments.length < 1)
+            return;
+        const lastPayment = docState.payments[docState.payments.length - 1].processorRef;
+        console.log(lastPayment);
+        const retrievedSafeAddress = lastPayment.split(":");
+        if (retrievedSafeAddress[0]) {
+            setSafeAddress(retrievedSafeAddress[0]);
+        }
+    }, [docState.payments.length]);
     const TOKEN_ADDRESSES = {
         BASE: {
             USDC: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
@@ -93,16 +104,17 @@ const InvoiceToGnosis = ({ docState, dispatch, }) => {
             if (data.success) {
                 const dataObj = typeof data.data === "string" ? JSON.parse(data.data) : data.data;
                 setsafeTxHash(dataObj.txHash);
+                setSafeAddress(dataObj.safeAddress);
                 if (invoiceStatus === "ACCEPTED") {
                     dispatch(actions.schedulePayment({
                         id: generateId(),
-                        processorRef: dataObj.txHash,
+                        processorRef: `${dataObj.safeAddress}:${dataObj.txHash}`,
                     }));
                 }
                 else {
                     dispatch(actions.addPayment({
                         id: generateId(),
-                        processorRef: dataObj.txHash,
+                        processorRef: `${dataObj.safeAddress}:${dataObj.txHash}`,
                         confirmed: false,
                     }));
                 }
@@ -157,10 +169,10 @@ const InvoiceToGnosis = ({ docState, dispatch, }) => {
                     ? "Processing..."
                     : invoiceStatus === "ACCEPTED"
                         ? "Schedule Payment in Gnosis Safe"
-                        : "Reschedule Payment in Gnosis Safe" })), error && (_jsx("div", { className: "text-red-500 bg-red-50 p-3 rounded-md", children: error })), safeTxHash && (_jsxs("div", { className: "bg-gray-50 mt-4 rounded-md space-y-2", children: [_jsx("a", { href: `https://app.safe.global/transactions/queue?safe=${urlChainName}:0x1FB6bEF04230d67aF0e3455B997a28AFcCe1F45e`, target: "_blank", rel: "noopener noreferrer", className: "text-blue-500 hover:text-blue-600 underline block", children: linkText }), _jsxs("p", { className: "font-medium", children: ["Safe Transaction Hash:", _jsx("span", { className: "font-mono text-sm ml-2 break-all", children: safeTxHash })] })] })), !safeTxHash &&
+                        : "Reschedule Payment in Gnosis Safe" })), error && (_jsx("div", { className: "text-red-500 bg-red-50 p-3 rounded-md", children: error })), safeTxHash && (_jsxs("div", { className: "bg-gray-50 mt-4 rounded-md space-y-2", children: [_jsx("a", { href: `https://app.safe.global/transactions/queue?safe=${urlChainName}:${safeAddress}`, target: "_blank", rel: "noopener noreferrer", className: "text-blue-500 hover:text-blue-600 underline block", children: linkText }), _jsxs("p", { className: "font-medium", children: ["Safe Transaction Hash:", _jsx("span", { className: "font-mono text-sm ml-2 break-all", children: safeTxHash })] })] })), !safeTxHash &&
                 !error &&
                 invoiceStatus === "PAYMENTSCHEDULED" &&
-                docState.payments.length > 0 && (_jsx(_Fragment, { children: docState.payments[docState.payments.length - 1].issue !== "" ? (_jsx("div", { className: "mt-4", children: _jsxs("p", { className: "text-red-700 font-medium", children: ["Issue: ", docState.payments[docState.payments.length - 1].issue] }) })) : (_jsxs("div", { className: "mt-4", children: [_jsx("div", { className: "invoice-link text-blue-900 hover:text-blue-600", children: _jsx("a", { className: "view-invoice-button", href: `https://app.safe.global/transactions/queue?safe=${urlChainName}:0x1FB6bEF04230d67aF0e3455B997a28AFcCe1F45e`, target: "_blank", rel: "noopener noreferrer", children: linkText }) }), _jsxs("p", { className: "mt-4 font-medium", children: ["Safe Transaction Hash:", _jsx("span", { className: "font-mono text-sm ml-2 break-all", children: docState.payments[docState.payments.length - 1]
+                docState.payments.length > 0 && (_jsx(_Fragment, { children: docState.payments[docState.payments.length - 1].issue !== "" ? (_jsx("div", { className: "mt-4", children: _jsxs("p", { className: "text-red-700 font-medium", children: ["Issue: ", docState.payments[docState.payments.length - 1].issue] }) })) : (_jsxs("div", { className: "mt-4", children: [_jsx("div", { className: "invoice-link text-blue-900 hover:text-blue-600", children: _jsx("a", { className: "view-invoice-button", href: `https://app.safe.global/transactions/queue?safe=${urlChainName}:${safeAddress}`, target: "_blank", rel: "noopener noreferrer", children: linkText }) }), _jsxs("p", { className: "mt-4 font-medium", children: ["Safe Transaction Hash:", _jsx("span", { className: "font-mono text-sm ml-2 break-all", children: docState.payments[docState.payments.length - 1]
                                         .processorRef })] })] })) })), invoiceStatusResponse && (_jsxs("div", { className: "bg-gray-50 p-4 rounded-md", children: [_jsx("p", { className: "font-medium", children: "Payment Details:" }), _jsx("p", { className: "text-gray-700", children: invoiceStatusResponse })] }))] }));
 };
 export default InvoiceToGnosis;

package/dist/scripts/invoice/gnosisTransactionBuilder.js

@@ -4,7 +4,7 @@ import { OperationType } from '@safe-global/types-kit';
 import { ethers, AbiCoder } from 'ethers';
 import dotenv from 'dotenv';
 dotenv.config();
-const safeAddress = process.env.DEV_STAGING_SAFE_ADDRESS;
+const safeAddress = process.env.PRODUCTION_SAFE_ADDRESS;
 if (!safeAddress) {
     throw new Error('Missing SAFE_ADDRESS in .env');
 }

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.0.83",
+  "version": "0.0.84",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [