From 9d281529444cab0bb4066bc157ff601a6e18b961 Mon Sep 17 00:00:00 2001
From: tassoman <tassoman@gmail.com>
Date: Sat, 4 Nov 2023 10:50:45 +0100
Subject: [PATCH] updated feature refactoring using iconbutton, better i18n
 handling

---
 .../ui/components/profile-info-panel.tsx      | 26 ++++++++++++-------
 src/locales/en.json                           |  2 ++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/features/ui/components/profile-info-panel.tsx b/src/features/ui/components/profile-info-panel.tsx
index 02670f782..0e2d33e04 100644
--- a/src/features/ui/components/profile-info-panel.tsx
+++ b/src/features/ui/components/profile-info-panel.tsx
@@ -5,7 +5,7 @@ import { usePatronUser } from 'soapbox/api/hooks';
 import Badge from 'soapbox/components/badge';
 import Markup from 'soapbox/components/markup';
 import { dateFormatOptions } from 'soapbox/components/relative-timestamp';
-import { Icon, HStack, Stack, Text } from 'soapbox/components/ui';
+import { Icon, IconButton, HStack, Stack, Text } from 'soapbox/components/ui';
 import { useAppSelector, useSoapboxConfig } from 'soapbox/hooks';
 import toast from 'soapbox/toast';
 import { badgeToTag, getBadges as getAccountBadges } from 'soapbox/utils/badges';
@@ -32,8 +32,9 @@ const messages = defineMessages({
   account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' },
   deactivated: { id: 'account.deactivated', defaultMessage: 'Deactivated' },
   bot: { id: 'account.badges.bot', defaultMessage: 'Bot' },
-  copied: { id: 'account.copied', defaultMessage: 'Username was copied in the clipboard' },
-  notCopied: { id: 'account.not_copied', defaultMessage: 'Unable to copy the username' },
+  copy_success: { id: 'copy.success', defaultMessage: 'Copied to clipboard!' },
+  copy: { id: 'copy', defaultMessage: 'Copy' },
+  copy_failed: { id: 'copy.failed', defaultMessage: 'Failed to copy' },
 });
 
 interface IProfileInfoPanel {
@@ -52,10 +53,11 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
 
   const handleUsernameClick: React.MouseEventHandler = () => {
     if ('clipboard' in navigator) {
-      navigator.clipboard.writeText('@' + username);
-      toast.success(messages.copied);
+      const c = (displayFqn) ? account?.fqn : account?.acct;
+      navigator.clipboard.writeText('@' + c);
+      toast.success(messages.copy_success);
     } else {
-      toast.error(messages.notCopied);
+      toast.error(messages.copy_failed);
     }
   };
 
@@ -165,13 +167,11 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
             )}
           </HStack>
 
-          <HStack alignItems='center' space={0.5} onClick={handleUsernameClick} className='cursor-pointer'>
+          <HStack alignItems='center' space={0.5}>
             <Text size='sm' theme='muted' direction='ltr' truncate>
               @{displayFqn ? account.fqn : account.acct}
             </Text>
 
-            <Icon src={require('@tabler/icons/copy.svg')} alt='copy' className='h-4 w-4 text-gray-600' />
-
             {account.locked && (
               <Icon
                 src={require('@tabler/icons/lock.svg')}
@@ -179,6 +179,14 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
                 className='h-4 w-4 text-gray-600'
               />
             )}
+
+            <IconButton
+              src={require('@tabler/icons/copy.svg')}
+              title={intl.formatMessage(messages.copy)}
+              className='text-gray-600'
+              iconClassName='h-4 w-4'
+              onClick={handleUsernameClick}
+            />
           </HStack>
         </Stack>
 
diff --git a/src/locales/en.json b/src/locales/en.json
index 672e7cbfe..a8ab3d3c7 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -524,6 +524,8 @@
   "confirmations.scheduled_status_delete.heading": "Cancel scheduled post",
   "confirmations.scheduled_status_delete.message": "Are you sure you want to discard this scheduled post?",
   "confirmations.unfollow.confirm": "Unfollow",
+  "copy": "Copy",
+  "copy.failed": "Failed to copy",
   "copy.success": "Copied to clipboard!",
   "crypto_donate.explanation_box.message": "{siteTitle} accepts cryptocurrency donations. You may send a donation to any of the addresses below. Thank you for your support!",
   "crypto_donate.explanation_box.title": "Sending cryptocurrency donations",