diff --git a/src/app/account/wallet/wallet.page.ts b/src/app/account/wallet/wallet.page.ts index 0c2dafb972f758469b5246cff5b47ad10dfd63cb..b25a600e748e7ff4431ae3f585536acd67b6455b 100644 --- a/src/app/account/wallet/wallet.page.ts +++ b/src/app/account/wallet/wallet.page.ts @@ -294,7 +294,7 @@ export class WalletPage extends AppPage<WalletState> implements OnInit { } distanceRuleValid(): boolean { - return this.refereePercent > this.networkService.currency.params.minAccessibleReferees / 1000000000; + return this.disableDistanceRule() || this.refereePercent > this.networkService.currency.params.minAccessibleReferees / 1000000000; } disableDistanceRule(): boolean { diff --git a/src/app/wot/wot-details.page.ts b/src/app/wot/wot-details.page.ts index 6c360f17fb750b7b70a6860e0dd070dc281a610a..cbd3229e1586bd492888850e905897ff40847541 100644 --- a/src/app/wot/wot-details.page.ts +++ b/src/app/wot/wot-details.page.ts @@ -209,7 +209,7 @@ export class WotDetailsPage extends AppPage<WotDetailsPageState> implements OnIn } distanceRuleValid(): boolean { - return this.refereePercent > this.networkService.currency.params.minAccessibleReferees / 1000000000; + return this.disableDistanceRule() || this.refereePercent > this.networkService.currency.params.minAccessibleReferees / 1000000000; } disableDistanceRule(): boolean { diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json index 46b201e10388c83de4b6f875a3a87cf0c7ca3553..776f43fff7700e976408628206b5888b2a7a5b4d 100644 --- a/src/assets/i18n/ca.json +++ b/src/assets/i18n/ca.json @@ -489,12 +489,17 @@ "AUTH": { "TITLE": "<i class=\"icon ion-locked\"></i> Autenticació", "BTN_AUTH": "Autenticar", - "PASSPHRASE": "Frase de pas", - "PASSPHRASE_HELP": "Si us plau, autentiqueu-vos, introduint la vostra frase de pas:", + "PASSPHRASE": "Codi secret", + "PASSPHRASE_HELP": "Si us plau, definiu el vostre codi secret:", "GENERAL_HELP": "Si us plau, autentiqueu-vos:", - "EXPECTED_UID_HELP": "Si us plau inicieu sessió al compte de <i class=\"ion-person\"></i> {{uid}}:", - "EXPECTED_PUBKEY_HELP": "Si us plau, autentiqueu-vos al moneder <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}} :", - "SCAN_FORM_HELP": "Escanegeu el codi QR de la <b>clau privada</b> del moneder." + "EXPECTED_UID_HELP": "Si us plau, autentiqueu-vos al compte <i class=\"ion-person\"></i> {{uid}}:", + "EXPECTED_PUBKEY_HELP": "Si us plau, autentiqueu-vos al moneder <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", + "SCAN_FORM_HELP": "Escanegeu el codi QR de la <b>clau privada</b> del moneder.", + "SELECT_DERIVATION": { + "TITLE": "Selecció de la derivació", + "AVAILABLE_WALLETS": "Moneders disponibles:", + "SCAN_DERIVATIONS": "Escaneig de derivacions..." + } }, "ACCOUNT": { "TITLE": "El meu compte", diff --git a/src/assets/i18n/en-GB.json b/src/assets/i18n/en-GB.json index fa6c23db4d434e71786dcc88b1bee04f1472d8b1..c7bd7855d44158077a1e0b04ec4adcd9914fc0e8 100644 --- a/src/assets/i18n/en-GB.json +++ b/src/assets/i18n/en-GB.json @@ -480,10 +480,17 @@ "AUTH": { "TITLE": "<i class=\"icon ion-locked\"></i> Authentication", "BTN_AUTH": "Authenticate", + "PASSPHRASE": "Secret code", + "PASSPHRASE_HELP": "Please define your secret code:", "GENERAL_HELP": "Please authenticate yourself:", - "EXPECTED_UID_HELP": "Please authenticate to the account <i class=\"ion-person\"></i> {{uid}}:", - "EXPECTED_PUBKEY_HELP": "Please authenticate to the wallet <i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", - "SCAN_FORM_HELP": "Scan the QR code of the <b>private key</b> of the wallet." + "EXPECTED_UID_HELP": "Please authenticate on account <i class=\"ion-person\"></i> {{uid}}:", + "EXPECTED_PUBKEY_HELP": "Please authenticate on wallet <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", + "SCAN_FORM_HELP": "Scan the QR code of the wallet's <b>private key</b>.", + "SELECT_DERIVATION": { + "TITLE": "Derivation Selection", + "AVAILABLE_WALLETS": "Available wallets:", + "SCAN_DERIVATIONS": "Scanning derivations..." + } }, "ACCOUNT": { "TITLE": "My Account", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index da1577f482b82930cb6bb6f2ff70f974977890b0..ee9e32e4cd7920914995e4bc85517879d2a7735b 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -493,13 +493,15 @@ "AUTH": { "TITLE": "<i class=\"icon ion-locked\"></i> Authentication", "BTN_AUTH": "Authenticate", + "PASSPHRASE": "Secret code", + "PASSPHRASE_HELP": "Please define your secret code:", "GENERAL_HELP": "Please authenticate yourself:", - "EXPECTED_UID_HELP": "Please authenticate to the account <i class=\"ion-person\"></i> {{uid}}:", - "EXPECTED_PUBKEY_HELP": "Please authenticate to the wallet <i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", - "SCAN_FORM_HELP": "Scan the QR code of the <b>private key</b> of the wallet.", + "EXPECTED_UID_HELP": "Please authenticate on account <i class=\"ion-person\"></i> {{uid}}:", + "EXPECTED_PUBKEY_HELP": "Please authenticate on wallet <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", + "SCAN_FORM_HELP": "Scan the QR code of the wallet's <b>private key</b>.", "SELECT_DERIVATION": { - "TITLE": "Select a derivation", - "AVAILABLE_WALLETS": "Available wallets", + "TITLE": "Derivation Selection", + "AVAILABLE_WALLETS": "Available wallets:", "SCAN_DERIVATIONS": "Scanning derivations..." } }, diff --git a/src/assets/i18n/eo-EO.json b/src/assets/i18n/eo-EO.json index 6c7118d4201e9e6b806046490ec40a7a6c96b906..3bbc0c5013744a5465614f2803a9749309228e90 100644 --- a/src/assets/i18n/eo-EO.json +++ b/src/assets/i18n/eo-EO.json @@ -477,12 +477,19 @@ } }, "AUTH": { - "TITLE": "<i class=\"icon ion-locked\"></i> AÅtentigado", - "BTN_AUTH": "AÅtentiÄi", - "GENERAL_HELP": "Bonvolu aÅtentiÄi:", - "EXPECTED_UID_HELP": "Bonvolu aÅtentiÄi ĉe la konto <i class=\"ion-person\"></i> {{uid}} :", - "EXPECTED_PUBKEY_HELP": "Bonvolu aÅtentiÄi ĉe la monujo <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}} :", - "SCAN_FORM_HELP": "Skani la QR-kodon de la <b>privata Ålosilo</b> de la monujo." + "TITLE": "<i class=\"icon ion-locked\"></i> AÅtentigo", + "BTN_AUTH": "AÅtentigi", + "PASSPHRASE": "Sekreta kodo", + "PASSPHRASE_HELP": "Bonvolu difini vian sekretan kodon:", + "GENERAL_HELP": "Bonvolu aÅtentigi vin:", + "EXPECTED_UID_HELP": "Bonvolu aÅtentigi vin al la konto <i class=\"ion-person\"></i> {{uid}}:", + "EXPECTED_PUBKEY_HELP": "Bonvolu aÅtentigi vin al la monujo <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", + "SCAN_FORM_HELP": "Skanu la QR-kodon de la <b>privata Ålosilo</b> de la monujo.", + "SELECT_DERIVATION": { + "TITLE": "Elekto de derivado", + "AVAILABLE_WALLETS": "Disponeblaj monujoj:", + "SCAN_DERIVATIONS": "Skanado de derivadoj..." + } }, "ACCOUNT": { "TITLE": "Mia konto", diff --git a/src/assets/i18n/es-ES.json b/src/assets/i18n/es-ES.json index 8a5909c1699698f2ffc9559551b89a1e58dc2fc9..a8f3d5296c15b157dab18ecc6ffd10555ace8b01 100644 --- a/src/assets/i18n/es-ES.json +++ b/src/assets/i18n/es-ES.json @@ -567,14 +567,16 @@ "AUTH": { "TITLE": "<i class=\"icon ion-locked\"></i> Autenticación", "BTN_AUTH": "Autenticar", - "GENERAL_HELP": "Por favor, autentÃquese:", - "EXPECTED_UID_HELP": "Por favor inicie sesión en la cuenta de <i class=\"ion-person\"></i> {{uid}}:", - "EXPECTED_PUBKEY_HELP": "Por favor, autentÃquese en el monedero <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}} :", - "SCAN_FORM_HELP": "Escanee el código QR de la <b>llave privada</b> del monedero.", + "PASSPHRASE": "Código secreto", + "PASSPHRASE_HELP": "Por favor, define tu código secreto:", + "GENERAL_HELP": "Por favor, autentÃcate:", + "EXPECTED_UID_HELP": "Por favor, autentÃcate en la cuenta <i class=\"ion-person\"></i> {{uid}}:", + "EXPECTED_PUBKEY_HELP": "Por favor, autentÃcate en la cartera <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", + "SCAN_FORM_HELP": "Escanea el código QR de la <b>clave privada</b> de la cartera.", "SELECT_DERIVATION": { - "TITLE": "Selección de la derivación", - "AVAILABLE_WALLETS": "Carteras disponibles", - "SCAN_DERIVATIONS": "Escaneo de las derivaciones..." + "TITLE": "Selección de derivación", + "AVAILABLE_WALLETS": "Carteras disponibles:", + "SCAN_DERIVATIONS": "Escaneando derivaciones..." } }, "ACCOUNT": { diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 31d511d4a08ed98d219ef3d4499bf08e407b136e..226f07be2bdace53efe72518484f9db062b150b3 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -504,7 +504,7 @@ "TITLE": "<i class=\"icon ion-locked\"></i> Authentification", "BTN_AUTH": "S'authentifier", "PASSPHRASE": "Code secret", - "PASSPHRASE_HELP": "Veuillez vous authentifier, en tapant votre code secret :", + "PASSPHRASE_HELP": "Veuillez définir votre code secret :", "GENERAL_HELP": "Veuillez vous authentifier :", "EXPECTED_UID_HELP": "Veuillez vous authentifier sur le compte <i class=\"ion-person\"></i> {{uid}} :", "EXPECTED_PUBKEY_HELP": "Veuillez vous authentifier sur le portefeuille <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}} :", diff --git a/src/assets/i18n/it-IT.json b/src/assets/i18n/it-IT.json index 651722526ca42216f2ce916fb684e7c472a876bf..128731f36777a8297d96c836e495d50c6f0720c7 100644 --- a/src/assets/i18n/it-IT.json +++ b/src/assets/i18n/it-IT.json @@ -460,10 +460,17 @@ "AUTH": { "TITLE": "<i class=\"icon ion-locked\"></i> Autenticazione", "BTN_AUTH": "Autenticarsi", - "GENERAL_HELP": "Autenticati :", - "EXPECTED_UID_HELP": "Effettua il login nel conto <i class=\"ion-person\"></i> {{uid}}:", - "EXPECTED_PUBKEY_HELP": "Si prega di autenticarsi nel portafoglio <i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", - "SCAN_FORM_HELP": "Scansiona il codice QR della <b>chiave pubblica</b> del portafoglio." + "PASSPHRASE": "Codice segreto", + "PASSPHRASE_HELP": "Per favore, definisci il tuo codice segreto:", + "GENERAL_HELP": "Per favore, autenticati:", + "EXPECTED_UID_HELP": "Per favore, autenticati sull'account <i class=\"ion-person\"></i> {{uid}}:", + "EXPECTED_PUBKEY_HELP": "Per favore, autenticati sul portafoglio <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", + "SCAN_FORM_HELP": "Scansiona il codice QR della <b>chiave privata</b> del portafoglio.", + "SELECT_DERIVATION": { + "TITLE": "Selezione della derivazione", + "AVAILABLE_WALLETS": "Portafogli disponibili:", + "SCAN_DERIVATIONS": "Scansione delle derivazioni..." + } }, "ACCOUNT": { "TITLE": "Il mio conto", diff --git a/src/assets/i18n/nl-NL.json b/src/assets/i18n/nl-NL.json index e125e6440d054cccfa9e13a9601bb39bcf93170e..b3a5605f91f0bd94cd7603add7b32a351e2775e7 100644 --- a/src/assets/i18n/nl-NL.json +++ b/src/assets/i18n/nl-NL.json @@ -349,6 +349,21 @@ "CREATE_ACCOUNT": "Open een rekening", "FORGOTTEN_ID": "Wachtwoord vergeten?" }, + "AUTH": { + "TITLE": "<i class=\"icon ion-locked\"></i> Authenticatie", + "BTN_AUTH": "Authenticeren", + "PASSPHRASE": "Geheime code", + "PASSPHRASE_HELP": "Definieer alstublieft uw geheime code:", + "GENERAL_HELP": "Authenticeer uzelf alstublieft:", + "EXPECTED_UID_HELP": "Authenticeer uzelf alstublieft op account <i class=\"ion-person\"></i> {{uid}}:", + "EXPECTED_PUBKEY_HELP": "Authenticeer uzelf alstublieft op portemonnee <br class=\"visible-xs\"/><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}:", + "SCAN_FORM_HELP": "Scan de QR-code van de <b>privésleutel</b> van de portemonnee.", + "SELECT_DERIVATION": { + "TITLE": "Selectie van derivatie", + "AVAILABLE_WALLETS": "Beschikbare portemonnees:", + "SCAN_DERIVATIONS": "Derivaties scannen..." + } + }, "ACCOUNT": { "TITLE": "Mijn rekening", "BALANCE": "Saldo",