cmd-plus-enter-commit-dialog

src/app/components/PushDialog.test.tsx

@@ -0,0 +1,89 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { StorageProviderType } from '@/constants/StorageProviderType';
+import {
+  act, render, resetStore, createMockStore, fireEvent,
+} from '../../../tests/config/setupTest';
+import PushDialog from './PushDialog';
+import { store } from '../store';
+
+describe('PushDialog', () => {
+  beforeEach(() => {
+    resetStore();
+  });
+
+  it('should show push dialog', () => {
+    const mockStore = createMockStore({
+      uiState: {
+        showPushDialog: 'initial',
+        localApiState: {
+          branch: 'main',
+          provider: StorageProviderType.GITHUB,
+        },
+      },
+    });
+
+    const result = render(
+      <Provider store={mockStore}>
+        <PushDialog />
+      </Provider>,
+    );
+    expect(result.getByText('Push changes')).toBeInTheDocument();
+    expect(result.getByText('Commit message')).toBeInTheDocument();
+    expect(result.getByText('Push')).toBeInTheDocument();
+
+    result.unmount();
+  });
+
+  it('should show success dialog', () => {
+    const mockStore = createMockStore({
+      uiState: {
+        showPushDialog: 'success',
+        localApiState: {
+          branch: 'main',
+          provider: StorageProviderType.GITHUB,
+        },
+      },
+    });
+
+    const result = render(
+      <Provider store={mockStore}>
+        <PushDialog />
+      </Provider>,
+    );
+    expect(result.getByText('Changes pushed to GitHub')).toBeInTheDocument();
+    expect(result.getByText('Create Pull Request')).toBeInTheDocument();
+
+    result.unmount();
+  });
+
+  it('should be able to push by pressing ctrl/cmd + Enter', () => {
+    const mockStore = createMockStore({
+      uiState: {
+        showPushDialog: 'initial',
+        localApiState: {
+          branch: 'main',
+          provider: StorageProviderType.GITHUB,
+        },
+      },
+    });
+
+    const result = render(
+      <Provider store={mockStore}>
+        <PushDialog />
+      </Provider>,
+    );
+
+    act(() => {
+      fireEvent.keyDown(document, {
+        key: 'Enter',
+        code: 'Enter',
+        ctrlKey: true,
+      });
+    });
+
+    expect(store.getState().uiState.showPushDialog).toBe(false);
+
+    result.unmount();
+  });
+});

src/app/components/PushDialog.tsx

@@ -15,6 +15,7 @@ import Spinner from './Spinner';
 import { StorageProviderType } from '@/constants/StorageProviderType';
 import { isGitProvider } from '@/utils/is';
 import Textarea from './Textarea';
+import { useShortcut } from '@/hooks/useShortcut';
 
 function ConfirmDialog() {
   const { onConfirm, onCancel, showPushDialog } = usePushDialog();
@@ -84,6 +85,14 @@ function ConfirmDialog() {
     }
   }, [showPushDialog, localApiState]);
 
+  const handleSaveShortcut = React.useCallback((event: KeyboardEvent) => {
+    if (event.metaKey || event.ctrlKey) {
+      handleSubmit();
+    }
+  }, [handleSubmit]);
+
+  useShortcut(['Enter'], handleSaveShortcut);
+
   switch (showPushDialog) {
     case 'initial': {
       return (

src/app/components/TokenGroup/TokenGroup.test.tsx

@@ -67,7 +67,7 @@ describe('TokenGroup', () => {
     resetStore();
   });
 
-  it('should be able to collpase a token group', async () => {
+  it('should be able to collapse a token group', async () => {
     const { getByTestId } = render(<TokenGroup
       tokenValues={tokenValues as DeepKeyTokenMap}
       showNewForm={showNewForm}