Skip to content

Commit 777b1d9

Browse files
shawnbusuttilshawnbusuttil
committed
remove wrapping component
1 parent c2cfe25 commit 777b1d9

File tree

13 files changed

+39
-57
lines changed

13 files changed

+39
-57
lines changed

‎source/renderer/app/components/staking/widgets/PoolPopOver.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import React, { useRef, useState } from 'react';
22
// @ts-ignore ts-migrate(2305) FIXME: Module '"react"' has no exported member 'Node'.
33
import type { Node } from 'react';
4+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
45
import { STAKE_POOL_TOOLTIP_HOVER_WAIT } from '../../../config/timingConfig';
56
import StakePool from '../../../domains/StakePool';
67
import TooltipPool from './TooltipPool';
78
import styles from './PoolPopOver.scss';
8-
import TopLevelPopOver from '../../widgets/TopLevelPopOver';
99

1010
/**
1111
* Stake pool tooltip component that can be wrapped around
@@ -52,7 +52,7 @@ export function PoolPopOver(props: {
5252
{props.children}
5353
</div>
5454
{isHovered ? ( // Init the pop over only when the target is hovered
55-
<TopLevelPopOver
55+
<PopOver
5656
interactive
5757
className="PoolPopOver"
5858
delay={props.openWithDelay ? STAKE_POOL_TOOLTIP_HOVER_WAIT : 0}

‎source/renderer/app/components/staking/widgets/TooltipPool.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import {
3939
IS_RANKING_DATA_AVAILABLE,
4040
IS_SATURATION_DATA_AVAILABLE,
4141
} from '../../../config/stakingConfig';
42-
import TopLevelPopOver from '../../widgets/TopLevelPopOver';
4342

4443
const messages = defineMessages({
4544
ranking: {
@@ -389,7 +388,7 @@ class TooltipPool extends Component<Props, State> {
389388
<div className={styles.fieldLabel}>
390389
{intl.formatMessage(messages[field.key])}
391390
</div>
392-
<TopLevelPopOver
391+
<PopOver
393392
offset={[0, 10]}
394393
key={field.key}
395394
content={
@@ -403,7 +402,7 @@ class TooltipPool extends Component<Props, State> {
403402
<div className={styles.questionMark}>
404403
<SVGInline svg={questionMarkIcon} />
405404
</div>
406-
</TopLevelPopOver>
405+
</PopOver>
407406
</div>
408407
</div>
409408
);

‎source/renderer/app/components/wallet/WalletCreateDialog.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { InputSkin } from 'react-polymorph/lib/skins/simple/InputSkin';
77
import { defineMessages, intlShape, FormattedHTMLMessage } from 'react-intl';
88
import vjf from 'mobx-react-form/lib/validators/VJF';
99
import SVGInline from 'react-svg-inline';
10+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
1011
import ReactToolboxMobxForm, {
1112
handleFormErrors,
1213
} from '../../utils/ReactToolboxMobxForm';
@@ -24,7 +25,6 @@ import { FORM_VALIDATION_DEBOUNCE_WAIT } from '../../config/timingConfig';
2425
import { submitOnEnter } from '../../utils/form';
2526
import infoIconInline from '../../assets/images/info-icon.inline.svg';
2627
import LoadingSpinner from '../widgets/LoadingSpinner';
27-
import TopLevelPopOver from '../widgets/TopLevelPopOver';
2828

2929
const messages = defineMessages({
3030
dialogTitle: {
@@ -278,12 +278,12 @@ class WalletCreateDialog extends Component<Props, State> {
278278
onKeyPress={this.handleSubmitOnEnter}
279279
{...spendingPasswordField.bind()}
280280
/>
281-
<TopLevelPopOver
281+
<PopOver
282282
content={<FormattedHTMLMessage {...messages.passwordTooltip} />}
283283
key="tooltip"
284284
>
285285
<SVGInline svg={infoIconInline} className={styles.infoIcon} />
286-
</TopLevelPopOver>
286+
</PopOver>
287287
</div>
288288
<div className={styles.spendingPasswordField}>
289289
<PasswordInput

‎source/renderer/app/components/wallet/WalletRestoreDialog.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { Input } from 'react-polymorph/lib/components/Input';
77
import { defineMessages, intlShape, FormattedHTMLMessage } from 'react-intl';
88
import vjf from 'mobx-react-form/lib/validators/VJF';
99
import SVGInline from 'react-svg-inline';
10+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
1011
import { PasswordInput } from '../widgets/forms/PasswordInput';
1112
import RadioSet from '../widgets/RadioSet';
1213
import ReactToolboxMobxForm, {
@@ -37,7 +38,6 @@ import {
3738
} from '../../config/cryptoConfig';
3839
import infoIconInline from '../../assets/images/info-icon.inline.svg';
3940
import LoadingSpinner from '../widgets/LoadingSpinner';
40-
import TopLevelPopOver from '../widgets/TopLevelPopOver';
4141

4242
const messages = defineMessages({
4343
title: {
@@ -608,12 +608,12 @@ class WalletRestoreDialog extends Component<Props, State> {
608608
onKeyPress={this.handleSubmitOnEnter}
609609
{...spendingPasswordField.bind()}
610610
/>
611-
<TopLevelPopOver
611+
<PopOver
612612
content={<FormattedHTMLMessage {...messages.passwordTooltip} />}
613613
key="tooltip"
614614
>
615615
<SVGInline svg={infoIconInline} className={styles.infoIcon} />
616-
</TopLevelPopOver>
616+
</PopOver>
617617
</div>
618618
<div className={styles.spendingPasswordField}>
619619
<PasswordInput

‎source/renderer/app/components/wallet/receive/WalletReceiveDialog.tsx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import { AddressVerificationCheckStatuses } from '../../../stores/HardwareWallet
2727
import LoadingSpinner from '../../widgets/LoadingSpinner';
2828
import type { AddressVerificationCheckStatus } from '../../../stores/HardwareWalletsStore';
2929
import type { HwDeviceStatus } from '../../../domains/Wallet';
30-
import TopLevelPopOver from '../../widgets/TopLevelPopOver';
3130

3231
const messages = defineMessages({
3332
inputLabel: {
@@ -391,17 +390,17 @@ class WalletReceiveDialog extends Component<Props, State> {
391390
</div>
392391

393392
<div className={styles.addressPathsWrapper}>
394-
<TopLevelPopOver content={intl.formatMessage(messages.spendingPathTooltip)}>
393+
<PopOver content={intl.formatMessage(messages.spendingPathTooltip)}>
395394
<div className={styles.spendingPath}>
396395
{constructedPaths.spendingPath}
397396
</div>
398-
</TopLevelPopOver>
397+
</PopOver>
399398

400-
<TopLevelPopOver content={intl.formatMessage(messages.stakingPathTooltip)}>
399+
<PopOver content={intl.formatMessage(messages.stakingPathTooltip)}>
401400
<div className={styles.stakingPath}>
402401
{constructedPaths.stakingPath}
403402
</div>
404-
</TopLevelPopOver>
403+
</PopOver>
405404
</div>
406405

407406
<div className={styles.address}>{address.id}</div>

‎source/renderer/app/components/wallet/send-form/WalletSendAssetsConfirmationDialog.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import BigNumber from 'bignumber.js';
99
import SVGInline from 'react-svg-inline';
1010
import { intlShape, FormattedHTMLMessage } from 'react-intl';
1111
import vjf from 'mobx-react-form/lib/validators/VJF';
12+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
1213
import ReactToolboxMobxForm from '../../../utils/ReactToolboxMobxForm';
1314
import Dialog from '../../widgets/Dialog';
1415
import DialogCloseButton from '../../widgets/DialogCloseButton';
@@ -29,7 +30,6 @@ import { getMessages } from './WalletSendAssetsConfirmationDialog.messages';
2930
import { shouldShowEmptyWalletWarning } from '../../../utils/walletUtils';
3031
import { hasTokensLeftAfterTransaction } from '../../../utils/assets';
3132
import globalMessages from '../../../i18n/global-messages';
32-
import TopLevelPopOver from '../../widgets/TopLevelPopOver';
3333

3434
const SHOW_TOTAL_AMOUNT = false;
3535
type Props = {
@@ -382,7 +382,7 @@ class WalletSendAssetsConfirmationDialog extends Component<Props, State> {
382382
{intl.formatMessage(
383383
messages.unformattedAmountLabel
384384
)}
385-
<TopLevelPopOver
385+
<PopOver
386386
content={
387387
<div className="UnformattedAmountTooltip">
388388
<FormattedHTMLMessage
@@ -400,7 +400,7 @@ class WalletSendAssetsConfirmationDialog extends Component<Props, State> {
400400
<div className={styles.questionMark}>
401401
<SVGInline svg={questionMarkIcon} />
402402
</div>
403-
</TopLevelPopOver>
403+
</PopOver>
404404
{':'}
405405
</div>
406406
<div className={styles.unformattedAmount}>

‎source/renderer/app/components/wallet/settings/ChangeSpendingPasswordDialog.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { Input } from 'react-polymorph/lib/components/Input';
55
import { defineMessages, FormattedHTMLMessage, intlShape } from 'react-intl';
66
import vjf from 'mobx-react-form/lib/validators/VJF';
77
import SVGInline from 'react-svg-inline';
8+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
89
import ReactToolboxMobxForm from '../../../utils/ReactToolboxMobxForm';
910
import DialogCloseButton from '../../widgets/DialogCloseButton';
1011
import Dialog from '../../widgets/Dialog';
@@ -20,7 +21,6 @@ import { FORM_VALIDATION_DEBOUNCE_WAIT } from '../../../config/timingConfig';
2021
import { submitOnEnter } from '../../../utils/form';
2122
// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../../assets/images/info-ic... Remove this comment to see the full error message
2223
import infoIconInline from '../../../assets/images/info-icon.inline.svg';
23-
import TopLevelPopOver from '../../widgets/TopLevelPopOver';
2424

2525
const messages = defineMessages({
2626
dialogTitleSetPassword: {
@@ -290,12 +290,12 @@ class ChangeSpendingPasswordDialog extends Component<Props> {
290290
{...currentPasswordField.bind()}
291291
onKeyPress={this.handleSubmitOnEnter}
292292
/>
293-
<TopLevelPopOver
293+
<PopOver
294294
content={<FormattedHTMLMessage {...messages.passwordTooltip} />}
295295
key="tooltip"
296296
>
297297
<SVGInline svg={infoIconInline} className={styles.infoIcon} />
298-
</TopLevelPopOver>
298+
</PopOver>
299299
</div>
300300
)}
301301

@@ -306,14 +306,14 @@ class ChangeSpendingPasswordDialog extends Component<Props> {
306306
onKeyPress={this.handleSubmitOnEnter}
307307
/>
308308
{!isSpendingPasswordSet && (
309-
<TopLevelPopOver
309+
<PopOver
310310
content={
311311
<FormattedHTMLMessage {...messages.passwordTooltip} />
312312
}
313313
key="tooltip"
314314
>
315315
<SVGInline svg={infoIconInline} className={styles.infoIcon} />
316-
</TopLevelPopOver>
316+
</PopOver>
317317
)}
318318
</div>
319319
</div>

‎source/renderer/app/components/wallet/settings/ICOPublicKeyQRCodeDialog.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import iconCopy from '../../../assets/images/clipboard-ic.inline.svg';
1212
import styles from './PublicKeyQRCodeDialog.scss';
1313
import globalMessages from '../../../i18n/global-messages';
1414
import { messages } from './ICOPublicKeyQRCodeDialog.messages';
15-
import TopLevelPopOver from '../../widgets/TopLevelPopOver';
1615

1716
type Props = {
1817
walletName: string;
@@ -67,9 +66,9 @@ const ICOPublicKeyQRCodeDialog = observer((props: Props) => {
6766
/>
6867
</div>
6968
<div className={styles.addressPathsWrapper}>
70-
<TopLevelPopOver content={intl.formatMessage(messages.derivationPathTooltip)}>
69+
<PopOver content={intl.formatMessage(messages.derivationPathTooltip)}>
7170
<div className={styles.spendingPath}>{derivationPath}</div>
72-
</TopLevelPopOver>
71+
</PopOver>
7372
</div>
7473

7574
<div className={styles.walletPublicKey}>{walletPublicKey}</div>

‎source/renderer/app/components/wallet/settings/WalletPublicKeyQRCodeDialog.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import { injectIntl, intlShape } from 'react-intl';
44
import CopyToClipboard from 'react-copy-to-clipboard';
55
import SVGInline from 'react-svg-inline';
66
import QRCode from 'qrcode.react';
7+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
78
import DialogCloseButton from '../../widgets/DialogCloseButton';
89
import Dialog from '../../widgets/Dialog';
910
// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../../assets/images/clipboa... Remove this comment to see the full error message
1011
import iconCopy from '../../../assets/images/clipboard-ic.inline.svg';
1112
import styles from './PublicKeyQRCodeDialog.scss';
1213
import globalMessages from '../../../i18n/global-messages';
1314
import type { ReactIntlMessage } from '../../../types/i18nTypes';
14-
import TopLevelPopOver from '../../widgets/TopLevelPopOver';
1515

1616
type Props = {
1717
walletName: string;
@@ -68,9 +68,9 @@ const WalletPublicKeyQRCodeDialog = observer((props: Props) => {
6868
/>
6969
</div>
7070
<div className={styles.addressPathsWrapper}>
71-
<TopLevelPopOver content={intl.formatMessage(messages.derivationPathTooltip)}>
71+
<PopOver content={intl.formatMessage(messages.derivationPathTooltip)}>
7272
<div className={styles.spendingPath}>{derivationPath}</div>
73-
</TopLevelPopOver>
73+
</PopOver>
7474
</div>
7575

7676
<div className={styles.walletPublicKey}>{walletPublicKey}</div>

‎source/renderer/app/components/wallet/wallet-import/WalletSelectImportDialog.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { Link } from 'react-polymorph/lib/components/Link';
1414
import { LinkSkin } from 'react-polymorph/lib/skins/simple/LinkSkin';
1515
import classNames from 'classnames';
1616
import SVGInline from 'react-svg-inline';
17+
import { PopOver } from 'react-polymorph/lib/components/PopOver';
1718
import styles from './WalletSelectImportDialog.scss';
1819
import DialogCloseButton from '../../widgets/DialogCloseButton';
1920
// @ts-ignore ts-migrate(2307) FIXME: Cannot find module '../../../assets/images/close-c... Remove this comment to see the full error message
@@ -27,8 +28,7 @@ import checkmarkImage from '../../../assets/images/check-w.inline.svg';
2728
import { MAX_ADA_WALLETS_COUNT } from '../../../config/numbersConfig';
2829
import type { ExportedByronWallet } from '../../../types/walletExportTypes';
2930
import Dialog from '../../widgets/Dialog';
30-
import TopLevelPopOver from '../../widgets/TopLevelPopOver';
31-
31+
3232
const messages = defineMessages({
3333
title: {
3434
id: 'wallet.select.import.dialog.title',
@@ -216,7 +216,7 @@ class WalletSelectImportDialog extends Component<Props> {
216216

217217
if (disabled) {
218218
statusIcon = (
219-
<TopLevelPopOver
219+
<PopOver
220220
content={
221221
invalidWalletName ? (
222222
this.context.intl.formatMessage(messages.enterWalletNameTooltip)
@@ -233,7 +233,7 @@ class WalletSelectImportDialog extends Component<Props> {
233233
placement={isOpeningUpward ? 'top' : 'bottom'}
234234
>
235235
{statusIcon}
236-
</TopLevelPopOver>
236+
</PopOver>
237237
);
238238
}
239239
} else if (wallet.import.status === WalletImportStatuses.RUNNING) {
@@ -416,7 +416,7 @@ class WalletSelectImportDialog extends Component<Props> {
416416
</div>
417417
<div className={styles.walletsInputField}>
418418
{!wallet.name ? (
419-
<TopLevelPopOver
419+
<PopOver
420420
content={intl.formatMessage(
421421
messages.enterWalletNameTooltip
422422
)}
@@ -430,7 +430,7 @@ class WalletSelectImportDialog extends Component<Props> {
430430
nameValidator,
431431
onWalletNameChange
432432
)}
433-
</TopLevelPopOver>
433+
</PopOver>
434434
) : (
435435
<>
436436
{this.getInlineEditingSmallInput(

0 commit comments

Comments
 (0)