From f54a24309e7320db1af59a3969cfb940aae23b78 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean.yesmunt@gmail.com>
Date: Wed, 23 May 2018 00:35:34 -0400
Subject: [PATCH] fix: use short form uri when preparingEdit so users know they
 are editing

---
 src/renderer/page/file/view.jsx           | 10 +++++++++-
 src/renderer/redux/reducers/navigation.js |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index bf7c34846..5ebe44876 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -129,6 +129,14 @@ class FilePage extends React.Component<Props> {
       subscriptionUri = buildURI({ channelName, claimId: channelClaimId }, false);
     }
 
+    // We want to use the short form uri for editing
+    // This is what the user is used to seeing, they don't care about the claim id
+    // We will select the claim id before they publish
+    let editUri;
+    if (claimIsMine) {
+      editUri = buildURI({ channelName, contentName: claim.name });
+    }
+
     const isPlaying = playingUri === uri && !isPaused;
     return (
       <Page extraPadding>
@@ -170,7 +178,7 @@ class FilePage extends React.Component<Props> {
                       icon={icons.EDIT}
                       label={__('Edit')}
                       onClick={() => {
-                        prepareEdit(claim, uri);
+                        prepareEdit(claim, editUri);
                         navigate('/publish');
                       }}
                     />
diff --git a/src/renderer/redux/reducers/navigation.js b/src/renderer/redux/reducers/navigation.js
index e4544b4cc..80a5e0259 100644
--- a/src/renderer/redux/reducers/navigation.js
+++ b/src/renderer/redux/reducers/navigation.js
@@ -3,7 +3,7 @@ import * as ACTIONS from 'constants/action_types';
 const getCurrentPath = () => {
   const { hash } = document.location;
   if (hash !== '') return hash.replace(/^#/, '');
-  return '/discover';
+  return '/publish';
 };
 
 const reducers = {};