From 1d55a84c94aab7209fc6fc79d58ff13f000420fb Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Fri, 4 Nov 2022 16:35:04 -0400
Subject: [PATCH] change display of blocked error

---
 static/app-strings.json      |  2 ++
 ui/page/show/view.jsx        | 10 ++++++----
 ui/redux/actions/claims.js   | 27 ++++++++++++++++++---------
 ui/redux/selectors/claims.js |  1 +
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/static/app-strings.json b/static/app-strings.json
index 756121275..491c7edae 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -2319,5 +2319,7 @@
   "Your hub has blocked this content because it subscribes to the following blocking channel:": "Your hub has blocked this content because it subscribes to the following blocking channel:",
   "Your hub has blocked access to this content do to a complaint received under the US Digital Millennium Copyright Act.": "Your hub has blocked access to this content do to a complaint received under the US Digital Millennium Copyright Act.",
   "Autoplay Next is on.": "Autoplay Next is on.",
+  "Content Blocked": "Content Blocked",
+  "Your hub has blocked %content% because it subscribes to the following blocking channel:": "Your hub has blocked %content% because it subscribes to the following blocking channel:",
   "--end--": "--end--"
 }
diff --git a/ui/page/show/view.jsx b/ui/page/show/view.jsx
index 57389e938..49677f004 100644
--- a/ui/page/show/view.jsx
+++ b/ui/page/show/view.jsx
@@ -162,17 +162,19 @@ function ShowPage(props: Props) {
     ) : (
       <Page>
         <Card
-          title={uri}
+          title={__('Content Blocked')}
           subtitle={
             <>
-              {(!errorCensor || !errorCensor.text) &&
-                __('Your hub has blocked this content because it subscribes to the following blocking channel:')}
-              {errorCensor && errorCensor.text}{' '}
+              {errorCensor &&
+                __(`Your hub has blocked %content% because it subscribes to the following blocking channel:`, {
+                  content: uri,
+                })}{' '}
               <Button
                 button="link"
                 navigate={errorCensor && errorCensor.canonical_url}
                 label={errorCensor && errorCensor.name}
               />
+              {errorCensor && <div className={'error__text'}>{`\nMessage:\n${errorCensor.text}\n`}</div>}
             </>
           }
         />
diff --git a/ui/redux/actions/claims.js b/ui/redux/actions/claims.js
index 1c1ceb5c3..70109be63 100644
--- a/ui/redux/actions/claims.js
+++ b/ui/redux/actions/claims.js
@@ -86,16 +86,25 @@ export function doResolveUris(
           // https://github.com/facebook/flow/issues/2221
           if (uriResolveInfo) {
             if (uriResolveInfo.error) {
-              // $FlowFixMe
-              resolveInfo[uri] = {
-                ...fallbackResolveInfo,
-                errorCensor: {
+              // TODO: handled filtered too
+              if (uriResolveInfo.error.name === 'BLOCKED') {
+                // $FlowFixMe
+                resolveInfo[uri] = {
                   // $FlowFixMe
-                  ...uriResolveInfo.error.censor,
-                  // $FlowFixMe
-                  text: uriResolveInfo.error.text,
-                },
-              };
+                  ...fallbackResolveInfo,
+                  errorCensor: {
+                    // $FlowFixMe
+                    ...uriResolveInfo.error.censor,
+                    // $FlowFixMe
+                    text: uriResolveInfo.error.text,
+                  }, // $FlowFixMe
+                };
+              } else {
+                // $FlowFixMe
+                resolveInfo[uri] = {
+                  ...fallbackResolveInfo,
+                };
+              }
             } else {
               if (checkReposts) {
                 if (uriResolveInfo.reposted_claim) {
diff --git a/ui/redux/selectors/claims.js b/ui/redux/selectors/claims.js
index 1f13f1bb9..51b56212c 100644
--- a/ui/redux/selectors/claims.js
+++ b/ui/redux/selectors/claims.js
@@ -83,6 +83,7 @@ export const selectClaimIdForUri = (state: State, uri: string) => selectClaimIds
 
 export const selectReflectingById = (state: State) => selectState(state).reflectingById;
 
+// TODO: remove this.
 export const makeSelectBlacklistedDueToDMCA = (claimUri: string) =>
   createSelector(makeSelectClaimErrorCensor(claimUri), (claimError) => {
     if (!claimError) {