From f75b7dd164271a9c9866f5701809ba67a027dfa4 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Fri, 17 Dec 2021 17:38:18 -0500
Subject: [PATCH 01/29] upgrade electron to 15

---
 electron/createWindow.js              |  9 +++--
 electron/index.js                     |  2 +
 package.json                          |  3 +-
 ui/component/common/file-selector.jsx |  4 +-
 ui/component/fileRender/view.jsx      |  2 +-
 ui/component/header/view.jsx          |  4 +-
 ui/component/walletBackup/view.jsx    |  3 +-
 ui/index.jsx                          |  3 +-
 ui/redux/actions/app.js               |  3 +-
 ui/redux/reducers/app.js              |  2 +-
 ui/util/context-menu.js               |  3 +-
 yarn.lock                             | 53 +++++++++++++--------------
 12 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/electron/createWindow.js b/electron/createWindow.js
index 042fae9b1..f1a796c3b 100644
--- a/electron/createWindow.js
+++ b/electron/createWindow.js
@@ -9,7 +9,7 @@ import { TO_TRAY_WHEN_CLOSED } from 'constants/settings';
 
 import setupBarMenu from './menu/setupBarMenu';
 import * as PAGES from 'constants/pages';
-
+const remote = require('@electron/remote/main');
 function GetAppLangCode() {
   // https://www.electronjs.org/docs/api/locales
   // 1. Gets the user locale.
@@ -54,6 +54,7 @@ export default appState => {
       webSecurity: !isDev,
       plugins: true,
       nodeIntegration: true,
+      contextIsolation: false,
       enableRemoteModule: true, // see about removing this
     },
   };
@@ -62,6 +63,7 @@ export default appState => {
   const rendererURL = isDev ? `http://localhost:${WEBPACK_ELECTRON_PORT}` : `file://${__dirname}/index.html`;
 
   let window = new BrowserWindow(windowConfiguration);
+  remote.enable(window.webContents);
 
   // Let us register listeners on the window, so we can update the state
   // automatically (the listeners will be removed when the window is closed)
@@ -187,9 +189,8 @@ export default appState => {
     window = null;
   });
 
-  window.webContents.on('new-window', (event, url) => {
-    event.preventDefault();
-    shell.openExternal(url);
+  window.webContents.setWindowOpenHandler((details) => {
+    return { action: 'deny' };
   });
 
   window.webContents.on('update-target-url', (event, url) => {
diff --git a/electron/index.js b/electron/index.js
index b73653280..a40822e4e 100644
--- a/electron/index.js
+++ b/electron/index.js
@@ -18,6 +18,8 @@ import installDevtools from './installDevtools';
 import fs from 'fs';
 import path from 'path';
 const { download } = require('electron-dl');
+const remote = require('@electron/remote/main');
+remote.initialize();
 const filePath = path.join(process.resourcesPath, 'static', 'upgradeDisabled');
 let upgradeDisabled;
 try {
diff --git a/package.json b/package.json
index 4da1e059b..a11fea0b3 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "postinstall:warning": "echo '\n\nWARNING\n\nNot all node modules were installed because NODE_ENV is set to \"production\".\nThis should only be set after installing dependencies with \"yarn\". The app will not work.\n\n'"
   },
   "dependencies": {
+    "@electron/remote": "^2.0.1",
     "@ungap/from-entries": "^0.2.1",
     "auto-launch": "^5.0.5",
     "electron-dl": "^3.2.0",
@@ -121,7 +122,7 @@
     "dom-scroll-into-view": "^1.2.1",
     "dotenv-defaults": "^2.0.1",
     "dotenv-webpack": "^1.8.0",
-    "electron": "11.5.0",
+    "electron": "15.3.2",
     "electron-builder": "^22.9.1",
     "electron-devtools-installer": "^3.1.1",
     "electron-is-dev": "^0.3.0",
diff --git a/ui/component/common/file-selector.jsx b/ui/component/common/file-selector.jsx
index 9e428986a..38dd92102 100644
--- a/ui/component/common/file-selector.jsx
+++ b/ui/component/common/file-selector.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react';
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import Button from 'component/button';
 import { FormField } from 'component/common/form';
 
@@ -47,7 +47,7 @@ class FileSelector extends React.PureComponent<Props> {
   };
 
   handleDirectoryInputSelection = () => {
-    remote.dialog.showOpenDialog({ properties: ['openDirectory'] }).then(result => {
+    remote.dialog.showOpenDialog({ properties: ['openDirectory'] }).then((result) => {
       const path = result && result.filePaths[0];
       if (path) {
         // $FlowFixMe
diff --git a/ui/component/fileRender/view.jsx b/ui/component/fileRender/view.jsx
index b99529fb3..0ffe92027 100644
--- a/ui/component/fileRender/view.jsx
+++ b/ui/component/fileRender/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import React from 'react';
 import classnames from 'classnames';
 import * as RENDER_MODES from 'constants/file_render_modes';
diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx
index 2715fe630..b8aadb5d6 100644
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@@ -17,10 +17,8 @@ import NotificationHeaderButton from 'component/notificationHeaderButton';
 import ChannelThumbnail from 'component/channelThumbnail';
 import SkipNavigationButton from 'component/skipNavigationButton';
 import Logo from 'component/logo';
-// @if TARGET='app'
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import { IS_MAC } from 'component/app/view';
-// @endif
 
 type Props = {
   user: ?User,
diff --git a/ui/component/walletBackup/view.jsx b/ui/component/walletBackup/view.jsx
index 3592cbdfb..22df3bffc 100644
--- a/ui/component/walletBackup/view.jsx
+++ b/ui/component/walletBackup/view.jsx
@@ -1,6 +1,7 @@
 // @flow
 import * as React from 'react';
-import { shell, remote } from 'electron';
+import { shell } from 'electron';
+import * as remote from '@electron/remote';
 import Button from 'component/button';
 import CopyableText from 'component/copyableText';
 import AdmZip from 'adm-zip';
diff --git a/ui/index.jsx b/ui/index.jsx
index 0f88a4900..c46e2f8e1 100644
--- a/ui/index.jsx
+++ b/ui/index.jsx
@@ -5,7 +5,8 @@ import SnackBar from 'component/snackBar';
 import SplashScreen from 'component/splash';
 import * as ACTIONS from 'constants/action_types';
 import { changeZoomFactor } from 'util/zoomWindow';
-import { ipcRenderer, remote, shell } from 'electron';
+import { ipcRenderer, shell } from 'electron';
+import * as remote from '@electron/remote';
 import moment from 'moment';
 import * as MODALS from 'constants/modal_types';
 import React, { Fragment, useState, useEffect } from 'react';
diff --git a/ui/redux/actions/app.js b/ui/redux/actions/app.js
index 84da06b75..d9348b752 100644
--- a/ui/redux/actions/app.js
+++ b/ui/redux/actions/app.js
@@ -1,6 +1,7 @@
 import { execSync } from 'child_process';
 import isDev from 'electron-is-dev';
-import { ipcRenderer, remote } from 'electron';
+import { ipcRenderer } from 'electron';
+import * as remote from '@electron/remote';
 import * as ACTIONS from 'constants/action_types';
 import * as MODALS from 'constants/modal_types';
 import * as SETTINGS from 'constants/settings';
diff --git a/ui/redux/reducers/app.js b/ui/redux/reducers/app.js
index 4772ebb2d..66bb53ed6 100644
--- a/ui/redux/reducers/app.js
+++ b/ui/redux/reducers/app.js
@@ -1,7 +1,7 @@
 // @flow
 
 import * as ACTIONS from 'constants/action_types';
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 
 // @if TARGET='app'
 const win = remote.BrowserWindow.getFocusedWindow();
diff --git a/ui/util/context-menu.js b/ui/util/context-menu.js
index 7d047af65..be2ea4a1a 100644
--- a/ui/util/context-menu.js
+++ b/ui/util/context-menu.js
@@ -1,4 +1,5 @@
-import { clipboard, remote, shell } from 'electron';
+import { clipboard, shell } from 'electron';
+import * as remote from '@electron/remote';
 import { convertToShareLink } from 'util/lbryURI';
 const isDev = process.env.NODE_ENV !== 'production';
 
diff --git a/yarn.lock b/yarn.lock
index 011127b58..7738bf4cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1270,22 +1270,27 @@
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
-"@electron/get@^1.0.1":
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3"
-  integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==
+"@electron/get@^1.13.0":
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
+  integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
     got "^9.6.0"
     progress "^2.0.3"
-    sanitize-filename "^1.6.2"
+    semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
-    global-agent "^2.0.2"
+    global-agent "^3.0.0"
     global-tunnel-ng "^2.7.1"
 
+"@electron/remote@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de"
+  integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==
+
 "@exponent/electron-cookies@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@exponent/electron-cookies/-/electron-cookies-2.0.0.tgz#4cf8dcf851454036cc524c40e9e482fc4e23f2d9"
@@ -1769,10 +1774,10 @@
   version "13.9.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.0.tgz#5b6ee7a77faacddd7de719017d0bc12f52f81589"
 
-"@types/node@^12.0.12":
-  version "12.12.62"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.62.tgz#733923d73669188d35950253dd18a21570085d2b"
-  integrity sha512-qAfo81CsD7yQIM9mVyh6B/U47li5g7cfpVQEDMfQeF8pSZVwzbhwU3crc0qG4DmpsebpJPR49AKOExQyJ05Cpg==
+"@types/node@^14.6.2":
+  version "14.18.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.1.tgz#459886b51f52aa923dc06b9ea81cb8b1d733e9d3"
+  integrity sha512-fTFWOFrgAkj737w1o0HLTIgisgYHnsZfeiqhG1Ltrf/iJjudEbUwetQAsfrtVE49JGwvpEzQR+EbMkIqG4227g==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -3737,11 +3742,6 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
 
-core-js@^3.6.5:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
-  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
-
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -4710,13 +4710,13 @@ electron-window-state@^4.1.1:
     jsonfile "^2.2.3"
     mkdirp "^0.5.1"
 
-electron@11.5.0:
-  version "11.5.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-11.5.0.tgz#f1650543b9d8f2047d3807755bdb120153ed210f"
-  integrity sha512-WjNDd6lGpxyiNjE3LhnFCAk/D9GIj1rU3GSDealVShhkkkPR3Vh4q8ErXGDl1OAO/faomVa10KoFPUN/pLbNxg==
+electron@15.3.2:
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz#4f0cbad781d14e0194f5dfef1709e09a70c8074a"
+  integrity sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ==
   dependencies:
-    "@electron/get" "^1.0.1"
-    "@types/node" "^12.0.12"
+    "@electron/get" "^1.13.0"
+    "@types/node" "^14.6.2"
     extract-zip "^1.0.3"
 
 elegant-spinner@^1.0.1:
@@ -5914,13 +5914,12 @@ glob@^7.0.5, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-agent@^2.0.2:
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
-  integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==
+global-agent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
+  integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
   dependencies:
     boolean "^3.0.1"
-    core-js "^3.6.5"
     es6-error "^4.1.1"
     matcher "^3.0.0"
     roarr "^2.15.3"
@@ -10692,7 +10691,7 @@ safe-regex@^1.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
+sanitize-filename@^1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
   integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
-- 
2.45.3


From b02731badbe6f15349f52ddbc1f260321b477d34 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Fri, 17 Dec 2021 18:12:21 -0500
Subject: [PATCH 02/29] linter

---
 electron/createWindow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron/createWindow.js b/electron/createWindow.js
index f1a796c3b..399c8ac82 100644
--- a/electron/createWindow.js
+++ b/electron/createWindow.js
@@ -1,5 +1,5 @@
 import { WEBPACK_ELECTRON_PORT } from 'config';
-import { app, BrowserWindow, dialog, shell, screen, nativeImage } from 'electron';
+import { app, BrowserWindow, dialog, screen, nativeImage } from 'electron';
 import isDev from 'electron-is-dev';
 import windowStateKeeper from 'electron-window-state';
 import SUPPORTED_LANGUAGES from 'constants/supported_languages';
-- 
2.45.3


From 18619cac203634990444f554c4d479b9c658b343 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Mon, 20 Dec 2021 16:20:16 -0500
Subject: [PATCH 03/29] successfully repair default hubs when custom hub fails
 (#7366)

---
 ui/redux/actions/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/redux/actions/settings.js b/ui/redux/actions/settings.js
index 08278b4b4..6ee990bd3 100644
--- a/ui/redux/actions/settings.js
+++ b/ui/redux/actions/settings.js
@@ -68,7 +68,7 @@ export function doClearDaemonSetting(key) {
     const state = getState();
     const ready = selectPrefsReady(state);
 
-    if (!ready) {
+    if (!ready && key !== DAEMON_SETTINGS.LBRYUM_SERVERS) {
       return dispatch(doAlertWaitingForSync());
     }
 
-- 
2.45.3


From 44fd8349a7b07ecc1cf42dff7be06c104789c65d Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Thu, 23 Dec 2021 11:31:20 -0500
Subject: [PATCH 04/29] fix comment replies (#7367)

---
 ui/component/commentCreate/view.jsx | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/ui/component/commentCreate/view.jsx b/ui/component/commentCreate/view.jsx
index d1108cd0e..2ef7f36ad 100644
--- a/ui/component/commentCreate/view.jsx
+++ b/ui/component/commentCreate/view.jsx
@@ -164,7 +164,7 @@ export function CommentCreate(props: Props) {
   function handleCommentChange(event) {
     let commentValue;
     if (isReply) {
-      commentValue = event.target.value;
+      commentValue = advancedEditor ? event : event.target.value;
     } else {
       commentValue = advancedEditor ? event : event.target.value;
     }
@@ -596,20 +596,6 @@ export function CommentCreate(props: Props) {
                     setActiveTab(TAB_LBC);
                   }}
                 />
-                {/* @if TARGET='web' */}
-                {stripeEnvironment && (
-                  <Button
-                    disabled={disabled}
-                    button="alt"
-                    className="thisButton"
-                    icon={ICONS.FINANCE}
-                    onClick={() => {
-                      setIsSupportComment(true);
-                      setActiveTab(TAB_FIAT);
-                    }}
-                  />
-                )}
-                {/* @endif */}
               </>
             )}
             {isReply && !minTip && (
-- 
2.45.3


From 1b2a6f6651a37625bf1ab3ca0e10294e122e6a49 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Fri, 24 Dec 2021 12:37:14 -0500
Subject: [PATCH 05/29] update windows code signing (#7368)

* update windows code signing

* reenable windows
---
 .github/workflows/deploy.yml   |   4 ++--
 build/cert-2021-2022.pfx       | Bin 0 -> 8541 bytes
 build/win-csc-2021-2022-08.p12 | Bin 4197 -> 0 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 build/cert-2021-2022.pfx
 delete mode 100644 build/win-csc-2021-2022-08.p12

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7ac7f60ee..2a549f0da 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -24,7 +24,7 @@ jobs:
         os:
           - ubuntu-latest
           - macos-latest
-#          - windows-latest
+          - windows-latest
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -61,7 +61,7 @@ jobs:
           ARTIFACTS_SECRET: ${{ secrets.ARTIFACTS_SECRET }}
           ARTIFACTS_REGION: ${{ secrets.ARTIFACTS_REGION }}
 
-          WIN_CSC_LINK: https://raw.githubusercontent.com/lbryio/lbry-desktop/master/build/win-csc-2021-2022-08.p12
+          WIN_CSC_LINK: https://raw.githubusercontent.com/lbryio/lbry-desktop/master/build/cert-2021-2022.pfx
           CSC_LINK: https://s3.amazonaws.com/files.lbry.io/cert/osx-csc-2021-2022.p12
 
           # UI
diff --git a/build/cert-2021-2022.pfx b/build/cert-2021-2022.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..ddd4358f4abcdab19f646896ccfaccb6b43f46b0
GIT binary patch
literal 8541
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
Rh#X}dLsJ7iU;gJx`#+0LNu2-y

literal 0
HcmV?d00001

diff --git a/build/win-csc-2021-2022-08.p12 b/build/win-csc-2021-2022-08.p12
deleted file mode 100644
index 6c40f2490f8c53feb27b70a65c9daefac9bfb1e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4197
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

-- 
2.45.3


From cb7f2e87cf6bb7a8e8ea1108b0f8661829ab4ed7 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Fri, 24 Dec 2021 13:08:47 -0500
Subject: [PATCH 06/29] use parser (#7369)

---
 package.json                             |  1 +
 ui/component/common/markdown-preview.jsx | 20 ++++-----
 yarn.lock                                | 54 +++++++++++++++++++++++-
 3 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 4da1e059b..aef8f4528 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "humanize-duration": "^3.27.0",
     "if-env": "^1.0.4",
     "match-sorter": "^6.3.0",
+    "node-html-parser": "^5.1.0",
     "parse-duration": "^1.0.0",
     "proxy-polyfill": "0.1.6",
     "re-reselect": "^4.0.0",
diff --git a/ui/component/common/markdown-preview.jsx b/ui/component/common/markdown-preview.jsx
index 587c234fd..7af303c73 100644
--- a/ui/component/common/markdown-preview.jsx
+++ b/ui/component/common/markdown-preview.jsx
@@ -16,7 +16,7 @@ import ZoomableImage from 'component/zoomableImage';
 import { CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS } from 'config';
 import Button from 'component/button';
 import * as ICONS from 'constants/icons';
-
+import { parse } from 'node-html-parser';
 type SimpleTextProps = {
   children?: React.Node,
 };
@@ -136,16 +136,16 @@ const MarkdownPreview = (props: MarkdownProps) => {
   const strippedContent = content
     ? content.replace(REPLACE_REGEX, (iframeHtml, y, iframeSrc) => {
         // Let the browser try to create an iframe to see if the markup is valid
-        const outer = document.createElement('div');
-        outer.innerHTML = iframeHtml;
-        const iframe = ((outer.querySelector('iframe'): any): ?HTMLIFrameElement);
+        let lbrySrc;
+        try {
+          let p = parse(iframeHtml);
+          const tag = p.getElementsByTagName('iframe');
+          const s = tag[0];
+          lbrySrc = s && s.getAttribute('src');
+        } catch (e) {}
 
-        if (iframe) {
-          const src = iframe.src;
-
-          if (src && src.startsWith('lbry://')) {
-            return src;
-          }
+        if (lbrySrc && lbrySrc.startsWith('lbry://')) {
+          return lbrySrc;
         }
 
         return iframeHtml;
diff --git a/yarn.lock b/yarn.lock
index 011127b58..aa0e13b66 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3962,6 +3962,17 @@ css-select@^2.0.0:
     domutils "^1.7.0"
     nth-check "^1.0.2"
 
+css-select@^4.1.3:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.0.tgz#ab28276d3afb00cc05e818bd33eb030f14f57895"
+  integrity sha512-6YVG6hsH9yIb/si3Th/is8Pex7qnVHO6t7q7U6TIUnkQASGbS8tnUDBftnPynLNnuUl/r2+PTd0ekiiq7R0zJw==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^5.1.0"
+    domhandler "^4.3.0"
+    domutils "^2.8.0"
+    nth-check "^2.0.1"
+
 css-tree@1.0.0-alpha.37:
   version "1.0.0-alpha.37"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
@@ -3977,6 +3988,11 @@ css-what@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz#f4a8f12421064621b456755e34a03a2c22df5da1"
 
+css-what@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
+  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
+
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
@@ -4403,6 +4419,11 @@ domelementtype@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
 
+domelementtype@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
+
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
@@ -4416,6 +4437,13 @@ domhandler@^3.0.0, domhandler@^3.2.0:
   dependencies:
     domelementtype "^2.0.1"
 
+domhandler@^4.2.0, domhandler@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626"
+  integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==
+  dependencies:
+    domelementtype "^2.2.0"
+
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
@@ -4439,6 +4467,15 @@ domutils@^2.0.0:
     domelementtype "^2.0.1"
     domhandler "^3.2.0"
 
+domutils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
 dot-case@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
@@ -6238,7 +6275,7 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
-he@^1.2.0:
+he@1.2.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -8389,6 +8426,14 @@ node-forge@0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
 
+node-html-parser@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-5.1.0.tgz#753f5a60cdfe6d027c15857cb817df592c18c998"
+  integrity sha512-l6C1Gf1o7YuxeMGa17PypEez/rj+ii3q4/NZG37nRmWSLDjHyB0WNrlE4h2UW92D0JSfUSfu+lOvxThttVe7Jw==
+  dependencies:
+    css-select "^4.1.3"
+    he "1.2.0"
+
 "node-libs-browser@^1.0.0 || ^2.0.0", node-libs-browser@^2.1.0, node-libs-browser@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
@@ -8556,6 +8601,13 @@ nth-check@^1.0.2, nth-check@~1.0.1:
   dependencies:
     boolbase "~1.0.0"
 
+nth-check@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
+  dependencies:
+    boolbase "^1.0.0"
+
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-- 
2.45.3


From 24c516acb089ca49b3382598ae07cad1a6a2aeda Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Fri, 24 Dec 2021 13:10:06 -0500
Subject: [PATCH 07/29] v0.52.0-alpha.11

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aef8f4528..a4052f459 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lbry",
-  "version": "0.52.0-alpha.10",
+  "version": "0.52.0-alpha.11",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
-- 
2.45.3


From ca15faef027c069106ac5b3bf95ae7a98f824d05 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Wed, 29 Dec 2021 15:58:55 -0500
Subject: [PATCH 08/29] fix advanced editor in description (#7372)

---
 ui/component/publishDescription/view.jsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/component/publishDescription/view.jsx b/ui/component/publishDescription/view.jsx
index 193809273..ba80c93bb 100644
--- a/ui/component/publishDescription/view.jsx
+++ b/ui/component/publishDescription/view.jsx
@@ -18,11 +18,17 @@ function PublishDescription(props: Props) {
     setAdvancedEditor(!advancedEditor);
   }
 
+  function handleCommentChange(event) {
+    let descriptionValue = advancedEditor ? event : event.target.value;
+
+    updatePublishForm({ description: descriptionValue });
+  }
+
   return (
     <Card
       actions={
         <FormField
-          type={'textarea'}
+          type={advancedEditor ? 'markdown' : 'textarea'}
           name="content_description"
           label={__('Description')}
           placeholder={__(
@@ -30,7 +36,7 @@ function PublishDescription(props: Props) {
           )}
           value={description}
           disabled={disabled}
-          onChange={(value) => updatePublishForm({ description: advancedEditor ? value : value.target.value })}
+          onChange={handleCommentChange}
           quickActionLabel={advancedEditor ? __('Simple Editor') : __('Advanced Editor')}
           quickActionHandler={toggleMarkdown}
           textAreaMaxLength={FF_MAX_CHARS_IN_DESCRIPTION}
-- 
2.45.3


From 59a188044e5df4762145281cf7d7fe2902b6b202 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Thu, 30 Dec 2021 13:10:10 -0500
Subject: [PATCH 09/29] fix private lists editing (#7374)

---
 ui/component/collectionActions/view.jsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ui/component/collectionActions/view.jsx b/ui/component/collectionActions/view.jsx
index 73576bf1c..2c454bb70 100644
--- a/ui/component/collectionActions/view.jsx
+++ b/ui/component/collectionActions/view.jsx
@@ -188,12 +188,10 @@ function CollectionActions(props: Props) {
           {lhsSection}
           {rhsSection}
         </div>
-        {uri && (
-          <div className="section">
-            {infoButton}
-            {showEditButton}
-          </div>
-        )}
+        <div className="section">
+          {uri && infoButton}
+          {showEditButton}
+        </div>
       </div>
     );
   }
-- 
2.45.3


From 36890601a8920c151697d65863a6cb10bcb745d3 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Thu, 30 Dec 2021 13:36:08 -0500
Subject: [PATCH 10/29] no empty lists on lists page (#7375)

---
 ui/component/collectionsListMine/view.jsx | 66 ++++++++++-------------
 1 file changed, 29 insertions(+), 37 deletions(-)

diff --git a/ui/component/collectionsListMine/view.jsx b/ui/component/collectionsListMine/view.jsx
index 4db77a6b5..e50cc294c 100644
--- a/ui/component/collectionsListMine/view.jsx
+++ b/ui/component/collectionsListMine/view.jsx
@@ -95,44 +95,36 @@ export default function CollectionsListMine(props: Props) {
       {builtin.map((list: Collection) => {
         const { items: itemUrls } = list;
         return (
-          <div className="claim-grid__wrapper" key={list.name}>
-            <>
-              {Boolean(itemUrls && itemUrls.length) && (
-                <>
-                  <h1 className="claim-grid__header">
-                    <Button
-                      className="claim-grid__title"
-                      button="link"
-                      navigate={`/$/${PAGES.LIST}/${list.id}`}
-                      label={
-                        <span className="claim-grid__title-span">
-                          {__(`${list.name}`)}
-                          <div className="claim-grid__title--empty">
-                            <Icon
-                              className="icon--margin-right"
-                              icon={
-                                (list.id === COLLECTIONS_CONSTS.WATCH_LATER_ID && ICONS.TIME) ||
-                                (list.id === COLLECTIONS_CONSTS.FAVORITES_ID && ICONS.STAR) ||
-                                ICONS.STACK
-                              }
-                            />
-                            {itemUrls.length}
-                          </div>
-                        </span>
-                      }
-                    />
-                  </h1>
-                  <ClaimList tileLayout key={list.name} uris={itemUrls.slice(0, 6)} collectionId={list.id} />
-                </>
-              )}
-              {!(itemUrls && itemUrls.length) && (
-                <h1 className="claim-grid__header claim-grid__title">
-                  {__(`${list.name}`)}
-                  <div className="claim-grid__title--empty">{__('(Empty) --[indicates empty playlist]--')}</div>
+          <>
+            {Boolean(itemUrls && itemUrls.length) && (
+              <div className="claim-grid__wrapper" key={list.name}>
+                <h1 className="claim-grid__header">
+                  <Button
+                    className="claim-grid__title"
+                    button="link"
+                    navigate={`/$/${PAGES.LIST}/${list.id}`}
+                    label={
+                      <span className="claim-grid__title-span">
+                        {__(`${list.name}`)}
+                        <div className="claim-grid__title--empty">
+                          <Icon
+                            className="icon--margin-right"
+                            icon={
+                              (list.id === COLLECTIONS_CONSTS.WATCH_LATER_ID && ICONS.TIME) ||
+                              (list.id === COLLECTIONS_CONSTS.FAVORITES_ID && ICONS.STAR) ||
+                              ICONS.STACK
+                            }
+                          />
+                          {itemUrls.length}
+                        </div>
+                      </span>
+                    }
+                  />
                 </h1>
-              )}
-            </>
-          </div>
+                <ClaimList tileLayout key={list.name} uris={itemUrls.slice(0, 6)} collectionId={list.id} />
+              </div>
+            )}
+          </>
         );
       })}
       <div className="claim-grid__wrapper">
-- 
2.45.3


From 06006464792a715b6e3359711f55f90275b624b9 Mon Sep 17 00:00:00 2001
From: Daniela Narvaez <danielabnarvaez85@gmail.com>
Date: Thu, 30 Dec 2021 15:48:26 -0300
Subject: [PATCH 11/29] update input border color in light theme #5551 (#7373)

---
 ui/scss/component/_form-field.scss | 2 +-
 ui/scss/init/_base-theme.scss      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/scss/component/_form-field.scss b/ui/scss/component/_form-field.scss
index 010d4eb05..adb3afa22 100644
--- a/ui/scss/component/_form-field.scss
+++ b/ui/scss/component/_form-field.scss
@@ -130,7 +130,7 @@ input-submit {
   & > *:nth-child(2) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
-    border: 1px solid var(--color-border);
+    border: 1px solid var(--color-input-border);
   }
 }
 
diff --git a/ui/scss/init/_base-theme.scss b/ui/scss/init/_base-theme.scss
index 58ca7b7a5..bc16c683b 100644
--- a/ui/scss/init/_base-theme.scss
+++ b/ui/scss/init/_base-theme.scss
@@ -90,7 +90,7 @@
   --color-input-label: var(--color-gray-5);
   --color-input-placeholder: var(--color-gray-8);
   --color-input-bg: var(--color-gray-1);
-  --color-input-border: var(--color-border);
+  --color-input-border: var(--color-gray-3);
   --color-input-border-active: var(--color-secondary);
   --color-input-toggle: var(--color-secondary);
   --color-input-toggle-bg: var(--color-gray-1);
-- 
2.45.3


From 2549f5b0ad1181d7933a550a5916b1856516438a Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Thu, 30 Dec 2021 15:35:35 -0500
Subject: [PATCH 12/29] fix library filter crash (#7376)

---
 ui/util/claim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/util/claim.js b/ui/util/claim.js
index 3049283f0..ca67e1205 100644
--- a/ui/util/claim.js
+++ b/ui/util/claim.js
@@ -57,7 +57,7 @@ export function filterClaims(claims: Array<Claim>, query: ?string): Array<Claim>
 
       return (
         (value.title && value.title.match(queryMatchRegExp)) ||
-        (claim.signing_channel && claim.signing_channel.name.match(queryMatchRegExp)) ||
+        (claim.signing_channel && claim.signing_channel.name && claim.signing_channel.name.match(queryMatchRegExp)) ||
         (claim.name && claim.name.match(queryMatchRegExp))
       );
     });
-- 
2.45.3


From dfdd3fc248856e0f0f6c86e0bad4dc3f397afb36 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Thu, 30 Dec 2021 15:51:28 -0500
Subject: [PATCH 13/29] more  whitespace on cards (#7377)

---
 ui/scss/component/_card.scss  | 32 +++++++++++++++++---------------
 ui/scss/init/_base-theme.scss |  3 ++-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ui/scss/component/_card.scss b/ui/scss/component/_card.scss
index fd9bbfb12..ecf1f8704 100644
--- a/ui/scss/component/_card.scss
+++ b/ui/scss/component/_card.scss
@@ -98,17 +98,18 @@
 .card__title-section {
   @extend .section__flex;
 
-  @media (min-width: $breakpoint-small) {
-    padding: var(--spacing-s) var(--spacing-m);
-  }
+  //@media (min-width: $breakpoint-small) {
+  //  padding: var(--spacing-s) var(--spacing-m);
+  //}
 }
 
 .card__title-section--body-list {
-  padding-left: var(--spacing-s);
-
-  @media (min-width: $breakpoint-small) {
-    padding: var(--spacing-m);
-  }
+  // this is superfluous
+  //padding-left: var(--spacing-s);
+  //
+  //@media (min-width: $breakpoint-small) {
+  //  padding: var(--spacing-m);
+  //}
 }
 
 .card__title-section--small {
@@ -278,9 +279,9 @@
   justify-content: space-between;
   align-items: flex-start;
   flex-wrap: wrap;
-
+  padding: var(--spacing-l) var(--spacing-l) var(--spacing-m) var(--spacing-l);
   @media (max-width: $breakpoint-small) {
-    padding: var(--spacing-s);
+    padding: var(--spacing-m);
     padding-bottom: 0;
     margin: 0;
     margin-bottom: var(--spacing-s);
@@ -322,9 +323,7 @@
 }
 
 .card__main-actions {
-  padding: var(--spacing-m);
-  padding-bottom: 0;
-  margin-bottom: var(--spacing-s);
+  //margin-bottom: var(--spacing-s);
   border-top: 1px solid var(--color-border);
   height: 100%;
 
@@ -337,7 +336,7 @@
   padding: var(--spacing-s);
 
   @media (min-width: $breakpoint-small) {
-    padding: var(--spacing-m);
+    padding: var(--spacing-l);
   }
 }
 
@@ -364,9 +363,12 @@
 .card__body,
 .card__main-actions {
   padding: var(--spacing-m);
+  @media (min-width: $breakpoint-small) {
+    padding: var(--spacing-l);
+  }
   padding-bottom: 0;
   margin: 0;
-  margin-bottom: var(--spacing-m);
+  //margin-bottom: var(--spacing-m);
 }
 
 .card__bottom-gutter {
diff --git a/ui/scss/init/_base-theme.scss b/ui/scss/init/_base-theme.scss
index bc16c683b..ac54f2740 100644
--- a/ui/scss/init/_base-theme.scss
+++ b/ui/scss/init/_base-theme.scss
@@ -89,7 +89,8 @@
   --color-input-color: var(--color-black);
   --color-input-label: var(--color-gray-5);
   --color-input-placeholder: var(--color-gray-8);
-  --color-input-bg: var(--color-gray-1);
+  //--color-input-bg: var(--color-gray-1);
+  --color-input-bg: var(--color-white);
   --color-input-border: var(--color-gray-3);
   --color-input-border-active: var(--color-secondary);
   --color-input-toggle: var(--color-secondary);
-- 
2.45.3


From b2e2e84cc0cd4fe3b4f50bff52663593dc947868 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Thu, 30 Dec 2021 15:54:00 -0500
Subject: [PATCH 14/29] show channel analytics only if authed (#7378)

---
 ui/component/header/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx
index 2715fe630..39bf6790f 100644
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@@ -326,7 +326,7 @@ const Header = (props: Props) => {
                         <Icon aria-hidden icon={ICONS.CHANNEL} />
                         {__('Channels')}
                       </MenuItem>
-                      {hasChannels && (
+                      {hasChannels && authenticated && (
                         <MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.CREATOR_DASHBOARD}`)}>
                           <Icon aria-hidden icon={ICONS.ANALYTICS} />
                           {__('Creator Analytics')}
-- 
2.45.3


From c00b9cd434b651c4019424f8dd864de1f64398d3 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Thu, 30 Dec 2021 15:57:55 -0500
Subject: [PATCH 15/29] v0.52.0-alpha.12

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a4052f459..a19b2c599 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lbry",
-  "version": "0.52.0-alpha.11",
+  "version": "0.52.0-alpha.12",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
-- 
2.45.3


From dbc980cab5a34903837c4a1c7f2c3f0630656741 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Thu, 30 Dec 2021 22:21:37 -0500
Subject: [PATCH 16/29] clear shuffle when entering edit or publish for
 collections (#7380)

---
 ui/component/collectionActions/view.jsx | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/ui/component/collectionActions/view.jsx b/ui/component/collectionActions/view.jsx
index 2c454bb70..0a06d9bb7 100644
--- a/ui/component/collectionActions/view.jsx
+++ b/ui/component/collectionActions/view.jsx
@@ -55,6 +55,20 @@ function CollectionActions(props: Props) {
   const claimId = claim && claim.claim_id;
   const webShareable = true; // collections have cost?
 
+  /*
+    A bit too much dependency with both ordering and shuffling depending on a single list item index selector
+    For now when they click edit, we'll toggle shuffle off for them.
+  */
+  const handleSetShowEdit = (setting) => {
+    doToggleShuffleList(collectionId, false);
+    setShowEdit(setting);
+  };
+
+  const handlePublishMode = () => {
+    doToggleShuffleList(collectionId, false);
+    push(`?${PAGE_VIEW_QUERY}=${EDIT_PAGE}`);
+  };
+
   const doPlay = React.useCallback(
     (playUri) => {
       const navigateUrl = formatLbryUrlForWeb(playUri);
@@ -124,7 +138,7 @@ function CollectionActions(props: Props) {
               title={uri ? __('Update') : __('Publish')}
               label={uri ? __('Update') : __('Publish')}
               className={classnames('button--file-action')}
-              onClick={() => push(`?${PAGE_VIEW_QUERY}=${EDIT_PAGE}`)}
+              onClick={() => handlePublishMode()}
               icon={ICONS.PUBLISH}
               iconColor={collectionHasEdits && 'red'}
               iconSize={18}
@@ -169,7 +183,7 @@ function CollectionActions(props: Props) {
         'button-toggle--active': showEdit,
       })}
       icon={ICONS.EDIT}
-      onClick={() => setShowEdit(!showEdit)}
+      onClick={() => handleSetShowEdit(!showEdit)}
     />
   );
 
-- 
2.45.3


From fd8cf9b40d698ea5d6a14e67fe875613380ad7b3 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Thu, 30 Dec 2021 22:54:45 -0500
Subject: [PATCH 17/29] clean up related card title header spacing (#7381)

---
 ui/scss/component/_main.scss   | 13 +++++++++++++
 ui/scss/component/_search.scss |  3 ---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ui/scss/component/_main.scss b/ui/scss/component/_main.scss
index 44f606300..93782f09c 100644
--- a/ui/scss/component/_main.scss
+++ b/ui/scss/component/_main.scss
@@ -126,6 +126,15 @@
     width: 35rem;
     margin-left: var(--spacing-m);
 
+    .card__header--between {
+      padding: var(--spacing-s) var(--spacing-s) var(--spacing-s) var(--spacing-s);
+      display: flex;
+      align-items: center;
+      .card__title-actions {
+        padding: 0 0 0 0;
+        align-items: center;
+      }
+    }
     @media (max-width: $breakpoint-medium) {
       width: 100%;
       margin-left: 0;
@@ -138,6 +147,10 @@
     flex-direction: column;
     overflow-wrap: break-word;
 
+    .card__header--between {
+      padding: var(--spacing-s) var(--spacing-s) var(--spacing-s) var(--spacing-s);
+    }
+
     .file-page__recommended-collection__row {
       display: block;
 
diff --git a/ui/scss/component/_search.scss b/ui/scss/component/_search.scss
index 4a520c067..30835d707 100644
--- a/ui/scss/component/_search.scss
+++ b/ui/scss/component/_search.scss
@@ -128,9 +128,6 @@
 }
 
 .recommended-content__toggles {
-  margin-top: var(--spacing-xs);
-  margin-right: var(--spacing-xs);
-
   button {
     padding: 0 var(--spacing-xs);
     height: 2rem;
-- 
2.45.3


From ee520d89e15f1b76c345f5153d88358967a1f85e Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Thu, 30 Dec 2021 23:38:22 -0500
Subject: [PATCH 18/29] v0.52.0-alpha.13

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a19b2c599..39724a9b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lbry",
-  "version": "0.52.0-alpha.12",
+  "version": "0.52.0-alpha.13",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
-- 
2.45.3


From 851a715025d1fefcad78885b1d0dd1a46d42be5f Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Fri, 31 Dec 2021 08:08:47 -0500
Subject: [PATCH 19/29] v0.52.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 39724a9b8..a880ce9b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lbry",
-  "version": "0.52.0-alpha.13",
+  "version": "0.52.0",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
-- 
2.45.3


From 500ed829882d974a7885f44d702b9f8507736e07 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Fri, 31 Dec 2021 10:56:25 -0500
Subject: [PATCH 20/29] restore medium spacing on cards (#7382)

---
 ui/scss/component/_card.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/scss/component/_card.scss b/ui/scss/component/_card.scss
index ecf1f8704..7b6f1c879 100644
--- a/ui/scss/component/_card.scss
+++ b/ui/scss/component/_card.scss
@@ -279,7 +279,7 @@
   justify-content: space-between;
   align-items: flex-start;
   flex-wrap: wrap;
-  padding: var(--spacing-l) var(--spacing-l) var(--spacing-m) var(--spacing-l);
+  padding: var(--spacing-m) var(--spacing-m) var(--spacing-m) var(--spacing-m);
   @media (max-width: $breakpoint-small) {
     padding: var(--spacing-m);
     padding-bottom: 0;
@@ -336,7 +336,7 @@
   padding: var(--spacing-s);
 
   @media (min-width: $breakpoint-small) {
-    padding: var(--spacing-l);
+    padding: var(--spacing-m);
   }
 }
 
@@ -364,7 +364,7 @@
 .card__main-actions {
   padding: var(--spacing-m);
   @media (min-width: $breakpoint-small) {
-    padding: var(--spacing-l);
+    padding: var(--spacing-m);
   }
   padding-bottom: 0;
   margin: 0;
-- 
2.45.3


From d9d7845d963df20811fdbdb8cde64de427e2f456 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Fri, 31 Dec 2021 11:11:25 -0500
Subject: [PATCH 21/29] Revert "v0.52.0"

This reverts commit 851a715025d1fefcad78885b1d0dd1a46d42be5f.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a880ce9b0..39724a9b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lbry",
-  "version": "0.52.0",
+  "version": "0.52.0-alpha.13",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
-- 
2.45.3


From 4fc050fdad1a186b299c62a0f089b7882e7d9543 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Fri, 31 Dec 2021 11:11:52 -0500
Subject: [PATCH 22/29] v0.52.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 39724a9b8..a880ce9b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lbry",
-  "version": "0.52.0-alpha.13",
+  "version": "0.52.0",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
-- 
2.45.3


From a3398843c2d90ccf58be7ac3abf1430e1b48e714 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Fri, 31 Dec 2021 12:52:26 -0500
Subject: [PATCH 23/29] Optimize selectClaimIsMine (#7370)

Frequently used; top in perf profile

Most of the time, you already have the claim object in the current context. `selectClaimIsMineForUri` will retrieve the claim again, which is wasteful, even if it is memoized (looking up the cache still takes time).

Break apart the logic and added the alternative `selectClaimIsMine` for faster lookup.

Co-authored-by: infinite-persistence <inf.persistence@gmail.com>
---
 extras/lbryinc/index.js                       |   7 +-
 extras/lbryinc/redux/selectors/ban.js         |  68 +++++
 extras/lbryinc/redux/selectors/stats.js       |  26 +-
 static/app-strings.json                       |   3 +
 ui/component/channelBlockButton/index.js      |   4 +-
 ui/component/channelContent/index.js          |  10 +-
 ui/component/channelStakedIndicator/index.js  |   8 +-
 ui/component/claimMenuList/index.js           |   8 +-
 ui/component/claimPreview/index.js            |  14 +-
 ui/component/claimPreview/view.jsx            |  43 +--
 ui/component/claimPreviewTile/index.js        |   7 +-
 ui/component/claimPreviewTile/view.jsx        |  79 +-----
 ui/component/claimProperties/index.js         |  16 +-
 .../collectionContentSidebar/index.js         |   6 +-
 .../collectionPreviewOverlay/index.js         |   4 +-
 ui/component/collectionPreviewTile/index.js   |   4 +-
 ui/component/comment/index.js                 |   4 +-
 ui/component/commentCreate/index.js           |  27 +-
 ui/component/commentMenuList/index.js         |  24 +-
 ui/component/commentReactions/index.js        |   7 +-
 ui/component/commentsList/index.js            |  16 +-
 ui/component/fileActions/index.js             |  30 ++-
 ui/component/fileDescription/index.js         |  24 +-
 ui/component/fileDownloadLink/index.js        |  26 +-
 ui/component/filePrice/index.js               |  24 +-
 ui/component/filePrice/view.jsx               |   6 +-
 ui/component/fileTitleSection/index.js        |   4 +-
 ui/component/fileValues/index.js              |  26 +-
 ui/component/fileViewCount/index.js           |   8 +-
 ui/component/fileViewCountInline/index.js     |   8 +-
 ui/component/previewLink/index.js             |  10 +-
 .../previewOverlayProperties/index.js         |   7 +-
 ui/modal/modalConfirmTransaction/index.js     |   4 +-
 ui/modal/modalRemoveFile/index.js             |   4 +-
 ui/page/channel/index.js                      |  42 +--
 ui/page/collection/index.js                   |  10 +-
 ui/page/discover/index.js                     |   4 +-
 ui/page/show/index.js                         |   8 +-
 ui/redux/actions/app.js                       |  15 +-
 ui/redux/actions/content.js                   |   9 +-
 ui/redux/actions/file.js                      |   6 +-
 ui/redux/actions/reactions.js                 |   6 +-
 ui/redux/actions/search.js                    |   4 +-
 ui/redux/actions/user.js                      |   4 +-
 ui/redux/selectors/app.js                     |   4 +-
 ui/redux/selectors/claims.js                  | 249 +++++++++++-------
 ui/redux/selectors/comments.js                |  11 +-
 47 files changed, 514 insertions(+), 424 deletions(-)
 create mode 100644 extras/lbryinc/redux/selectors/ban.js

diff --git a/extras/lbryinc/index.js b/extras/lbryinc/index.js
index 1b23baae0..2d86de5fd 100644
--- a/extras/lbryinc/index.js
+++ b/extras/lbryinc/index.js
@@ -50,9 +50,12 @@ export {
 export { selectFilteredOutpoints, selectFilteredOutpointMap } from './redux/selectors/filtered';
 export {
   selectViewCount,
-  makeSelectViewCountForUri,
-  makeSelectSubCountForUri,
+  selectViewCountForUri,
+  // makeSelectViewCountForUri, // deprecated
+  selectSubCountForUri,
+  // makeSelectSubCountForUri, // deprecated
 } from './redux/selectors/stats';
+export { selectBanStateForUri } from './redux/selectors/ban';
 export {
   selectHasSyncedWallet,
   selectSyncData,
diff --git a/extras/lbryinc/redux/selectors/ban.js b/extras/lbryinc/redux/selectors/ban.js
new file mode 100644
index 000000000..ee0e2b0a0
--- /dev/null
+++ b/extras/lbryinc/redux/selectors/ban.js
@@ -0,0 +1,68 @@
+// @flow
+
+// TODO: This should be in 'redux/selectors/claim.js'. Temporarily putting it
+// here to get past importing issues with 'lbryinc', which the real fix might
+// involve moving it from 'extras' to 'ui' (big change).
+
+import { createCachedSelector } from 're-reselect';
+import { selectClaimForUri } from 'redux/selectors/claims';
+import { selectMutedChannels } from 'redux/selectors/blocked';
+import { selectModerationBlockList } from 'redux/selectors/comments';
+import { selectBlacklistedOutpointMap, selectFilteredOutpointMap } from 'lbryinc';
+import { getChannelFromClaim } from 'util/claim';
+import { isURIEqual } from 'util/lbryURI';
+
+export const selectBanStateForUri = createCachedSelector(
+  selectClaimForUri,
+  selectBlacklistedOutpointMap,
+  selectFilteredOutpointMap,
+  selectMutedChannels,
+  selectModerationBlockList,
+  (claim, blackListedOutpointMap, filteredOutpointMap, mutedChannelUris, personalBlocklist) => {
+    const banState = {};
+
+    if (!claim) {
+      return banState;
+    }
+
+    const channelClaim = getChannelFromClaim(claim);
+
+    // This will be replaced once blocking is done at the wallet server level.
+    if (blackListedOutpointMap) {
+      if (
+        (channelClaim && blackListedOutpointMap[`${channelClaim.txid}:${channelClaim.nout}`]) ||
+        blackListedOutpointMap[`${claim.txid}:${claim.nout}`]
+      ) {
+        banState['blacklisted'] = true;
+      }
+    }
+
+    // We're checking to see if the stream outpoint or signing channel outpoint
+    // is in the filter list.
+    if (filteredOutpointMap) {
+      if (
+        (channelClaim && filteredOutpointMap[`${channelClaim.txid}:${channelClaim.nout}`]) ||
+        filteredOutpointMap[`${claim.txid}:${claim.nout}`]
+      ) {
+        banState['filtered'] = true;
+      }
+    }
+
+    // block stream claims
+    // block channel claims if we can't control for them in claim search
+    if (mutedChannelUris.length && channelClaim) {
+      if (mutedChannelUris.some((blockedUri) => isURIEqual(blockedUri, channelClaim.permanent_url))) {
+        banState['muted'] = true;
+      }
+    }
+
+    // Commentron blocklist
+    if (personalBlocklist.length && channelClaim) {
+      if (personalBlocklist.some((blockedUri) => isURIEqual(blockedUri, channelClaim.permanent_url))) {
+        banState['blocked'] = true;
+      }
+    }
+
+    return banState;
+  }
+)((state, uri) => String(uri));
diff --git a/extras/lbryinc/redux/selectors/stats.js b/extras/lbryinc/redux/selectors/stats.js
index 2b2065285..755402c07 100644
--- a/extras/lbryinc/redux/selectors/stats.js
+++ b/extras/lbryinc/redux/selectors/stats.js
@@ -1,20 +1,20 @@
+// @flow
 import { createSelector } from 'reselect';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import { selectClaimIdForUri } from 'redux/selectors/claims';
 
+type State = { claims: any };
 const selectState = state => state.stats || {};
 export const selectViewCount = createSelector(selectState, state => state.viewCountById);
 export const selectSubCount = createSelector(selectState, state => state.subCountById);
 
-export const makeSelectViewCountForUri = uri =>
-  createSelector(
-    makeSelectClaimForUri(uri),
-    selectViewCount,
-    (claim, viewCountById) => (claim ? viewCountById[claim.claim_id] || 0 : 0)
-  );
+export const selectViewCountForUri = (state: State, uri: string) => {
+  const claimId = selectClaimIdForUri(state, uri);
+  const viewCountById = selectViewCount(state);
+  return claimId ? viewCountById[claimId] || 0 : 0;
+};
 
-export const makeSelectSubCountForUri = uri =>
-  createSelector(
-    makeSelectClaimForUri(uri),
-    selectSubCount,
-    (claim, subCountById) => (claim ? subCountById[claim.claim_id] || 0 : 0)
-  );
+export const selectSubCountForUri = (state: State, uri: string) => {
+  const claimId = selectClaimIdForUri(state, uri);
+  const subCountById = selectSubCount(state);
+  return claimId ? subCountById[claimId] || 0 : 0;
+};
diff --git a/static/app-strings.json b/static/app-strings.json
index 515bb7550..0d2718541 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -2235,5 +2235,8 @@
   "Network Data Hosting allows the p2p network to store blobs unrelated to your browsing.": "Network Data Hosting allows the p2p network to store blobs unrelated to your browsing.",
   "Content: Limit (GB)": "Content: Limit (GB)",
   "Network: Allow (GB)": "Network: Allow (GB)",
+  "Failed to view lbry://@Destiny#6/destiny-crashes-conservative-panel-w#a, please try again. If this problem persists, visit https://lbry.com/faq/support for support.": "Failed to view lbry://@Destiny#6/destiny-crashes-conservative-panel-w#a, please try again. If this problem persists, visit https://lbry.com/faq/support for support.",
+  "A channel is required to repost on LBRY": "A channel is required to repost on LBRY",
+  "Failed to view lbry://@gatogalactico#9/gato-galactico-e-as-estrelas-ninja-dos#1, please try again. If this problem persists, visit https://lbry.com/faq/support for support.": "Failed to view lbry://@gatogalactico#9/gato-galactico-e-as-estrelas-ninja-dos#1, please try again. If this problem persists, visit https://lbry.com/faq/support for support.",
   "--end--": "--end--"
 }
diff --git a/ui/component/channelBlockButton/index.js b/ui/component/channelBlockButton/index.js
index 9852404d7..4018ebcc6 100644
--- a/ui/component/channelBlockButton/index.js
+++ b/ui/component/channelBlockButton/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimIdForUri } from 'redux/selectors/claims';
+import { selectClaimIdForUri } from 'redux/selectors/claims';
 import {
   doCommentModUnBlock,
   doCommentModBlock,
@@ -43,7 +43,7 @@ const select = (state, props) => {
     isBlocked,
     isToggling,
     isBlockingOrUnBlocking: makeSelectUriIsBlockingOrUnBlocking(props.uri)(state),
-    creatorId: makeSelectClaimIdForUri(props.creatorUri)(state),
+    creatorId: selectClaimIdForUri(state, props.creatorUri),
   };
 };
 
diff --git a/ui/component/channelContent/index.js b/ui/component/channelContent/index.js
index fc1a349f0..46e9b29eb 100644
--- a/ui/component/channelContent/index.js
+++ b/ui/component/channelContent/index.js
@@ -3,9 +3,9 @@ import { PAGE_SIZE } from 'constants/claim';
 import {
   makeSelectClaimsInChannelForPage,
   makeSelectFetchingChannelClaims,
-  makeSelectClaimIsMine,
+  selectClaimIsMine,
   makeSelectTotalPagesInChannelSearch,
-  makeSelectClaimForUri,
+  selectClaimForUri,
 } from 'redux/selectors/claims';
 import { doResolveUris } from 'redux/actions/claims';
 import * as SETTINGS from 'constants/settings';
@@ -20,13 +20,15 @@ const select = (state, props) => {
   const { search } = props.location;
   const urlParams = new URLSearchParams(search);
   const page = urlParams.get('page') || 0;
+  const claim = props.uri && selectClaimForUri(state, props.uri);
+
   return {
     pageOfClaimsInChannel: makeSelectClaimsInChannelForPage(props.uri, page)(state),
     fetching: makeSelectFetchingChannelClaims(props.uri)(state),
     totalPages: makeSelectTotalPagesInChannelSearch(props.uri, PAGE_SIZE)(state),
-    channelIsMine: makeSelectClaimIsMine(props.uri)(state),
+    channelIsMine: selectClaimIsMine(state, claim),
     channelIsBlocked: makeSelectChannelIsMuted(props.uri)(state),
-    claim: props.uri && makeSelectClaimForUri(props.uri)(state),
+    claim,
     isAuthenticated: selectUserVerifiedEmail(state),
     showMature: selectShowMatureContent(state),
     tileLayout: makeSelectClientSetting(SETTINGS.TILE_LAYOUT)(state),
diff --git a/ui/component/channelStakedIndicator/index.js b/ui/component/channelStakedIndicator/index.js
index d217012a4..3a1a41107 100644
--- a/ui/component/channelStakedIndicator/index.js
+++ b/ui/component/channelStakedIndicator/index.js
@@ -1,15 +1,15 @@
 import { connect } from 'react-redux';
 import {
   makeSelectClaimForUri,
-  makeSelectStakedLevelForChannelUri,
-  makeSelectTotalStakedAmountForChannelUri,
+  selectTotalStakedAmountForChannelUri,
+  selectStakedLevelForChannelUri,
 } from 'redux/selectors/claims';
 import ChannelStakedIndicator from './view';
 
 const select = (state, props) => ({
   channelClaim: makeSelectClaimForUri(props.uri)(state),
-  amount: makeSelectTotalStakedAmountForChannelUri(props.uri)(state),
-  level: makeSelectStakedLevelForChannelUri(props.uri)(state),
+  amount: selectTotalStakedAmountForChannelUri(state, props.uri),
+  level: selectStakedLevelForChannelUri(state, props.uri),
 });
 
 export default connect(select)(ChannelStakedIndicator);
diff --git a/ui/component/claimMenuList/index.js b/ui/component/claimMenuList/index.js
index 2f00b8766..847270381 100644
--- a/ui/component/claimMenuList/index.js
+++ b/ui/component/claimMenuList/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimForUri, makeSelectClaimIsMine } from 'redux/selectors/claims';
+import { selectClaimForUri, selectClaimIsMine } from 'redux/selectors/claims';
 import { doCollectionEdit, doFetchItemsInCollection } from 'redux/actions/collections';
 import { doPrepareEdit } from 'redux/actions/publish';
 import {
@@ -34,7 +34,7 @@ import ClaimPreview from './view';
 import fs from 'fs';
 
 const select = (state, props) => {
-  const claim = makeSelectClaimForUri(props.uri, false)(state);
+  const claim = selectClaimForUri(state, props.uri, false); // @KP test no repost!
   const collectionId = props.collectionId;
   const repostedClaim = claim && claim.reposted_claim;
   const contentClaim = repostedClaim || claim;
@@ -51,7 +51,7 @@ const select = (state, props) => {
     contentClaim,
     contentSigningChannel,
     contentChannelUri,
-    claimIsMine: makeSelectClaimIsMine(props.uri)(state),
+    claimIsMine: selectClaimIsMine(state, claim),
     hasClaimInWatchLater: makeSelectCollectionForIdHasClaimUrl(
       COLLECTIONS_CONSTS.WATCH_LATER_ID,
       contentPermanentUri
@@ -92,7 +92,7 @@ const perform = (dispatch) => ({
   doChannelUnmute: (channelUri) => dispatch(doChannelUnmute(channelUri)),
   doCommentModBlock: (channelUri) => dispatch(doCommentModBlock(channelUri)),
   doCommentModUnBlock: (channelUri) => dispatch(doCommentModUnBlock(channelUri)),
-  doCommentModBlockAsAdmin: (commenterUri, blockerId) => dispatch(doCommentModBlockAsAdmin(commenterUri, blockerId)),
+  doCommentModBlockAsAdmin: (a, b, c) => dispatch(doCommentModBlockAsAdmin(a, b, c)),
   doCommentModUnBlockAsAdmin: (commenterUri, blockerId) =>
     dispatch(doCommentModUnBlockAsAdmin(commenterUri, blockerId)),
   doChannelSubscribe: (subscription) => dispatch(doChannelSubscribe(subscription)),
diff --git a/ui/component/claimPreview/index.js b/ui/component/claimPreview/index.js
index 25ab46a8b..65efab5d6 100644
--- a/ui/component/claimPreview/index.js
+++ b/ui/component/claimPreview/index.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import {
   selectClaimForUri,
   makeSelectIsUriResolving,
-  makeSelectClaimIsMine,
+  selectClaimIsMine,
   makeSelectClaimIsPending,
   makeSelectClaimIsNsfw,
   makeSelectReflectingClaimForUri,
@@ -20,12 +20,10 @@ import {
 import { doResolveUri } from 'redux/actions/claims';
 import { doCollectionEdit } from 'redux/actions/collections';
 import { doFileGet } from 'redux/actions/file';
-import { selectMutedChannels, makeSelectChannelIsMuted } from 'redux/selectors/blocked';
-import { selectBlackListedOutpoints, selectFilteredOutpoints } from 'lbryinc';
+import { selectBanStateForUri } from 'lbryinc';
 import { selectShowMatureContent } from 'redux/selectors/settings';
 import { makeSelectHasVisitedUri } from 'redux/selectors/content';
 import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
-import { selectModerationBlockList } from 'redux/selectors/comments';
 import ClaimPreview from './view';
 import formatMediaDuration from 'util/formatMediaDuration';
 
@@ -42,16 +40,12 @@ const select = (state, props) => {
     pending: props.uri && makeSelectClaimIsPending(props.uri)(state),
     reflectingProgress: props.uri && makeSelectReflectingClaimForUri(props.uri)(state),
     obscureNsfw: selectShowMatureContent(state) === false,
-    claimIsMine: props.uri && makeSelectClaimIsMine(props.uri)(state),
+    claimIsMine: props.uri && selectClaimIsMine(state, claim),
     isResolvingUri: props.uri && makeSelectIsUriResolving(props.uri)(state),
     isResolvingRepost: props.uri && makeSelectIsUriResolving(props.repostUrl)(state),
     nsfw: props.uri && makeSelectClaimIsNsfw(props.uri)(state),
-    blackListedOutpoints: selectBlackListedOutpoints(state),
-    filteredOutpoints: selectFilteredOutpoints(state),
-    mutedUris: selectMutedChannels(state),
-    blockedUris: selectModerationBlockList(state),
+    banState: selectBanStateForUri(state, props.uri),
     hasVisitedUri: props.uri && makeSelectHasVisitedUri(props.uri)(state),
-    channelIsBlocked: props.uri && makeSelectChannelIsMuted(props.uri)(state),
     isSubscribed: props.uri && makeSelectIsSubscribed(props.uri, true)(state),
     streamingUrl: props.uri && makeSelectStreamingUrlForUri(props.uri)(state),
     wasPurchased: props.uri && makeSelectClaimWasPurchased(props.uri)(state),
diff --git a/ui/component/claimPreview/view.jsx b/ui/component/claimPreview/view.jsx
index 8903c28c2..b85ce32aa 100644
--- a/ui/component/claimPreview/view.jsx
+++ b/ui/component/claimPreview/view.jsx
@@ -4,7 +4,7 @@ import React, { useEffect, forwardRef } from 'react';
 import { NavLink, withRouter } from 'react-router-dom';
 import { isEmpty } from 'util/object';
 import classnames from 'classnames';
-import { isURIEqual, isURIValid } from 'util/lbryURI';
+import { isURIValid } from 'util/lbryURI';
 import * as COLLECTIONS_CONSTS from 'constants/collections';
 import { formatLbryUrlForWeb } from 'util/url';
 import { formatClaimPreviewTitle } from 'util/formatAriaLabel';
@@ -46,17 +46,8 @@ type Props = {
   nsfw: boolean,
   placeholder: string,
   type: string,
+  banState: { blacklisted?: boolean, filtered?: boolean, muted?: boolean, blocked?: boolean },
   hasVisitedUri: boolean,
-  blackListedOutpoints: Array<{
-    txid: string,
-    nout: number,
-  }>,
-  filteredOutpoints: Array<{
-    txid: string,
-    nout: number,
-  }>,
-  mutedUris: Array<string>,
-  blockedUris: Array<string>,
   channelIsBlocked: boolean,
   actions: boolean | Node | string | number,
   properties: boolean | Node | string | number | ((Claim) => Node),
@@ -131,10 +122,7 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
     properties,
     onClick,
     actions,
-    mutedUris,
-    blockedUris,
-    blackListedOutpoints,
-    filteredOutpoints,
+    banState,
     includeSupportAction,
     renderActions,
     hideMenu = false,
@@ -236,28 +224,13 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
     ((abandoned && !showUnresolvedClaim) || (!claimIsMine && obscureNsfw && nsfw));
 
   // This will be replaced once blocking is done at the wallet server level
-  if (claim && !claimIsMine && !shouldHide && blackListedOutpoints) {
-    shouldHide = blackListedOutpoints.some(
-      (outpoint) =>
-        (signingChannel && outpoint.txid === signingChannel.txid && outpoint.nout === signingChannel.nout) ||
-        (outpoint.txid === claim.txid && outpoint.nout === claim.nout)
-    );
-  }
-  // We're checking to see if the stream outpoint
-  // or signing channel outpoint is in the filter list
-  if (claim && !claimIsMine && !shouldHide && filteredOutpoints) {
-    shouldHide = filteredOutpoints.some(
-      (outpoint) =>
-        (signingChannel && outpoint.txid === signingChannel.txid && outpoint.nout === signingChannel.nout) ||
-        (outpoint.txid === claim.txid && outpoint.nout === claim.nout)
-    );
+  if (claim && !claimIsMine && (banState.blacklisted || banState.filtered)) {
+    shouldHide = true;
   }
+
   // block stream claims
-  if (claim && !shouldHide && !showUserBlocked && mutedUris.length && signingChannel) {
-    shouldHide = mutedUris.some((blockedUri) => isURIEqual(blockedUri, signingChannel.permanent_url));
-  }
-  if (claim && !shouldHide && !showUserBlocked && blockedUris.length && signingChannel) {
-    shouldHide = blockedUris.some((blockedUri) => isURIEqual(blockedUri, signingChannel.permanent_url));
+  if (!shouldHide && !showUserBlocked && (banState.muted || banState.blocked)) {
+    shouldHide = true;
   }
 
   if (!shouldHide && customShouldHide && claim) {
diff --git a/ui/component/claimPreviewTile/index.js b/ui/component/claimPreviewTile/index.js
index eaf64a865..7d1e558d4 100644
--- a/ui/component/claimPreviewTile/index.js
+++ b/ui/component/claimPreviewTile/index.js
@@ -11,7 +11,7 @@ import {
 import { doFileGet } from 'redux/actions/file';
 import { doResolveUri } from 'redux/actions/claims';
 import { selectMutedChannels } from 'redux/selectors/blocked';
-import { makeSelectViewCountForUri, selectBlackListedOutpoints, selectFilteredOutpoints } from 'lbryinc';
+import { selectViewCountForUri, selectBanStateForUri } from 'lbryinc';
 import { selectShowMatureContent } from 'redux/selectors/settings';
 import ClaimPreviewTile from './view';
 import formatMediaDuration from 'util/formatMediaDuration';
@@ -29,12 +29,11 @@ const select = (state, props) => {
     isResolvingUri: props.uri && makeSelectIsUriResolving(props.uri)(state),
     thumbnail: props.uri && makeSelectThumbnailForUri(props.uri)(state),
     title: props.uri && makeSelectTitleForUri(props.uri)(state),
-    blackListedOutpoints: selectBlackListedOutpoints(state),
-    filteredOutpoints: selectFilteredOutpoints(state),
+    banState: selectBanStateForUri(state, props.uri),
     blockedChannelUris: selectMutedChannels(state),
     showMature: selectShowMatureContent(state),
     isMature: makeSelectClaimIsNsfw(props.uri)(state),
-    viewCount: makeSelectViewCountForUri(props.uri)(state),
+    viewCount: selectViewCountForUri(state, props.uri),
   };
 };
 
diff --git a/ui/component/claimPreviewTile/view.jsx b/ui/component/claimPreviewTile/view.jsx
index 1c921f64e..f68fc1c22 100644
--- a/ui/component/claimPreviewTile/view.jsx
+++ b/ui/component/claimPreviewTile/view.jsx
@@ -12,7 +12,7 @@ import SubscribeButton from 'component/subscribeButton';
 import useGetThumbnail from 'effects/use-get-thumbnail';
 import { formatLbryUrlForWeb, generateListSearchUrlParams } from 'util/url';
 import { formatClaimPreviewTitle } from 'util/formatAriaLabel';
-import { parseURI, isURIEqual } from 'util/lbryURI';
+import { parseURI } from 'util/lbryURI';
 import PreviewOverlayProperties from 'component/previewOverlayProperties';
 import FileDownloadLink from 'component/fileDownloadLink';
 import FileWatchLaterLink from 'component/fileWatchLaterLink';
@@ -33,15 +33,7 @@ type Props = {
   thumbnail: string,
   title: string,
   placeholder: boolean,
-  blackListedOutpoints: Array<{
-    txid: string,
-    nout: number,
-  }>,
-  filteredOutpoints: Array<{
-    txid: string,
-    nout: number,
-  }>,
-  blockedChannelUris: Array<string>,
+  banState: { blacklisted?: boolean, filtered?: boolean, muted?: boolean, blocked?: boolean },
   getFile: (string) => void,
   streamingUrl: string,
   isMature: boolean,
@@ -64,11 +56,9 @@ function ClaimPreviewTile(props: Props) {
     resolveUri,
     claim,
     placeholder,
-    blackListedOutpoints,
-    filteredOutpoints,
+    banState,
     getFile,
     streamingUrl,
-    blockedChannelUris,
     isMature,
     showMature,
     showHiddenByUser,
@@ -139,34 +129,9 @@ function ClaimPreviewTile(props: Props) {
     // Unfortunately needed until this is resolved
     // https://github.com/lbryio/lbry-sdk/issues/2785
     shouldHide = true;
-  }
-
-  // This will be replaced once blocking is done at the wallet server level
-  if (claim && !shouldHide && blackListedOutpoints) {
-    shouldHide = blackListedOutpoints.some(
-      (outpoint) =>
-        (signingChannel && outpoint.txid === signingChannel.txid && outpoint.nout === signingChannel.nout) ||
-        (outpoint.txid === claim.txid && outpoint.nout === claim.nout)
-    );
-  }
-  // We're checking to see if the stream outpoint
-  // or signing channel outpoint is in the filter list
-  if (claim && !shouldHide && filteredOutpoints) {
-    shouldHide = filteredOutpoints.some(
-      (outpoint) =>
-        (signingChannel && outpoint.txid === signingChannel.txid && outpoint.nout === signingChannel.nout) ||
-        (outpoint.txid === claim.txid && outpoint.nout === claim.nout)
-    );
-  }
-
-  // block stream claims
-  if (claim && !shouldHide && !showHiddenByUser && blockedChannelUris.length && signingChannel) {
-    shouldHide = blockedChannelUris.some((blockedUri) => isURIEqual(blockedUri, signingChannel.permanent_url));
-  }
-  // block channel claims if we can't control for them in claim search
-  // e.g. fetchRecommendedSubscriptions
-  if (claim && isChannel && !shouldHide && !showHiddenByUser && blockedChannelUris.length && signingChannel) {
-    shouldHide = blockedChannelUris.some((blockedUri) => isURIEqual(blockedUri, signingChannel.permanent_url));
+  } else {
+    shouldHide =
+      banState.blacklisted || banState.filtered || (!showHiddenByUser && (banState.muted || banState.blocked));
   }
 
   if (shouldHide) {
@@ -280,34 +245,4 @@ function ClaimPreviewTile(props: Props) {
   );
 }
 
-export default React.memo<Props>(withRouter(ClaimPreviewTile), areEqual);
-
-const BLOCKLIST_KEYS = ['blackListedOutpoints', 'filteredOutpoints', 'blockedChannelUris'];
-const HANDLED_KEYS = [...BLOCKLIST_KEYS, 'date'];
-
-function areEqual(prev: Props, next: Props) {
-  for (let i = 0; i < BLOCKLIST_KEYS.length; ++i) {
-    const key = BLOCKLIST_KEYS[i];
-    const a = prev[key];
-    const b = next[key];
-
-    if (((!a || !b) && a !== b) || (a && b && a.length !== b.length)) {
-      // The arrays are huge, so just compare the length instead of each entry.
-      return false;
-    }
-  }
-
-  if (Number(prev.date) !== Number(next.date)) {
-    return false;
-  }
-
-  const propKeys = Object.keys(next);
-  for (let i = 0; i < propKeys.length; ++i) {
-    const pk = propKeys[i];
-    if (!HANDLED_KEYS.includes(pk) && prev[pk] !== next[pk]) {
-      return false;
-    }
-  }
-
-  return true;
-}
+export default withRouter(ClaimPreviewTile);
diff --git a/ui/component/claimProperties/index.js b/ui/component/claimProperties/index.js
index 574ceb0e1..3b5f3edf6 100644
--- a/ui/component/claimProperties/index.js
+++ b/ui/component/claimProperties/index.js
@@ -1,12 +1,16 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimIsMine, makeSelectClaimForUri } from 'redux/selectors/claims';
+import { selectClaimIsMine, selectClaimForUri } from 'redux/selectors/claims';
 import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
 import ClaimProperties from './view';
 
-const select = (state, props) => ({
-  claim: makeSelectClaimForUri(props.uri)(state),
-  isSubscribed: makeSelectIsSubscribed(props.uri)(state),
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
-});
+const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
+
+  return {
+    claim,
+    isSubscribed: makeSelectIsSubscribed(props.uri)(state),
+    claimIsMine: selectClaimIsMine(state, claim),
+  };
+};
 
 export default connect(select, null)(ClaimProperties);
diff --git a/ui/component/collectionContentSidebar/index.js b/ui/component/collectionContentSidebar/index.js
index e07304052..e65f79f84 100644
--- a/ui/component/collectionContentSidebar/index.js
+++ b/ui/component/collectionContentSidebar/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import CollectionContent from './view';
-import { makeSelectClaimForUri, makeSelectClaimIsMine } from 'redux/selectors/claims';
+import { selectClaimForUri, selectClaimIsMine } from 'redux/selectors/claims';
 import {
   makeSelectUrlsForCollectionId,
   makeSelectNameForCollectionId,
@@ -12,7 +12,7 @@ import { doToggleLoopList, doToggleShuffleList } from 'redux/actions/content';
 const select = (state, props) => {
   const playingUri = selectPlayingUri(state);
   const playingUrl = playingUri && playingUri.uri;
-  const claim = makeSelectClaimForUri(playingUrl)(state);
+  const claim = selectClaimForUri(state, playingUrl);
   const url = claim && claim.permanent_url;
   const loopList = selectListLoop(state);
   const loop = loopList && loopList.collectionId === props.id && loopList.loop;
@@ -24,7 +24,7 @@ const select = (state, props) => {
     collection: makeSelectCollectionForId(props.id)(state),
     collectionUrls: makeSelectUrlsForCollectionId(props.id)(state),
     collectionName: makeSelectNameForCollectionId(props.id)(state),
-    isMine: makeSelectClaimIsMine(url)(state),
+    isMine: selectClaimIsMine(state, claim),
     loop,
     shuffle,
   };
diff --git a/ui/component/collectionPreviewOverlay/index.js b/ui/component/collectionPreviewOverlay/index.js
index 8c04f7020..caee0c5c9 100644
--- a/ui/component/collectionPreviewOverlay/index.js
+++ b/ui/component/collectionPreviewOverlay/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { makeSelectIsUriResolving, makeSelectClaimIdForUri, makeSelectClaimForClaimId } from 'redux/selectors/claims';
+import { makeSelectIsUriResolving, selectClaimIdForUri, makeSelectClaimForClaimId } from 'redux/selectors/claims';
 import {
   makeSelectUrlsForCollectionId,
   makeSelectNameForCollectionId,
@@ -10,7 +10,7 @@ import { doFetchItemsInCollection } from 'redux/actions/collections';
 import CollectionPreviewOverlay from './view';
 
 const select = (state, props) => {
-  const collectionId = props.collectionId || (props.uri && makeSelectClaimIdForUri(props.uri)(state));
+  const collectionId = props.collectionId || (props.uri && selectClaimIdForUri(state, props.uri));
   const claim = props.collectionId && makeSelectClaimForClaimId(props.collectionId)(state);
   const collectionUri = props.uri || (claim && (claim.canonical_url || claim.permanent_url)) || null;
 
diff --git a/ui/component/collectionPreviewTile/index.js b/ui/component/collectionPreviewTile/index.js
index c3a5cc65b..706cd974d 100644
--- a/ui/component/collectionPreviewTile/index.js
+++ b/ui/component/collectionPreviewTile/index.js
@@ -5,7 +5,7 @@ import {
   makeSelectTitleForUri,
   makeSelectChannelForClaimUri,
   makeSelectClaimIsNsfw,
-  makeSelectClaimIdForUri,
+  selectClaimIdForUri,
   makeSelectClaimForClaimId,
 } from 'redux/selectors/claims';
 import {
@@ -24,7 +24,7 @@ import { selectShowMatureContent } from 'redux/selectors/settings';
 import CollectionPreviewTile from './view';
 
 const select = (state, props) => {
-  const collectionId = props.collectionId || (props.uri && makeSelectClaimIdForUri(props.uri)(state));
+  const collectionId = props.collectionId || (props.uri && selectClaimIdForUri(state, props.uri));
   const claim = props.collectionId && makeSelectClaimForClaimId(props.collectionId)(state);
   const collectionUri = props.uri || (claim && (claim.canonical_url || claim.permanent_url)) || null;
 
diff --git a/ui/component/comment/index.js b/ui/component/comment/index.js
index ffe06dd37..b5c336522 100644
--- a/ui/component/comment/index.js
+++ b/ui/component/comment/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import {
-  makeSelectStakedLevelForChannelUri,
+  selectTotalStakedAmountForChannelUri,
   makeSelectClaimForUri,
   makeSelectThumbnailForUri,
   selectMyChannelClaims,
@@ -33,7 +33,7 @@ const select = (state, props) => {
     activeChannelClaim,
     myChannels: selectMyChannelClaims(state),
     playingUri: selectPlayingUri(state),
-    stakedLevel: makeSelectStakedLevelForChannelUri(props.authorUri)(state),
+    stakedLevel: selectTotalStakedAmountForChannelUri(state, props.authorUri),
     linkedCommentAncestors: selectLinkedCommentAncestors(state),
     totalReplyPages: makeSelectTotalReplyPagesForParentId(props.commentId)(state),
   };
diff --git a/ui/component/commentCreate/index.js b/ui/component/commentCreate/index.js
index 61d209e5d..ff760c3e3 100644
--- a/ui/component/commentCreate/index.js
+++ b/ui/component/commentCreate/index.js
@@ -1,8 +1,8 @@
 import { connect } from 'react-redux';
 import {
-  makeSelectClaimForUri,
-  makeSelectClaimIsMine,
-  selectMyChannelClaims,
+  selectClaimForUri,
+  selectClaimIsMine,
+  selectHasChannels,
   selectFetchingMyChannels,
   makeSelectTagInClaimOrChannelForUri,
 } from 'redux/selectors/claims';
@@ -14,15 +14,18 @@ import { CommentCreate } from './view';
 import { doToast } from 'redux/actions/notifications';
 import { DISABLE_SUPPORT_TAG } from 'constants/tags';
 
-const select = (state, props) => ({
-  claim: makeSelectClaimForUri(props.uri)(state),
-  channels: selectMyChannelClaims(state),
-  isFetchingChannels: selectFetchingMyChannels(state),
-  activeChannelClaim: selectActiveChannelClaim(state),
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
-  settingsByChannelId: selectSettingsByChannelId(state),
-  supportDisabled: makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_SUPPORT_TAG)(state),
-});
+const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
+  return {
+    activeChannelClaim: selectActiveChannelClaim(state),
+    hasChannels: selectHasChannels(state),
+    claim,
+    claimIsMine: selectClaimIsMine(state, claim),
+    isFetchingChannels: selectFetchingMyChannels(state),
+    settingsByChannelId: selectSettingsByChannelId(state),
+    supportDisabled: makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_SUPPORT_TAG)(state),
+  };
+};
 
 const perform = (dispatch, ownProps) => ({
   createComment: (comment, claimId, parentId, txid, payment_intent_id, environment) =>
diff --git a/ui/component/commentMenuList/index.js b/ui/component/commentMenuList/index.js
index 62ddf4c8b..ce91b592d 100644
--- a/ui/component/commentMenuList/index.js
+++ b/ui/component/commentMenuList/index.js
@@ -4,24 +4,22 @@ import { doCommentPin, doCommentModAddDelegate } from 'redux/actions/comments';
 import { doOpenModal } from 'redux/actions/app';
 import { doSetPlayingUri } from 'redux/actions/content';
 import { doToast } from 'redux/actions/notifications';
-import {
-  makeSelectChannelPermUrlForClaimUri,
-  makeSelectClaimIsMine,
-  makeSelectClaimForUri,
-} from 'redux/selectors/claims';
+import { selectClaimIsMine, selectClaimForUri } from 'redux/selectors/claims';
 import { selectActiveChannelClaim } from 'redux/selectors/app';
 import { selectModerationDelegatorsById } from 'redux/selectors/comments';
 import { selectPlayingUri } from 'redux/selectors/content';
 import CommentMenuList from './view';
 
-const select = (state, props) => ({
-  claim: makeSelectClaimForUri(props.uri)(state),
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
-  contentChannelPermanentUrl: makeSelectChannelPermUrlForClaimUri(props.uri)(state),
-  activeChannelClaim: selectActiveChannelClaim(state),
-  playingUri: selectPlayingUri(state),
-  moderationDelegatorsById: selectModerationDelegatorsById(state),
-});
+const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
+  return {
+    claim,
+    claimIsMine: selectClaimIsMine(state, claim),
+    activeChannelClaim: selectActiveChannelClaim(state),
+    playingUri: selectPlayingUri(state),
+    moderationDelegatorsById: selectModerationDelegatorsById(state),
+  };
+};
 
 const perform = (dispatch) => ({
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
diff --git a/ui/component/commentReactions/index.js b/ui/component/commentReactions/index.js
index b2de27008..86dfcdd4f 100644
--- a/ui/component/commentReactions/index.js
+++ b/ui/component/commentReactions/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import Comment from './view';
-import { makeSelectClaimIsMine, makeSelectClaimForUri } from 'redux/selectors/claims';
+import { selectClaimIsMine, selectClaimForUri } from 'redux/selectors/claims';
 import { doResolveUri } from 'redux/actions/claims';
 import { doToast } from 'redux/actions/notifications';
 import { selectMyReactsForComment, selectOthersReactsForComment } from 'redux/selectors/comments';
@@ -11,10 +11,11 @@ const select = (state, props) => {
   const activeChannelClaim = selectActiveChannelClaim(state);
   const activeChannelId = activeChannelClaim && activeChannelClaim.claim_id;
   const reactionKey = activeChannelId ? `${props.commentId}:${activeChannelId}` : props.commentId;
+  const claim = selectClaimForUri(state, props.uri);
 
   return {
-    claim: makeSelectClaimForUri(props.uri)(state),
-    claimIsMine: makeSelectClaimIsMine(props.uri)(state),
+    claim,
+    claimIsMine: selectClaimIsMine(state, claim),
     myReacts: selectMyReactsForComment(state, reactionKey),
     othersReacts: selectOthersReactsForComment(state, reactionKey),
     activeChannelId,
diff --git a/ui/component/commentsList/index.js b/ui/component/commentsList/index.js
index 4b09b9b4f..53712cf93 100644
--- a/ui/component/commentsList/index.js
+++ b/ui/component/commentsList/index.js
@@ -1,10 +1,11 @@
 import { connect } from 'react-redux';
 import { doResolveUris } from 'redux/actions/claims';
 import {
+  selectClaimForUri,
   makeSelectClaimForUri,
-  makeSelectClaimIsMine,
+  selectClaimIsMine,
   selectFetchingMyChannels,
-  selectMyChannelClaims,
+  selectMyClaimIdsRaw,
 } from 'redux/selectors/claims';
 import {
   selectTopLevelCommentsForUri,
@@ -15,7 +16,7 @@ import {
   makeSelectTotalCommentsCountForUri,
   selectOthersReacts,
   selectMyReacts,
-  makeSelectCommentIdsForUri,
+  selectCommentIdsForUri,
   selectSettingsByChannelId,
   selectPinnedCommentsForUri,
 } from 'redux/selectors/comments';
@@ -24,6 +25,7 @@ import { selectActiveChannelClaim } from 'redux/selectors/app';
 import CommentsList from './view';
 
 const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
   const activeChannelClaim = selectActiveChannelClaim(state);
   const topLevelComments = selectTopLevelCommentsForUri(state, props.uri);
 
@@ -35,13 +37,13 @@ const select = (state, props) => {
   return {
     topLevelComments,
     resolvedComments,
-    myChannels: selectMyChannelClaims(state),
-    allCommentIds: makeSelectCommentIdsForUri(props.uri)(state),
+    myChannelIds: selectMyClaimIdsRaw(state),
+    allCommentIds: selectCommentIdsForUri(state, props.uri),
     pinnedComments: selectPinnedCommentsForUri(state, props.uri),
     topLevelTotalPages: makeSelectTopLevelTotalPagesForUri(props.uri)(state),
     totalComments: makeSelectTotalCommentsCountForUri(props.uri)(state),
-    claim: makeSelectClaimForUri(props.uri)(state),
-    claimIsMine: makeSelectClaimIsMine(props.uri)(state),
+    claim,
+    claimIsMine: selectClaimIsMine(state, claim),
     isFetchingComments: selectIsFetchingComments(state),
     isFetchingCommentsById: selectIsFetchingCommentsById(state),
     isFetchingReacts: selectIsFetchingReacts(state),
diff --git a/ui/component/fileActions/index.js b/ui/component/fileActions/index.js
index 3fe529ce9..78d76d263 100644
--- a/ui/component/fileActions/index.js
+++ b/ui/component/fileActions/index.js
@@ -1,8 +1,8 @@
 import { connect } from 'react-redux';
 import {
-  makeSelectClaimIsMine,
-  makeSelectClaimForUri,
-  selectMyChannelClaims,
+  selectClaimIsMine,
+  selectClaimForUri,
+  selectHasChannels,
   makeSelectTagInClaimOrChannelForUri,
 } from 'redux/selectors/claims';
 import { makeSelectStreamingUrlForUri, makeSelectFileInfoForUri } from 'redux/selectors/file_info';
@@ -16,16 +16,20 @@ import fs from 'fs';
 import FileActions from './view';
 import { makeSelectFileRenderModeForUri } from 'redux/selectors/content';
 
-const select = (state, props) => ({
-  claim: makeSelectClaimForUri(props.uri)(state),
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
-  fileInfo: makeSelectFileInfoForUri(props.uri)(state),
-  renderMode: makeSelectFileRenderModeForUri(props.uri)(state),
-  costInfo: makeSelectCostInfoForUri(props.uri)(state),
-  myChannels: selectMyChannelClaims(state),
-  reactionsDisabled: makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_COMMENTS_TAG)(state),
-  streamingUrl: makeSelectStreamingUrlForUri(props.uri)(state),
-});
+const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
+
+  return {
+    claim,
+    claimIsMine: selectClaimIsMine(state, claim),
+    fileInfo: makeSelectFileInfoForUri(props.uri)(state),
+    renderMode: makeSelectFileRenderModeForUri(props.uri)(state),
+    costInfo: makeSelectCostInfoForUri(props.uri)(state),
+    hasChannels: selectHasChannels(state),
+    reactionsDisabled: makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_COMMENTS_TAG)(state),
+    streamingUrl: makeSelectStreamingUrlForUri(props.uri)(state),
+  };
+};
 
 const perform = (dispatch) => ({
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
diff --git a/ui/component/fileDescription/index.js b/ui/component/fileDescription/index.js
index 5004b7220..d8a119c37 100644
--- a/ui/component/fileDescription/index.js
+++ b/ui/component/fileDescription/index.js
@@ -1,23 +1,27 @@
 import { connect } from 'react-redux';
 import {
-  makeSelectClaimForUri,
+  selectClaimForUri,
   makeSelectMetadataForUri,
+  selectClaimIsMine,
   makeSelectTagsForUri,
-  makeSelectClaimIsMine,
 } from 'redux/selectors/claims';
 import { makeSelectPendingAmountByUri } from 'redux/selectors/wallet';
 import { doOpenModal } from 'redux/actions/app';
 import { selectUser } from 'redux/selectors/user';
 import FileDescription from './view';
 
-const select = (state, props) => ({
-  claim: makeSelectClaimForUri(props.uri)(state),
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
-  metadata: makeSelectMetadataForUri(props.uri)(state),
-  user: selectUser(state),
-  tags: makeSelectTagsForUri(props.uri)(state),
-  pendingAmount: makeSelectPendingAmountByUri(props.uri)(state),
-});
+const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
+
+  return {
+    claim,
+    claimIsMine: selectClaimIsMine(state, claim),
+    metadata: makeSelectMetadataForUri(props.uri)(state),
+    user: selectUser(state),
+    pendingAmount: makeSelectPendingAmountByUri(props.uri)(state),
+    tags: makeSelectTagsForUri(props.uri)(state),
+  };
+};
 
 export default connect(select, {
   doOpenModal,
diff --git a/ui/component/fileDownloadLink/index.js b/ui/component/fileDownloadLink/index.js
index 41e32d044..bf4ad34d3 100644
--- a/ui/component/fileDownloadLink/index.js
+++ b/ui/component/fileDownloadLink/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimIsMine, makeSelectClaimForUri, makeSelectClaimWasPurchased } from 'redux/selectors/claims';
+import { selectClaimIsMine, selectClaimForUri, makeSelectClaimWasPurchased } from 'redux/selectors/claims';
 import {
   makeSelectFileInfoForUri,
   makeSelectDownloadingForUri,
@@ -11,16 +11,20 @@ import { doOpenModal, doAnalyticsView } from 'redux/actions/app';
 import { doSetPlayingUri, doPlayUri } from 'redux/actions/content';
 import FileDownloadLink from './view';
 
-const select = (state, props) => ({
-  fileInfo: makeSelectFileInfoForUri(props.uri)(state),
-  downloading: makeSelectDownloadingForUri(props.uri)(state),
-  loading: makeSelectLoadingForUri(props.uri)(state),
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
-  claim: makeSelectClaimForUri(props.uri)(state),
-  costInfo: makeSelectCostInfoForUri(props.uri)(state),
-  claimWasPurchased: makeSelectClaimWasPurchased(props.uri)(state),
-  streamingUrl: makeSelectStreamingUrlForUri(props.uri)(state),
-});
+const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
+
+  return {
+    fileInfo: makeSelectFileInfoForUri(props.uri)(state),
+    downloading: makeSelectDownloadingForUri(props.uri)(state),
+    loading: makeSelectLoadingForUri(props.uri)(state),
+    claimIsMine: selectClaimIsMine(state, claim),
+    claim,
+    costInfo: makeSelectCostInfoForUri(props.uri)(state),
+    claimWasPurchased: makeSelectClaimWasPurchased(props.uri)(state),
+    streamingUrl: makeSelectStreamingUrlForUri(props.uri)(state),
+  };
+};
 
 const perform = (dispatch) => ({
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
diff --git a/ui/component/filePrice/index.js b/ui/component/filePrice/index.js
index d795184c5..560f38b96 100644
--- a/ui/component/filePrice/index.js
+++ b/ui/component/filePrice/index.js
@@ -1,18 +1,18 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimForUri, makeSelectClaimWasPurchased, makeSelectClaimIsMine } from 'redux/selectors/claims';
+import { selectClaimForUri, makeSelectClaimWasPurchased, selectClaimIsMine } from 'redux/selectors/claims';
 import { makeSelectCostInfoForUri, doFetchCostInfoForUri, makeSelectFetchingCostInfoForUri } from 'lbryinc';
 import FilePrice from './view';
 
-const select = (state, props) => ({
-  costInfo: makeSelectCostInfoForUri(props.uri)(state),
-  fetching: makeSelectFetchingCostInfoForUri(props.uri)(state),
-  claim: makeSelectClaimForUri(props.uri)(state),
-  claimWasPurchased: makeSelectClaimWasPurchased(props.uri)(state),
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
-});
+const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
 
-const perform = (dispatch) => ({
-  fetchCostInfo: (uri) => dispatch(doFetchCostInfoForUri(uri)),
-});
+  return {
+    claim,
+    claimIsMine: selectClaimIsMine(state, claim),
+    claimWasPurchased: makeSelectClaimWasPurchased(props.uri)(state),
+    costInfo: makeSelectCostInfoForUri(props.uri)(state),
+    fetching: makeSelectFetchingCostInfoForUri(props.uri)(state),
+  };
+};
 
-export default connect(select, perform)(FilePrice);
+export default connect(select, { doFetchCostInfoForUri })(FilePrice);
diff --git a/ui/component/filePrice/view.jsx b/ui/component/filePrice/view.jsx
index 3f9b1f626..352064d80 100644
--- a/ui/component/filePrice/view.jsx
+++ b/ui/component/filePrice/view.jsx
@@ -8,7 +8,7 @@ import Icon from 'component/common/icon';
 type Props = {
   showFullPrice: boolean,
   costInfo: ?{ includesData: boolean, cost: number },
-  fetchCostInfo: string => void,
+  doFetchCostInfoForUri: (string) => void,
   uri: string,
   fetching: boolean,
   claim: ?{},
@@ -35,10 +35,10 @@ class FilePrice extends React.PureComponent<Props> {
   }
 
   fetchCost = (props: Props) => {
-    const { costInfo, fetchCostInfo, uri, fetching, claim } = props;
+    const { costInfo, doFetchCostInfoForUri, uri, fetching, claim } = props;
 
     if (costInfo === undefined && !fetching && claim) {
-      fetchCostInfo(uri);
+      doFetchCostInfoForUri(uri);
     }
   };
 
diff --git a/ui/component/fileTitleSection/index.js b/ui/component/fileTitleSection/index.js
index 0e9f3a4f9..b012111f5 100644
--- a/ui/component/fileTitleSection/index.js
+++ b/ui/component/fileTitleSection/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { doFetchSubCount, makeSelectSubCountForUri } from 'lbryinc';
+import { doFetchSubCount, selectSubCountForUri } from 'lbryinc';
 import { makeSelectTitleForUri, makeSelectClaimForUri } from 'redux/selectors/claims';
 import { makeSelectInsufficientCreditsForUri } from 'redux/selectors/content';
 import FileTitleSection from './view';
@@ -8,7 +8,7 @@ const select = (state, props) => {
   const claim = makeSelectClaimForUri(props.uri)(state);
   const channelClaimId = claim && claim.signing_channel ? claim.signing_channel.claim_id : undefined;
   const channelUri = claim && claim.signing_channel ? claim.signing_channel.canonical_url : undefined;
-  const subCount = channelUri && makeSelectSubCountForUri(channelUri)(state);
+  const subCount = channelUri && selectSubCountForUri(state, channelUri);
 
   return {
     isInsufficientCredits: makeSelectInsufficientCreditsForUri(props.uri)(state),
diff --git a/ui/component/fileValues/index.js b/ui/component/fileValues/index.js
index 8fe82ba56..a3994d7c3 100644
--- a/ui/component/fileValues/index.js
+++ b/ui/component/fileValues/index.js
@@ -1,9 +1,9 @@
 import { connect } from 'react-redux';
 import {
-  makeSelectClaimForUri,
+  selectClaimForUri,
   makeSelectContentTypeForUri,
   makeSelectMetadataForUri,
-  makeSelectClaimIsMine,
+  selectClaimIsMine,
 } from 'redux/selectors/claims';
 import { makeSelectPendingAmountByUri } from 'redux/selectors/wallet';
 import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
@@ -12,15 +12,19 @@ import { doOpenModal } from 'redux/actions/app';
 
 import FileValues from './view';
 
-const select = (state, props) => ({
-  claim: makeSelectClaimForUri(props.uri)(state),
-  contentType: makeSelectContentTypeForUri(props.uri)(state),
-  fileInfo: makeSelectFileInfoForUri(props.uri)(state),
-  metadata: makeSelectMetadataForUri(props.uri)(state),
-  user: selectUser(state),
-  pendingAmount: makeSelectPendingAmountByUri(props.uri)(state),
-  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
-});
+const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
+
+  return {
+    claim,
+    contentType: makeSelectContentTypeForUri(props.uri)(state),
+    fileInfo: makeSelectFileInfoForUri(props.uri)(state),
+    metadata: makeSelectMetadataForUri(props.uri)(state),
+    user: selectUser(state),
+    pendingAmount: makeSelectPendingAmountByUri(props.uri)(state),
+    claimIsMine: selectClaimIsMine(state, claim),
+  };
+};
 
 const perform = (dispatch) => ({
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
diff --git a/ui/component/fileViewCount/index.js b/ui/component/fileViewCount/index.js
index e4c5e64d5..d1cec539a 100644
--- a/ui/component/fileViewCount/index.js
+++ b/ui/component/fileViewCount/index.js
@@ -1,12 +1,12 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
-import { doFetchViewCount, makeSelectViewCountForUri } from 'lbryinc';
+import { selectClaimForUri } from 'redux/selectors/claims';
+import { doFetchViewCount, selectViewCountForUri } from 'lbryinc';
 import { doAnalyticsView } from 'redux/actions/app';
 import FileViewCount from './view';
 
 const select = (state, props) => ({
-  claim: makeSelectClaimForUri(props.uri)(state),
-  viewCount: makeSelectViewCountForUri(props.uri)(state),
+  claim: selectClaimForUri(state, props.uri),
+  viewCount: selectViewCountForUri(state, props.uri),
 });
 
 const perform = (dispatch) => ({
diff --git a/ui/component/fileViewCountInline/index.js b/ui/component/fileViewCountInline/index.js
index 0f9f2c1e6..36fdabf98 100644
--- a/ui/component/fileViewCountInline/index.js
+++ b/ui/component/fileViewCountInline/index.js
@@ -1,13 +1,13 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
-import { makeSelectViewCountForUri } from 'lbryinc';
+import { selectClaimForUri } from 'redux/selectors/claims';
+import { selectViewCountForUri } from 'lbryinc';
 import { selectLanguage } from 'redux/selectors/settings';
 import FileViewCountInline from './view';
 
 const select = (state, props) => {
   return {
-    claim: makeSelectClaimForUri(props.uri)(state),
-    viewCount: makeSelectViewCountForUri(props.uri)(state),
+    claim: selectClaimForUri(state, props.uri),
+    viewCount: selectViewCountForUri(state, props.uri),
     lang: selectLanguage(state),
   };
 };
diff --git a/ui/component/previewLink/index.js b/ui/component/previewLink/index.js
index 17493a0ed..9d93d2c63 100644
--- a/ui/component/previewLink/index.js
+++ b/ui/component/previewLink/index.js
@@ -1,9 +1,9 @@
 import { connect } from 'react-redux';
 import {
-  makeSelectClaimIsMine,
+  selectClaimIsMine,
   makeSelectTitleForUri,
   makeSelectThumbnailForUri,
-  makeSelectClaimForUri,
+  selectClaimForUri,
   makeSelectIsUriResolving,
   makeSelectMetadataItemForUri,
 } from 'redux/selectors/claims';
@@ -12,13 +12,15 @@ import { selectBlackListedOutpoints } from 'lbryinc';
 import PreviewLink from './view';
 
 const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
+
   return {
     uri: props.uri,
-    claim: makeSelectClaimForUri(props.uri)(state),
+    claim,
     title: makeSelectTitleForUri(props.uri)(state),
     thumbnail: makeSelectThumbnailForUri(props.uri)(state),
     description: makeSelectMetadataItemForUri(props.uri, 'description')(state),
-    channelIsMine: makeSelectClaimIsMine(props.uri)(state),
+    channelIsMine: selectClaimIsMine(state, claim),
     isResolvingUri: makeSelectIsUriResolving(props.uri)(state),
     blackListedOutpoints: selectBlackListedOutpoints(state),
   };
diff --git a/ui/component/previewOverlayProperties/index.js b/ui/component/previewOverlayProperties/index.js
index 622fb642b..aa0938a0c 100644
--- a/ui/component/previewOverlayProperties/index.js
+++ b/ui/component/previewOverlayProperties/index.js
@@ -1,19 +1,20 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimIsMine, makeSelectClaimForUri } from 'redux/selectors/claims';
+import { selectClaimIsMine, selectClaimForUri } from 'redux/selectors/claims';
 import { makeSelectFilePartlyDownloaded } from 'redux/selectors/file_info';
 import { makeSelectEditedCollectionForId } from 'redux/selectors/collections';
 import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
 import PreviewOverlayProperties from './view';
 
 const select = (state, props) => {
-  const claim = makeSelectClaimForUri(props.uri)(state);
+  const claim = selectClaimForUri(state, props.uri);
   const claimId = claim && claim.claim_id;
+
   return {
     claim,
     editedCollection: makeSelectEditedCollectionForId(claimId)(state),
     downloaded: makeSelectFilePartlyDownloaded(props.uri)(state),
     isSubscribed: makeSelectIsSubscribed(props.uri)(state),
-    claimIsMine: makeSelectClaimIsMine(props.uri)(state),
+    claimIsMine: selectClaimIsMine(state, claim),
   };
 };
 
diff --git a/ui/modal/modalConfirmTransaction/index.js b/ui/modal/modalConfirmTransaction/index.js
index c59a746dd..5a5493099 100644
--- a/ui/modal/modalConfirmTransaction/index.js
+++ b/ui/modal/modalConfirmTransaction/index.js
@@ -1,12 +1,12 @@
 import { connect } from 'react-redux';
 import { doSendDraftTransaction, doSendTip } from 'redux/actions/wallet';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import { selectClaimForUri } from 'redux/selectors/claims';
 import { doHideModal } from 'redux/actions/app';
 import ModalConfirmTransaction from './view';
 import { selectActiveChannelClaim, selectIncognito } from 'redux/selectors/app';
 
 const select = (state, props) => ({
-  claim: makeSelectClaimForUri(props.destination)(state),
+  claim: selectClaimForUri(state, props.destination)(state),
   activeChannelClaim: selectActiveChannelClaim(state),
   incognito: selectIncognito(state),
 });
diff --git a/ui/modal/modalRemoveFile/index.js b/ui/modal/modalRemoveFile/index.js
index bc0fdd321..2a9228f39 100644
--- a/ui/modal/modalRemoveFile/index.js
+++ b/ui/modal/modalRemoveFile/index.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { doDeleteFileAndMaybeGoBack } from 'redux/actions/file';
 import {
   makeSelectTitleForUri,
-  makeSelectClaimForUri,
+  selectClaimForUri,
   makeSelectIsAbandoningClaimForUri,
   makeSelectClaimIsMine,
 } from 'redux/selectors/claims';
@@ -13,7 +13,7 @@ import ModalRemoveFile from './view';
 const select = (state, props) => ({
   claimIsMine: makeSelectClaimIsMine(props.uri)(state),
   title: makeSelectTitleForUri(props.uri)(state),
-  claim: makeSelectClaimForUri(props.uri)(state),
+  claim: selectClaimForUri(state, props.uri),
   isAbandoning: makeSelectIsAbandoningClaimForUri(props.uri)(state),
 });
 
diff --git a/ui/page/channel/index.js b/ui/page/channel/index.js
index 049d0f0ea..4576586d3 100644
--- a/ui/page/channel/index.js
+++ b/ui/page/channel/index.js
@@ -1,15 +1,15 @@
 import { connect } from 'react-redux';
 import {
-  makeSelectClaimIsMine,
+  selectClaimIsMine,
   makeSelectTitleForUri,
   makeSelectThumbnailForUri,
   makeSelectCoverForUri,
   selectCurrentChannelPage,
-  makeSelectClaimForUri,
+  selectClaimForUri,
   makeSelectClaimIsPending,
 } from 'redux/selectors/claims';
 import { selectMyUnpublishedCollections } from 'redux/selectors/collections';
-import { selectBlackListedOutpoints, doFetchSubCount, makeSelectSubCountForUri } from 'lbryinc';
+import { selectBlackListedOutpoints, doFetchSubCount, selectSubCountForUri } from 'lbryinc'; // ban state
 import { selectYoutubeChannels } from 'redux/selectors/user';
 import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
 import { selectModerationBlockList } from 'redux/selectors/comments';
@@ -17,22 +17,26 @@ import { selectMutedChannels } from 'redux/selectors/blocked';
 import { doOpenModal } from 'redux/actions/app';
 import ChannelPage from './view';
 
-const select = (state, props) => ({
-  title: makeSelectTitleForUri(props.uri)(state),
-  thumbnail: makeSelectThumbnailForUri(props.uri)(state),
-  cover: makeSelectCoverForUri(props.uri)(state),
-  channelIsMine: makeSelectClaimIsMine(props.uri)(state),
-  page: selectCurrentChannelPage(state),
-  claim: makeSelectClaimForUri(props.uri)(state),
-  isSubscribed: makeSelectIsSubscribed(props.uri, true)(state),
-  blackListedOutpoints: selectBlackListedOutpoints(state),
-  subCount: makeSelectSubCountForUri(props.uri)(state),
-  pending: makeSelectClaimIsPending(props.uri)(state),
-  youtubeChannels: selectYoutubeChannels(state),
-  blockedChannels: selectModerationBlockList(state),
-  mutedChannels: selectMutedChannels(state),
-  unpublishedCollections: selectMyUnpublishedCollections(state),
-});
+const select = (state, props) => {
+  const claim = selectClaimForUri(state, props.uri);
+
+  return {
+    title: makeSelectTitleForUri(props.uri)(state),
+    thumbnail: makeSelectThumbnailForUri(props.uri)(state),
+    cover: makeSelectCoverForUri(props.uri)(state),
+    channelIsMine: selectClaimIsMine(state, claim),
+    page: selectCurrentChannelPage(state),
+    claim,
+    isSubscribed: makeSelectIsSubscribed(props.uri, true)(state),
+    blackListedOutpoints: selectBlackListedOutpoints(state),
+    subCount: selectSubCountForUri(state, props.uri),
+    pending: makeSelectClaimIsPending(props.uri)(state),
+    youtubeChannels: selectYoutubeChannels(state),
+    blockedChannels: selectModerationBlockList(state), // banlist
+    mutedChannels: selectMutedChannels(state),
+    unpublishedCollections: selectMyUnpublishedCollections(state),
+  };
+};
 
 const perform = (dispatch) => ({
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
diff --git a/ui/page/collection/index.js b/ui/page/collection/index.js
index b6705e674..62585eafe 100644
--- a/ui/page/collection/index.js
+++ b/ui/page/collection/index.js
@@ -5,7 +5,7 @@ import CollectionPage from './view';
 import {
   makeSelectTitleForUri,
   makeSelectThumbnailForUri,
-  makeSelectClaimIsMine,
+  selectClaimIsMine,
   makeSelectClaimIsPending,
   makeSelectClaimForClaimId,
   makeSelectChannelForClaimUri,
@@ -20,11 +20,7 @@ import {
   makeSelectEditedCollectionForId,
 } from 'redux/selectors/collections';
 
-import {
-  doFetchItemsInCollection,
-  doCollectionDelete,
-  doCollectionEdit,
-} from 'redux/actions/collections';
+import { doFetchItemsInCollection, doCollectionDelete, doCollectionEdit } from 'redux/actions/collections';
 import { selectUser } from 'redux/selectors/user';
 
 const select = (state, props) => {
@@ -44,7 +40,7 @@ const select = (state, props) => {
     isResolvingCollection: makeSelectIsResolvingCollectionForId(collectionId)(state),
     title: makeSelectTitleForUri(uri)(state),
     thumbnail: makeSelectThumbnailForUri(uri)(state),
-    isMyClaim: makeSelectClaimIsMine(uri)(state), // or collection is mine?
+    isMyClaim: selectClaimIsMine(state, claim), // or collection is mine?
     isMyCollection: makeSelectCollectionIsMine(collectionId)(state),
     claimIsPending: makeSelectClaimIsPending(uri)(state),
     collectionHasEdits: Boolean(makeSelectEditedCollectionForId(collectionId)(state)),
diff --git a/ui/page/discover/index.js b/ui/page/discover/index.js
index 0d0823b74..55890537e 100644
--- a/ui/page/discover/index.js
+++ b/ui/page/discover/index.js
@@ -1,7 +1,7 @@
 import * as CS from 'constants/claim_search';
 import { connect } from 'react-redux';
 import { doResolveUri } from 'redux/actions/claims';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import { selectClaimForUri } from 'redux/selectors/claims';
 import * as SETTINGS from 'constants/settings';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import { selectFollowedTags } from 'redux/selectors/tags';
@@ -17,7 +17,7 @@ const select = (state, props) => {
   return {
     followedTags: selectFollowedTags(state),
     repostedUri: repostedUri,
-    repostedClaim: repostedUri ? makeSelectClaimForUri(repostedUri)(state) : null,
+    repostedClaim: repostedUri ? selectClaimForUri(state, repostedUri) : null,
     isAuthenticated: selectUserVerifiedEmail(state),
     tileLayout: makeSelectClientSetting(SETTINGS.TILE_LAYOUT)(state),
   };
diff --git a/ui/page/show/index.js b/ui/page/show/index.js
index 5f1ca151d..8c174e058 100644
--- a/ui/page/show/index.js
+++ b/ui/page/show/index.js
@@ -4,11 +4,11 @@ import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
 import { PAGE_SIZE } from 'constants/claim';
 import {
-  makeSelectClaimForUri,
+  selectClaimForUri,
   makeSelectIsUriResolving,
   makeSelectTotalPagesForChannel,
   makeSelectTitleForUri,
-  makeSelectClaimIsMine,
+  selectClaimIsMine,
   makeSelectClaimIsPending,
 } from 'redux/selectors/claims';
 import {
@@ -62,7 +62,7 @@ const select = (state, props) => {
       props.history.replace(`/${path.slice(0, match.index)}`);
     }
   }
-  const claim = makeSelectClaimForUri(uri)(state);
+  const claim = selectClaimForUri(state, uri);
   const collectionId =
     urlParams.get(COLLECTIONS_CONSTS.COLLECTION_ID) ||
     (claim && claim.value_type === 'collection' && claim.claim_id) ||
@@ -76,7 +76,7 @@ const select = (state, props) => {
     totalPages: makeSelectTotalPagesForChannel(uri, PAGE_SIZE)(state),
     isSubscribed: makeSelectChannelInSubscriptions(uri)(state),
     title: makeSelectTitleForUri(uri)(state),
-    claimIsMine: makeSelectClaimIsMine(uri)(state),
+    claimIsMine: selectClaimIsMine(state, claim),
     claimIsPending: makeSelectClaimIsPending(uri)(state),
     collection: makeSelectCollectionForId(collectionId)(state),
     collectionId: collectionId,
diff --git a/ui/redux/actions/app.js b/ui/redux/actions/app.js
index 84da06b75..3420c9b69 100644
--- a/ui/redux/actions/app.js
+++ b/ui/redux/actions/app.js
@@ -9,7 +9,7 @@ import * as SHARED_PREFERENCES from 'constants/shared_preferences';
 import { DOMAIN } from 'config';
 import Lbry from 'lbry';
 import { doFetchChannelListMine, doFetchCollectionListMine, doCheckPendingClaims } from 'redux/actions/claims';
-import { makeSelectClaimForUri, makeSelectClaimIsMine, selectMyChannelClaims } from 'redux/selectors/claims';
+import { selectClaimForUri, selectClaimIsMineForUri, selectMyChannelClaims } from 'redux/selectors/claims';
 import { doFetchFileInfos } from 'redux/actions/file_info';
 import { doClearSupport, doBalanceSubscribe } from 'redux/actions/wallet';
 import { doClearPublish } from 'redux/actions/publish';
@@ -434,8 +434,9 @@ export function doToggleSearchExpanded() {
 export function doAnalyticsView(uri, timeToStart) {
   return (dispatch, getState) => {
     const state = getState();
-    const { txid, nout, claim_id: claimId } = makeSelectClaimForUri(uri)(state);
-    const claimIsMine = makeSelectClaimIsMine(uri)(state);
+    const claim = selectClaimForUri(state, uri);
+    const { txid, nout, claim_id: claimId } = claim;
+    const claimIsMine = selectClaimIsMineForUri(state, claim);
     const outpoint = `${txid}:${nout}`;
 
     if (claimIsMine) {
@@ -449,13 +450,13 @@ export function doAnalyticsView(uri, timeToStart) {
 export function doAnalyticsBuffer(uri, bufferData) {
   return (dispatch, getState) => {
     const state = getState();
-    const claim = makeSelectClaimForUri(uri)(state);
+    const claim = selectClaimForUri(state, uri);
     const user = selectUser(state);
     const {
       value: { video, audio, source },
     } = claim;
-    const timeAtBuffer = parseInt(bufferData.currentTime * 1000);
-    const bufferDuration = parseInt(bufferData.secondsToLoad * 1000);
+    const timeAtBuffer = parseInt(bufferData.currentTime ? bufferData.currentTime * 1000 : 0);
+    const bufferDuration = parseInt(bufferData.secondsToLoad ? bufferData.secondsToLoad * 1000 : 0);
     const fileDurationInSeconds = (video && video.duration) || (audio && audio.duration);
     const fileSize = source.size; // size in bytes
     const fileSizeInBits = fileSize * 8;
@@ -501,7 +502,7 @@ export function doSignIn() {
   return (dispatch, getState) => {
     const state = getState();
     const user = selectUser(state);
-    const notificationsEnabled = user.experimental_ui; // what is notifications?
+    const notificationsEnabled = user.experimental_ui;
 
     dispatch(doNotificationSocketConnect(notificationsEnabled));
 
diff --git a/ui/redux/actions/content.js b/ui/redux/actions/content.js
index 045987665..f8d593082 100644
--- a/ui/redux/actions/content.js
+++ b/ui/redux/actions/content.js
@@ -5,7 +5,12 @@ import * as MODALS from 'constants/modal_types';
 import { ipcRenderer } from 'electron';
 // @endif
 import { doOpenModal } from 'redux/actions/app';
-import { makeSelectClaimForUri, makeSelectClaimIsMine, makeSelectClaimWasPurchased } from 'redux/selectors/claims';
+import {
+  makeSelectClaimForUri,
+  selectClaimForUri,
+  makeSelectClaimIsMine,
+  makeSelectClaimWasPurchased,
+} from 'redux/selectors/claims';
 import {
   makeSelectFileInfoForUri,
   selectFileInfosByOutpoint,
@@ -216,7 +221,7 @@ export function doPlayUri(
 export function savePosition(uri: string, position: number) {
   return (dispatch: Dispatch, getState: () => any) => {
     const state = getState();
-    const claim = makeSelectClaimForUri(uri)(state);
+    const claim = selectClaimForUri(state, uri)(state);
     const { claim_id: claimId, txid, nout } = claim;
     const outpoint = `${txid}:${nout}`;
 
diff --git a/ui/redux/actions/file.js b/ui/redux/actions/file.js
index 41cf1a2bb..e73177e35 100644
--- a/ui/redux/actions/file.js
+++ b/ui/redux/actions/file.js
@@ -5,7 +5,7 @@ import * as ABANDON_STATES from 'constants/abandon_states';
 import { shell } from 'electron';
 // @endif
 import Lbry from 'lbry';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import { selectClaimForUri } from 'redux/selectors/claims';
 import { doAbandonClaim } from 'redux/actions/claims';
 import { batchActions } from 'util/batch-actions';
 
@@ -71,7 +71,7 @@ export function doDeleteFileAndMaybeGoBack(
     const state = getState();
     const playingUri = selectPlayingUri(state);
     const { outpoint } = makeSelectFileInfoForUri(uri)(state) || '';
-    const { nout, txid } = makeSelectClaimForUri(uri)(state);
+    const { nout, txid } = selectClaimForUri(state, uri);
     const claimOutpoint = `${txid}:${nout}`;
     const actions = [];
 
@@ -105,7 +105,7 @@ export function doDeleteFileAndMaybeGoBack(
 export function doFileGet(uri: string, saveFile: boolean = true, onSuccess?: (GetResponse) => any) {
   return (dispatch: Dispatch, getState: () => any) => {
     const state = getState();
-    const { nout, txid } = makeSelectClaimForUri(uri)(state);
+    const { nout, txid } = selectClaimForUri(state, uri);
     const outpoint = `${txid}:${nout}`;
 
     dispatch({
diff --git a/ui/redux/actions/reactions.js b/ui/redux/actions/reactions.js
index 51d2ac1a4..8c3d90eb3 100644
--- a/ui/redux/actions/reactions.js
+++ b/ui/redux/actions/reactions.js
@@ -3,7 +3,7 @@ import { Lbryio } from 'lbryinc';
 import * as ACTIONS from 'constants/action_types';
 import * as REACTION_TYPES from 'constants/reactions';
 import { makeSelectMyReactionForUri } from 'redux/selectors/reactions';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import { selectClaimForUri } from 'redux/selectors/claims';
 
 export const doFetchReactions = (claimId: string) => (dispatch: Dispatch) => {
   dispatch({ type: ACTIONS.REACTIONS_LIST_STARTED });
@@ -20,7 +20,7 @@ export const doFetchReactions = (claimId: string) => (dispatch: Dispatch) => {
 export const doReactionLike = (uri: string) => (dispatch: Dispatch, getState: GetState) => {
   const state = getState();
   const myReaction = makeSelectMyReactionForUri(uri)(state);
-  const claim = makeSelectClaimForUri(uri)(state);
+  const claim = selectClaimForUri(state, uri);
   const claimId = claim.claim_id;
   const shouldRemove = myReaction === REACTION_TYPES.LIKE;
 
@@ -46,7 +46,7 @@ export const doReactionLike = (uri: string) => (dispatch: Dispatch, getState: Ge
 export const doReactionDislike = (uri: string) => (dispatch: Dispatch, getState: GetState) => {
   const state = getState();
   const myReaction = makeSelectMyReactionForUri(uri)(state);
-  const claim = makeSelectClaimForUri(uri)(state);
+  const claim = selectClaimForUri(state, uri);
   const claimId = claim.claim_id;
   const shouldRemove = myReaction === REACTION_TYPES.DISLIKE;
 
diff --git a/ui/redux/actions/search.js b/ui/redux/actions/search.js
index 2a3de1afe..dfd9c724a 100644
--- a/ui/redux/actions/search.js
+++ b/ui/redux/actions/search.js
@@ -1,7 +1,7 @@
 // @flow
 import * as ACTIONS from 'constants/action_types';
 import { selectShowMatureContent } from 'redux/selectors/settings';
-import { makeSelectClaimForUri, makeSelectClaimIsNsfw } from 'redux/selectors/claims';
+import { selectClaimForUri, makeSelectClaimIsNsfw } from 'redux/selectors/claims';
 import { doResolveUris } from 'redux/actions/claims';
 import { buildURI, isURIValid } from 'util/lbryURI';
 import { batchActions } from 'util/batch-actions';
@@ -131,7 +131,7 @@ export const doUpdateSearchOptions = (newOptions: SearchOptions, additionalOptio
 
 export const doFetchRecommendedContent = (uri: string) => (dispatch: Dispatch, getState: GetState) => {
   const state = getState();
-  const claim = makeSelectClaimForUri(uri)(state);
+  const claim = selectClaimForUri(state, uri);
   const matureEnabled = selectShowMatureContent(state);
   const claimIsMature = makeSelectClaimIsNsfw(uri)(state);
 
diff --git a/ui/redux/actions/user.js b/ui/redux/actions/user.js
index 701c36e5a..0935027d3 100644
--- a/ui/redux/actions/user.js
+++ b/ui/redux/actions/user.js
@@ -1,5 +1,5 @@
 import Lbry from 'lbry';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import { selectClaimForUri } from 'redux/selectors/claims';
 import { doFetchChannelListMine } from 'redux/actions/claims';
 import { isURIValid, normalizeURI } from 'util/lbryURI';
 import { batchActions } from 'util/batch-actions';
@@ -657,7 +657,7 @@ export function doUserSetReferrer(referrer, shouldClaim) {
     const isValid = isURIValid(referrer);
     if (isValid) {
       const uri = normalizeURI(referrer);
-      claim = makeSelectClaimForUri(uri)(getState());
+      claim = selectClaimForUri(getState(), uri);
       if (!claim) {
         try {
           const response = await Lbry.resolve({ urls: [uri] });
diff --git a/ui/redux/selectors/app.js b/ui/redux/selectors/app.js
index daea35ac1..aef96c158 100644
--- a/ui/redux/selectors/app.js
+++ b/ui/redux/selectors/app.js
@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import { selectClaimsById, selectMyChannelClaims, makeSelectStakedLevelForChannelUri } from 'redux/selectors/claims';
+import { selectClaimsById, selectMyChannelClaims, selectTotalStakedAmountForChannelUri } from 'redux/selectors/claims';
 
 export const selectState = (state) => state.app || {};
 
@@ -127,7 +127,7 @@ export const selectActiveChannelStakedLevel = createSelector(
     }
 
     const uri = activeChannelClaim.permanent_url;
-    const stakedLevel = makeSelectStakedLevelForChannelUri(uri)(state);
+    const stakedLevel = selectTotalStakedAmountForChannelUri(state, uri)(state);
 
     return stakedLevel;
   }
diff --git a/ui/redux/selectors/claims.js b/ui/redux/selectors/claims.js
index 45f12936e..fb986fe1f 100644
--- a/ui/redux/selectors/claims.js
+++ b/ui/redux/selectors/claims.js
@@ -8,7 +8,7 @@ import * as CLAIM from 'constants/claim';
 
 type State = { claims: any };
 
-const selectState = (state) => state.claims || {};
+const selectState = (state: State) => state.claims || {};
 
 export const selectById = (state: State) => selectState(state).byId || {};
 export const selectPendingClaimsById = (state: State) => selectState(state).pendingById || {};
@@ -18,16 +18,11 @@ export const selectClaimsById = createSelector(selectById, selectPendingClaimsBy
 });
 
 export const selectClaimIdsByUri = (state: State) => selectState(state).claimsByUri || {};
-
-export const selectCurrentChannelPage = createSelector(selectState, (state) => state.currentChannelPage || 1);
-
-export const selectCreatingChannel = createSelector(selectState, (state) => state.creatingChannel);
-
-export const selectCreateChannelError = createSelector(selectState, (state) => state.createChannelError);
-
-export const selectRepostLoading = createSelector(selectState, (state) => state.repostLoading);
-
-export const selectRepostError = createSelector(selectState, (state) => state.repostError);
+export const selectCurrentChannelPage = (state: State) => selectState(state).currentChannelPage || 1;
+export const selectCreatingChannel = (state: State) => selectState(state).creatingChannel;
+export const selectCreateChannelError = (state: State) => selectState(state).createChannelError;
+export const selectRepostLoading = (state: State) => selectState(state).repostLoading;
+export const selectRepostError = (state: State) => selectState(state).repostError;
 
 export const selectClaimsByUri = createSelector(selectClaimIdsByUri, selectClaimsById, (byUri, byId) => {
   const claims = {};
@@ -48,6 +43,21 @@ export const selectClaimsByUri = createSelector(selectClaimIdsByUri, selectClaim
   return claims;
 });
 
+/**
+ * Returns the claim with the specified ID. The claim could be undefined if does
+ * not exist or have not fetched. Take note of the second parameter, which means
+ * an inline function or helper would be required when used as an input to
+ * 'createSelector'.
+ *
+ * @param state
+ * @param claimId
+ * @returns {*}
+ */
+export const selectClaimWithId = (state: State, claimId: string) => {
+  const byId = selectClaimsById(state);
+  return byId[claimId];
+};
+
 export const selectAllClaimsByChannel = createSelector(selectState, (state) => state.paginatedClaimsByChannel || {});
 
 export const selectPendingIds = createSelector(selectState, (state) => Object.keys(state.pendingById) || []);
@@ -69,10 +79,9 @@ export const makeSelectClaimIdIsPending = (claimId: string) =>
     return Boolean(pendingById[claimId]);
   });
 
-export const makeSelectClaimIdForUri = (uri: string) =>
-  createSelector(selectClaimIdsByUri, (claimIds) => claimIds[uri]);
+export const selectClaimIdForUri = (state: State, uri: string) => selectClaimIdsByUri(state)[uri];
 
-export const selectReflectingById = createSelector(selectState, (state) => state.reflectingById);
+export const selectReflectingById = (state: State) => selectState(state).reflectingById;
 
 export const makeSelectClaimForClaimId = (claimId: string) => createSelector(selectClaimsById, (byId) => byId[claimId]);
 
@@ -85,7 +94,8 @@ export const selectClaimForUri = createCachedSelector(
     const validUri = isURIValid(uri);
 
     if (validUri && byUri) {
-      const claimId = uri && byUri[normalizeURI(uri)];
+      const normalizedUri = normalizeURI(uri);
+      const claimId = uri && byUri[normalizedUri];
       const claim = byId[claimId];
 
       // Make sure to return the claim as is so apps can check if it's been resolved before (null) or still needs to be resolved (undefined)
@@ -102,7 +112,7 @@ export const selectClaimForUri = createCachedSelector(
 
         return {
           ...repostedClaim,
-          repost_url: normalizeURI(uri),
+          repost_url: normalizedUri,
           repost_channel_url: channelUrl,
           repost_bid_amount: claim && claim.meta && claim.meta.effective_amount,
         };
@@ -111,14 +121,16 @@ export const selectClaimForUri = createCachedSelector(
       }
     }
   }
-)((state, uri, returnRepost = true) => `${uri}:${returnRepost ? '1' : '0'}`);
+)((state, uri, returnRepost = true) => `${String(uri)}:${returnRepost ? '1' : '0'}`);
 
+// Note: this is deprecated. Use "selectClaimForUri(state, uri)" instead.
 export const makeSelectClaimForUri = (uri: string, returnRepost: boolean = true) =>
   createSelector(selectClaimIdsByUri, selectClaimsById, (byUri, byId) => {
     const validUri = isURIValid(uri);
 
     if (validUri && byUri) {
-      const claimId = uri && byUri[normalizeURI(uri)];
+      const normalizedUri = normalizeURI(uri);
+      const claimId = uri && byUri[normalizedUri];
       const claim = byId[claimId];
 
       // Make sure to return the claim as is so apps can check if it's been resolved before (null) or still needs to be resolved (undefined)
@@ -135,7 +147,7 @@ export const makeSelectClaimForUri = (uri: string, returnRepost: boolean = true)
 
         return {
           ...repostedClaim,
-          repost_url: normalizeURI(uri),
+          repost_url: normalizedUri,
           repost_channel_url: channelUrl,
           repost_bid_amount: claim && claim.meta && claim.meta.effective_amount,
         };
@@ -145,6 +157,9 @@ export const makeSelectClaimForUri = (uri: string, returnRepost: boolean = true)
     }
   });
 
+// Returns your claim IDs without handling pending and abandoned claims.
+export const selectMyClaimIdsRaw = (state: State) => selectState(state).myClaims;
+
 export const selectMyClaimsRaw = createSelector(selectState, selectClaimsById, (state, byId) => {
   const ids = state.myClaims;
   if (!ids) {
@@ -161,7 +176,10 @@ export const selectMyClaimsRaw = createSelector(selectState, selectClaimsById, (
   return claims;
 });
 
-export const selectAbandoningIds = createSelector(selectState, (state) => Object.keys(state.abandoningById || {}));
+export const selectAbandoningById = (state: State) => selectState(state).abandoningById || {};
+export const selectAbandoningIds = createSelector(selectAbandoningById, (abandoningById) =>
+  Object.keys(abandoningById)
+);
 
 export const makeSelectAbandoningClaimById = (claimId: string) =>
   createSelector(selectAbandoningIds, (ids) => ids.includes(claimId));
@@ -173,12 +191,63 @@ export const makeSelectIsAbandoningClaimForUri = (uri: string) =>
   });
 
 export const selectMyActiveClaims = createSelector(
-  selectMyClaimsRaw,
+  selectMyClaimIdsRaw,
   selectAbandoningIds,
-  (claims, abandoningIds) =>
-    new Set(claims && claims.map((claim) => claim.claim_id).filter((claimId) => !abandoningIds.includes(claimId)))
+  (myClaimIds, abandoningIds) => {
+    return new Set(myClaimIds && myClaimIds.filter((claimId) => !abandoningIds.includes(claimId)));
+  }
 );
 
+// Helper for 'selectClaimIsMineForUri'.
+// Returns undefined string if unable to normalize or is not valid.
+const selectNormalizedAndVerifiedUri = createCachedSelector(
+  (state, rawUri) => rawUri,
+  (rawUri) => {
+    try {
+      const uri = normalizeURI(rawUri);
+      if (isURIValid(uri)) {
+        return uri;
+      }
+    } catch (e) {}
+
+    return undefined;
+  }
+)((state, rawUri) => String(rawUri));
+
+export const selectClaimIsMine = (state: State, claim: ?Claim) => {
+  if (claim) {
+    // The original code seems to imply that 'is_my_output' could be false even
+    // when it is yours and there is a need to double-check with 'myActiveClaims'.
+    // I'm retaining that logic. Otherwise, we could have just return
+    // is_my_output directly when it is defined and skip the fallback.
+    if (claim.is_my_output) {
+      return true;
+    } else {
+      // 'is_my_output' is false or undefined.
+      const myActiveClaims = selectMyActiveClaims(state);
+      return claim.claim_id && myActiveClaims.has(claim.claim_id);
+    }
+  } else {
+    return false;
+  }
+};
+
+export const selectClaimIsMineForUri = (state: State, rawUri: string) => {
+  // Not memoizing this selector because:
+  // (1) The workload is somewhat lightweight.
+  // (2) Since it depends on 'selectClaimsByUri', memoization won't work anyway
+  // because the array is constantly invalidated.
+
+  const uri = selectNormalizedAndVerifiedUri(state, rawUri);
+  if (!uri) {
+    return false;
+  }
+
+  const claimsByUri = selectClaimsByUri(state);
+  return selectClaimIsMine(state, claimsByUri && claimsByUri[uri]);
+};
+
+// DEPRECATED - use selectClaimIsMineForUri instead.
 export const makeSelectClaimIsMine = (rawUri: string) => {
   let uri;
   try {
@@ -198,15 +267,11 @@ export const makeSelectClaimIsMine = (rawUri: string) => {
   });
 };
 
-export const selectMyPurchases = createSelector(selectState, (state) => state.myPurchases);
-
-export const selectPurchaseUriSuccess = createSelector(selectState, (state) => state.purchaseUriSuccess);
-
-export const selectMyPurchasesCount = createSelector(selectState, (state) => state.myPurchasesPageTotalResults);
-
-export const selectIsFetchingMyPurchases = createSelector(selectState, (state) => state.fetchingMyPurchases);
-
-export const selectFetchingMyPurchasesError = createSelector(selectState, (state) => state.fetchingMyPurchasesError);
+export const selectMyPurchases = (state: State) => selectState(state).myPurchases;
+export const selectPurchaseUriSuccess = (state: State) => selectState(state).purchaseUriSuccess;
+export const selectMyPurchasesCount = (state: State) => selectState(state).myPurchasesPageTotalResults;
+export const selectIsFetchingMyPurchases = (state: State) => selectState(state).fetchingMyPurchases;
+export const selectFetchingMyPurchasesError = (state: State) => selectState(state).fetchingMyPurchasesError;
 
 export const makeSelectMyPurchasesForPage = (query: ?string, page: number = 1) =>
   createSelector(
@@ -270,7 +335,7 @@ export const makeSelectTotalPagesInChannelSearch = (uri: string) =>
 export const selectMetadataForUri = createCachedSelector(selectClaimForUri, (claim, uri) => {
   const metadata = claim && claim.value;
   return metadata || (claim === undefined ? undefined : null);
-})((state, uri) => uri);
+})((state, uri) => String(uri));
 
 export const makeSelectMetadataForUri = (uri: string) =>
   createSelector(makeSelectClaimForUri(uri), (claim) => {
@@ -303,7 +368,7 @@ export const selectDateForUri = createCachedSelector(
     const dateObj = new Date(timestamp);
     return dateObj;
   }
-)((state, uri) => uri);
+)((state, uri) => String(uri));
 
 export const makeSelectAmountForUri = (uri: string) =>
   createSelector(makeSelectClaimForUri(uri), (claim) => {
@@ -335,7 +400,7 @@ export const makeSelectCoverForUri = (uri: string) =>
     return cover && cover.url ? cover.url.trim().replace(/^http:\/\//i, 'https://') : undefined;
   });
 
-export const selectIsFetchingClaimListMine = createSelector(selectState, (state) => state.isFetchingClaimListMine);
+export const selectIsFetchingClaimListMine = (state: State) => selectState(state).isFetchingClaimListMine;
 
 export const selectMyClaimsPage = createSelector(selectState, (state) => state.myClaimsPageResults || []);
 
@@ -346,12 +411,8 @@ export const selectMyClaimsPageNumber = createSelector(
   (state) => (state.txoPage && state.txoPage.page) || 1
 );
 
-export const selectMyClaimsPageItemCount = createSelector(selectState, (state) => state.myClaimsPageTotalResults || 1);
-
-export const selectFetchingMyClaimsPageError = createSelector(
-  selectState,
-  (state) => state.fetchingClaimListMinePageError
-);
+export const selectMyClaimsPageItemCount = (state: State) => selectState(state).myClaimsPageTotalResults || 1;
+export const selectFetchingMyClaimsPageError = (state: State) => selectState(state).fetchingClaimListMinePageError;
 
 export const selectMyClaims = createSelector(
   selectMyActiveClaims,
@@ -403,18 +464,31 @@ export const selectMyClaimsOutpoints = createSelector(selectMyClaims, (myClaims)
   return outpoints;
 });
 
-export const selectFetchingMyChannels = createSelector(selectState, (state) => state.fetchingMyChannels);
+export const selectFetchingMyChannels = (state: State) => selectState(state).fetchingMyChannels;
+export const selectFetchingMyCollections = (state: State) => selectState(state).fetchingMyCollections;
 
-export const selectFetchingMyCollections = createSelector(selectState, (state) => state.fetchingMyCollections);
+export const selectMyChannelClaimIds = (state: State) => selectState(state).myChannelClaims;
 
-export const selectMyChannelClaims = createSelector(selectState, selectClaimsById, (state, byId) => {
-  const ids = state.myChannelClaims;
-  if (!ids) {
-    return ids;
+export const selectMyChannelClaims = createSelector(selectMyChannelClaimIds, (myChannelClaimIds) => {
+  if (!myChannelClaimIds) {
+    return myChannelClaimIds;
   }
 
+  if (!window || !window.store) {
+    return undefined;
+  }
+
+  // Note: Grabbing the store and running the selector this way is anti-pattern,
+  // but it is _needed_ and works only because we know for sure that 'byId[]'
+  // will be populated with the same claims as when 'myChannelClaimIds' is populated.
+  // If we put 'state' or 'byId' as the input selector, it essentially
+  // recalculates every time. Putting 'state' as input to createSelector() is
+  // always wrong from a memoization standpoint.
+  const state = window.store.getState();
+  const byId = selectClaimsById(state);
+
   const claims = [];
-  ids.forEach((id) => {
+  myChannelClaimIds.forEach((id) => {
     if (byId[id]) {
       // I'm not sure why this check is necessary, but it ought to be a quick fix for https://github.com/lbryio/lbry-desktop/issues/544
       claims.push(byId[id]);
@@ -428,16 +502,21 @@ export const selectMyChannelUrls = createSelector(selectMyChannelClaims, (claims
   claims ? claims.map((claim) => claim.canonical_url || claim.permanent_url) : undefined
 );
 
-export const selectMyCollectionIds = createSelector(selectState, (state) => state.myCollectionClaims);
+export const selectHasChannels = (state: State) => {
+  const myChannelClaimIds = selectMyChannelClaimIds(state);
+  return myChannelClaimIds ? myChannelClaimIds.length > 0 : false;
+};
+
+export const selectMyCollectionIds = (state: State) => selectState(state).myCollectionClaims;
 
 export const selectResolvingUris = createSelector(selectState, (state) => state.resolvingUris || []);
 
-export const selectChannelImportPending = createSelector(selectState, (state) => state.pendingChannelImport);
+export const selectChannelImportPending = (state: State) => selectState(state).pendingChannelImport;
 
 export const makeSelectIsUriResolving = (uri: string) =>
   createSelector(selectResolvingUris, (resolvingUris) => resolvingUris && resolvingUris.indexOf(uri) !== -1);
 
-export const selectPlayingUri = createSelector(selectState, (state) => state.playingUri);
+export const selectPlayingUri = (state: State) => selectState(state).playingUri;
 
 export const selectChannelClaimCounts = createSelector(selectState, (state) => state.channelClaimCounts || {});
 
@@ -541,7 +620,7 @@ export const makeSelectMyChannelPermUrlForName = (name: string) =>
 
 export const selectTagsForUri = createCachedSelector(selectMetadataForUri, (metadata: ?GenericMetadata) => {
   return (metadata && metadata.tags) || [];
-})((state, uri) => uri);
+})((state, uri) => String(uri));
 
 export const makeSelectTagsForUri = (uri: string) =>
   createSelector(makeSelectMetadataForUri(uri), (metadata: ?GenericMetadata) => {
@@ -592,9 +671,8 @@ export const makeSelectSupportsForUri = (uri: string) =>
     return total;
   });
 
-export const selectUpdatingChannel = createSelector(selectState, (state) => state.updatingChannel);
-
-export const selectUpdateChannelError = createSelector(selectState, (state) => state.updateChannelError);
+export const selectUpdatingChannel = (state: State) => selectState(state).updatingChannel;
+export const selectUpdateChannelError = (state: State) => selectState(state).updateChannelError;
 
 export const makeSelectReflectingClaimForUri = (uri: string) =>
   createSelector(selectClaimIdsByUri, selectReflectingById, (claimIdsByUri, reflectingById) => {
@@ -638,39 +716,34 @@ export const makeSelectClaimIsStreamPlaceholder = (uri: string) =>
     return Boolean(claim.value_type === 'stream' && !claim.value.source);
   });
 
-export const makeSelectTotalStakedAmountForChannelUri = (uri: string) =>
-  createSelector(makeSelectClaimForUri(uri), (claim) => {
-    if (!claim || !claim.amount || !claim.meta || !claim.meta.support_amount) {
-      return 0;
-    }
+export const selectTotalStakedAmountForChannelUri = createCachedSelector(selectClaimForUri, (claim) => {
+  if (!claim || !claim.amount || !claim.meta || !claim.meta.support_amount) {
+    return 0;
+  }
 
-    return parseFloat(claim.amount) + parseFloat(claim.meta.support_amount) || 0;
-  });
+  return parseFloat(claim.amount) + parseFloat(claim.meta.support_amount) || 0;
+})((state, uri) => String(uri));
 
-export const makeSelectStakedLevelForChannelUri = (uri: string) =>
-  createSelector(makeSelectTotalStakedAmountForChannelUri(uri), (amount) => {
-    let level = 1;
-    switch (true) {
-      case amount >= CLAIM.LEVEL_2_STAKED_AMOUNT && amount < CLAIM.LEVEL_3_STAKED_AMOUNT:
-        level = 2;
-        break;
-      case amount >= CLAIM.LEVEL_3_STAKED_AMOUNT && amount < CLAIM.LEVEL_4_STAKED_AMOUNT:
-        level = 3;
-        break;
-      case amount >= CLAIM.LEVEL_4_STAKED_AMOUNT && amount < CLAIM.LEVEL_5_STAKED_AMOUNT:
-        level = 4;
-        break;
-      case amount >= CLAIM.LEVEL_5_STAKED_AMOUNT:
-        level = 5;
-        break;
-    }
-    return level;
-  });
+export const selectStakedLevelForChannelUri = createCachedSelector(selectTotalStakedAmountForChannelUri, (amount) => {
+  let level = 1;
+  switch (true) {
+    case amount >= CLAIM.LEVEL_2_STAKED_AMOUNT && amount < CLAIM.LEVEL_3_STAKED_AMOUNT:
+      level = 2;
+      break;
+    case amount >= CLAIM.LEVEL_3_STAKED_AMOUNT && amount < CLAIM.LEVEL_4_STAKED_AMOUNT:
+      level = 3;
+      break;
+    case amount >= CLAIM.LEVEL_4_STAKED_AMOUNT && amount < CLAIM.LEVEL_5_STAKED_AMOUNT:
+      level = 4;
+      break;
+    case amount >= CLAIM.LEVEL_5_STAKED_AMOUNT:
+      level = 5;
+      break;
+  }
+  return level;
+})((state, uri) => String(uri));
 
-export const selectUpdatingCollection = createSelector(selectState, (state) => state.updatingCollection);
-
-export const selectUpdateCollectionError = createSelector(selectState, (state) => state.updateCollectionError);
-
-export const selectCreatingCollection = createSelector(selectState, (state) => state.creatingCollection);
-
-export const selectCreateCollectionError = createSelector(selectState, (state) => state.createCollectionError);
+export const selectUpdatingCollection = (state: State) => selectState(state).updatingCollection;
+export const selectUpdateCollectionError = (state: State) => selectState(state).updateCollectionError;
+export const selectCreatingCollection = (state: State) => selectState(state).creatingCollection;
+export const selectCreateCollectionError = (state: State) => selectState(state).createCollectionError;
diff --git a/ui/redux/selectors/comments.js b/ui/redux/selectors/comments.js
index bc53eb785..4ced61c4f 100644
--- a/ui/redux/selectors/comments.js
+++ b/ui/redux/selectors/comments.js
@@ -4,14 +4,15 @@ import { createCachedSelector } from 're-reselect';
 import { selectMutedChannels } from 'redux/selectors/blocked';
 import { selectShowMatureContent } from 'redux/selectors/settings';
 import { selectBlacklistedOutpointMap, selectFilteredOutpointMap } from 'lbryinc';
-import { selectClaimsById, selectMyActiveClaims } from 'redux/selectors/claims';
+import { selectClaimsById, selectMyActiveClaims, selectClaimIdForUri } from 'redux/selectors/claims';
 import { isClaimNsfw } from 'util/claim';
 
-type State = { comments: CommentsState };
+type State = { comments: CommentsState, claims: any };
 
 const selectState = (state) => state.comments || {};
 
 export const selectCommentsById = (state: State) => selectState(state).commentById || {};
+export const selectCommentIdsByClaimId = (state: State) => selectState(state).byId;
 export const selectIsFetchingComments = (state: State) => selectState(state).isLoading;
 export const selectIsFetchingCommentsById = (state: State) => selectState(state).isLoadingById;
 export const selectIsFetchingCommentsByParentId = (state: State) => selectState(state).isLoadingByParentId;
@@ -173,6 +174,12 @@ export const selectRepliesByParentId = createSelector(selectState, selectComment
 
 export const selectLinkedCommentAncestors = (state: State) => selectState(state).linkedCommentAncestors;
 
+export const selectCommentIdsForUri = (state: State, uri: string) => {
+  const claimId = selectClaimIdForUri(state, uri);
+  const commentIdsByClaimId = selectCommentIdsByClaimId(state);
+  return commentIdsByClaimId[claimId];
+};
+
 export const makeSelectCommentIdsForUri = (uri: string) =>
   createSelector(selectState, selectCommentsByUri, selectClaimsById, (state, byUri) => {
     const claimId = byUri[uri];
-- 
2.45.3


From 08c47a57f1fd5ef53fc3b63b52264719f0c5d0f1 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Fri, 31 Dec 2021 12:53:07 -0500
Subject: [PATCH 24/29] upgrade electron to 15 (#7363)

* upgrade electron to 15

* linter
---
 electron/createWindow.js              | 11 +++---
 electron/index.js                     |  2 +
 package.json                          |  3 +-
 ui/component/common/file-selector.jsx |  4 +-
 ui/component/fileRender/view.jsx      |  2 +-
 ui/component/header/view.jsx          |  4 +-
 ui/component/walletBackup/view.jsx    |  3 +-
 ui/index.jsx                          |  3 +-
 ui/redux/actions/app.js               |  3 +-
 ui/redux/reducers/app.js              |  2 +-
 ui/util/context-menu.js               |  3 +-
 yarn.lock                             | 53 +++++++++++++--------------
 12 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/electron/createWindow.js b/electron/createWindow.js
index 042fae9b1..399c8ac82 100644
--- a/electron/createWindow.js
+++ b/electron/createWindow.js
@@ -1,5 +1,5 @@
 import { WEBPACK_ELECTRON_PORT } from 'config';
-import { app, BrowserWindow, dialog, shell, screen, nativeImage } from 'electron';
+import { app, BrowserWindow, dialog, screen, nativeImage } from 'electron';
 import isDev from 'electron-is-dev';
 import windowStateKeeper from 'electron-window-state';
 import SUPPORTED_LANGUAGES from 'constants/supported_languages';
@@ -9,7 +9,7 @@ import { TO_TRAY_WHEN_CLOSED } from 'constants/settings';
 
 import setupBarMenu from './menu/setupBarMenu';
 import * as PAGES from 'constants/pages';
-
+const remote = require('@electron/remote/main');
 function GetAppLangCode() {
   // https://www.electronjs.org/docs/api/locales
   // 1. Gets the user locale.
@@ -54,6 +54,7 @@ export default appState => {
       webSecurity: !isDev,
       plugins: true,
       nodeIntegration: true,
+      contextIsolation: false,
       enableRemoteModule: true, // see about removing this
     },
   };
@@ -62,6 +63,7 @@ export default appState => {
   const rendererURL = isDev ? `http://localhost:${WEBPACK_ELECTRON_PORT}` : `file://${__dirname}/index.html`;
 
   let window = new BrowserWindow(windowConfiguration);
+  remote.enable(window.webContents);
 
   // Let us register listeners on the window, so we can update the state
   // automatically (the listeners will be removed when the window is closed)
@@ -187,9 +189,8 @@ export default appState => {
     window = null;
   });
 
-  window.webContents.on('new-window', (event, url) => {
-    event.preventDefault();
-    shell.openExternal(url);
+  window.webContents.setWindowOpenHandler((details) => {
+    return { action: 'deny' };
   });
 
   window.webContents.on('update-target-url', (event, url) => {
diff --git a/electron/index.js b/electron/index.js
index b73653280..a40822e4e 100644
--- a/electron/index.js
+++ b/electron/index.js
@@ -18,6 +18,8 @@ import installDevtools from './installDevtools';
 import fs from 'fs';
 import path from 'path';
 const { download } = require('electron-dl');
+const remote = require('@electron/remote/main');
+remote.initialize();
 const filePath = path.join(process.resourcesPath, 'static', 'upgradeDisabled');
 let upgradeDisabled;
 try {
diff --git a/package.json b/package.json
index a880ce9b0..1ba1c8e52 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "postinstall:warning": "echo '\n\nWARNING\n\nNot all node modules were installed because NODE_ENV is set to \"production\".\nThis should only be set after installing dependencies with \"yarn\". The app will not work.\n\n'"
   },
   "dependencies": {
+    "@electron/remote": "^2.0.1",
     "@ungap/from-entries": "^0.2.1",
     "auto-launch": "^5.0.5",
     "electron-dl": "^3.2.0",
@@ -122,7 +123,7 @@
     "dom-scroll-into-view": "^1.2.1",
     "dotenv-defaults": "^2.0.1",
     "dotenv-webpack": "^1.8.0",
-    "electron": "11.5.0",
+    "electron": "15.3.2",
     "electron-builder": "^22.9.1",
     "electron-devtools-installer": "^3.1.1",
     "electron-is-dev": "^0.3.0",
diff --git a/ui/component/common/file-selector.jsx b/ui/component/common/file-selector.jsx
index 9e428986a..38dd92102 100644
--- a/ui/component/common/file-selector.jsx
+++ b/ui/component/common/file-selector.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react';
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import Button from 'component/button';
 import { FormField } from 'component/common/form';
 
@@ -47,7 +47,7 @@ class FileSelector extends React.PureComponent<Props> {
   };
 
   handleDirectoryInputSelection = () => {
-    remote.dialog.showOpenDialog({ properties: ['openDirectory'] }).then(result => {
+    remote.dialog.showOpenDialog({ properties: ['openDirectory'] }).then((result) => {
       const path = result && result.filePaths[0];
       if (path) {
         // $FlowFixMe
diff --git a/ui/component/fileRender/view.jsx b/ui/component/fileRender/view.jsx
index b99529fb3..0ffe92027 100644
--- a/ui/component/fileRender/view.jsx
+++ b/ui/component/fileRender/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import React from 'react';
 import classnames from 'classnames';
 import * as RENDER_MODES from 'constants/file_render_modes';
diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx
index 39bf6790f..ecba80983 100644
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@@ -17,10 +17,8 @@ import NotificationHeaderButton from 'component/notificationHeaderButton';
 import ChannelThumbnail from 'component/channelThumbnail';
 import SkipNavigationButton from 'component/skipNavigationButton';
 import Logo from 'component/logo';
-// @if TARGET='app'
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 import { IS_MAC } from 'component/app/view';
-// @endif
 
 type Props = {
   user: ?User,
diff --git a/ui/component/walletBackup/view.jsx b/ui/component/walletBackup/view.jsx
index 3592cbdfb..22df3bffc 100644
--- a/ui/component/walletBackup/view.jsx
+++ b/ui/component/walletBackup/view.jsx
@@ -1,6 +1,7 @@
 // @flow
 import * as React from 'react';
-import { shell, remote } from 'electron';
+import { shell } from 'electron';
+import * as remote from '@electron/remote';
 import Button from 'component/button';
 import CopyableText from 'component/copyableText';
 import AdmZip from 'adm-zip';
diff --git a/ui/index.jsx b/ui/index.jsx
index 0f88a4900..c46e2f8e1 100644
--- a/ui/index.jsx
+++ b/ui/index.jsx
@@ -5,7 +5,8 @@ import SnackBar from 'component/snackBar';
 import SplashScreen from 'component/splash';
 import * as ACTIONS from 'constants/action_types';
 import { changeZoomFactor } from 'util/zoomWindow';
-import { ipcRenderer, remote, shell } from 'electron';
+import { ipcRenderer, shell } from 'electron';
+import * as remote from '@electron/remote';
 import moment from 'moment';
 import * as MODALS from 'constants/modal_types';
 import React, { Fragment, useState, useEffect } from 'react';
diff --git a/ui/redux/actions/app.js b/ui/redux/actions/app.js
index 3420c9b69..098aea012 100644
--- a/ui/redux/actions/app.js
+++ b/ui/redux/actions/app.js
@@ -1,6 +1,7 @@
 import { execSync } from 'child_process';
 import isDev from 'electron-is-dev';
-import { ipcRenderer, remote } from 'electron';
+import { ipcRenderer } from 'electron';
+import * as remote from '@electron/remote';
 import * as ACTIONS from 'constants/action_types';
 import * as MODALS from 'constants/modal_types';
 import * as SETTINGS from 'constants/settings';
diff --git a/ui/redux/reducers/app.js b/ui/redux/reducers/app.js
index 4772ebb2d..66bb53ed6 100644
--- a/ui/redux/reducers/app.js
+++ b/ui/redux/reducers/app.js
@@ -1,7 +1,7 @@
 // @flow
 
 import * as ACTIONS from 'constants/action_types';
-import { remote } from 'electron';
+import * as remote from '@electron/remote';
 
 // @if TARGET='app'
 const win = remote.BrowserWindow.getFocusedWindow();
diff --git a/ui/util/context-menu.js b/ui/util/context-menu.js
index 7d047af65..be2ea4a1a 100644
--- a/ui/util/context-menu.js
+++ b/ui/util/context-menu.js
@@ -1,4 +1,5 @@
-import { clipboard, remote, shell } from 'electron';
+import { clipboard, shell } from 'electron';
+import * as remote from '@electron/remote';
 import { convertToShareLink } from 'util/lbryURI';
 const isDev = process.env.NODE_ENV !== 'production';
 
diff --git a/yarn.lock b/yarn.lock
index aa0e13b66..43e0aa2a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1270,22 +1270,27 @@
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
-"@electron/get@^1.0.1":
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3"
-  integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==
+"@electron/get@^1.13.0":
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
+  integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
     got "^9.6.0"
     progress "^2.0.3"
-    sanitize-filename "^1.6.2"
+    semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
-    global-agent "^2.0.2"
+    global-agent "^3.0.0"
     global-tunnel-ng "^2.7.1"
 
+"@electron/remote@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de"
+  integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==
+
 "@exponent/electron-cookies@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@exponent/electron-cookies/-/electron-cookies-2.0.0.tgz#4cf8dcf851454036cc524c40e9e482fc4e23f2d9"
@@ -1769,10 +1774,10 @@
   version "13.9.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.0.tgz#5b6ee7a77faacddd7de719017d0bc12f52f81589"
 
-"@types/node@^12.0.12":
-  version "12.12.62"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.62.tgz#733923d73669188d35950253dd18a21570085d2b"
-  integrity sha512-qAfo81CsD7yQIM9mVyh6B/U47li5g7cfpVQEDMfQeF8pSZVwzbhwU3crc0qG4DmpsebpJPR49AKOExQyJ05Cpg==
+"@types/node@^14.6.2":
+  version "14.18.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.1.tgz#459886b51f52aa923dc06b9ea81cb8b1d733e9d3"
+  integrity sha512-fTFWOFrgAkj737w1o0HLTIgisgYHnsZfeiqhG1Ltrf/iJjudEbUwetQAsfrtVE49JGwvpEzQR+EbMkIqG4227g==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -3737,11 +3742,6 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
 
-core-js@^3.6.5:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
-  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
-
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -4747,13 +4747,13 @@ electron-window-state@^4.1.1:
     jsonfile "^2.2.3"
     mkdirp "^0.5.1"
 
-electron@11.5.0:
-  version "11.5.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-11.5.0.tgz#f1650543b9d8f2047d3807755bdb120153ed210f"
-  integrity sha512-WjNDd6lGpxyiNjE3LhnFCAk/D9GIj1rU3GSDealVShhkkkPR3Vh4q8ErXGDl1OAO/faomVa10KoFPUN/pLbNxg==
+electron@15.3.2:
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz#4f0cbad781d14e0194f5dfef1709e09a70c8074a"
+  integrity sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ==
   dependencies:
-    "@electron/get" "^1.0.1"
-    "@types/node" "^12.0.12"
+    "@electron/get" "^1.13.0"
+    "@types/node" "^14.6.2"
     extract-zip "^1.0.3"
 
 elegant-spinner@^1.0.1:
@@ -5951,13 +5951,12 @@ glob@^7.0.5, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-agent@^2.0.2:
-  version "2.1.12"
-  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
-  integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==
+global-agent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
+  integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
   dependencies:
     boolean "^3.0.1"
-    core-js "^3.6.5"
     es6-error "^4.1.1"
     matcher "^3.0.0"
     roarr "^2.15.3"
@@ -10744,7 +10743,7 @@ safe-regex@^1.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
+sanitize-filename@^1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
   integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
-- 
2.45.3


From 73600003b03465692942666e9aa7c1af93a23aa5 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Fri, 31 Dec 2021 13:27:39 -0500
Subject: [PATCH 25/29] v0.52.1-alpha.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1ba1c8e52..bdb1791bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lbry",
-  "version": "0.52.0",
+  "version": "0.52.1-alpha.1",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
-- 
2.45.3


From 68ecfbb990da0ab70e65e7b01a31356a6e2480aa Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Fri, 31 Dec 2021 13:29:20 -0500
Subject: [PATCH 26/29] update changelog for 0.52.1

---
 CHANGELOG.md | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ef9494f9..2a5987b08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,52 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased for Desktop]
-## [0.52.0] - [2021-10-24]
+## [0.52.1] - [2021-12-31]
+
+### Compatibility
+- Mac <= 10.13 (High Sierra) and Ubuntu <= 16 (Xenial) are no longer supported. If you upgrade, you will need to manually build and install your own lbrynet SDK
+
+### Added
+- Direct replying to notifications _community pr!_ ([#6935](https://github.com/lbryio/lbry-desktop/pull/6935))
+- Added "Replay" option on autoplay countdown ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921))
+- Added "Loop" option on Lists ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921))
+- Added "Shuffle" option on Lists ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921))
+- Added Play Next/Previous buttons (with shortcuts SHIFT+N/SHIFT+P) ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921))
+- Separate control for autoplay next on video player ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921))
+- Channel Mention selection ability while creating a comment ([#7151](https://github.com/lbryio/lbry-desktop/pull/7151))
+- Disk space setting under Data Hosting ([#7266](https://github.com/lbryio/lbry-desktop/pull/7266))
+- Paginated 'All Playlists' page ([#7268](https://github.com/lbryio/lbry-desktop/pull/7268))
+- Expanded playlist ordering tools ([#7305](https://github.com/lbryio/lbry-desktop/pull/7305))
+- Setting to upgrade to alpha prerelease builds ([#7353](https://github.com/lbryio/lbry-desktop/pull/7353))
+
+### Changed
+- Changing the supported language from Filipino to Tagalog _community pr!_ ([#6951](https://github.com/lbryio/lbry-desktop/pull/6951))
+- Don't show countdown to next item in list ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921))
+- Changed "View List" popup option to link, so can be opened on a new tab ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921))
+- App reorganized to remove lbry-redux and lbryinc repository dependencies ([#7240](https://github.com/lbryio/lbry-desktop/pull/7240))
+- Styling cleanup for file reactions ([#7251](https://github.com/lbryio/lbry-desktop/pull/7251))
+- Change share url to odysee and allow custom share url in settings ([#7258](https://github.com/lbryio/lbry-desktop/pull/7258))
+- Change Sign in/up to Cloud Connect for Odysee ([#7260](https://github.com/lbryio/lbry-desktop/pull/7260))
+- Upgraded to lbrynet v0.106.0 ([#7315](https://github.com/lbryio/lbry-desktop/pull/7315))
+- Upgraded Electron to v11.5.0 ([#7276](https://github.com/lbryio/lbry-desktop/pull/7276))
+- Cleaner Discover page filters ([#7306](https://github.com/lbryio/lbry-desktop/pull/7306))
+- Scroll bar styling ([#7314](https://github.com/lbryio/lbry-desktop/pull/7314))
+- Remove pages for obsolete features like invites, rewards, swap ([#7330](https://github.com/lbryio/lbry-desktop/pull/7330))
+- Change file repost to modal _community pr!_ ([#7341](https://github.com/lbryio/lbry-desktop/pull/7341))
+
+### Fixed
+- Clicking on the title of a floating player will take you back to the list ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921))
+- Fix floating player stopping on markdown or image files ([#7073](https://github.com/lbryio/lbry-desktop/pull/7073))
+- Fix list thumbnail upload ([#7074](https://github.com/lbryio/lbry-desktop/pull/7074))
+- Stream Key is now hidden _community pr!_ ([#7127](https://github.com/lbryio/lbry-desktop/pull/7127))
+- Fix playlist preview thumbnail ([#7178](https://github.com/lbryio/lbry-desktop/pull/7178)
+- Fixed “Your Account” popup on mobile ([#7172](https://github.com/lbryio/lbry-desktop/pull/7172))
+- Fix disable-support for comments ([#7245](https://github.com/lbryio/lbry-desktop/pull/7245))
+- Fix Electron taking over .html files on linux ([#7291](https://github.com/lbryio/lbry-desktop/pull/7291))
+- Fix floating player play/pause on drag _community pr!_ ([#7339](https://github.com/lbryio/lbry-desktop/pull/7339))
+- Fix card dropdown menus triggering menu actions _community pr!_ ([#7335](https://github.com/lbryio/lbry-desktop/pull/7335))
+
+## [0.52.0] - [2021-12-31]
 
 ### Compatibility
 - Mac <= 10.13 (High Sierra) and Ubuntu <= 16 (Xenial) are no longer supported. If you upgrade, you will need to manually build and install your own lbrynet SDK
-- 
2.45.3


From 6d04ff6e32bc543145276d551343669dc328b519 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Fri, 31 Dec 2021 14:49:45 -0500
Subject: [PATCH 27/29] Revert "upgrade electron to 15 (#7363)" (#7383)

This reverts commit 08c47a57f1fd5ef53fc3b63b52264719f0c5d0f1.
---
 electron/createWindow.js              | 11 +++---
 electron/index.js                     |  2 -
 package.json                          |  3 +-
 ui/component/common/file-selector.jsx |  4 +-
 ui/component/fileRender/view.jsx      |  2 +-
 ui/component/header/view.jsx          |  4 +-
 ui/component/walletBackup/view.jsx    |  3 +-
 ui/index.jsx                          |  3 +-
 ui/redux/actions/app.js               |  3 +-
 ui/redux/reducers/app.js              |  2 +-
 ui/util/context-menu.js               |  3 +-
 yarn.lock                             | 53 ++++++++++++++-------------
 12 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/electron/createWindow.js b/electron/createWindow.js
index 399c8ac82..042fae9b1 100644
--- a/electron/createWindow.js
+++ b/electron/createWindow.js
@@ -1,5 +1,5 @@
 import { WEBPACK_ELECTRON_PORT } from 'config';
-import { app, BrowserWindow, dialog, screen, nativeImage } from 'electron';
+import { app, BrowserWindow, dialog, shell, screen, nativeImage } from 'electron';
 import isDev from 'electron-is-dev';
 import windowStateKeeper from 'electron-window-state';
 import SUPPORTED_LANGUAGES from 'constants/supported_languages';
@@ -9,7 +9,7 @@ import { TO_TRAY_WHEN_CLOSED } from 'constants/settings';
 
 import setupBarMenu from './menu/setupBarMenu';
 import * as PAGES from 'constants/pages';
-const remote = require('@electron/remote/main');
+
 function GetAppLangCode() {
   // https://www.electronjs.org/docs/api/locales
   // 1. Gets the user locale.
@@ -54,7 +54,6 @@ export default appState => {
       webSecurity: !isDev,
       plugins: true,
       nodeIntegration: true,
-      contextIsolation: false,
       enableRemoteModule: true, // see about removing this
     },
   };
@@ -63,7 +62,6 @@ export default appState => {
   const rendererURL = isDev ? `http://localhost:${WEBPACK_ELECTRON_PORT}` : `file://${__dirname}/index.html`;
 
   let window = new BrowserWindow(windowConfiguration);
-  remote.enable(window.webContents);
 
   // Let us register listeners on the window, so we can update the state
   // automatically (the listeners will be removed when the window is closed)
@@ -189,8 +187,9 @@ export default appState => {
     window = null;
   });
 
-  window.webContents.setWindowOpenHandler((details) => {
-    return { action: 'deny' };
+  window.webContents.on('new-window', (event, url) => {
+    event.preventDefault();
+    shell.openExternal(url);
   });
 
   window.webContents.on('update-target-url', (event, url) => {
diff --git a/electron/index.js b/electron/index.js
index a40822e4e..b73653280 100644
--- a/electron/index.js
+++ b/electron/index.js
@@ -18,8 +18,6 @@ import installDevtools from './installDevtools';
 import fs from 'fs';
 import path from 'path';
 const { download } = require('electron-dl');
-const remote = require('@electron/remote/main');
-remote.initialize();
 const filePath = path.join(process.resourcesPath, 'static', 'upgradeDisabled');
 let upgradeDisabled;
 try {
diff --git a/package.json b/package.json
index bdb1791bc..63ad2964b 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
     "postinstall:warning": "echo '\n\nWARNING\n\nNot all node modules were installed because NODE_ENV is set to \"production\".\nThis should only be set after installing dependencies with \"yarn\". The app will not work.\n\n'"
   },
   "dependencies": {
-    "@electron/remote": "^2.0.1",
     "@ungap/from-entries": "^0.2.1",
     "auto-launch": "^5.0.5",
     "electron-dl": "^3.2.0",
@@ -123,7 +122,7 @@
     "dom-scroll-into-view": "^1.2.1",
     "dotenv-defaults": "^2.0.1",
     "dotenv-webpack": "^1.8.0",
-    "electron": "15.3.2",
+    "electron": "11.5.0",
     "electron-builder": "^22.9.1",
     "electron-devtools-installer": "^3.1.1",
     "electron-is-dev": "^0.3.0",
diff --git a/ui/component/common/file-selector.jsx b/ui/component/common/file-selector.jsx
index 38dd92102..9e428986a 100644
--- a/ui/component/common/file-selector.jsx
+++ b/ui/component/common/file-selector.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react';
-import * as remote from '@electron/remote';
+import { remote } from 'electron';
 import Button from 'component/button';
 import { FormField } from 'component/common/form';
 
@@ -47,7 +47,7 @@ class FileSelector extends React.PureComponent<Props> {
   };
 
   handleDirectoryInputSelection = () => {
-    remote.dialog.showOpenDialog({ properties: ['openDirectory'] }).then((result) => {
+    remote.dialog.showOpenDialog({ properties: ['openDirectory'] }).then(result => {
       const path = result && result.filePaths[0];
       if (path) {
         // $FlowFixMe
diff --git a/ui/component/fileRender/view.jsx b/ui/component/fileRender/view.jsx
index 0ffe92027..b99529fb3 100644
--- a/ui/component/fileRender/view.jsx
+++ b/ui/component/fileRender/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import * as remote from '@electron/remote';
+import { remote } from 'electron';
 import React from 'react';
 import classnames from 'classnames';
 import * as RENDER_MODES from 'constants/file_render_modes';
diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx
index ecba80983..39bf6790f 100644
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@@ -17,8 +17,10 @@ import NotificationHeaderButton from 'component/notificationHeaderButton';
 import ChannelThumbnail from 'component/channelThumbnail';
 import SkipNavigationButton from 'component/skipNavigationButton';
 import Logo from 'component/logo';
-import * as remote from '@electron/remote';
+// @if TARGET='app'
+import { remote } from 'electron';
 import { IS_MAC } from 'component/app/view';
+// @endif
 
 type Props = {
   user: ?User,
diff --git a/ui/component/walletBackup/view.jsx b/ui/component/walletBackup/view.jsx
index 22df3bffc..3592cbdfb 100644
--- a/ui/component/walletBackup/view.jsx
+++ b/ui/component/walletBackup/view.jsx
@@ -1,7 +1,6 @@
 // @flow
 import * as React from 'react';
-import { shell } from 'electron';
-import * as remote from '@electron/remote';
+import { shell, remote } from 'electron';
 import Button from 'component/button';
 import CopyableText from 'component/copyableText';
 import AdmZip from 'adm-zip';
diff --git a/ui/index.jsx b/ui/index.jsx
index c46e2f8e1..0f88a4900 100644
--- a/ui/index.jsx
+++ b/ui/index.jsx
@@ -5,8 +5,7 @@ import SnackBar from 'component/snackBar';
 import SplashScreen from 'component/splash';
 import * as ACTIONS from 'constants/action_types';
 import { changeZoomFactor } from 'util/zoomWindow';
-import { ipcRenderer, shell } from 'electron';
-import * as remote from '@electron/remote';
+import { ipcRenderer, remote, shell } from 'electron';
 import moment from 'moment';
 import * as MODALS from 'constants/modal_types';
 import React, { Fragment, useState, useEffect } from 'react';
diff --git a/ui/redux/actions/app.js b/ui/redux/actions/app.js
index 098aea012..3420c9b69 100644
--- a/ui/redux/actions/app.js
+++ b/ui/redux/actions/app.js
@@ -1,7 +1,6 @@
 import { execSync } from 'child_process';
 import isDev from 'electron-is-dev';
-import { ipcRenderer } from 'electron';
-import * as remote from '@electron/remote';
+import { ipcRenderer, remote } from 'electron';
 import * as ACTIONS from 'constants/action_types';
 import * as MODALS from 'constants/modal_types';
 import * as SETTINGS from 'constants/settings';
diff --git a/ui/redux/reducers/app.js b/ui/redux/reducers/app.js
index 66bb53ed6..4772ebb2d 100644
--- a/ui/redux/reducers/app.js
+++ b/ui/redux/reducers/app.js
@@ -1,7 +1,7 @@
 // @flow
 
 import * as ACTIONS from 'constants/action_types';
-import * as remote from '@electron/remote';
+import { remote } from 'electron';
 
 // @if TARGET='app'
 const win = remote.BrowserWindow.getFocusedWindow();
diff --git a/ui/util/context-menu.js b/ui/util/context-menu.js
index be2ea4a1a..7d047af65 100644
--- a/ui/util/context-menu.js
+++ b/ui/util/context-menu.js
@@ -1,5 +1,4 @@
-import { clipboard, shell } from 'electron';
-import * as remote from '@electron/remote';
+import { clipboard, remote, shell } from 'electron';
 import { convertToShareLink } from 'util/lbryURI';
 const isDev = process.env.NODE_ENV !== 'production';
 
diff --git a/yarn.lock b/yarn.lock
index 43e0aa2a6..aa0e13b66 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1270,27 +1270,22 @@
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
-"@electron/get@^1.13.0":
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
-  integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
+"@electron/get@^1.0.1":
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3"
+  integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
     got "^9.6.0"
     progress "^2.0.3"
-    semver "^6.2.0"
+    sanitize-filename "^1.6.2"
     sumchecker "^3.0.1"
   optionalDependencies:
-    global-agent "^3.0.0"
+    global-agent "^2.0.2"
     global-tunnel-ng "^2.7.1"
 
-"@electron/remote@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de"
-  integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==
-
 "@exponent/electron-cookies@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@exponent/electron-cookies/-/electron-cookies-2.0.0.tgz#4cf8dcf851454036cc524c40e9e482fc4e23f2d9"
@@ -1774,10 +1769,10 @@
   version "13.9.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.0.tgz#5b6ee7a77faacddd7de719017d0bc12f52f81589"
 
-"@types/node@^14.6.2":
-  version "14.18.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.1.tgz#459886b51f52aa923dc06b9ea81cb8b1d733e9d3"
-  integrity sha512-fTFWOFrgAkj737w1o0HLTIgisgYHnsZfeiqhG1Ltrf/iJjudEbUwetQAsfrtVE49JGwvpEzQR+EbMkIqG4227g==
+"@types/node@^12.0.12":
+  version "12.12.62"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.62.tgz#733923d73669188d35950253dd18a21570085d2b"
+  integrity sha512-qAfo81CsD7yQIM9mVyh6B/U47li5g7cfpVQEDMfQeF8pSZVwzbhwU3crc0qG4DmpsebpJPR49AKOExQyJ05Cpg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -3742,6 +3737,11 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
 
+core-js@^3.6.5:
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
+  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -4747,13 +4747,13 @@ electron-window-state@^4.1.1:
     jsonfile "^2.2.3"
     mkdirp "^0.5.1"
 
-electron@15.3.2:
-  version "15.3.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz#4f0cbad781d14e0194f5dfef1709e09a70c8074a"
-  integrity sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ==
+electron@11.5.0:
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-11.5.0.tgz#f1650543b9d8f2047d3807755bdb120153ed210f"
+  integrity sha512-WjNDd6lGpxyiNjE3LhnFCAk/D9GIj1rU3GSDealVShhkkkPR3Vh4q8ErXGDl1OAO/faomVa10KoFPUN/pLbNxg==
   dependencies:
-    "@electron/get" "^1.13.0"
-    "@types/node" "^14.6.2"
+    "@electron/get" "^1.0.1"
+    "@types/node" "^12.0.12"
     extract-zip "^1.0.3"
 
 elegant-spinner@^1.0.1:
@@ -5951,12 +5951,13 @@ glob@^7.0.5, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-agent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
-  integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
+global-agent@^2.0.2:
+  version "2.1.12"
+  resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195"
+  integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==
   dependencies:
     boolean "^3.0.1"
+    core-js "^3.6.5"
     es6-error "^4.1.1"
     matcher "^3.0.0"
     roarr "^2.15.3"
@@ -10743,7 +10744,7 @@ safe-regex@^1.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-sanitize-filename@^1.6.3:
+sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
   integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
-- 
2.45.3


From 1980d79c79dbd290096940b16aae32575eb0f16e Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Sun, 2 Jan 2022 14:49:09 -0500
Subject: [PATCH 28/29] change electron-cookies to modded version for electron
 >=10

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index a11fea0b3..a2f9f4a9b 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.0.0",
     "@datapunt/matomo-tracker-js": "^0.1.4",
-    "@exponent/electron-cookies": "^2.0.0",
+    "@meetfranz/electron-cookies": "^2.0.0",
     "@hot-loader/react-dom": "^16.13",
     "@reach/auto-id": "^0.13.0",
     "@reach/combobox": "^0.12.1",
diff --git a/yarn.lock b/yarn.lock
index 7738bf4cf..1a0860e1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1291,13 +1291,6 @@
   resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de"
   integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==
 
-"@exponent/electron-cookies@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@exponent/electron-cookies/-/electron-cookies-2.0.0.tgz#4cf8dcf851454036cc524c40e9e482fc4e23f2d9"
-  dependencies:
-    tough-cookie "^2.2.2"
-    tough-cookie-web-storage-store "^1.0.0"
-
 "@gar/promisify@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
@@ -1319,6 +1312,15 @@
   dependencies:
     unist-util-visit "^1.3.0"
 
+"@meetfranz/electron-cookies@^2.0.0":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@meetfranz/electron-cookies/-/electron-cookies-3.0.2.tgz#762b6bf8d90b339ad0b89234facc84ee9816d1c4"
+  integrity sha512-8HuCIY6yfcHApmmCrwLHqKhDeiag65/3CcubV5AI9Cf39fc7WgaKR6KWWjSJemXNwwaK/nLFUuiArmXO+LBveQ==
+  dependencies:
+    "@electron/remote" "^2.0.1"
+    tough-cookie "^2.3.1"
+    tough-cookie-web-storage-store "^1.0.0"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -11869,7 +11871,7 @@ tough-cookie-web-storage-store@^1.0.0:
   dependencies:
     lodash "^4.6.1"
 
-tough-cookie@^2.2.2:
+tough-cookie@^2.3.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-- 
2.45.3


From 9a8c76c6f99f5950fbb8e178577e5e8926723b96 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Sun, 2 Jan 2022 14:51:51 -0500
Subject: [PATCH 29/29] electron-cookies version fix

---
 package.json    | 2 +-
 ui/analytics.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a2f9f4a9b..471abdb61 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.0.0",
     "@datapunt/matomo-tracker-js": "^0.1.4",
-    "@meetfranz/electron-cookies": "^2.0.0",
+    "@meetfranz/electron-cookies": "^3.0.2",
     "@hot-loader/react-dom": "^16.13",
     "@reach/auto-id": "^0.13.0",
     "@reach/combobox": "^0.12.1",
diff --git a/ui/analytics.js b/ui/analytics.js
index f90644ae7..d93dd82e3 100644
--- a/ui/analytics.js
+++ b/ui/analytics.js
@@ -6,7 +6,7 @@ import { history } from './store';
 import { SDK_API_PATH } from './index';
 // @if TARGET='app'
 import Native from 'native';
-import ElectronCookies from '@exponent/electron-cookies';
+import ElectronCookies from '@meetfranz/electron-cookies';
 import { generateInitialUrl } from 'util/url';
 // @endif
 import { MATOMO_ID, MATOMO_URL } from 'config';
-- 
2.45.3