Merge pull request #2921 from input-output-hk/feature/ddw-992

input-output-hk · Mar 25, 2022 · 38fc0ed · 38fc0ed
2 parents 43d4622 + e1b0a97
commit 38fc0ed
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixes
 
+- Fixed position of popup on syncing screen ([PR 2921](https://github.com/input-output-hk/daedalus/pull/2921))
 - Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
 - Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
 - Restored opacity for search icon when focused ([PR 2909](https://github.com/input-output-hk/daedalus/pull/2909))

diff --git a/...ce/renderer/app/components/loading/syncing-connecting/SyncingProgress/SyncingProgress.tsx b/...ce/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>

diff --git 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": "すべてを選択",