Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/screens/ActDetail/ActDetailScreen.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ export default StyleSheet.create({
linkStyle: {
color: Colors.primary,
textDecorationLine: "underline",
textDecorationColor: Colors.primary,
Comment thread
PierreBresson marked this conversation as resolved.
},
});
4 changes: 2 additions & 2 deletions app/screens/ActDetail/ActDetailScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { ScrollView, useWindowDimensions } from "react-native";
import { useRoute } from "@react-navigation/native";
import HTML from "react-native-render-html";
import { RenderHTML } from "@native-html/render";

import { HTMLImage } from "components";
import { ui } from "utils";
Expand Down Expand Up @@ -30,7 +30,7 @@ const ActDetailScreen: NavStatelessComponent = () => {
contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={{ paddingBottom: paddingBottom }}
>
<HTML
<RenderHTML
source={{ html: body }}
contentWidth={contentWidth}
baseStyle={baseFontStyle}
Expand Down
5 changes: 3 additions & 2 deletions app/screens/InfoModal/InfoModalScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { ScrollView, StyleSheet } from "react-native";
import { useRoute } from "@react-navigation/native";
import HTML from "react-native-render-html";
import { RenderHTML } from "@native-html/render";

import { ui } from "utils";
import { NavStatelessComponent } from "interfaces";
Expand All @@ -18,6 +18,7 @@ const InfoModalScreen: NavStatelessComponent = () => {
a: {
color: Colors.primary,
textDecorationLine: "underline",
textDecorationColor: Colors.primary,
},
});
const route = useRoute();
Expand All @@ -40,7 +41,7 @@ const InfoModalScreen: NavStatelessComponent = () => {
style={styles.container}
contentInsetAdjustmentBehavior="automatic"
>
<HTML
<RenderHTML
source={{ html }}
contentWidth={Layout.screen.width}
baseStyle={styles.text}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`InfoModalScreen renders correctly 1`] = `
}
}
>
<HTML
<RenderHTML
baseStyle={
{
"fontSize": 18,
Expand Down Expand Up @@ -56,6 +56,7 @@ exports[`InfoModalScreen renders correctly 1`] = `
{
"a": {
"color": "#0F853B",
"textDecorationColor": "#0F853B",
"textDecorationLine": "underline",
},
}
Expand Down
6 changes: 4 additions & 2 deletions jest/mock/node-modules/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ jest.mock("react-redux", () => {
};
});

jest.mock("react-native-render-html", () => {
jest.mock("@native-html/render", () => {
const createMock = require("../../utils").createMock;

return createMock("HTML");
return {
RenderHTML: createMock("RenderHTML"),
};
});

jest.mock("react-native-keyboard-aware-scroll-view", () => {
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
},
"dependencies": {
"@expo/vector-icons": "^15.0.3",
"@native-html/render": "^1.0.0-alpha.0",
"@react-native-async-storage/async-storage": "2.2.0",
"@react-native-community/datetimepicker": "8.4.4",
"@react-native-community/slider": "5.0.1",
Expand Down Expand Up @@ -72,9 +73,8 @@
"react-native-pager-view": "6.9.1",
"react-native-progress": "5.0.1",
"react-native-reanimated": "~4.1.1",
"react-native-render-html": "^6.3.4",
"react-native-safe-area-context": "~5.6.0",
"react-native-screens": "^4.19.0",
"react-native-screens": "4.19.0",
Comment thread
PierreBresson marked this conversation as resolved.
"react-native-svg": "15.12.1",
"react-native-worklets": "0.5.1",
"react-redux": "8.0.4",
Expand Down Expand Up @@ -126,4 +126,4 @@
},
"name": "nmf-app",
"version": "1.0.0"
}
}
Loading