From 8c6341b29a6518a5347a02c1a2f4921d00e92299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Mas=C5=82owski?= <szymon.maslowski@iohk.io>
Date: Mon, 14 Mar 2022 09:48:28 +0100
Subject: [PATCH 1/3] [DDW-992] Fix position of popup on syncing screen

---
 .../SyncingProgress/SyncingProgress.tsx       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/source/renderer/app/components/loading/syncing-connecting/SyncingProgress/SyncingProgress.tsx b/source/renderer/app/components/loading/syncing-connecting/SyncingProgress/SyncingProgress.tsx
index 40e17337a0..0fc509d96f 100644
--- a/source/renderer/app/components/loading/syncing-connecting/SyncingProgress/SyncingProgress.tsx
+++ b/source/renderer/app/components/loading/syncing-connecting/SyncingProgress/SyncingProgress.tsx
@@ -58,16 +58,18 @@ const SyncingProgress: FC<Props> = (props, { intl }: Context) => (
           <span className={makeMainMessageStyles(props[type] === 100)}>
             {intl.formatMessage(getProgressNameByBlockSyncType(type))}
           </span>
-          <PopOver
-            content={intl.formatMessage(
-              getProgressDescriptionByBlockSyncType(type)
-            )}
-          >
-            <SVGInline
-              svg={questionMarkIcon}
-              className={questionMarkIconStyles}
-            />
-          </PopOver>
+          <span>
+            <PopOver
+              content={intl.formatMessage(
+                getProgressDescriptionByBlockSyncType(type)
+              )}
+            >
+              <SVGInline
+                svg={questionMarkIcon}
+                className={questionMarkIconStyles}
+              />
+            </PopOver>
+          </span>
         </div>
       ))}
     </div>

From c5efdb961cd5778125ca2a8fead1eb05f7787b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Mas=C5=82owski?= <szymon.maslowski@iohk.io>
Date: Mon, 14 Mar 2022 12:14:43 +0100
Subject: [PATCH 2/3] [DDW-992] Add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4f3f2b7c3..2c92298ca9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Fixes
 
+- Fixed position of popup on syncing screen ([PR 2921](https://github.com/input-output-hk/daedalus/pull/2921))
 - Fixed styling of the incentivized testnet rewards wallet dropdown ([PR 2907](https://github.com/input-output-hk/daedalus/pull/2907))
 - Fix warning sign displayed when recommend decimals is zero ([PR 2905](https://github.com/input-output-hk/daedalus/pull/2905))
 - Fixed discrete tooltip being clipped by loading overlay when stake pools are adjusted ([PR 2902](https://github.com/input-output-hk/daedalus/pull/2902))

From 1f3b7c40012a3c724fbcc8e17c1a1aa2f31ffd25 Mon Sep 17 00:00:00 2001
From: Marcin Mazurek <marcin.mazurek@iohk.io>
Date: Wed, 23 Mar 2022 13:46:11 +0100
Subject: [PATCH 3/3] [DDW-992] Change incorrect translaction for Add button in
 token selection

---
 source/renderer/app/i18n/locales/ja-JP.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json
index 78dc6a0d4d..0221e1e76e 100755
--- a/source/renderer/app/i18n/locales/ja-JP.json
+++ b/source/renderer/app/i18n/locales/ja-JP.json
@@ -1187,7 +1187,7 @@
   "wallet.summary.transactionsList.syncingTransactionsMessage": "ウォレットのトランザクション履歴は現在ブロックチェーンと同期中です。",
   "wallet.summary.transactionsList.todayLabel": "今日",
   "wallet.summary.transactionsList.yesterdayLabel": "昨日",
-  "wallet.token.picker.addButtonLabel": "キャンセル",
+  "wallet.token.picker.addButtonLabel": "追加する",
   "wallet.token.picker.allTokensLabel": "すべてのトークン",
   "wallet.token.picker.cancelButtonLabel": "キャンセル",
   "wallet.token.picker.checkAllLabel": "すべてを選択",