diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index adc1ddb8bb9c697863cd5677b322a9bc8ea2e165..f4967fdb91e6cc8732519759e420311c110a6114 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -129,6 +129,8 @@
"ENABLE_UI_EFFECTS": "Enable visual effects",
"HISTORY_SETTINGS": "Account operations",
"DISPLAY_UD_HISTORY": "Display produced dividends?",
+ "TX_HISTORY_AUTO_REFRESH": "Enable automatic refresh?",
+ "TX_HISTORY_AUTO_REFRESH_HELP": "Updates the list of operations to each new block.",
"AUTHENTICATION_SETTINGS": "Authentication",
"KEEP_AUTH": "Expiration of authentication",
"KEEP_AUTH_HELP": "Define when authentication is cleared from memory",
@@ -520,6 +522,15 @@
"TITLE": "Identity selection",
"HELP": "Several <b>different identities</b> have been sent, for the public key <span class=\"gray\"> <i class=\"ion-key\"></i> {{pubkey | formatPubkey}}</span>.<br/>Please select the identity to use:"
},
+ "SELECT_WALLET_MODAL": {
+ "TITLE": "Wallet selection"
+ },
+ "WALLET_LIST": {
+ "TITLE": "secondary wallets",
+ "BTN_NEW": "Add a wallet",
+ "NO_WALLET": "No secondary wallet",
+ "BTN_DELETE": "Remove a secondary wallet..."
+ },
"SECURITY":{
"ADD_QUESTION" : "Add custom question",
"BTN_CLEAN" : "Clean",
@@ -595,6 +606,7 @@
"TRANSFER": {
"TITLE": "Transfer",
"SUB_TITLE": "Transfer money",
+ "SUB_TITLE_ALL": "Empty the account",
"FROM": "From",
"TO": "To",
"AMOUNT": "Amount",
@@ -705,7 +717,12 @@
"EXISTING_ACCOUNT_REQUEST": "Please modify your credentials so that they correspond to an unused account.",
"GET_LICENSE_FILE_FAILED": "Unable to get license file",
"CHECK_NETWORK_CONNECTION": "No peer appears to be accessible.<br/><br/>Please <b>check your Internet connection</b>.",
- "ISSUE_524_TX_FAILED": "Failed to transfer.<br/><br/>A message has been sent to developers to help solve the problem.<b>Thank you for your help</b>."
+ "ISSUE_524_TX_FAILED": "Failed to transfer.<br/><br/>A message has been sent to developers to help solve the problem.<b>Thank you for your help</b>.",
+ "ADD_SECONDARY_WALLET_FAILED": "Unable to add secondary wallet.",
+ "UPDATE_WALLET_LIST_FAILED": "Unable to refresh the list of wallets.",
+ "LOAD_WALLET_LIST_FAILED": "Unable to load the list of wallets.",
+ "COULD_NOT_ADD_MAIN_WALLET": "The wallet to add <b>must be different from the main account</b> with which you are connected.",
+ "UNKNOWN_WALLET_ID": "Unknown secondary wallet."
},
"INFO": {
"POPUP_TITLE": "Information",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 9f26d374dce30eab23b330d5709d7029a82c02dd..c7ce22c14f6658a622c9035095dcdbce179c5e0f 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -129,6 +129,8 @@
"ENABLE_UI_EFFECTS": "Enable visual effects",
"HISTORY_SETTINGS": "Account operations",
"DISPLAY_UD_HISTORY": "Display produced dividends?",
+ "TX_HISTORY_AUTO_REFRESH": "Enable automatic refresh?",
+ "TX_HISTORY_AUTO_REFRESH_HELP": "Updates the list of operations to each new block.",
"AUTHENTICATION_SETTINGS": "Authentication",
"KEEP_AUTH": "Expiration of authentication",
"KEEP_AUTH_HELP": "Define when authentication is cleared from memory",
@@ -520,6 +522,15 @@
"TITLE": "Identity selection",
"HELP": "Several <b>different identities</b> have been sent, for the public key <span class=\"gray\"> <i class=\"ion-key\"></i> {{pubkey | formatPubkey}}</span>.<br/>Please select the identity to use:"
},
+ "SELECT_WALLET_MODAL": {
+ "TITLE": "Wallet selection"
+ },
+ "WALLET_LIST": {
+ "TITLE": "secondary wallets",
+ "BTN_NEW": "Add a wallet",
+ "NO_WALLET": "No secondary wallet",
+ "BTN_DELETE": "Remove a secondary wallet..."
+ },
"SECURITY":{
"ADD_QUESTION" : "Add custom question",
"BTN_CLEAN" : "Clean",
@@ -595,6 +606,7 @@
"TRANSFER": {
"TITLE": "Transfer",
"SUB_TITLE": "Transfer money",
+ "SUB_TITLE_ALL": "Empty the account",
"FROM": "From",
"TO": "To",
"AMOUNT": "Amount",
@@ -705,7 +717,12 @@
"EXISTING_ACCOUNT_REQUEST": "Please modify your credentials so that they correspond to an unused account.",
"GET_LICENSE_FILE_FAILED": "Unable to get license file",
"CHECK_NETWORK_CONNECTION": "No peer appears to be accessible.<br/><br/>Please <b>check your Internet connection</b>.",
- "ISSUE_524_TX_FAILED": "Failed to transfer.<br/><br/>A message has been sent to developers to help solve the problem.<b>Thank you for your help</b>."
+ "ISSUE_524_TX_FAILED": "Failed to transfer.<br/><br/>A message has been sent to developers to help solve the problem.<b>Thank you for your help</b>.",
+ "ADD_SECONDARY_WALLET_FAILED": "Unable to add secondary wallet.",
+ "UPDATE_WALLET_LIST_FAILED": "Unable to refresh the list of wallets.",
+ "LOAD_WALLET_LIST_FAILED": "Unable to load the list of wallets.",
+ "COULD_NOT_ADD_MAIN_WALLET": "The wallet to add <b>must be different from the main account</b> with which you are connected.",
+ "UNKNOWN_WALLET_ID": "Unknown secondary wallet."
},
"INFO": {
"POPUP_TITLE": "Information",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 886b2b00c6d40eed0fc60fb35fd49e4156917de7..3138c37aa1d89b3e80a2c88f9a2b85b06d7e5088 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -523,13 +523,13 @@
"HELP": "Plusieurs <b>identités différentes</b> ont été envoyées, pour la clé publique <span class=\"gray\"><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}</span>.<br/>Veuillez sélectionner le dossier à utiliser :"
},
"SELECT_WALLET_MODAL": {
- "TITLE": "Sélection du compte"
+ "TITLE": "Sélection du portefeuille"
},
"WALLET_LIST": {
- "TITLE": "Comptes secondaires",
- "BTN_NEW": "Ajouter un compte",
- "NO_WALLET": "Aucun compte secondaire",
- "BTN_DELETE": "Retirer un compte secondaire..."
+ "TITLE": "Portefeuille secondaires",
+ "BTN_NEW": "Ajouter un portefeuille",
+ "NO_WALLET": "Aucun portefeuille secondaire",
+ "BTN_DELETE": "Retirer un portefeuille secondaire..."
},
"SECURITY": {
"ADD_QUESTION": "Ajouter une question personnalisée ",
@@ -718,9 +718,9 @@
"GET_LICENSE_FILE_FAILED": "Récupérer du fichier de licence impossible",
"CHECK_NETWORK_CONNECTION": "Aucun nœud ne semble accessible.<br/><br/>Veuillez <b>vérifier votre connection Internet</b>.",
"ISSUE_524_TX_FAILED": "Echec du virement.<br/><br/>Un message a été envoyé aux développeurs pour faciliter la résolution du problème. <b>Merci de votre aide</b>.",
- "ADD_SECONDARY_WALLET_FAILED": "Echec de l'ajout du portefeuille seconcdaire",
- "UPDATE_WALLET_LIST_FAILED": "Echec du rafraichissement des portefeuilles secondaires",
- "LOAD_WALLET_LIST_FAILED": "Echec du chargement des portefeuilles secondaires",
+ "ADD_SECONDARY_WALLET_FAILED": "Echec de l'ajout du portefeuille secondaire.",
+ "UPDATE_WALLET_LIST_FAILED": "Echec du rafraichissement des portefeuilles secondaires.",
+ "LOAD_WALLET_LIST_FAILED": "Echec du chargement des portefeuilles secondaires.",
"COULD_NOT_ADD_MAIN_WALLET": "Le portefeuille à ajouter <b>doit être différent du compte principal</b> avec lequel vous êtes connecté.",
"UNKNOWN_WALLET_ID": "Portefeuille secondaire inconnu."
},
diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js
index 694bce2934235d8dbec2dee82ac5984b1b8eca15..7540e133938eccd74a7985b148e5c5779f5d5004 100644
--- a/www/js/services/wallet-services.js
+++ b/www/js/services/wallet-services.js
@@ -1667,16 +1667,7 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
// Store (store children locally)
var finishFn = (!options || angular.isUndefined(options.store) || options.store) ? store : $q.when;
-
- // if already login
- if (wallet.isLogin()) {
- // Raise login event
- return api.data.raisePromise.login(wallet.data)
- .then(finishFn);
- }
- else {
- return finishFn();
- }
+ return finishFn();
},
removeChildWalletById = function(id) {