From 415b1872f004916d3462a1a501f9954d044dfe0d Mon Sep 17 00:00:00 2001
From: Thuc Nguyen Duy <duythucbk@gmail.com>
Date: Wed, 16 Aug 2023 17:33:06 +0700
Subject: [PATCH] [issue-935] Upgrade UI - Update sorting modal & remove
 console log

---
 src/components/Modal/common/PoolSelector.tsx           |  5 +++--
 src/components/Modal/common/ValidatorSelector.tsx      | 10 ++--------
 src/hooks/modal/useConfirmModal.ts                     |  1 -
 src/hooks/qr/usePayloadScanner.ts                      |  1 -
 src/screens/Home/Crypto/BuyToken.tsx                   |  1 -
 .../Home/Staking/Balance/StakingBalanceList.tsx        |  2 --
 src/screens/Transaction/Stake/index.tsx                |  1 -
 src/utils/permission/camera.ts                         |  6 +++---
 src/utils/walletConnect/index.ts                       |  1 -
 9 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/components/Modal/common/PoolSelector.tsx b/src/components/Modal/common/PoolSelector.tsx
index 704241929..f0729d939 100644
--- a/src/components/Modal/common/PoolSelector.tsx
+++ b/src/components/Modal/common/PoolSelector.tsx
@@ -9,7 +9,7 @@ import useGetNominatorInfo from 'hooks/screen/Staking/useGetNominatorInfo';
 import { PREDEFINED_STAKING_POOL } from '@subwallet/extension-base/constants';
 import { PoolSelectorField } from 'components/Field/PoolSelector';
 import { PoolSelectorDetailModal } from 'components/Modal/common/PoolSelectorDetailModal';
-import { ArrowCounterClockwise, MagnifyingGlass, SortAscending, SortDescending } from 'phosphor-react-native';
+import { ArrowsClockwise, MagnifyingGlass, SortAscending, SortDescending } from 'phosphor-react-native';
 import { BasicSelectModal } from 'components/common/SelectModal/BasicSelectModal';
 import { ModalRef } from 'types/modalRef';
 import { useSubWalletTheme } from 'hooks/useSubWalletTheme';
@@ -249,7 +249,8 @@ export const PoolSelector = ({ chain, onSelectItem, from, poolLoading, selectedP
             renderCustomItem={renderSortingItem}>
             {
               <Button
-                icon={<Icon phosphorIcon={ArrowCounterClockwise} size={'md'} />}
+                style={{ marginTop: 16 }}
+                icon={<Icon phosphorIcon={ArrowsClockwise} size={'md'} />}
                 onPress={() => {
                   setSortSelection(SortKey.DEFAULT);
                   sortingModalRef?.current?.onCloseModal();
diff --git a/src/components/Modal/common/ValidatorSelector.tsx b/src/components/Modal/common/ValidatorSelector.tsx
index e8ad020ab..d5ae7444c 100644
--- a/src/components/Modal/common/ValidatorSelector.tsx
+++ b/src/components/Modal/common/ValidatorSelector.tsx
@@ -11,13 +11,7 @@ import useGetNominatorInfo from 'hooks/screen/Staking/useGetNominatorInfo';
 import { useSelectValidators } from 'hooks/screen/Transaction/useSelectValidators';
 import useGetChainStakingMetadata from 'hooks/screen/Staking/useGetChainStakingMetadata';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import {
-  ArrowCounterClockwise,
-  CheckCircle,
-  MagnifyingGlass,
-  SortAscending,
-  SortDescending,
-} from 'phosphor-react-native';
+import { ArrowsClockwise, CheckCircle, MagnifyingGlass, SortAscending, SortDescending } from 'phosphor-react-native';
 import { useSubWalletTheme } from 'hooks/useSubWalletTheme';
 import { ValidatorSelectorField } from 'components/Field/ValidatorSelector';
 import { ValidatorSelectorDetailModal } from 'components/Modal/common/ValidatorSelectorDetailModal';
@@ -272,7 +266,7 @@ export const ValidatorSelector = ({
             {
               <Button
                 style={{ marginTop: 16 }}
-                icon={<Icon phosphorIcon={ArrowCounterClockwise} size={'md'} />}
+                icon={<Icon phosphorIcon={ArrowsClockwise} size={'md'} />}
                 onPress={() => {
                   setSortSelection(SortKey.DEFAULT);
                   sortingModalRef?.current?.onCloseModal();
diff --git a/src/hooks/modal/useConfirmModal.ts b/src/hooks/modal/useConfirmModal.ts
index a4f30dbb1..46d297902 100644
--- a/src/hooks/modal/useConfirmModal.ts
+++ b/src/hooks/modal/useConfirmModal.ts
@@ -39,7 +39,6 @@ const useConfirmModal = (onComplete: VoidFunction): Result => {
   }, [onComplete]);
 
   const onCancelModal = useCallback(() => {
-    console.log('8000');
     rejectRef.current?.(new Error('User cancel request'));
     promiseRef.current = undefined;
   }, []);
diff --git a/src/hooks/qr/usePayloadScanner.ts b/src/hooks/qr/usePayloadScanner.ts
index 38813f0eb..7c88c2b34 100644
--- a/src/hooks/qr/usePayloadScanner.ts
+++ b/src/hooks/qr/usePayloadScanner.ts
@@ -96,7 +96,6 @@ const usePayloadScanner = (showAlertMessage: (message: string) => void): Process
         const unsignedData = checkMultiFramesData(parsedData);
 
         if (unsignedData === null) {
-          console.log('Unsigned data is null');
 
           return showAlertMessage('');
         }
diff --git a/src/screens/Home/Crypto/BuyToken.tsx b/src/screens/Home/Crypto/BuyToken.tsx
index aa064d8d8..012d76425 100644
--- a/src/screens/Home/Crypto/BuyToken.tsx
+++ b/src/screens/Home/Crypto/BuyToken.tsx
@@ -48,7 +48,6 @@ export const BuyToken = ({
   } = useBuyToken(tokenGroupSlug, groupSymbol);
 
   const selectedAccount = useGetAccountByAddress(selectedBuyAccount);
-  console.log('selectedBuyToken', selectedBuyToken);
   const symbol = useMemo(() => {
     return selectedBuyToken ? PREDEFINED_TRANSAK_TOKEN_BY_SLUG[selectedBuyToken].symbol : '';
   }, [selectedBuyToken]);
diff --git a/src/screens/Home/Staking/Balance/StakingBalanceList.tsx b/src/screens/Home/Staking/Balance/StakingBalanceList.tsx
index dd0d7e1b6..cc731ee37 100644
--- a/src/screens/Home/Staking/Balance/StakingBalanceList.tsx
+++ b/src/screens/Home/Staking/Balance/StakingBalanceList.tsx
@@ -86,7 +86,6 @@ const StakingBalanceList = () => {
     { label: i18n.filterOptions.pooled, value: FilterValue.POOLED },
   ];
   const stakingList = useMemo(() => {
-    console.log(data);
     if (!data.length) {
       return [];
     }
@@ -100,7 +99,6 @@ const StakingBalanceList = () => {
       const secondValue =
         // @ts-ignore
         new BigNumber(secondItem.staking.balance).dividedBy(BN_TEN.pow(secondItem.decimals)).toFixed() * secondPrice;
-      console.log(firstValue, secondValue);
       return secondValue - firstValue;
     });
     return result;
diff --git a/src/screens/Transaction/Stake/index.tsx b/src/screens/Transaction/Stake/index.tsx
index d60c6f85d..7ac97ed74 100644
--- a/src/screens/Transaction/Stake/index.tsx
+++ b/src/screens/Transaction/Stake/index.tsx
@@ -123,7 +123,6 @@ export const Stake = ({
     value: currentValue,
   } = formState.data;
 
-  console.log('asset', asset);
   const chainState = useFetchChainState(chain);
   const chainStakingMetadata = useGetChainStakingMetadata(chain);
   const nominatorMetadataList = useGetNominatorInfo(chain, currentStakingType as StakingType, from);
diff --git a/src/utils/permission/camera.ts b/src/utils/permission/camera.ts
index d36e9f43c..cf4558af6 100644
--- a/src/utils/permission/camera.ts
+++ b/src/utils/permission/camera.ts
@@ -14,14 +14,14 @@ export const requestCameraPermission = async (onPressCancel?: () => void) => {
 
   switch (result) {
     case RESULTS.UNAVAILABLE:
-      console.log('Images: This feature is not available (on this device / in this context)');
+      // Images: This feature is not available (on this device / in this context)
       break;
     case RESULTS.DENIED:
       request(getCameraPermission()).then(() => onPressCancel && onPressCancel());
-      console.log('Images: The permission has not been requested / is denied but requestable');
+      // Images: The permission has not been requested / is denied but requestable
       break;
     case RESULTS.GRANTED:
-      console.log('Images: The permission is granted');
+      // Images: The permission is granted
       return result;
     case RESULTS.BLOCKED:
       Alert.alert(i18n.common.notify, i18n.common.cannotScanQRCodeWithoutPermission, [
diff --git a/src/utils/walletConnect/index.ts b/src/utils/walletConnect/index.ts
index 732cb8d86..ce0472f53 100644
--- a/src/utils/walletConnect/index.ts
+++ b/src/utils/walletConnect/index.ts
@@ -100,7 +100,6 @@ export const connectWalletConnect = (wcUrl: string, toast?: ToastType) => {
       runned[wcUrl] = true;
       addConnection({ uri: wcUrl }).catch(e => {
         const errMessage = (e as Error).message;
-        console.log('e----------', errMessage);
         const message = errMessage.includes('Pairing already exists')
           ? i18n.errorMessage.connectionAlreadyExist
           : i18n.errorMessage.failToAddConnection;