Merge pull request #102 from blockscout:fix-api-update

update models for public tags

types/api/account.ts

@@ -80,13 +80,11 @@ export interface PublicTag {
   full_name: string;
   email: string;
   company: string;
-  addresses: string; // address_1;<address_2;address_3 etc.
+  addresses: Array<string>;
   additional_comment: string;
 }
 
-export type PublicTagNew = Omit<PublicTag, 'addresses' | 'id'> & {
-  addresses_array: Array<string>;
-}
+export type PublicTagNew = Omit<PublicTag, 'id'>
 
 export type PublicTags = Array<PublicTag>;
 

ui/publicTags/PublicTagTable/PublicTagTableItem.tsx

@@ -36,7 +36,7 @@ const PublicTagTableItem = ({ item, onEditClick, onDeleteClick }: Props) => {
     <Tr alignItems="top" key={ item.id }>
       <Td>
         <VStack spacing={ 4 } alignItems="unset">
-          { item.addresses.split(';').map((address) => {
+          { item.addresses.map((address) => {
             return (
               <HStack spacing={ 4 } key={ address } overflow="hidden" alignItems="start">
                 <AddressIcon address={ address }/>

ui/publicTags/PublicTagsForm/PublicTagsForm.tsx

@@ -60,7 +60,7 @@ const PublicTagsForm = ({ changeToDataScreen, data }: Props) => {
       companyName: data?.company || '',
       companyUrl: data?.website || '',
       tags: data?.tags.split(';').map((tag) => tag).join('; ') || '',
-      addresses: data?.addresses.split(';').map((address, index: number) => ({ name: `address.${ index }.address`, address })) ||
+      addresses: data?.addresses.map((address, index: number) => ({ name: `address.${ index }.address`, address })) ||
         [ { name: 'address.0.address', address: '' } ],
       comment: data?.additional_comment || '',
       action: data?.is_owner === undefined || data?.is_owner ? 'add' : 'report',
@@ -84,7 +84,7 @@ const PublicTagsForm = ({ changeToDataScreen, data }: Props) => {
       company: formData.companyName || '',
       website: formData.companyUrl || '',
       is_owner: formData.action === 'add',
-      addresses_array: formData.addresses?.map(({ address }) => address) || [],
+      addresses: formData.addresses?.map(({ address }) => address) || [],
       tags: formData.tags?.split(';').map((s) => s.trim()).join(';') || '',
       additional_comment: formData.comment || '',
     };