From a665b74a043144505bd1fc5615ed8342a99042b5 Mon Sep 17 00:00:00 2001
From: eniamza <65225917+Eniamza@users.noreply.github.com>
Date: Sun, 8 Aug 2021 22:15:16 +0600
Subject: [PATCH 1/4] Fix: Paid embed warning was showing lbry.tv
---
ui/page/embedWrapper/view.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/page/embedWrapper/view.jsx b/ui/page/embedWrapper/view.jsx
index 0ec506da7..87d183221 100644
--- a/ui/page/embedWrapper/view.jsx
+++ b/ui/page/embedWrapper/view.jsx
@@ -110,7 +110,7 @@ const EmbedWrapperPage = (props: Props) => {
{__('Paid content cannot be embedded.')}
-
+
)}
--
2.45.2
From 50fbff30c1845bce5ba82f97b5f043f988aeebd4 Mon Sep 17 00:00:00 2001
From: eniamza <65225917+Eniamza@users.noreply.github.com>
Date: Sun, 8 Aug 2021 22:22:04 +0600
Subject: [PATCH 2/4] Added: Change for PR #6819
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb3ef272b..3b585140e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Added \ and = to reserved symbol warning _community pr!_ ([#6733](https://github.com/lbryio/lbry-desktop/pull/6733))
- Don't break words in chat + fix text overflow past 3 dot menu _community pr!_ ([#6602](https://github.com/lbryio/lbry-desktop/pull/6602))
- Fix embed shows wrong OG metadata _community pr!_ ([#6815](https://github.com/lbryio/lbry-desktop/pull/6815))
+- Fix Paid embed warning overlay redirection button now links to odysee _community pr!_ ([#6819](https://github.com/lbryio/lbry-desktop/pull/6819))
## [0.51.1] - [2021-06-26]
--
2.45.2
From bc16e56c6165ac333e3d55b58e21b35d2cf5d9ed Mon Sep 17 00:00:00 2001
From: eniamza <65225917+Eniamza@users.noreply.github.com>
Date: Wed, 11 Aug 2021 03:29:52 +0600
Subject: [PATCH 3/4] Revert: Changelog for conflicts
---
CHANGELOG.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b585140e..fb3ef272b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,7 +35,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Added \ and = to reserved symbol warning _community pr!_ ([#6733](https://github.com/lbryio/lbry-desktop/pull/6733))
- Don't break words in chat + fix text overflow past 3 dot menu _community pr!_ ([#6602](https://github.com/lbryio/lbry-desktop/pull/6602))
- Fix embed shows wrong OG metadata _community pr!_ ([#6815](https://github.com/lbryio/lbry-desktop/pull/6815))
-- Fix Paid embed warning overlay redirection button now links to odysee _community pr!_ ([#6819](https://github.com/lbryio/lbry-desktop/pull/6819))
## [0.51.1] - [2021-06-26]
--
2.45.2
From b08a9f1ee99d02f12398a713395352c5079640f6 Mon Sep 17 00:00:00 2001
From: Eniamza
Date: Wed, 11 Aug 2021 04:38:07 +0600
Subject: [PATCH 4/4] Fix: Use site title instead
---
CHANGELOG.md | 1 +
ui/page/embedWrapper/view.jsx | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1307a778..becebef46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Don't break words in chat + fix text overflow past 3 dot menu _community pr!_ ([#6602](https://github.com/lbryio/lbry-desktop/pull/6602))
- Fix embed shows wrong OG metadata _community pr!_ ([#6815](https://github.com/lbryio/lbry-desktop/pull/6815))
- Fix OG: "Unparsable data structure - Truncated Unicode character" _community pr!_ ([#6839](https://github.com/lbryio/lbry-desktop/pull/6839))
+- Fix Paid embed warning overlay redirection button now links to odysee _community pr!_ ([#6819](https://github.com/lbryio/lbry-desktop/pull/6819))
## [0.51.1] - [2021-06-26]
diff --git a/ui/page/embedWrapper/view.jsx b/ui/page/embedWrapper/view.jsx
index 87d183221..78a5ce8fe 100644
--- a/ui/page/embedWrapper/view.jsx
+++ b/ui/page/embedWrapper/view.jsx
@@ -1,4 +1,5 @@
// @flow
+import { SITE_NAME } from 'config';
import React, { useEffect } from 'react';
import classnames from 'classnames';
import FileRender from 'component/fileRender';
@@ -110,7 +111,7 @@ const EmbedWrapperPage = (props: Props) => {
{__('Paid content cannot be embedded.')}
-
+
)}
--
2.45.2