@fileverse-dev/formulajs 4.4.11-mod-89-patch-1 → 4.4.11-mod-89-patch-3

package/lib/cjs/index.cjs

@@ -18475,44 +18475,57 @@ async function SMARTCONTRACT() {
   }
 }
 
+function isExpired(createdAt) {
+  if(!createdAt)return true
+  const expiryTs = createdAt + 60 * 60 * 1000;
+  return Date.now() > expiryTs;
+}
+
 async function GNOSISPAY() {
 
   try {
-    const apiKeyKey = SERVICES_API_KEY.GnosisPay;
-    const API_KEY = window.localStorage.getItem(apiKeyKey);
+    const GNOSIS_PAY_ACCESS = window.localStorage.getItem('GNOSIS_PAY_ACCESS');
 
-    if(!API_KEY){
-        throw new MissingApiKeyError(apiKeyKey)
+    if(!GNOSIS_PAY_ACCESS){
+        throw new MissingApiKeyError('GNOSIS_PAY_ACCESS')
+    }
+    const access = JSON.parse(GNOSIS_PAY_ACCESS);
+    if(!access?.token || isExpired(access?.createdAt)){
+      throw new ValidationError('Expired or invalid access token')
     }
 
     const url = new URL(`https://api.gnosispay.com/api/v1/transactions`);
     const res = await fetch(url.toString(), {
       headers: {
-        Authorization: `Bearer ${API_KEY}`,
+        Authorization: `Bearer ${access.token}`,
         'Content-Type': 'application/json',
       },
     });
 
-    if (!res.ok) throw new NetworkError(apiKeyKey, res.status);
+    if (!res.ok) throw new NetworkError('GNOSIS_PAY', res.status);
 
     const json = await res.json();
-
-    if (!Array.isArray(json)) return [];
-
-    return json.map(tx => ({
-      createdAt: tx.createdAt,
-      clearedAt: tx.clearedAt,
-      country: tx.country,
-      merchant: tx.merchant,
-      billingAmount: tx.billingAmount,
-      billingCurrency: tx.billingCurrency,
-      transactionAmount: tx.transactionAmount,
-      transactionCurrency: tx.transactionCurrency,
-      transactionType: tx.transactionType,
-      kind: tx.kind,
-      status: tx.status || null,
-      mcc: tx.mcc,
-    }));
+    if(!Array.isArray(json)){
+      return [{message: 'Unexpected response'}]
+    }
+    const result = json.map((transactions) => {
+      return {
+        createdAt: transactions.createdAt,
+        clearedAt: transactions.clearedAt,
+        country: transactions.country?.name || '',
+        isPending: transactions.isPending,
+        mcc: transactions.mcc,
+        merchant: transactions.merchant?.name || '',
+        billingAmount: transactions.billingAmount,
+        billingCurrency: transactions.billingCurrency,
+        transactionAmount: transactions.transactionAmount,
+        transactionCurrency: transactions.transactionCurrency,
+        transactionType: transactions.transactionType,
+        kind: transactions.kind,
+        status: transactions.status
+      }
+    });
+    return result 
   } catch (err) {
     return errorMessageHandler(err, 'GNOSISPAY')
   }

package/lib/esm/crypto-constants.mjs

@@ -717,33 +717,11 @@ var GNOSISPAY_metadata = {
   LOGO: "https://gnosisscan.io/assets/generic/html/favicon-light.ico",
   BRAND_COLOR: "#F6F7F6",
   BRAND_SECONDARY_COLOR: "#84968f",
-  ACTION: [
-    {
-      name: "Access required",
-      message: "To access your Gnosis Pay account, please grant permission. Your dSheet account should be created via the same wallet ss your Gnosis Pay.",
-      buttonText: "Grand access"
-    }
-  ],
   n: "GNOSISPAY",
   t: 20,
   d: "Get any data from your Gnosis Pay account.",
   a: "Get any data from your Gnosis Pay account",
-  p: [
-    {
-      name: "address",
-      detail: "Wallet address for which you want grab information e.g. [Traffic],[Volume]",
-      example: `"0x1D1479C185d32EB90533a08b36B3CFa5F84A0E6B"`,
-      require: "m",
-      type: "string"
-    },
-    {
-      name: "txns",
-      detail: "Additional numbers or ranges to add to \u201Cvalue1\u201D",
-      example: `"posts"`,
-      require: "m",
-      type: "string"
-    }
-  ]
+  p: []
 };
 
 // src/crypto/crypto-metadata.js

package/lib/esm/index.mjs

@@ -18473,44 +18473,57 @@ async function SMARTCONTRACT() {
   }
 }
 
+function isExpired(createdAt) {
+  if(!createdAt)return true
+  const expiryTs = createdAt + 60 * 60 * 1000;
+  return Date.now() > expiryTs;
+}
+
 async function GNOSISPAY() {
 
   try {
-    const apiKeyKey = SERVICES_API_KEY.GnosisPay;
-    const API_KEY = window.localStorage.getItem(apiKeyKey);
+    const GNOSIS_PAY_ACCESS = window.localStorage.getItem('GNOSIS_PAY_ACCESS');
 
-    if(!API_KEY){
-        throw new MissingApiKeyError(apiKeyKey)
+    if(!GNOSIS_PAY_ACCESS){
+        throw new MissingApiKeyError('GNOSIS_PAY_ACCESS')
+    }
+    const access = JSON.parse(GNOSIS_PAY_ACCESS);
+    if(!access?.token || isExpired(access?.createdAt)){
+      throw new ValidationError('Expired or invalid access token')
     }
 
     const url = new URL(`https://api.gnosispay.com/api/v1/transactions`);
     const res = await fetch(url.toString(), {
       headers: {
-        Authorization: `Bearer ${API_KEY}`,
+        Authorization: `Bearer ${access.token}`,
         'Content-Type': 'application/json',
       },
     });
 
-    if (!res.ok) throw new NetworkError(apiKeyKey, res.status);
+    if (!res.ok) throw new NetworkError('GNOSIS_PAY', res.status);
 
     const json = await res.json();
-
-    if (!Array.isArray(json)) return [];
-
-    return json.map(tx => ({
-      createdAt: tx.createdAt,
-      clearedAt: tx.clearedAt,
-      country: tx.country,
-      merchant: tx.merchant,
-      billingAmount: tx.billingAmount,
-      billingCurrency: tx.billingCurrency,
-      transactionAmount: tx.transactionAmount,
-      transactionCurrency: tx.transactionCurrency,
-      transactionType: tx.transactionType,
-      kind: tx.kind,
-      status: tx.status || null,
-      mcc: tx.mcc,
-    }));
+    if(!Array.isArray(json)){
+      return [{message: 'Unexpected response'}]
+    }
+    const result = json.map((transactions) => {
+      return {
+        createdAt: transactions.createdAt,
+        clearedAt: transactions.clearedAt,
+        country: transactions.country?.name || '',
+        isPending: transactions.isPending,
+        mcc: transactions.mcc,
+        merchant: transactions.merchant?.name || '',
+        billingAmount: transactions.billingAmount,
+        billingCurrency: transactions.billingCurrency,
+        transactionAmount: transactions.transactionAmount,
+        transactionCurrency: transactions.transactionCurrency,
+        transactionType: transactions.transactionType,
+        kind: transactions.kind,
+        status: transactions.status
+      }
+    });
+    return result 
   } catch (err) {
     return errorMessageHandler(err, 'GNOSISPAY')
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/formulajs",
-  "version": "4.4.11-mod-89-patch-1",
+  "version": "4.4.11-mod-89-patch-3",
   "description": "JavaScript implementation of most Microsoft Excel formula functions",
   "author": "Formulajs",
   "publishConfig": {

package/types/cjs/index.d.cts

@@ -1893,6 +1893,8 @@ export function GNOSISPAY(): Promise<{
     createdAt: any;
     clearedAt: any;
     country: any;
+    isPending: any;
+    mcc: any;
     merchant: any;
     billingAmount: any;
     billingCurrency: any;
@@ -1901,7 +1903,8 @@ export function GNOSISPAY(): Promise<{
     transactionType: any;
     kind: any;
     status: any;
-    mcc: any;
+}[] | {
+    message: string;
 }[]>;
 /**
  * Returns values along an exponential trend.

package/types/esm/index.d.mts

@@ -1893,6 +1893,8 @@ export function GNOSISPAY(): Promise<{
     createdAt: any;
     clearedAt: any;
     country: any;
+    isPending: any;
+    mcc: any;
     merchant: any;
     billingAmount: any;
     billingCurrency: any;
@@ -1901,7 +1903,8 @@ export function GNOSISPAY(): Promise<{
     transactionType: any;
     kind: any;
     status: any;
-    mcc: any;
+}[] | {
+    message: string;
 }[]>;
 /**
  * Returns values along an exponential trend.