fix: pass failed description, styles

anoma · Sep 10, 2024 · dbe729e · dbe729e
1 parent b40a331
commit dbe729e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/apps/namadillo/src/App/Common/Toast.tsx b/apps/namadillo/src/App/Common/Toast.tsx
@@ -9,6 +9,7 @@ import { useAtomValue, useSetAtom } from "jotai";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { FaCheck, FaTimes } from "react-icons/fa";
 import { FaRegHourglassHalf, FaXmark } from "react-icons/fa6";
+import { GoAlert } from "react-icons/go";
 import { ToastNotification } from "types";
 
 export const Toasts = (): JSX.Element => {
@@ -113,6 +114,11 @@ const Toast = ({
             <FaRegHourglassHalf />
           </i>
         )}
+        {notification.type === "partialSuccess" && (
+          <i className="text-2xl">
+            <GoAlert />
+          </i>
+        )}
       </span>
       <Stack
         gap={0.5}
@@ -137,11 +143,14 @@ const Toast = ({
           </div>
         )}
         {notification.failedDetails && (viewDetails || forceDetailsOpen) && (
-          <div className="w-full text-xs text-red block">
-            <br />
-            <div>The following Tx were not applied:</div>
-            {notification.failedDetails}
-          </div>
+          <>
+            <div className="w-full text-xs text-white block my-4">
+              <span className="font-bold">
+                {notification.failedDescription}
+              </span>
+              {notification.failedDetails}
+            </div>
+          </>
         )}
       </Stack>
       <i

diff --git a/apps/namadillo/src/hooks/useTransactionNotifications.tsx b/apps/namadillo/src/hooks/useTransactionNotifications.tsx
@@ -118,6 +118,9 @@ export const useTransactionNotifications = (): void => {
           succeeded
         </>
       ),
+      failedDescription: (
+        <>The following staking transactions were not applied:</>
+      ),
       details: getAmountByValidatorList(e.detail.data),
       failedDetails: getAmountByValidatorList(e.detail.failedData || []),
       type: "partialSuccess",
@@ -149,9 +152,12 @@ export const useTransactionNotifications = (): void => {
       title: "Some Unstake transactions failed",
       description: (
         <>
-          Your unbonding of <NamCurrency amount={total} /> has succeeded
+          Your unstaking of <NamCurrency amount={total} /> has succeeded
         </>
       ),
+      failedDescription: (
+        <>The following unstaking transactions were not applied:</>
+      ),
       details: getAmountByValidatorList(e.detail.data),
       failedDetails:
         e.detail.failedData ?
@@ -246,6 +252,7 @@ export const useTransactionNotifications = (): void => {
           has succeeded
         </>
       ),
+      failedDescription: <>The following redelegations were not applied:</>,
       details: getReDelegateDetailList(e.detail.data),
       failedDetails:
         e.detail.failedData ?

diff --git a/apps/namadillo/src/lib/query.ts b/apps/namadillo/src/lib/query.ts
@@ -9,7 +9,6 @@ import {
 } from "@namada/types";
 import { getIndexerApi } from "atoms/api";
 import { chainParametersAtom } from "atoms/chain";
-import BigNumber from "bignumber.js";
 import { getSdkInstance } from "hooks";
 import invariant from "invariant";
 import { getDefaultStore } from "jotai";
@@ -59,7 +58,7 @@ const getTxProps = (
   return {
     token: chain.nativeTokenAddress,
     feeAmount: gasConfig.gasPrice,
-    gasLimit: BigNumber(200),
+    gasLimit: gasConfig.gasLimit,
     chainId: chain.chainId,
     publicKey: account.publicKey!,
     memo: "",

diff --git a/apps/namadillo/src/types.d.ts b/apps/namadillo/src/types.d.ts
@@ -144,6 +144,7 @@ export type ToastNotification = {
   type: "pending" | "success" | "partialSuccess" | "error";
   title: React.ReactNode;
   description: React.ReactNode;
+  failedDescription?: React.ReactNode;
   details?: React.ReactNode;
   failedDetails?: React.ReactNode;
   timeout?: number;