@depay/widgets 6.28.0 → 6.28.4

package/dist/esm/index.bundle.js

@@ -62159,6 +62159,10 @@ var ChangableAmountProvider = (function (props) {
         }));
       } else {
         Promise.all(props.accept.map(function (configuration) {
+          if (CONSTANTS$2[configuration.blockchain].USD.toLowerCase() == configuration.token.toLowerCase()) {
+            return 1.00 / conversionRate;
+          }
+
           return route$8({
             blockchain: configuration.blockchain,
             tokenIn: CONSTANTS$2[configuration.blockchain].USD,
@@ -62167,17 +62171,19 @@ var ChangableAmountProvider = (function (props) {
             fromAddress: account,
             toAddress: account
           });
-        })).then(function (routes) {
-          Promise.all(routes.map(function (routes, index) {
-            if (routes[0] == undefined) {
+        })).then(function (results) {
+          Promise.all(results.map(function (result, index) {
+            if (typeof result == 'number') {
+              return result;
+            } else if (result[0] == undefined) {
               return;
+            } else {
+              return Token.readable({
+                blockchain: props.accept[index].blockchain,
+                amount: result[0].amountOut,
+                address: result[0].tokenOut
+              });
             }
-
-            return Token.readable({
-              blockchain: props.accept[index].blockchain,
-              amount: routes[0].amountOut,
-              address: routes[0].tokenOut
-            });
           })).then(resolve)["catch"](setError);
         })["catch"](setError);
       }
@@ -68147,7 +68153,7 @@ let subtractFee = ({ amount, paymentRoute, fee })=> {
 
 let transactionFeeAmount = ({ paymentRoute, fee })=> {
   if(typeof fee.amount == 'string' && fee.amount.match('%')) {
-    return BigNumber.from(paymentRoute.toAmount).div(100).mul(parseFloat(fee.amount)).toString()
+    return BigNumber.from(paymentRoute.toAmount).div(1000).mul(parseFloat(fee.amount)*10).toString()
   } else if(typeof fee.amount == 'string') {
     return fee.amount
   } else if(typeof fee.amount == 'number') {
@@ -85485,7 +85491,7 @@ function convertToRoutes({ assets, accept, from }) {
 function assetsToRoutes({ assets, blacklist, accept, from, event, fee }) {
   return Promise.resolve(filterBlacklistedAssets({ assets, blacklist }))
     .then((assets) => convertToRoutes({ assets, accept, from }))
-    .then(addDirectTransferStatus)
+    .then((routes) => addDirectTransferStatus({ routes, fee }))
     .then(addExchangeRoutes)
     .then(filterExchangeRoutesWithoutPlugin)
     .then(filterNotRoutable)
@@ -85498,6 +85504,10 @@ function assetsToRoutes({ assets, blacklist, accept, from, event, fee }) {
 }
 
 function route({ accept, from, whitelist, blacklist, event, fee, update }) {
+  if(fee && fee.amount && typeof(fee.amount) == 'string' && fee.amount.match(/\.\d\d+\%/)) {
+    throw('Only up to 1 decimal is supported for fee amounts!')
+  }
+
   return new Promise(async (resolveAll, rejectAll)=>{
 
     let priority = [];
@@ -85646,9 +85656,9 @@ let addApproval = (routes) => {
   )
 };
 
-let addDirectTransferStatus = (routes) => {
+let addDirectTransferStatus = ({ routes, fee }) => {
   return routes.map((route)=>{
-    route.directTransfer = route.fromToken.address.toLowerCase() == route.toToken.address.toLowerCase() && route.toContract == undefined;
+    route.directTransfer = route.fromToken.address.toLowerCase() == route.toToken.address.toLowerCase() && route.toContract == undefined && fee == undefined;
     return route
   })
 };
@@ -89522,7 +89532,7 @@ var PaymentOverviewSkeleton = (function (props) {
       className: "SkeletonBackground"
     }))), selectedRoute == undefined && slowRouting && /*#__PURE__*/react.createElement("div", {
       className: "TextCenter Opacity05 PaddingTopS"
-    }, /*#__PURE__*/react.createElement("strong", null, "Still loading your wallet balances...")))
+    }, /*#__PURE__*/react.createElement("strong", null, "Loading payment routes...")))
   });
 });
 
@@ -89953,13 +89963,22 @@ var SaleOverviewDialog = (function (props) {
       setSalePerTokenValue = _useState2[1];
 
   react.useEffect(function () {
-    if (paymentValue && (amountConfiguration == undefined || amountConfiguration.token != true)) {
-      setSalePerTokenValue(new Currency({
-        amount: (paymentValue.amount / parseFloat(toTokenReadableAmount)).toFixed(2),
+    if (paymentValue && (amountConfiguration == undefined || amountConfiguration.token != true) && toTokenReadableAmount) {
+      var UsdAmountPerToken = paymentValue.amount / parseFloat(toTokenReadableAmount);
+      var readableLocalizedAmountPerToken = new Currency({
+        amount: UsdAmountPerToken,
+        code: paymentValue.code
+      }).toString();
+      var zero = new Currency({
+        amount: 0,
         code: paymentValue.code
-      }).toString());
+      }).toString();
+
+      if (readableLocalizedAmountPerToken != zero) {
+        setSalePerTokenValue(readableLocalizedAmountPerToken);
+      }
     }
-  }, [paymentValue]);
+  }, [paymentValue, toTokenReadableAmount]);
 
   if (toToken == undefined || toTokenReadableAmount == undefined || payment == undefined || paymentValue == undefined) {
     return /*#__PURE__*/react.createElement(SaleOverviewSkeleton, null);
@@ -107853,7 +107872,7 @@ var SelectTokenDialog = (function (props) {
       className: "Tooltip"
     }, /*#__PURE__*/react.createElement("span", {
       className: "TooltipArrowUp"
-    }), "Paste or enter token address here!")))),
+    }), "Enter token address here")))),
     bodyClassName: "ScrollHeight",
     body: /*#__PURE__*/react.createElement("div", {
       className: ""

package/dist/esm/index.js

@@ -2107,6 +2107,10 @@ var ChangableAmountProvider = (function (props) {
         }));
       } else {
         Promise.all(props.accept.map(function (configuration) {
+          if (CONSTANTS[configuration.blockchain].USD.toLowerCase() == configuration.token.toLowerCase()) {
+            return 1.00 / conversionRate;
+          }
+
           return route({
             blockchain: configuration.blockchain,
             tokenIn: CONSTANTS[configuration.blockchain].USD,
@@ -2115,17 +2119,19 @@ var ChangableAmountProvider = (function (props) {
             fromAddress: account,
             toAddress: account
           });
-        })).then(function (routes) {
-          Promise.all(routes.map(function (routes, index) {
-            if (routes[0] == undefined) {
+        })).then(function (results) {
+          Promise.all(results.map(function (result, index) {
+            if (typeof result == 'number') {
+              return result;
+            } else if (result[0] == undefined) {
               return;
+            } else {
+              return Token.readable({
+                blockchain: props.accept[index].blockchain,
+                amount: result[0].amountOut,
+                address: result[0].tokenOut
+              });
             }
-
-            return Token.readable({
-              blockchain: props.accept[index].blockchain,
-              amount: routes[0].amountOut,
-              address: routes[0].tokenOut
-            });
           })).then(resolve)["catch"](setError);
         })["catch"](setError);
       }
@@ -4671,7 +4677,7 @@ var PaymentOverviewSkeleton = (function (props) {
       className: "SkeletonBackground"
     }))), selectedRoute == undefined && slowRouting && /*#__PURE__*/React.createElement("div", {
       className: "TextCenter Opacity05 PaddingTopS"
-    }, /*#__PURE__*/React.createElement("strong", null, "Still loading your wallet balances...")))
+    }, /*#__PURE__*/React.createElement("strong", null, "Loading payment routes...")))
   });
 });
 
@@ -5102,13 +5108,22 @@ var SaleOverviewDialog = (function (props) {
       setSalePerTokenValue = _useState2[1];
 
   useEffect(function () {
-    if (paymentValue && (amountConfiguration == undefined || amountConfiguration.token != true)) {
-      setSalePerTokenValue(new Currency({
-        amount: (paymentValue.amount / parseFloat(toTokenReadableAmount)).toFixed(2),
+    if (paymentValue && (amountConfiguration == undefined || amountConfiguration.token != true) && toTokenReadableAmount) {
+      var UsdAmountPerToken = paymentValue.amount / parseFloat(toTokenReadableAmount);
+      var readableLocalizedAmountPerToken = new Currency({
+        amount: UsdAmountPerToken,
+        code: paymentValue.code
+      }).toString();
+      var zero = new Currency({
+        amount: 0,
         code: paymentValue.code
-      }).toString());
+      }).toString();
+
+      if (readableLocalizedAmountPerToken != zero) {
+        setSalePerTokenValue(readableLocalizedAmountPerToken);
+      }
     }
-  }, [paymentValue]);
+  }, [paymentValue, toTokenReadableAmount]);
 
   if (toToken == undefined || toTokenReadableAmount == undefined || payment == undefined || paymentValue == undefined) {
     return /*#__PURE__*/React.createElement(SaleOverviewSkeleton, null);
@@ -23002,7 +23017,7 @@ var SelectTokenDialog = (function (props) {
       className: "Tooltip"
     }, /*#__PURE__*/React.createElement("span", {
       className: "TooltipArrowUp"
-    }), "Paste or enter token address here!")))),
+    }), "Enter token address here")))),
     bodyClassName: "ScrollHeight",
     body: /*#__PURE__*/React.createElement("div", {
       className: ""

package/dist/umd/index.bundle.js

@@ -62165,6 +62165,10 @@
           }));
         } else {
           Promise.all(props.accept.map(function (configuration) {
+            if (CONSTANTS$2[configuration.blockchain].USD.toLowerCase() == configuration.token.toLowerCase()) {
+              return 1.00 / conversionRate;
+            }
+
             return route$8({
               blockchain: configuration.blockchain,
               tokenIn: CONSTANTS$2[configuration.blockchain].USD,
@@ -62173,17 +62177,19 @@
               fromAddress: account,
               toAddress: account
             });
-          })).then(function (routes) {
-            Promise.all(routes.map(function (routes, index) {
-              if (routes[0] == undefined) {
+          })).then(function (results) {
+            Promise.all(results.map(function (result, index) {
+              if (typeof result == 'number') {
+                return result;
+              } else if (result[0] == undefined) {
                 return;
+              } else {
+                return Token.readable({
+                  blockchain: props.accept[index].blockchain,
+                  amount: result[0].amountOut,
+                  address: result[0].tokenOut
+                });
               }
-
-              return Token.readable({
-                blockchain: props.accept[index].blockchain,
-                amount: routes[0].amountOut,
-                address: routes[0].tokenOut
-              });
             })).then(resolve)["catch"](setError);
           })["catch"](setError);
         }
@@ -68153,7 +68159,7 @@
 
   let transactionFeeAmount = ({ paymentRoute, fee })=> {
     if(typeof fee.amount == 'string' && fee.amount.match('%')) {
-      return BigNumber.from(paymentRoute.toAmount).div(100).mul(parseFloat(fee.amount)).toString()
+      return BigNumber.from(paymentRoute.toAmount).div(1000).mul(parseFloat(fee.amount)*10).toString()
     } else if(typeof fee.amount == 'string') {
       return fee.amount
     } else if(typeof fee.amount == 'number') {
@@ -85491,7 +85497,7 @@
   function assetsToRoutes({ assets, blacklist, accept, from, event, fee }) {
     return Promise.resolve(filterBlacklistedAssets({ assets, blacklist }))
       .then((assets) => convertToRoutes({ assets, accept, from }))
-      .then(addDirectTransferStatus)
+      .then((routes) => addDirectTransferStatus({ routes, fee }))
       .then(addExchangeRoutes)
       .then(filterExchangeRoutesWithoutPlugin)
       .then(filterNotRoutable)
@@ -85504,6 +85510,10 @@
   }
 
   function route({ accept, from, whitelist, blacklist, event, fee, update }) {
+    if(fee && fee.amount && typeof(fee.amount) == 'string' && fee.amount.match(/\.\d\d+\%/)) {
+      throw('Only up to 1 decimal is supported for fee amounts!')
+    }
+
     return new Promise(async (resolveAll, rejectAll)=>{
 
       let priority = [];
@@ -85652,9 +85662,9 @@
     )
   };
 
-  let addDirectTransferStatus = (routes) => {
+  let addDirectTransferStatus = ({ routes, fee }) => {
     return routes.map((route)=>{
-      route.directTransfer = route.fromToken.address.toLowerCase() == route.toToken.address.toLowerCase() && route.toContract == undefined;
+      route.directTransfer = route.fromToken.address.toLowerCase() == route.toToken.address.toLowerCase() && route.toContract == undefined && fee == undefined;
       return route
     })
   };
@@ -89528,7 +89538,7 @@
         className: "SkeletonBackground"
       }))), selectedRoute == undefined && slowRouting && /*#__PURE__*/react.createElement("div", {
         className: "TextCenter Opacity05 PaddingTopS"
-      }, /*#__PURE__*/react.createElement("strong", null, "Still loading your wallet balances...")))
+      }, /*#__PURE__*/react.createElement("strong", null, "Loading payment routes...")))
     });
   });
 
@@ -89959,13 +89969,22 @@
         setSalePerTokenValue = _useState2[1];
 
     react.useEffect(function () {
-      if (paymentValue && (amountConfiguration == undefined || amountConfiguration.token != true)) {
-        setSalePerTokenValue(new Currency({
-          amount: (paymentValue.amount / parseFloat(toTokenReadableAmount)).toFixed(2),
+      if (paymentValue && (amountConfiguration == undefined || amountConfiguration.token != true) && toTokenReadableAmount) {
+        var UsdAmountPerToken = paymentValue.amount / parseFloat(toTokenReadableAmount);
+        var readableLocalizedAmountPerToken = new Currency({
+          amount: UsdAmountPerToken,
+          code: paymentValue.code
+        }).toString();
+        var zero = new Currency({
+          amount: 0,
           code: paymentValue.code
-        }).toString());
+        }).toString();
+
+        if (readableLocalizedAmountPerToken != zero) {
+          setSalePerTokenValue(readableLocalizedAmountPerToken);
+        }
       }
-    }, [paymentValue]);
+    }, [paymentValue, toTokenReadableAmount]);
 
     if (toToken == undefined || toTokenReadableAmount == undefined || payment == undefined || paymentValue == undefined) {
       return /*#__PURE__*/react.createElement(SaleOverviewSkeleton, null);
@@ -107859,7 +107878,7 @@
         className: "Tooltip"
       }, /*#__PURE__*/react.createElement("span", {
         className: "TooltipArrowUp"
-      }), "Paste or enter token address here!")))),
+      }), "Enter token address here")))),
       bodyClassName: "ScrollHeight",
       body: /*#__PURE__*/react.createElement("div", {
         className: ""

package/dist/umd/index.js

@@ -2102,6 +2102,10 @@
           }));
         } else {
           Promise.all(props.accept.map(function (configuration) {
+            if (web3Constants.CONSTANTS[configuration.blockchain].USD.toLowerCase() == configuration.token.toLowerCase()) {
+              return 1.00 / conversionRate;
+            }
+
             return web3Exchanges.route({
               blockchain: configuration.blockchain,
               tokenIn: web3Constants.CONSTANTS[configuration.blockchain].USD,
@@ -2110,17 +2114,19 @@
               fromAddress: account,
               toAddress: account
             });
-          })).then(function (routes) {
-            Promise.all(routes.map(function (routes, index) {
-              if (routes[0] == undefined) {
+          })).then(function (results) {
+            Promise.all(results.map(function (result, index) {
+              if (typeof result == 'number') {
+                return result;
+              } else if (result[0] == undefined) {
                 return;
+              } else {
+                return web3Tokens.Token.readable({
+                  blockchain: props.accept[index].blockchain,
+                  amount: result[0].amountOut,
+                  address: result[0].tokenOut
+                });
               }
-
-              return web3Tokens.Token.readable({
-                blockchain: props.accept[index].blockchain,
-                amount: routes[0].amountOut,
-                address: routes[0].tokenOut
-              });
             })).then(resolve)["catch"](setError);
           })["catch"](setError);
         }
@@ -4666,7 +4672,7 @@
         className: "SkeletonBackground"
       }))), selectedRoute == undefined && slowRouting && /*#__PURE__*/React__default["default"].createElement("div", {
         className: "TextCenter Opacity05 PaddingTopS"
-      }, /*#__PURE__*/React__default["default"].createElement("strong", null, "Still loading your wallet balances...")))
+      }, /*#__PURE__*/React__default["default"].createElement("strong", null, "Loading payment routes...")))
     });
   });
 
@@ -5097,13 +5103,22 @@
         setSalePerTokenValue = _useState2[1];
 
     React.useEffect(function () {
-      if (paymentValue && (amountConfiguration == undefined || amountConfiguration.token != true)) {
-        setSalePerTokenValue(new localCurrency.Currency({
-          amount: (paymentValue.amount / parseFloat(toTokenReadableAmount)).toFixed(2),
+      if (paymentValue && (amountConfiguration == undefined || amountConfiguration.token != true) && toTokenReadableAmount) {
+        var UsdAmountPerToken = paymentValue.amount / parseFloat(toTokenReadableAmount);
+        var readableLocalizedAmountPerToken = new localCurrency.Currency({
+          amount: UsdAmountPerToken,
+          code: paymentValue.code
+        }).toString();
+        var zero = new localCurrency.Currency({
+          amount: 0,
           code: paymentValue.code
-        }).toString());
+        }).toString();
+
+        if (readableLocalizedAmountPerToken != zero) {
+          setSalePerTokenValue(readableLocalizedAmountPerToken);
+        }
       }
-    }, [paymentValue]);
+    }, [paymentValue, toTokenReadableAmount]);
 
     if (toToken == undefined || toTokenReadableAmount == undefined || payment == undefined || paymentValue == undefined) {
       return /*#__PURE__*/React__default["default"].createElement(SaleOverviewSkeleton, null);
@@ -22997,7 +23012,7 @@
         className: "Tooltip"
       }, /*#__PURE__*/React__default["default"].createElement("span", {
         className: "TooltipArrowUp"
-      }), "Paste or enter token address here!")))),
+      }), "Enter token address here")))),
       bodyClassName: "ScrollHeight",
       body: /*#__PURE__*/React__default["default"].createElement("div", {
         className: ""

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets",
   "moduleName": "DePayWidgets",
-  "version": "6.28.0",
+  "version": "6.28.4",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",
@@ -44,7 +44,7 @@
     "@depay/web3-client": "^8.0.0",
     "@depay/web3-constants": "^5.0.0",
     "@depay/web3-exchanges": "^8.2.1",
-    "@depay/web3-payments": "^10.1.1",
+    "@depay/web3-payments": "^10.1.3",
     "@depay/web3-tokens": "^8.0.1",
     "@depay/web3-wallets": "^10.0.3",
     "decimal.js": "^10.3.1",