Merge branch 'develop' into fix/send-all-button-in-mobile

ArdentHQ · Oct 18, 2024 · a85d7b5 · a85d7b5
2 parents 8792045 + ff50148
commit a85d7b5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/domains/transaction/components/TransactionDetail/TransactionId/TransactionId.test.tsx b/src/domains/transaction/components/TransactionDetail/TransactionId/TransactionId.test.tsx
@@ -29,6 +29,7 @@ describe("TransactionId", () => {
 
 		render(
 			<TransactionId
+				isConfirmed
 				transaction={
 					{
 						explorerLink: () => "https://test.com",

diff --git a/src/domains/transaction/components/TransactionDetail/TransactionId/TransactionId.tsx b/src/domains/transaction/components/TransactionDetail/TransactionId/TransactionId.tsx
@@ -13,9 +13,10 @@ import cn from "classnames";
 
 interface Properties {
 	transaction: DTO.ExtendedSignedTransactionData | DTO.ExtendedConfirmedTransactionData;
+	isConfirmed?: boolean;
 }
 
-export const TransactionId = ({ transaction }: Properties): ReactElement => {
+export const TransactionId = ({ transaction, isConfirmed }: Properties): ReactElement => {
 	const { t } = useTranslation();
 	const { isDarkMode } = useTheme();
 	const { isSmAndAbove } = useBreakpoint();
@@ -54,7 +55,7 @@ export const TransactionId = ({ transaction }: Properties): ReactElement => {
 					variant="secondary"
 					size="icon"
 					className="border border-theme-secondary-300 bg-transparent p-2 hover:border-transparent dark:border-transparent dark:bg-theme-secondary-800"
-					disabled={!transaction.isConfirmed()}
+					disabled={[!isConfirmed, !transaction.isConfirmed()].every(Boolean)}
 					onClick={() => {
 						openExternal(transaction.explorerLink());
 					}}

diff --git a/src/domains/transaction/components/TransactionDetailModal/TransactionDetailModal.tsx b/src/domains/transaction/components/TransactionDetailModal/TransactionDetailModal.tsx
@@ -59,7 +59,7 @@ export const TransactionDetailContent = ({
 	return (
 		<DetailsCondensed>
 			<div className="mt-4">
-				<TransactionId transaction={transaction} />
+				<TransactionId transaction={transaction} isConfirmed={isConfirmed} />
 			</div>
 
 			<div className={cn("mt-6 space-y-4", containerClassname)}>

diff --git a/src/domains/transaction/pages/SendIpfs/__snapshots__/SendIpfs.test.tsx.snap b/src/domains/transaction/pages/SendIpfs/__snapshots__/SendIpfs.test.tsx.snap
@@ -1732,9 +1732,8 @@ exports[`SendIpfs > should render summary step 1`] = `
               </span>
             </button>
             <button
-              class="relative items-center inline-flex justify-center font-semibold leading-tight text-center transition-colors-shadow duration-100 ease-linear outline-none focus:outline-none focus:ring-2 focus:ring-theme-primary-400 disabled:cursor-not-allowed rounded disabled:bg-theme-secondary-200 disabled:text-theme-secondary-400 dark:disabled:bg-theme-secondary-800 dark:disabled:text-theme-secondary-700 border border-theme-secondary-300 bg-transparent p-2 hover:border-transparent dark:border-transparent dark:bg-theme-secondary-800"
+              class="relative items-center inline-flex justify-center font-semibold leading-tight text-center transition-colors-shadow duration-100 ease-linear outline-none focus:outline-none focus:ring-2 focus:ring-theme-primary-400 disabled:cursor-not-allowed rounded dark:text-theme-secondary-200 text-theme-primary-600 hover:bg-theme-primary-700 hover:text-white dark:hover:bg-theme-primary-700 border border-theme-secondary-300 bg-transparent p-2 hover:border-transparent dark:border-transparent dark:bg-theme-secondary-800"
               data-testid="explorer-link"
-              disabled=""
               type="button"
             >
               <div

diff --git a/src/domains/wallet/components/WalletsList/WalletsList.tsx b/src/domains/wallet/components/WalletsList/WalletsList.tsx
@@ -201,7 +201,7 @@ export const WalletsList: React.VFC<WalletsListProperties> = ({
 							<div className="flex items-center justify-center gap-2 text-sm font-semibold leading-5 text-theme-secondary-700 dark:text-theme-secondary-200 sm:justify-start">
 								<span>{t("COMMON.SHOW")}</span>
 								<Select
-									options={[1, 2, 10, 25, 50, 100].map((v) => ({
+									options={[10, 25, 50, 100].map((v) => ({
 										label: v.toString(),
 										value: v.toString(),
 									}))}
@@ -211,7 +211,6 @@ export const WalletsList: React.VFC<WalletsListProperties> = ({
 									defaultValue={perPage.toString()}
 									wrapperClassName="relative"
 									className="!h-8 !w-[78px] !px-3"
-									innerClassName="!text-sm"
 									onChange={(selected) => {
 										setCurrentPage(1);
 										setPerPage(Number(selected.value));