Merge branch 'fix/general-fixes' into 'develop'

Fix / general fixes See merge request minds/mobile-native!2807
Minds · Oct 23, 2024 · 6d12046 · 6d12046
2 parents eb0e9dc + 3c0a57b
commit 6d12046
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/auth/ChangeEmailScreen.tsx b/src/auth/ChangeEmailScreen.tsx
@@ -74,7 +74,7 @@ const ChangeEmailScreen = () => {
   return (
     <>
       <CodeConfirmScreen
-        onBack={sp.navigation.goBack}
+        onBack={() => sp.navigation.goBack()}
         title={'Change email'}
         description={sp.i18n.t('auth.mistypedEmail')}
         keyboardType={'email-address'}

diff --git a/src/onboarding/v2/steps/SelectHashtagsScreen.tsx b/src/onboarding/v2/steps/SelectHashtagsScreen.tsx
@@ -71,7 +71,7 @@ export default withErrorBoundaryScreen(
       <ModalContainer
         title="Hashtags"
         contentContainer={theme.alignSelfCenterMaxWidth}
-        onPressBack={sp.navigation.goBack}>
+        onPressBack={() => sp.navigation.goBack()}>
         <View style={[theme.flexContainer, theme.paddingHorizontal4x]}>
           <ScrollView contentContainerStyle={theme.paddingBottom7x}>
             <MText

diff --git a/src/onboarding/v2/steps/SetupChannelScreen.tsx b/src/onboarding/v2/steps/SetupChannelScreen.tsx
@@ -99,7 +99,7 @@ export default withErrorBoundaryScreen(
       <ModalContainer
         title={i18n.t('onboarding.setupChannel')}
         contentContainer={theme.alignSelfCenterMaxWidth}
-        onPressBack={sp.navigation.goBack}
+        onPressBack={() => sp.navigation.goBack()}
         leftButton={
           keyboard.keyboardShown ? (
             <Btn type="action" mode="flat" size="small" onPress={store.save}>

diff --git a/src/onboarding/v2/steps/SuggestedChannelsScreen.tsx b/src/onboarding/v2/steps/SuggestedChannelsScreen.tsx
@@ -46,7 +46,7 @@ export default withErrorBoundaryScreen(
           theme.bgPrimaryBackgroundHighlight,
           theme.alignSelfCenterMaxWidth,
         ]}
-        onPressBack={sp.navigation.goBack}>
+        onPressBack={() => sp.navigation.goBack()}>
         <ScrollView style={theme.flexContainer}>
           {empty}
           {loadingPlaceholder}

diff --git a/src/onboarding/v2/steps/SuggestedGroupsScreen.tsx b/src/onboarding/v2/steps/SuggestedGroupsScreen.tsx
@@ -35,7 +35,7 @@ export default withErrorBoundaryScreen(
       <ModalContainer
         title={i18n.t('onboarding.joinGroup')}
         contentContainer={theme.alignSelfCenterMaxWidth}
-        onPressBack={sp.navigation.goBack}>
+        onPressBack={() => sp.navigation.goBack()}>
         <View style={[theme.flexContainer, theme.paddingHorizontal2x]}>
           <MText
             style={[

diff --git a/src/settings/screens/ResourcesScreen.tsx b/src/settings/screens/ResourcesScreen.tsx
@@ -192,7 +192,7 @@ const ResourcesScreen = ({}: PropsType) => {
                 <MenuItem
                   key={`${item.id}.${option.id}`}
                   // @ts-ignore
-                  title={i18n.t(`settings.${item.id}.${option.id}`)}
+                  title={sp.i18n.t(`settings.${item.id}.${option.id}`)}
                   onPress={option.onPress}
                   noBorderTop={i > 0}
                 />