fix things

apps/sunnyawards/lib/session/loginWithWalletAction.ts

@@ -26,7 +26,6 @@ export const loginWithWalletAction = actionClient
     const { user: loggedInUser } = await createOrGetUserFromWallet({
       address: parsedInput.address
     });
-
     ctx.session.anonymousUserId = undefined;
     ctx.session.user = { id: loggedInUser.id };
     await ctx.session.save();

lib/blockchain/signAndVerify.ts

@@ -1,9 +1,8 @@
 import { log } from '@charmverse/core/log';
+import { InvalidInputError } from '@packages/utils/errors';
 import { SiweMessage } from 'siwe';
 import { hashMessage, parseAbi } from 'viem';
 
-import { InvalidInputError } from '../../packages/utils/src/errors';
-
 import { getPublicClient } from './publicClient';
 
 /**
@@ -69,9 +68,7 @@ export async function verifyEIP1271Signature({
 }: SignatureVerificationPayloadWithAddress): Promise<boolean> {
   const chainId = message.chainId;
   const parsedMessage = new SiweMessage(message).toMessage();
-
   const messageHash = hashMessage(parsedMessage);
-
   const client = getPublicClient(chainId);
 
   const data = await client

lib/blockchain/walletClient.ts

@@ -1,10 +1,9 @@
 import { getChainById } from '@packages/blockchain/connectors/chains';
+import { InvalidInputError } from '@packages/utils/errors';
 import { createWalletClient, http, publicActions } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { optimismSepolia } from 'viem/chains';
 
-import { InvalidInputError } from '../../packages/utils/src/errors';
-
 export function getWalletClient({
   chainId,
   privateKey,

lib/charms/generateCharmWallet.ts

@@ -1,6 +1,5 @@
 import { prisma } from '@charmverse/core/prisma-client';
-
-import { isUniqueConstraintError } from '../../packages/utils/src/errors/prisma';
+import { isUniqueConstraintError } from '@packages/utils/errors/prisma';
 
 type Params = { userId: string } | { spaceId: string };
 

lib/middleware/requireWalletSignature.ts

@@ -1,3 +1,4 @@
+import { MissingDataError } from '@packages/utils/errors';
 import type { SignatureVerificationPayloadWithAddress } from '@root/lib/blockchain/signAndVerify';
 import {
   isValidWalletSignature,
@@ -7,8 +8,6 @@ import {
 import type { NextApiRequest, NextApiResponse } from 'next';
 import type { NextHandler } from 'next-connect';
 
-import { MissingDataError } from '../../packages/utils/src/errors';
-
 export async function requireWalletSignature(req: NextApiRequest, res: NextApiResponse, next: NextHandler) {
   const domain = req.headers.host as string;
   const { message, signature, address } = req.body as SignatureVerificationPayloadWithAddress;

lib/rewards/listAvailableRewards.ts

@@ -1,6 +1,6 @@
 import { prisma } from '@charmverse/core/prisma-client';
+import { DataNotFoundError } from '@packages/utils/errors';
 
-import { DataNotFoundError } from '../../packages/utils/src/errors';
 import type { AvailableResourcesRequest } from '../permissions/interfaces';
 
 import { rewardWithUsersInclude } from './getReward';

lib/roles/__tests__/assignRole.spec.ts

@@ -1,21 +1,16 @@
 import type { Space, User } from '@charmverse/core/prisma';
 import { InvalidStateError } from '@packages/nextjs/errors';
+import { ExpectedAnError } from '@packages/testing/errors';
 import {
   generateRole,
   generateSpaceUser,
   generateUserAndSpace,
   generateUserAndSpaceWithApiToken
 } from '@packages/testing/setupDatabase';
+import { DataNotFoundError, InsecureOperationError, UndesirableOperationError } from '@packages/utils/errors';
 import { assignRole, listRoleMembers } from '@root/lib/roles';
 import { v4 } from 'uuid';
 
-import { ExpectedAnError } from '../../../packages/testing/src/errors';
-import {
-  DataNotFoundError,
-  InsecureOperationError,
-  UndesirableOperationError
-} from '../../../packages/utils/src/errors';
-
 let user: User;
 let space: Space;
 

lib/utils/__tests__/blockchain.spec.ts

@@ -1,9 +1,8 @@
 import type { UserWallet } from '@charmverse/core/prisma';
 import { randomETHWalletAddress } from '@packages/testing/generateStubs';
+import { matchWalletAddress, shortenHex, shortWalletAddress } from '@packages/utils/blockchain';
 import { getAddress } from 'viem';
 
-import { matchWalletAddress, shortenHex, shortWalletAddress } from '../../../packages/utils/src/blockchain';
-
 describe('shortWalletAddress()', () => {
   it('should shorten valid wallet addresses', () => {
     const address = randomETHWalletAddress();

lib/utils/__tests__/paginatedPrismaTask.spec.ts

@@ -3,8 +3,8 @@ import type { Post } from '@charmverse/core/prisma-client';
 import { prisma } from '@charmverse/core/prisma-client';
 import { testUtilsForum, testUtilsUser } from '@charmverse/core/test';
 import { arrayUtils } from '@charmverse/core/utilities';
+import { randomIntFromInterval } from '@packages/utils/random';
 
-import { randomIntFromInterval } from '../../../packages/utils/src/random';
 import { paginatedPrismaTask } from '../paginatedPrismaTask';
 
 describe('paginatedPrismaTask', () => {

lib/utils/paginatedPrismaTask.ts

@@ -1,7 +1,6 @@
 import type { Prisma } from '@charmverse/core/prisma-client';
 import { prisma } from '@charmverse/core/prisma-client';
-
-import { InvalidInputError } from '../../packages/utils/src/errors';
+import { InvalidInputError } from '@packages/utils/errors';
 
 type PrismaModel = Extract<
   Uncapitalize<Prisma.ModelName>,

packages/users/src/__tests__/getUserProfile.spec.ts

@@ -1,12 +1,11 @@
 import { prisma } from '@charmverse/core/prisma-client';
 import { sessionUserRelations } from '@packages/profile/constants';
 import type { LoggedInUser } from '@packages/profile/getUser';
+import { getUserProfile } from '@packages/profile/getUser';
 import { InvalidInputError, MissingDataError } from '@packages/utils/errors';
 import { uid } from '@packages/utils/strings';
 import { v4 } from 'uuid';
 
-import { getUserProfile } from '../@packages/profile/getUser';
-
 let user: LoggedInUser;
 const walletAddress = `0x${v4()}`;