Compare commits

..

No commits in common. "235b038ecc841a5f5ed06ca89d018755452af8ff" and "7d79e0d2061a4f9a97e317e4fc2dbca6e64b214f" have entirely different histories.

View File

@ -16,7 +16,6 @@ import { ElectronContext } from './ElectronContext'
import NewAppUpdate from '../Management/AppUpdates/NewAppUpdate'
import AppUpdateProgress from '../Management/AppUpdates/AppUpdateProgress'
import SoftwareUpdateIcon from '../../Icons/SoftwareUpdateIcon'
import ExclamationOctogonIcon from '../../Icons/ExclamationOctagonIcon'
const { Text } = Typography
@ -460,12 +459,7 @@ export const AppUpdateProvider = ({ children }) => {
</Space>
</Modal>
<Modal
title={
<Flex align='center' gap='middle'>
<SoftwareUpdateIcon style={{ fontSize: 18 }} />
Software Update
</Flex>
}
title='Software Update'
open={noUpdateOpen}
okText='OK'
style={{ maxWidth: 430 }}
@ -552,16 +546,11 @@ export const AppUpdateProvider = ({ children }) => {
</Text>
</Modal>
<Modal
title={
<Flex align='center' gap='middle'>
<ExclamationOctogonIcon />
Duplicate Installation Found
</Flex>
}
title='Duplicate Installation Found'
open={Boolean(duplicatePromptOpen && duplicateInstall)}
width={!removingDuplicate && !duplicateRemovalResult ? 560 : 430}
style={{ maxWidth: 480 }}
centered
closable={false}
closable={!removingDuplicate}
maskClosable={false}
onCancel={removingDuplicate ? undefined : closeDuplicatePrompt}
footer={
@ -610,10 +599,10 @@ export const AppUpdateProvider = ({ children }) => {
<Space direction='vertical' size='small'>
<Text>
Farm Control is now installed in your user applications folder,
but an older copy is still installed at:{' '}
<Text code>{duplicateInstall?.duplicatePath}</Text>.{' '}
<Text>Do you want to remove the duplicate installation?</Text>
but an older copy is still installed at:
</Text>
<Text code>{duplicateInstall?.duplicatePath}</Text>
<Text>Do you want to remove the duplicate installation?</Text>
</Space>
)}
</Modal>