From 903e392e9a7b6902ade120f8be319836b01723d5 Mon Sep 17 00:00:00 2001
From: "Nguyen, Tom CITZ:EX" <Tom.Nguyen@gov.bc.ca>
Date: Mon, 7 Oct 2024 20:34:31 -0700
Subject: [PATCH] chore: rename ButtonWithIcon to IconButton

Signed-off-by: Nguyen, Tom CITZ:EX <Tom.Nguyen@gov.bc.ca>
---
 .../core/App/components/buttons/HeaderHome.tsx       |  4 ++--
 .../buttons/{ButtonWithIcon.tsx => IconButton.tsx}   |  6 +++---
 .../legacy/core/App/components/buttons/InfoIcon.tsx  |  4 ++--
 .../core/App/components/buttons/SettingsMenu.tsx     |  4 ++--
 .../legacy/core/App/components/misc/NewQRView.tsx    |  8 ++++----
 packages/legacy/core/App/index.ts                    |  4 ++--
 .../modules/history/ui/components/HistoryMenu.tsx    |  4 ++--
 .../legacy/core/App/navigators/ProofRequestStack.tsx |  6 +++---
 packages/legacy/core/App/navigators/RootStack.tsx    |  4 ++--
 packages/legacy/core/App/screens/ListContacts.tsx    |  4 ++--
 packages/legacy/core/App/screens/Onboarding.tsx      |  4 ++--
 packages/legacy/core/App/screens/ProofRequesting.tsx |  4 ++--
 packages/legacy/core/App/screens/Settings.tsx        |  4 ++--
 .../{ButtonWithIcon.test.tsx => IconButton.test.tsx} | 12 ++++++------
 ...thIcon.test.tsx.snap => IconButton.test.tsx.snap} |  6 +++---
 15 files changed, 39 insertions(+), 39 deletions(-)
 rename packages/legacy/core/App/components/buttons/{ButtonWithIcon.tsx => IconButton.tsx} (94%)
 rename packages/legacy/core/__tests__/components/{ButtonWithIcon.test.tsx => IconButton.test.tsx} (87%)
 rename packages/legacy/core/__tests__/components/__snapshots__/{ButtonWithIcon.test.tsx.snap => IconButton.test.tsx.snap} (95%)

diff --git a/packages/legacy/core/App/components/buttons/HeaderHome.tsx b/packages/legacy/core/App/components/buttons/HeaderHome.tsx
index ac646be2b..166ea7e91 100644
--- a/packages/legacy/core/App/components/buttons/HeaderHome.tsx
+++ b/packages/legacy/core/App/components/buttons/HeaderHome.tsx
@@ -5,14 +5,14 @@ import { useTranslation } from 'react-i18next'
 import { Screens, TabStacks } from '../../types/navigators'
 import { testIdWithKey } from '../../utils/testable'
 
-import ButtonWithIcon, { ButtonLocation } from './ButtonWithIcon'
+import IconButton, { ButtonLocation } from './IconButton'
 
 const HeaderRightHome: React.FC = () => {
   const { t } = useTranslation()
   const navigation = useNavigation()
 
   return (
-    <ButtonWithIcon
+    <IconButton
       buttonLocation={ButtonLocation.Right}
       accessibilityLabel={t('Global.Home')}
       testID={testIdWithKey('HomeButton')}
diff --git a/packages/legacy/core/App/components/buttons/ButtonWithIcon.tsx b/packages/legacy/core/App/components/buttons/IconButton.tsx
similarity index 94%
rename from packages/legacy/core/App/components/buttons/ButtonWithIcon.tsx
rename to packages/legacy/core/App/components/buttons/IconButton.tsx
index 67fdcbb3b..1a5de8da9 100644
--- a/packages/legacy/core/App/components/buttons/ButtonWithIcon.tsx
+++ b/packages/legacy/core/App/components/buttons/IconButton.tsx
@@ -12,7 +12,7 @@ export enum ButtonLocation {
   Right,
 }
 
-interface ButtonWithIconProps {
+interface IconButtonProps {
   buttonLocation: ButtonLocation
   accessibilityLabel: string
   testID: string
@@ -22,7 +22,7 @@ interface ButtonWithIconProps {
   iconTintColor?: string
 }
 
-const ButtonWithIcon: React.FC<ButtonWithIconProps> = ({
+const IconButton: React.FC<IconButtonProps> = ({
   buttonLocation,
   icon,
   text,
@@ -83,4 +83,4 @@ const ButtonWithIcon: React.FC<ButtonWithIconProps> = ({
   )
 }
 
-export default ButtonWithIcon
+export default IconButton
diff --git a/packages/legacy/core/App/components/buttons/InfoIcon.tsx b/packages/legacy/core/App/components/buttons/InfoIcon.tsx
index 750e3c8bc..953597189 100644
--- a/packages/legacy/core/App/components/buttons/InfoIcon.tsx
+++ b/packages/legacy/core/App/components/buttons/InfoIcon.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'
 import { RootStackParams, Screens, Stacks } from '../../types/navigators'
 import { testIdWithKey } from '../../utils/testable'
 
-import ButtonWithIcon, { ButtonLocation } from './ButtonWithIcon'
+import IconButton, { ButtonLocation } from './IconButton'
 
 interface InfoIconProps {
   connectionId: string
@@ -17,7 +17,7 @@ const InfoIcon: React.FC<InfoIconProps> = ({ connectionId }) => {
   const { t } = useTranslation()
 
   return (
-    <ButtonWithIcon
+    <IconButton
       buttonLocation={ButtonLocation.Right}
       accessibilityLabel={t('Screens.Settings')}
       testID={testIdWithKey('Settings')}
diff --git a/packages/legacy/core/App/components/buttons/SettingsMenu.tsx b/packages/legacy/core/App/components/buttons/SettingsMenu.tsx
index 63123dedc..a530c8684 100644
--- a/packages/legacy/core/App/components/buttons/SettingsMenu.tsx
+++ b/packages/legacy/core/App/components/buttons/SettingsMenu.tsx
@@ -6,14 +6,14 @@ import { useTranslation } from 'react-i18next'
 import { RootStackParams, Screens, Stacks } from '../../types/navigators'
 import { testIdWithKey } from '../../utils/testable'
 
-import ButtonWithIcon, { ButtonLocation } from './ButtonWithIcon'
+import IconButton, { ButtonLocation } from './IconButton'
 
 const SettingsMenu: React.FC = () => {
   const navigation = useNavigation<StackNavigationProp<RootStackParams>>()
   const { t } = useTranslation()
 
   return (
-    <ButtonWithIcon
+    <IconButton
       buttonLocation={ButtonLocation.Left}
       accessibilityLabel={t('Screens.Settings')}
       testID={testIdWithKey('Settings')}
diff --git a/packages/legacy/core/App/components/misc/NewQRView.tsx b/packages/legacy/core/App/components/misc/NewQRView.tsx
index 49fdacca9..20948f65b 100644
--- a/packages/legacy/core/App/components/misc/NewQRView.tsx
+++ b/packages/legacy/core/App/components/misc/NewQRView.tsx
@@ -16,7 +16,7 @@ import { ConnectStackParams, Screens, Stacks } from '../../types/navigators'
 import { createConnectionInvitation } from '../../utils/helpers'
 import { testIdWithKey } from '../../utils/testable'
 import LoadingIndicator from '../animated/LoadingIndicator'
-import ButtonWithIcon, { ButtonLocation } from '../buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from '../buttons/IconButton'
 import InfoBox, { InfoBoxType } from '../misc/InfoBox'
 import DismissiblePopupModal from '../modals/DismissiblePopupModal'
 
@@ -138,7 +138,7 @@ const NewQRView: React.FC<Props> = ({ defaultToConnect, handleCodeScan, error, e
 
   useEffect(() => {
     let headerRight = invitation ? (
-      <ButtonWithIcon
+      <IconButton
         buttonLocation={ButtonLocation.Right}
         accessibilityLabel={t('Global.Share')}
         testID={testIdWithKey('ShareButton')}
@@ -152,7 +152,7 @@ const NewQRView: React.FC<Props> = ({ defaultToConnect, handleCodeScan, error, e
 
     if (firstTabActive) {
       headerRight = (
-        <ButtonWithIcon
+        <IconButton
           buttonLocation={ButtonLocation.Right}
           accessibilityLabel={t('Global.Share')}
           testID={testIdWithKey('ShareButton')}
@@ -312,7 +312,7 @@ const NewQRView: React.FC<Props> = ({ defaultToConnect, handleCodeScan, error, e
                   <Text testID={testIdWithKey('WalletName')} style={[styles.walletName, { paddingHorizontal: 20 }]}>
                     {store.preferences.walletName}
                   </Text>
-                  <ButtonWithIcon
+                  <IconButton
                     buttonLocation={ButtonLocation.Right}
                     accessibilityLabel={t('NameWallet.EditWalletName')}
                     testID={testIdWithKey('EditWalletName')}
diff --git a/packages/legacy/core/App/index.ts b/packages/legacy/core/App/index.ts
index 95ada3780..10724f9aa 100644
--- a/packages/legacy/core/App/index.ts
+++ b/packages/legacy/core/App/index.ts
@@ -7,7 +7,7 @@ import AgentProvider from '@credo-ts/react-hooks'
 import App from './App'
 import * as components from './components'
 import { Button as IButton, ButtonImpl as Button, ButtonType } from './components/buttons/Button'
-import ButtonWithIcon, { ButtonLocation } from './components/buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from './components/buttons/IconButton'
 import BulletPoint from './components/inputs/BulletPoint'
 import CheckBoxRow from './components/inputs/CheckBoxRow'
 import ContentGradient from './components/misc/ContentGradient'
@@ -121,7 +121,7 @@ export {
   credentialOfferTourSteps,
   proofRequestTourSteps,
   ButtonType,
-  ButtonWithIcon,
+  IconButton,
   ButtonLocation,
   CheckBoxRow,
   CredentialCard,
diff --git a/packages/legacy/core/App/modules/history/ui/components/HistoryMenu.tsx b/packages/legacy/core/App/modules/history/ui/components/HistoryMenu.tsx
index 904017fc5..2fa1f714c 100644
--- a/packages/legacy/core/App/modules/history/ui/components/HistoryMenu.tsx
+++ b/packages/legacy/core/App/modules/history/ui/components/HistoryMenu.tsx
@@ -3,7 +3,7 @@ import { StackNavigationProp } from '@react-navigation/stack'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 
-import ButtonWithIcon, { ButtonLocation } from '../../../../components/buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from '../../../../components/buttons/IconButton'
 import { RootStackParams, Screens, Stacks } from '../../../../types/navigators'
 import { testIdWithKey } from '../../../../utils/testable'
 
@@ -12,7 +12,7 @@ const HistoryMenu: React.FC = () => {
   const { t } = useTranslation()
 
   return (
-    <ButtonWithIcon
+    <IconButton
       buttonLocation={ButtonLocation.Right}
       accessibilityLabel={t('Screens.Settings')}
       testID={testIdWithKey('Settings')}
diff --git a/packages/legacy/core/App/navigators/ProofRequestStack.tsx b/packages/legacy/core/App/navigators/ProofRequestStack.tsx
index 8737ce87c..62255f660 100644
--- a/packages/legacy/core/App/navigators/ProofRequestStack.tsx
+++ b/packages/legacy/core/App/navigators/ProofRequestStack.tsx
@@ -2,7 +2,7 @@ import { createStackNavigator } from '@react-navigation/stack'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 
-import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from '../components/buttons/IconButton'
 import HeaderRightHome from '../components/buttons/HeaderHome'
 import { useTheme } from '../contexts/theme'
 import ListProofRequests from '../screens/ListProofRequests'
@@ -53,7 +53,7 @@ const ProofRequestStack: React.FC = () => {
         options={({ navigation }) => ({
           title: t('ProofRequest.RequestForProof'),
           headerLeft: () => (
-            <ButtonWithIcon
+            <IconButton
               buttonLocation={ButtonLocation.Left}
               accessibilityLabel={t('Global.Back')}
               testID={testIdWithKey('BackButton')}
@@ -69,7 +69,7 @@ const ProofRequestStack: React.FC = () => {
         options={({ navigation, route }) => ({
           title: '',
           headerLeft: () => (
-            <ButtonWithIcon
+            <IconButton
               buttonLocation={ButtonLocation.Left}
               accessibilityLabel={t('Global.Back')}
               testID={testIdWithKey('BackButton')}
diff --git a/packages/legacy/core/App/navigators/RootStack.tsx b/packages/legacy/core/App/navigators/RootStack.tsx
index af9b83cc2..634a3638f 100644
--- a/packages/legacy/core/App/navigators/RootStack.tsx
+++ b/packages/legacy/core/App/navigators/RootStack.tsx
@@ -12,7 +12,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { AppState, DeviceEventEmitter } from 'react-native'
 
-import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from '../components/buttons/IconButton'
 import { EventTypes, walletTimeout } from '../constants'
 import { TOKENS, useServices } from '../container-api'
 import { useAuth } from '../contexts/auth'
@@ -271,7 +271,7 @@ const RootStack: React.FC = () => {
             headerShown: true,
             title: t('Screens.CredentialOffer'),
             headerLeft: () => (
-              <ButtonWithIcon
+              <IconButton
                 buttonLocation={ButtonLocation.Left}
                 accessibilityLabel={t('Global.Back')}
                 testID={testIdWithKey('BackButton')}
diff --git a/packages/legacy/core/App/screens/ListContacts.tsx b/packages/legacy/core/App/screens/ListContacts.tsx
index 7a4f3d6dc..e94906ab9 100644
--- a/packages/legacy/core/App/screens/ListContacts.tsx
+++ b/packages/legacy/core/App/screens/ListContacts.tsx
@@ -5,7 +5,7 @@ import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { DeviceEventEmitter, FlatList, StyleSheet, View } from 'react-native'
 
-import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from '../components/buttons/IconButton'
 import ContactListItem from '../components/listItems/ContactListItem'
 import EmptyListContacts from '../components/misc/EmptyListContacts'
 import { EventTypes } from '../constants'
@@ -74,7 +74,7 @@ const ListContacts: React.FC<ListContactsProps> = ({ navigation }) => {
     if (store.preferences.useConnectionInviterCapability) {
       navigation.setOptions({
         headerRight: () => (
-          <ButtonWithIcon
+          <IconButton
             buttonLocation={ButtonLocation.Right}
             accessibilityLabel={t('Contacts.AddContact')}
             testID={testIdWithKey('AddContact')}
diff --git a/packages/legacy/core/App/screens/Onboarding.tsx b/packages/legacy/core/App/screens/Onboarding.tsx
index 7dbb8c227..34d0750ec 100644
--- a/packages/legacy/core/App/screens/Onboarding.tsx
+++ b/packages/legacy/core/App/screens/Onboarding.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
 import { Animated, BackHandler, FlatList, View, useWindowDimensions } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
 
-import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from '../components/buttons/IconButton'
 import { Pagination } from '../components/misc/Pagination'
 import { DispatchAction } from '../contexts/reducers/store'
 import { useStore } from '../contexts/store'
@@ -101,7 +101,7 @@ const Onboarding: React.FC<OnboardingProps> = ({
     !disableSkip &&
       navigation.setOptions({
         headerRight: () => (
-          <ButtonWithIcon
+          <IconButton
             buttonLocation={ButtonLocation.Right}
             accessibilityLabel={t('Onboarding.SkipA11y')}
             testID={testIdWithKey('Skip')}
diff --git a/packages/legacy/core/App/screens/ProofRequesting.tsx b/packages/legacy/core/App/screens/ProofRequesting.tsx
index d0102c90c..30d3bcc7d 100644
--- a/packages/legacy/core/App/screens/ProofRequesting.tsx
+++ b/packages/legacy/core/App/screens/ProofRequesting.tsx
@@ -27,7 +27,7 @@ import { SafeAreaView } from 'react-native-safe-area-context'
 
 import LoadingIndicator from '../components/animated/LoadingIndicator'
 import Button, { ButtonType } from '../components/buttons/Button'
-import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from '../components/buttons/IconButton'
 import QRRenderer from '../components/misc/QRRenderer'
 import { EventTypes } from '../constants'
 import { useStore } from '../contexts/store'
@@ -154,7 +154,7 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
   useEffect(() => {
     if (message && store.preferences.enableShareableLink) {
       const scanShareUrl = () => (
-        <ButtonWithIcon
+        <IconButton
           buttonLocation={ButtonLocation.Right}
           accessibilityLabel={t('Global.Share')}
           testID={testIdWithKey('ShareButton')}
diff --git a/packages/legacy/core/App/screens/Settings.tsx b/packages/legacy/core/App/screens/Settings.tsx
index 3471db402..b4100499d 100644
--- a/packages/legacy/core/App/screens/Settings.tsx
+++ b/packages/legacy/core/App/screens/Settings.tsx
@@ -14,7 +14,7 @@ import { getVersion, getBuildNumber } from 'react-native-device-info'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import Icon from 'react-native-vector-icons/MaterialIcons'
 
-import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from '../components/buttons/IconButton'
 import { DispatchAction } from '../contexts/reducers/store'
 import { useStore } from '../contexts/store'
 import { useTheme } from '../contexts/theme'
@@ -291,7 +291,7 @@ const Settings: React.FC<SettingsProps> = ({ navigation }) => {
             </Text>
           </View>
           {iconRight && (
-            <ButtonWithIcon
+            <IconButton
               buttonLocation={ButtonLocation.Right}
               accessibilityLabel={iconRight.accessibilityLabel!}
               testID={iconRight.testID!}
diff --git a/packages/legacy/core/__tests__/components/ButtonWithIcon.test.tsx b/packages/legacy/core/__tests__/components/IconButton.test.tsx
similarity index 87%
rename from packages/legacy/core/__tests__/components/ButtonWithIcon.test.tsx
rename to packages/legacy/core/__tests__/components/IconButton.test.tsx
index 16dc8fc83..9b2fa388b 100644
--- a/packages/legacy/core/__tests__/components/ButtonWithIcon.test.tsx
+++ b/packages/legacy/core/__tests__/components/IconButton.test.tsx
@@ -1,13 +1,13 @@
 import { render, fireEvent } from '@testing-library/react-native'
 import React from 'react'
 
-import ButtonWithIcon, { ButtonLocation } from '../../App/components/buttons/ButtonWithIcon'
+import IconButton, { ButtonLocation } from '../../App/components/buttons/IconButton'
 import { testIdWithKey } from '../../App/utils/testable'
 
-describe('ButtonWithIcon Component', () => {
+describe('IconButton Component', () => {
   test('Left alignment renders correctly', () => {
     const tree = render(
-      <ButtonWithIcon
+      <IconButton
         buttonLocation={ButtonLocation.Left}
         accessibilityLabel={'LeftButton'}
         testID={testIdWithKey('LeftButton')}
@@ -21,7 +21,7 @@ describe('ButtonWithIcon Component', () => {
 
   test('Right alignment renders correctly', () => {
     const tree = render(
-      <ButtonWithIcon
+      <IconButton
         buttonLocation={ButtonLocation.Right}
         accessibilityLabel={'RightButton'}
         testID={testIdWithKey('RightButton')}
@@ -35,7 +35,7 @@ describe('ButtonWithIcon Component', () => {
 
   test('Right alignment with text renders correctly', () => {
     const tree = render(
-      <ButtonWithIcon
+      <IconButton
         buttonLocation={ButtonLocation.Right}
         accessibilityLabel={'RightButton'}
         testID={testIdWithKey('RightButton')}
@@ -51,7 +51,7 @@ describe('ButtonWithIcon Component', () => {
   test('Button onPress triggers on press', () => {
     const callback = jest.fn()
     const { getByTestId } = render(
-      <ButtonWithIcon
+      <IconButton
         buttonLocation={ButtonLocation.Left}
         accessibilityLabel={'LeftButton'}
         testID={testIdWithKey('LeftButton')}
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/ButtonWithIcon.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/IconButton.test.tsx.snap
similarity index 95%
rename from packages/legacy/core/__tests__/components/__snapshots__/ButtonWithIcon.test.tsx.snap
rename to packages/legacy/core/__tests__/components/__snapshots__/IconButton.test.tsx.snap
index b726ab713..13d989dbc 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/ButtonWithIcon.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/IconButton.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ButtonWithIcon Component Left alignment renders correctly 1`] = `
+exports[`IconButton Component Left alignment renders correctly 1`] = `
 <View
   accessibilityLabel="LeftButton"
   accessibilityRole="button"
@@ -80,7 +80,7 @@ exports[`ButtonWithIcon Component Left alignment renders correctly 1`] = `
 </View>
 `;
 
-exports[`ButtonWithIcon Component Right alignment renders correctly 1`] = `
+exports[`IconButton Component Right alignment renders correctly 1`] = `
 <View
   accessibilityLabel="RightButton"
   accessibilityRole="button"
@@ -160,7 +160,7 @@ exports[`ButtonWithIcon Component Right alignment renders correctly 1`] = `
 </View>
 `;
 
-exports[`ButtonWithIcon Component Right alignment with text renders correctly 1`] = `
+exports[`IconButton Component Right alignment with text renders correctly 1`] = `
 <View
   accessibilityLabel="RightButton"
   accessibilityRole="button"