diff --git a/src/components/basicHeader/container/basicHeaderContainer.js b/src/components/basicHeader/container/basicHeaderContainer.tsx similarity index 90% rename from src/components/basicHeader/container/basicHeaderContainer.js rename to src/components/basicHeader/container/basicHeaderContainer.tsx index 59d0acdb2..43e0262c4 100644 --- a/src/components/basicHeader/container/basicHeaderContainer.js +++ b/src/components/basicHeader/container/basicHeaderContainer.tsx @@ -9,7 +9,12 @@ import { setHidePostsThumbnails } from '../../../redux/actions/applicationAction // Components import BasicHeaderView from '../view/basicHeaderView'; -const BasicHeaderContainer = (props) => { + +interface BackHeaderProps { + backIconName:'close'|'arrow-back'; +} + +const BasicHeaderContainer = (props:BackHeaderProps) => { const dispatch = useAppDispatch(); const isHideImages = useAppSelector((state) => state.application.hidePostsThumbnails); diff --git a/src/components/basicHeader/view/basicHeaderView.tsx b/src/components/basicHeader/view/basicHeaderView.tsx index c11fcab65..186e3f1a8 100644 --- a/src/components/basicHeader/view/basicHeaderView.tsx +++ b/src/components/basicHeader/view/basicHeaderView.tsx @@ -45,6 +45,7 @@ const BasicHeaderView = ({ handleRewardChange, enableViewModeToggle, handleSettingsPress, + backIconName, }) => { const [isInputVisible, setIsInputVisible] = useState(false); @@ -112,7 +113,7 @@ const BasicHeaderView = ({ (isModalHeader ? handleOnPressClose() : handleOnPressBackButton())} disabled={disabled} /> diff --git a/src/navigation/stackNavigator.tsx b/src/navigation/stackNavigator.tsx index 731de30de..88cb05808 100644 --- a/src/navigation/stackNavigator.tsx +++ b/src/navigation/stackNavigator.tsx @@ -36,11 +36,10 @@ import { DrawerNavigator } from './drawerNavigator'; const Stack = createNativeStackNavigator(); - export const StackNavigator = () => { return ( - + @@ -61,21 +60,18 @@ export const StackNavigator = () => { - - + - - - + ) } diff --git a/src/screens/follows/container/followsContainer.js b/src/screens/follows/container/followsContainer.js index f76367310..04ea2dffa 100644 --- a/src/screens/follows/container/followsContainer.js +++ b/src/screens/follows/container/followsContainer.js @@ -6,7 +6,6 @@ import get from 'lodash/get'; // Utilities // Services and Actions -import { withNavigation } from '@react-navigation/compat'; import { getFollowers, getFollowing, getFollowSearch } from '../../../providers/hive/dhive'; // Component import FollowsScreen from '../screen/followsScreen'; diff --git a/src/screens/follows/screen/followsScreen.js b/src/screens/follows/screen/followsScreen.js index 14f7b9552..488ac91d7 100644 --- a/src/screens/follows/screen/followsScreen.js +++ b/src/screens/follows/screen/followsScreen.js @@ -61,7 +61,12 @@ class FollowsScreen extends PureComponent { return ( - + index.toString()} diff --git a/src/screens/reblogs/screen/reblogScreen.js b/src/screens/reblogs/screen/reblogScreen.js index da4204b03..6cd2dabbb 100644 --- a/src/screens/reblogs/screen/reblogScreen.js +++ b/src/screens/reblogs/screen/reblogScreen.js @@ -39,6 +39,7 @@ const ReblogScreen = ({ navigation, route }) => { handleSearch(text, 'account')} /> diff --git a/src/screens/transfer/screen/addressScreen.js b/src/screens/transfer/screen/addressScreen.js index 85c00d2f2..2870ea967 100644 --- a/src/screens/transfer/screen/addressScreen.js +++ b/src/screens/transfer/screen/addressScreen.js @@ -27,7 +27,10 @@ const AddressView = ({ return ( - + {accountType !== 'postingKey' && diff --git a/src/screens/transfer/screen/delegateScreen.js b/src/screens/transfer/screen/delegateScreen.js index e67c31119..70a49e897 100644 --- a/src/screens/transfer/screen/delegateScreen.js +++ b/src/screens/transfer/screen/delegateScreen.js @@ -575,7 +575,7 @@ class DelegateScreen extends Component { return ( - + - + - + { +const VotersScreen = ({ route }) => { const intl = useIntl(); - const [content, setContent] = useState(route.params?.content ?? null); + const [content] = useState(route.params?.content ?? null); const [activeVotes, setActiveVotes] = useState(get(content, 'active_votes') || []); - const [isLoading, setIsLoading] = useState(false); const headerTitle = intl.formatMessage({ id: 'voters.voters_info', @@ -54,6 +53,7 @@ const VotersScreen = ({ route, navigation }) => { {({ data, filterResult, filterIndex, handleOnVotersDropdownSelect, handleSearch }) => ( <> handleSearch(text, 'voter')}