Merge pull request #51 from pshalagin/master

enabled multiple entry of the same account if the account is a co-signer

package.json

@@ -1,7 +1,7 @@
 {
   "name": "org.montelibero.solar",
   "displayName": "MTL Solar",
-  "version": "1.0.0-beta",
+  "version": "1.0.0-beta.2",
   "description": "Wallet for the Stellar payment network by Montelibero.",
   "license": "MIT",
   "private": true,

src/AccountCreation/hooks/useAccountCreation.ts

@@ -6,9 +6,21 @@ import { Account, AccountsContext } from "~App/contexts/accounts"
 import { CustomError } from "~Generic/lib/errors"
 import { AccountCreation, AccountCreationErrors } from "../types/types"
 
-function isAccountAlreadyImported(privateKey: string, accounts: Account[], testnet: boolean) {
-  const publicKey = Keypair.fromSecret(privateKey).publicKey()
-  return accounts.some(account => account.publicKey === publicKey && account.testnet === testnet)
+function isAccountAlreadyImported(creatingAccount: AccountCreation, accounts: Account[], testnet: boolean) {
+  const publicKey = Keypair.fromSecret(creatingAccount.secretKey!).publicKey()
+  const simpleDuplicate =
+    !creatingAccount.cosigner &&
+    accounts.some(account => account.publicKey === publicKey && account.testnet === testnet && !account.cosignerOf)
+  const cosignerDuplicate =
+    creatingAccount.cosigner &&
+    accounts.some(
+      account =>
+        account.publicKey === publicKey &&
+        account.testnet === testnet &&
+        account.cosignerOf === creatingAccount.cosignerOf
+    )
+  const cosigningMyself = creatingAccount.cosigner && publicKey === creatingAccount.cosignerOf
+  return simpleDuplicate || cosigningMyself || cosignerDuplicate
 }
 
 function isValidSecretKey(privateKey: string) {
@@ -49,10 +61,7 @@ function validateAccountCreation(t: TFunction, accounts: Account[], accountCreat
 
   if (accountCreation.import && !isValidSecretKey(accountCreation.secretKey!)) {
     errors.secretKey = t("create-account.validation.invalid-key")
-  } else if (
-    accountCreation.import &&
-    isAccountAlreadyImported(accountCreation.secretKey!, accounts, accountCreation.testnet)
-  ) {
+  } else if (accountCreation.import && isAccountAlreadyImported(accountCreation, accounts, accountCreation.testnet)) {
     errors.secretKey = t("create-account.validation.same-account")
   }