[Issue-4263] feat: refactor code & review

Author: dungnguyen-art

packages/extension-base/src/core/logic-validation/recipientAddress.ts

@@ -133,7 +133,5 @@ export function validateRecipientAddress (validateRecipientParams: ValidateRecip
   const conditions = getConditions(validateRecipientParams);
   const validationFunctions = getValidationFunctions(conditions);
 
-  console.log('conditions', conditions);
-
   return runValidationFunctions(validateRecipientParams, validationFunctions);
 }

packages/extension-base/src/core/utils.ts

@@ -114,7 +114,6 @@ export function _isValidCardanoAddressFormat (validateRecipientParams: ValidateR
   return '';
 }
 
-// TODO: Temporarily allow the transfer flow, review this function later.
 export function _isValidBitcoinAddressFormat (validateRecipientParams: ValidateRecipientParams): string {
   const { destChainInfo, toAddress } = validateRecipientParams;
   const addressInfo = validateBitcoinAddress(toAddress) ? getBitcoinAddressInfo(toAddress) : null;

packages/extension-base/src/services/chain-service/utils/index.ts

@@ -142,7 +142,7 @@ export function _isTokenTransferredByCardano (tokenInfo: _ChainAsset) {
   return _isCIP26Token(tokenInfo) || _isNativeToken(tokenInfo);
 }
 
-// TODO Note: Currently supports transferring only the native token, Bitcoin.
+// TODO [Review]: Currently supports transferring only the native token, Bitcoin.
 export function _isTokenTransferredByBitcoin (tokenInfo: _ChainAsset) {
   return _isNativeToken(tokenInfo);
 }

packages/extension-base/src/services/request-service/handler/BitcoinRequestHandler.ts

@@ -111,9 +111,6 @@ export default class BitcoinRequestHandler {
       };
     });
 
-    console.log('confirmations.next', confirmations);
-    console.log('confirmations.isInternal', isInternal);
-
     this.confirmationsQueueSubjectBitcoin.next(confirmations);
 
     if (!isInternal) {
@@ -238,6 +235,8 @@ export default class BitcoinRequestHandler {
       bitcoinApi,
       chain,
       from,
+      feeCustom,
+      feeOption,
       feeInfo,
       to,
       transferAll: false,

packages/extension-base/src/services/transaction-service/index.ts

@@ -94,8 +94,6 @@ export default class TransactionService {
       .filter((item) => item.address === transaction.address && item.chain === transaction.chain);
 
     if (existed.length > 0) {
-      console.log('validate.3');
-
       return [new TransactionError(BasicTxErrorType.DUPLICATE_TRANSACTION)];
     }
 
@@ -152,7 +150,6 @@ export default class TransactionService {
     const isNoCardanoApi = transaction && isCardanoTransaction(transaction) && !cardanoApi;
     const isNoBitcoinApi = transaction && isBitcoinTransaction(transaction) && !bitcoinApi;
 
-    // TODO: template pass validation for bitcoin transfer
     if (isNoEvmApi || isNoTonApi || isNoCardanoApi || isNoBitcoinApi) {
       validationResponse.errors.push(new TransactionError(BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
     }
@@ -261,7 +258,7 @@ export default class TransactionService {
       warnings: transaction.warnings || [],
       url: transaction.url || EXTENSION_REQUEST_URL,
       status: ExtrinsicStatus.QUEUED,
-      isInternal: false,
+      isInternal,
       id: transactionId,
       extrinsicHash: transactionId
     } as SWTransaction;

packages/extension-koni-ui/src/Popup/Confirmations/index.tsx

@@ -20,7 +20,7 @@ import { SignerPayloadJSON } from '@polkadot/types/types';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 
 import { ConfirmationHeader } from './parts';
-import { AddNetworkConfirmation, AddTokenConfirmation, AuthorizeConfirmation, BitcoinSendTransactionRequestConfirmation, BitcoinSignatureConfirmation, BitcoinSignPsbtConfirmation, ConnectWalletConnectConfirmation, EvmSignatureConfirmation, EvmSignatureWithProcess, EvmTransactionConfirmation, MetadataConfirmation, NetworkConnectionErrorConfirmation, NotSupportConfirmation, NotSupportWCConfirmation, SignConfirmation, TransactionConfirmation } from './variants';
+import { AddNetworkConfirmation, AddTokenConfirmation, AuthorizeConfirmation, ConnectWalletConnectConfirmation, EvmSignatureConfirmation, EvmSignatureWithProcess, EvmTransactionConfirmation, MetadataConfirmation, NetworkConnectionErrorConfirmation, NotSupportConfirmation, NotSupportWCConfirmation, SignConfirmation, TransactionConfirmation } from './variants';
 
 type Props = ThemeProps
 
@@ -53,8 +53,6 @@ const Component = function ({ className }: Props) {
   const { alertProps, closeAlert, openAlert } = useAlert(alertModalId);
   const { transactionRequest } = useSelector((state) => state.requestState);
 
-  console.log('confirmation', confirmation);
-
   const nextConfirmation = useCallback(() => {
     setIndex((val) => Math.min(val + 1, numberOfConfirmations - 1));
   }, [numberOfConfirmations]);
@@ -177,27 +175,27 @@ const Component = function ({ className }: Props) {
           />
         );
 
-      case 'bitcoinSignatureRequest':
-        return (
-          <BitcoinSignatureConfirmation
-            request={confirmation.item as ConfirmationDefinitionsBitcoin['bitcoinSignatureRequest'][0]}
-            type={confirmation.type}
-          />
-        );
-      case 'bitcoinSignPsbtRequest':
-        return (
-          <BitcoinSignPsbtConfirmation
-            request={confirmation.item as ConfirmationDefinitionsBitcoin['bitcoinSignPsbtRequest'][0]}
-            type={confirmation.type}
-          />
-        );
-      case 'bitcoinSendTransactionRequestAfterConfirmation':
-        return (
-          <BitcoinSendTransactionRequestConfirmation
-            request={confirmation.item as ConfirmationDefinitionsBitcoin['bitcoinSendTransactionRequestAfterConfirmation'][0]}
-            type={confirmation.type}
-          />
-        );
+      // case 'bitcoinSignatureRequest':
+      //   return (
+      //     <BitcoinSignatureConfirmation
+      //       request={confirmation.item as ConfirmationDefinitionsBitcoin['bitcoinSignatureRequest'][0]}
+      //       type={confirmation.type}
+      //     />
+      //   );
+      // case 'bitcoinSignPsbtRequest':
+      //   return (
+      //     <BitcoinSignPsbtConfirmation
+      //       request={confirmation.item as ConfirmationDefinitionsBitcoin['bitcoinSignPsbtRequest'][0]}
+      //       type={confirmation.type}
+      //     />
+      //   );
+      // case 'bitcoinSendTransactionRequestAfterConfirmation':
+      //   return (
+      //     <BitcoinSendTransactionRequestConfirmation
+      //       request={confirmation.item as ConfirmationDefinitionsBitcoin['bitcoinSendTransactionRequestAfterConfirmation'][0]}
+      //       type={confirmation.type}
+      //     />
+      //   );
       case 'authorizeRequest':
         return (
           <AuthorizeConfirmation request={confirmation.item as AuthorizeRequest} />

packages/extension-koni-ui/src/Popup/Confirmations/parts/Sign/Bitcoin.tsx

@@ -56,6 +56,7 @@ const Component: React.FC<Props> = (props: Props) => {
   const { canSign, className, editedPayload, extrinsicType, id, payload, type } = props;
   const { payload: { hashPayload } } = payload;
   const { account } = (payload.payload as BitcoinSignatureRequest);
+  // TODO: [Review] Error eslint
   const chainId = (payload.payload as EvmSendTransactionRequest)?.chainId || 1;
 
   const { t } = useTranslation();
@@ -178,7 +179,8 @@ const Component: React.FC<Props> = (props: Props) => {
     setLoading(true);
 
     setTimeout(() => {
-      const signPromise = isMessage ? ledgerSignMessage(u8aToU8a(hashPayload), account?.accountIndex, account?.addressOffset) : ledgerSignTransaction(hexToU8a(hashPayload), account?.accountIndex, account?.addressOffset);
+      // TODO: Review metadata of ledgerSignTransaction
+      const signPromise = isMessage ? ledgerSignMessage(u8aToU8a(hashPayload), account?.accountIndex, account?.addressOffset) : ledgerSignTransaction(hexToU8a(hashPayload), new Uint8Array(0), account?.accountIndex, account?.addressOffset);
 
       signPromise
         .then(({ signature }) => {