diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.js b/app/soapbox/features/crypto_donate/components/crypto_address.js index 76ccbefa6..b2498101c 100644 --- a/app/soapbox/features/crypto_donate/components/crypto_address.js +++ b/app/soapbox/features/crypto_donate/components/crypto_address.js @@ -34,14 +34,14 @@ class CryptoAddress extends ImmutablePureComponent {
{title}
-
{title}
+
{title || ticker.toUpperCase()}
- + {explorerUrl && - + }
{note &&
{note}
} diff --git a/app/soapbox/features/crypto_donate/components/detailed_crypto_address.js b/app/soapbox/features/crypto_donate/components/detailed_crypto_address.js index 784c54dcf..de5971d36 100644 --- a/app/soapbox/features/crypto_donate/components/detailed_crypto_address.js +++ b/app/soapbox/features/crypto_donate/components/detailed_crypto_address.js @@ -29,11 +29,11 @@ class DetailedCryptoAddress extends ImmutablePureComponent {
{title}
-
{title}
+
{title || ticker.toUpperCase()}
- + {explorerUrl && - + }
{note &&
{note}
} diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index 7a481d211..0ad1f361d 100644 --- a/app/soapbox/features/forms/index.js +++ b/app/soapbox/features/forms/index.js @@ -291,7 +291,7 @@ export class CopyableInput extends ImmutablePureComponent { return (
- + diff --git a/app/soapbox/features/ui/components/profile_info_panel.js b/app/soapbox/features/ui/components/profile_info_panel.js index 4af0d84c4..cb8a7ed76 100644 --- a/app/soapbox/features/ui/components/profile_info_panel.js +++ b/app/soapbox/features/ui/components/profile_info_panel.js @@ -13,6 +13,12 @@ import { List as ImmutableList } from 'immutable'; import { getAcct, isAdmin, isModerator } from 'soapbox/utils/accounts'; import { displayFqn } from 'soapbox/utils/state'; import classNames from 'classnames'; +import CryptoAddress from 'soapbox/features/crypto_donate/components/crypto_address'; + +const TICKER_REGEX = /\$([a-zA-Z]*)/i; + +const getTicker = value => (value.match(TICKER_REGEX) || [])[1]; +const isTicker = value => Boolean(getTicker(value)); const messages = defineMessages({ linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' }, @@ -123,15 +129,19 @@ class ProfileInfoPanel extends ImmutablePureComponent { ))} - {fields.map((pair, i) => ( -
-
+ {fields.map((pair, i) => + isTicker(pair.get('name', '')) ? ( + + ) : ( +
+
-
- {pair.get('verified_at') && } -
-
- ))} +
+ {pair.get('verified_at') && } +
+
+ ), + )}
)} diff --git a/app/styles/components/crypto-donate.scss b/app/styles/components/crypto-donate.scss index b01fef8de..10289e976 100644 --- a/app/styles/components/crypto-donate.scss +++ b/app/styles/components/crypto-donate.scss @@ -61,3 +61,9 @@ border-radius: 8px; padding-bottom: 13px; } + +.profile-info-panel-content__fields { + .crypto-address { + padding: 10px 0; + } +}