Merge branch '422-revise-the-prettier-configuration-to-ensure-that-im…

…ports-are-sorted' into 'dev' Resolve "Revise the Prettier configuration to ensure that imports are sorted" Closes #422 See merge request ergo/rosen-bridge/ui!350
rosen-bridge · Nov 16, 2024 · 0230e3c · 0230e3c
2 parents 724ece0 + 9e40c6a
commit 0230e3c
Show file tree

Hide file tree

Showing 53 changed files with 366 additions and 179 deletions.
diff --git a/.changeset/tender-crews-drum.md b/.changeset/tender-crews-drum.md
@@ -0,0 +1,5 @@
+---
+'@rosen-bridge/rosen-app': minor
+---
+
+Revise the Prettier configuration to ensure that imports are sorted
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["esbenp.prettier-vscode"]
+}
diff --git a/apps/rosen/.prettierrc b/apps/rosen/.prettierrc
@@ -0,0 +1,20 @@
+{
+  "quoteProps": "consistent",
+  "singleQuote": true,
+  "importOrder": [
+    "^(@?react|@?next)",
+    "<THIRD_PARTY_MODULES>",
+    "^@/(.*)$",
+    "^[.](.*)"
+  ],
+  "importOrderCaseInsensitive": true,
+  "importOrderParserPlugins": [
+    "typescript",
+    "jsx",
+    "classProperties",
+    "[\"decorators\", { \"decoratorsBeforeExport\": true }]"
+  ],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": false,
+  "plugins": ["@trivago/prettier-plugin-sort-imports"]
+}
diff --git a/apps/rosen/app/(bridge)/BridgeForm.tsx b/apps/rosen/app/(bridge)/BridgeForm.tsx
@@ -1,8 +1,9 @@
 'use client';
 
 import { useCallback, ChangeEvent } from 'react';
-import { getDecimalString } from '@rosen-ui/utils';
 
+import { Autocomplete } from '@mui/material';
+import { RosenChainToken } from '@rosen-bridge/tokens';
 import {
   Grid,
   TextField,
@@ -14,20 +15,19 @@ import {
   SvgIcon,
   Alert,
 } from '@rosen-bridge/ui-kit';
+import { NETWORKS } from '@rosen-ui/constants';
+import { getDecimalString } from '@rosen-ui/utils';
 
 import useBridgeForm from '@/_hooks/useBridgeForm';
-import { useNetwork } from '@/_hooks/useNetwork';
-
-import { getTokenNameAndId } from '@/_utils';
 import { useMaxTransfer } from '@/_hooks/useMaxTransfer';
+import { useNetwork } from '@/_hooks/useNetwork';
 import useTokenBalance from '@/_hooks/useTokenBalance';
-import useTransactionFormData from '@/_hooks/useTransactionFormData';
 import { useTokenMap } from '@/_hooks/useTokenMap';
+import useTransactionFormData from '@/_hooks/useTransactionFormData';
 import useWallet from '@/_hooks/useWallet';
+import { getTokenNameAndId } from '@/_utils';
+
 import { UseAllAmount } from './UseAllAmount';
-import { NETWORKS } from '@rosen-ui/constants';
-import { Autocomplete } from '@mui/material';
-import { RosenChainToken } from '@rosen-bridge/tokens';
 
 /**
  * bridge form container comp
@@ -290,7 +290,7 @@ export const BridgeForm = () => {
           ),
         }}
         inputProps={{
-          style: { fontSize: '2rem' },
+          'style': { fontSize: '2rem' },
           'aria-label': 'amount input',
         }}
         variant="filled"

diff --git a/apps/rosen/app/(bridge)/BridgeTransaction.tsx b/apps/rosen/app/(bridge)/BridgeTransaction.tsx
@@ -1,5 +1,7 @@
 'use client';
 
+import { Dispatch, SetStateAction } from 'react';
+
 import {
   Alert,
   Amount,
@@ -14,10 +16,9 @@ import { useTokenMap } from '@/_hooks/useTokenMap';
 import useTransactionFees from '@/_hooks/useTransactionFees';
 import useTransactionFormData from '@/_hooks/useTransactionFormData';
 import useWallet from '@/_hooks/useWallet';
-
 import { getTokenNameAndId } from '@/_utils';
+
 import { ChooseWalletModal } from './ChooseWalletModal';
-import { Dispatch, SetStateAction } from 'react';
 import { WalletInfo } from './WalletInfo';
 
 export interface BridgeTransactionProps {

diff --git a/apps/rosen/app/(bridge)/ConnectOrSubmitButton.tsx b/apps/rosen/app/(bridge)/ConnectOrSubmitButton.tsx
@@ -16,12 +16,12 @@ import {
 } from '@rosen-bridge/ui-kit';
 
 import { useNetwork } from '@/_hooks/useNetwork';
+import { useTokenMap } from '@/_hooks/useTokenMap';
 import { useTransaction } from '@/_hooks/useTransaction';
 import useTransactionFees from '@/_hooks/useTransactionFees';
 import useTransactionFormData from '@/_hooks/useTransactionFormData';
 import useWallet from '@/_hooks/useWallet';
 import { getTokenNameAndId } from '@/_utils';
-import { useTokenMap } from '@/_hooks/useTokenMap';
 
 interface ConnectOrSubmitButtonProps {
   setChooseWalletsModalOpen: (open: boolean) => void;

diff --git a/apps/rosen/app/(bridge)/UseAllAmount.tsx b/apps/rosen/app/(bridge)/UseAllAmount.tsx
@@ -1,3 +1,4 @@
+import { SyncProblem } from '@rosen-bridge/icons';
 import {
   Button,
   CircularProgress,
@@ -7,7 +8,6 @@ import {
   SvgIcon,
   Typography,
 } from '@rosen-bridge/ui-kit';
-import { SyncProblem } from '@rosen-bridge/icons';
 
 export interface UseAllAmountProps {
   error: boolean;

diff --git a/apps/rosen/app/(bridge)/page.tsx b/apps/rosen/app/(bridge)/page.tsx
@@ -7,22 +7,22 @@ import { Alert, styled } from '@rosen-bridge/ui-kit';
 import { NETWORKS } from '@rosen-ui/constants';
 import { RosenAmountValue } from '@rosen-ui/types';
 
-import { BridgeTransaction } from './BridgeTransaction';
 import { BridgeForm } from './BridgeForm';
+import { BridgeTransaction } from './BridgeTransaction';
 import { ConnectOrSubmitButton } from './ConnectOrSubmitButton';
 
 const BridgeContainer = styled('div')(({ theme }) => ({
-  position: 'absolute',
-  top: '50%',
-  left: '50%',
-  transform: 'translate(-50%, -50%)',
-  maxWidth: theme.breakpoints.values.desktop,
-  width: '100%',
-  gap: theme.spacing(3),
-  padding: theme.spacing(4),
-  display: 'grid',
-  gridTemplateColumns: '8fr 4fr',
-  gridTemplateRows: '1fr auto auto',
+  'position': 'absolute',
+  'top': '50%',
+  'left': '50%',
+  'transform': 'translate(-50%, -50%)',
+  'maxWidth': theme.breakpoints.values.desktop,
+  'width': '100%',
+  'gap': theme.spacing(3),
+  'padding': theme.spacing(4),
+  'display': 'grid',
+  'gridTemplateColumns': '8fr 4fr',
+  'gridTemplateRows': '1fr auto auto',
   '& > button': {
     width: '50%',
     justifySelf: 'flex-end',

diff --git a/apps/rosen/app/App.tsx b/apps/rosen/app/App.tsx
@@ -1,13 +1,12 @@
 'use client';
 
-import React from 'react';
-
 /**
  * FIXME: import NoSsr from ui-kit
  * local:ergo/rosen-bridge/ui#193
  */
-import { NoSsr } from '@mui/material';
+import React from 'react';
 
+import { NoSsr } from '@mui/material';
 import {
   styled,
   AppSnackbar,
@@ -16,11 +15,11 @@ import {
   ThemeProvider,
 } from '@rosen-bridge/ui-kit';
 
-import { SideBar } from './SideBar';
-import Toolbar from './Toolbar';
-
 import { theme } from '@/_theme/theme';
+
 import { WalletContextProvider } from './_contexts/walletContext';
+import { SideBar } from './SideBar';
+import Toolbar from './Toolbar';
 
 const Root = styled('div')(({ theme }) => ({
   width: '100vw',

diff --git a/apps/rosen/app/Toolbar.tsx b/apps/rosen/app/Toolbar.tsx
@@ -8,11 +8,11 @@ import {
 
 const pageTitleMap: Record<string, string> = {
   '(bridge)': 'Rosen Bridge',
-  events: 'Events',
-  assets: 'Assets',
-  dashboard: 'Dashboard',
-  support: 'Support',
-  transactions: 'Transactions',
+  'events': 'Events',
+  'assets': 'Assets',
+  'dashboard': 'Dashboard',
+  'support': 'Support',
+  'transactions': 'Transactions',
 };
 
 /**

diff --git a/apps/rosen/app/_actions/calculateFee.ts b/apps/rosen/app/_actions/calculateFee.ts
@@ -4,6 +4,11 @@ import { ErgoNetworkType, MinimumFeeBox } from '@rosen-bridge/minimum-fee';
 import cardanoKoiosClientFactory from '@rosen-clients/cardano-koios';
 import ergoExplorerClientFactory from '@rosen-clients/ergo-explorer';
 import { getHeight as ethereumGetHeight } from '@rosen-network/ethereum';
+import { NETWORKS, NETWORK_VALUES } from '@rosen-ui/constants';
+import { Network } from '@rosen-ui/types';
+import Joi from 'joi';
+
+import { wrap } from '@/_safeServerAction';
 
 const cardanoKoiosClient = cardanoKoiosClientFactory(
   process.env.CARDANO_KOIOS_API!,
@@ -12,11 +17,6 @@ const ergoExplorerClient = ergoExplorerClientFactory(
   process.env.ERGO_EXPLORER_API!,
 );
 
-import { NETWORKS, NETWORK_VALUES } from '@rosen-ui/constants';
-import { Network } from '@rosen-ui/types';
-import { wrap } from '@/_safeServerAction';
-import Joi from 'joi';
-
 const GetHeight = {
   [NETWORKS.ETHEREUM]: ethereumGetHeight,
   [NETWORKS.CARDANO]: async () =>

diff --git a/apps/rosen/app/_actions/validateAddress.ts b/apps/rosen/app/_actions/validateAddress.ts
@@ -1,11 +1,11 @@
 'use server';
 
+import { validateAddress as validate } from '@rosen-bridge/address-codec';
 import { NETWORK_VALUES } from '@rosen-ui/constants';
 import { Network } from '@rosen-ui/types';
+import Joi from 'joi';
 
 import { wrap } from '@/_safeServerAction';
-import Joi from 'joi';
-import { validateAddress as validate } from '@rosen-bridge/address-codec';
 
 /**
  * server action to verify the wallet addresses

diff --git a/apps/rosen/app/_backend/assets/repository.ts b/apps/rosen/app/_backend/assets/repository.ts
@@ -3,12 +3,11 @@ import {
   LockedAssetEntity,
   TokenEntity,
 } from '@rosen-ui/asset-calculator';
+import { Network } from '@rosen-ui/types';
 
 import NotFoundError from '@/_errors/NotFoundError';
 
 import dataSource from '../dataSource';
-import { Network } from '@rosen-ui/types';
-
 import '../initialize-datasource-if-needed';
 
 const bridgedAssetRepository = dataSource.getRepository(BridgedAssetEntity);

diff --git a/apps/rosen/app/_backend/events/repository.ts b/apps/rosen/app/_backend/events/repository.ts
@@ -4,7 +4,6 @@ import { EventTriggerEntity } from '@rosen-bridge/watcher-data-extractor';
 import { Network } from '@rosen-ui/types';
 
 import dataSource from '../dataSource';
-
 import '../initialize-datasource-if-needed';
 
 const blockRepository = dataSource.getRepository(BlockEntity);

diff --git a/apps/rosen/app/_backend/events/services.ts b/apps/rosen/app/_backend/events/services.ts
@@ -3,9 +3,8 @@ import { Network } from '@rosen-ui/types';
 
 import { getRosenTokens } from '@/_backend/utils';
 
-import { getEvents } from './repository';
-
 import { UNSUPPORTED_TOKEN_NAME } from '../constants';
+import { getEvents } from './repository';
 
 const tokenMap = new TokenMap(getRosenTokens());
 

diff --git a/apps/rosen/app/_backend/utils.ts b/apps/rosen/app/_backend/utils.ts
@@ -2,6 +2,7 @@
 
 import fs from 'fs';
 import path from 'path';
+
 import { wrap } from '@/_safeServerAction';
 
 /**

diff --git a/apps/rosen/app/_hooks/useBridgeForm.ts b/apps/rosen/app/_hooks/useBridgeForm.ts
@@ -1,19 +1,17 @@
 import { useContext } from 'react';
 import { useController } from 'react-hook-form';
 
+import { Network, RosenAmountValue } from '@rosen-ui/types';
 import { getNonDecimalString } from '@rosen-ui/utils';
 
-import useTransactionFormData from './useTransactionFormData';
-
-import { WalletContext } from '@/_contexts/walletContext';
-
 import { validateAddress } from '@/_actions/validateAddress';
-
+import { WalletContext } from '@/_contexts/walletContext';
 import { availableNetworks } from '@/_networks';
+import { unwrap } from '@/_safeServerAction';
 import { getMaxTransfer, getMinTransfer } from '@/_utils';
+
 import { useTokenMap } from './useTokenMap';
-import { Network, RosenAmountValue } from '@rosen-ui/types';
-import { unwrap } from '@/_safeServerAction';
+import useTransactionFormData from './useTransactionFormData';
 
 /**
  * handles the form field registrations and form state changes

diff --git a/apps/rosen/app/_hooks/useMaxTransfer.ts b/apps/rosen/app/_hooks/useMaxTransfer.ts
@@ -1,12 +1,12 @@
 import { useCallback, useEffect, useState, useTransition } from 'react';
 
+import { NETWORKS } from '@rosen-ui/constants';
 import { RosenAmountValue } from '@rosen-ui/types';
 
-import { NETWORKS } from '@rosen-ui/constants';
+import { getMaxTransfer } from '@/_utils';
 
 import { useNetwork } from './useNetwork';
 import useTokenBalance from './useTokenBalance';
-import { getMaxTransfer } from '@/_utils';
 import useTransactionFormData from './useTransactionFormData';
 import useWallet from './useWallet';
 

diff --git a/apps/rosen/app/_hooks/useNetwork.ts b/apps/rosen/app/_hooks/useNetwork.ts
@@ -1,12 +1,13 @@
 import { useEffect, useMemo, useState } from 'react';
 
+import { RosenChainToken } from '@rosen-bridge/tokens';
 import { NETWORK_VALUES } from '@rosen-ui/constants';
+import { Network } from '@rosen-ui/types';
+
 import { AvailableNetworks, availableNetworks } from '@/_networks';
 
 import useBridgeForm from './useBridgeForm';
 import { useTokenMap } from './useTokenMap';
-import { Network } from '@rosen-ui/types';
-import { RosenChainToken } from '@rosen-bridge/tokens';
 
 type BlackList = {
   fromChain: Network;

diff --git a/apps/rosen/app/_hooks/useTokenBalance.ts b/apps/rosen/app/_hooks/useTokenBalance.ts
@@ -1,13 +1,12 @@
 import { useState, useEffect, useCallback } from 'react';
 
 import { TokenInfo } from '@rosen-ui/types';
+import { RosenAmountValue } from '@rosen-ui/types';
+import { Wallet } from '@rosen-ui/wallet-api';
 
 import useBridgeForm from './useBridgeForm';
 import useWallet from './useWallet';
 
-import { Wallet } from '@rosen-ui/wallet-api';
-import { RosenAmountValue } from '@rosen-ui/types';
-
 interface UseTokenBalance {
   isLoading: boolean;
   // THIS IS A WRAPPED-VALUE

diff --git a/apps/rosen/app/_hooks/useTransaction.ts b/apps/rosen/app/_hooks/useTransaction.ts
@@ -2,13 +2,13 @@ import { useState } from 'react';
 
 import { RosenChainToken } from '@rosen-bridge/tokens';
 import { useSnackbar } from '@rosen-bridge/ui-kit';
+import { RosenAmountValue } from '@rosen-ui/types';
+import { getNonDecimalString } from '@rosen-ui/utils';
 
 import { useNetwork } from './useNetwork';
+import { useTokenMap } from './useTokenMap';
 import useTransactionFormData from './useTransactionFormData';
 import useWallet from './useWallet';
-import { getNonDecimalString } from '@rosen-ui/utils';
-import { useTokenMap } from './useTokenMap';
-import { RosenAmountValue } from '@rosen-ui/types';
 
 /**
  * a react hook to create and sign and submit transactions

diff --git a/apps/rosen/app/_hooks/useTransactionFees.ts b/apps/rosen/app/_hooks/useTransactionFees.ts
@@ -1,15 +1,14 @@
 import { useMemo, useEffect, useRef, useCallback, useTransition } from 'react';
+
 import { RosenChainToken } from '@rosen-bridge/tokens';
 import { useSnackbar } from '@rosen-bridge/ui-kit';
-
+import { Network } from '@rosen-ui/types';
 import { getNonDecimalString, getDecimalString } from '@rosen-ui/utils';
 
-import { useNetwork } from './useNetwork';
-
 import { calculateFee } from '@/_actions/calculateFee';
-
-import { Network } from '@rosen-ui/types';
 import { unwrap } from '@/_safeServerAction';
+
+import { useNetwork } from './useNetwork';
 import { useTokenMap } from './useTokenMap';
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     import fs from 'fs';
     import path from 'path';
     import { wrap } from '@/_safeServerAction';
     /**
@@ Expand Down @@