From 424308ef09239ee4b495662ce2451256e5b50968 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Sat, 13 Nov 2021 16:15:29 -0500
Subject: [PATCH] fix rebase

---
 ui/component/downloadProgress/index.js |  3 ++-
 ui/component/downloadProgress/view.jsx |  2 +-
 ui/util/remark-lbry.js                 | 15 ---------------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/ui/component/downloadProgress/index.js b/ui/component/downloadProgress/index.js
index d5a4fa943..738c3b2a8 100644
--- a/ui/component/downloadProgress/index.js
+++ b/ui/component/downloadProgress/index.js
@@ -1,7 +1,8 @@
 import { connect } from 'react-redux';
 import DownloadProgress from './view';
 import { doSetPlayingUri, doStopDownload, doContinueDownloading, doPurchaseUriWrapper } from 'redux/actions/content';
-import { selectFileInfosByOutpoint, SETTINGS } from 'lbry-redux';
+import * as SETTINGS from 'constants/settings';
+import { selectFileInfosByOutpoint } from 'redux/selectors/file_info';
 import { selectPrimaryUri, selectPlayingUri } from 'redux/selectors/content';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 
diff --git a/ui/component/downloadProgress/view.jsx b/ui/component/downloadProgress/view.jsx
index dd95b5c7c..63064b420 100644
--- a/ui/component/downloadProgress/view.jsx
+++ b/ui/component/downloadProgress/view.jsx
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
 import { shell } from 'electron';
 import Button from 'component/button';
 import * as ICONS from 'constants/icons';
-import { buildURI } from 'lbry-redux';
+import { buildURI } from 'util/lbryURI';
 import { formatBytes } from 'util/format-bytes';
 import { areEqual, removeItem } from 'util/array';
 import loadingIcon from '../../../static/img/white_loading.gif';
diff --git a/ui/util/remark-lbry.js b/ui/util/remark-lbry.js
index d0850bc50..1350370dc 100644
--- a/ui/util/remark-lbry.js
+++ b/ui/util/remark-lbry.js
@@ -26,21 +26,6 @@ function handlePunctuation(value) {
   return punctuationIndex ? value.substring(0, punctuationIndex) : value;
 }
 
-function handlePunctuation(value) {
-  const modifierIndex =
-    (value.indexOf(':') >= 0 && value.indexOf(':')) || (value.indexOf('#') >= 0 && value.indexOf('#'));
-
-  let punctuationIndex;
-  punctuationMarks.some((p) => {
-    if (modifierIndex) {
-      punctuationIndex = value.indexOf(p, modifierIndex + 1) >= 0 && value.indexOf(p, modifierIndex + 1);
-    }
-    return punctuationIndex;
-  });
-
-  return punctuationIndex ? value.substring(0, punctuationIndex) : value;
-}
-
 // Find channel mention
 function locateMention(value, fromIndex) {
   const index = value.indexOf(mentionToken, fromIndex);