Fixes after rebase

app/components/views/GetStartedPage/TrezorConfig/Page.js

@@ -1,7 +1,6 @@
 import { Tooltip } from "shared";
-import { FormattedMessage as T } from "react-intl";
 import { LoaderBarBottom } from "indicators";
-import { AboutModalButtonInvisible } from "buttons";
+import { AboutModalButton, GoBackMsg } from "../messages";
 
 export default ({
   onHideTrezorConfig,
@@ -16,10 +15,10 @@ export default ({
     <div className="getstarted loader">
       <div className="content-title">
         <div className="loader-settings-logs">
-          <AboutModalButtonInvisible version={appVersion} updateAvailable={updateAvailable} buttonLabel={<T id="help.about" m="About Decrediton" />}/>
+          <AboutModalButton version={appVersion} updateAvailable={updateAvailable} />
         </div>
         <div className="go-back-screen-button-area">
-          <Tooltip text={ <T id="logs.goBack" m="Go back" /> }><div className="go-back-screen-button" onClick={onHideTrezorConfig}/></Tooltip>
+          <Tooltip text={ <GoBackMsg /> }><div className="go-back-screen-button" onClick={onHideTrezorConfig}/></Tooltip>
         </div>
       </div>
 

app/i18n/translations/dev.json

@@ -141,6 +141,7 @@
   "createWallet.enterHexSeed.placeholder": "Digite em hex",
   "createWallet.enterSeed.placeholder": "Digite a semente...",
   "createWallet.goBack": "Voltar",
+  "createWallet.isTrezor.setupLink": "(setup device)",
   "createWallet.passhraseInput.label": "Criptografar carteira",
   "createWallet.passphraseInput.errors.noMatch": "*Senhas diferentes",
   "createWallet.passphraseInput.errors.noPassPhrase": "*Entre com a senha privada",
@@ -152,6 +153,7 @@
   "createWallet.verifyPassphrasePlaceholder": "Repetir senha",
   "createwallet.dupeWalletName.error": "Use um nome não usado",
   "createwallet.errors.walletRemoveFailed": "{originalError}",
+  "createwallet.isTrezor.label": "Trezor",
   "createwallet.walletOnly.label": "Observar apenas",
   "createwallet.walletWatchOnly.error": "Master Pubkey inválida",
   "createwallet.walletmasterpubkey.label": "Master Pub Keyyyyy",
@@ -266,7 +268,8 @@
   "getStarted.whatsNew": "Novidades {version}",
   "getStartedStake.apiKeyPlaceholder": "Tipicamente começa com ‘eyJhb…’",
   "governance.description": "Aspectos de governança of Decred.",
-  "governance.tab.proposals": "Propostas ",
+  "governance.tab.blockchain": "Blockchain",
+  "governance.tab.politeia": "Politeia",
   "governance.title": "Governança",
   "help.about": "Sobre Decrediton",
   "help.about.decrediton": "Sobre Decrediton",
@@ -380,7 +383,8 @@
   "noStats.description": "Sem estatísticas",
   "noTickets.description": "Sem tickets",
   "noTransactions.description": "Nenhuma transação",
-  "notification.transfer.amount": "Valor",
+  "notification.new": "New Transaction",
+  "notification.seeTransactionDetails": "See Transaction Details",
   "notification.transfer.fee": "Taxa",
   "notifications.type.receive": "Entrada",
   "notifications.type.revocation": "Revogação",
@@ -540,6 +544,8 @@
   "sendToAccount.amount": "Valor",
   "sendToAccount.amountPlaceholder": "Valor",
   "sendToAccount.to": "Para",
+  "settings.SPV": "SPV",
+  "settings.SPVConnect": "SPV Connect",
   "settings.advancedDaemon.false": "Disabilitado",
   "settings.advancedDaemon.label": "Startup avançado",
   "settings.advancedDaemon.true": "Habilitado",
@@ -552,8 +558,13 @@
   "settings.gapLimit.label": "Gapppp Limit",
   "settings.general.title": "Geral",
   "settings.locale": "Língua",
+  "settings.network": "Network",
+  "settings.network.mainnet": "Mainnet",
+  "settings.network.testnet": "Testnet",
   "settings.privacy.networkStatus.description": "Informações gerais (block height, etc) from decred.org",
   "settings.privacy.networkStatus.label": "Informações da rede",
+  "settings.privacy.politeia.description": "List and vote on proposals on proposals.decred.org",
+  "settings.privacy.politeia.label": "Politeia",
   "settings.privacy.stakepoolListing.description": "Listar stakepools disponíveis from decred.org",
   "settings.privacy.stakepoolListing.label": "Listagem de stakepool",
   "settings.privacy.title": "Privacidade",
@@ -563,8 +574,12 @@
   "settings.proxy.title": "Proxyyyy",
   "settings.proxy.type": "Tipo Proxy",
   "settings.proxy.type.none": "Nenhum Proxy",
+  "settings.resetNetworkContent": "The setting you have chosen to change requires Decrediton to be restarted.  Please confirm this action before proceeding.",
+  "settings.resetNetworkTitle": "Reset required",
   "settings.save": "Salvar configurações",
   "settings.security.title": "Segurança",
+  "settings.spv.false": "Disabled",
+  "settings.spv.true": "Enabled",
   "settings.timezone.local.description": "Usar timezone local",
   "settings.timezone.local.label": "Locallll",
   "settings.timezone.title": "Fuso Horário",
@@ -583,6 +598,7 @@
   "sidebar.link.settings": "Configurações",
   "sidebar.link.tickets": "Ticketssss",
   "sidebar.link.transactions": "Transações",
+  "sidebar.link.trezor": "Trezor Setup",
   "sidebar.rescanBtn.tip": "Iniciar Rescan\n\nNote que vai demorar",
   "sidebar.rescanCancelBtn.tip": "Cancelar rescan",
   "sidebar.totalBalance": "Balanço Total",
@@ -679,7 +695,6 @@
   "tickets.startAutoBuyerConfirmation.description": "Precisa continuar rodando.",
   "tickets.startAutoBuyerHeader": "Está rodando.",
   "tickets.stopAutoBuyerHeader": "Ticket buyer está parado.",
-  "tickets.tab.governance": "Governança",
   "tickets.tab.mytickets": "Meus tickets",
   "tickets.tab.purchase": "Comprar tickets",
   "tickets.tab.statistics": "Estatísticas",
@@ -715,6 +730,49 @@
   "transactions.tab.send": "Enviar",
   "transactions.title": "Transações",
   "transactions.txtypes.tooltip": "Tipo Tx",
+  "trezor.changeHomeScreen.success": "Trezor home screen successfully changed",
+  "trezor.changeLabel.changeButton": "Change",
+  "trezor.changeLabel.description": "New Label",
+  "trezor.changeLabel.header": "Change Label",
+  "trezor.changeLabel.success": "Changed label on selected trezor to '{label}'",
+  "trezor.configButtons.header": "Config Trezor",
+  "trezor.firmwareUpdate.header": "Firmware Update",
+  "trezor.getStartedConfig.noDeviceFound": "No trezor device found. Check the connection and the trezor bridge software.",
+  "trezor.getWalletCreationMasterPubKey.failed": "Failed to obtain master extended pubkey from trezor device: {originalError}",
+  "trezor.initDevice.success": "Trezor device initialized with new seed",
+  "trezor.noConnectedDevice": "No trezor device connected. Check the device connection and trezor bridge.",
+  "trezor.noDevice.message": "No trezor device detected. Connect the device and check if trezor bridge is installed and running.",
+  "trezor.passphraseModal.description": "Type the secret passphrase for the wallet stored in trezor {label}",
+  "trezor.passphraseModal.title": "Enter Trezor Passphrase",
+  "trezor.passphraseProtectionSuccess.disabled": "Passphrase protection has been disabled in trezor '{label}'",
+  "trezor.passphraseProtectionSuccess.enabled": "Passphrase protection has been enabled in trezor '{label}'",
+  "trezor.pinModal.clear": "clear",
+  "trezor.pinModal.description": "Click button sequence that corresponds to your pin on trezor {label}",
+  "trezor.pinModal.title": "Enter Pin",
+  "trezor.pinProtectionSuccess.disabled": "Pin protection has been disabled in trezor '{label}'",
+  "trezor.pinProtectionSuccess.enabled": "Pin protection has been enabled in trezor '{label}'",
+  "trezor.recoverDevice.success": "Trezor device recovered",
+  "trezor.recoveryButtons.header": "Device Recovery",
+  "trezor.updateFirmware.success": "Firmware updated on trezor device",
+  "trezor.walletCreationPassPhraseModal.title": "Type Wallet Creation PassPhrase",
+  "trezor.walletCreationPassphrasesMismatched": "Passphrases are different",
+  "trezor.walletCreationpassphraseModal.description": "Type the secret passphrase of the wallet to restore from the trezor device {label}",
+  "trezor.walltCreationPrivatePassphrase": "Wallet PassPhrase",
+  "trezor.walltCreationPrivatePassphraseConfirm": "Confirm Wallet PassPhrase",
+  "trezor.wipeDevice.success": "Trezor device wiped",
+  "trezor.wordModal.description": "Type the word requested in the trezor device.",
+  "trezor.wordModal.selectPlaceholder": "Start typing word...",
+  "trezor.wordModal.title": "Type the requested word",
+  "trezorPage.changeHomeScreen": "Change Home Screen",
+  "trezorPage.description": "Perform several trezor-related actions.",
+  "trezorPage.initDeviceBtn": "Init Device",
+  "trezorPage.recoverDeviceBtn": "Recover Device",
+  "trezorPage.title": "Trezor Setup",
+  "trezorPage.togglePassPhraseProtectionBtn": "Toggle Passphrase Protection",
+  "trezorPage.togglePinProtectionBtn": "Toggle Pin Protection",
+  "trezorPage.updateFirmwareBtn": "Update Firmware",
+  "trezorPage.updateFirmwarePah": "Path to firmware file",
+  "trezorPage.wipeDeviceBtn": "Wipe Device",
   "tutorial.finishBtn": "Encerrar",
   "tutorial.nextBtn": "Próximo",
   "tutorial.skipBtn": "Pular",

app/i18n/translations/whitelist_dev.json

@@ -17,6 +17,5 @@
   "tickets.errors.setStakePoolVoteChoicesFailed",
   "accounts.errors.renameAccountFailed",
   "accounts.errors.getNextAccountFailed",
-  "settings.errors.changePassphraseFailed",
   "decodeRawTx.errors.decodeFailed"
 ]

app/reducers/snackbar.js

@@ -390,12 +390,14 @@ export default function snackbar(state = {}, action) {
     type = "Success";
     message = messages[PUBLISHTX_SUCCESS];
     values = { hash: action.hash };
+    break;
 
   case TRZ_TOGGLEPINPROTECTION_SUCCESS:
     type = "Success";
 
     message = messages["TRZ_TOGGLEPINPROTECTION_SUCCESS_" + (action.clearProtection ? "DISABLED" : "ENABLED")];
     values = { label: action.deviceLabel };
+    break;
 
   case TRZ_TOGGLEPASSPHRASEPROTECTION_SUCCESS:
     type = "Success";