Resolve errors due to rebasing

components/Accounts.tsx

@@ -29,7 +29,7 @@ const Accounts: React.FC<AccountsProps> = ({
     setIsAccountCreating(false);
     if (newAccount) {
       updateAccounts(newAccount);
-      updateId(newAccount.id);
+      updateId(newAccount.counterId);
     }
   };
 
@@ -47,10 +47,10 @@ const Accounts: React.FC<AccountsProps> = ({
   const renderAccountItems = () =>
     selectedAccounts.map(account => (
       <List.Item
-        key={account.id}
-        title={`Account ${account.id + 1}`}
+        key={account.counterId}
+        title={`Account ${account.counterId + 1}`}
         onPress={() => {
-          updateId(account.id);
+          updateId(account.counterId);
           setExpanded(false);
         }}
       />

components/HDPath.tsx

@@ -5,7 +5,7 @@ import { Button, Text, TextInput } from 'react-native-paper';
 import { NativeStackScreenProps } from '@react-navigation/native-stack';
 
 import { StackParamsList } from '../types';
-import { accountFromHDPath } from '../utils';
+import { addAccountFromHDPath } from '../utils';
 
 type HDPathProps = NativeStackScreenProps<StackParamsList, 'HDPath'>;
 
@@ -16,7 +16,7 @@ const HDPath: React.FC<HDPathProps> = ({}) => {
 
   const createFromHDPathHandler = async () => {
     setIsAccountCreating(true);
-    const newAccount = await accountFromHDPath(path);
+    const newAccount = await addAccountFromHDPath(path);
     setIsAccountCreating(false);
     setAccount(newAccount);
     Alert.alert('Account Created');

components/SignMessage.tsx

@@ -24,7 +24,7 @@ const SignMessage = ({ route }: SignProps) => {
       const signedMessage = await signMessage({
         message,
         network,
-        accountId: account.id,
+        accountId: account.counterId,
       });
       Alert.alert('Signature', signedMessage);
     }
@@ -35,7 +35,7 @@ const SignMessage = ({ route }: SignProps) => {
       <View style={styles.accountInfo}>
         <View>
           <Text variant="headlineSmall">
-            {account && `Account ${account.id + 1}`}
+            {account && `Account ${account.counterId + 1}`}
           </Text>
         </View>
         <View style={styles.accountContainer}>