Merge branch 'develop' into release/v0.26.0

secretkeylabs · Dec 7, 2023 · 24e5f70 · 24e5f70
2 parents 9d9cf8b + eed2090
commit 24e5f70
Show file tree

Hide file tree

Showing 25 changed files with 1,150 additions and 57 deletions.
diff --git a/src/app/App.tsx b/src/app/App.tsx
@@ -1,4 +1,5 @@
 import LoadingScreen from '@components/loadingScreen';
+import { CheckCircle } from '@phosphor-icons/react';
 import rootStore from '@stores/index';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
@@ -40,7 +41,23 @@ function App(): JSX.Element {
             <SessionGuard>
               <ThemeProvider theme={Theme}>
                 <RouterProvider router={router} />
-                <Toaster position="bottom-center" />
+                <Toaster
+                  position="bottom-center"
+                  containerStyle={{ bottom: 80 }}
+                  toastOptions={{
+                    success: {
+                      icon: <CheckCircle size={20} weight="bold" />,
+                      style: {
+                        ...Theme.typography.body_medium_m,
+                        backgroundColor: Theme.colors.success_medium,
+                        borderRadius: Theme.radius(2),
+                        padding: Theme.spacing(4),
+                        paddingLeft: Theme.spacing(6),
+                        color: Theme.colors.elevation0,
+                      },
+                    },
+                  }}
+                />
               </ThemeProvider>
             </SessionGuard>
           </PersistGate>

diff --git a/src/app/components/bottomModal/index.tsx b/src/app/components/bottomModal/index.tsx
@@ -4,7 +4,7 @@ import Modal from 'react-modal';
 import styled, { useTheme } from 'styled-components';
 
 const BottomModalHeaderText = styled.h1((props) => ({
-  ...props.theme.body_bold_m,
+  ...props.theme.typography.body_bold_l,
   flex: 1,
 }));
 

diff --git a/src/app/components/button/index.tsx b/src/app/components/button/index.tsx
@@ -81,7 +81,7 @@ interface Props {
   icon?: JSX.Element;
   iconPosition?: 'left' | 'right';
   text: string;
-  onPress: () => void;
+  onPress: (e: React.MouseEvent<HTMLButtonElement>) => void;
   processing?: boolean;
   disabled?: boolean;
   transparent?: boolean;
@@ -102,9 +102,9 @@ function ActionButton({
   warning,
   hoverDialogId,
 }: Props) {
-  const handleOnPress = () => {
+  const handleOnPress = (e: React.MouseEvent<HTMLButtonElement>) => {
     if (!disabled) {
-      onPress();
+      onPress(e);
     }
   };
 

diff --git a/src/app/components/transactionSetting/editFee.tsx b/src/app/components/transactionSetting/editFee.tsx
@@ -58,10 +58,7 @@ const InputContainer = styled.div<InputContainerProps>((props) => ({
   }`,
   backgroundColor: props.theme.colors.elevation1,
   borderRadius: props.theme.radius(1),
-  paddingLeft: props.theme.spacing(5),
-  paddingRight: props.theme.spacing(5),
-  paddingTop: props.theme.spacing(5),
-  paddingBottom: props.theme.spacing(5),
+  padding: props.theme.spacing(5),
 }));
 
 const InputField = styled.input((props) => ({
@@ -103,7 +100,7 @@ const FeeButton = styled.button<ButtonProps>((props) => ({
   color: `${props.isSelected ? props.theme.colors.elevation2 : props.theme.colors.white_400}`,
   background: `${props.isSelected ? props.theme.colors.white : 'transparent'}`,
   border: `1px solid ${props.isSelected ? 'transparent' : props.theme.colors.elevation6}`,
-  borderRadius: 40,
+  borderRadius: props.theme.radius(9),
   width: props.isBtc ? 104 : 82,
   height: 40,
   display: 'flex',
@@ -112,13 +109,13 @@ const FeeButton = styled.button<ButtonProps>((props) => ({
   marginRight: props.isLastInRow ? 0 : 8,
 }));
 
-const ButtonContainer = styled.div({
+const ButtonContainer = styled.div((props) => ({
   display: 'flex',
   flexDirection: 'row',
   alignItems: 'center',
   justifyContent: 'space-between',
-  marginTop: 12,
-});
+  marginTop: props.theme.spacing(6),
+}));
 
 const FeeContainer = styled.div({
   display: 'flex',

diff --git a/src/app/components/transactionSetting/editNonce.tsx b/src/app/components/transactionSetting/editNonce.tsx
@@ -51,6 +51,7 @@ interface Props {
 function EditNonce({ nonce, setNonce }: Props) {
   const { t } = useTranslation('translation', { keyPrefix: 'TRANSACTION_SETTING' });
   const [nonceInput, setNonceInput] = useState(nonce);
+
   const onInputEditNonceChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setNonceInput(e.target.value);
   };

diff --git a/src/app/components/transactions/btcTransaction.tsx b/src/app/components/transactions/btcTransaction.tsx
@@ -1,23 +1,28 @@
+import ActionButton from '@components/button';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { Brc20HistoryTransactionData, BtcTransactionData } from '@secretkeylabs/xverse-core';
+import { FastForward } from '@phosphor-icons/react';
+import {
+  Brc20HistoryTransactionData,
+  BtcTransactionData,
+  rbf,
+  RBFProps,
+} from '@secretkeylabs/xverse-core';
 import { getBtcTxStatusUrl } from '@utils/helper';
 import { isBtcTransaction } from '@utils/transactions/transactions';
 import { useCallback } from 'react';
-import styled from 'styled-components';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
+import styled, { useTheme } from 'styled-components';
 import TransactionAmount from './transactionAmount';
 import TransactionRecipient from './transactionRecipient';
 import TransactionStatusIcon from './transactionStatusIcon';
 import TransactionTitle from './transactionTitle';
 
-interface TransactionHistoryItemProps {
-  transaction: BtcTransactionData | Brc20HistoryTransactionData;
-}
-
 const TransactionContainer = styled.button((props) => ({
   display: 'flex',
+  alignItems: 'center',
   width: '100%',
-  paddingTop: props.theme.spacing(5),
-  paddingBottom: props.theme.spacing(5),
+  padding: props.theme.spacing(5),
   paddingLeft: props.theme.spacing(8),
   paddingRight: props.theme.spacing(8),
   background: 'none',
@@ -30,10 +35,11 @@ const TransactionContainer = styled.button((props) => ({
 }));
 
 const TransactionAmountContainer = styled.div({
+  width: '100%',
   display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'flex-end',
   flex: 1,
-  width: '100%',
-  justifyContent: 'flex-end',
 });
 
 const TransactionInfoContainer = styled.div((props) => ({
@@ -47,30 +53,74 @@ const TransactionRow = styled.div((props) => ({
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'space-between',
-  ...props.theme.body_bold_m,
+  ...props.theme.typography.body_bold_m,
+}));
+
+const StyledButton = styled(ActionButton)((props) => ({
+  padding: 0,
+  border: 'none',
+  width: 'auto',
+  height: 'auto',
+  div: {
+    ...props.theme.typography.body_medium_m,
+    color: props.theme.colors.tangerine,
+  },
+  ':hover:enabled': {
+    backgroundColor: 'transparent',
+  },
+  ':active:enabled': {
+    backgroundColor: 'transparent',
+  },
 }));
 
-export default function BtcTransactionHistoryItem(props: TransactionHistoryItemProps) {
-  const { transaction } = props;
-  const { network } = useWalletSelector();
+interface TransactionHistoryItemProps {
+  transaction: BtcTransactionData | Brc20HistoryTransactionData;
+  wallet: RBFProps;
+}
+export default function BtcTransactionHistoryItem({
+  transaction,
+  wallet,
+}: TransactionHistoryItemProps) {
+  const { network, hasActivatedRBFKey } = useWalletSelector();
   const isBtc = isBtcTransaction(transaction) ? 'BTC' : 'brc20';
+  const theme = useTheme();
+  const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
+
   const openBtcTxStatusLink = useCallback(() => {
     window.open(getBtcTxStatusUrl(transaction.txid, network), '_blank', 'noopener,noreferrer');
   }, []);
 
+  const showAccelerateButton =
+    hasActivatedRBFKey &&
+    isBtcTransaction(transaction) &&
+    rbf.isTransactionRbfEnabled(transaction, wallet);
+
   return (
     <TransactionContainer onClick={openBtcTxStatusLink}>
       <TransactionStatusIcon transaction={transaction} currency={isBtc} />
       <TransactionInfoContainer>
         <TransactionRow>
-          <TransactionTitle transaction={transaction} />
+          <div>
+            <TransactionTitle transaction={transaction} />
+            <TransactionRecipient transaction={transaction} />
+          </div>
           <TransactionAmountContainer>
             <TransactionAmount transaction={transaction} coin={isBtc} />
+            {showAccelerateButton && (
+              <Link to={`/speed-up-tx/${transaction.txid}`}>
+                <StyledButton
+                  transparent
+                  text={t('SPEED_UP')}
+                  onPress={(e) => {
+                    e.stopPropagation();
+                  }}
+                  icon={<FastForward size={16} color={theme.colors.tangerine} weight="fill" />}
+                  iconPosition="right"
+                />
+              </Link>
+            )}
           </TransactionAmountContainer>
         </TransactionRow>
-        <TransactionRow>
-          <TransactionRecipient transaction={transaction} />
-        </TransactionRow>
       </TransactionInfoContainer>
     </TransactionContainer>
   );

diff --git a/src/app/components/transactions/transactionTitle.tsx b/src/app/components/transactions/transactionTitle.tsx
@@ -23,16 +23,17 @@ export default function TransactionTitle(props: TransactionTitleProps) {
   const { transaction } = props;
   const { t } = useTranslation('translation', { keyPrefix: 'COIN_DASHBOARD_SCREEN' });
   const { coins } = useWalletSelector();
+  const isPending = transaction.txStatus === 'pending';
 
   const getTokenTransferTitle = (tx: TransactionData): string => {
-    if (tx.txStatus === 'pending') {
+    if (isPending) {
       return tx.incoming ? t('TRANSACTION_PENDING_RECEIVING') : t('TRANSACTION_PENDING_SENDING');
     }
     return tx.incoming ? t('TRANSACTION_RECEIVED') : t('TRANSACTION_SENT');
   };
 
   const getBrc20TokenTitle = (tx: Brc20HistoryTransactionData): string => {
-    if (tx.txStatus === 'pending') {
+    if (isPending) {
       return tx.incoming ? t('TRANSACTION_PENDING_RECEIVING') : t('TRANSACTION_PENDING_SENDING');
     }
     if (tx.operation === 'transfer_send') {
@@ -48,7 +49,7 @@ export default function TransactionTitle(props: TransactionTitleProps) {
   };
 
   const getBtcTokenTransferTitle = (tx: BtcTransactionData): string => {
-    if (tx.txStatus === 'pending') {
+    if (isPending) {
       if (tx.isOrdinal) {
         return tx.incoming
           ? t('ORDINAL_TRANSACTION_PENDING_RECEIVING')

diff --git a/src/app/hooks/queries/useTransaction.ts b/src/app/hooks/queries/useTransaction.ts
@@ -0,0 +1,29 @@
+import useBtcClient from '@hooks/useBtcClient';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { fetchBtcTransaction } from '@secretkeylabs/xverse-core';
+import { useQuery } from '@tanstack/react-query';
+
+export default function useTransaction(id: string) {
+  const { selectedAccount } = useWalletSelector();
+  const btcClient = useBtcClient();
+
+  const fetchTransaction = async () => {
+    if (!selectedAccount || !id) {
+      return;
+    }
+
+    const transaction = await fetchBtcTransaction(
+      id,
+      selectedAccount.btcAddress,
+      selectedAccount.ordinalsAddress,
+      btcClient,
+    );
+
+    return transaction;
+  };
+
+  return useQuery({
+    queryKey: ['transaction', id],
+    queryFn: fetchTransaction,
+  });
+}
diff --git a/src/app/hooks/useSponsoredTransaction.ts b/src/app/hooks/useSponsoredTransaction.ts
@@ -16,7 +16,6 @@ export const useSponsorInfoQuery = (sponsorUrl?: string) =>
 
 export const useSponsoredTransaction = (isSponsorOptionSelected: boolean, sponsorUrl?: string) => {
   const [isServiceRunning, setIsServiceRunning] = useState(false);
-
   const { error, data: isActive, isLoading } = useSponsorInfoQuery(sponsorUrl);
 
   useEffect(() => {

diff --git a/src/app/routes/index.tsx b/src/app/routes/index.tsx
@@ -64,6 +64,7 @@ import PrivacyPreferencesScreen from '@screens/settings/privacyPreferences';
 import SignatureRequest from '@screens/signatureRequest';
 import SignBatchPsbtRequest from '@screens/signBatchPsbtRequest';
 import SignPsbtRequest from '@screens/signPsbtRequest';
+import SpeedUpTransactionScreen from '@screens/speedUpTransaction';
 import Stacking from '@screens/stacking';
 import SwapScreen from '@screens/swap';
 import SwapConfirmScreen from '@screens/swap/swapConfirmation';
@@ -262,6 +263,10 @@ const router = createHashRouter([
           </AuthGuard>
         ),
       },
+      {
+        path: 'speed-up-tx/:id',
+        element: <SpeedUpTransactionScreen />,
+      },
       {
         path: 'create-inscription',
         element: (