Skip to content

Commit 147ccff

Browse files
committed
fix(ts): resolved types error due to merge
1 parent cf52a89 commit 147ccff

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/views/settings/ExternalAccount/IzlyActivation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {AlertTriangle} from "lucide-react-native";
1111
import {AccountService, IzlyAccount} from "@/stores/account/types";
1212
import {useAccounts, useCurrentAccount} from "@/stores/account";
1313
import uuid from "@/utils/uuid-v4";
14+
1415
const IzlyActivation: Screen<"IzlyActivation"> = ({ navigation, route }) => {
1516
const theme = useTheme();
1617
const { colors } = theme;
@@ -126,7 +127,6 @@ const IzlyActivation: Screen<"IzlyActivation"> = ({ navigation, route }) => {
126127
</View>
127128

128129
<NativeText
129-
pointerEvents="none"
130130
style={{
131131
width: "100%",
132132
paddingHorizontal: 16,

src/views/settings/SettingsAbout.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,10 @@ const SettingsAbout: Screen<"SettingsAbout"> = ({ navigation }) => {
187187
<NativeText variant="title">
188188
Version des dépendances
189189
</NativeText>
190-
{PackageJSON.dependencies["react-native"] && PackageJSON.devDependencies.expo &&
190+
{PackageJSON.dependencies["react-native"] &&
191191
<NativeText variant="subtitle">
192-
RN : {PackageJSON.dependencies["react-native"].split("^")[1]} | Expo : {PackageJSON.devDependencies.expo.split("^")[1]}
192+
{/* @ts-expect-error Le module expo est ajouté aux dépendances au moment du build. */}
193+
RN : {PackageJSON.dependencies["react-native"].split("^")[1]} | Expo : {(PackageJSON.devDependencies.expo || PackageJSON.dependencies.expo).split("^")[1]}
193194
</NativeText>
194195
}
195196
</NativeItem>

0 commit comments

Comments
 (0)