Fix PR modal message

Author: CompuIves

packages/app/src/app/pages/common/Modals/PRModal/index.js

@@ -6,11 +6,7 @@ function PRModal({ store }) {
   let result = null;
 
   if (!store.git.isCreatingPr) {
-    const pr = store.git.pr;
-    const git = store.editor.currentSandbox.originalGit;
-    const newUrl = `https://github.com/${git.username}/${git.repo}/compare/${
-      git.branch
-    }...${store.user.username}:${pr.newBranch}?expand=1`;
+    const newUrl = store.git.pr.prURL;
 
     result = (
       <div>

packages/app/src/app/store/modules/git/actions.js

@@ -1,11 +1,5 @@
 export function openPr({ state, browser }) {
-  const pr = state.get('git.pr');
-  const user = state.get('user');
-  const git = state.get('editor.currentSandbox.originalGit');
-
-  const url = `https://github.com/${git.username}/${git.repo}/compare/${
-    git.branch
-  }...${user.username}:${pr.newBranch}?expand=1`;
+  const url = state.get('git.pr.prURL');
 
   browser.openWindow(url);
 }
@@ -82,3 +76,15 @@ export function saveGithubData({ api, state, props }) {
 export function redirectToGithubSandbox({ props, router }) {
   router.updateSandboxUrl({ git: props.git });
 }
+
+export function setPRURL({ state }) {
+  const pr = state.get('git.pr');
+  const user = state.get('user');
+  const git = state.get('editor.currentSandbox.originalGit');
+
+  const url = `https://github.com/${git.username}/${git.repo}/compare/${
+    git.branch
+  }...${user.username}:${pr.newBranch}?expand=1`;
+
+  state.set('git.pr.prURL', url);
+}

packages/app/src/app/store/modules/git/model.js

@@ -39,6 +39,7 @@ export default {
       newBranch: types.string,
       sha: types.string,
       url: types.string,
+      prURL: types.maybe(types.string),
     })
   ),
   isCommiting: types.boolean,

packages/app/src/app/store/modules/git/sequences.js

@@ -60,9 +60,11 @@ export const createPr = [
   actions.createPr,
   set(state`git.pr`, props`pr`),
   set(state`git.isCreatingPr`, false),
+  actions.setPRURL,
   wait(3000),
   actions.openPr,
   set(state`git.subject`, ''),
   set(state`git.description`, ''),
+  set(state`git.originalGitChanges`, null),
   actions.redirectToPr,
 ];