Skip to content

Commit f829c0e

Browse files
kcq888kcq888
authored
Merge pull request #245 from Open-STEM/kq-bugs
Kq bugs
2 parents c54b6f2 + 3503f4b commit f829c0e

1 file changed

Lines changed: 61 additions & 24 deletions

File tree

‎src/components/dialogs/updatedlg.tsx‎

Lines changed: 61 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ type UpdateDlgProps = {
1313
toggleDialog: () => void;
1414
};
1515

16-
export default function UpdateDlg({ isUpdateMP, isUpdateLib, mpVersion, xrpVersion, updateCallback, toggleDialog }: UpdateDlgProps) {
16+
export default function UpdateDlg({
17+
isUpdateMP,
18+
isUpdateLib,
19+
mpVersion,
20+
xrpVersion,
21+
updateCallback,
22+
toggleDialog,
23+
}: UpdateDlgProps) {
1724
const { t } = useTranslation();
1825
const [connectionType, setConnectionType] = useState(ConnectionType.USB);
1926

@@ -37,38 +44,68 @@ export default function UpdateDlg({ isUpdateMP, isUpdateLib, mpVersion, xrpVersi
3744
return (
3845
<div className="flex flex-col items-center gap-4 rounded-md border border-mountain-mist-700 p-8 shadow-md transition-all dark:border-shark-500 dark:bg-shark-950">
3946
<div className="flex w-[90%] flex-col items-center">
40-
<h1 className="text-lg font-bold text-mountain-mist-700">{t('update')}</h1>
41-
<p className="text-sm text-mountain-mist-700">{t('update-desc')}</p>
47+
<h1 className="text-lg font-bold text-mountain-mist-700 dark:text-mountain-mist-300">
48+
{t('update')}
49+
</h1>
50+
<p className="text-sm text-mountain-mist-700 dark:text-mountain-mist-300">
51+
{t('update-desc')}
52+
</p>
4253
</div>
4354
<hr className="w-full border-mountain-mist-600" />
44-
<div className='flex flex-col items-start gap-2'>
45-
{ isUpdateMP && <p className='text-mountain-mist-700 text-md text-left'>{t('update-MP')}</p> }
46-
{ isUpdateLib && <p className='text-mountain-mist-700 text-md text-left'>{t('update-lib')}</p>}
47-
{ mpVersion &&
55+
<div className="flex flex-col items-start gap-2">
56+
{isUpdateMP && (
57+
<p className="text-md text-left text-mountain-mist-700 dark:text-mountain-mist-300">
58+
{t('update-MP')}
59+
</p>
60+
)}
61+
{isUpdateLib && (
62+
<p className="text-md text-left text-mountain-mist-700 dark:text-mountain-mist-300">
63+
{t('update-lib')}
64+
</p>
65+
)}
66+
{mpVersion && (
4867
<>
49-
<div className='flex flex-row gap-2'>
50-
<label className='text-sm text-mountain-mist-700'>{t('current-mp-version')}</label>
51-
<span className='text-sm text-mountain-mist-900'>{mpVersion?.currentVersion}</span>
68+
<div className="flex flex-row gap-2">
69+
<label className="text-sm text-mountain-mist-700 dark:text-mountain-mist-300">
70+
{t('current-mp-version')}
71+
</label>
72+
<span className="text-sm text-mountain-mist-900 dark:text-mountain-mist-300">
73+
{mpVersion?.currentVersion}
74+
</span>
5275
</div>
53-
<div className='flex flex-row gap-2'>
54-
<label className='text-sm text-mountain-mist-700'>{t('available-mp-version')}</label>
55-
<span className='text-sm text-mountain-mist-900'>{mpVersion?.newVersion}</span>
76+
<div className="flex flex-row gap-2">
77+
<label className="text-sm text-mountain-mist-700 dark:text-mountain-mist-300">
78+
{t('available-mp-version')}
79+
</label>
80+
<span className="text-sm text-mountain-mist-900 dark:text-mountain-mist-300">
81+
{mpVersion?.newVersion}
82+
</span>
5683
</div>
5784
</>
58-
}
59-
{ xrpVersion &&
85+
)}
86+
{xrpVersion && (
6087
<>
61-
<div className='flex flex-col gap-2'>
62-
<label className='text-sm text-mountain-mist-700'>{t('current-lib-version')}</label>
63-
<span className='text-sm text-mountain-mist-900'>{xrpVersion?.currentVersion}</span>
88+
<div className="flex flex-col gap-2">
89+
<label className="text-sm text-mountain-mist-700 dark:text-mountain-mist-300">
90+
{t('current-lib-version')}
91+
</label>
92+
<span className="text-sm text-mountain-mist-900 dark:text-mountain-mist-300">
93+
{xrpVersion?.currentVersion}
94+
</span>
6495
</div>
65-
<div className='flex flex-col gap-2'>
66-
<label className='text-sm text-mountain-mist-700'>{t('available-lib-version')}</label>
67-
<span className='text-sm text-mountain-mist-900'>{xrpVersion?.newVersion}</span>
96+
<div className="flex flex-col gap-2">
97+
<label className="text-sm text-mountain-mist-700 dark:text-mountain-mist-300">
98+
{t('available-lib-version')}
99+
</label>
100+
<span className="text-sm text-mountain-mist-900 dark:text-mountain-mist-300">
101+
{xrpVersion?.newVersion}
102+
</span>
68103
</div>
69104
</>
70-
}
71-
<p className='text-mountain-mist-700 text-md text-left'>{t('update-inst')}</p>
105+
)}
106+
<p className="text-md text-left text-mountain-mist-700 dark:text-mountain-mist-300">
107+
{t('update-inst')}
108+
</p>
72109
</div>
73110
<hr className="w-full border-mountain-mist-600" />
74111
<DialogFooter
@@ -77,6 +114,6 @@ export default function UpdateDlg({ isUpdateMP, isUpdateLib, mpVersion, xrpVersi
77114
btnAcceptCallback={handleUpdate}
78115
btnCancelCallback={toggleDialog}
79116
/>
80-
</div>
117+
</div>
81118
);
82119
}

0 commit comments

Comments
 (0)