Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chaged description field to (dangerous?) html #131

Merged
merged 4 commits into from
Aug 9, 2023
Merged

Chaged description field to (dangerous?) html #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e43a5f
Chaged description field to (dangerous?) html
banzzai Jul 20, 2023
ce16fd1
Adding HTML to all view states
banzzai Aug 9, 2023
c1dff9b
bumping version number
banzzai Aug 9, 2023
eb148cf
fixing version
banzzai Aug 9, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/transcend-io/consent-manager-ui.git"
},
"homepage": "https://github.com/transcend-io/consent-manager-ui",
"version": "4.1.2",
"version": "4.2.0",
"license": "MIT",
"main": "build/ui",
"files": [
Expand Down
9 changes: 7 additions & 2 deletions src/components/AcceptAllOrMoreChoices.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,13 @@ export function AcceptAllOrMoreChoices({
</p>
</div>
<div>
<p className="paragraph">
{formatMessage(messages.acceptAllDescription)}
<p className="paragraph">
<div
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{
__html: formatMessage(messages.acceptAllDescription),
bencmbrook marked this conversation as resolved.
Show resolved Hide resolved
}}
/>
</p>
</div>
</div>
Expand Down
9 changes: 8 additions & 1 deletion src/components/AcceptOrRejectAdvertising.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,14 @@ export function AcceptOrRejectAdvertising({
</div>
<div>
<p className="paragraph">
{formatMessage(messages.acceptOrRejectAdvertisingDescription)}
<div
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{
__html: formatMessage(
messages.acceptOrRejectAdvertisingDescription,
),
}}
/>
</p>
</div>
</div>
Expand Down
7 changes: 6 additions & 1 deletion src/components/AcceptOrRejectAll.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ export function AcceptOrRejectAll({
</div>
<div>
<p className="paragraph">
{formatMessage(messages.acceptAllDescription)}
<div
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{
__html: formatMessage(messages.acceptAllDescription),
}}
/>
</p>
</div>
</div>
Expand Down
7 changes: 6 additions & 1 deletion src/components/AcceptOrRejectAllOrMoreChoices.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ export function AcceptOrRejectAllOrMoreChoices({
</div>
<div>
<p className="paragraph">
{formatMessage(messages.acceptAllDescription)}
<div
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{
__html: formatMessage(messages.acceptAllDescription),
}}
/>
</p>
</div>
</div>
Expand Down
9 changes: 8 additions & 1 deletion src/components/AcceptOrRejectAnalytics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,14 @@ export function AcceptOrRejectAnalytics({
</div>
<div>
<p className="paragraph">
{formatMessage(messages.acceptOrRejectAnalyticsDescription)}
<div
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{
__html: formatMessage(
messages.acceptOrRejectAnalyticsDescription,
),
}}
/>
</p>
</div>
</div>
Expand Down
Loading