fix source buttons not displaying for file renaming

scm-ui/ui-components/src/repos/DiffFile.tsx

@@ -415,11 +415,7 @@ class DiffFile extends React.Component<Props, State> {
     }
     const collapseIcon = this.hasContent(file) ? <Icon name={icon} color="inherit"/> : null;
     const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null;
-    const sideBySideToggle =
+    const sideBySideToggle = file.hunks && file.hunks.length && <MenuContext.Consumer>
-      file.hunks && file.hunks.length > 0 && (
-        <ButtonWrapper className={classNames("level-right", "is-flex")}>
-          <ButtonGroup>
-            <MenuContext.Consumer>
       {({setCollapsed}) => (
         <DiffButton
           icon={sideBySide ? "align-left" : "columns"}
@@ -433,7 +429,11 @@ class DiffFile extends React.Component<Props, State> {
           }
         />
       )}
-            </MenuContext.Consumer>
+    </MenuContext.Consumer>;
+    const headerButtons = (
+        <ButtonWrapper className={classNames("level-right", "is-flex")}>
+          <ButtonGroup>
+            {sideBySideToggle}
             {fileControls}
           </ButtonGroup>
         </ButtonWrapper>
@@ -467,7 +467,7 @@ class DiffFile extends React.Component<Props, State> {
               </TitleWrapper>
               {this.renderChangeTag(file)}
             </FullWidthTitleHeader>
-            {sideBySideToggle}
+            {headerButtons}
           </FlexWrapLevel>
         </div>
         {body}

scm-ui/ui-webapp/src/repos/containers/RepositoryRoot.tsx

@@ -177,7 +177,7 @@ class RepositoryRoot extends React.Component<Props> {
           break;
         default:
           if (targetLink) {
-            links.push(sourceLink, targetLink);
+            links.push(targetLink, sourceLink); // Target link first because its the previous file
           } else {
             links.push(sourceLink);
           }