chore(bridge): hide keyboard when bottom sheet active & solve typescr…

…ipt issues

src/features/bridge/context/Bridge.Context.tsx

@@ -2,6 +2,7 @@ import { createContextSelector } from '@utils/createContextSelector';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   Config as BridgeConfigModel,
+  BridgeDataState,
   FeeData,
   Token
 } from '@lib/bridgeSDK/models/types';
@@ -45,7 +46,8 @@ export const BridgeContext = () => {
   const [destination, setDestination] = useState(DEFAULT_ETH_NETWORK);
   const networkNativeToken = Config.NETWORK_NATIVE_COIN[from.id];
 
-  const [selectedBridgeData, setSelectedBridgeData] = useState(null);
+  const [selectedBridgeData, setSelectedBridgeData] =
+    useState<BridgeDataState | null>(null);
   const [selectedTokenPairs, setSelectedTokenPairs] = useState<Token[] | null>(
     null
   );

src/features/bridge/templates/BridgeForm/BridgeForm.tsx

@@ -5,7 +5,7 @@ import React, {
   useRef,
   useState
 } from 'react';
-import { styles } from './styles';
+import { Keyboard, LayoutChangeEvent, View, ViewStyle } from 'react-native';
 import {
   KeyboardDismissingView,
   Spacer,
@@ -17,13 +17,14 @@ import Animated, {
   useSharedValue,
   withTiming
 } from 'react-native-reanimated';
+import { BigNumber, BigNumberish, ethers } from 'ethers';
 import { useTranslation } from 'react-i18next';
+import { styles } from './styles';
 import { BottomSheetRef } from '@components/composite';
 import { useBridgeContextData } from '@features/bridge/context';
 import { useKeyboardHeight } from '@hooks';
 import { DEVICE_HEIGHT } from '@constants/variables';
 import { PrimaryButton } from '@components/modular';
-import { View, ViewStyle } from 'react-native';
 import { scale, verticalScale } from '@utils/scaling';
 import { isAndroid } from '@utils/isPlatform';
 import { COLORS } from '@constants/colors';
@@ -34,15 +35,13 @@ import { parseUnits } from 'ethers/lib/utils';
 import { BottomSheetBridgePreview } from '@features/bridge/templates/BottomSheetBridgePreview/BottomSheetBridgePreview';
 import { getFeeData } from '@features/bridge/utils/getBridgeFee';
 import { FeeData } from '@lib/bridgeSDK/models/types';
-import { BigNumber, BigNumberish, ethers } from 'ethers';
 import { NumberUtils } from '@utils/number';
 import {
   DEFAULT_TRANSACTION,
   EMPTY_FEE_DATA
 } from '@features/bridge/constants';
 import { getAllBridgeTokenBalance } from '@lib';
 import { useWalletStore } from '@entities/wallet';
-import { LayoutChangeEvent } from 'react-native/Libraries/Types/CoreEventTypes';
 
 export const BridgeForm = () => {
   const { wallet: selectedWallet } = useWalletStore();
@@ -169,6 +168,7 @@ export const BridgeForm = () => {
   }, [setProcessingTransaction]);
 
   const goToPreview = useCallback(async () => {
+    Keyboard.dismiss();
     setDefaultOptions();
     const isMax =
       amountToBridge ===
@@ -240,7 +240,7 @@ export const BridgeForm = () => {
         setSelectedBridgeData({
           // @ts-ignore
           ...selectedBridgeData,
-          pairs
+          ...pairs
         });
       });
     }
@@ -352,7 +352,7 @@ export const BridgeForm = () => {
       <Animated.View style={[margin]}>
         <PrimaryButton onPress={goToPreview} disabled={disabledButton}>
           {templateDataLoader ? (
-            <Spinner customSize={15} />
+            <Spinner />
           ) : (
             <Text color={disabledButton ? COLORS.brand300 : COLORS.neutral0}>
               {error ? t('bridge.insufficient.funds') : t('common.review')}

src/lib/bridgeSDK/models/types.ts

@@ -2,6 +2,14 @@ import { BigNumber, BigNumberish, ethers } from 'ethers';
 import { AccountDBModel } from '@database';
 import { CryptoCurrencyCode } from '@appTypes';
 
+export type BridgeDataState = {
+  from: string;
+  destination: string;
+  bridgeConfig: unknown;
+  ownerAddress?: string;
+  pairs: Token[][];
+};
+
 export type BridgeNetwork = 'eth' | 'bsc';
 export type Network = BridgeNetwork | 'amb';
 export type RelayUrls = { [net in BridgeNetwork]: string };