From 4478b3d2d875f607310614c22326ea3d9d4e4845 Mon Sep 17 00:00:00 2001 From: Mauricio Perdomo Date: Mon, 9 Dec 2019 05:37:00 -0500 Subject: [PATCH] [models]Remove duplicated methods in walletManager --- src/models/walletsManager.go | 2 -- src/ui/SubPageSendAdvanced.qml | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/models/walletsManager.go b/src/models/walletsManager.go index b78609a1..030952bd 100644 --- a/src/models/walletsManager.go +++ b/src/models/walletsManager.go @@ -40,8 +40,6 @@ type WalletManager struct { _ func() `constructor:"init"` _ func(seed string, label string, walletType string, password string, scanN int) *QWallet `slot:"createEncryptedWallet"` _ func(seed string, label string, walletType string, scanN int) *QWallet `slot:"createUnencryptedWallet"` - _ func(seed string, label string, password string, scanN int) *QWallet `slot:"createEncryptedWallet"` - _ func(seed string, label string, scanN int) *QWallet `slot:"createUnencryptedWallet"` _ func(entropy int) string `slot:"getNewSeed"` _ func(seed string) int `slot:"verifySeed"` _ func(id string, n int, password string) `slot:"newWalletAddress"` diff --git a/src/ui/SubPageSendAdvanced.qml b/src/ui/SubPageSendAdvanced.qml index 453d339b..6a32674a 100644 --- a/src/ui/SubPageSendAdvanced.qml +++ b/src/ui/SubPageSendAdvanced.qml @@ -50,10 +50,7 @@ Page { upperAltCointBound = valCH*9/10 minFeeAmount = valCH/10 } -<<<<<<< HEAD -======= ->>>>>>> 361d7f76c5f2348ed6ab09bde7934bc05aade9e4 function getSelectedAddressesWithWallets(){ var indexs = comboBoxWalletsAddressesSendFrom.getCheckedDelegates() var addresses = [] @@ -94,7 +91,7 @@ Page { var indexs = comboBoxWalletsSendFrom.getCheckedDelegates() var enc = [] for (var i = 0; i < indexs.length; i++){ - walletEncrypted = [] + var walletEncrypted = [] walletEncrypted.push(comboBoxWalletsSendFrom.model.wallets[indexs[i]].fileName) walletEncrypted.push(comboBoxWalletsSendFrom.model.wallets[indexs[i]].name) walletEncrypted.push(comboBoxWalletsSendFrom.model.wallets[indexs[i]].encryptionEnabled)