chore: rename HeaderButton into ButtonWithIcon

Signed-off-by: Nguyen, Tom CITZ:EX <[email protected]>
openwallet-foundation · Oct 3, 2024 · 4c7f4ee · 4c7f4ee
1 parent a657da4
commit 4c7f4ee
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 39 deletions.
diff --git a/...e/App/components/buttons/HeaderButton.tsx → ...App/components/buttons/ButtonWithIcon.tsx b/...e/App/components/buttons/HeaderButton.tsx → ...App/components/buttons/ButtonWithIcon.tsx
@@ -12,7 +12,7 @@ export enum ButtonLocation {
  Right,
 }
 
-interface HeaderButtonProps {
+interface ButtonWithIconProps {
  buttonLocation: ButtonLocation
  accessibilityLabel: string
  testID: string
@@ -22,7 +22,7 @@ interface HeaderButtonProps {
  iconTintColor?: string
 }
 
-const HeaderButton: React.FC<HeaderButtonProps> = ({
+const ButtonWithIcon: React.FC<ButtonWithIconProps> = ({
  buttonLocation,
  icon,
  text,
@@ -83,4 +83,4 @@ const HeaderButton: React.FC<HeaderButtonProps> = ({
  )
 }
 
-export default HeaderButton
+export default ButtonWithIcon
diff --git 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 HeaderButton, { ButtonLocation } from './HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from './ButtonWithIcon'
 
 const HeaderRightHome: React.FC = () => {
  const { t } = useTranslation()
  const navigation = useNavigation()
 
  return (
- <HeaderButton
+ <ButtonWithIcon
  buttonLocation={ButtonLocation.Right}
  accessibilityLabel={t('Global.Home')}
  testID={testIdWithKey('HomeButton')}

diff --git 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 HeaderButton, { ButtonLocation } from './HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from './ButtonWithIcon'
 
 interface InfoIconProps {
  connectionId: string
@@ -17,7 +17,7 @@ const InfoIcon: React.FC<InfoIconProps> = ({ connectionId }) => {
  const { t } = useTranslation()
 
  return (
- <HeaderButton
+ <ButtonWithIcon
  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
@@ -6,14 +6,14 @@ import { useTranslation } from 'react-i18next'
 import { RootStackParams, Screens, Stacks } from '../../types/navigators'
 import { testIdWithKey } from '../../utils/testable'
 
-import HeaderButton, { ButtonLocation } from './HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from './ButtonWithIcon'
 
 const SettingsMenu: React.FC = () => {
  const navigation = useNavigation<StackNavigationProp<RootStackParams>>()
  const { t } = useTranslation()
 
  return (
- <HeaderButton
+ <ButtonWithIcon
  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
@@ -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 HeaderButton, { ButtonLocation } from '../buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from '../buttons/ButtonWithIcon'
 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 ? (
- <HeaderButton
+ <ButtonWithIcon
  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 = (
- <HeaderButton
+ <ButtonWithIcon
  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>
- <HeaderButton
+ <ButtonWithIcon
  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
@@ -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 HeaderButton, { ButtonLocation } from './components/buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from './components/buttons/ButtonWithIcon'
 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,
- HeaderButton,
+ ButtonWithIcon,
  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
@@ -3,7 +3,7 @@ import { StackNavigationProp } from '@react-navigation/stack'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 
-import HeaderButton, { ButtonLocation } from '../../../../components/buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from '../../../../components/buttons/ButtonWithIcon'
 import { RootStackParams, Screens, Stacks } from '../../../../types/navigators'
 import { testIdWithKey } from '../../../../utils/testable'
 
@@ -12,7 +12,7 @@ const HistoryMenu: React.FC = () => {
  const { t } = useTranslation()
 
  return (
- <HeaderButton
+ <ButtonWithIcon
  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
@@ -2,7 +2,7 @@ import { createStackNavigator } from '@react-navigation/stack'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 
-import HeaderButton, { ButtonLocation } from '../components/buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
 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: () => (
- <HeaderButton
+ <ButtonWithIcon
  buttonLocation={ButtonLocation.Left}
  accessibilityLabel={t('Global.Back')}
  testID={testIdWithKey('BackButton')}
@@ -69,7 +69,7 @@ const ProofRequestStack: React.FC = () => {
  options={({ navigation, route }) => ({
  title: '',
  headerLeft: () => (
- <HeaderButton
+ <ButtonWithIcon
  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
@@ -12,7 +12,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { AppState, DeviceEventEmitter } from 'react-native'
 
-import HeaderButton, { ButtonLocation } from '../components/buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
 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: () => (
- <HeaderButton
+ <ButtonWithIcon
  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
@@ -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 HeaderButton, { ButtonLocation } from '../components/buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
 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: () => (
- <HeaderButton
+ <ButtonWithIcon
  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
@@ -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 HeaderButton, { ButtonLocation } from '../components/buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
 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: () => (
- <HeaderButton
+ <ButtonWithIcon
  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
@@ -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 HeaderButton, { ButtonLocation } from '../components/buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
 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 = () => (
- <HeaderButton
+ <ButtonWithIcon
  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
@@ -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 HeaderButton, { ButtonLocation } from '../components/buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from '../components/buttons/ButtonWithIcon'
 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 && (
- <HeaderButton
+ <ButtonWithIcon
  buttonLocation={ButtonLocation.Right}
  accessibilityLabel={iconRight.accessibilityLabel!}
  testID={iconRight.testID!}

diff --git a/..._tests__/components/HeaderButton.test.tsx → ...ests__/components/ButtonWithIcon.test.tsx b/..._tests__/components/HeaderButton.test.tsx → ...ests__/components/ButtonWithIcon.test.tsx
@@ -1,13 +1,13 @@
 import { render, fireEvent } from '@testing-library/react-native'
 import React from 'react'
 
-import HeaderButton, { ButtonLocation } from '../../App/components/buttons/HeaderButton'
+import ButtonWithIcon, { ButtonLocation } from '../../App/components/buttons/ButtonWithIcon'
 import { testIdWithKey } from '../../App/utils/testable'
 
-describe('HeaderButton Component', () => {
+describe('ButtonWithIcon Component', () => {
  test('Left alignment renders correctly', () => {
  const tree = render(
- <HeaderButton
+ <ButtonWithIcon
  buttonLocation={ButtonLocation.Left}
  accessibilityLabel={'LeftButton'}
  testID={testIdWithKey('LeftButton')}
@@ -21,7 +21,7 @@ describe('HeaderButton Component', () => {
 
  test('Right alignment renders correctly', () => {
  const tree = render(
- <HeaderButton
+ <ButtonWithIcon
  buttonLocation={ButtonLocation.Right}
  accessibilityLabel={'RightButton'}
  testID={testIdWithKey('RightButton')}
@@ -35,7 +35,7 @@ describe('HeaderButton Component', () => {
 
  test('Right alignment with text renders correctly', () => {
  const tree = render(
- <HeaderButton
+ <ButtonWithIcon
  buttonLocation={ButtonLocation.Right}
  accessibilityLabel={'RightButton'}
  testID={testIdWithKey('RightButton')}
@@ -51,7 +51,7 @@ describe('HeaderButton Component', () => {
  test('Button onPress triggers on press', () => {
  const callback = jest.fn()
  const { getByTestId } = render(
- <HeaderButton
+ <ButtonWithIcon
  buttonLocation={ButtonLocation.Left}
  accessibilityLabel={'LeftButton'}
  testID={testIdWithKey('LeftButton')}

diff --git a/.../__snapshots__/HeaderButton.test.tsx.snap → ..._snapshots__/ButtonWithIcon.test.tsx.snap b/.../__snapshots__/HeaderButton.test.tsx.snap → ..._snapshots__/ButtonWithIcon.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`HeaderButton Component Left alignment renders correctly 1`] = `
+exports[`ButtonWithIcon Component Left alignment renders correctly 1`] = `
 <View
  accessibilityLabel="LeftButton"
  accessibilityRole="button"
@@ -80,7 +80,7 @@ exports[`HeaderButton Component Left alignment renders correctly 1`] = `
 </View>
 `;
 
-exports[`HeaderButton Component Right alignment renders correctly 1`] = `
+exports[`ButtonWithIcon Component Right alignment renders correctly 1`] = `
 <View
  accessibilityLabel="RightButton"
  accessibilityRole="button"
@@ -160,7 +160,7 @@ exports[`HeaderButton Component Right alignment renders correctly 1`] = `
 </View>
 `;
 
-exports[`HeaderButton Component Right alignment with text renders correctly 1`] = `
+exports[`ButtonWithIcon Component Right alignment with text renders correctly 1`] = `
 <View
  accessibilityLabel="RightButton"
  accessibilityRole="button"