Merge branch 'develop' into dependabot/npm_and_yarn/develop/ledgerhq/hw-transport-webhid-6.30.0

Author: Comp0te

e2e-tests/constants.ts

@@ -99,6 +99,12 @@ export const NEW_VALIDATOR_FOR_SIGNATURE_REQUEST = {
 };
 
 export const VALIDATOR_FOR_STAKE = {
+  publicKey:
+    '0106ca7c39cd272dbf21a86eeb3b36b7c26e2e9b94af64292419f7862936bca2ca',
+  truncatedPublicKey: '0106...a2ca'
+};
+
+export const VALIDATOR_FOR_UNDELEGATE = {
   publicKey:
     '01f340df2c32f25391e8f7924a99e93cab3a6f230ff7af1cacbfc070772cbebd94',
   truncatedPublicKey: '01f3...bd94'

e2e-tests/popup/stakes/redelagation.spec.ts

@@ -2,7 +2,7 @@ import {
   NEW_VALIDATOR_FOR_STAKE,
   RPC_RESPONSE,
   URLS,
-  VALIDATOR_FOR_STAKE
+  VALIDATOR_FOR_UNDELEGATE
 } from '../../constants';
 import { popup, popupExpect } from '../../fixtures';
 
@@ -28,11 +28,11 @@ popup.describe('Popup UI: Redelegation', () => {
 
       await popupPage
         .getByPlaceholder('Validator public address', { exact: true })
-        .fill(VALIDATOR_FOR_STAKE.publicKey);
+        .fill(VALIDATOR_FOR_UNDELEGATE.publicKey);
 
       await new Promise(r => setTimeout(r, 2000));
       await popupPage
-        .getByText(VALIDATOR_FOR_STAKE.truncatedPublicKey, { exact: true })
+        .getByText(VALIDATOR_FOR_UNDELEGATE.truncatedPublicKey, { exact: true })
         .click();
 
       await popupPage.getByRole('button', { name: 'Next' }).click();
@@ -72,7 +72,7 @@ popup.describe('Popup UI: Redelegation', () => {
       ).toBeDisabled();
 
       await popupExpect(
-        popupPage.getByText(VALIDATOR_FOR_STAKE.publicKey)
+        popupPage.getByText(VALIDATOR_FOR_UNDELEGATE.publicKey)
       ).toBeVisible();
 
       await popupExpect(

e2e-tests/popup/stakes/undelegate.spec.ts

@@ -1,4 +1,4 @@
-import { RPC_RESPONSE, URLS, VALIDATOR_FOR_STAKE } from '../../constants';
+import { RPC_RESPONSE, URLS, VALIDATOR_FOR_UNDELEGATE } from '../../constants';
 import { popup, popupExpect } from '../../fixtures';
 
 popup.describe('Popup UI: Undelegation', () => {
@@ -22,7 +22,7 @@ popup.describe('Popup UI: Undelegation', () => {
       await new Promise(r => setTimeout(r, 2000));
 
       await popupPage
-        .getByText(VALIDATOR_FOR_STAKE.truncatedPublicKey, { exact: true })
+        .getByText(VALIDATOR_FOR_UNDELEGATE.truncatedPublicKey, { exact: true })
         .click();
 
       await popupPage.getByRole('button', { name: 'Next' }).click();
@@ -36,7 +36,7 @@ popup.describe('Popup UI: Undelegation', () => {
       await popupPage.getByRole('button', { name: 'Next' }).click();
 
       await popupExpect(
-        popupPage.getByText(VALIDATOR_FOR_STAKE.publicKey)
+        popupPage.getByText(VALIDATOR_FOR_UNDELEGATE.publicKey)
       ).toBeVisible();
 
       // Scroll to the bottom

src/apps/popup/pages/add-contact/index.tsx

@@ -7,7 +7,10 @@ import { SuccessScreen } from '@popup/pages/add-contact/success-screen';
 import { RouterPath, useTypedLocation, useTypedNavigate } from '@popup/router';
 
 import { newContactAdded } from '@background/redux/contacts/actions';
-import { selectAllContactsNames } from '@background/redux/contacts/selectors';
+import {
+  selectAllContactsNames,
+  selectAllContactsPublicKeys
+} from '@background/redux/contacts/selectors';
 import { dispatchToMainStore } from '@background/redux/utils';
 
 import {
@@ -28,12 +31,17 @@ export const AddContactPage = () => {
   const { state } = useTypedLocation();
 
   const contactsNames = useSelector(selectAllContactsNames);
+  const contactPublicKeys = useSelector(selectAllContactsPublicKeys);
 
   const {
     register,
     handleSubmit,
     formState: { errors, isValid }
-  } = useContactForm(contactsNames, state?.recipientPublicKey);
+  } = useContactForm(
+    contactsNames,
+    contactPublicKeys,
+    state?.recipientPublicKey
+  );
 
   const onSubmit = ({ name, publicKey }: ContactFromValues) => {
     const lastModified = new Date().toISOString();

src/apps/popup/pages/contact-details/index.tsx

@@ -17,7 +17,8 @@ import {
 } from '@background/redux/contacts/actions';
 import {
   selectAllContacts,
-  selectAllContactsNames
+  selectAllContactsNames,
+  selectAllContactsPublicKeys
 } from '@background/redux/contacts/selectors';
 import { contactEditingPermissionChanged } from '@background/redux/session/actions';
 import { selectIsContactEditingAllowed } from '@background/redux/session/selectors';
@@ -48,6 +49,7 @@ export const ContactDetailsPage = () => {
   const { casperLiveUrl } = useSelector(selectApiConfigBasedOnActiveNetwork);
   const isContactEditingAllowed = useSelector(selectIsContactEditingAllowed);
   const contactsNames = useSelector(selectAllContactsNames);
+  const contactPublicKeys = useSelector(selectAllContactsPublicKeys);
 
   const handlePasswordConfirmed = useCallback(() => {
     dispatchToMainStore(contactEditingPermissionChanged());
@@ -66,7 +68,12 @@ export const ContactDetailsPage = () => {
     handleSubmit,
     getValues,
     formState: { errors, isValid }
-  } = useContactForm(existingContactNames, contact?.publicKey!, contact?.name!);
+  } = useContactForm(
+    existingContactNames,
+    contactPublicKeys,
+    contact?.publicKey!,
+    contact?.name!
+  );
 
   const isButtonDisabled = useMemo(
     () => calculateSubmitButtonDisabled({ isValid }),

src/libs/ui/forms/contact.ts

@@ -14,6 +14,7 @@ export type ContactFromValues = {
 
 export const useContactForm = (
   existingContactNames: string[],
+  existingContactPublicKeys: string[],
   defaultPublicKey?: string,
   defaultName?: string
 ) => {
@@ -22,7 +23,11 @@ export const useContactForm = (
       value =>
         value?.trim() != null && !existingContactNames.includes(value?.trim())
     ),
-    publicKey: useContactPublicKeyRule()
+    publicKey: useContactPublicKeyRule(
+      value =>
+        value?.trim() != null &&
+        !existingContactPublicKeys.includes(value?.trim())
+    )
   });
 
   const newContactFormOptions: UseFormProps<ContactFromValues> = {

src/libs/ui/forms/form-validation-rules.ts

@@ -602,7 +602,11 @@ export const useContactNameRule = (
     );
 };
 
-export const useContactPublicKeyRule = () => {
+export const useContactPublicKeyRule = (
+  isPublicKeyAlreadyInContactsCallback: (
+    value: string | undefined
+  ) => Promise<boolean> | boolean
+) => {
   const { t } = useTranslation();
 
   return Yup.string()
@@ -611,7 +615,12 @@ export const useContactPublicKeyRule = () => {
       name: 'contactPublicKey',
       test: value => (value ? isValidPublicKey(value) : false),
       message: t('Public address should be a valid public key')
-    });
+    })
+    .test(
+      'unique',
+      t('You’ve already got a contact with this public key'),
+      value => isPublicKeyAlreadyInContactsCallback(value)
+    );
 };
 
 export const useTorusSecretKeyRule = () => {