Merge branch 'chore/AddTextToAppWarning' of https://github.com/Naturalclar/upgrade-helper into chore/AddTextToAppWarning

Author: Naturalclar

src/components/common/Diff/Diff.js

@@ -89,7 +89,8 @@ const Diff = ({
   onToggleChangeSelection,
   areAllCollapsed,
   setAllCollapsed,
-  diffViewStyle
+  diffViewStyle,
+  appName
 }) => {
   const [isDiffCollapsed, setIsDiffCollapsed] = useState(
     isDiffCollapsedByDefault({ type, hunks })
@@ -121,14 +122,15 @@ const Diff = ({
         }}
         isDiffCompleted={isDiffCompleted}
         onCompleteDiff={onCompleteDiff}
+        appName={appName}
       />
 
       {!isDiffCollapsed && (
         <DiffView
           viewType={diffViewStyle}
           diffType={type}
           hunks={hunks}
-          widgets={getComments({ newPath, fromVersion, toVersion })}
+          widgets={getComments({ newPath, fromVersion, toVersion, appName })}
           optimizeSelection={true}
           selectedChanges={selectedChanges}
         >

src/components/common/Diff/DiffComment.js

@@ -35,8 +35,8 @@ const LINE_CHANGE_TYPES = {
 const getLineNumberWithType = ({ lineChangeType, lineNumber }) =>
   `${LINE_CHANGE_TYPES[lineChangeType.toUpperCase()]}${lineNumber}`
 
-const getComments = ({ newPath, fromVersion, toVersion }) => {
-  const newPathSanitized = removeAppPathPrefix(newPath)
+const getComments = ({ newPath, fromVersion, toVersion, appName }) => {
+  const newPathSanitized = removeAppPathPrefix(newPath, appName)
 
   const versionsInDiff = getVersionsInDiff({ fromVersion, toVersion }).filter(
     ({ comments }) =>

src/components/common/Diff/DiffHeader.js

@@ -9,9 +9,9 @@ const FileRenameArrow = styled(props => <Icon {...props} type="right" />)`
   color: #f78206;
 `
 
-const FileName = ({ oldPath, newPath, type }) => {
-  const oldPathSanitized = removeAppPathPrefix(oldPath)
-  const newPathSanitized = removeAppPathPrefix(newPath)
+const FileName = ({ oldPath, newPath, type, appName }) => {
+  const oldPathSanitized = removeAppPathPrefix(oldPath, appName)
+  const newPathSanitized = removeAppPathPrefix(newPath, appName)
 
   if (type === 'delete') {
     return <span>{oldPathSanitized}</span>
@@ -163,6 +163,7 @@ const DiffHeader = styled(
     setIsDiffCollapsed,
     isDiffCompleted,
     onCompleteDiff,
+    appName,
     ...props
   }) => (
     <div {...props}>
@@ -171,7 +172,12 @@ const DiffHeader = styled(
         isDiffCollapsed={isDiffCollapsed}
         onClick={({ altKey }) => setIsDiffCollapsed(!isDiffCollapsed, altKey)}
       />
-      <FileName oldPath={oldPath} newPath={newPath} type={type} />{' '}
+      <FileName
+        oldPath={oldPath}
+        newPath={newPath}
+        type={type}
+        appName={appName}
+      />{' '}
       <FileStatus type={type} />
       <BinaryBadge visible={!hasDiff} />
       <HeaderButtonsContainer>

src/components/common/Diff/DiffSection.js

@@ -17,7 +17,8 @@ const DiffSection = ({
   handleCompleteDiff,
   selectedChanges,
   onToggleChangeSelection,
-  diffViewStyle
+  diffViewStyle,
+  appName
 }) => {
   const [areAllCollapsed, setAllCollapsed] = useState(undefined)
 
@@ -50,6 +51,7 @@ const DiffSection = ({
             onToggleChangeSelection={onToggleChangeSelection}
             areAllCollapsed={areAllCollapsed}
             setAllCollapsed={setAllCollapsed}
+            appName={appName}
           />
         )
       })}

src/components/common/DiffViewer.js

@@ -145,11 +145,17 @@ const DiffViewer = ({
         {...diffSectionProps}
         isDoneSection={false}
         diffViewStyle={diffViewStyle}
+        appName={appName}
       />
 
       {renderUpgradeDoneMessage({ diff, completedDiffs })}
 
-      <DiffSection {...diffSectionProps} isDoneSection={true} title="Done" />
+      <DiffSection
+        {...diffSectionProps}
+        isDoneSection={true}
+        title="Done"
+        appName={appName}
+      />
 
       <CompletedFilesCounter
         completed={completedDiffs.length}

src/utils.js

@@ -12,7 +12,8 @@ export const getDiffPatchURL = ({ fromVersion, toVersion }) =>
 export const getBinaryFileURL = ({ version, path }) =>
   `https://github.com/${RN_DIFF_REPO}/raw/release/${version}/${path}`
 
-export const removeAppPathPrefix = path => path.replace(/RnDiffApp\//, '')
+export const removeAppPathPrefix = (path, appName) =>
+  path.replace(new RegExp(`${appName || 'RnDiffApp'}/`), '')
 
 export const getVersionsInDiff = ({ fromVersion, toVersion }) => {
   const cleanedToVersion = semver.valid(semver.coerce(toVersion))