From 47308ca5c383f709d24acdcc67203bb9564c8d99 Mon Sep 17 00:00:00 2001
From: Pavel Prichodko <14926950+prichodko@users.noreply.github.com>
Date: Mon, 13 Mar 2023 21:48:42 +0100
Subject: [PATCH] unify package.jsons

---
 apps/desktop/package.json                           | 6 +++---
 apps/mobile/package.json                            | 8 +++++---
 apps/web/package.json                               | 4 +++-
 package.json                                        | 5 ++---
 packages/components/package.json                    | 6 +++++-
 packages/components/src/accordion/accordionItem.tsx | 4 ++--
 packages/status-js/package.json                     | 5 ++---
 packages/status-react/package.json                  | 5 ++---
 8 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 1bf14808..e3229bae 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -4,11 +4,11 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "#dev": "vite",
     "dev": "tauri dev",
-    "build": "tsc && vite build",
+    "build": "vite build",
+    "typecheck": "tsc",
     "preview": "vite preview",
-    "tauri": "tauri"
+    "clean": "rimraf node_modules"
   },
   "dependencies": {
     "react": "^18.2.0",
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 8eb3970a..3637e859 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -7,7 +7,10 @@
     "dev": "expo start -c",
     "ios": "TAMAGUI_TARGET=native yarn expo run:ios",
     "android": "TAMAGUI_TARGET=native yarn expo run:android",
-    "start": "expo start --dev-client"
+    "start": "expo start --dev-client",
+    "lint": "eslint screens",
+    "#typecheck": "tsc",
+    "clean": "rimraf node_modules"
   },
   "dependencies": {
     "@babel/runtime": "^7.18.9",
@@ -26,8 +29,7 @@
     "react-native": "0.70.5",
     "react-native-safe-area-context": "4.4.1",
     "react-native-screens": "~3.18.0",
-    "react-native-svg": "^13.8.0",
-    "react-native-web": "~0.18.12"
+    "react-native-svg": "^13.8.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.9",
diff --git a/apps/web/package.json b/apps/web/package.json
index a647d14d..8b44c2b3 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -5,7 +5,9 @@
   "scripts": {
     "dev": "TAMAGUI_TARGET='web' vite",
     "build": "tsc && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "lint": "eslint src",
+    "#typecheck": "tsc"
   },
   "dependencies": {
     "@status-im/components": "*",
diff --git a/package.json b/package.json
index 300640ee..9e846301 100644
--- a/package.json
+++ b/package.json
@@ -12,12 +12,11 @@
   "scripts": {
     "prepare": "husky install",
     "test": "turbo run test --filter=@status-im/* -- --run",
-    "dev": "turbo run dev --parallel --filter=@status-im/*",
+    "dev": "turbo run dev --filter=@status-im/* --parallel",
     "build": "turbo run build  --filter=@status-im/*",
-    "typecheck": "turbo run typecheck --filter=@status-im/*",
     "lint": "eslint --cache --cache-location ./node_modules/.cache/eslint/.eslint-cache .",
+    "typecheck": "turbo run typecheck",
     "format": "prettier --ignore-path .gitignore --cache --write .",
-    "format:check": "prettier --check .",
     "clean": "turbo run clean && rimraf node_modules",
     "web": "yarn workspace web dev",
     "mobile": "yarn workspace mobile dev",
diff --git a/packages/components/package.json b/packages/components/package.json
index 87d07482..e3c7b707 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -14,9 +14,13 @@
   "scripts": {
     "dev": "tamagui-build --watch",
     "build": "tamagui-build",
+    "postbuild": "yarn typegen",
     "typegen": "tsc --noEmit false --emitDeclarationOnly || true",
+    "lint": "eslint src",
+    "typecheck": "tsc",
     "storybook": "TAMAGUI_TARGET='web' storybook dev -p 3001",
-    "storybook:build": "TAMAGUI_TARGET='web' storybook build"
+    "storybook:build": "TAMAGUI_TARGET='web' storybook build",
+    "clean": "rimraf node_modules dist .turbo storybook-static"
   },
   "peerDependencies": {
     "react-native-web": "^0.18.0"
diff --git a/packages/components/src/accordion/accordionItem.tsx b/packages/components/src/accordion/accordionItem.tsx
index 8c50f71e..4144a1ca 100644
--- a/packages/components/src/accordion/accordionItem.tsx
+++ b/packages/components/src/accordion/accordionItem.tsx
@@ -1,5 +1,5 @@
 import { MutedIcon } from '@status-im/icons/20'
-import { Stack } from '@tamagui/core'
+import { Stack, Text } from '@tamagui/core'
 
 import { Label, Paragraph } from '../typography'
 
@@ -67,7 +67,7 @@ const AccordionItem = (props: Props) => {
             justifyContent="center"
             alignItems="center"
           >
-            {emoji}
+            <Text>{emoji}</Text>
           </Stack>
         )}
         <Paragraph
diff --git a/packages/status-js/package.json b/packages/status-js/package.json
index f0d0d843..a9b3dbfc 100644
--- a/packages/status-js/package.json
+++ b/packages/status-js/package.json
@@ -19,14 +19,13 @@
     "url": "https://github.com/status-im/status-web/issues"
   },
   "scripts": {
+    "test": "vitest",
     "dev": "vite build --watch --mode development",
     "build": "vite build",
     "postbuild": "yarn typegen",
-    "test": "vitest",
-    "typecheck": "tsc",
     "typegen": "tsc --noEmit false --emitDeclarationOnly || true",
     "lint": "eslint src",
-    "format": "prettier --write src",
+    "typecheck": "tsc",
     "protos": "protons protos/*.proto",
     "clean": "rimraf dist node_modules .turbo"
   },
diff --git a/packages/status-react/package.json b/packages/status-react/package.json
index cc630a46..591e69f0 100644
--- a/packages/status-react/package.json
+++ b/packages/status-react/package.json
@@ -19,14 +19,13 @@
     "url": "https://github.com/status-im/status-web/issues"
   },
   "scripts": {
+    "#test": "vitest",
     "dev": "vite build --watch --mode development",
     "build": "vite build",
     "postbuild": "yarn typegen",
-    "#test": "vitest",
-    "typecheck": "tsc",
     "typegen": "tsc --noEmit false --emitDeclarationOnly || true",
     "lint": "eslint src",
-    "format": "prettier --write src",
+    "typecheck": "tsc",
     "clean": "rimraf dist node_modules .turbo"
   },
   "dependencies": {