@funkit/connect 1.0.14 → 1.0.15

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @funkit/connect
 
+## 1.0.15
+
+### Patch Changes
+
+- f2c5087: fix: normalization bug
+- 762f52c: feat: processing page with completion time estimation
+
 ## 1.0.14
 
 ### Patch Changes

package/dist/index.js

@@ -3409,7 +3409,7 @@ function formatTimestamp(date, shortened = false) {
   const formattedDate = `${month} ${day}${daySuffix}${shortened ? "" : `, ${year}`} \xB7 ${hours % 12 || 12}:${minutes < 10 ? "0" : ""}${minutes}${shortened ? "" : `:${seconds < 10 ? "0" : ""}${seconds}`} ${ampm}`;
   return formattedDate;
 }
-function formatSecondsToReadableForm(seconds, specifyUnderMinute = false) {
+function formatSecondsToReadableForm(seconds, specifyUnderMinute = false, omitSeconds = false) {
   const normalizedSeconds = Math.ceil(seconds);
   if (normalizedSeconds < 60) {
     if (specifyUnderMinute) {
@@ -3420,6 +3420,9 @@ function formatSecondsToReadableForm(seconds, specifyUnderMinute = false) {
   }
   const mins = Math.floor(normalizedSeconds / 60);
   const remainingSecs = normalizedSeconds % 60;
+  if (omitSeconds) {
+    return `${mins + 1}mins`;
+  }
   if (remainingSecs === 0) {
     return mins === 1 ? `${mins}min` : `${mins}mins`;
   }
@@ -6335,7 +6338,8 @@ function FunTransactionSummary({
     size: "14"
   }, formatSecondsToReadableForm(
     parseFloat(estTime == null ? void 0 : estTime.toString()),
-    true
+    true,
+    false
   )) : null), hasTotal ? /* @__PURE__ */ React65.createElement(Fragment2, null, /* @__PURE__ */ React65.createElement(FunTxSummaryDivider, null), /* @__PURE__ */ React65.createElement(LineItem, null, /* @__PURE__ */ React65.createElement(Text, {
     weight: "medium",
     color: "modalTextDim",
@@ -6993,9 +6997,9 @@ function FunPaymentMoonpayType({
     return signature || "";
   };
   const description = useMemo18(() => {
-    const normalizedConvertedAssetName = finalConvertedAssetName.toLowerCase();
+    let normalizedConvertedAssetName = finalConvertedAssetName.toLowerCase();
     if (normalizedConvertedAssetName.startsWith("$")) {
-      return normalizedConvertedAssetName.slice(1);
+      normalizedConvertedAssetName = normalizedConvertedAssetName.slice(1);
     }
     const isSame = normalizedConvertedAssetName === depositToken.toLowerCase();
     const conversionText = finalConvertedAssetName && !isSame ? ` that is then automatically converted to ${finalConvertedAssetName}.` : ".";
@@ -13339,6 +13343,7 @@ function FunCheckoutHistoryDetail({
   checkoutHistoryInfo
 }) {
   const checkoutItem = checkoutHistoryInfo.clientMetadata;
+  console.log("checkoutItem", checkoutItem);
   const { isCheckoutDirectCrFlow } = useCheckoutType(checkoutItem);
   const {
     isProcessing,
@@ -13354,6 +13359,17 @@ function FunCheckoutHistoryDetail({
     checkoutHistoryInfo.depositAddr
   );
   useWalletAssetsListener(isProcessing || isCompleted);
+  const estimatedEndTimeInfo = useMemo31(() => {
+    var _a;
+    const estimatedEndTimeMs = (((_a = checkoutItem == null ? void 0 : checkoutItem.latestQuote) == null ? void 0 : _a.finalTimeEstimationMs) || 0) + checkoutHistoryInfo.createdTimeMs;
+    const estimatedEndTimeFromNowMs = estimatedEndTimeMs - Date.now();
+    const isExceededEstimation = estimatedEndTimeFromNowMs <= 0;
+    return {
+      estimatedEndTimeMs,
+      estimatedEndTimeFromNowMs,
+      isExceededEstimation
+    };
+  }, [checkoutHistoryInfo.createdTimeMs, checkoutItem]);
   const timelineLabels = useMemo31(() => {
     const fromExplorerInfo = FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO9[checkoutHistoryInfo.fromChainId].explorerInfo;
     const toExplorerInfo = FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO9[checkoutHistoryInfo.toChainId].explorerInfo;
@@ -13381,7 +13397,13 @@ function FunCheckoutHistoryDetail({
             )
           ) : isTerminal ? formatTimestamp(
             new Date(checkoutHistoryInfo.lastUpdatedTimeMs)
-          ) : "",
+          ) : estimatedEndTimeInfo.isExceededEstimation ? "" : `Estimated to complete in ${formatSecondsToReadableForm(
+            Math.floor(
+              estimatedEndTimeInfo.estimatedEndTimeFromNowMs / 1e3
+            ),
+            true,
+            true
+          )}`,
           ...isCompleted ? {
             linkText: `View on ${toExplorerInfo.name}`,
             linkUrl: `${toExplorerInfo.url}/address/${checkoutHistoryInfo.recipientAddr}`
@@ -13401,6 +13423,8 @@ function FunCheckoutHistoryDetail({
     isError,
     isExpired,
     isTerminal,
+    estimatedEndTimeInfo.isExceededEstimation,
+    estimatedEndTimeInfo.estimatedEndTimeFromNowMs,
     isCompleted
   ]);
   return /* @__PURE__ */ React137.createElement(Box, {
@@ -13423,7 +13447,7 @@ function FunCheckoutHistoryDetail({
     step: isCheckoutDirectCrFlow ? 2 : isTerminal ? 3 : 2,
     totalSteps: timelineLabels.length,
     labels: timelineLabels
-  }), isTerminal ? null : /* @__PURE__ */ React137.createElement(Box, {
+  }), isTerminal || !isCheckoutDirectCrFlow ? null : /* @__PURE__ */ React137.createElement(Box, {
     display: "flex",
     flexDirection: "column",
     alignItems: "center",
@@ -13431,7 +13455,7 @@ function FunCheckoutHistoryDetail({
   }, /* @__PURE__ */ React137.createElement(Text, {
     size: "12",
     color: "modalTextDim"
-  }, isCheckoutDirectCrFlow ? "Funds may take up to 10 minutes to arrive." : "You will receive a notification when your order has finished."))), isFailedFinal ? /* @__PURE__ */ React137.createElement(FunToast, {
+  }, "Funds may take up to 10 minutes to arrive."))), isFailedFinal ? /* @__PURE__ */ React137.createElement(FunToast, {
     type: 1 /* ERROR */,
     title: "Order Failed",
     isDescriptionText: false,
@@ -15702,7 +15726,7 @@ function setFunkitConnectVersion({ version }) {
   localStorage.setItem(storageKey4, version);
 }
 function getCurrentSdkVersion() {
-  return "1.0.14";
+  return "1.0.15";
 }
 function useFingerprint() {
   const fingerprint = useCallback29(() => {

package/dist/utils/formatTimestamp.d.ts

@@ -8,5 +8,6 @@ export declare function formatTimestamp(date: Date, shortened?: boolean): string
  * - seconds = 61, output = '1min 1s'
  * - seconds = 300, output = '5mins'
  * - seconds = 320, output = '5mins 20s'
+ * - seconds = 320, omitSeconds=true, output = '6mins'
  */
-export declare function formatSecondsToReadableForm(seconds: number, specifyUnderMinute?: boolean): string;
+export declare function formatSecondsToReadableForm(seconds: number, specifyUnderMinute?: boolean, omitSeconds?: boolean): string;

package/dist/wallets/walletConnectors/index.js

@@ -1,10 +1,16 @@
 "use client";
 import {
-  trustWallet
-} from "./chunk-Z2DGDHHZ.js";
+  zerionWallet
+} from "./chunk-7CQPABJG.js";
 import {
-  safeheronWallet
-} from "./chunk-63NPZXAL.js";
+  zealWallet
+} from "./chunk-DPXMP5KS.js";
+import {
+  ramperWallet
+} from "./chunk-ZOL6ZMTJ.js";
+import {
+  tahoWallet
+} from "./chunk-H76YCX2M.js";
 import {
   talismanWallet
 } from "./chunk-H273OTQA.js";
@@ -12,32 +18,29 @@ import {
   tokenPocketWallet
 } from "./chunk-2UXZAUWT.js";
 import {
-  safepalWallet
-} from "./chunk-SYELB4QO.js";
-import {
-  uniswapWallet
-} from "./chunk-XRSY4JVH.js";
+  trustWallet
+} from "./chunk-Z2DGDHHZ.js";
 import {
   tokenaryWallet
 } from "./chunk-ENZLEAG2.js";
 import {
-  xdefiWallet
-} from "./chunk-L734HTUS.js";
+  uniswapWallet
+} from "./chunk-XRSY4JVH.js";
 import {
   walletConnectWallet
 } from "./chunk-ASPRR7T3.js";
 import {
-  zealWallet
-} from "./chunk-DPXMP5KS.js";
+  xdefiWallet
+} from "./chunk-L734HTUS.js";
 import {
-  zerionWallet
-} from "./chunk-7CQPABJG.js";
+  rabbyWallet
+} from "./chunk-XPEBP6XV.js";
 import {
-  phantomWallet
-} from "./chunk-KGBLSE7L.js";
+  rainbowWallet
+} from "./chunk-O5NKWWEG.js";
 import {
-  ramperWallet
-} from "./chunk-ZOL6ZMTJ.js";
+  desigWallet
+} from "./chunk-P4JLZ42R.js";
 import {
   roninWallet
 } from "./chunk-LVRXH33E.js";
@@ -45,62 +48,68 @@ import {
   safeWallet
 } from "./chunk-D3DCQ72J.js";
 import {
-  rainbowWallet
-} from "./chunk-O5NKWWEG.js";
-import {
-  mewWallet
-} from "./chunk-PWYTDYBE.js";
+  safeheronWallet
+} from "./chunk-63NPZXAL.js";
 import {
-  tahoWallet
-} from "./chunk-H76YCX2M.js";
+  safepalWallet
+} from "./chunk-SYELB4QO.js";
 import {
   subWallet
 } from "./chunk-ZBAQFL6G.js";
 import {
-  kresusWallet
-} from "./chunk-X6T3CICZ.js";
+  metaMaskWallet
+} from "./chunk-3WZRNEZH.js";
 import {
-  ledgerWallet
-} from "./chunk-Y6VY6E3L.js";
+  mewWallet
+} from "./chunk-PWYTDYBE.js";
 import {
   oktoWallet
 } from "./chunk-WKHTUEF5.js";
-import {
-  omniWallet
-} from "./chunk-SVN7OEQR.js";
 import {
   okxWallet
 } from "./chunk-NGXIHASN.js";
+import {
+  omniWallet
+} from "./chunk-SVN7OEQR.js";
 import {
   oneInchWallet
 } from "./chunk-LCPIZUR3.js";
-import {
-  rabbyWallet
-} from "./chunk-XPEBP6XV.js";
 import {
   oneKeyWallet
 } from "./chunk-4WOV4ITL.js";
 import {
-  bitverseWallet
-} from "./chunk-NL4I7WOT.js";
+  phantomWallet
+} from "./chunk-KGBLSE7L.js";
 import {
-  bloomWallet
-} from "./chunk-NTGZF5BY.js";
+  frameWallet
+} from "./chunk-XXFJVY73.js";
 import {
-  imTokenWallet
-} from "./chunk-5MVV7OVS.js";
+  frontierWallet
+} from "./chunk-AM4SSLAP.js";
 import {
   gateWallet
 } from "./chunk-V45EXW7A.js";
 import {
-  bybitWallet
-} from "./chunk-ZUAHWUEL.js";
+  imTokenWallet
+} from "./chunk-5MVV7OVS.js";
 import {
   injectedWallet
 } from "./chunk-KIHCNUU3.js";
 import {
-  metaMaskWallet
-} from "./chunk-3WZRNEZH.js";
+  kresusWallet
+} from "./chunk-X6T3CICZ.js";
+import {
+  ledgerWallet
+} from "./chunk-Y6VY6E3L.js";
+import {
+  bybitWallet
+} from "./chunk-ZUAHWUEL.js";
+import {
+  clvWallet
+} from "./chunk-MIWCKFYE.js";
+import {
+  coin98Wallet
+} from "./chunk-4FQLUQNA.js";
 import {
   coinbaseWallet
 } from "./chunk-XBUTWYE4.js";
@@ -110,9 +119,6 @@ import {
 import {
   dawnWallet
 } from "./chunk-4XQDKOGF.js";
-import {
-  desigWallet
-} from "./chunk-P4JLZ42R.js";
 import {
   enkryptWallet
 } from "./chunk-FLY7F4XA.js";
@@ -120,14 +126,8 @@ import {
   foxWallet
 } from "./chunk-Q4RLUJJD.js";
 import {
-  frameWallet
-} from "./chunk-XXFJVY73.js";
-import {
-  frontierWallet
-} from "./chunk-AM4SSLAP.js";
-import {
-  bitskiWallet
-} from "./chunk-C67TQJ6W.js";
+  argentWallet
+} from "./chunk-NZ5G23JP.js";
 import {
   bifrostWallet
 } from "./chunk-6LTLPR2Q.js";
@@ -135,19 +135,19 @@ import {
   bitgetWallet
 } from "./chunk-ZNXQ4V6G.js";
 import {
-  argentWallet
-} from "./chunk-NZ5G23JP.js";
+  bitskiWallet
+} from "./chunk-C67TQJ6W.js";
+import {
+  bitverseWallet
+} from "./chunk-NL4I7WOT.js";
+import {
+  bloomWallet
+} from "./chunk-NTGZF5BY.js";
 import "./chunk-ZOLACFTK.js";
+import "./chunk-ZDU3JFGR.js";
 import {
   braveWallet
 } from "./chunk-ABYQAXUX.js";
-import {
-  clvWallet
-} from "./chunk-MIWCKFYE.js";
-import {
-  coin98Wallet
-} from "./chunk-4FQLUQNA.js";
-import "./chunk-ZDU3JFGR.js";
 import "./chunk-QII6PY2D.js";
 export {
   argentWallet,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funkit/connect",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Funkit Connect SDK elevates DeFi apps via web2 sign-ins and one-click checkouts.",
   "files": [
     "dist",