Merge pull request #1330 from multiversx/development

3.0.20
multiversx · Nov 28, 2024 · 85348ba · 85348ba
2 parents cc1c8b1 + 7e1029e
commit 85348ba
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[v3.0.20](https://github.com/multiversx/mx-sdk-dapp/pull/1330)] - 2024-11-28
+
+- [Fixed EGLD-000000 token is not found](https://github.com/multiversx/mx-sdk-dapp/pull/1329)
+- [Fixed address is not shown on ledger login](https://github.com/multiversx/mx-sdk-dapp/pull/1328)
+- [Added support for custom web socket url](https://github.com/multiversx/mx-sdk-dapp/pull/1327)
+
 ## [[v3.0.19](https://github.com/multiversx/mx-sdk-dapp/pull/1326)] - 2024-11-28
 
 - [Fix wallet hub webview](https://github.com/multiversx/mx-sdk-dapp/pull/1325)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-dapp",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "description": "A library to hold the main logic for a dapp on the MultiversX blockchain",
   "author": "MultiversX",
   "license": "GPL-3.0-or-later",

diff --git a/...nsactionsModals/SignWithDeviceModal/components/components/ConfirmAmount/ConfirmAmount.tsx b/...nsactionsModals/SignWithDeviceModal/components/components/ConfirmAmount/ConfirmAmount.tsx
@@ -1,12 +1,14 @@
 import React from 'react';
 import classNames from 'classnames';
 
+import { DECIMALS } from 'constants/index';
 import { withStyles } from 'hocs/withStyles';
 import { useGetEgldPrice, useGetTokenDetails } from 'hooks';
 import { ActiveLedgerTransactionType } from 'types';
 import { NftEnumType } from 'types/tokens.types';
 import { LoadingDots } from 'UI/LoadingDots';
 
+import { getEgldLabel } from 'utils';
 import { WithStylesImportType } from '../../../../../../hocs/useStyles';
 
 import {
@@ -37,12 +39,27 @@ const ConfirmAmountComponent = ({
   });
 
   const { price: egldPrice } = useGetEgldPrice();
+
+  // TODO: Remove when EGLD-000000 is available on API
+  const egldTokenDetails = {
+    type: undefined,
+    isLoading: false,
+    esdtPrice: egldPrice,
+    identifier: 'EGLD-000000',
+    tokenAvatar: '',
+    tokenDecimals: DECIMALS,
+    tokenLabel: getEgldLabel()
+  };
+
+  const usedTokenDetails =
+    tokenId === egldTokenDetails.identifier ? egldTokenDetails : tokenDetails;
+
   const {
     type,
     esdtPrice,
     isLoading: isTokenDetailsLoading,
     identifier
-  } = tokenDetails;
+  } = usedTokenDetails;
 
   const isEgld = !tokenId;
   const tokenPrice = isEgld ? egldPrice : esdtPrice;
@@ -82,7 +99,7 @@ const ConfirmAmountComponent = ({
             <ConfirmAmountNftSft
               amount={amount}
               type={type}
-              tokenDetails={tokenDetails}
+              tokenDetails={usedTokenDetails}
             />
           ) : (
             <ConfirmAmountData
@@ -91,7 +108,7 @@ const ConfirmAmountComponent = ({
               amount={amount}
               handleReference={handleAmountReference}
               currentTransaction={currentTransaction}
-              tokenDetails={tokenDetails}
+              tokenDetails={usedTokenDetails}
               tokenPrice={tokenPrice}
             />
           )}

diff --git a/...al/components/components/ConfirmAmount/components/ConfirmAmountData/ConfirmAmountData.tsx b/...al/components/components/ConfirmAmount/components/ConfirmAmountData/ConfirmAmountData.tsx
@@ -47,17 +47,19 @@ const ConfirmAmountDataComponent = ({
       addCommas
     });
 
+  // TODO: Remove when EGLD-000000 is available on API
+  const usedIsEgld = isEgld || tokenDetails.identifier === 'EGLD-000000';
   const formattedAmount = getFormattedAmount({ addCommas: true });
   const rawAmount = getFormattedAmount({ addCommas: false });
 
   return (
     <div className={styles?.confirmAmountData}>
       <div className={styles?.confirmAmountDataWrapper}>
-        {!isEgld && tokenAvatar && (
+        {!usedIsEgld && tokenAvatar && (
           <img src={tokenAvatar} className={styles?.confirmAmountDataIcon} />
         )}
 
-        {!isEgld && !tokenAvatar && (
+        {!usedIsEgld && !tokenAvatar && (
           <div
             className={classNames(
               styles?.confirmAmountDataIcon,
@@ -77,11 +79,11 @@ const ConfirmAmountDataComponent = ({
         >
           <Balance
             amount={formattedAmount}
-            egldIcon={isEgld}
+            egldIcon={usedIsEgld}
             data-testid={DataTestIdsEnum.confirmAmount}
             showTokenLabel
             showTokenLabelSup
-            tokenLabel={isEgld ? network.egldLabel : identifier}
+            tokenLabel={usedIsEgld ? network.egldLabel : identifier}
             className={styles?.confirmAmountDataBalance}
           />
         </div>

diff --git a/src/UI/TransactionData/TransactionData.tsx b/src/UI/TransactionData/TransactionData.tsx
@@ -60,8 +60,10 @@ const TransactionDataComponent = ({
   const [encodedScCall, ...remainingDataFields] =
     highlight && isScCall ? highlight.split('@') : [];
 
-  const isHighlightedData = data && highlight;
-  const occurrences = isHighlightedData ? allOccurences(data, highlight) : [];
+  const isHighlightedData = decodedData && highlight;
+  const occurrences = isHighlightedData
+    ? allOccurences(decodedData, highlight)
+    : [];
   const showHighlight = isHighlightedData && occurrences.length > 0;
 
   const handleElementReference = (element: HTMLElement | null) => {
@@ -83,7 +85,7 @@ const TransactionDataComponent = ({
   if (showHighlight) {
     switch (true) {
       case decodedData.startsWith(highlight): {
-        const [, rest] = data.split(highlight);
+        const [, rest] = decodedData.split(highlight);
 
         output = (
           <>
@@ -93,8 +95,8 @@ const TransactionDataComponent = ({
         );
         break;
       }
-      case data.endsWith(highlight): {
-        const [rest] = data.split(highlight);
+      case decodedData.endsWith(highlight): {
+        const [rest] = decodedData.split(highlight);
 
         output = (
           <>
@@ -114,7 +116,7 @@ const TransactionDataComponent = ({
         const { start, end } = getUnHighlightedDataFieldParts({
           occurrences,
           transactionIndex,
-          data: data,
+          data: decodedData,
           highlight
         });
 
@@ -165,7 +167,7 @@ const TransactionDataComponent = ({
                 {decodedScCall}
               </span>
 
-              {data && (
+              {decodedData && (
                 <CopyButton
                   text={decodedScCall}
                   className={styles?.transactionDataValueCopy}

diff --git a/src/UI/TransactionData/components/TransactionDataDecode.tsx b/src/UI/TransactionData/components/TransactionDataDecode.tsx
@@ -64,12 +64,10 @@ export const TransactionDataDecode = ({
   }, [method, data]);
 
   return (
-    <div
-      data-testid={DataTestIdsEnum.transactionDataDecode}
-      className={classNames('transaction-data-decode', className)}
-    >
+    <div className={classNames('transaction-data-decode', className)}>
       <select
         className='transaction-data-decode-select'
+        data-testid={DataTestIdsEnum.transactionDataDecode}
         value={method.value}
         onChange={handleSelect}
       >

diff --git a/src/hooks/login/useLedgerLogin.ts b/src/hooks/login/useLedgerLogin.ts
@@ -238,8 +238,8 @@ export const useLedgerLogin = ({
         );
       }
 
-      await loginUser();
       setIsLoading(false);
+      await loginUser();
     } catch (err) {
       onLoginFailed(err);
     }

diff --git a/src/hooks/websocketListener/useInitializeWebsocketConnection.tsx b/src/hooks/websocketListener/useInitializeWebsocketConnection.tsx
@@ -68,7 +68,8 @@ export function useInitializeWebsocketConnection() {
         // To avoid multiple connections to the same endpoint, we have to guard the initialization before the logic started
         websocketConnection.status = WebsocketConnectionStatusEnum.PENDING;
 
-        const websocketUrl = await getWebsocketUrl(network.apiAddress);
+        const websocketUrl =
+          network.websocketUrl ?? (await getWebsocketUrl(network.apiAddress));
 
         if (websocketUrl == null) {
           console.warn('Can not get websocket url');

diff --git a/src/types/network.types.ts b/src/types/network.types.ts
@@ -16,6 +16,7 @@ export interface BaseNetworkType {
   xAliasAddress?: string;
   roundDuration: number;
   metamaskSnapWalletAddress?: string;
+  websocketUrl?: string;
 }
 
 export interface AccountInfoSliceNetworkType extends BaseNetworkType {
@@ -47,6 +48,7 @@ export interface CustomNetworkType {
   walletConnectV2ProjectId?: string;
   walletConnectV2Options?: any;
   metamaskSnapWalletAddress?: string;
+  websocketUrl?: string;
 }
 
 export interface ApiNetworkConfigType {