Merge branch 'develop' into add-epoch-history

.github/workflows/tests.yml

@@ -153,16 +153,11 @@ jobs:
 
       - name: Download firmware
         working-directory: ../trezor-user-env/src/binaries/firmware/bin/
-        run: |
-          sed '/^.*R_LATEST_BUILD.*$/d' download.sh | sed '/^.*trezor_r_master.*$/d' > temp_file.sh
-          rm download.sh
-          mv temp_file.sh download.sh
-          chmod +x download.sh
-          sudo ./download.sh
+        run: sudo ./download.sh
 
       - name: Download trezord-go
-        working-directory: ../trezor-user-env
-        run: sudo ./src/binaries/trezord-go/bin/download.sh
+        working-directory: ../trezor-user-env/src/binaries/trezord-go/bin/
+        run: sudo ./download.sh
 
       - name: Copy the v2-master firmware to the root of the project
         working-directory: ../trezor-user-env

packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js

@@ -353,6 +353,7 @@ export type CatalystRoundInfoRequest = {|
 
 export type CatalystRound = {|
   +id: number,
+  +name: string,
   +registrationStart: string,
   +registrationEnd: string,
   +votingStart: string,

packages/yoroi-extension/app/components/wallet/voting/Voting.js

@@ -17,7 +17,7 @@ import type { WalletType } from './types';
 const messages = defineMessages({
   lineTitle: {
     id: 'wallet.voting.lineTitle',
-    defaultMessage: '!!!Register to vote on Fund {round}',
+    defaultMessage: '!!!Register to vote on {fundName}',
   },
   line2: {
     id: 'wallet.voting.line2',
@@ -54,7 +54,7 @@ type Props = {|
   +onExternalLinkClick: MouseEvent => void,
   +hasAnyPending: boolean,
   +isDelegated: boolean,
-  +round: number,
+  +name: string,
   +walletType: WalletType,
 |};
 
@@ -100,7 +100,7 @@ export default class Voting extends Component<Props> {
   render(): Node {
     const { intl } = this.context;
 
-    const round = this.props.round;
+    const fundName = this.props.name;
 
     const pendingTxWarningComponent = this.props.hasAnyPending
       ? (
@@ -135,7 +135,7 @@ export default class Voting extends Component<Props> {
           </div>
 
           <div className={classnames([styles.lineTitle, styles.firstItem])}>
-            {intl.formatMessage(messages.lineTitle, { round })}
+            {intl.formatMessage(messages.lineTitle, { fundName })}
           </div>
 
           <div className={styles.lineText}>

packages/yoroi-extension/app/containers/wallet/voting/VotingPage.js

@@ -280,6 +280,7 @@ export default class VotingPage extends Component<Props> {
     out of the registration dates.
     */
     const round = catalystRoundInfo?.currentFund?.id || catalystRoundInfo?.nextFund?.id || 5
+    const fundName = catalystRoundInfo?.currentFund?.name || round.toString();
     return (
       //
       <div>
@@ -289,7 +290,7 @@ export default class VotingPage extends Component<Props> {
           hasAnyPending={this.generated.hasAnyPending}
           onExternalLinkClick={handleExternalLinkClick}
           isDelegated={this.isDelegated === true}
-          round={round}
+          name={fundName}
           walletType={walletType}
         />
       </div>

packages/yoroi-extension/app/i18n/locales/cs-CZ.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Copy to clipboard",
   "widgets.explorer.tooltip": "Go to {websiteName}",

packages/yoroi-extension/app/i18n/locales/de-DE.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Bevor du beginnst, schließe bitte die folgenden Schritte ab",
   "wallet.voting.line3": "Lade die Catalyst Abstimmungs-App herunter.",
   "wallet.voting.line4": "Öffne die Catalyst Voting App und klicke auf die Schaltfläche Registrierung abschließen.",
-  "wallet.voting.lineTitle": "Registrierung für die Fund { round } Abstimmung",
+  "wallet.voting.lineTitle": "Registrierung für die { fundName } Abstimmung",
   "wallet.withdrawal.transaction.unregister": "Diese Transaktion wird eine oder mehrere Staking Schlüssel zurückziehen, und Dir {refundAmount} {ticker} zurückgeben",
   "widgets.copyableaddress.addressCopyTooltipMessage": "In die Zwischenablage kopieren",
   "widgets.explorer.tooltip": "Gehe zu {websiteName}",

packages/yoroi-extension/app/i18n/locales/el-GR.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Αντιγραφή στο πρόχειρο",
   "widgets.explorer.tooltip": "Πηγαίνετε στο {websiteName}",

packages/yoroi-extension/app/i18n/locales/en-US.json

@@ -926,7 +926,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.voting.notDelegated": "You haven't delegated anything. Your voting power is determined by the amount you delegate and voting rewards are distributed to your delegation reward address. Please remember to delegate prior to voting.",
   "wallet.voting.trezorTRequirement": "<a target=\"_blank\" rel=\"noopener noreferrer\" href=\"https://wiki.trezor.io/User_manual:Updating_the_Trezor_device_firmware\">Update</a> your Trezor Model T firmware version to 2.4.1 or above.",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",

packages/yoroi-extension/app/i18n/locales/es-ES.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Antes de empezar, asegúrate de completar los siguientes pasos",
   "wallet.voting.line3": "Descarga la aplicación Catalyst Voting App.",
   "wallet.voting.line4": "Abre la Catalyst Voting App y haz clic en el botón Completar registro.",
-  "wallet.voting.lineTitle": "Registrarse para votar en el Fondo { round }",
+  "wallet.voting.lineTitle": "Registrarse para votar en el { fundName }",
   "wallet.withdrawal.transaction.unregister": "Esta transacción desregistrará una o más claves de delegación, devolviendo las {refundAmount} {ticker} de tu depósito",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Copiar al portapapeles",
   "widgets.explorer.tooltip": "Ir a {websiteName}",

packages/yoroi-extension/app/i18n/locales/fr-FR.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Avant de commencer, assurez-vous de suivre les étapes suivantes",
   "wallet.voting.line3": "Télécharger l'application Catalyst Voting.",
   "wallet.voting.line4": "Ouvrez l'application Catalyst Voting App et cliquez sur le bouton Compléter l'inscription.",
-  "wallet.voting.lineTitle": "S'enregistrer pour voter au Fund { round }",
+  "wallet.voting.lineTitle": "S'enregistrer pour voter au { fundName }",
   "wallet.withdrawal.transaction.unregister": "Cette opération va désinscrire une ou plusieurs clés de staking, ce qui vous permettra de récupérer votre dépôt de {refundAmount} {ticker}",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Copier dans le presse-papier",
   "widgets.explorer.tooltip": "Aller sur {websiteName}",

packages/yoroi-extension/app/i18n/locales/hr-HR.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Copy to clipboard",
   "widgets.explorer.tooltip": "Go to {websiteName}",

packages/yoroi-extension/app/i18n/locales/id-ID.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Menyalin ke clipboard",
   "widgets.explorer.tooltip": "Pergi ke {websiteName}",

packages/yoroi-extension/app/i18n/locales/it-IT.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Prima di iniziare, assicurati di completare i seguenti passi",
   "wallet.voting.line3": "Scarica la Catalyst Voting App.",
   "wallet.voting.line4": "Aprire la Catalyst Voting App e clicca sul pulsante Completa la registrazione.",
-  "wallet.voting.lineTitle": "Registrati per votare sul Fund { round }",
+  "wallet.voting.lineTitle": "Registrati per votare sul { fundName }",
   "wallet.withdrawal.transaction.unregister": "Questa transazione deregistrerà una o più chiavi di staking, restituendovi i vostri {refundAmount} {ticker} dal vostro deposito",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Copia negli appunti",
   "widgets.explorer.tooltip": "Vai a {websiteName}",

packages/yoroi-extension/app/i18n/locales/ja-JP.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "クリップボードにコピーする",
   "widgets.explorer.tooltip": "{websiteName}へ",

packages/yoroi-extension/app/i18n/locales/ko-KR.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "클립보드로 복사",
   "widgets.explorer.tooltip": "{websiteName} 로 가기",

packages/yoroi-extension/app/i18n/locales/nl-NL.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Zorg ervoor dat u de onderstaande stappen uitvoert voordat u begint",
   "wallet.voting.line3": "Download de Catalyst Stem-applicatie.",
   "wallet.voting.line4": "Open de Catalyst Stem-applicatie en klik op de knop \"Registratie voltooien\".",
-  "wallet.voting.lineTitle": "Registreer uzelf om op Fonds { round } te stemmen",
+  "wallet.voting.lineTitle": "Registreer uzelf om op { fundName } te stemmen",
   "wallet.withdrawal.transaction.unregister": "Met deze transactie wordt de registratie van een of meer stemsleutels ongedaan gemaakt, waardoor u uw {refundAmount} {ticker} van uw storting terugkrijgt",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Kopieer naar klembord",
   "widgets.explorer.tooltip": "Ga naar {websiteName}",

packages/yoroi-extension/app/i18n/locales/pt-BR.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "Essa transação irá revogar uma ou mais chave de participação, reembolsando suas {refundAmount}{ticker} pagas como depósito no registro de sua chave de participação",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Copiar para área de transferência",
   "widgets.explorer.tooltip": "Ir para {websiteName}",

packages/yoroi-extension/app/i18n/locales/ru-RU.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Скопировать в буфер обмена",
   "widgets.explorer.tooltip": "Перейти на {websiteName}",

packages/yoroi-extension/app/i18n/locales/sk-SK.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Copy to clipboard",
   "widgets.explorer.tooltip": "Go to {websiteName}",

packages/yoroi-extension/app/i18n/locales/tr-TR.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "Panoya kopyala",
   "widgets.explorer.tooltip": "{websiteName} Adresine Git",

packages/yoroi-extension/app/i18n/locales/zh-Hans.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "在您开始之前，请确保完成了下列步骤",
   "wallet.voting.line3": "下载Catalyst投票应用。",
   "wallet.voting.line4": "打开Catalyst投票应用，点击完成注册按钮。",
-  "wallet.voting.lineTitle": "注册并给资金{ round }投票",
+  "wallet.voting.lineTitle": "注册并给资金{ fundName }投票",
   "wallet.withdrawal.transaction.unregister": "此交易将取消注册一个或多个委托密钥，从而从您的存款中退还您的{refundAmount}{ticker}。",
   "widgets.copyableaddress.addressCopyTooltipMessage": "复制到剪贴板",
   "widgets.explorer.tooltip": "前往{websiteName}",

packages/yoroi-extension/app/i18n/locales/zh-Hant.json

@@ -776,7 +776,7 @@
   "wallet.voting.line2": "Before you begin, make sure to complete steps below",
   "wallet.voting.line3": "Download the Catalyst Voting App.",
   "wallet.voting.line4": "Open the Catalyst Voting App and click on the Complete registration button.",
-  "wallet.voting.lineTitle": "Register to vote on Fund { round }",
+  "wallet.voting.lineTitle": "Register to vote on { fundName }",
   "wallet.withdrawal.transaction.unregister": "This transaction will unregister one or more staking keys, giving you back your {refundAmount} {ticker} from your deposit",
   "widgets.copyableaddress.addressCopyTooltipMessage": "複製到剪貼板",
   "widgets.explorer.tooltip": "前往{websiteName}",