Allow only tokens and collections with prefix to be registered (#57)

* Allow only tokens and collections with prefix to be registered

* Fixed FaucetScreen.tsx

* Refactor

* Refactor

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- [Allow only tokens and collections with prefix to be registered](https://github.com/multiversx/mx-lite-wallet-dapp/pull/56)
+
 ## [[1.0.2](https://github.com/multiversx/mx-lite-wallet-dapp/pull/54)] - 2024-10-03
 
 - [Fixed faucet is missing on sovereign when recpatcha key is missing](https://github.com/multiversx/mx-lite-wallet-dapp/pull/55)

package.json

@@ -28,7 +28,8 @@
     "copy:sovereign-config": "cp ./src/config/config.sovereign.ts ./src/config/index.ts",
     "test:pptr-headless": "npx @puppeteer/browsers install [email protected] && jest --config=jest-puppeteer.config.js",
     "test:pptr": "JEST_PPTR_RETRY_TIMES=0 HEADLESS=false jest --config=jest-puppeteer.config.js",
-    "test": "jest"
+    "test": "jest",
+    "preview": "vite preview"
   },
   "browserslist": [
     ">0.2%",

src/hooks/tokens/useTokenOptions.ts

@@ -27,14 +27,12 @@ export const useTokenOptions = ({
       );
     }
 
-    if (skipAddEgld && tokens[0]?.identifier === egldLabel) {
-      tokens.shift();
-    }
-
-    return tokens.map((token) => ({
-      value: token.identifier,
-      label: token.name
-    }));
+    return tokens
+      .filter((token) => !skipAddEgld || token.identifier !== egldLabel)
+      .map((token) => ({
+        value: token.identifier,
+        label: token.name
+      }));
   };
 
   const getTokens = (type: SendTypeEnum) =>
@@ -49,11 +47,9 @@ export const useTokenOptions = ({
     [nfts, tokens, sendType]
   );
 
-  const allTokens = [...tokens, ...(nfts || [])];
-
-  if (skipAddEgld && allTokens[0]?.identifier === egldLabel) {
-    allTokens.shift();
-  }
+  const allTokens = [...tokens, ...(nfts || [])].filter(
+    (token) => !skipAddEgld || token.identifier !== egldLabel
+  );
 
   return {
     allTokens,

src/pages/Faucet/components/FaucetScreen/FaucetScreen.tsx

@@ -6,7 +6,6 @@ import { DataTestIdsEnum } from 'localConstants';
 import { FaucetSettingsReturnType } from 'redux/endpoints';
 
 const sitekey = import.meta.env.VITE_APP_GOOGLE_RECAPTCHA_KEY;
-const isDisabled = process.env.NODE_ENV === 'production';
 
 export interface FaucetScreenPropsType {
   settings: FaucetSettingsReturnType;
@@ -18,7 +17,7 @@ export const FaucetScreen = ({
   onRequestClick
 }: FaucetScreenPropsType) => {
   const [captcha, setCaptcha] = useState('');
-  const [requestDisabled, setRequestDisabled] = useState(isDisabled);
+  const [requestDisabled, setRequestDisabled] = useState(false);
   const egldLabel = getEgldLabel();
 
   const onRecaptchaChange = (value: string | null) => {

src/pages/RegisterToken/helpers/getRegisterTokenTransaction.ts

@@ -42,7 +42,7 @@ export const getRegisterTokenTransaction = ({
     'identifier' in token ? token.identifier : token.ticker;
   const tokenType = TokenTypeMap[nft.type] || 0;
   const tokenName = token.name;
-  const tokenTicker = token.ticker?.split('-')[0];
+  const tokenTicker = token.ticker?.split('-')[1];
   const tokenDecimals = token.decimals || 0;
 
   const args = [

src/pages/RegisterToken/hooks/useRegisterTokenOptions.ts

@@ -1,6 +1,6 @@
 import { useEffect, useMemo } from 'react';
 import { useGetTokensWithEgld } from 'hooks';
-import { useGetAccountInfo } from 'lib';
+import { useGetAccountInfo, getEgldLabel } from 'lib';
 import { useLazyGetCollectionsQuery } from 'redux/endpoints';
 import { SendTypeEnum, TokenOptionType } from 'types';
 
@@ -11,24 +11,28 @@ export const useRegisterTokenOptions = (sendType: SendTypeEnum) => {
     fetchCollections,
     { data: collections, isLoading: isLoadingCollections }
   ] = useLazyGetCollectionsQuery();
+  const egldLabel = getEgldLabel();
 
   const getTokenOptionsByType = (type: SendTypeEnum): TokenOptionType[] => {
+    let options: TokenOptionType[] = [];
+
     if (type === SendTypeEnum.nft) {
-      return (
+      options =
         collections?.map((token) => ({
           value: token.ticker,
           label: token.name
-        })) ?? []
-      );
+        })) ?? [];
+    } else {
+      options = tokens
+        .filter((token) => token.identifier !== egldLabel)
+        .map((token) => ({
+          value: token.identifier,
+          label: token.name
+        }));
     }
 
-    // Remove EGLD
-    tokens.shift();
-
-    return tokens.map((token) => ({
-      value: token.identifier,
-      label: token.name
-    }));
+    // Show only tokens/collections with a prefix (e.g. sov-FNG-123456)
+    return options.filter((token) => token.value.split('-').length > 2);
   };
 
   const getTokens = (type: SendTypeEnum) =>
@@ -43,10 +47,9 @@ export const useRegisterTokenOptions = (sendType: SendTypeEnum) => {
     [collections, tokens, sendType]
   );
 
-  const allTokens = [...tokens, ...(collections || [])];
-
-  // Remove EGLD
-  allTokens.shift();
+  const allTokens = [...tokens, ...(collections || [])].filter(
+    (token) => !('identifier' in token) || token.identifier !== egldLabel
+  );
 
   return {
     allTokens,