Merge branch 'main' into twentyhq#7038-add-currencies

BOHEUS · Oct 4, 2024 · 71707b4 · 71707b4
2 parents e7ca0bc + d8c4af9
commit 71707b4
Show file tree

Hide file tree

Showing 148 changed files with 4,363 additions and 2,542 deletions.
diff --git a/packages/twenty-emails/package.json b/packages/twenty-emails/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-emails",
-  "version": "0.31.canary",
+  "version": "0.31.0-canary",
   "description": "",
   "author": "",
   "private": true,

diff --git a/packages/twenty-front/.storybook/preview.tsx b/packages/twenty-front/.storybook/preview.tsx
@@ -1,7 +1,7 @@
-import { useEffect } from 'react';
 import { ThemeProvider } from '@emotion/react';
 import { Preview } from '@storybook/react';
 import { initialize, mswDecorator } from 'msw-storybook-addon';
+import { useEffect } from 'react';
 import { useDarkMode } from 'storybook-dark-mode';
 import { THEME_DARK, THEME_LIGHT, ThemeContextProvider } from 'twenty-ui';
 
@@ -13,12 +13,16 @@ import 'react-loading-skeleton/dist/skeleton.css';
 initialize({
   onUnhandledRequest: async (request: Request) => {
     const fileExtensionsToIgnore =
-      /\.(ts|tsx|js|jsx|svg|css|png)(\?v=[a-zA-Z0-9]+)?/;
+      /\.(ts|tsx|js|jsx|svg|css|png|woff2)(\?v=[a-zA-Z0-9]+)?/;
 
     if (fileExtensionsToIgnore.test(request.url)) {
       return;
     }
 
+    if (request.url.startsWith('http://localhost:3000/files/data:image')) {
+      return;
+    }
+
     const requestBody = await request.json();
     // eslint-disable-next-line no-console
     console.warn(`Unhandled ${request.method} request to ${request.url} 

diff --git a/packages/twenty-front/jest.config.ts b/packages/twenty-front/jest.config.ts
@@ -2,6 +2,7 @@ import { JestConfigWithTsJest, pathsToModuleNameMapper } from 'ts-jest';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const tsConfig = require('./tsconfig.json');
+process.env.TZ = 'GMT';
 
 const jestConfig: JestConfigWithTsJest = {
   // to enable logs, comment out the following line
@@ -25,7 +26,7 @@ const jestConfig: JestConfigWithTsJest = {
   coverageThreshold: {
     global: {
       statements: 60,
-      lines: 60,
+      lines: 55,
       functions: 50,
     },
   },

diff --git a/packages/twenty-front/nyc.config.cjs b/packages/twenty-front/nyc.config.cjs
@@ -16,7 +16,7 @@ const modulesCoverage = {
 };
 
 const pagesCoverage = {
-  branches: 40,
+  branches: 35,
   statements: 60,
   lines: 60,
   functions: 45,

diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-front",
-  "version": "0.31.canary",
+  "version": "0.31.0-canary",
   "private": true,
   "type": "module",
   "scripts": {