Fix issue where adding imported addresses has PositionInWalletArray s…

…et incorrectly
arcbit · Jun 26, 2017 · 4aa2cd9 · yasarsenturklaz · Dec 20, 2017 · 4aa2cd9
1 parent cb44169
commit 4aa2cd9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/js/model/TLImportedAddresses.js b/src/js/model/TLImportedAddresses.js
@@ -108,7 +108,7 @@ define(['angular', 'model/TLCoin', 'model/TLWalletJSONKeys', 'model/TLBitcoinJSW
             var importedPrivateKeyDict = this.appWallet.addImportedPrivateKey(privateKey, encryptedPrivateKey);
             var importedAddressObject = new TLImportedAddress(this.appDelegate, importedPrivateKeyDict);
             this.importedAddresses.push(importedAddressObject);
-            importedAddressObject.setPositionInWalletArray(this.importedAddresses.length - 1);
+            importedAddressObject.setPositionInWalletArray(this.importedAddresses.length + this.archivedImportedAddresses.length - 1);
             this.addressToPositionInWalletArrayDict[importedAddressObject.getPositionInWalletArray()] = importedAddressObject;
             var address = TLBitcoinJSWrapper.getAddress(privateKey, this.appWallet.isTestnet());
             var indexes = this.addressToIdxDict[address];
@@ -117,23 +117,23 @@ define(['angular', 'model/TLCoin', 'model/TLWalletJSONKeys', 'model/TLBitcoinJSW
                 this.addressToIdxDict[importedAddressObject.getAddress()] = indexes;
             }
             indexes.push(this.importedAddresses.length-1);
-            this.setLabel(importedAddressObject.getDefaultAddressLabel(), this.importedAddresses.length-1);
+            this.setLabel(importedAddressObject.getDefaultAddressLabel(), importedAddressObject.getPositionInWalletArray());
             return importedAddressObject;
         };
 
         TLImportedAddresses.prototype.addImportedWatchAddress = function(address) {
             var importedDict = this.appWallet.addWatchOnlyAddress(address);
             var importedAddressObject = new TLImportedAddress(this.appDelegate, importedDict);
             this.importedAddresses.push(importedAddressObject);
-            importedAddressObject.setPositionInWalletArray(this.importedAddresses.length - 1);
+            importedAddressObject.setPositionInWalletArray(this.importedAddresses.length + this.archivedImportedAddresses.length - 1);
             this.addressToPositionInWalletArrayDict[importedAddressObject.getPositionInWalletArray()] = importedAddressObject;
             var indexes = this.addressToIdxDict[address];
             if (indexes == null) {
                 indexes = [];
                 this.addressToIdxDict[address] = indexes;
             }
             indexes.push(this.importedAddresses.length-1);
-            this.setLabel(importedAddressObject.getDefaultAddressLabel(), this.importedAddresses.length-1);
+            this.setLabel(importedAddressObject.getDefaultAddressLabel(), importedAddressObject.getPositionInWalletArray());
             return importedAddressObject;
         };