feat: Cross chain

.last-build

@@ -1 +1 @@
-e932aa06dae0e03488468a2b16e32aefc545a2b1
+fc88bd6e44892363c6733e5c38489c4335b0bb93

android/app/build.gradle

@@ -84,7 +84,7 @@ android {
     applicationId "com.haqq.wallet"
     minSdkVersion rootProject.ext.minSdkVersion
     targetSdkVersion rootProject.ext.targetSdkVersion
-    versionCode 735
+    versionCode 736
     versionName project.env.get("APP_VERSION")
     missingDimensionStrategy 'react-native-camera', 'general'
     manifestPlaceholders = [

assets/locales/en/en.json

@@ -3,7 +3,7 @@
   "StakingInfoUnDelegationDay": " ({{day}} day left)",
   "StakingInfoUnDelegationDays": " ({{days}} days left)",
   "Welcome_haqq_pin": "Welcome to HAQQ Wallet",
-  "_hash": "b526e233768a8f01d7dc6874a4b8ac439ec30995d3b710fe91f2138553a15a68",
+  "_hash": "eb5af911058fecdc73ac1f648770eb5d9b92850a2ee39766383ef63731466b25",
   "accept": "Accept",
   "accountInfoNftTabTitle": "NFTs",
   "accountInfoTokensTabTitle": "Tokens",
@@ -543,6 +543,7 @@
   "raffleRewardСongratulations": "Congratulations!",
   "raffleRewardСongratulations": "Сongratulations!",
   "raffleTicketRecieved": "You have successfully claimed your reward",
+  "rateInfo": "Rate {{token}} ≈ {{fiat}}",
   "recent": "Recent",
   "recoveryPinButton": "Recovery",
   "recoveryPinDescription": "If you encounter issues changing the PIN or get an \"Incorrect password\" error, you can restore wallet access by entering the PIN you intended to change to.",
@@ -889,6 +890,7 @@
   "tokensSortingByAvailable": "By Available",
   "tokensWidgetTitle": "Tokens",
   "tokensZeroBalance": " Zero Balance",
+  "totalAmountFrom": "Total Amount from",
   "totalAvailable": "Total: {{count}}",
   "totalValueAccount": "Total balance",
   "totalValueScreenTitle": "Transactions",
@@ -1086,6 +1088,7 @@
   "welcomeSocialWallet": "Social login",
   "welcomeTitle": "No account is connected",
   "yes": "Yes",
+  "youSentFrom": "You Sent from",
   "yourAddresses": "Your addresses",
   "yourAppVersion": "Your version: {{version}}"
 }

ios/haqq.xcodeproj/project.pbxproj

@@ -1295,7 +1295,7 @@
 				CODE_SIGN_ENTITLEMENTS = haqq/haqq.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 762;
+				CURRENT_PROJECT_VERSION = 763;
 				DEVELOPMENT_TEAM = XL66G6TJJL;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = haqq/Info.plist;
@@ -1333,7 +1333,7 @@
 				CODE_SIGN_ENTITLEMENTS = haqq/haqq.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 762;
+				CURRENT_PROJECT_VERSION = 763;
 				DEVELOPMENT_TEAM = XL66G6TJJL;
 				INFOPLIST_FILE = haqq/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Haqq Wallet";

ios/haqq/Images.xcassets/arrow_down_tail.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images": [
+    {
+      "idiom": "universal",
+      "filename": "arrow_down_tail.svg"
+    }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}

ios/haqq/Info.plist

@@ -61,7 +61,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>762</string>
+	<string>763</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/haqqTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>762</string>
+	<string>763</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "haqq",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -91,6 +91,7 @@
     "js-sha3": "0.8.0",
     "json-rpc-engine": "6.1.0",
     "json-stable-stringify": "1.0.2",
+    "lodash.debounce": "^4.0.8",
     "lottie-react-native": "7.0.0",
     "markdown-it": "13.0.1",
     "mobx": "6.12.0",
@@ -190,6 +191,7 @@
     "@types/bn.js": "5.1.1",
     "@types/create-hash": "1.2.2",
     "@types/jest": "29.5.5",
+    "@types/lodash.debounce": "^4.0.9",
     "@types/metro-config": "0.76.3",
     "@types/pbkdf2": "3.1.0",
     "@types/pump": "1.1.1",

src/components/account-info/account-info-header.tsx

@@ -8,6 +8,7 @@ import {
   First,
   Icon,
   IconButton,
+  IconsName,
   Inline,
   Spacer,
   Text,
@@ -113,7 +114,7 @@ export const AccountInfoHeader = ({
           disabled={wallet.type === WalletType.watchOnly}
           onPress={onSend}
           style={styles.iconButton}>
-          <Icon i24 name="arrow_send" color={Color.textBase1} />
+          <Icon i24 name={IconsName.arrow_send} color={Color.textBase1} />
           <Text variant={TextVariant.t14} i18n={I18N.walletCardSend} />
         </IconButton>
         <IconButton onPress={onReceive} style={styles.iconButton}>

src/components/address-highlight.tsx

@@ -0,0 +1,64 @@
+import {useCallback, useMemo} from 'react';
+
+import Clipboard from '@react-native-clipboard/clipboard';
+import {ViewStyle} from 'react-native';
+
+import {Color} from '@app/colors';
+import {createTheme} from '@app/helpers';
+import {I18N} from '@app/i18n';
+import {sendNotification} from '@app/services';
+import {splitAddress} from '@app/utils';
+
+import {DataContent, DataContentProps, Text, TextPosition} from './ui';
+
+type AddressHighlightProps = DataContentProps & {
+  address: string;
+  title: I18N;
+  centered?: boolean;
+};
+
+export const AddressHighlight = ({
+  address,
+  title,
+  centered,
+  ...dataContentProps
+}: AddressHighlightProps) => {
+  const splitted = useMemo(() => splitAddress(address), [address]);
+
+  const onPressAddress = useCallback(() => {
+    Clipboard.setString(address);
+    sendNotification(I18N.notificationCopied);
+  }, [address]);
+
+  const titlePosition: TextPosition = useMemo(
+    () => (centered ? TextPosition.center : TextPosition.left),
+    [centered],
+  );
+  const subTitlePosition = useMemo(
+    () => (centered ? {alignItems: 'center'} : {alignItems: 'flex-start'}),
+    [centered],
+  );
+
+  return (
+    <DataContent
+      {...dataContentProps}
+      title={
+        <Text position={titlePosition}>
+          <Text>{splitted[0]}</Text>
+          <Text color={Color.textBase2}>{splitted[1]}</Text>
+          <Text>{splitted[2]}</Text>
+        </Text>
+      }
+      numberOfLines={2}
+      subtitleI18n={title}
+      reversed
+      short
+      onPress={onPressAddress}
+      style={{...styles.container, ...subTitlePosition} as ViewStyle}
+    />
+  );
+};
+
+const styles = createTheme({
+  container: {flex: 0},
+});

src/components/address-row.tsx

@@ -6,7 +6,7 @@ import {Color} from '@app/colors';
 import {createTheme} from '@app/helpers';
 import {shortAddress} from '@app/helpers/short-address';
 
-import {Box, DataContent, Text} from './ui';
+import {Box, DataContent, Text, TextVariant} from './ui';
 
 import {Contact} from '../models/contact';
 
@@ -22,7 +22,7 @@ export const AddressRow = ({item, onPress}: AddressRowProps) => {
       }}>
       <View style={page.container}>
         <Box style={page.badge}>
-          <Text t13 color={Color.textBase2}>
+          <Text variant={TextVariant.t13} color={Color.textBase2}>
             {item.name.slice(0, 1)}
           </Text>
         </Box>

src/components/chip.tsx

@@ -0,0 +1,56 @@
+import {PropsWithChildren} from 'react';
+
+import {TouchableOpacity, View} from 'react-native';
+
+import {Color} from '@app/colors';
+import {createTheme} from '@app/helpers';
+
+import {Spacer, Text, TextVariant} from './ui';
+
+type ChipProps = {
+  title: string;
+  subtitle?: string;
+};
+
+export const Chip = ({
+  title,
+  subtitle,
+  children,
+}: PropsWithChildren<ChipProps>) => {
+  return (
+    <TouchableOpacity>
+      <View style={styles.container}>
+        <Text variant={TextVariant.t13} color={Color.textGreen1}>
+          {title}
+        </Text>
+        {subtitle && (
+          <>
+            <Spacer width={4} />
+            <Text variant={TextVariant.t13} color={Color.textGreen1}>
+              {subtitle}
+            </Text>
+          </>
+        )}
+        {children && (
+          <>
+            <Spacer width={4} />
+            {children}
+          </>
+        )}
+      </View>
+    </TouchableOpacity>
+  );
+};
+
+const styles = createTheme({
+  container: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    borderColor: Color.textGreen1,
+    borderWidth: 1,
+    borderRadius: 100,
+    paddingHorizontal: 16,
+    paddingVertical: 8,
+    backgroundColor: Color.bg1,
+  },
+});

src/components/index.ts

@@ -1 +1,5 @@
 export * from './popup-header';
+
+export * from './address-highlight';
+export * from './chip';
+export * from './token-icon';

src/components/json-rpc-sign/json-rpc-common-transaction.tsx

@@ -26,6 +26,7 @@ import {ProviderModel} from '@app/models/provider';
 import {Token} from '@app/models/tokens';
 import {Balance} from '@app/services/balance';
 import {
+  AddressWallet,
   ChainId,
   IToken,
   JsonRpcMetadata,
@@ -156,7 +157,7 @@ export const JsonRpcCommonTransaction = ({
   }, [provider, parsedInput, delegatorAddress]);
 
   useEffectAsync(async () => {
-    const contract = await Contract.getById(tx?.to!, chainId);
+    const contract = await Contract.getById(tx?.to! as AddressWallet, chainId);
     const t = contract ?? Token.UNKNOWN_TOKEN;
     setToken(t as unknown as IToken);
   }, [tx, chainId]);

src/components/json-rpc-sign/json-rpc-transaction-info.tsx

@@ -8,7 +8,10 @@ import {useEffectAsync} from '@app/hooks/use-effect-async';
 import {EstimationVariant, Fee} from '@app/models/fee';
 import {Provider} from '@app/models/provider';
 import {WalletModel} from '@app/models/wallet';
-import {JsonRpcSignPopupStackParamList} from '@app/route-types';
+import {
+  JsonRpcSignPopupStackParamList,
+  TransactionStackRoutes,
+} from '@app/route-types';
 import {EthNetwork} from '@app/services';
 import {Balance} from '@app/services/balance';
 import {
@@ -150,18 +153,21 @@ export const JsonRpcTransactionInfo = observer(
       }
 
       if (fee) {
-        const result = await awaitForFee({
-          fee,
-          from: tx.from! || wallet.address,
-          to: tx.to!,
-          value: new Balance(
-            tx.value! || '0x0',
-            provider?.decimals,
-            provider?.denom,
-          ),
-          data: tx.data,
-          chainId: provider?.ethChainId ? provider.ethChainId : undefined,
-        });
+        const result = await awaitForFee(
+          {
+            fee,
+            from: tx.from! || wallet.address,
+            to: tx.to!,
+            value: new Balance(
+              tx.value! || '0x0',
+              provider?.decimals,
+              provider?.denom,
+            ),
+            data: tx.data,
+            chainId: provider?.ethChainId ? provider.ethChainId : undefined,
+          },
+          TransactionStackRoutes.TransactionFeeSettings,
+        );
         setFee(result);
       }
     }, [navigation, tx, fee, provider, wallet]);

src/components/modals/copy-address-bottom-sheet.tsx

@@ -11,19 +11,13 @@ import {shortAddress} from '@app/helpers/short-address';
 import {I18N} from '@app/i18n';
 import {Provider} from '@app/models/provider';
 import {sendNotification} from '@app/services';
-import {
-  AddressCosmosHaqq,
-  AddressEthereum,
-  AddressTron,
-  ModalType,
-  Modals,
-} from '@app/types';
+import {AddressWallet, ModalType, Modals} from '@app/types';
 import {ETH_CHAIN_ID, MAINNET_ETH_CHAIN_ID} from '@app/variables/common';
 
 import {ImageWrapper} from '../image-wrapper';
 
 type AddressItem = {
-  address: AddressCosmosHaqq | AddressEthereum | AddressTron;
+  address: AddressWallet;
   icon: string;
   providerName: string;
 };