create and edit address update

BirthdayResearch · Jul 27, 2023 · 00ff7e4 · 00ff7e4
1 parent 1ddb4a3
commit 00ff7e4
Show file tree

Hide file tree

Showing 8 changed files with 1,588 additions and 1,898 deletions.
diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/AddressRow.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/AddressRow.tsx
@@ -2,6 +2,10 @@ import { View } from "react-native";
 import { tailwind } from "@tailwind";
 import { translate } from "@translations";
 import { AddressType } from "@waveshq/walletkit-ui/dist/store";
+import {
+  AddressType as WalletAddressType,
+  getAddressType,
+} from "@waveshq/walletkit-core";
 import {
   ThemedIcon,
   ThemedTextV2,
@@ -94,9 +98,11 @@ export function AddressRow({
       address !== undefined &&
       jellyfishWalletAddress.includes(address)
     ) {
+      const type = getAddressType(address, networkName);
       // wallet address that does not have a label
       setMatchedAddress({
-        address,
+        address: type !== WalletAddressType.ETH ? address : "",
+        evmAddress: type === WalletAddressType.ETH ? address : "",
         label: "",
         isMine: true,
       });

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/BottomSheetAddressBook.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/components/BottomSheetAddressBook.tsx
diff --git a/...le-app/app/screens/AppNavigator/screens/Portfolio/components/BottomSheetAddressDetail.tsx b/...le-app/app/screens/AppNavigator/screens/Portfolio/components/BottomSheetAddressDetail.tsx
@@ -216,7 +216,6 @@ export const BottomSheetAddressDetail = (
                   name: props.navigateToScreen.screenName,
                   params: {
                     title: "Edit address label",
-                    isAddressBook: false,
                     address: item,
                     addressLabel:
                       labeledAddresses != null ? labeledAddresses[item] : "",

diff --git a/...-app/app/screens/AppNavigator/screens/Portfolio/components/BottomSheetAddressDetailV2.tsx b/...-app/app/screens/AppNavigator/screens/Portfolio/components/BottomSheetAddressDetailV2.tsx
@@ -287,7 +287,6 @@ export const BottomSheetAddressDetailV2 = (
                     name: props.navigateToScreen.screenName,
                     params: {
                       title: "Edit wallet label",
-                      isAddressBook: false,
                       address: item,
                       addressLabel:
                         labeledAddresses != null ? labeledAddresses[item] : "",