wallet-ext: fix import path groups order for styles

cat-kitty-it · Jul 7, 2022 · 68cf0a9 · 68cf0a9
1 parent e9d494e
commit 68cf0a9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/wallet/.eslintignore b/wallet/.eslintignore
@@ -2,3 +2,4 @@ dist/
 node_modules/
 .next/
 .swc/
+out/
diff --git a/wallet/.eslintrc.js b/wallet/.eslintrc.js
@@ -23,6 +23,11 @@ module.exports = {
                     'type',
                 ],
                 pathGroups: [
+                    {
+                        pattern: '{.,..,_*}/**/*.?(s)css',
+                        group: 'type',
+                        position: 'after',
+                    },
                     {
                         pattern: '_*',
                         group: 'internal',
@@ -31,11 +36,6 @@ module.exports = {
                         pattern: '_*/**',
                         group: 'internal',
                     },
-                    {
-                        pattern: '{.,..}/**/*.?(s)css',
-                        group: 'type',
-                        position: 'after',
-                    },
                 ],
                 pathGroupsExcludedImportTypes: ['builtin', 'object', 'type'],
                 'newlines-between': 'always',

diff --git a/wallet/.prettierignore b/wallet/.prettierignore
@@ -5,3 +5,4 @@ yarn-debug.log*
 yarn-error.log*
 .next/
 .swc/
+out/
diff --git a/wallet/.stylelintignore b/wallet/.stylelintignore
@@ -2,3 +2,4 @@ node_modules/
 dist/
 .next/
 .swc/
+out/
diff --git a/wallet/src/ui/app/pages/dapp-tx-approval/index.tsx b/wallet/src/ui/app/pages/dapp-tx-approval/index.tsx
@@ -6,7 +6,6 @@ import { useParams } from 'react-router-dom';
 
 import Loading from '_components/loading';
 import UserApproveContainer from '_components/user-approve-container';
-import stUserApprove from '_components/user-approve-container/UserApproveContainer.module.scss';
 import { useAppDispatch, useAppSelector, useInitializedGuard } from '_hooks';
 import {
     respondToTransactionRequest,
@@ -17,6 +16,7 @@ import type { SuiJsonValue } from '@mysten/sui.js';
 import type { RootState } from '_redux/RootReducer';
 
 import st from './DappTxApprovalPage.module.scss';
+import stUserApprove from '_components/user-approve-container/UserApproveContainer.module.scss';
 
 function toList(items: SuiJsonValue[]) {
     if (!items.length) {

diff --git a/wallet/src/ui/app/pages/site-connect/index.tsx b/wallet/src/ui/app/pages/site-connect/index.tsx
@@ -6,8 +6,6 @@ import { useParams } from 'react-router-dom';
 
 import Loading from '_components/loading';
 import UserApproveContainer from '_components/user-approve-container';
-// TODO: fix imports ordering for this
-import stUserApprove from '_components/user-approve-container/UserApproveContainer.module.scss';
 import { useAppDispatch, useAppSelector, useInitializedGuard } from '_hooks';
 import {
     permissionsSelectors,
@@ -18,6 +16,7 @@ import type { PermissionType } from '_messages/payloads/permissions';
 import type { RootState } from '_redux/RootReducer';
 
 import st from './SiteConnectPage.module.scss';
+import stUserApprove from '_components/user-approve-container/UserApproveContainer.module.scss';
 
 const permissionTypeToTxt: Record<PermissionType, string> = {
     viewAccount: 'View Account',
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ dist/ @@
     node_modules/
     .next/
     .swc/
+    out/