Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[No QA] [TS migration] Migrate 'UpdateAppModal' component to TypeScript #34723

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
import React, {memo, useState} from 'react';
import React, {useState} from 'react';
import ConfirmModal from '@components/ConfirmModal';
import withLocalize from '@components/withLocalize';
import {defaultProps, propTypes} from './updateAppModalPropTypes';
import useLocalize from '@hooks/useLocalize';
import type UpdateAppModalProps from './types';

function BaseUpdateAppModal({translate, onSubmit}) {
function BaseUpdateAppModal({onSubmit}: UpdateAppModalProps) {
const [isModalOpen, setIsModalOpen] = useState(true);
const {translate} = useLocalize();

/**
* Execute the onSubmit callback and close the modal.
*/
function submitAndClose() {
onSubmit();
const submitAndClose = () => {
onSubmit?.();
setIsModalOpen(false);
}
};

return (
<ConfirmModal
title={translate('baseUpdateAppModal.updateApp')}
isVisible={isModalOpen}
onConfirm={() => submitAndClose()}
onConfirm={submitAndClose}
onCancel={() => setIsModalOpen(false)}
prompt={translate('baseUpdateAppModal.updatePrompt')}
confirmText={translate('baseUpdateAppModal.updateApp')}
Expand All @@ -27,7 +28,6 @@ function BaseUpdateAppModal({translate, onSubmit}) {
);
}

BaseUpdateAppModal.propTypes = propTypes;
BaseUpdateAppModal.defaultProps = defaultProps;
BaseUpdateAppModal.displayName = 'BaseUpdateAppModal';

export default memo(withLocalize(BaseUpdateAppModal));
export default React.memo(BaseUpdateAppModal);
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
import React from 'react';
import ELECTRON_EVENTS from '../../../desktop/ELECTRON_EVENTS';
import BaseUpdateAppModal from './BaseUpdateAppModal';
import {propTypes} from './updateAppModalPropTypes';
import type UpdateAppModalProps from './types';

function UpdateAppModal(props) {
function UpdateAppModal({onSubmit}: UpdateAppModalProps) {
const updateApp = () => {
if (props.onSubmit) {
props.onSubmit();
if (onSubmit) {
onSubmit();
}
JKobrynski marked this conversation as resolved.
Show resolved Hide resolved
window.electron.send(ELECTRON_EVENTS.START_UPDATE);
};
return <BaseUpdateAppModal onSubmit={updateApp} />;
}
UpdateAppModal.propTypes = propTypes;

UpdateAppModal.displayName = 'UpdateAppModal';

export default UpdateAppModal;
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import React from 'react';
import BaseUpdateAppModal from './BaseUpdateAppModal';
import {propTypes} from './updateAppModalPropTypes';
import type UpdateAppModalProps from './types';

function UpdateAppModal(props) {
function UpdateAppModal(props: UpdateAppModalProps) {
return (
<BaseUpdateAppModal
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
/>
);
}
UpdateAppModal.propTypes = propTypes;

UpdateAppModal.displayName = 'UpdateAppModal';

export default UpdateAppModal;
5 changes: 5 additions & 0 deletions src/components/UpdateAppModal/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type UpdateAppModalProps = {
onSubmit?: () => void;
JKobrynski marked this conversation as resolved.
Show resolved Hide resolved
};

export default UpdateAppModalProps;
12 changes: 0 additions & 12 deletions src/components/UpdateAppModal/updateAppModalPropTypes.js

This file was deleted.

Loading