ETH for bsc WETH (#760)

* ETH for bsc WETH * clean code while debugging (#761) * update ui kit
massalabs · Jul 29, 2024 · 6683ea8 · 6683ea8
1 parent e16f870
commit 6683ea8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 26 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@dusalabs/sdk": "^0.5.28",
     "@massalabs/massa-web3": "^4.0.2-dev",
-    "@massalabs/react-ui-kit": "^0.0.5-dev",
+    "@massalabs/react-ui-kit": "^0.0.6-dev",
     "@massalabs/wallet-provider": "^2.0.1-dev",
     "@rainbow-me/rainbowkit": "^2.0.0-beta.4",
     "@tanstack/query-core": "^5.18.1",

diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
@@ -274,7 +274,6 @@
     "claim": {
       "error": {
         "rejected": "Claim rejected by user, try again",
-        "timeout": "Claim timeout out.",
         "unknown": "Unknown error, Try again."
       }
     },

diff --git a/src/pages/IndexPage/Layouts/LoadingLayout/PendingOperationLayout.tsx b/src/pages/IndexPage/Layouts/LoadingLayout/PendingOperationLayout.tsx
@@ -17,21 +17,22 @@ export function PendingOperationLayout() {
 
   const { box } = useGlobalStatusesStore();
 
-  const IS_BOX_SUCCESS = box === Status.Success;
-  const IS_BOX_WARNING = box === Status.Warning;
-  const IS_BOX_ERROR = box === Status.Error;
+  const isBoxSuccess = box === Status.Success;
+  const isBoxWarning = box === Status.Warning;
+  const isBoxError = box === Status.Error;
 
-  const displaySubtitle = !IS_BOX_SUCCESS && !IS_BOX_WARNING && !IS_BOX_ERROR;
+  const displaySubtitle = !isBoxSuccess && !isBoxWarning && !isBoxError;
 
-  const isNotProcessing = IS_BOX_SUCCESS || IS_BOX_WARNING || IS_BOX_ERROR;
+  const isNotProcessing = isBoxSuccess || isBoxWarning || isBoxError;
 
   function getLoadingBoxHeader() {
-    if (IS_BOX_SUCCESS) return Intl.t('index.loading-box.success');
-    else if (IS_BOX_ERROR) {
+    if (isBoxSuccess) return Intl.t('index.loading-box.success');
+    if (isBoxError) {
       return massaToEvm
         ? Intl.t('index.loading-box.title-redeem-error')
         : Intl.t('index.loading-box.title-bridge-error');
-    } else if (IS_BOX_WARNING) {
+    }
+    if (isBoxWarning) {
       return massaToEvm ? (
         <>
           {Intl.t('index.loading-box.title-redeem-warning-1')}
@@ -54,9 +55,9 @@ export function PendingOperationLayout() {
 
   function getLoadingBoxContent() {
     switch (true) {
-      case IS_BOX_SUCCESS:
+      case isBoxSuccess:
         return <SuccessLayout />;
-      case IS_BOX_WARNING:
+      case isBoxWarning:
         return <WarningLayout />;
       case massaToEvm:
         return <RedeemLayout />;

diff --git a/src/pages/IndexPage/Layouts/LoadingLayout/RedeemLayout/ClaimRedeem.tsx b/src/pages/IndexPage/Layouts/LoadingLayout/RedeemLayout/ClaimRedeem.tsx
@@ -48,11 +48,6 @@ export function ClaimRedeem() {
     [burnTxId, updateBurnRedeemOperationById],
   );
 
-  const setLoadingToError = useCallback(() => {
-    setClaim(Status.Error);
-    setBox(Status.Error);
-  }, [setClaim, setBox]);
-
   // Updates current redeem operation state based on claim status
   useEffect(() => {
     if (hash) setClaimTxId(hash);
@@ -76,7 +71,8 @@ export function ClaimRedeem() {
           claimState: ClaimState.REJECTED,
         });
       } else {
-        setLoadingToError();
+        setClaim(Status.Error);
+        setBox(Status.Error);
         updateCurrentRedeemOperation({
           claimState: ClaimState.ERROR,
         });
@@ -91,7 +87,6 @@ export function ClaimRedeem() {
     refreshBalances,
     setClaim,
     updateCurrentRedeemOperation,
-    setLoadingToError,
     setClaimTxId,
   ]);
 

diff --git a/src/store/helpers/tokenSymbol.ts b/src/store/helpers/tokenSymbol.ts
@@ -3,5 +3,6 @@ export function getMASSASymbol(symbol: string) {
 }
 export function getEVMSymbol(symbol: string) {
   // removes any ". + alphanumeric " from string
+  if (symbol === 'WETH.b') return 'ETH';
   return symbol.replace(/\.[^.]+$/, '');
 }
diff --git a/src/utils/lambdaApi.ts b/src/utils/lambdaApi.ts
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import { useAccount } from 'wagmi';
 import { ClaimState } from './const';
 import { config } from '../const';
-import { useBridgeModeStore, useGlobalStatusesStore } from '../store/store';
+import { useBridgeModeStore } from '../store/store';
 import { useResource } from '@/custom/api/useResource';
 import { BurnRedeemOperation, useOperationStore } from '@/store/operationStore';
 
@@ -143,7 +143,6 @@ function getClaimState(
 export function useFetchSignatures() {
   const { burnTxId, getCurrentRedeemOperation, updateBurnRedeemOperationById } =
     useOperationStore();
-  const { setBox } = useGlobalStatusesStore();
   const { currentMode } = useBridgeModeStore();
   const { address: evmAddress } = useAccount();
 
@@ -181,7 +180,6 @@ export function useFetchSignatures() {
   }, [
     burnTxId,
     burnOperations,
-    setBox,
     getCurrentRedeemOperation,
     updateBurnRedeemOperationById,
   ]);