market page improvements

BTS-CM · Feb 4, 2025 · 19b67b1 · 19b67b1
1 parent af1761e
commit 19b67b1
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -104,7 +104,6 @@
     "deep-equal": "^2.2.3",
     "dompurify": "^3.1.6",
     "ecurve": "^1.0.6",
-    "electron-devtools-installer": "^3.2.0",
     "embla-carousel-react": "^8.3.0",
     "express": "^4.21.0",
     "fuse.js": "^7.0.0",

diff --git a/src/components/AccountLists.jsx b/src/components/AccountLists.jsx
@@ -176,8 +176,8 @@ export default function AccountLists(properties) {
           {showRowDialog ? (
             <DeepLinkDialog
               operationNames={["account_whitelist"]}
-              username={usr.username}
-              usrChain={usr.chain}
+              username={usr && usr.username ? usr.username : ""}
+              usrChain={usr && usr.chain ? usr.chain : "bitshares"}
               userID={usr.id}
               dismissCallback={setShowRowDialog}
               key={`RemovingAccountFromList${mode}${account}`}

diff --git a/src/components/CreditDeals.jsx b/src/components/CreditDeals.jsx
@@ -298,9 +298,11 @@ export default function CreditDeals(properties) {
                 classnamecontents="text-blue-500"
                 type="text"
                 text={res.id.replace("1.22.", "")}
-                hyperlink={`https://blocksights.info/#/objects/${res.id}${
-                  usr.chain === "bitshares" ? "" : "?network=testnet"
-                }`}
+                hyperlink={
+                  usr && usr.chain
+                    ? `https://blocksights.info/#/objects/${res.id}${usr.chain === "bitshares" ? "" : "?network=testnet"}`
+                    : ''
+                }
               />
               {t("CreditDeals:with")}
               <ExternalLink

diff --git a/src/components/Market/LimitOrderCard.jsx b/src/components/Market/LimitOrderCard.jsx
@@ -568,6 +568,23 @@ export default function LimitOrderCard(properties) {
                         </span>
                       </span>
                     </FormControl>
+
+                    {orderType === "sell" &&
+                    amount &&
+                    price &&
+                    assetABalance &&
+                    parseFloat(assetABalance.replaceAll(",", "")) < parseFloat(amount) ? (
+                      <FormMessage>
+                        {t("LimitOrderCard:sellTotal.requireMore", {
+                          requiredAmount:
+                            amount -
+                            parseFloat(assetABalance.replaceAll(",", "")).toFixed(
+                              assetAData.precision
+                            ),
+                          asset: thisAssetA,
+                        })}
+                      </FormMessage>
+                    ) : null}
                   </FormItem>
                 )}
               />
@@ -642,7 +659,8 @@ export default function LimitOrderCard(properties) {
                         </span>
                       </span>
                     </FormControl>
-                    {amount &&
+                    {orderType === "buy" &&
+                    amount &&
                     price &&
                     assetBBalance &&
                     parseFloat(assetBBalance.replaceAll(",", "")) < parseFloat(total) ? (

diff --git a/src/components/Market/Summary/MyOrderSummary.jsx b/src/components/Market/Summary/MyOrderSummary.jsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from "react";
+import React, { useMemo, useSyncExternalStore } from "react";
 import { useTranslation } from "react-i18next";
 import { i18n as i18nInstance, locale } from "@/lib/i18n.js";
 
@@ -18,10 +18,12 @@ import { Button } from "@/components/ui/button";
 import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card";
 
 import ExternalLink from "@/components/common/ExternalLink.jsx";
+import { $currentUser } from "@/stores/users.ts";
 
 export default function MyOrderSummary(properties) {
   const { type, assetAData, assetBData, usrLimitOrders } = properties;
   const { t, i18n } = useTranslation(locale.get(), { i18n: i18nInstance });
+  const usr = useSyncExternalStore($currentUser.subscribe, $currentUser.get, () => true);
 
   const filteredUsrLimitOrders = useMemo(
     () =>
@@ -159,9 +161,9 @@ export default function MyOrderSummary(properties) {
                     classnamecontents=""
                     type="button"
                     text={t("MyOrderSummary:viewObjectOnBlocksights")}
-                    hyperlink={`https://blocksights.info/#/objects/${res.id}${
+                    hyperlink={usr && usr.chain ? `https://blocksights.info/#/objects/${res.id}${
                       usr.chain === "bitshares" ? "" : "?network=testnet"
-                    }`}
+                    }` : ''}
                   />
                 </div>
               </div>

diff --git a/src/data/locales/da/LimitOrderCard.json b/src/data/locales/da/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "Brug højeste bud"
   },
   "sellAmount": {
-    "label": "Salgsbeløb",
+    "label": "Beløb",
     "buyDescription": "Mængden af {{asset}} du planlægger at købe",
     "sellDescription": "Mængden af {{asset}} du planlægger at sælge",
     "provideNewLabel": "Angiv et nyt beløb"

diff --git a/src/data/locales/de/LimitOrderCard.json b/src/data/locales/de/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "Höchstgebot verwenden"
   },
   "sellAmount": {
-    "label": "Verkaufsbetrag",
+    "label": "Menge",
     "buyDescription": "Die Menge an {{asset}} Sie planen einen Kauf",
     "sellDescription": "Die Menge an {{asset}} Sie planen zu verkaufen",
     "provideNewLabel": "Geben Sie einen neuen Betrag an"

diff --git a/src/data/locales/en/LimitOrderCard.json b/src/data/locales/en/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "Use highest bid"
   },
   "sellAmount": {
-    "label": "Sell Amount",
+    "label": "Amount",
     "buyDescription": "The amount of {{asset}} you plan on buying",
     "sellDescription": "The amount of {{asset}} you plan on selling",
     "provideNewLabel": "Provide a new amount"

diff --git a/src/data/locales/es/LimitOrderCard.json b/src/data/locales/es/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "Usar la oferta más alta"
   },
   "sellAmount": {
-    "label": "Monto de venta",
+    "label": "Cantidad",
     "buyDescription": "La cantidad de {{asset}} planeas comprar",
     "sellDescription": "La cantidad de {{asset}} planeas vender",
     "provideNewLabel": "Proporcionar una nueva cantidad"

diff --git a/src/data/locales/et/LimitOrderCard.json b/src/data/locales/et/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "Kasutage kõrgeimat pakkumist"
   },
   "sellAmount": {
-    "label": "Müügisumma",
+    "label": "Summa",
     "buyDescription": "Summa {{asset}} plaanite osta",
     "sellDescription": "Summa {{asset}} plaanite müüa",
     "provideNewLabel": "Esitage uus summa"

diff --git a/src/data/locales/fr/LimitOrderCard.json b/src/data/locales/fr/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "Utiliser l'enchère la plus élevée"
   },
   "sellAmount": {
-    "label": "Montant de la vente",
+    "label": "Montant",
     "buyDescription": "La quantité de {{asset}} tu comptes acheter",
     "sellDescription": "La quantité de {{asset}} tu comptes vendre",
     "provideNewLabel": "Fournir un nouveau montant"

diff --git a/src/data/locales/it/LimitOrderCard.json b/src/data/locales/it/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "Utilizza l'offerta più alta"
   },
   "sellAmount": {
-    "label": "Importo di vendita",
+    "label": "Quantità",
     "buyDescription": "La quantità di {{asset}} prevedi di acquistare",
     "sellDescription": "La quantità di {{asset}} hai intenzione di vendere",
     "provideNewLabel": "Fornire un nuovo importo"

diff --git a/src/data/locales/ja/LimitOrderCard.json b/src/data/locales/ja/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "最高入札額を使用する"
   },
   "sellAmount": {
-    "label": "販売額",
+    "label": "額",
     "buyDescription": "の量 {{asset}} 購入するつもりですか",
     "sellDescription": "の量 {{asset}} 販売するつもりですか",
     "provideNewLabel": "新しい金額を入力してください"

diff --git a/src/data/locales/ko/LimitOrderCard.json b/src/data/locales/ko/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "최고 입찰가 사용"
   },
   "sellAmount": {
-    "label": "판매금액",
+    "label": "양",
     "buyDescription": "양 {{asset}} 당신은 구입할 계획입니다",
     "sellDescription": "양 {{asset}} 당신은 판매할 계획이에요",
     "provideNewLabel": "새로운 금액 제공"

diff --git a/src/data/locales/pt/LimitOrderCard.json b/src/data/locales/pt/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "Usar o lance mais alto"
   },
   "sellAmount": {
-    "label": "Valor de venda",
+    "label": "Quantia",
     "buyDescription": "A quantidade de {{asset}} você planeja comprar",
     "sellDescription": "A quantidade de {{asset}} você planeja vender",
     "provideNewLabel": "Forneça um novo valor"

diff --git a/src/data/locales/th/LimitOrderCard.json b/src/data/locales/th/LimitOrderCard.json
@@ -13,7 +13,7 @@
     "useHighestBid": "ใช้ราคาเสนอสูงสุด"
   },
   "sellAmount": {
-    "label": "ขายจำนวน",
+    "label": "จำนวน",
     "buyDescription": "จำนวน {{asset}} คุณวางแผนที่จะซื้อ",
     "sellDescription": "จำนวน {{asset}} คุณวางแผนที่จะขาย",
     "provideNewLabel": "ระบุจำนวนเงินใหม่"