farmcontrol/farmcontrol-ui
farmcontrol/farmcontrol-ui
2
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: farmcontrol:235b038ecc841a5f5ed06ca89d018755452af8ff
Branches Tags
farmcontrol:main
farmcontrol:electrobun
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration
..
compare: farmcontrol:7d79e0d2061a4f9a97e317e4fc2dbca6e64b214f
Branches Tags
farmcontrol:main
farmcontrol:electrobun
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration

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

1 changed files with 7 additions and 18 deletions
Show Stats Expand all files Collapse all files

25
src/components/Dashboard/context/AppUpdateContext.jsx
View File

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