From bc5f1d7412cca437d391e134825cfddc5f4d6356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20Akkurt?= <oezgurmakkurt@gmail.com>
Date: Mon, 25 Jul 2022 16:11:36 +0300
Subject: [PATCH 1/6] remove mutex on connector handler

---
 .../chrome/extension/background.js            | 61 +++++++++----------
 packages/yoroi-extension/package-lock.json    | 15 -----
 packages/yoroi-extension/package.json         |  1 -
 3 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/packages/yoroi-extension/chrome/extension/background.js b/packages/yoroi-extension/chrome/extension/background.js
index a6b354be0b..82f20df22b 100644
--- a/packages/yoroi-extension/chrome/extension/background.js
+++ b/packages/yoroi-extension/chrome/extension/background.js
@@ -77,7 +77,6 @@ import type { lf$Database, } from 'lovefield';
 import { schema } from 'lovefield';
 import { copyDbToMemory, loadLovefieldDB, } from '../../app/api/ada/lib/storage/database/index';
 import { migrateNoRefresh } from '../../app/api/common/migration';
-import { Mutex, } from 'async-mutex';
 import {
   getCardanoHaskellBaseConfig,
   isCardanoHaskell
@@ -214,39 +213,37 @@ const dbAccessMutex = new Mutex();
 async function withDb<T>(
   continuation: (lf$Database, LocalStorageApi) => Promise<T>
 ): Promise<T> {
-  return await dbAccessMutex.runExclusive(async () => {
-    // note: lovefield internally caches queries an optimization
-    // this doesn't work for us because the DB can change under our feet through the Yoroi Extension
-    // so instead, we create the DB, use it, then close the connection
-    const db = await loadLovefieldDB(schema.DataStoreType.INDEXED_DB);
-    let inMemoryDb: void | lf$Database = undefined;
-    try {
-      // process migration here before anything involving storage is cached
-      // as dApp can't easily recover from refreshing a page to wipe cache after storage migration
-      const localStorageApi = new LocalStorageApi();
-      // note: it's safe that this call modifies the DB that is shared with the main extension
-      // since if a migration actually needs to be processed,
-      // it means the extension hasn't been launched since the Yoroi version updated
-      // which means it's not running at the same time as the connector
-      await migrateNoRefresh({
-        localStorageApi,
-        persistentDb: db,
-        currVersion: environment.getVersion(),
-      })
+  // note: lovefield internally caches queries an optimization
+  // this doesn't work for us because the DB can change under our feet through the Yoroi Extension
+  // so instead, we create the DB, use it, then close the connection
+  const db = await loadLovefieldDB(schema.DataStoreType.INDEXED_DB);
+  let inMemoryDb: void | lf$Database = undefined;
+  try {
+    // process migration here before anything involving storage is cached
+    // as dApp can't easily recover from refreshing a page to wipe cache after storage migration
+    const localStorageApi = new LocalStorageApi();
+    // note: it's safe that this call modifies the DB that is shared with the main extension
+    // since if a migration actually needs to be processed,
+    // it means the extension hasn't been launched since the Yoroi version updated
+    // which means it's not running at the same time as the connector
+    await migrateNoRefresh({
+      localStorageApi,
+      persistentDb: db,
+      currVersion: environment.getVersion(),
+    })
 
-      // note: we can't close the persistent DB connection here after copying it
-      // since lovefield closes some shared workers causing the in-memory connection to fail as well
-      inMemoryDb = await copyDbToMemory(db);
+    // note: we can't close the persistent DB connection here after copying it
+    // since lovefield closes some shared workers causing the in-memory connection to fail as well
+    inMemoryDb = await copyDbToMemory(db);
 
-      return await continuation(inMemoryDb, localStorageApi);
-    } catch (e) {
-      Logger.error(`DB continuation call failed due to internal error: ${e}\n${e.stack}`);
-      throw e;
-    } finally {
-      inMemoryDb?.close();
-      db.close();
-    }
-  });
+    return await continuation(inMemoryDb, localStorageApi);
+  } catch (e) {
+    Logger.error(`DB continuation call failed due to internal error: ${e}\n${e.stack}`);
+    throw e;
+  } finally {
+    inMemoryDb?.close();
+    db.close();
+  }
 }
 
 async function createFetcher(
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 1302955388..8b20ce7b40 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -8899,21 +8899,6 @@
       "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
       "dev": true
     },
-    "async-mutex": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.2.tgz",
-      "integrity": "sha512-HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==",
-      "requires": {
-        "tslib": "^2.3.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-        }
-      }
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index c78c16126d..469cb569dd 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -185,7 +185,6 @@
     "@mui/lab": "^5.0.0-alpha.51",
     "@mui/material": "^5.0.4",
     "@svgr/webpack": "5.5.0",
-    "async-mutex": "^0.3.1",
     "axios": "0.21.1",
     "bech32": "2.0.0",
     "bignumber.js": "9.0.1",

From 9b3706e7830923b2c08d5025851383b115ab5c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20Akkurt?= <oezgurmakkurt@gmail.com>
Date: Mon, 25 Jul 2022 16:44:32 +0300
Subject: [PATCH 2/6] remove Mutex usage

---
 packages/yoroi-extension/chrome/extension/background.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/yoroi-extension/chrome/extension/background.js b/packages/yoroi-extension/chrome/extension/background.js
index 82f20df22b..ce20bd9cb2 100644
--- a/packages/yoroi-extension/chrome/extension/background.js
+++ b/packages/yoroi-extension/chrome/extension/background.js
@@ -196,13 +196,6 @@ const ports: Map<TabId, any> = new Map();
 
 let pendingTxs: PendingTransaction[] = [];
 
-/**
-* need to make sure JS tasks run in an order where no two of them have different DB instances
-* Otherwise, caching logic may make things go wrong
-* TODO: this doesn't help if the Yoroi Extension or a Web Worker makes a query during this execution
-*/
-const dbAccessMutex = new Mutex();
-
 /**
  * Performs wallet version migration if needed
  * Then calls the continuation with storage objects

From bbe680a7951d4ce8ee73dbee8897a5a577db7e68 Mon Sep 17 00:00:00 2001
From: Pedro <pedromtcosta@users.noreply.github.com>
Date: Wed, 3 Aug 2022 12:32:22 -0300
Subject: [PATCH 3/6] fix fund message

---
 .../yoroi-extension/app/api/ada/lib/state-fetch/types.js  | 1 +
 .../app/components/wallet/voting/Voting.js                | 8 ++++----
 .../app/containers/wallet/voting/VotingPage.js            | 3 ++-
 packages/yoroi-extension/app/i18n/locales/cs-CZ.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/de-DE.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/el-GR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/en-US.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/es-ES.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/fr-FR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/hr-HR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/id-ID.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/it-IT.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/ja-JP.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/ko-KR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/nl-NL.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/pt-BR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/ru-RU.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/sk-SK.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/tr-TR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/zh-Hans.json    | 2 +-
 packages/yoroi-extension/app/i18n/locales/zh-Hant.json    | 2 +-
 21 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js b/packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js
index 14655040fc..21655aadf7 100644
--- a/packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js
+++ b/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,
diff --git a/packages/yoroi-extension/app/components/wallet/voting/Voting.js b/packages/yoroi-extension/app/components/wallet/voting/Voting.js
index c88e57a22d..44b22d2d1e 100644
--- a/packages/yoroi-extension/app/components/wallet/voting/Voting.js
+++ b/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}>
diff --git a/packages/yoroi-extension/app/containers/wallet/voting/VotingPage.js b/packages/yoroi-extension/app/containers/wallet/voting/VotingPage.js
index 2da42be0e9..c1128236b1 100644
--- a/packages/yoroi-extension/app/containers/wallet/voting/VotingPage.js
+++ b/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>
diff --git a/packages/yoroi-extension/app/i18n/locales/cs-CZ.json b/packages/yoroi-extension/app/i18n/locales/cs-CZ.json
index 53e90d7f83..057298ffe5 100644
--- a/packages/yoroi-extension/app/i18n/locales/cs-CZ.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/de-DE.json b/packages/yoroi-extension/app/i18n/locales/de-DE.json
index 6672fe795e..009bc2d244 100644
--- a/packages/yoroi-extension/app/i18n/locales/de-DE.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/el-GR.json b/packages/yoroi-extension/app/i18n/locales/el-GR.json
index 9d84623e26..ee57fa9108 100644
--- a/packages/yoroi-extension/app/i18n/locales/el-GR.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 56c0be9dee..1302ea9b76 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/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",
diff --git a/packages/yoroi-extension/app/i18n/locales/es-ES.json b/packages/yoroi-extension/app/i18n/locales/es-ES.json
index fd516ea326..220b391d1a 100644
--- a/packages/yoroi-extension/app/i18n/locales/es-ES.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/fr-FR.json b/packages/yoroi-extension/app/i18n/locales/fr-FR.json
index 1e22d32775..c076525099 100644
--- a/packages/yoroi-extension/app/i18n/locales/fr-FR.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/hr-HR.json b/packages/yoroi-extension/app/i18n/locales/hr-HR.json
index 088b4a2f9b..010e48fa84 100644
--- a/packages/yoroi-extension/app/i18n/locales/hr-HR.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/id-ID.json b/packages/yoroi-extension/app/i18n/locales/id-ID.json
index b900f04c66..d2e53cfd13 100644
--- a/packages/yoroi-extension/app/i18n/locales/id-ID.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/it-IT.json b/packages/yoroi-extension/app/i18n/locales/it-IT.json
index 44f63b15ec..5d3ff93c07 100644
--- a/packages/yoroi-extension/app/i18n/locales/it-IT.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/ja-JP.json b/packages/yoroi-extension/app/i18n/locales/ja-JP.json
index f1bf903f1c..97de7c3656 100644
--- a/packages/yoroi-extension/app/i18n/locales/ja-JP.json
+++ b/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}へ",
diff --git a/packages/yoroi-extension/app/i18n/locales/ko-KR.json b/packages/yoroi-extension/app/i18n/locales/ko-KR.json
index 69608f4e6d..a6f4fb82b8 100644
--- a/packages/yoroi-extension/app/i18n/locales/ko-KR.json
+++ b/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} 로 가기",
diff --git a/packages/yoroi-extension/app/i18n/locales/nl-NL.json b/packages/yoroi-extension/app/i18n/locales/nl-NL.json
index 1a506e55bb..0b1a8f80cb 100644
--- a/packages/yoroi-extension/app/i18n/locales/nl-NL.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/pt-BR.json b/packages/yoroi-extension/app/i18n/locales/pt-BR.json
index 5b50369079..26b9388898 100644
--- a/packages/yoroi-extension/app/i18n/locales/pt-BR.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/ru-RU.json b/packages/yoroi-extension/app/i18n/locales/ru-RU.json
index cca36055fb..c9900d60d9 100644
--- a/packages/yoroi-extension/app/i18n/locales/ru-RU.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/sk-SK.json b/packages/yoroi-extension/app/i18n/locales/sk-SK.json
index e8b7190294..b3d54cc43c 100644
--- a/packages/yoroi-extension/app/i18n/locales/sk-SK.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/tr-TR.json b/packages/yoroi-extension/app/i18n/locales/tr-TR.json
index 1c6eed49ff..65caeb6c2b 100644
--- a/packages/yoroi-extension/app/i18n/locales/tr-TR.json
+++ b/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",
diff --git a/packages/yoroi-extension/app/i18n/locales/zh-Hans.json b/packages/yoroi-extension/app/i18n/locales/zh-Hans.json
index 7fac048c45..2006e6cb55 100644
--- a/packages/yoroi-extension/app/i18n/locales/zh-Hans.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/zh-Hant.json b/packages/yoroi-extension/app/i18n/locales/zh-Hant.json
index 9892d39224..92ecc3cc5c 100644
--- a/packages/yoroi-extension/app/i18n/locales/zh-Hant.json
+++ b/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}",

From ca314fd96d5d998942c7ab58f3842dce7f63f65f Mon Sep 17 00:00:00 2001
From: Pedro <pedromtcosta@users.noreply.github.com>
Date: Wed, 3 Aug 2022 12:32:22 -0300
Subject: [PATCH 4/6] fix fund message

---
 .../yoroi-extension/app/api/ada/lib/state-fetch/types.js  | 1 +
 .../app/components/wallet/voting/Voting.js                | 8 ++++----
 .../app/containers/wallet/voting/VotingPage.js            | 3 ++-
 packages/yoroi-extension/app/i18n/locales/cs-CZ.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/de-DE.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/el-GR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/en-US.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/es-ES.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/fr-FR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/hr-HR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/id-ID.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/it-IT.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/ja-JP.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/ko-KR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/nl-NL.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/pt-BR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/ru-RU.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/sk-SK.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/tr-TR.json      | 2 +-
 packages/yoroi-extension/app/i18n/locales/zh-Hans.json    | 2 +-
 packages/yoroi-extension/app/i18n/locales/zh-Hant.json    | 2 +-
 21 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js b/packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js
index 49910833c8..ea8b28ad9d 100644
--- a/packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js
+++ b/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,
diff --git a/packages/yoroi-extension/app/components/wallet/voting/Voting.js b/packages/yoroi-extension/app/components/wallet/voting/Voting.js
index c88e57a22d..44b22d2d1e 100644
--- a/packages/yoroi-extension/app/components/wallet/voting/Voting.js
+++ b/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}>
diff --git a/packages/yoroi-extension/app/containers/wallet/voting/VotingPage.js b/packages/yoroi-extension/app/containers/wallet/voting/VotingPage.js
index 2da42be0e9..c1128236b1 100644
--- a/packages/yoroi-extension/app/containers/wallet/voting/VotingPage.js
+++ b/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>
diff --git a/packages/yoroi-extension/app/i18n/locales/cs-CZ.json b/packages/yoroi-extension/app/i18n/locales/cs-CZ.json
index 53e90d7f83..057298ffe5 100644
--- a/packages/yoroi-extension/app/i18n/locales/cs-CZ.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/de-DE.json b/packages/yoroi-extension/app/i18n/locales/de-DE.json
index 6672fe795e..009bc2d244 100644
--- a/packages/yoroi-extension/app/i18n/locales/de-DE.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/el-GR.json b/packages/yoroi-extension/app/i18n/locales/el-GR.json
index 9d84623e26..ee57fa9108 100644
--- a/packages/yoroi-extension/app/i18n/locales/el-GR.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 56c0be9dee..1302ea9b76 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/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",
diff --git a/packages/yoroi-extension/app/i18n/locales/es-ES.json b/packages/yoroi-extension/app/i18n/locales/es-ES.json
index fd516ea326..220b391d1a 100644
--- a/packages/yoroi-extension/app/i18n/locales/es-ES.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/fr-FR.json b/packages/yoroi-extension/app/i18n/locales/fr-FR.json
index 1e22d32775..c076525099 100644
--- a/packages/yoroi-extension/app/i18n/locales/fr-FR.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/hr-HR.json b/packages/yoroi-extension/app/i18n/locales/hr-HR.json
index 088b4a2f9b..010e48fa84 100644
--- a/packages/yoroi-extension/app/i18n/locales/hr-HR.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/id-ID.json b/packages/yoroi-extension/app/i18n/locales/id-ID.json
index b900f04c66..d2e53cfd13 100644
--- a/packages/yoroi-extension/app/i18n/locales/id-ID.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/it-IT.json b/packages/yoroi-extension/app/i18n/locales/it-IT.json
index 44f63b15ec..5d3ff93c07 100644
--- a/packages/yoroi-extension/app/i18n/locales/it-IT.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/ja-JP.json b/packages/yoroi-extension/app/i18n/locales/ja-JP.json
index f1bf903f1c..97de7c3656 100644
--- a/packages/yoroi-extension/app/i18n/locales/ja-JP.json
+++ b/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}へ",
diff --git a/packages/yoroi-extension/app/i18n/locales/ko-KR.json b/packages/yoroi-extension/app/i18n/locales/ko-KR.json
index 69608f4e6d..a6f4fb82b8 100644
--- a/packages/yoroi-extension/app/i18n/locales/ko-KR.json
+++ b/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} 로 가기",
diff --git a/packages/yoroi-extension/app/i18n/locales/nl-NL.json b/packages/yoroi-extension/app/i18n/locales/nl-NL.json
index 1a506e55bb..0b1a8f80cb 100644
--- a/packages/yoroi-extension/app/i18n/locales/nl-NL.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/pt-BR.json b/packages/yoroi-extension/app/i18n/locales/pt-BR.json
index 5b50369079..26b9388898 100644
--- a/packages/yoroi-extension/app/i18n/locales/pt-BR.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/ru-RU.json b/packages/yoroi-extension/app/i18n/locales/ru-RU.json
index cca36055fb..c9900d60d9 100644
--- a/packages/yoroi-extension/app/i18n/locales/ru-RU.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/sk-SK.json b/packages/yoroi-extension/app/i18n/locales/sk-SK.json
index e8b7190294..b3d54cc43c 100644
--- a/packages/yoroi-extension/app/i18n/locales/sk-SK.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/tr-TR.json b/packages/yoroi-extension/app/i18n/locales/tr-TR.json
index 1c6eed49ff..65caeb6c2b 100644
--- a/packages/yoroi-extension/app/i18n/locales/tr-TR.json
+++ b/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",
diff --git a/packages/yoroi-extension/app/i18n/locales/zh-Hans.json b/packages/yoroi-extension/app/i18n/locales/zh-Hans.json
index 7fac048c45..2006e6cb55 100644
--- a/packages/yoroi-extension/app/i18n/locales/zh-Hans.json
+++ b/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}",
diff --git a/packages/yoroi-extension/app/i18n/locales/zh-Hant.json b/packages/yoroi-extension/app/i18n/locales/zh-Hant.json
index 9892d39224..92ecc3cc5c 100644
--- a/packages/yoroi-extension/app/i18n/locales/zh-Hant.json
+++ b/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}",

From f61477e8e73713c5e69af2cfe01f0f93268811ea Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Thu, 4 Aug 2022 12:53:01 +0300
Subject: [PATCH 5/6] Version bump: 4.15.200

---
 packages/yoroi-extension/package-lock.json | 2 +-
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 56aea72eb8..dc6f236eef 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "4.15.100",
+  "version": "4.15.200",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 445cabc3a4..894ecb0a8c 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "4.15.100",
+  "version": "4.15.200",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev:build": "rimraf dev/ && babel-node scripts/build --type=debug",

From 9d2db4c48656d2092c21a063db6b2701422d24e5 Mon Sep 17 00:00:00 2001
From: Denis <nebytov.d@gmail.com>
Date: Thu, 4 Aug 2022 13:16:01 +0300
Subject: [PATCH 6/6] Updated the step of downloading trezor firmwares

---
 .github/workflows/tests.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2054a2c773..028a1d0fe9 100644
--- a/.github/workflows/tests.yml
+++ b/.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