From 7bedc649c0b1af4edec0592cb98c5aab8ab4a97f Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 7 Nov 2023 14:49:08 -0600 Subject: [PATCH 01/64] Use source of common in web build --- package-lock.json | 6617 +++++------------ packages/common/package.json | 4 +- .../services/audius-backend/AudiusBackend.ts | 1 + .../src/services/remote-config/index.ts | 4 +- .../store/pages/deactivate-account/index.ts | 4 +- packages/common/src/store/pages/index.ts | 9 +- .../common/src/store/pages/track/types.ts | 2 +- .../common/src/store/recovery-email/index.ts | 4 +- packages/common/src/store/ui/index.ts | 12 +- packages/common/src/utils/index.ts | 2 +- packages/harmony/package.json | 1 + packages/harmony/rollup.config.mjs | 5 + packages/web/package.json | 4 +- packages/web/src/assets/styles/index.css | 12 +- packages/web/src/index.css | 2 +- packages/web/tsconfig.json | 2 +- packages/web/vite.config.ts | 23 +- 17 files changed, 1757 insertions(+), 4951 deletions(-) diff --git a/package-lock.json b/package-lock.json index 682584a8da5..9804f613e78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -206,8 +206,7 @@ }, "node_modules/@apollo/client": { "version": "3.3.7", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.7.tgz", - "integrity": "sha512-Cb0OqqvlehlRHtHIXRIS/Pe5WYU4hHl1FznXTRSxBAN42WmBUM3zy/Unvw183RdWMyV6Kc2pFKOEuaG1K7JTAQ==", + "license": "MIT", "dependencies": { "@graphql-typed-document-node/core": "^3.0.0", "@types/zen-observable": "^0.8.0", @@ -239,8 +238,7 @@ }, "node_modules/@apollo/client/node_modules/symbol-observable": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz", - "integrity": "sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==", + "license": "MIT", "engines": { "node": ">=0.10" } @@ -2756,36 +2754,30 @@ }, "node_modules/@brillout/import": { "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@brillout/import/-/import-0.2.3.tgz", - "integrity": "sha512-1T8WlD75eeFSMrptGy8jiLHmfHgMmSjWvLOIUvHmSVZt+6k0eQqYUoK4KbmE4T9pVLIfxvZSOm2D68VEqKRHRw==" + "license": "MIT" }, "node_modules/@brillout/json-serializer": { "version": "0.5.8", - "resolved": "https://registry.npmjs.org/@brillout/json-serializer/-/json-serializer-0.5.8.tgz", - "integrity": "sha512-vEuXw30ok+mJfJutOxXKBb4lBJ0HymA7lev9PcYK6W/hzjhCTPk9Bdk85HrcNcKZWRQiwoWtw0F2Di4TRJ7ssQ==" + "license": "MIT" }, "node_modules/@brillout/picocolors": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@brillout/picocolors/-/picocolors-1.0.10.tgz", - "integrity": "sha512-dh+JJlsBf3QYX+91Ezma8RLKNOjGDoBBmORv/NzRpQuasdyzwQCMXGGjsDu12ZhGz92TqQbL9pv79rvbheI21A==" + "license": "ISC" }, "node_modules/@brillout/require-shim": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@brillout/require-shim/-/require-shim-0.1.2.tgz", - "integrity": "sha512-3I4LRHnVZXoSAsEoni5mosq9l6eiJED58d9V954W4CIZ88AUfYBanWGBGbJG3NztaRTpFHEA6wB3Hn93BmmJdg==" + "license": "MIT" }, "node_modules/@brillout/vite-plugin-import-build": { "version": "0.2.22", - "resolved": "https://registry.npmjs.org/@brillout/vite-plugin-import-build/-/vite-plugin-import-build-0.2.22.tgz", - "integrity": "sha512-n5sv0HdCB5WC2QJSnTN6iS/F+sJsF0AmtsCCaQ+5+dRjgsoGGsa3auinJV8tuEog5WsX+3MF8RIwn3A/u0e04w==", + "license": "MIT", "dependencies": { "@brillout/import": "^0.2.3" } }, "node_modules/@ceramicnetwork/3id-did-resolver": { "version": "2.32.0", - "resolved": "https://registry.npmjs.org/@ceramicnetwork/3id-did-resolver/-/3id-did-resolver-2.32.0.tgz", - "integrity": "sha512-9jnibtXIYCPUbS+FlBakh5ghUt7/ItGn2nuRfw8kMGdO4JsfN3jVjLHyah1b2X3AVsGG+V1k1CYH3otgdfvftA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/stream-tile": "^2.35.0", @@ -2798,8 +2790,7 @@ }, "node_modules/@ceramicnetwork/3id-did-resolver/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2807,16 +2798,14 @@ }, "node_modules/@ceramicnetwork/3id-did-resolver/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/3id-did-resolver/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2824,8 +2813,7 @@ }, "node_modules/@ceramicnetwork/codecs": { "version": "1.14.0", - "resolved": "https://registry.npmjs.org/@ceramicnetwork/codecs/-/codecs-1.14.0.tgz", - "integrity": "sha512-UElVFFIHWHGc/cr5pZxQTfd7DJIf95cFtADTFQ+O78c+X+OOO323F40KLCP+vuwooyiVbGArHiaU5WsrHCz7bg==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/streamid": "^2.17.0", "cartonne": "^2.1.1", @@ -2837,8 +2825,7 @@ }, "node_modules/@ceramicnetwork/codecs/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2846,16 +2833,14 @@ }, "node_modules/@ceramicnetwork/codecs/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/codecs/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2863,8 +2848,7 @@ }, "node_modules/@ceramicnetwork/common": { "version": "2.39.0", - "resolved": "https://registry.npmjs.org/@ceramicnetwork/common/-/common-2.39.0.tgz", - "integrity": "sha512-NB/6XzPqualWK5Kyti664VHhJug3Z8XDFNpYxM0dLz13lgtNnLWUt6xFG0I7chB0ecbhexanKRE/dh7Ltjczvw==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/codecs": "^1.14.0", "@ceramicnetwork/streamid": "^2.17.0", @@ -2888,8 +2872,7 @@ }, "node_modules/@ceramicnetwork/common/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2897,16 +2880,14 @@ }, "node_modules/@ceramicnetwork/common/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/common/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2914,8 +2895,7 @@ }, "node_modules/@ceramicnetwork/http-client": { "version": "2.36.0", - "resolved": "https://registry.npmjs.org/@ceramicnetwork/http-client/-/http-client-2.36.0.tgz", - "integrity": "sha512-N2iTPPAYER81PiU21tIVE7eh8PpNhSXaV7qsOdOZb2F3fmgcbO7PpOHki/1AaaAZUAXUNb0SOOjZGKIzJR1bhw==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/stream-caip10-link": "^2.34.0", @@ -2930,24 +2910,21 @@ }, "node_modules/@ceramicnetwork/http-client/node_modules/decode-uri-component": { "version": "0.2.2", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", - "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", + "license": "MIT", "engines": { "node": ">=0.10" } }, "node_modules/@ceramicnetwork/http-client/node_modules/filter-obj": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", - "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/@ceramicnetwork/http-client/node_modules/query-string": { "version": "7.1.3", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz", - "integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==", + "license": "MIT", "dependencies": { "decode-uri-component": "^0.2.2", "filter-obj": "^1.1.0", @@ -2963,16 +2940,14 @@ }, "node_modules/@ceramicnetwork/http-client/node_modules/split-on-first": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", - "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/@ceramicnetwork/stream-caip10-link": { "version": "2.34.0", - "resolved": "https://registry.npmjs.org/@ceramicnetwork/stream-caip10-link/-/stream-caip10-link-2.34.0.tgz", - "integrity": "sha512-bBxzPLc+NX+k7nKpmB7rcGy30R31pgU2/3FR1x+rezPY3n3trMZLcHqeNtUtuJv/tDLL2z+EDmfdXK91kBUTag==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/streamid": "^2.17.0", @@ -2983,13 +2958,11 @@ }, "node_modules/@ceramicnetwork/stream-caip10-link/node_modules/did-resolver": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-4.1.0.tgz", - "integrity": "sha512-S6fWHvCXkZg2IhS4RcVHxwuyVejPR7c+a4Go0xbQ9ps5kILa8viiYQgrM4gfTyeTjJ0ekgJH9gk/BawTpmkbZA==" + "license": "Apache-2.0" }, "node_modules/@ceramicnetwork/stream-model": { "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@ceramicnetwork/stream-model/-/stream-model-1.21.0.tgz", - "integrity": "sha512-OOIG7LU5XlBKi+7+lb5o1vtfJI9yblIzww1G7yeLW8W3axEzvnkrk/Hyyeeg1R2R7B6zE+AEWi93mBE1FP96VA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/codecs": "^1.14.0", "@ceramicnetwork/common": "^2.39.0", @@ -3007,8 +2980,7 @@ }, "node_modules/@ceramicnetwork/stream-model-instance": { "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@ceramicnetwork/stream-model-instance/-/stream-model-instance-1.21.0.tgz", - "integrity": "sha512-XxnLSv9HvzIuAYGlwSh/ODLolzgxrqnflk3rVj0cYODOmFYHi0/cYr2Sh/TTR7VpE3Xm6o1ch8BeLNozx6NGvg==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/streamid": "^2.17.0", @@ -3021,8 +2993,7 @@ }, "node_modules/@ceramicnetwork/stream-model-instance/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3030,16 +3001,14 @@ }, "node_modules/@ceramicnetwork/stream-model-instance/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/stream-model/node_modules/ajv": { "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -3053,13 +3022,11 @@ }, "node_modules/@ceramicnetwork/stream-model/node_modules/json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + "license": "MIT" }, "node_modules/@ceramicnetwork/stream-model/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3067,16 +3034,14 @@ }, "node_modules/@ceramicnetwork/stream-model/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/stream-model/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3084,8 +3049,7 @@ }, "node_modules/@ceramicnetwork/stream-tile": { "version": "2.35.0", - "resolved": "https://registry.npmjs.org/@ceramicnetwork/stream-tile/-/stream-tile-2.35.0.tgz", - "integrity": "sha512-pkUsgAyEo7cd7Zj+T4OfXxDnaIN3cUiqkWOg2rj7ESXBKCVnTMXexsDNM2I+HvlXCCSuY+ek4TYu6QwVe1yiIA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/streamid": "^2.17.0", @@ -3099,8 +3063,7 @@ }, "node_modules/@ceramicnetwork/stream-tile/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3108,16 +3071,14 @@ }, "node_modules/@ceramicnetwork/stream-tile/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/streamid": { "version": "2.17.0", - "resolved": "https://registry.npmjs.org/@ceramicnetwork/streamid/-/streamid-2.17.0.tgz", - "integrity": "sha512-LC6YL8dcN2XqOdPEDKqWAloyJNXBIyw30JAm4gvWLsUuOaL8hTJWpu2HndFp/Jn4Mab9090/fwVZ2O8CWno58w==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ipld/dag-cbor": "^7.0.0", "@stablelib/sha256": "^1.0.1", @@ -3130,8 +3091,7 @@ }, "node_modules/@ceramicnetwork/streamid/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3139,16 +3099,14 @@ }, "node_modules/@ceramicnetwork/streamid/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/streamid/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3156,8 +3114,7 @@ }, "node_modules/@ceramicnetwork/streamid/node_modules/varint": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", - "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==" + "license": "MIT" }, "node_modules/@certusone/wormhole-sdk": { "version": "0.1.1", @@ -3493,8 +3450,7 @@ }, "node_modules/@coinflowlabs/react": { "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@coinflowlabs/react/-/react-3.1.5.tgz", - "integrity": "sha512-XloIfXGXaOjv9l0DAptpl1ZeIDvuPpG6SUsX3vCi1yyzO6MNPgG9kjEi8lRF0SdfGV02knxdODNYITLdH1I8Ow==", + "license": "Apache-2.0", "dependencies": { "bn.js": "^5.2.1", "bs58": "^5.0.0", @@ -3634,13 +3590,11 @@ }, "node_modules/@coinflowlabs/react/node_modules/base-x": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", - "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" + "license": "MIT" }, "node_modules/@coinflowlabs/react/node_modules/bs58": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz", - "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==", + "license": "MIT", "dependencies": { "base-x": "^4.0.0" } @@ -3837,8 +3791,7 @@ }, "node_modules/@didtools/cacao": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@didtools/cacao/-/cacao-2.1.0.tgz", - "integrity": "sha512-35gopj+mOmAlA3nHoHiYMvNMXJtbJDJnVpIlCf/Wf/+/x+uG9aIQefXfF35D6JuaTCZ0apabjpT2umL5h3EXcw==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@didtools/codecs": "^1.0.1", "@didtools/siwx": "1.0.0", @@ -3853,8 +3806,7 @@ }, "node_modules/@didtools/cacao/node_modules/@ipld/dag-cbor": { "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.0.8.tgz", - "integrity": "sha512-ETWJ7p7lmGw5X+BuI/7rf4/k56xyOvAOVNUVuQmnGYBdJjObLPgS+vyFxRk4odATlkyZqCq2MLNY52bhE6SlRA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "cborg": "^4.0.0", "multiformats": "^13.0.0" @@ -3866,21 +3818,18 @@ }, "node_modules/@didtools/cacao/node_modules/@ipld/dag-cbor/node_modules/multiformats": { "version": "13.0.1", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.1.tgz", - "integrity": "sha512-bt3R5iXe2O8xpp3wkmQhC73b/lC4S2ihU8Dndwcsysqbydqb8N+bpP116qMcClZ17g58iSIwtXUTcg2zT4sniA==" + "license": "Apache-2.0 OR MIT" }, "node_modules/@didtools/cacao/node_modules/cborg": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/cborg/-/cborg-4.0.8.tgz", - "integrity": "sha512-/6QDK0Hw//cV4YNWZZjdIUMFNw0DZmb56jdVGJPwXP7874gSN0AMYqM07mVKpAm+6Nn7U8lvYFzPgBGatC+5xw==", + "license": "Apache-2.0", "bin": { "cborg": "lib/bin.js" } }, "node_modules/@didtools/cacao/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3888,16 +3837,14 @@ }, "node_modules/@didtools/cacao/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@didtools/cacao/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3905,8 +3852,7 @@ }, "node_modules/@didtools/codecs": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@didtools/codecs/-/codecs-1.0.1.tgz", - "integrity": "sha512-6PYXOCX7mwVWUcudKQ3eW5LtI8v5esozazbf2q2F01PE+LoeEvTytvgU9FEspj4pATpq3hPx1eenX2uLirDJ8w==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "codeco": "^1.1.0", "multiformats": "^11.0.1", @@ -3918,8 +3864,7 @@ }, "node_modules/@didtools/codecs/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3927,16 +3872,14 @@ }, "node_modules/@didtools/codecs/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@didtools/codecs/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3944,8 +3887,7 @@ }, "node_modules/@didtools/pkh-ethereum": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@didtools/pkh-ethereum/-/pkh-ethereum-0.1.0.tgz", - "integrity": "sha512-Abmc6uvWU8zkOrQbPUAsRtTW293vhx+rzd+/bbduTLrRGEqZ3niakQkxMqvQKZ6/9w+n0IjQVXSHE5vzc5cAeg==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@didtools/cacao": "^2.0.0", "@ethersproject/wallet": "^5.7.0", @@ -3958,8 +3900,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/abstract-provider": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", - "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", "funding": [ { "type": "individual", @@ -3970,6 +3910,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -3982,8 +3923,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/abstract-signer": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", - "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", "funding": [ { "type": "individual", @@ -3994,6 +3933,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -4004,8 +3944,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/address": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", - "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", "funding": [ { "type": "individual", @@ -4016,6 +3954,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -4026,8 +3965,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/base64": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", - "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", "funding": [ { "type": "individual", @@ -4038,14 +3975,13 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0" } }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/basex": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.7.0.tgz", - "integrity": "sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==", "funding": [ { "type": "individual", @@ -4056,6 +3992,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/properties": "^5.7.0" @@ -4063,8 +4000,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/hash": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", - "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", "funding": [ { "type": "individual", @@ -4075,6 +4010,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -4089,8 +4025,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/hdnode": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.7.0.tgz", - "integrity": "sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==", "funding": [ { "type": "individual", @@ -4101,6 +4035,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/basex": "^5.7.0", @@ -4118,8 +4053,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/json-wallets": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz", - "integrity": "sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==", "funding": [ { "type": "individual", @@ -4130,6 +4063,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -4148,8 +4082,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/networks": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", - "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", "funding": [ { "type": "individual", @@ -4160,14 +4092,13 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/pbkdf2": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz", - "integrity": "sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==", "funding": [ { "type": "individual", @@ -4178,6 +4109,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/sha2": "^5.7.0" @@ -4185,8 +4117,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/properties": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", - "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", "funding": [ { "type": "individual", @@ -4197,14 +4127,13 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/random": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.7.0.tgz", - "integrity": "sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==", "funding": [ { "type": "individual", @@ -4215,6 +4144,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -4222,8 +4152,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/rlp": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", - "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", "funding": [ { "type": "individual", @@ -4234,6 +4162,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -4241,8 +4170,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/signing-key": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", - "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", "funding": [ { "type": "individual", @@ -4253,6 +4180,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0", @@ -4264,8 +4192,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/transactions": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", - "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", "funding": [ { "type": "individual", @@ -4276,6 +4202,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -4290,8 +4217,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/wallet": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.7.0.tgz", - "integrity": "sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==", "funding": [ { "type": "individual", @@ -4302,6 +4227,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", @@ -4322,8 +4248,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/web": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", - "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", "funding": [ { "type": "individual", @@ -4334,6 +4258,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/base64": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -4344,8 +4269,6 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/wordlists": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.7.0.tgz", - "integrity": "sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==", "funding": [ { "type": "individual", @@ -4356,6 +4279,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/hash": "^5.7.0", @@ -4366,13 +4290,11 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/aes-js": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==" + "license": "MIT" }, "node_modules/@didtools/pkh-solana": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@didtools/pkh-solana/-/pkh-solana-0.1.1.tgz", - "integrity": "sha512-2Sn4xSg8otqAeXA0tDYUM+3KQtzOr2gBcu0wbJyOn/30Ocj3jxHFQg7NfumEsiQtQ0HtnmsGZUrnCgoxHqLwWg==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@didtools/cacao": "^2.0.0", "@noble/curves": "^1.0.0", @@ -4386,8 +4308,7 @@ }, "node_modules/@didtools/pkh-solana/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -4395,16 +4316,14 @@ }, "node_modules/@didtools/pkh-solana/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@didtools/pkh-stacks": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@didtools/pkh-stacks/-/pkh-stacks-0.1.0.tgz", - "integrity": "sha512-dEgyHleiIa2afibchNqs07tSqddFS6pX9D5BNxbWH0NAr+FisVCA4nUXajcbd9TUbSuplClfQ4EXjjJAGqlgeg==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@didtools/cacao": "^2.0.0", "@stablelib/random": "^1.0.2", @@ -4420,8 +4339,7 @@ }, "node_modules/@didtools/pkh-tezos": { "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@didtools/pkh-tezos/-/pkh-tezos-0.2.2.tgz", - "integrity": "sha512-pUzquLujQJQ4tQoGrXjozFZePNt+VLX7Bk32r1DPbkp8FaLoAA5UoaP1qf+fM/J9EsxCfdnpntqqGU+MmvIpHA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@didtools/cacao": "^2.0.0", "@noble/curves": "^1.0.0", @@ -4436,8 +4354,7 @@ }, "node_modules/@didtools/pkh-tezos/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -4445,16 +4362,14 @@ }, "node_modules/@didtools/pkh-tezos/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@didtools/siwx": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@didtools/siwx/-/siwx-1.0.0.tgz", - "integrity": "sha512-b7sPDTNHdySoJ+Rp2p06x3rg1iTxI4yPTTA3PrPh40xcvFJ0K/YhdIb/Rzff13t92arcJ+VYGFhqtJorauV91g==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "codeco": "^1.1.0" }, @@ -4519,9 +4434,8 @@ }, "node_modules/@electron/asar": { "version": "3.2.8", - "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz", - "integrity": "sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg==", "dev": true, + "license": "MIT", "dependencies": { "commander": "^5.0.0", "glob": "^7.1.6", @@ -4536,18 +4450,16 @@ }, "node_modules/@electron/asar/node_modules/commander": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } }, "node_modules/@electron/osx-sign": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz", - "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "compare-version": "^0.1.2", "debug": "^4.3.4", @@ -4566,9 +4478,8 @@ }, "node_modules/@electron/osx-sign/node_modules/fs-extra": { "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -4580,9 +4491,8 @@ }, "node_modules/@electron/osx-sign/node_modules/jsonfile": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -4592,9 +4502,8 @@ }, "node_modules/@electron/osx-sign/node_modules/universalify": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } @@ -4654,8 +4563,7 @@ }, "node_modules/@emotion/core": { "version": "10.3.1", - "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.3.1.tgz", - "integrity": "sha512-447aUEjPIm0MnE6QYIaFz9VQOHSXf4Iu6EWOIqq11EAPqinkSZmfymPTmlOE3QjLv846lH4JVZBUOtwGbuQoww==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.5.5", "@emotion/cache": "^10.0.27", @@ -4670,8 +4578,7 @@ }, "node_modules/@emotion/core/node_modules/@emotion/cache": { "version": "10.0.29", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz", - "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==", + "license": "MIT", "dependencies": { "@emotion/sheet": "0.9.4", "@emotion/stylis": "0.8.5", @@ -4681,8 +4588,7 @@ }, "node_modules/@emotion/core/node_modules/@emotion/css": { "version": "10.0.27", - "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz", - "integrity": "sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==", + "license": "MIT", "dependencies": { "@emotion/serialize": "^0.11.15", "@emotion/utils": "0.11.3", @@ -4691,18 +4597,15 @@ }, "node_modules/@emotion/core/node_modules/@emotion/hash": { "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", - "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + "license": "MIT" }, "node_modules/@emotion/core/node_modules/@emotion/memoize": { "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", - "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==" + "license": "MIT" }, "node_modules/@emotion/core/node_modules/@emotion/serialize": { "version": "0.11.16", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz", - "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==", + "license": "MIT", "dependencies": { "@emotion/hash": "0.8.0", "@emotion/memoize": "0.7.4", @@ -4713,28 +4616,23 @@ }, "node_modules/@emotion/core/node_modules/@emotion/sheet": { "version": "0.9.4", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz", - "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==" + "license": "MIT" }, "node_modules/@emotion/core/node_modules/@emotion/unitless": { "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", - "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" + "license": "MIT" }, "node_modules/@emotion/core/node_modules/@emotion/utils": { "version": "0.11.3", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz", - "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==" + "license": "MIT" }, "node_modules/@emotion/core/node_modules/@emotion/weak-memoize": { "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", - "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" + "license": "MIT" }, "node_modules/@emotion/core/node_modules/csstype": { "version": "2.6.21", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" + "license": "MIT" }, "node_modules/@emotion/css": { "version": "11.11.2", @@ -4833,8 +4731,7 @@ }, "node_modules/@emotion/styled": { "version": "11.11.0", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.11.0.tgz", - "integrity": "sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.11.0", @@ -4878,9 +4775,8 @@ }, "node_modules/@esbuild-kit/cjs-loader": { "version": "2.4.4", - "resolved": "https://registry.npmjs.org/@esbuild-kit/cjs-loader/-/cjs-loader-2.4.4.tgz", - "integrity": "sha512-NfsJX4PdzhwSkfJukczyUiZGc7zNNWZcEAyqeISpDnn0PTfzMJR1aR8xAIPskBejIxBJbIgCCMzbaYa9SXepIg==", "dev": true, + "license": "MIT", "dependencies": { "@esbuild-kit/core-utils": "^3.2.3", "get-tsconfig": "^4.7.0" @@ -4888,9 +4784,8 @@ }, "node_modules/@esbuild-kit/core-utils": { "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz", - "integrity": "sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "~0.18.20", "source-map-support": "^0.5.21" @@ -4898,9 +4793,8 @@ }, "node_modules/@esbuild-kit/esm-loader": { "version": "2.6.5", - "resolved": "https://registry.npmjs.org/@esbuild-kit/esm-loader/-/esm-loader-2.6.5.tgz", - "integrity": "sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==", "dev": true, + "license": "MIT", "dependencies": { "@esbuild-kit/core-utils": "^3.3.2", "get-tsconfig": "^4.7.0" @@ -4914,58 +4808,12 @@ "esbuild": "*" } }, - "node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@esbuild/darwin-arm64": { "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -4974,276 +4822,6 @@ "node": ">=12" } }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", - "cpu": [ - "ia32" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", - "cpu": [ - "loong64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", - "cpu": [ - "mips64el" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", - "cpu": [ - "ppc64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", - "cpu": [ - "riscv64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", - "cpu": [ - "s390x" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", - "cpu": [ - "ia32" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@escape.tech/mookme": { "version": "2.4.1", "license": "MIT", @@ -6539,16 +6117,14 @@ }, "node_modules/@glazed/constants": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@glazed/constants/-/constants-0.2.0.tgz", - "integrity": "sha512-+umVEKMhoH8o+M9sPBKhoo0vHJg9Tei5huM+vApB7IgffbVMD7O3luQsHbO/QIVtt8azQXUODnvg14a3IgYEWQ==", + "license": "(Apache-2.0 OR MIT)", "engines": { "node": ">=14.14" } }, "node_modules/@glazed/datamodel": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@glazed/datamodel/-/datamodel-0.3.1.tgz", - "integrity": "sha512-UBd+z9yoHZkFDXKOE3VmnUPdkE0ERla+3jU8Q09jo4pCQPwzk/IvMlLNlRfIqUbGuoYkz8pZkdcuTB012yS/dw==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@glazed/tile-loader": "^0.2.1" }, @@ -6558,8 +6134,7 @@ }, "node_modules/@glazed/did-datastore": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@glazed/did-datastore/-/did-datastore-0.3.2.tgz", - "integrity": "sha512-/sNasgFF1bvUFIc4KVIihPzD+Zo2kr/uJ8cZHU1U+rRVsCL1AeYcx/bF27OaaMvxfDlJ9nXMmiaPl5kwnyzviQ==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/streamid": "^2.1.0", "@glazed/constants": "^0.2.0", @@ -6572,8 +6147,7 @@ }, "node_modules/@glazed/tile-loader": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@glazed/tile-loader/-/tile-loader-0.2.1.tgz", - "integrity": "sha512-opICtDY1OIhIYJD8UVTO8BdNDMGD+Ui4MPA1JifpVeUWAO97PtgsXZ1irLLab5l5zDiakmajoiWZxv2PbVGTlA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/stream-tile": "^2.2.2", "dataloader": "^2.1.0" @@ -6584,8 +6158,7 @@ }, "node_modules/@google/model-viewer": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@google/model-viewer/-/model-viewer-3.3.0.tgz", - "integrity": "sha512-nQQXi9VUpO7odH42EfnN5L3E/1DT5M50H7eOMd5Q9xI2X6J4we6IsfHPzxxFXffK9fMSw026OE2YAvkUcBxT3A==", + "license": "Apache-2.0", "dependencies": { "lit": "^2.7.2" }, @@ -6609,8 +6182,7 @@ }, "node_modules/@graphql-typed-document-node/core": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz", - "integrity": "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==", + "license": "MIT", "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } @@ -6688,8 +6260,7 @@ }, "node_modules/@ipld/dag-cbor": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-7.0.3.tgz", - "integrity": "sha512-1VVh2huHsuohdXC1bGJNE8WR72slZ9XE2T3wbBBq31dm7ZBatmKLLxrB+XAqafxfRFjv08RZmj/W/ZqaM13AuA==", + "license": "(Apache-2.0 AND MIT)", "dependencies": { "cborg": "^1.6.0", "multiformats": "^9.5.4" @@ -8803,9 +8374,8 @@ }, "node_modules/@ledgerhq/cryptoassets": { "version": "11.4.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/cryptoassets/-/cryptoassets-11.4.0.tgz", - "integrity": "sha512-1M0iNyZlmf4MbLGk6vl5CK3gyHAT0yeUzkMbQn+Eo3JL0Y8ng7bl39GGRVasD7X7d/ue2nrG1bX6peGhLcDL/Q==", "dev": true, + "license": "Apache-2.0", "dependencies": { "axios": "^1.6.0", "bs58check": "^2.1.2", @@ -8813,10 +8383,9 @@ } }, "node_modules/@ledgerhq/cryptoassets/node_modules/axios": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", - "integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", + "version": "1.6.5", "dev": true, + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.4", "form-data": "^4.0.0", @@ -8825,8 +8394,6 @@ }, "node_modules/@ledgerhq/cryptoassets/node_modules/follow-redirects": { "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -8834,6 +8401,7 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -8845,9 +8413,8 @@ }, "node_modules/@ledgerhq/cryptoassets/node_modules/form-data": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -8859,9 +8426,8 @@ }, "node_modules/@ledgerhq/devices": { "version": "8.2.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.2.0.tgz", - "integrity": "sha512-XROTW2gTmmuy+YPPDjdtKKTQ3mfxrPtKtV+a9QFbj8f5MnjVMV0Zpy1BIB4CyIMsVVi4z6+nI67auT7IlsM3SQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ledgerhq/errors": "^6.16.1", "@ledgerhq/logs": "^6.12.0", @@ -8871,9 +8437,8 @@ }, "node_modules/@ledgerhq/devices/node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -8883,9 +8448,8 @@ }, "node_modules/@ledgerhq/devices/node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -8898,15 +8462,13 @@ }, "node_modules/@ledgerhq/devices/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@ledgerhq/domain-service": { "version": "1.1.17", - "resolved": "https://registry.npmjs.org/@ledgerhq/domain-service/-/domain-service-1.1.17.tgz", - "integrity": "sha512-EAnbuuuWJpFYHp1a4fMh8cNk5Lic+4Rwf4xGXAOHKcUUT90Q3/VYiom1+ZZwKA8PBgebbxE695UDKK1SzPvh8Q==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ledgerhq/errors": "^6.16.1", "@ledgerhq/logs": "^6.12.0", @@ -8918,10 +8480,9 @@ } }, "node_modules/@ledgerhq/domain-service/node_modules/axios": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", - "integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", + "version": "1.6.5", "dev": true, + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.4", "form-data": "^4.0.0", @@ -8930,8 +8491,6 @@ }, "node_modules/@ledgerhq/domain-service/node_modules/follow-redirects": { "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -8939,6 +8498,7 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -8950,9 +8510,8 @@ }, "node_modules/@ledgerhq/domain-service/node_modules/form-data": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -8964,15 +8523,13 @@ }, "node_modules/@ledgerhq/errors": { "version": "6.16.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.16.1.tgz", - "integrity": "sha512-4D4wKecGzQpIu7sx03Sg4uE1e8g1oZUndWgw9gw776H8h9ov9c5TxPaldTn2j6orPECAERViLf7LTO4L5pE2Cw==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/@ledgerhq/evm-tools": { "version": "1.0.14", - "resolved": "https://registry.npmjs.org/@ledgerhq/evm-tools/-/evm-tools-1.0.14.tgz", - "integrity": "sha512-L1fj3mbcZPueCJ/ZwxKXQegpY561NkxGd8nljF/JVqwH/B1N+usdZb9HZswrsgWjQdxqeQykgz7ZZgYolU+vlg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ledgerhq/cryptoassets": "^11.4.0", "@ledgerhq/live-env": "^0.9.0", @@ -8983,8 +8540,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/abi": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", - "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", "dev": true, "funding": [ { @@ -8996,6 +8551,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -9010,8 +8566,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/abstract-provider": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", - "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", "dev": true, "funding": [ { @@ -9023,6 +8577,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9035,8 +8590,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/abstract-signer": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", - "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", "dev": true, "funding": [ { @@ -9048,6 +8601,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -9058,8 +8612,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/address": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", - "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", "dev": true, "funding": [ { @@ -9071,6 +8623,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9081,8 +8634,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/base64": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", - "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", "dev": true, "funding": [ { @@ -9094,14 +8645,13 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0" } }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/basex": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.7.0.tgz", - "integrity": "sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==", "dev": true, "funding": [ { @@ -9113,6 +8663,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/properties": "^5.7.0" @@ -9120,8 +8671,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/contracts": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.7.0.tgz", - "integrity": "sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==", "dev": true, "funding": [ { @@ -9133,6 +8682,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abi": "^5.7.0", "@ethersproject/abstract-provider": "^5.7.0", @@ -9148,8 +8698,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/hash": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", - "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", "dev": true, "funding": [ { @@ -9161,6 +8709,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -9175,8 +8724,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/hdnode": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.7.0.tgz", - "integrity": "sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==", "dev": true, "funding": [ { @@ -9188,6 +8735,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/basex": "^5.7.0", @@ -9205,8 +8753,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/json-wallets": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz", - "integrity": "sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==", "dev": true, "funding": [ { @@ -9218,6 +8764,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -9236,8 +8783,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/networks": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", - "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", "dev": true, "funding": [ { @@ -9249,14 +8794,13 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/pbkdf2": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz", - "integrity": "sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==", "dev": true, "funding": [ { @@ -9268,6 +8812,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/sha2": "^5.7.0" @@ -9275,8 +8820,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/properties": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", - "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", "dev": true, "funding": [ { @@ -9288,14 +8831,13 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/providers": { "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.7.2.tgz", - "integrity": "sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==", "dev": true, "funding": [ { @@ -9307,6 +8849,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", @@ -9332,8 +8875,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/random": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.7.0.tgz", - "integrity": "sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==", "dev": true, "funding": [ { @@ -9345,6 +8886,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -9352,8 +8894,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/rlp": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", - "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", "dev": true, "funding": [ { @@ -9365,6 +8905,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -9372,8 +8913,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/signing-key": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", - "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", "dev": true, "funding": [ { @@ -9385,6 +8924,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0", @@ -9396,8 +8936,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/solidity": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.7.0.tgz", - "integrity": "sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==", "dev": true, "funding": [ { @@ -9409,6 +8947,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9420,8 +8959,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/transactions": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", - "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", "dev": true, "funding": [ { @@ -9433,6 +8970,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -9447,8 +8985,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/units": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.7.0.tgz", - "integrity": "sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==", "dev": true, "funding": [ { @@ -9460,6 +8996,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/constants": "^5.7.0", @@ -9468,8 +9005,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/wallet": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.7.0.tgz", - "integrity": "sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==", "dev": true, "funding": [ { @@ -9481,6 +9016,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", @@ -9501,8 +9037,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/web": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", - "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", "dev": true, "funding": [ { @@ -9514,6 +9048,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/base64": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9524,8 +9059,6 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/wordlists": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.7.0.tgz", - "integrity": "sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==", "dev": true, "funding": [ { @@ -9537,6 +9070,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/hash": "^5.7.0", @@ -9547,20 +9081,16 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/aes-js": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@ledgerhq/evm-tools/node_modules/bech32": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", - "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@ledgerhq/evm-tools/node_modules/ethers": { "version": "5.7.2", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.7.2.tgz", - "integrity": "sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==", "dev": true, "funding": [ { @@ -9572,6 +9102,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abi": "5.7.0", "@ethersproject/abstract-provider": "5.7.0", @@ -9607,9 +9138,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/ws": { "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.3.0" }, @@ -9628,9 +9158,8 @@ }, "node_modules/@ledgerhq/hw-app-eth": { "version": "6.35.3", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-app-eth/-/hw-app-eth-6.35.3.tgz", - "integrity": "sha512-nt5kWQj9xmNmIMzueKJlNrM2MYo9zfPwUqo6haF/F1DsNK5LeIzrCqDaamAv+kfsiK6Y40d/jO5B6ukHG2qD+w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ethersproject/abi": "^5.5.0", "@ethersproject/rlp": "^5.5.0", @@ -9648,8 +9177,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/abi": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", - "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", "dev": true, "funding": [ { @@ -9661,6 +9188,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -9675,8 +9203,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/abstract-provider": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", - "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", "dev": true, "funding": [ { @@ -9688,6 +9214,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9700,8 +9227,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/abstract-signer": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", - "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", "dev": true, "funding": [ { @@ -9713,6 +9238,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -9723,8 +9249,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/address": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", - "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", "dev": true, "funding": [ { @@ -9736,6 +9260,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9746,8 +9271,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/base64": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", - "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", "dev": true, "funding": [ { @@ -9759,14 +9282,13 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0" } }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/hash": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", - "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", "dev": true, "funding": [ { @@ -9778,6 +9300,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -9792,8 +9315,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/networks": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", - "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", "dev": true, "funding": [ { @@ -9805,14 +9326,13 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/properties": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", - "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", "dev": true, "funding": [ { @@ -9824,14 +9344,13 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/rlp": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", - "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", "dev": true, "funding": [ { @@ -9843,6 +9362,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -9850,8 +9370,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/signing-key": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", - "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", "dev": true, "funding": [ { @@ -9863,6 +9381,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0", @@ -9874,8 +9393,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/transactions": { "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", - "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", "dev": true, "funding": [ { @@ -9887,6 +9404,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -9901,8 +9419,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/web": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", - "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", "dev": true, "funding": [ { @@ -9914,6 +9430,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@ethersproject/base64": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9923,10 +9440,9 @@ } }, "node_modules/@ledgerhq/hw-app-eth/node_modules/axios": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", - "integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", + "version": "1.6.5", "dev": true, + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.4", "form-data": "^4.0.0", @@ -9935,8 +9451,6 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/follow-redirects": { "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -9944,6 +9458,7 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -9955,9 +9470,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/form-data": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -9969,9 +9483,8 @@ }, "node_modules/@ledgerhq/hw-transport": { "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.30.2.tgz", - "integrity": "sha512-iTB0cwQaISvUXwrnPOLAmPoAOMvW14XmtKsuQce0qYJZC/1/eUPNFu6sOD8X0qUBbMfWhre8X9AmMuWTPQH3lA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ledgerhq/devices": "^8.2.0", "@ledgerhq/errors": "^6.16.1", @@ -9981,9 +9494,8 @@ }, "node_modules/@ledgerhq/hw-transport-mocker": { "version": "6.28.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-mocker/-/hw-transport-mocker-6.28.2.tgz", - "integrity": "sha512-sR/J+yDOM1uFdoTUpUWFVwsv8DQpbFxshYqb6gjp/lwOosSCZyztDc0i8+CwLAe+fze2QqKlsqie6bnGNE35NQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ledgerhq/hw-transport": "^6.30.2", "@ledgerhq/logs": "^6.12.0", @@ -9992,9 +9504,8 @@ }, "node_modules/@ledgerhq/hw-transport-node-hid": { "version": "6.28.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.28.2.tgz", - "integrity": "sha512-6PaW+eNdIbVt0BWJId8g9xyIYwScGRGmLUDYyfY6Ws+KTtqYeVjOhrgGT0nVUuF767zvTOOW9Nfl8f0Yvx4kLQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ledgerhq/devices": "^8.2.0", "@ledgerhq/errors": "^6.16.1", @@ -10008,9 +9519,8 @@ }, "node_modules/@ledgerhq/hw-transport-node-hid-noevents": { "version": "6.29.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.29.2.tgz", - "integrity": "sha512-bVRHCWxSTwIW5AQFqMrqg45U6Ae1IdF1eCDMGDg1bHzgOOHGtWrhdMf3GatUVI9FO3l0khYdGuRbheSfantjJg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ledgerhq/devices": "^8.2.0", "@ledgerhq/errors": "^6.16.1", @@ -10021,18 +9531,16 @@ }, "node_modules/@ledgerhq/hw-transport/node_modules/events": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.x" } }, "node_modules/@ledgerhq/live-env": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/live-env/-/live-env-0.9.0.tgz", - "integrity": "sha512-IRRyYw17Bc5TepOY1c0E1fG9YaCD7Mjl8SCn6VGhGtH932nJkqaGwPqJnrFhFjHXDx4unMSYedmMRWoaR2j0+Q==", "dev": true, + "license": "Apache-2.0", "dependencies": { "rxjs": "^7.8.1", "utility-types": "^3.10.0" @@ -10040,9 +9548,8 @@ }, "node_modules/@ledgerhq/live-network": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/@ledgerhq/live-network/-/live-network-1.1.11.tgz", - "integrity": "sha512-TamiftFWGC8tPkDNv1xSWtPxEbpu5xCmTbmXo9QD+pjjCApWqukuaJeNrW7VkkRYWdY7K8HA4Jz/PgPllNKs5A==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ledgerhq/errors": "^6.16.1", "@ledgerhq/live-env": "^0.9.0", @@ -10055,17 +9562,14 @@ }, "node_modules/@ledgerhq/live-network/node_modules/axios": { "version": "0.26.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", - "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "dev": true, + "license": "MIT", "dependencies": { "follow-redirects": "^1.14.8" } }, "node_modules/@ledgerhq/live-network/node_modules/follow-redirects": { "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -10073,6 +9577,7 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -10084,33 +9589,29 @@ }, "node_modules/@ledgerhq/live-network/node_modules/lru-cache": { "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, + "license": "ISC", "engines": { "node": ">=12" } }, "node_modules/@ledgerhq/live-promise": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@ledgerhq/live-promise/-/live-promise-0.0.3.tgz", - "integrity": "sha512-/49dRz5XoxUw4TFq0kytU2Vz9w+FoGgG28U8RH9nuUWVPjVhAPvhY/QXUQA+7qqaorEIAYPHF0Rappalawhr+g==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@ledgerhq/logs": "^6.12.0" } }, "node_modules/@ledgerhq/logs": { "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-6.12.0.tgz", - "integrity": "sha512-ExDoj1QV5eC6TEbMdLUMMk9cfvNKhhv5gXol4SmULRVCx/3iyCPhJ74nsb3S0Vb+/f+XujBEj3vQn5+cwS0fNA==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/@ledgerhq/types-live": { "version": "6.44.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/types-live/-/types-live-6.44.0.tgz", - "integrity": "sha512-WFXLHsgAm+rJ5oxCl5c+Cr0lNVsX0av0wctEQjLZUF2FSWFvAiqmGMLUd5B0NsLhJaQYFw+iFo7C178DRfoh3w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "bignumber.js": "^9.1.2", "rxjs": "^7.8.1" @@ -10118,13 +9619,11 @@ }, "node_modules/@lit-labs/ssr-dom-shim": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz", - "integrity": "sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g==" + "license": "BSD-3-Clause" }, "node_modules/@lit/reactive-element": { "version": "1.6.3", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.6.3.tgz", - "integrity": "sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ==", + "license": "BSD-3-Clause", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.0.0" } @@ -10384,8 +9883,7 @@ }, "node_modules/@mongodb-js/saslprep": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.4.tgz", - "integrity": "sha512-8zJ8N1x51xo9hwPh6AWnKdLGEC5N3lDa6kms1YHmFBoRhTpJR6HG8wWk0td1MVCu9cD4YBrvjZEtd5Obw0Fbnw==", + "license": "MIT", "dependencies": { "sparse-bitfield": "^3.0.3" } @@ -10463,8 +9961,7 @@ }, "node_modules/@multiformats/base-x": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@multiformats/base-x/-/base-x-4.0.1.tgz", - "integrity": "sha512-eMk0b9ReBbV23xXU693TAIrLyeO5iTgBZGSJfpqriG8UkYvr/hC9u9pyMlAakDNHWmbhMZCDs6KQO0jzKD8OTw==" + "license": "MIT" }, "node_modules/@multiformats/murmur3": { "version": "1.1.3", @@ -10643,8 +10140,7 @@ }, "node_modules/@noble/ciphers": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-0.4.1.tgz", - "integrity": "sha512-QCOA9cgf3Rc33owG0AYBB9wszz+Ul2kramWN8tXG44Gyciud/tbkEqvxRF/IpqQaBpRBNi9f4jdNxqB2CQCIXg==", + "license": "MIT", "funding": { "url": "https://paulmillr.com/funding/" } @@ -11209,9 +10705,8 @@ }, "node_modules/@oclif/core": { "version": "1.26.2", - "resolved": "https://registry.npmjs.org/@oclif/core/-/core-1.26.2.tgz", - "integrity": "sha512-6jYuZgXvHfOIc9GIaS4T3CIKGTjPmfAxuMcbCbMRKJJl4aq/4xeRlEz0E8/hz8HxvxZBGvN2GwAUHlrGWQVrVw==", "dev": true, + "license": "MIT", "dependencies": { "@oclif/linewrap": "^1.0.0", "@oclif/screen": "^3.0.4", @@ -11248,9 +10743,8 @@ }, "node_modules/@oclif/core/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -11263,9 +10757,8 @@ }, "node_modules/@oclif/core/node_modules/chalk": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -11279,9 +10772,8 @@ }, "node_modules/@oclif/core/node_modules/chalk/node_modules/supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -11291,9 +10783,8 @@ }, "node_modules/@oclif/core/node_modules/clean-stack": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz", - "integrity": "sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==", "dev": true, + "license": "MIT", "dependencies": { "escape-string-regexp": "4.0.0" }, @@ -11306,9 +10797,8 @@ }, "node_modules/@oclif/core/node_modules/fs-extra": { "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, + "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -11321,9 +10811,8 @@ }, "node_modules/@oclif/core/node_modules/js-yaml": { "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -11334,9 +10823,8 @@ }, "node_modules/@oclif/core/node_modules/jsonfile": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -11346,9 +10834,8 @@ }, "node_modules/@oclif/core/node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -11358,9 +10845,8 @@ }, "node_modules/@oclif/core/node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -11373,24 +10859,21 @@ }, "node_modules/@oclif/core/node_modules/tslib": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@oclif/core/node_modules/universalify": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.0.0" } }, "node_modules/@oclif/core/node_modules/widest-line": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", "dev": true, + "license": "MIT", "dependencies": { "string-width": "^4.0.0" }, @@ -11400,9 +10883,8 @@ }, "node_modules/@oclif/core/node_modules/wrap-ansi": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -11417,21 +10899,18 @@ }, "node_modules/@oclif/core/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@oclif/linewrap": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz", - "integrity": "sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@oclif/plugin-help": { "version": "5.2.20", - "resolved": "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-5.2.20.tgz", - "integrity": "sha512-u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ==", "dev": true, + "license": "MIT", "dependencies": { "@oclif/core": "^2.15.0" }, @@ -11441,9 +10920,8 @@ }, "node_modules/@oclif/plugin-help/node_modules/@oclif/core": { "version": "2.15.0", - "resolved": "https://registry.npmjs.org/@oclif/core/-/core-2.15.0.tgz", - "integrity": "sha512-fNEMG5DzJHhYmI3MgpByTvltBOMyFcnRIUMxbiz2ai8rhaYgaTHMG3Q38HcosfIvtw9nCjxpcQtC8MN8QtVCcA==", "dev": true, + "license": "MIT", "dependencies": { "@types/cli-progress": "^3.11.0", "ansi-escapes": "^4.3.2", @@ -11480,9 +10958,8 @@ }, "node_modules/@oclif/plugin-help/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -11495,9 +10972,8 @@ }, "node_modules/@oclif/plugin-help/node_modules/chalk": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -11511,9 +10987,8 @@ }, "node_modules/@oclif/plugin-help/node_modules/chalk/node_modules/supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -11523,9 +10998,8 @@ }, "node_modules/@oclif/plugin-help/node_modules/clean-stack": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz", - "integrity": "sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==", "dev": true, + "license": "MIT", "dependencies": { "escape-string-regexp": "4.0.0" }, @@ -11538,9 +11012,8 @@ }, "node_modules/@oclif/plugin-help/node_modules/js-yaml": { "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -11551,9 +11024,8 @@ }, "node_modules/@oclif/plugin-help/node_modules/slice-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -11568,15 +11040,13 @@ }, "node_modules/@oclif/plugin-help/node_modules/tslib": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@oclif/plugin-help/node_modules/widest-line": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", "dev": true, + "license": "MIT", "dependencies": { "string-width": "^4.0.0" }, @@ -11586,15 +11056,13 @@ }, "node_modules/@oclif/plugin-help/node_modules/wordwrap": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@oclif/plugin-help/node_modules/wrap-ansi": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -11609,9 +11077,8 @@ }, "node_modules/@oclif/screen": { "version": "3.0.8", - "resolved": "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.8.tgz", - "integrity": "sha512-yx6KAqlt3TAHBduS2fMQtJDL2ufIHnDRArrJEOoTTuizxqmjLT+psGYOHpmMl3gvQpFJ11Hs76guUUktzAF9Bg==", "dev": true, + "license": "MIT", "engines": { "node": ">=12.0.0" } @@ -12753,9 +12220,8 @@ }, "node_modules/@pkgr/core": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.0.tgz", - "integrity": "sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ==", "dev": true, + "license": "MIT", "engines": { "node": "^12.20.0 || ^14.18.0 || >=16.0.0" }, @@ -13197,8 +12663,7 @@ }, "node_modules/@polka/url": { "version": "1.0.0-next.24", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz", - "integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==" + "license": "MIT" }, "node_modules/@project-serum/anchor": { "version": "0.24.1", @@ -13674,8 +13139,7 @@ }, "node_modules/@radix-ui/react-slot": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz", - "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.13.10", "@radix-ui/react-compose-refs": "1.0.1" @@ -16860,9 +16324,8 @@ }, "node_modules/@rollup/plugin-virtual": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-3.0.2.tgz", - "integrity": "sha512-10monEYsBp3scM4/ND4LNH5Rxvh3e/cVeL3jWTgZ2SrQ+BmUoQcopVQvnaMcOnykb1VkxUFuDAN+0FnpTFRy2A==", "dev": true, + "license": "MIT", "engines": { "node": ">=14.0.0" }, @@ -16896,171 +16359,26 @@ "dev": true, "license": "MIT" }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.3.0.tgz", - "integrity": "sha512-/4pns6BYi8MXdwnXM44yoGAcFYVHL/BYlB2q1HXZ6AzH++LaiEVWFpBWQ/glXhbMbv3E3o09igrHFbP/snhAvA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.3.0.tgz", - "integrity": "sha512-nLO/JsL9idr416vzi3lHm3Xm+QZh4qHij8k3Er13kZr5YhL7/+kBAx84kDmPc7HMexLmwisjDCeDIKNFp8mDlQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, "node_modules/@rollup/rollup-darwin-arm64": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.3.0.tgz", - "integrity": "sha512-dGhVBlllt4iHwTGy21IEoMOTN5wZoid19zEIxsdY29xcEiOEHqzDa7Sqrkh5OE7LKCowL61eFJXxYe/+pYa7ZQ==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ] }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.3.0.tgz", - "integrity": "sha512-h8wRfHeLEbU3NzaP1Oku7BYXCJQiTRr+8U0lklyOQXxXiEpHLL8tk1hFl+tezoRKLcPJD7joKaK74ASsqt3Ekg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.3.0.tgz", - "integrity": "sha512-wP4VgR/gfV18sylTuym3sxRTkAgUR2vh6YLeX/GEznk5jCYcYSlx585XlcUcl0c8UffIZlRJ09raWSX3JDb4GA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.3.0.tgz", - "integrity": "sha512-v/14JCYVkqRSJeQbxFx4oUkwVQQw6lFMN7bd4vuARBc3X2lmomkxBsc+BFiIDL/BK+CTx5AOh/k9XmqDnKWRVg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.3.0.tgz", - "integrity": "sha512-tNhfYqFH5OxtRzfkTOKdgFYlPSZnlDLNW4+leNEvQZhwTJxoTwsZAAhR97l3qVry/kkLyJPBK+Q8EAJLPinDIg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.3.0.tgz", - "integrity": "sha512-pw77m8QywdsoFdFOgmc8roF1inBI0rciqzO8ffRUgLoq7+ee9o5eFqtEcS6hHOOplgifAUUisP8cAnwl9nUYPw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.3.0.tgz", - "integrity": "sha512-tJs7v2MnV2F8w6X1UpPHl/43OfxjUy9SuJ2ZPoxn79v9vYteChVYO/ueLHCpRMmyTUIVML3N9z4azl9ENH8Xxg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.3.0.tgz", - "integrity": "sha512-OKGxp6kATQdTyI2DF+e9s+hB3/QZB45b6e+dzcfW1SUqiF6CviWyevhmT4USsMEdP3mlpC9zxLz3Oh+WaTMOSw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.3.0.tgz", - "integrity": "sha512-DDZ5AH68JJ2ClQFEA1aNnfA7Ybqyeh0644rGbrLOdNehTmzfICHiWSn0OprzYi9HAshTPQvlwrM+bi2kuaIOjQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.3.0.tgz", - "integrity": "sha512-dMvGV8p92GQ8jhNlGIKpyhVZPzJlT258pPrM5q2F8lKcc9Iv9BbfdnhX1OfinYWnb9ms5zLw6MlaMnqLfUkKnQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/@rushstack/eslint-patch": { "version": "1.5.1", "license": "MIT" }, "node_modules/@scarf/scarf": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.3.0.tgz", - "integrity": "sha512-lHKK8M5CTcpFj2hZDB3wIjb0KAbEOgDmiJGDv1WBRfQgRm/a8/XMEkG/N1iM01xgbUDsPQwi42D+dFo1XPAKew==", - "hasInstallScript": true + "hasInstallScript": true, + "license": "Apache-2.0" }, "node_modules/@scure/base": { "version": "1.1.1", @@ -17117,8 +16435,7 @@ }, "node_modules/@self.id/3box-legacy": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@self.id/3box-legacy/-/3box-legacy-0.3.0.tgz", - "integrity": "sha512-RHCnKyouQrPb0k1RaoyydENK0ELIXFGWZvmM3G4NQ7/XqmiF/EGShkGKxmf8Dj2zPLN55FSAgQNdxYUlyKKMTg==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "cross-fetch": "^3.1.4" }, @@ -17128,8 +16445,7 @@ }, "node_modules/@self.id/core": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@self.id/core/-/core-0.4.1.tgz", - "integrity": "sha512-sczQxU4iujPk0G8qhEi+++QZ3wFk0HOK/PbLwMRA+N8V8fMM2ujQO6MassX4DfpqtB6DWILO2WAlxPp8VmCEFA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ceramicnetwork/3id-did-resolver": "^2.0.0", "@ceramicnetwork/http-client": "^2.0.0", @@ -17204,8 +16520,7 @@ }, "node_modules/@sentry-internal/tracing": { "version": "7.65.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.65.0.tgz", - "integrity": "sha512-TEYkiq5vKr1Y79YIu+UYr1sO3vEMttQOBsOZLziDbqiC7TvKUARBR4W5XWfb9qBVDeon87EFNKluW0/+7rzYWw==", + "license": "MIT", "dependencies": { "@sentry/core": "7.65.0", "@sentry/types": "7.65.0", @@ -17218,8 +16533,7 @@ }, "node_modules/@sentry/browser": { "version": "7.65.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.65.0.tgz", - "integrity": "sha512-TUzZPAXNJ/Y1yakFODYhsEtdDpLdkgjTfrx5i9MOnXQLrcRR0C4TC1KitqbP6Tv7Xha9WiR0TDZkh7gS/9RxEA==", + "license": "MIT", "dependencies": { "@sentry-internal/tracing": "7.65.0", "@sentry/core": "7.65.0", @@ -17234,8 +16548,7 @@ }, "node_modules/@sentry/cli": { "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.23.0.tgz", - "integrity": "sha512-xFTv7YOaKWMCSPgN8A1jZpxJQhwdES89pqMTWjJOgjmkwFvziuaTM7O7kazps/cACDhJp2lK2j6AT6imhr4t9w==", + "license": "BSD-3-Clause", "dependencies": { "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.7", @@ -17261,8 +16574,7 @@ }, "node_modules/@sentry/cli-darwin": { "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.23.0.tgz", - "integrity": "sha512-tWuTxvb6P5pA0E+O1/7jKQ6AP45DOOW+BAd7mwBMHZ+5xG3nsvvrRS9hOIzBNPTeB2RyIEXgpQ2Mb6NdD21DBQ==", + "license": "BSD-3-Clause", "optional": true, "os": [ "darwin" @@ -17271,106 +16583,9 @@ "node": ">=10" } }, - "node_modules/@sentry/cli-linux-arm": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.23.0.tgz", - "integrity": "sha512-1R8ngBDKtPw++Km6VnVTx76ndrBL9BuBBNpF9TUCGftK3ArdaifqoIx8cZ8aKu8sWXLAKO7lHzxL4BNPZvlDiw==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "linux", - "freebsd" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@sentry/cli-linux-arm64": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.23.0.tgz", - "integrity": "sha512-KsOckP+b0xAzrRuoP4eiqJ6ASD6SqIplL8BCHOAODQfvWn9rgNwsJWOgKlWwfrJnkJYkpWVYvYeyx0oeUx3N0g==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux", - "freebsd" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@sentry/cli-linux-i686": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.23.0.tgz", - "integrity": "sha512-KRqB98KstBkKh33ZqUq+q8O0U4c01aTWCNPpVrqAX7zikSk0AAJTG8eAtqwDSx949IkKUl8xa6PFLfz+Nb2EMQ==", - "cpu": [ - "x86", - "ia32" - ], - "optional": true, - "os": [ - "linux", - "freebsd" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@sentry/cli-linux-x64": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.23.0.tgz", - "integrity": "sha512-USHZ0zzg9qujGYAyRjLeUfLDZOMgNjCr82m0BSBMmlFs4oKwHmO6bSvdi9UzNNcpmkOavNAdUM4jnZWk11i46Q==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux", - "freebsd" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@sentry/cli-win32-i686": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.23.0.tgz", - "integrity": "sha512-lS/B3pONDl18IEu/I//3vcMnosThobyXpqfAm4WYUtFTiw/wwDHgwGgaIjZWm5wMRkPFzYoRFpZfPlUrJd/4cQ==", - "cpu": [ - "x86", - "ia32" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@sentry/cli-win32-x64": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.23.0.tgz", - "integrity": "sha512-7LP6wA3w93ViYKQR8tMN2i/SfpQzaXqM2SAHI3yfJ3bdREHOV3+/N0mNiWVRvgL0TKNQJS42v2IILLhiDxufHQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=10" - } - }, "node_modules/@sentry/cli/node_modules/node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -17388,18 +16603,15 @@ }, "node_modules/@sentry/cli/node_modules/tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "license": "MIT" }, "node_modules/@sentry/cli/node_modules/webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "license": "BSD-2-Clause" }, "node_modules/@sentry/cli/node_modules/whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -17407,8 +16619,7 @@ }, "node_modules/@sentry/core": { "version": "7.65.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.65.0.tgz", - "integrity": "sha512-EwZABW8CtAbRGXV69FqeCqcNApA+Jbq308dko0W+MFdFe+9t2RGubUkpPxpJcbWy/dN2j4LiuENu1T7nWn0ZAQ==", + "license": "MIT", "dependencies": { "@sentry/types": "7.65.0", "@sentry/utils": "7.65.0", @@ -17420,8 +16631,7 @@ }, "node_modules/@sentry/hub": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.2.5.tgz", - "integrity": "sha512-YlEFdEhcfqpl2HC+/dWXBsBJEljyMzFS7LRRjCk8QANcOdp9PhwQjwebUB4/ulOBjHPP2WZk7fBBd/IKDasTUg==", + "license": "BSD-3-Clause", "dependencies": { "@sentry/types": "6.2.5", "@sentry/utils": "6.2.5", @@ -17433,16 +16643,14 @@ }, "node_modules/@sentry/hub/node_modules/@sentry/types": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.5.tgz", - "integrity": "sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w==", + "license": "BSD-3-Clause", "engines": { "node": ">=6" } }, "node_modules/@sentry/hub/node_modules/@sentry/utils": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.5.tgz", - "integrity": "sha512-fJoLUZHrd5MPylV1dT4qL74yNFDl1Ur/dab+pKNSyvnHPnbZ/LRM7aJ8VaRY/A7ZdpRowU+E14e/Yeem2c6gtQ==", + "license": "BSD-3-Clause", "dependencies": { "@sentry/types": "6.2.5", "tslib": "^1.9.3" @@ -17453,8 +16661,7 @@ }, "node_modules/@sentry/integrations": { "version": "7.65.0", - "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.65.0.tgz", - "integrity": "sha512-9b54p0UrkWe9+RAWWTObJQ2k/uStqaUj7BkNFyuaxfKQ4IZViqc4Sa7d7zX2X1oynGNL3ic7iqcgVTh7NvNsAQ==", + "license": "MIT", "dependencies": { "@sentry/types": "7.65.0", "@sentry/utils": "7.65.0", @@ -17467,8 +16674,7 @@ }, "node_modules/@sentry/minimal": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.2.5.tgz", - "integrity": "sha512-RKP4Qx3p7Cv0oX1cPKAkNVFYM7p2k1t32cNk1+rrVQS4hwlJ7Eg6m6fsqsO+85jd6Ne/FnyYsfo9cDD3ImTlWQ==", + "license": "BSD-3-Clause", "dependencies": { "@sentry/hub": "6.2.5", "@sentry/types": "6.2.5", @@ -17480,16 +16686,14 @@ }, "node_modules/@sentry/minimal/node_modules/@sentry/types": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.5.tgz", - "integrity": "sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w==", + "license": "BSD-3-Clause", "engines": { "node": ">=6" } }, "node_modules/@sentry/node": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.2.5.tgz", - "integrity": "sha512-/iM3khzGnUH713VFhZBAEYJhb/saEQSVz7Udogml+O7mFQ4rutnwJhgoGcB9YYrwMv2m7qOSszkdZbemDV6k2g==", + "license": "BSD-3-Clause", "dependencies": { "@sentry/core": "6.2.5", "@sentry/hub": "6.2.5", @@ -17507,8 +16711,7 @@ }, "node_modules/@sentry/node/node_modules/@sentry/core": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.2.5.tgz", - "integrity": "sha512-I+AkgIFO6sDUoHQticP6I27TT3L+i6TUS03in3IEtpBcSeP2jyhlxI8l/wdA7gsBqUPdQ4GHOOaNgtFIcr8qag==", + "license": "BSD-3-Clause", "dependencies": { "@sentry/hub": "6.2.5", "@sentry/minimal": "6.2.5", @@ -17522,16 +16725,14 @@ }, "node_modules/@sentry/node/node_modules/@sentry/types": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.5.tgz", - "integrity": "sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w==", + "license": "BSD-3-Clause", "engines": { "node": ">=6" } }, "node_modules/@sentry/node/node_modules/@sentry/utils": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.5.tgz", - "integrity": "sha512-fJoLUZHrd5MPylV1dT4qL74yNFDl1Ur/dab+pKNSyvnHPnbZ/LRM7aJ8VaRY/A7ZdpRowU+E14e/Yeem2c6gtQ==", + "license": "BSD-3-Clause", "dependencies": { "@sentry/types": "6.2.5", "tslib": "^1.9.3" @@ -17542,8 +16743,7 @@ }, "node_modules/@sentry/react": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.81.1.tgz", - "integrity": "sha512-kk0plP/mf8KgVLOiImIpp1liYysmh3Un8uXcVAToomSuHZPGanelFAdP0XhY+0HlWU9KIfxTjhMte1iSwQ8pYw==", + "license": "MIT", "dependencies": { "@sentry/browser": "7.81.1", "@sentry/types": "7.81.1", @@ -17559,8 +16759,7 @@ }, "node_modules/@sentry/react-native": { "version": "5.15.2", - "resolved": "https://registry.npmjs.org/@sentry/react-native/-/react-native-5.15.2.tgz", - "integrity": "sha512-X9yYdgIvVloR4WUrX8zSU0SXbmqY5Yq1W68TT2xe4LyKpWYJHFFbeJUaFAXFn65JXOSJvjEpEFYYyGJ9dzQ9rg==", + "license": "MIT", "dependencies": { "@sentry/browser": "7.81.1", "@sentry/cli": "2.23.0", @@ -17578,8 +16777,7 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry-internal/tracing": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.81.1.tgz", - "integrity": "sha512-E5xm27xrLXL10knH2EWDQsQYh5nb4SxxZzJ3sJwDGG9XGKzBdlp20UUhKqx00wixooVX9uCj3e4Jg8SvNB1hKg==", + "license": "MIT", "dependencies": { "@sentry/core": "7.81.1", "@sentry/types": "7.81.1", @@ -17591,8 +16789,7 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/browser": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.81.1.tgz", - "integrity": "sha512-DNtS7bZEnFPKVoGazKs5wHoWC0FwsOFOOMNeDvEfouUqKKbjO7+RDHbr7H6Bo83zX4qmZWRBf8V+3n3YPIiJFw==", + "license": "MIT", "dependencies": { "@sentry-internal/tracing": "7.81.1", "@sentry/core": "7.81.1", @@ -17606,8 +16803,7 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/core": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.81.1.tgz", - "integrity": "sha512-tU37yAmckOGCw/moWKSwekSCWWJP15O6luIq+u7wal22hE88F3Vc5Avo8SeF3upnPR+4ejaOFH+BJTr6bgrs6Q==", + "license": "MIT", "dependencies": { "@sentry/types": "7.81.1", "@sentry/utils": "7.81.1" @@ -17618,8 +16814,7 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/hub": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-7.81.1.tgz", - "integrity": "sha512-25cvsI3HKiRLJBZGFC8ntuy7/yB8M1w8YLTjr3tIqydYmjFUX7f18w0iuWEtd204d8OQSPBJDapbGMdfkE5x6w==", + "license": "MIT", "dependencies": { "@sentry/core": "7.81.1", "@sentry/types": "7.81.1", @@ -17631,8 +16826,7 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/integrations": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.81.1.tgz", - "integrity": "sha512-DN5ONn0/LX5HHVPf1EBGHFssIZaZmLgkqUIeMqCNYBpB4DiOrJANnGwTcWKDPphqhdPxjnPv9AGRLaU0PdvvZQ==", + "license": "MIT", "dependencies": { "@sentry/core": "7.81.1", "@sentry/types": "7.81.1", @@ -17645,8 +16839,7 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/replay": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.81.1.tgz", - "integrity": "sha512-4ueT0C4bYjngN/9p0fEYH10dTMLovHyk9HxJ6zSTgePvGVexhg+cSEHXisoBDwHeRZVnbIvsVM0NA7rmEDXJJw==", + "license": "MIT", "dependencies": { "@sentry-internal/tracing": "7.81.1", "@sentry/core": "7.81.1", @@ -17659,16 +16852,14 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/types": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.81.1.tgz", - "integrity": "sha512-dvJvGyctiaPMIQqa46k56Re5IODWMDxiHJ1UjBs/WYDLrmWFPGrEbyJ8w8CYLhYA+7qqrCyIZmHbWSTRIxstHw==", + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/@sentry/react-native/node_modules/@sentry/utils": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.81.1.tgz", - "integrity": "sha512-gq+MDXIirHKxNZ+c9/lVvCXd6y2zaZANujwlFggRH2u9SRiPaIXVilLpvMm4uJqmqBMEcY81ArujExtHvkbCqg==", + "license": "MIT", "dependencies": { "@sentry/types": "7.81.1" }, @@ -17678,8 +16869,7 @@ }, "node_modules/@sentry/react/node_modules/@sentry-internal/tracing": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.81.1.tgz", - "integrity": "sha512-E5xm27xrLXL10knH2EWDQsQYh5nb4SxxZzJ3sJwDGG9XGKzBdlp20UUhKqx00wixooVX9uCj3e4Jg8SvNB1hKg==", + "license": "MIT", "dependencies": { "@sentry/core": "7.81.1", "@sentry/types": "7.81.1", @@ -17691,8 +16881,7 @@ }, "node_modules/@sentry/react/node_modules/@sentry/browser": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.81.1.tgz", - "integrity": "sha512-DNtS7bZEnFPKVoGazKs5wHoWC0FwsOFOOMNeDvEfouUqKKbjO7+RDHbr7H6Bo83zX4qmZWRBf8V+3n3YPIiJFw==", + "license": "MIT", "dependencies": { "@sentry-internal/tracing": "7.81.1", "@sentry/core": "7.81.1", @@ -17706,8 +16895,7 @@ }, "node_modules/@sentry/react/node_modules/@sentry/core": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.81.1.tgz", - "integrity": "sha512-tU37yAmckOGCw/moWKSwekSCWWJP15O6luIq+u7wal22hE88F3Vc5Avo8SeF3upnPR+4ejaOFH+BJTr6bgrs6Q==", + "license": "MIT", "dependencies": { "@sentry/types": "7.81.1", "@sentry/utils": "7.81.1" @@ -17718,8 +16906,7 @@ }, "node_modules/@sentry/react/node_modules/@sentry/replay": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.81.1.tgz", - "integrity": "sha512-4ueT0C4bYjngN/9p0fEYH10dTMLovHyk9HxJ6zSTgePvGVexhg+cSEHXisoBDwHeRZVnbIvsVM0NA7rmEDXJJw==", + "license": "MIT", "dependencies": { "@sentry-internal/tracing": "7.81.1", "@sentry/core": "7.81.1", @@ -17732,16 +16919,14 @@ }, "node_modules/@sentry/react/node_modules/@sentry/types": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.81.1.tgz", - "integrity": "sha512-dvJvGyctiaPMIQqa46k56Re5IODWMDxiHJ1UjBs/WYDLrmWFPGrEbyJ8w8CYLhYA+7qqrCyIZmHbWSTRIxstHw==", + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/@sentry/react/node_modules/@sentry/utils": { "version": "7.81.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.81.1.tgz", - "integrity": "sha512-gq+MDXIirHKxNZ+c9/lVvCXd6y2zaZANujwlFggRH2u9SRiPaIXVilLpvMm4uJqmqBMEcY81ArujExtHvkbCqg==", + "license": "MIT", "dependencies": { "@sentry/types": "7.81.1" }, @@ -17751,8 +16936,7 @@ }, "node_modules/@sentry/replay": { "version": "7.65.0", - "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.65.0.tgz", - "integrity": "sha512-vhlk5F9RrhMQ+gOjNlLoWXamAPLNIT6wNII1O9ae+DRhZFmiUYirP5ag6dH5lljvNZndKl+xw+lJGJ3YdjXKlQ==", + "license": "MIT", "dependencies": { "@sentry/core": "7.65.0", "@sentry/types": "7.65.0", @@ -17764,8 +16948,7 @@ }, "node_modules/@sentry/tracing": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.2.5.tgz", - "integrity": "sha512-j/hM0BoHxfrNLxPeEJ5Vq4R34hO/TOHMEpLR3FdnunBXbsmjoKMMygIkPxnpML5XWtvukAehbwpDXldwMYz83w==", + "license": "MIT", "dependencies": { "@sentry/hub": "6.2.5", "@sentry/minimal": "6.2.5", @@ -17779,16 +16962,14 @@ }, "node_modules/@sentry/tracing/node_modules/@sentry/types": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.5.tgz", - "integrity": "sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w==", + "license": "BSD-3-Clause", "engines": { "node": ">=6" } }, "node_modules/@sentry/tracing/node_modules/@sentry/utils": { "version": "6.2.5", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.5.tgz", - "integrity": "sha512-fJoLUZHrd5MPylV1dT4qL74yNFDl1Ur/dab+pKNSyvnHPnbZ/LRM7aJ8VaRY/A7ZdpRowU+E14e/Yeem2c6gtQ==", + "license": "BSD-3-Clause", "dependencies": { "@sentry/types": "6.2.5", "tslib": "^1.9.3" @@ -17799,16 +16980,14 @@ }, "node_modules/@sentry/types": { "version": "7.65.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.65.0.tgz", - "integrity": "sha512-YYq7IDLLhpSBTmHoyWFtq/5ZDaEJ01r7xGuhB0aSIq33cm2I7im/B3ipzoOP/ukGZSIhuYVW9t531xZEO0+6og==", + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { "version": "7.65.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.65.0.tgz", - "integrity": "sha512-2JEBf4jzRSClhp+LJpX/E3QgHEeKvXqFMeNhmwQ07qqd6szhfH2ckYFj4gXk6YiGGY4Act3C6oxLfdZovG71bw==", + "license": "MIT", "dependencies": { "@sentry/types": "7.65.0", "tslib": "^2.4.1 || ^1.9.3" @@ -18461,8 +17640,7 @@ }, "node_modules/@socket.io/component-emitter": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", - "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" + "license": "MIT" }, "node_modules/@solana-mobile/mobile-wallet-adapter-protocol": { "version": "0.9.9", @@ -18534,9 +17712,8 @@ }, "node_modules/@solana/wallet-adapter-base": { "version": "0.9.23", - "resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.23.tgz", - "integrity": "sha512-apqMuYwFp1jFi55NxDfvXUX2x1T0Zh07MxhZ/nCCTGys5raSfYUh82zen2BLv8BSDj/JxZ2P/s7jrQZGrX8uAw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@solana/wallet-standard-features": "^1.1.0", "@wallet-standard/base": "^1.0.1", @@ -18552,9 +17729,8 @@ }, "node_modules/@solana/wallet-standard-features": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@solana/wallet-standard-features/-/wallet-standard-features-1.1.0.tgz", - "integrity": "sha512-oVyygxfYkkF5INYL0GuD8GFmNO/wd45zNesIqGCFE6X66BYxmI6HmyzQJCcZTZ0BNsezlVg4t+3MCL5AhfFoGA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@wallet-standard/base": "^1.0.1", "@wallet-standard/features": "^1.0.3" @@ -18647,16 +17823,14 @@ }, "node_modules/@stablelib/binary": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@stablelib/binary/-/binary-1.0.1.tgz", - "integrity": "sha512-ClJWvmL6UBM/wjkvv/7m5VP3GMr9t0osr4yVgLZsLCOz4hGN9gIAFEqnJ0TsSMAN+n840nf2cHZnA5/KFqHC7Q==", + "license": "MIT", "dependencies": { "@stablelib/int": "^1.0.1" } }, "node_modules/@stablelib/ed25519": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@stablelib/ed25519/-/ed25519-1.0.3.tgz", - "integrity": "sha512-puIMWaX9QlRsbhxfDc5i+mNPMY+0TmQEskunY1rZEBPi1acBCVQAhnsk/1Hk50DGPtVsZtAWQg4NHGlVaO9Hqg==", + "license": "MIT", "dependencies": { "@stablelib/random": "^1.0.2", "@stablelib/sha512": "^1.0.1", @@ -18665,18 +17839,15 @@ }, "node_modules/@stablelib/hash": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@stablelib/hash/-/hash-1.0.1.tgz", - "integrity": "sha512-eTPJc/stDkdtOcrNMZ6mcMK1e6yBbqRBaNW55XA1jU8w/7QdnCF0CmMmOD1m7VSkBR44PWrMHU2l6r8YEQHMgg==" + "license": "MIT" }, "node_modules/@stablelib/int": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@stablelib/int/-/int-1.0.1.tgz", - "integrity": "sha512-byr69X/sDtDiIjIV6m4roLVWnNNlRGzsvxw+agj8CIEazqWGOQp2dTYgQhtyVXV9wpO6WyXRQUzLV/JRNumT2w==" + "license": "MIT" }, "node_modules/@stablelib/random": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@stablelib/random/-/random-1.0.2.tgz", - "integrity": "sha512-rIsE83Xpb7clHPVRlBj8qNe5L8ISQOzjghYQm/dZ7VaM2KHYwMW5adjQjrzTZCchFnNCNhkwtnOBa9HTMJCI8w==", + "license": "MIT", "dependencies": { "@stablelib/binary": "^1.0.1", "@stablelib/wipe": "^1.0.1" @@ -18684,8 +17855,7 @@ }, "node_modules/@stablelib/sha256": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@stablelib/sha256/-/sha256-1.0.1.tgz", - "integrity": "sha512-GIIH3e6KH+91FqGV42Kcj71Uefd/QEe7Dy42sBTeqppXV95ggCcxLTk39bEr+lZfJmp+ghsR07J++ORkRELsBQ==", + "license": "MIT", "dependencies": { "@stablelib/binary": "^1.0.1", "@stablelib/hash": "^1.0.1", @@ -18694,8 +17864,7 @@ }, "node_modules/@stablelib/sha512": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@stablelib/sha512/-/sha512-1.0.1.tgz", - "integrity": "sha512-13gl/iawHV9zvDKciLo1fQ8Bgn2Pvf7OV6amaRVKiq3pjQ3UmEpXxWiAfV8tYjUpeZroBxtyrwtdooQT/i3hzw==", + "license": "MIT", "dependencies": { "@stablelib/binary": "^1.0.1", "@stablelib/hash": "^1.0.1", @@ -18704,22 +17873,19 @@ }, "node_modules/@stablelib/wipe": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@stablelib/wipe/-/wipe-1.0.1.tgz", - "integrity": "sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg==" + "license": "MIT" }, "node_modules/@stacks/common": { "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.10.0.tgz", - "integrity": "sha512-6x5Z7AKd9/kj3+DYE9xIDIkFLHihBH614i2wqrZIjN02WxVo063hWSjIlUxlx8P4gl6olVzlOy5LzhLJD9OP0A==", + "license": "MIT", "dependencies": { "@types/bn.js": "^5.1.0", "@types/node": "^18.0.4" } }, "node_modules/@stacks/encryption": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.11.2.tgz", - "integrity": "sha512-lkTlAmsmc8feLk57SVeTn08Z1brMX7kyxJ1KT02lAYvlhq34Hf/GoNLnHaowBRR6cExI2rAQYtOX162+mgJ5aQ==", + "version": "6.11.3", + "license": "MIT", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -18734,36 +17900,33 @@ }, "node_modules/@stacks/encryption/node_modules/@noble/hashes": { "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz", - "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } - ] + ], + "license": "MIT" }, "node_modules/@stacks/encryption/node_modules/@noble/secp256k1": { "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", - "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } - ] + ], + "license": "MIT" }, "node_modules/@stacks/encryption/node_modules/@scure/bip39": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz", - "integrity": "sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } ], + "license": "MIT", "dependencies": { "@noble/hashes": "~1.1.1", "@scure/base": "~1.1.0" @@ -18771,60 +17934,54 @@ }, "node_modules/@stacks/encryption/node_modules/base-x": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", - "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" + "license": "MIT" }, "node_modules/@stacks/encryption/node_modules/bs58": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz", - "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==", + "license": "MIT", "dependencies": { "base-x": "^4.0.0" } }, "node_modules/@stacks/network": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.10.0.tgz", - "integrity": "sha512-mbiZ8nlsyy77ndmBdaqhHXii22IFdK4ThRcOQs9j/O00DkAr04jCM4GV5Q+VLUnZ9OBoJq7yOV7Pf6jglh+0hw==", + "version": "6.11.3", + "license": "MIT", "dependencies": { "@stacks/common": "^6.10.0", "cross-fetch": "^3.1.5" } }, "node_modules/@stacks/transactions": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.11.2.tgz", - "integrity": "sha512-Ojz+8gEl0NcLNnlKqu2itLqqcdzH8zrkmyRUU2zcOJseKy6q7JID16wxMdEI8dSUcL7gxLYJzNMhx8BoI9CMPQ==", + "version": "6.11.3", + "license": "MIT", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", "@stacks/common": "^6.10.0", - "@stacks/network": "^6.10.0", + "@stacks/network": "^6.11.3", "c32check": "^2.0.0", "lodash.clonedeep": "^4.5.0" } }, "node_modules/@stacks/transactions/node_modules/@noble/hashes": { "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz", - "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } - ] + ], + "license": "MIT" }, "node_modules/@stacks/transactions/node_modules/@noble/secp256k1": { "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", - "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } - ] + ], + "license": "MIT" }, "node_modules/@storybook/addon-a11y": { "version": "7.4.0", @@ -35579,9 +34736,8 @@ }, "node_modules/@tanstack/eslint-plugin-query": { "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@tanstack/eslint-plugin-query/-/eslint-plugin-query-5.0.5.tgz", - "integrity": "sha512-kYbh5Cboz1BzN6LeUWnI1B0BCikXMYQjxaEO7cV+0rycllU0qZqSEkd2LdgWIZhuLTc4WBt0li1s+O6RhM5Cog==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/utils": "^5.54.0" }, @@ -35595,8 +34751,7 @@ }, "node_modules/@tanstack/query-core": { "version": "4.35.7", - "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.35.7.tgz", - "integrity": "sha512-PgDJtX75ubFS0WCYFM7DqEoJ4QbxU3S5OH3gJSI40xr7UVVax3/J4CM3XUMOTs+EOT5YGEfssi3tfRVGte4DEw==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -35604,8 +34759,7 @@ }, "node_modules/@tanstack/query-devtools": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.1.0.tgz", - "integrity": "sha512-EZhYS6clf4yyzFwE3b+7P2J46zgiweIwatc80MhfuzScz/Z4m1kPsKvNK0j54v4y1WvG4pN14qfOXjp4ac7f/Q==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -35613,8 +34767,7 @@ }, "node_modules/@tanstack/react-query": { "version": "4.35.7", - "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.35.7.tgz", - "integrity": "sha512-0MankquP/6EOM2ATfEov6ViiKemey5uTbjGlFMX1xGotwNaqC76YKDMJdHumZupPbZcZPWAeoPGEHQmVKIKoOQ==", + "license": "MIT", "dependencies": { "@tanstack/query-core": "4.35.7", "use-sync-external-store": "^1.2.0" @@ -35637,6 +34790,22 @@ } } }, + "node_modules/@tanstack/react-query-devtools": { + "version": "5.1.0", + "license": "MIT", + "dependencies": { + "@tanstack/query-devtools": "5.1.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "@tanstack/react-query": "^5.0.5", + "react": "^18.0.0", + "react-dom": "^18.0.0" + } + }, "node_modules/@terra-dev/browser-check": { "version": "2.5.3", "license": "Apache-2.0", @@ -36254,22 +35423,20 @@ }, "node_modules/@trpc/client": { "version": "10.38.4", - "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.38.4.tgz", - "integrity": "sha512-svpZ9Iq9cnn+XfXQZF8PMt1YxAtNYeGiKZ/pGpcume7RqJrra/kWwU41gbax8d/cAg3YKUgNft9dZFKMYtXuYw==", "funding": [ "https://trpc.io/sponsor" ], + "license": "MIT", "peerDependencies": { "@trpc/server": "10.38.4" } }, "node_modules/@trpc/react-query": { "version": "10.38.4", - "resolved": "https://registry.npmjs.org/@trpc/react-query/-/react-query-10.38.4.tgz", - "integrity": "sha512-wEreUn9E+ZMKn/oRWlhHzmSgG5SG9WpmE1F27PPjn3I0S92aYRQvVsmV43v2OAL1VUYP2aHLk7gXx2luKLLRyw==", "funding": [ "https://trpc.io/sponsor" ], + "license": "MIT", "peerDependencies": { "@tanstack/react-query": "^4.18.0", "@trpc/client": "10.38.4", @@ -36280,11 +35447,10 @@ }, "node_modules/@trpc/server": { "version": "10.38.4", - "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.38.4.tgz", - "integrity": "sha512-xSMTwnKA/Unxu5fbAkQ7cApHeWj1rTEA3XgrGDcPHn03fmeIidIKxronM46N46ZF4CCexey4JWzu89XxA16uIA==", "funding": [ "https://trpc.io/sponsor" - ] + ], + "license": "MIT" }, "node_modules/@truffle/blockchain-utils": { "version": "0.0.18", @@ -36960,8 +36126,8 @@ "license": "Apache-2.0", "dependencies": { "debug": "^2.2.0", - "es5-ext": "^0.10.50", - "nan": "^2.14.0", + "gulp": "^4.0.2", + "nan": "^2.11.0", "typedarray-to-buffer": "^3.1.5", "yaeti": "^0.0.6" }, @@ -38018,9 +37184,8 @@ }, "node_modules/@types/3box": { "version": "1.22.0", - "resolved": "https://registry.npmjs.org/@types/3box/-/3box-1.22.0.tgz", - "integrity": "sha512-IuB9Y1FaxIObBpiuEMwI6hNAhAjrJrXssMJowaOgWOmquICaMq5a1wlhOEgv9YDW/oK8WfAw8gXTCkj2K2O0lA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/acorn": { "version": "4.0.6", @@ -38161,36 +37326,32 @@ }, "node_modules/@types/cli-progress": { "version": "3.11.5", - "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.5.tgz", - "integrity": "sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/color": { "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@types/color/-/color-3.0.6.tgz", - "integrity": "sha512-NMiNcZFRUAiUUCCf7zkAelY8eV3aKqfbzyFQlXpPIEeoNDbsEHGpb854V3gzTsGKYj830I5zPuOwU/TP5/cW6A==", "dev": true, + "license": "MIT", "dependencies": { "@types/color-convert": "*" } }, "node_modules/@types/color-convert": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/color-convert/-/color-convert-2.0.3.tgz", - "integrity": "sha512-2Q6wzrNiuEvYxVQqhh7sXM2mhIhvZR/Paq4FdsQkOMgWsCIkKvSGj8Le1/XalulrmgOzPMqNa0ix+ePY4hTrfg==", "dev": true, + "license": "MIT", "dependencies": { "@types/color-name": "*" } }, "node_modules/@types/color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-87W6MJCKZYDhLAx/J1ikW8niMvmGRyY+rpUxWpL1cO7F8Uu5CHuQoFv+R0/L5pgNdW4jTyda42kv60uwVIPjLw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/compute-lcm": { "version": "1.1.1", @@ -38561,8 +37722,7 @@ }, "node_modules/@types/lodash-es": { "version": "4.17.12", - "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz", - "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", + "license": "MIT", "dependencies": { "@types/lodash": "*" } @@ -38633,9 +37793,8 @@ }, "node_modules/@types/node-cron": { "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@types/node-cron/-/node-cron-3.0.11.tgz", - "integrity": "sha512-0ikrnug3/IyneSHqCBeslAhlK2aBfYek1fGo4bP4QnZPmiqSGRK+Oy7ZMisLWkesffJvQ1cqAcBnJC+8+nxIAg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/node-fetch": { "version": "2.6.8", @@ -38807,8 +37966,7 @@ }, "node_modules/@types/react": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.0.tgz", - "integrity": "sha512-0FLj93y5USLHdnhIhABk83rm8XEGA7kH3cr+YUlvxoUGp1xNt/DINUMvqPxLyOQMzLmZe8i4RTHbvb8MC7NmrA==", + "license": "MIT", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -38835,9 +37993,8 @@ }, "node_modules/@types/react-dom": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-8yQrvS6sMpSwIovhPOwfyNf2Wz6v/B62LFSVYQ85+Rq3tLsBIG7rP5geMxaijTUxSkrO6RzN/IRuIAADYQsleA==", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } @@ -38927,9 +38084,8 @@ }, "node_modules/@types/react-tooltip": { "version": "3.11.0", - "resolved": "https://registry.npmjs.org/@types/react-tooltip/-/react-tooltip-3.11.0.tgz", - "integrity": "sha512-TkXMgkZ5aAKkFE9Wvt8OlOiPtF9ufgBOL9xWlRSzLBaoL12qSOBiyMcU4/8TyED1fuWkm5VTVarScwOPLSArYw==", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } @@ -39185,8 +38341,7 @@ }, "node_modules/@types/trusted-types": { "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", - "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==" + "license": "MIT" }, "node_modules/@types/tsscmp": { "version": "1.0.1", @@ -39194,8 +38349,7 @@ }, "node_modules/@types/ungap__global-this": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@types/ungap__global-this/-/ungap__global-this-0.3.3.tgz", - "integrity": "sha512-xQmbka2Nc/tILZsXWigqr60nniHaHCddbilYy2ozU9V5wBoNd6qhLXsdK4/7LzHRcod+setcpeWemcxfOj61Cg==" + "license": "MIT" }, "node_modules/@types/unist": { "version": "2.0.9", @@ -39203,9 +38357,8 @@ }, "node_modules/@types/url-join": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz", - "integrity": "sha512-awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/use-sync-external-store": { "version": "0.0.3", @@ -39224,9 +38377,8 @@ }, "node_modules/@types/w3c-web-usb": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@types/w3c-web-usb/-/w3c-web-usb-1.0.10.tgz", - "integrity": "sha512-CHgUI5kTc/QLMP8hODUHhge0D4vx+9UiAwIGiT0sTy/B2XpdX1U5rJt6JSISgr6ikRT7vxV9EVAFeYZqUnl1gQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/wait-on": { "version": "5.3.3", @@ -39238,8 +38390,7 @@ }, "node_modules/@types/webidl-conversions": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", - "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" + "license": "MIT" }, "node_modules/@types/webpack": { "version": "5.28.1", @@ -39257,8 +38408,7 @@ }, "node_modules/@types/whatwg-url": { "version": "11.0.4", - "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.4.tgz", - "integrity": "sha512-lXCmTWSHJvf0TRSO58nm978b8HJ/EdsSsEKLd3ODHFjo+3VGAyyTp4v50nWvwtzBxSMQrVOK7tcuN0zGPLICMw==", + "license": "MIT", "dependencies": { "@types/webidl-conversions": "*" } @@ -39291,8 +38441,7 @@ }, "node_modules/@types/zen-observable": { "version": "0.8.7", - "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.7.tgz", - "integrity": "sha512-LKzNTjj+2j09wAo/vvVjzgw5qckJJzhdGgWHW7j69QIGdq/KnZrMAMIHQiWGl3Ccflh5/CudBAntTPYdprPltA==" + "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "6.16.0", @@ -40003,8 +39152,7 @@ }, "node_modules/@ungap/global-this": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/@ungap/global-this/-/global-this-0.4.4.tgz", - "integrity": "sha512-mHkm6FvepJECMNthFuIgpAEFmPOk71UyXuIxYfjytvFTnSDBIz7jmViO+LfHI/AjrazWije0PnSP3+/NlwzqtA==" + "license": "ISC" }, "node_modules/@ungap/promise-all-settled": { "version": "1.1.2", @@ -40205,18 +39353,16 @@ }, "node_modules/@wallet-standard/base": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@wallet-standard/base/-/base-1.0.1.tgz", - "integrity": "sha512-1To3ekMfzhYxe0Yhkpri+Fedq0SYcfrOfJi3vbLjMwF2qiKPjTGLwZkf2C9ftdQmxES+hmxhBzTwF4KgcOwf8w==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=16" } }, "node_modules/@wallet-standard/features": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@wallet-standard/features/-/features-1.0.3.tgz", - "integrity": "sha512-m8475I6W5LTatTZuUz5JJNK42wFRgkJTB0I9tkruMwfqBF2UN2eomkYNVf9RbrsROelCRzSFmugqjKZBFaubsA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@wallet-standard/base": "^1.0.1" }, @@ -40864,8 +40010,7 @@ }, "node_modules/@wry/context": { "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.5.4.tgz", - "integrity": "sha512-/pktJKHUXDr4D6TJqWgudOPJW2Z+Nb+bqk40jufA3uTkLbnCRKdJPiYDIa/c7mfcPH8Hr6O8zjCERpg5Sq04Zg==", + "license": "MIT", "dependencies": { "tslib": "^1.14.1" }, @@ -40875,8 +40020,7 @@ }, "node_modules/@wry/equality": { "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.3.4.tgz", - "integrity": "sha512-1gQQhCPenzxw/1HzLlvSIs/59eBHJf9ZDIussjjZhqNSqQuPKQIzN6SWt4kemvlBPDi7RqMuUa03pId7MAE93g==", + "license": "MIT", "dependencies": { "tslib": "^1.14.1" }, @@ -40886,8 +40030,7 @@ }, "node_modules/@wry/trie": { "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@wry/trie/-/trie-0.2.2.tgz", - "integrity": "sha512-OxqBB39x6MfHaa2HpMiRMfhuUnQTddD32Ko020eBeJXq87ivX6xnSSnzKHVbA21p7iqBASz8n/07b6W5wW1BVQ==", + "license": "MIT", "dependencies": { "tslib": "^1.14.1" }, @@ -40963,16 +40106,14 @@ }, "node_modules/@yornaath/batshit": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@yornaath/batshit/-/batshit-0.9.0.tgz", - "integrity": "sha512-QdI1hQUPlpFT+o1iKLi9fQEKCli8c3UG7q4Ih8MP4jn+pyAjbfC4xaK5PwqSsSZgT0YeAZ0GWbbO9+1xAtWXlQ==", + "license": "MIT", "dependencies": { "@yornaath/batshit-devtools": "^1.6.0" } }, "node_modules/@yornaath/batshit-devtools": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@yornaath/batshit-devtools/-/batshit-devtools-1.6.0.tgz", - "integrity": "sha512-ckKxrdfuFSRFz54tYU+VkD1eZOOaxa92U4eKOPtlxc1itB12Cqb1Dmk8Rqv6mARxp8YvocVGKbccrXoCwH2Lew==" + "license": "MIT" }, "node_modules/@zeit/schemas": { "version": "2.6.0", @@ -41118,8 +40259,7 @@ }, "node_modules/add-px-to-style": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/add-px-to-style/-/add-px-to-style-1.0.0.tgz", - "integrity": "sha512-YMyxSlXpPjD8uWekCQGuN40lV4bnZagUwqa2m/uFv1z/tNImSk9fnXVMUI5qwME/zzI3MMQRvjZ+69zyfSSyew==" + "license": "MIT" }, "node_modules/address": { "version": "1.0.3", @@ -41933,6 +41073,721 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/armada-cli": { + "version": "0.4.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@ethersproject/constants": "^5.7.0", + "@ledgerhq/hw-app-eth": "^6.29.10", + "@ledgerhq/hw-transport-node-hid": "^6.27.6", + "@oclif/core": "^1.20.2", + "@oclif/plugin-help": "^5.1.17", + "ethers": "^5.7.1", + "inquirer": "^7.1.4", + "keytar": "^7.9.0", + "tar": "^6.1.11", + "yargs": "^17.6.0" + }, + "bin": { + "armada": "bin/run" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/abi": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/abstract-provider": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/networks": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/web": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/abstract-signer": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/address": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/rlp": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/base64": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/basex": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/properties": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/contracts": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abi": "^5.7.0", + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/transactions": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/hash": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/base64": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/hdnode": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/basex": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/pbkdf2": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/sha2": "^5.7.0", + "@ethersproject/signing-key": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/wordlists": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/json-wallets": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/hdnode": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/pbkdf2": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/random": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "aes-js": "3.0.0", + "scrypt-js": "3.0.1" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/networks": { + "version": "5.7.1", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/logger": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/pbkdf2": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/sha2": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/properties": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/logger": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/providers": { + "version": "5.7.2", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/base64": "^5.7.0", + "@ethersproject/basex": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/networks": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/random": "^5.7.0", + "@ethersproject/rlp": "^5.7.0", + "@ethersproject/sha2": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/web": "^5.7.0", + "bech32": "1.1.4", + "ws": "7.4.6" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/random": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/rlp": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/signing-key": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "bn.js": "^5.2.1", + "elliptic": "6.5.4", + "hash.js": "1.1.7" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/solidity": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/sha2": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/transactions": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/rlp": "^5.7.0", + "@ethersproject/signing-key": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/units": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/logger": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/wallet": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/hdnode": "^5.7.0", + "@ethersproject/json-wallets": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/random": "^5.7.0", + "@ethersproject/signing-key": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/wordlists": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/web": { + "version": "5.7.1", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/base64": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/@ethersproject/wordlists": { + "version": "5.7.0", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "node_modules/armada-cli/node_modules/aes-js": { + "version": "3.0.0", + "dev": true, + "license": "MIT" + }, + "node_modules/armada-cli/node_modules/ansi-styles": { + "version": "4.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/armada-cli/node_modules/bech32": { + "version": "1.1.4", + "dev": true, + "license": "MIT" + }, + "node_modules/armada-cli/node_modules/chalk": { + "version": "4.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/armada-cli/node_modules/ethers": { + "version": "5.7.2", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abi": "5.7.0", + "@ethersproject/abstract-provider": "5.7.0", + "@ethersproject/abstract-signer": "5.7.0", + "@ethersproject/address": "5.7.0", + "@ethersproject/base64": "5.7.0", + "@ethersproject/basex": "5.7.0", + "@ethersproject/bignumber": "5.7.0", + "@ethersproject/bytes": "5.7.0", + "@ethersproject/constants": "5.7.0", + "@ethersproject/contracts": "5.7.0", + "@ethersproject/hash": "5.7.0", + "@ethersproject/hdnode": "5.7.0", + "@ethersproject/json-wallets": "5.7.0", + "@ethersproject/keccak256": "5.7.0", + "@ethersproject/logger": "5.7.0", + "@ethersproject/networks": "5.7.1", + "@ethersproject/pbkdf2": "5.7.0", + "@ethersproject/properties": "5.7.0", + "@ethersproject/providers": "5.7.2", + "@ethersproject/random": "5.7.0", + "@ethersproject/rlp": "5.7.0", + "@ethersproject/sha2": "5.7.0", + "@ethersproject/signing-key": "5.7.0", + "@ethersproject/solidity": "5.7.0", + "@ethersproject/strings": "5.7.0", + "@ethersproject/transactions": "5.7.0", + "@ethersproject/units": "5.7.0", + "@ethersproject/wallet": "5.7.0", + "@ethersproject/web": "5.7.1", + "@ethersproject/wordlists": "5.7.0" + } + }, + "node_modules/armada-cli/node_modules/inquirer": { + "version": "7.3.3", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.19", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/armada-cli/node_modules/rxjs": { + "version": "6.6.7", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/armada-cli/node_modules/supports-color": { + "version": "7.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/armada-cli/node_modules/ws": { + "version": "7.4.6", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/arr-diff": { "version": "4.0.0", "dev": true, @@ -43216,8 +43071,7 @@ }, "node_modules/babel-plugin-emotion": { "version": "10.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz", - "integrity": "sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA==", + "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.0.0", "@emotion/hash": "0.8.0", @@ -43233,18 +43087,15 @@ }, "node_modules/babel-plugin-emotion/node_modules/@emotion/hash": { "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", - "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + "license": "MIT" }, "node_modules/babel-plugin-emotion/node_modules/@emotion/memoize": { "version": "0.7.4", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", - "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==" + "license": "MIT" }, "node_modules/babel-plugin-emotion/node_modules/@emotion/serialize": { "version": "0.11.16", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz", - "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==", + "license": "MIT", "dependencies": { "@emotion/hash": "0.8.0", "@emotion/memoize": "0.7.4", @@ -43255,18 +43106,15 @@ }, "node_modules/babel-plugin-emotion/node_modules/@emotion/unitless": { "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", - "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" + "license": "MIT" }, "node_modules/babel-plugin-emotion/node_modules/@emotion/utils": { "version": "0.11.3", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz", - "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==" + "license": "MIT" }, "node_modules/babel-plugin-emotion/node_modules/babel-plugin-macros": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz", - "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", "cosmiconfig": "^6.0.0", @@ -43275,8 +43123,7 @@ }, "node_modules/babel-plugin-emotion/node_modules/cosmiconfig": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", - "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", + "license": "MIT", "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.1.0", @@ -43290,13 +43137,11 @@ }, "node_modules/babel-plugin-emotion/node_modules/csstype": { "version": "2.6.21", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" + "license": "MIT" }, "node_modules/babel-plugin-emotion/node_modules/escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -44653,8 +44498,7 @@ }, "node_modules/bigint-mod-arith": { "version": "3.3.1", - "resolved": "https://registry.npmjs.org/bigint-mod-arith/-/bigint-mod-arith-3.3.1.tgz", - "integrity": "sha512-pX/cYW3dCa87Jrzv6DAr8ivbbJRzEX5yGhdt8IutnX/PCIXfpx+mabWNK/M8qqh+zQ0J3thftUBHW0ByuUlG0w==", + "license": "MIT", "engines": { "node": ">=10.4.0" } @@ -45260,8 +45104,7 @@ }, "node_modules/bson": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.2.0.tgz", - "integrity": "sha512-ID1cI+7bazPDyL9wYy9GaQ8gEEohWvcUl/Yf0dIdutJxnmInEEyCsb4awy/OiBfall7zBA179Pahi3vCdFze3Q==", + "license": "Apache-2.0", "engines": { "node": ">=16.20.1" } @@ -45670,8 +45513,7 @@ }, "node_modules/c32check": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/c32check/-/c32check-2.0.0.tgz", - "integrity": "sha512-rpwfAcS/CMqo0oCqDf3r9eeLgScRE3l/xHDCXhM3UyrfvIn7PrLq63uHh7yYbv8NzaZn5MVsVhIRpQ+5GZ5HyA==", + "license": "MIT", "dependencies": { "@noble/hashes": "^1.1.2", "base-x": "^4.0.0" @@ -45682,8 +45524,7 @@ }, "node_modules/c32check/node_modules/base-x": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", - "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" + "license": "MIT" }, "node_modules/c8": { "version": "7.14.0", @@ -46103,8 +45944,7 @@ }, "node_modules/caip": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/caip/-/caip-1.1.0.tgz", - "integrity": "sha512-yOO3Fu4ygyKYAdznuoaqschMKIZzcdgyMpBNtrIfrUhnOeaOWG+dh0c13wcOS6B/46IGGbncoyzJlio79jU7rw==" + "license": "MIT" }, "node_modules/call-bind": { "version": "1.0.5", @@ -46263,8 +46103,7 @@ }, "node_modules/canonicalize": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/canonicalize/-/canonicalize-2.0.0.tgz", - "integrity": "sha512-ulDEYPv7asdKvqahuAY35c1selLdzDwHqugK92hfkzvlDCwXRRelDkR+Er33md/PtnpqHemgkuDPanZ4fiYZ8w==" + "license": "Apache-2.0" }, "node_modules/canvas-fit": { "version": "1.5.0", @@ -46320,9 +46159,8 @@ }, "node_modules/cardinal": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz", - "integrity": "sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==", "dev": true, + "license": "MIT", "dependencies": { "ansicolors": "~0.3.2", "redeyed": "~2.1.0" @@ -46333,8 +46171,7 @@ }, "node_modules/cartonne": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cartonne/-/cartonne-2.2.0.tgz", - "integrity": "sha512-O1rA2AQKnposZJ7oT+GtCQpcv4kfs+gqkCs5rFLBfegP3K0nWNmHj5q4d8NlUxqe3EHvAddCci6WO+ogupl3MA==", + "license": "(Apache-2.0 AND MIT)", "dependencies": { "@ipld/dag-cbor": "^9.0.0", "multiformats": "^11.0.2", @@ -46344,8 +46181,7 @@ }, "node_modules/cartonne/node_modules/@ipld/dag-cbor": { "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.0.8.tgz", - "integrity": "sha512-ETWJ7p7lmGw5X+BuI/7rf4/k56xyOvAOVNUVuQmnGYBdJjObLPgS+vyFxRk4odATlkyZqCq2MLNY52bhE6SlRA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "cborg": "^4.0.0", "multiformats": "^13.0.0" @@ -46357,21 +46193,18 @@ }, "node_modules/cartonne/node_modules/@ipld/dag-cbor/node_modules/multiformats": { "version": "13.0.1", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.1.tgz", - "integrity": "sha512-bt3R5iXe2O8xpp3wkmQhC73b/lC4S2ihU8Dndwcsysqbydqb8N+bpP116qMcClZ17g58iSIwtXUTcg2zT4sniA==" + "license": "Apache-2.0 OR MIT" }, "node_modules/cartonne/node_modules/cborg": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/cborg/-/cborg-4.0.8.tgz", - "integrity": "sha512-/6QDK0Hw//cV4YNWZZjdIUMFNw0DZmb56jdVGJPwXP7874gSN0AMYqM07mVKpAm+6Nn7U8lvYFzPgBGatC+5xw==", + "license": "Apache-2.0", "bin": { "cborg": "lib/bin.js" } }, "node_modules/cartonne/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -46391,8 +46224,7 @@ }, "node_modules/cborg": { "version": "1.10.2", - "resolved": "https://registry.npmjs.org/cborg/-/cborg-1.10.2.tgz", - "integrity": "sha512-b3tFPA9pUr2zCUiCfRd2+wok2/LBSNUMKOuRRok+WlvvAgEt/PlbgPTsZUcwCOs53IJvLgTp0eotwtosE6njug==", + "license": "Apache-2.0", "bin": { "cborg": "cli.js" } @@ -46468,8 +46300,7 @@ }, "node_modules/change-emitter": { "version": "0.1.6", - "resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz", - "integrity": "sha512-YXzt1cQ4a2jqazhcuSWEOc1K2q8g9H6eWNsyZgi640LDzRWVQ2eDe+Y/kVdftH+vYdPF2rgDb3dLdpxE1jvAxw==" + "license": "MIT" }, "node_modules/char-regex": { "version": "1.0.2", @@ -46890,9 +46721,8 @@ }, "node_modules/cli-progress": { "version": "3.12.0", - "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz", - "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==", "dev": true, + "license": "MIT", "dependencies": { "string-width": "^4.2.3" }, @@ -47354,8 +47184,7 @@ }, "node_modules/codeco": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/codeco/-/codeco-1.2.0.tgz", - "integrity": "sha512-SHTBW7QsiDtHGqEyhX10gZesmWlWV00gXteFyU2xLqyZmy658/+HlPyXG5EvY05+csQNWjBIfGg2mZrklR1RtQ==" + "license": "(MIT OR Apache-2.0)" }, "node_modules/collect-v8-coverage": { "version": "1.0.2", @@ -47696,9 +47525,8 @@ }, "node_modules/config-file-ts": { "version": "0.2.6", - "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.6.tgz", - "integrity": "sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==", "dev": true, + "license": "MIT", "dependencies": { "glob": "^10.3.10", "typescript": "^5.3.3" @@ -47706,18 +47534,16 @@ }, "node_modules/config-file-ts/node_modules/brace-expansion": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, "node_modules/config-file-ts/node_modules/cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -47729,9 +47555,8 @@ }, "node_modules/config-file-ts/node_modules/foreground-child": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", "dev": true, + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -47745,9 +47570,8 @@ }, "node_modules/config-file-ts/node_modules/glob": { "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.3.5", @@ -47767,9 +47591,8 @@ }, "node_modules/config-file-ts/node_modules/minimatch": { "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -47782,27 +47605,24 @@ }, "node_modules/config-file-ts/node_modules/minipass": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, "node_modules/config-file-ts/node_modules/path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/config-file-ts/node_modules/shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -47812,18 +47632,16 @@ }, "node_modules/config-file-ts/node_modules/shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/config-file-ts/node_modules/signal-exit": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, + "license": "ISC", "engines": { "node": ">=14" }, @@ -47833,9 +47651,8 @@ }, "node_modules/config-file-ts/node_modules/typescript": { "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -48638,9 +48455,8 @@ }, "node_modules/crypto-js": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", - "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/crypto-random-string": { "version": "2.0.0", @@ -49601,8 +49417,7 @@ }, "node_modules/dag-jose": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/dag-jose/-/dag-jose-4.0.0.tgz", - "integrity": "sha512-tw595L3UYoOUT9dSJPbBEG/qpRpw24kRZxa5SLRnlnr+g5L7O8oEs1d3W5TiVA1oJZbthVsf0Vi3zFN66qcEBA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ipld/dag-cbor": "^9.0.0", "multiformats": "^11.0.0" @@ -49610,8 +49425,7 @@ }, "node_modules/dag-jose-utils": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/dag-jose-utils/-/dag-jose-utils-3.0.0.tgz", - "integrity": "sha512-gu+XutOTy3kD8fDcA1SMjZ2U0mUOb/hxoRVZaMCizXN7Ssbc5dKOzeXQ4GquV4BdQzs3w5Y7irOpn2plFPIJfg==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@ipld/dag-cbor": "^7.0.1", "multiformats": "^11.0.1" @@ -49619,8 +49433,7 @@ }, "node_modules/dag-jose-utils/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -49628,8 +49441,7 @@ }, "node_modules/dag-jose/node_modules/@ipld/dag-cbor": { "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.0.8.tgz", - "integrity": "sha512-ETWJ7p7lmGw5X+BuI/7rf4/k56xyOvAOVNUVuQmnGYBdJjObLPgS+vyFxRk4odATlkyZqCq2MLNY52bhE6SlRA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "cborg": "^4.0.0", "multiformats": "^13.0.0" @@ -49641,21 +49453,18 @@ }, "node_modules/dag-jose/node_modules/@ipld/dag-cbor/node_modules/multiformats": { "version": "13.0.1", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.1.tgz", - "integrity": "sha512-bt3R5iXe2O8xpp3wkmQhC73b/lC4S2ihU8Dndwcsysqbydqb8N+bpP116qMcClZ17g58iSIwtXUTcg2zT4sniA==" + "license": "Apache-2.0 OR MIT" }, "node_modules/dag-jose/node_modules/cborg": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/cborg/-/cborg-4.0.8.tgz", - "integrity": "sha512-/6QDK0Hw//cV4YNWZZjdIUMFNw0DZmb56jdVGJPwXP7874gSN0AMYqM07mVKpAm+6Nn7U8lvYFzPgBGatC+5xw==", + "license": "Apache-2.0", "bin": { "cborg": "lib/bin.js" } }, "node_modules/dag-jose/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -49863,8 +49672,7 @@ }, "node_modules/decompress": { "version": "4.2.1", - "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz", - "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==", + "license": "MIT", "dependencies": { "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", @@ -51138,8 +50946,7 @@ }, "node_modules/did-jwt": { "version": "7.4.7", - "resolved": "https://registry.npmjs.org/did-jwt/-/did-jwt-7.4.7.tgz", - "integrity": "sha512-Apz7nIfIHSKWIMaEP5L/K8xkwByvjezjTG0xiqwKdnNj1x8M0+Yasury5Dm/KPltxi2PlGfRPf3IejRKZrT8mQ==", + "license": "Apache-2.0", "dependencies": { "@noble/ciphers": "^0.4.0", "@noble/curves": "^1.0.0", @@ -51154,22 +50961,18 @@ }, "node_modules/did-jwt/node_modules/@scure/base": { "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", - "integrity": "sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ==", + "license": "MIT", "funding": { "url": "https://paulmillr.com/funding/" } }, "node_modules/did-jwt/node_modules/did-resolver": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-4.1.0.tgz", - "integrity": "sha512-S6fWHvCXkZg2IhS4RcVHxwuyVejPR7c+a4Go0xbQ9ps5kILa8viiYQgrM4gfTyeTjJ0ekgJH9gk/BawTpmkbZA==" + "license": "Apache-2.0" }, "node_modules/did-jwt/node_modules/multibase": { "version": "4.0.6", - "resolved": "https://registry.npmjs.org/multibase/-/multibase-4.0.6.tgz", - "integrity": "sha512-x23pDe5+svdLz/k5JPGCVdfn7Q5mZVMBETiC+ORfO+sor9Sgs0smJzAjfTbM5tckeCqnaUuMYoz+k3RXMmJClQ==", - "deprecated": "This module has been superseded by the multiformats module", + "license": "MIT", "dependencies": { "@multiformats/base-x": "^4.0.1" }, @@ -51180,13 +50983,11 @@ }, "node_modules/did-resolver": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-3.2.2.tgz", - "integrity": "sha512-Eeo2F524VM5N3W4GwglZrnul2y6TLTwMQP3In62JdG34NZoqihYyOZLk+5wUW8sSgvIYIcJM8Dlt3xsdKZZ3tg==" + "license": "Apache-2.0" }, "node_modules/dids": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/dids/-/dids-4.0.4.tgz", - "integrity": "sha512-PKxQP0QFqgeMe0dbL7LCRdPJVhZU2ejj8RWCfJ6vro3a+o5o32cWNM1X6YXpdIWq6G5fTJw9KO2dHj2ZzYDc7w==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@didtools/cacao": "^2.1.0", "@didtools/codecs": "^1.0.1", @@ -51206,8 +51007,7 @@ }, "node_modules/dids/node_modules/@didtools/pkh-ethereum": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@didtools/pkh-ethereum/-/pkh-ethereum-0.4.1.tgz", - "integrity": "sha512-oE5bbyTauJ/WddaWnDK7bWns2E2LG4Ut33ICEcEQdlMoXM0902/vnGm8+6QE/yuLOyAllgf7DnDKvERF5IY6uQ==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@didtools/cacao": "^2.1.0", "@noble/curves": "^1.1.0", @@ -51221,13 +51021,11 @@ }, "node_modules/dids/node_modules/did-resolver": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-4.1.0.tgz", - "integrity": "sha512-S6fWHvCXkZg2IhS4RcVHxwuyVejPR7c+a4Go0xbQ9ps5kILa8viiYQgrM4gfTyeTjJ0ekgJH9gk/BawTpmkbZA==" + "license": "Apache-2.0" }, "node_modules/dids/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -51235,16 +51033,14 @@ }, "node_modules/dids/node_modules/uint8arrays": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", - "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", + "license": "Apache-2.0 OR MIT", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/dids/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", - "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -51394,8 +51190,7 @@ }, "node_modules/dom-css": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/dom-css/-/dom-css-2.1.0.tgz", - "integrity": "sha512-w9kU7FAbaSh3QKijL6n59ofAhkkmMJ31GclJIz/vyQdjogfyxcB6Zf8CZyibOERI5o0Hxz30VmJS7+7r5fEj2Q==", + "license": "MIT", "dependencies": { "add-px-to-style": "1.0.0", "prefix-style": "2.0.1", @@ -51780,9 +51575,8 @@ }, "node_modules/eip55": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/eip55/-/eip55-2.1.1.tgz", - "integrity": "sha512-WcagVAmNu2Ww2cDUfzuWVntYwFxbvZ5MvIyLZpMjTTkjD6sCvkGOiS86jTppzu9/gWsc8isLHAeMBWK02OnZmA==", "dev": true, + "license": "MIT", "dependencies": { "keccak": "^3.0.3" } @@ -51912,8 +51706,7 @@ }, "node_modules/engine.io-client": { "version": "6.5.3", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz", - "integrity": "sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==", + "license": "MIT", "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1", @@ -51924,8 +51717,7 @@ }, "node_modules/engine.io-client/node_modules/ws": { "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", - "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -51944,8 +51736,7 @@ }, "node_modules/engine.io-parser": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz", - "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==", + "license": "MIT", "engines": { "node": ">=10.0.0" } @@ -52435,9 +52226,8 @@ }, "node_modules/esbuild": { "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -52469,54 +52259,6 @@ "@esbuild/win32-x64": "0.18.20" } }, - "node_modules/esbuild-android-64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz", - "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-android-arm64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz", - "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-darwin-64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz", - "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/esbuild-darwin-arm64": { "version": "0.14.54", "cpu": [ @@ -52532,198 +52274,6 @@ "node": ">=12" } }, - "node_modules/esbuild-freebsd-64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz", - "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-freebsd-arm64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz", - "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-32": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz", - "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz", - "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-arm": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz", - "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-arm64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz", - "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-mips64le": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz", - "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-ppc64le": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz", - "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-riscv64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz", - "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-linux-s390x": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz", - "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-netbsd-64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz", - "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-openbsd-64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz", - "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/esbuild-plugin-alias": { "version": "0.2.1", "dev": true, @@ -52740,70 +52290,6 @@ "esbuild": ">=0.12 <1" } }, - "node_modules/esbuild-sunos-64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz", - "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-windows-32": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz", - "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-windows-64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz", - "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/esbuild-windows-arm64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz", - "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/escalade": { "version": "3.1.1", "license": "MIT", @@ -53925,9 +53411,8 @@ }, "node_modules/eslint-plugin-react-refresh": { "version": "0.4.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.5.tgz", - "integrity": "sha512-D53FYKJa+fDmZMtriODxvhwrO+IOqrxoEo21gMA0sjHdU6dPVH4OhyFip9ypl8HOF5RV5KdTo+rBQLvnY2cO8w==", "dev": true, + "license": "MIT", "peerDependencies": { "eslint": ">=7" } @@ -56465,8 +55950,6 @@ }, "node_modules/fast-xml-parser": { "version": "4.3.2", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz", - "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==", "funding": [ { "type": "github", @@ -56477,6 +55960,7 @@ "url": "https://paypal.me/naturalintelligence" } ], + "license": "MIT", "dependencies": { "strnum": "^1.0.5" }, @@ -56540,8 +56024,7 @@ }, "node_modules/fbjs": { "version": "0.8.18", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.18.tgz", - "integrity": "sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==", + "license": "MIT", "dependencies": { "core-js": "^1.0.0", "isomorphic-fetch": "^2.1.1", @@ -56554,14 +56037,11 @@ }, "node_modules/fbjs/node_modules/core-js": { "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==", - "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js." + "license": "MIT" }, "node_modules/fbjs/node_modules/promise": { "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "license": "MIT", "dependencies": { "asap": "~2.0.3" } @@ -59007,8 +58487,7 @@ }, "node_modules/graphql-tag": { "version": "2.12.6", - "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz", - "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==", + "license": "MIT", "dependencies": { "tslib": "^2.1.0" }, @@ -59021,8 +58500,7 @@ }, "node_modules/graphql-tag/node_modules/tslib": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "license": "0BSD" }, "node_modules/growl": { "version": "1.10.5", @@ -59924,8 +59402,7 @@ }, "node_modules/html-to-react": { "version": "1.7.0", - "resolved": "https://registry.npmjs.org/html-to-react/-/html-to-react-1.7.0.tgz", - "integrity": "sha512-b5HTNaTGyOj5GGIMiWVr1k57egAZ/vGy0GGefnCQ1VW5hu9+eku8AXHtf2/DeD95cj/FKBKYa1J7SWBOX41yUQ==", + "license": "MIT", "dependencies": { "domhandler": "^5.0", "htmlparser2": "^9.0", @@ -59937,8 +59414,7 @@ }, "node_modules/html-to-react/node_modules/dom-serializer": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", - "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -59950,19 +59426,17 @@ }, "node_modules/html-to-react/node_modules/domelementtype": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/html-to-react/node_modules/domhandler": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", - "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" }, @@ -59975,8 +59449,7 @@ }, "node_modules/html-to-react/node_modules/domutils": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", @@ -59988,8 +59461,7 @@ }, "node_modules/html-to-react/node_modules/entities": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -59999,8 +59471,6 @@ }, "node_modules/html-to-react/node_modules/htmlparser2": { "version": "9.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", - "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -60008,6 +59478,7 @@ "url": "https://github.com/sponsors/fb55" } ], + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", @@ -60266,9 +59737,8 @@ }, "node_modules/hyperlinker": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz", - "integrity": "sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -60325,8 +59795,7 @@ }, "node_modules/identicon.js": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/identicon.js/-/identicon.js-2.3.3.tgz", - "integrity": "sha512-/qgOkXKZ7YbeCYbawJ9uQQ3XJ3uBg9VDpvHjabCAPp6aRMhjLaFAxG90+1TxzrhKaj6AYpVGrx6UXQfQA41UEA==" + "license": "BSD" }, "node_modules/identity-obj-proxy": { "version": "3.0.0", @@ -61707,8 +61176,7 @@ }, "node_modules/isbot-fast": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/isbot-fast/-/isbot-fast-1.2.0.tgz", - "integrity": "sha512-twjuQzy2gKMDVfKGQyQqrx6Uy4opu/fiVUTTpdqtFsd7OQijIp5oXvb27n5EemYXaijh5fomndJt/SPRLsEdSg==", + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -61741,8 +61209,7 @@ }, "node_modules/isomorphic-fetch": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", - "integrity": "sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==", + "license": "MIT", "dependencies": { "node-fetch": "^1.0.1", "whatwg-fetch": ">=0.10.0" @@ -61750,16 +61217,14 @@ }, "node_modules/isomorphic-fetch/node_modules/is-stream": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/isomorphic-fetch/node_modules/node-fetch": { "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "license": "MIT", "dependencies": { "encoding": "^0.1.11", "is-stream": "^1.0.1" @@ -67371,16 +66836,14 @@ }, "node_modules/jet-logger": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/jet-logger/-/jet-logger-1.2.2.tgz", - "integrity": "sha512-Kbw4G3BC45+Umz5XBnsE50pHplruJTVKGRy5X1YfCu3Te7f8ggTL8Tm10YegAD2QP41MVQ3o/Y9MFAZzfythqw==", + "license": "MIT", "dependencies": { "colors": "1.3.0" } }, "node_modules/jet-logger/node_modules/colors": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz", - "integrity": "sha512-EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==", + "license": "MIT", "engines": { "node": ">=0.1.90" } @@ -67999,8 +67462,7 @@ }, "node_modules/json-schema-typed": { "version": "8.0.1", - "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.1.tgz", - "integrity": "sha512-XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg==" + "license": "BSD-2-Clause" }, "node_modules/json-stable-stringify": { "version": "1.0.2", @@ -68097,8 +67559,7 @@ }, "node_modules/jsontokens": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsontokens/-/jsontokens-4.0.1.tgz", - "integrity": "sha512-+MO415LEN6M+3FGsRz4wU20g7N2JA+2j9d9+pGaNJHviG4L8N0qzavGyENw6fJqsq9CcrHOIL6iWX5yeTZ86+Q==", + "license": "MIT", "dependencies": { "@noble/hashes": "^1.1.2", "@noble/secp256k1": "^1.6.3", @@ -68270,8 +67731,7 @@ }, "node_modules/kareem": { "version": "2.5.1", - "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz", - "integrity": "sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==", + "license": "Apache-2.0", "engines": { "node": ">=12.0.0" } @@ -68303,8 +67763,7 @@ }, "node_modules/key-did-resolver": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/key-did-resolver/-/key-did-resolver-2.3.0.tgz", - "integrity": "sha512-q3ChQILPe+u8qkpWP196fEoxsygEyjM3K25qrGaMSolVaUdfgj7qwMz2DE/GRIlfNK2HgKW6KXA8RZMy8aL4MA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "@stablelib/ed25519": "^1.0.2", "bigint-mod-arith": "^3.1.0", @@ -68316,18 +67775,16 @@ }, "node_modules/key-did-resolver/node_modules/varint": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", - "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==" + "license": "MIT" }, "node_modules/keymirror": { "version": "0.1.1" }, "node_modules/keytar": { "version": "7.9.0", - "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz", - "integrity": "sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "node-addon-api": "^4.3.0", "prebuild-install": "^7.0.1" @@ -68335,9 +67792,8 @@ }, "node_modules/keytar/node_modules/node-addon-api": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", - "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/keyv": { "version": "4.5.4", @@ -68553,8 +68009,7 @@ }, "node_modules/least-recent": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/least-recent/-/least-recent-1.0.3.tgz", - "integrity": "sha512-PH9ZuFAKFf5fY7j0wizus6f/Ni2wSaby4eQYEUmR+sK6lY7OEbVz/iEh/tTgEmgOivWJhay89wVyUe5VnXoUSQ==", + "license": "(MIT OR Apache-2.0)", "dependencies": { "nanoevents": "^8.0.0" } @@ -68860,8 +68315,7 @@ }, "node_modules/lit": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/lit/-/lit-2.8.0.tgz", - "integrity": "sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA==", + "license": "BSD-3-Clause", "dependencies": { "@lit/reactive-element": "^1.6.0", "lit-element": "^3.3.0", @@ -68870,8 +68324,7 @@ }, "node_modules/lit-element": { "version": "3.3.3", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.3.3.tgz", - "integrity": "sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA==", + "license": "BSD-3-Clause", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.1.0", "@lit/reactive-element": "^1.3.0", @@ -68880,8 +68333,7 @@ }, "node_modules/lit-html": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.8.0.tgz", - "integrity": "sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==", + "license": "BSD-3-Clause", "dependencies": { "@types/trusted-types": "^2.0.2" } @@ -69095,8 +68547,7 @@ }, "node_modules/lodash": { "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "license": "MIT" }, "node_modules/lodash-es": { "version": "4.17.21", @@ -69130,8 +68581,7 @@ }, "node_modules/lodash.escaperegexp": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", - "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==" + "license": "MIT" }, "node_modules/lodash.flatmap": { "version": "4.5.0", @@ -69368,8 +68818,7 @@ }, "node_modules/logfmt": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/logfmt/-/logfmt-1.4.0.tgz", - "integrity": "sha512-p1Ow0C2dDJYaQBhRHt+HVMP6ELuBm4jYSYNHPMfz0J5wJ9qA6/7oBOlBZBfT1InqguTYcvJzNea5FItDxTcbyw==", + "license": "MIT", "dependencies": { "split": "0.2.x", "through": "2.3.x" @@ -69897,8 +69346,7 @@ }, "node_modules/mapmoize": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/mapmoize/-/mapmoize-1.2.1.tgz", - "integrity": "sha512-LK8ArSM1wbfRPTnl+LpdxW1pwkfY6GxtM9p+STr6aDtM7ImR8jLuf4ekei43/AN0f7XDSrohzwwK57eGHSDAuA==", + "license": "(MIT OR Apache-2.0)", "engines": { "node": "^14.0.0 || ^16.0.0 || >=18.0.0" } @@ -69994,16 +69442,14 @@ }, "node_modules/mdast-add-list-metadata": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdast-add-list-metadata/-/mdast-add-list-metadata-1.0.1.tgz", - "integrity": "sha512-fB/VP4MJ0LaRsog7hGPxgOrSL3gE/2uEdZyDuSEnKCv/8IkYHiDkIQSbChiJoHyxZZXZ9bzckyRk+vNxFzh8rA==", + "license": "MIT", "dependencies": { "unist-util-visit-parents": "1.1.2" } }, "node_modules/mdast-add-list-metadata/node_modules/unist-util-visit-parents": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-1.1.2.tgz", - "integrity": "sha512-yvo+MMLjEwdc3RhhPYSximset7rwjMrdt9E41Smmvg25UQIenzrN83cRnF1JMzoMi9zZOQeYXHSDf7p+IQkW3Q==" + "license": "MIT" }, "node_modules/mdast-util-definitions": { "version": "4.0.0", @@ -71016,8 +70462,7 @@ }, "node_modules/memory-pager": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", - "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" + "license": "MIT" }, "node_modules/meow": { "version": "6.1.1", @@ -72936,8 +72381,7 @@ }, "node_modules/mongodb": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.3.0.tgz", - "integrity": "sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==", + "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.1.0", "bson": "^6.2.0", @@ -72981,8 +72425,7 @@ }, "node_modules/mongodb-connection-string-url": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.0.tgz", - "integrity": "sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ==", + "license": "Apache-2.0", "dependencies": { "@types/whatwg-url": "^11.0.2", "whatwg-url": "^13.0.0" @@ -72990,16 +72433,14 @@ }, "node_modules/mongodb-connection-string-url/node_modules/punycode": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/mongodb-connection-string-url/node_modules/tr46": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", - "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", + "license": "MIT", "dependencies": { "punycode": "^2.3.0" }, @@ -73009,8 +72450,7 @@ }, "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": { "version": "13.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", - "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", + "license": "MIT", "dependencies": { "tr46": "^4.1.1", "webidl-conversions": "^7.0.0" @@ -73021,8 +72461,7 @@ }, "node_modules/mongoose": { "version": "8.1.0", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.1.0.tgz", - "integrity": "sha512-kOA4Xnq2goqNpN9EmYElGNWfxA9H80fxcr7UdJKWi3UMflza0R7wpTihCpM67dE/0MNFljoa0sjQtlXVkkySAQ==", + "license": "MIT", "dependencies": { "bson": "^6.2.0", "kareem": "2.5.1", @@ -73042,8 +72481,7 @@ }, "node_modules/mongoose/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "license": "MIT" }, "node_modules/morgan": { "version": "1.10.0", @@ -73121,16 +72559,14 @@ }, "node_modules/mpath": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz", - "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==", + "license": "MIT", "engines": { "node": ">=4.0.0" } }, "node_modules/mquery": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz", - "integrity": "sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==", + "license": "MIT", "dependencies": { "debug": "4.x" }, @@ -73643,8 +73079,7 @@ }, "node_modules/multihashes-sync": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/multihashes-sync/-/multihashes-sync-1.1.3.tgz", - "integrity": "sha512-996qBYdXxol6Pjjw++lsdgrEMI/6S6Su4bt0D/vb5TGpJsqicVxkramwIbuRaJU4WYUTytYPGRru2s626Qkzlw==", + "license": "(MIT OR Apache-2.0)", "dependencies": { "@noble/hashes": "^1.3.0", "multiformats": "^11.0.0" @@ -73652,8 +73087,7 @@ }, "node_modules/multihashes-sync/node_modules/multiformats": { "version": "11.0.2", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", - "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", + "license": "Apache-2.0 OR MIT", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -73784,8 +73218,7 @@ }, "node_modules/nanoevents": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/nanoevents/-/nanoevents-8.0.0.tgz", - "integrity": "sha512-bYYwNCdNc5ea6/Lwh1uioU1/7aaKa3EPmNQ2weTm8PWSpbWrsaWHePe0Zq4SF+D3F3JX3cn+QdktOPCf1meOqw==", + "license": "MIT", "engines": { "node": "^16.0.0 || ^18.0.0 || >=20.0.0" } @@ -73909,9 +73342,8 @@ }, "node_modules/natural-orderby": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz", - "integrity": "sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -74054,8 +73486,7 @@ }, "node_modules/nist-weierstrauss": { "version": "1.6.1", - "resolved": "https://registry.npmjs.org/nist-weierstrauss/-/nist-weierstrauss-1.6.1.tgz", - "integrity": "sha512-FpjCOnPV/s3ZVIkeldCVSml2K4lruabPbBgoEitpCK1JL0KTVoWb56CFTU6rZn5i6VqAjdwcOp0FDwJACPmeFA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "multiformats": "^9.6.5", "uint8arrays": "^2.1.4" @@ -74063,8 +73494,7 @@ }, "node_modules/nist-weierstrauss/node_modules/uint8arrays": { "version": "2.1.10", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-2.1.10.tgz", - "integrity": "sha512-Q9/hhJa2836nQfEJSZTmr+pg9+cDJS9XEAp7N2Vg5MzL3bK/mkMVfjscRGYruP9jNda6MAdf4QD/y78gSzkp6A==", + "license": "MIT", "dependencies": { "multiformats": "^9.4.2" } @@ -74156,8 +73586,7 @@ }, "node_modules/node-cron": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.3.tgz", - "integrity": "sha512-dOal67//nohNgYWb+nWmg5dkFdIwDm8EpeGYMekPMrngV3637lqnX0lbUcCtgibHTz6SEz7DAIjKvKDFYCnO1A==", + "license": "ISC", "dependencies": { "uuid": "8.3.2" }, @@ -74167,8 +73596,7 @@ }, "node_modules/node-cron/node_modules/uuid": { "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } @@ -74324,10 +73752,9 @@ }, "node_modules/node-hid": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/node-hid/-/node-hid-2.2.0.tgz", - "integrity": "sha512-vj48zh9j555DZzUhMc8tk/qw6xPFrDyPBH1ST1Z/hWaA/juBJw7IuSxPeOgpzNFNU36mGYj+THioRMt1xOdm/g==", "dev": true, "hasInstallScript": true, + "license": "(MIT OR X11)", "dependencies": { "bindings": "^1.5.0", "node-addon-api": "^3.0.2", @@ -74342,9 +73769,8 @@ }, "node_modules/node-hid/node_modules/node-addon-api": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/node-html-parser": { "version": "6.1.12", @@ -76814,17 +76240,15 @@ }, "node_modules/object-sizeof": { "version": "2.6.4", - "resolved": "https://registry.npmjs.org/object-sizeof/-/object-sizeof-2.6.4.tgz", - "integrity": "sha512-YuJAf7Bi61KROcYmXm8RCeBrBw8UOaJDzTm1gp0eU7RjYi1xEte3/Nmg/VyPaHcJZ3sNojs1Y0xvSrgwkLmcFw==", + "license": "MIT", "dependencies": { "buffer": "^6.0.3" } }, "node_modules/object-treeify": { "version": "1.1.33", - "resolved": "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.33.tgz", - "integrity": "sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10" } @@ -77086,8 +76510,7 @@ }, "node_modules/optimism": { "version": "0.14.1", - "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.14.1.tgz", - "integrity": "sha512-7+1lSN+LJEtaj3uBLLFk8uFCFKy3txLvcvln5Dh1szXjF9yghEMeWclmnk0qdtYZ+lcMNyu48RmQQRw+LRYKSQ==", + "license": "MIT", "dependencies": { "@wry/context": "^0.5.2", "@wry/trie": "^0.2.1" @@ -77862,9 +77285,8 @@ }, "node_modules/password-prompt": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz", - "integrity": "sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==", "dev": true, + "license": "0BSD", "dependencies": { "ansi-escapes": "^4.3.2", "cross-spawn": "^7.0.3" @@ -77872,9 +77294,8 @@ }, "node_modules/password-prompt/node_modules/cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -77886,18 +77307,16 @@ }, "node_modules/password-prompt/node_modules/path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/password-prompt/node_modules/shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -77907,9 +77326,8 @@ }, "node_modules/password-prompt/node_modules/shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -82588,18 +82006,6 @@ "node": ">=0.10.0" } }, - "node_modules/postgres": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.3.tgz", - "integrity": "sha512-iHJn4+M9vbTdHSdDzNkC0crHq+1CUdFhx+YqCE+SqWxPjm+Zu63jq7yZborOBF64c8pc58O5uMudyL1FQcHacA==", - "engines": { - "node": ">=12" - }, - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/porsager" - } - }, "node_modules/postgres-array": { "version": "2.0.0", "license": "MIT", @@ -82671,8 +82077,7 @@ }, "node_modules/prefix-style": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/prefix-style/-/prefix-style-2.0.1.tgz", - "integrity": "sha512-gdr1MBNVT0drzTq95CbSNdsrBDoHGlb2aDJP/FoY+1e+jSDPOb1Cv554gH2MGiSr2WTcXi/zu+NaFzfcHQkfBQ==" + "license": "MIT" }, "node_modules/prelude-ls": { "version": "1.2.1", @@ -84750,8 +84155,7 @@ }, "node_modules/react-country-flag": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/react-country-flag/-/react-country-flag-3.0.2.tgz", - "integrity": "sha512-JPaz+q3QD0/nZtHBKj5x3O7r/SgSG9kxbymdaIU0RqlDAcorJIe4KV0DFhWIdKh69q5cPVkIVERcMYGZdvXgAA==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -84761,8 +84165,7 @@ }, "node_modules/react-custom-scrollbars": { "version": "4.2.1", - "resolved": "https://registry.npmjs.org/react-custom-scrollbars/-/react-custom-scrollbars-4.2.1.tgz", - "integrity": "sha512-VtJTUvZ7kPh/auZWIbBRceGPkE30XBYe+HktFxuMWBR2eVQQ+Ur6yFJMoaYcNpyGq22uYJ9Wx4UAEcC0K+LNPQ==", + "license": "MIT", "dependencies": { "dom-css": "^2.0.0", "prop-types": "^15.5.10", @@ -85609,8 +85012,7 @@ }, "node_modules/react-markdown": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-5.0.3.tgz", - "integrity": "sha512-jDWOc1AvWn0WahpjW6NK64mtx6cwjM4iSsLHJPNBqoAgGOVoIdJMqaKX4++plhOtdd4JksdqzlDibgPx6B/M2w==", + "license": "MIT", "dependencies": { "@types/mdast": "^3.0.3", "@types/unist": "^2.0.3", @@ -85634,8 +85036,7 @@ }, "node_modules/react-markdown/node_modules/bail": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", - "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -85643,8 +85044,6 @@ }, "node_modules/react-markdown/node_modules/is-buffer": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", "funding": [ { "type": "github", @@ -85659,14 +85058,14 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/react-markdown/node_modules/remark-parse": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", - "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", + "license": "MIT", "dependencies": { "mdast-util-from-markdown": "^0.8.0" }, @@ -85677,8 +85076,7 @@ }, "node_modules/react-markdown/node_modules/trough": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", - "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -85686,8 +85084,7 @@ }, "node_modules/react-markdown/node_modules/unified": { "version": "9.2.2", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", - "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", + "license": "MIT", "dependencies": { "bail": "^1.0.0", "extend": "^3.0.0", @@ -85703,8 +85100,7 @@ }, "node_modules/react-markdown/node_modules/unist-util-is": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", + "license": "MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" @@ -85712,8 +85108,7 @@ }, "node_modules/react-markdown/node_modules/unist-util-visit": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz", - "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==", + "license": "MIT", "dependencies": { "@types/unist": "^2.0.0", "unist-util-is": "^4.0.0", @@ -85726,8 +85121,7 @@ }, "node_modules/react-markdown/node_modules/unist-util-visit-parents": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", - "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", + "license": "MIT", "dependencies": { "@types/unist": "^2.0.0", "unist-util-is": "^4.0.0" @@ -85739,8 +85133,7 @@ }, "node_modules/react-markdown/node_modules/vfile": { "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", - "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", + "license": "MIT", "dependencies": { "@types/unist": "^2.0.0", "is-buffer": "^2.0.0", @@ -85754,8 +85147,7 @@ }, "node_modules/react-markdown/node_modules/vfile-message": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", - "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", + "license": "MIT", "dependencies": { "@types/unist": "^2.0.0", "unist-util-stringify-position": "^2.0.0" @@ -85884,9 +85276,7 @@ }, "node_modules/react-native-collapsible-tab-view": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/react-native-collapsible-tab-view/-/react-native-collapsible-tab-view-2.0.2.tgz", - "integrity": "sha512-83fme3FnMFIMIbhE6J7Iqmt2HG5q7A8d49X38VrSRegC1UG4sIAVjS3MSSVMgCip+WscqBc0aiJFQInTUzkUEw==", - "deprecated": "Deprecated in favor of v4", + "license": "MIT", "dependencies": { "use-debounce": "^5.1.0" }, @@ -86005,8 +85395,7 @@ }, "node_modules/react-native-fs": { "version": "2.20.0", - "resolved": "https://registry.npmjs.org/react-native-fs/-/react-native-fs-2.20.0.tgz", - "integrity": "sha512-VkTBzs7fIDUiy/XajOSNk0XazFE9l+QlMAce7lGuebZcag5CnjszB+u4BdqzwaQOdcYb5wsJIsqq4kxInIRpJQ==", + "license": "MIT", "dependencies": { "base-64": "^0.1.0", "utf8": "^3.0.0" @@ -86048,8 +85437,7 @@ }, "node_modules/react-native-inset-shadow": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/react-native-inset-shadow/-/react-native-inset-shadow-1.0.3.tgz", - "integrity": "sha512-4UXuSrenJtOWKcV0zSqHLQ47Oxn+BXdmxFxYXf5rE8KletbTvQq8ziZsX8MSEegUGWDcJJ3Mw+1OVbPJxm4lZg==", + "license": "Unlicense", "dependencies": { "prop-types": "^15.7.2" }, @@ -86152,8 +85540,7 @@ }, "node_modules/react-native-safe-area-context": { "version": "4.8.2", - "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.8.2.tgz", - "integrity": "sha512-ffUOv8BJQ6RqO3nLml5gxJ6ab3EestPiyWekxdzO/1MQ7NF8fW1Mzh1C5QE9yq573Xefnc7FuzGXjtesZGv7cQ==", + "license": "MIT", "peerDependencies": { "react": "*", "react-native": "*" @@ -86173,8 +85560,7 @@ }, "node_modules/react-native-svg": { "version": "13.14.0", - "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.14.0.tgz", - "integrity": "sha512-27ZnxUkHgWICimhuj6MuqBkISN53lVvgWJB7pIypjXysAyM+nqgQBPh4vXg+7MbqLBoYvR4PiBgKfwwGAqVxHg==", + "license": "MIT", "dependencies": { "css-select": "^5.1.0", "css-tree": "^1.1.3" @@ -86599,8 +85985,7 @@ }, "node_modules/react-native-svg/node_modules/css-select": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", - "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", "css-what": "^6.1.0", @@ -86614,8 +85999,7 @@ }, "node_modules/react-native-svg/node_modules/dom-serializer": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", - "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -86627,19 +86011,17 @@ }, "node_modules/react-native-svg/node_modules/domelementtype": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/react-native-svg/node_modules/domhandler": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", - "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" }, @@ -86652,8 +86034,7 @@ }, "node_modules/react-native-svg/node_modules/domutils": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", @@ -86665,8 +86046,7 @@ }, "node_modules/react-native-svg/node_modules/entities": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -87091,8 +86471,7 @@ }, "node_modules/react-perfect-scrollbar": { "version": "1.5.8", - "resolved": "https://registry.npmjs.org/react-perfect-scrollbar/-/react-perfect-scrollbar-1.5.8.tgz", - "integrity": "sha512-bQ46m70gp/HJtiBOF3gRzBISSZn8FFGNxznTdmTG8AAwpxG1bJCyn7shrgjEvGSQ5FJEafVEiosY+ccER11OSA==", + "license": "MIT", "dependencies": { "perfect-scrollbar": "^1.5.0", "prop-types": "^15.6.1" @@ -91725,8 +91104,7 @@ }, "node_modules/react-spinners": { "version": "0.5.12", - "resolved": "https://registry.npmjs.org/react-spinners/-/react-spinners-0.5.12.tgz", - "integrity": "sha512-A1UG87Yd+pdmPQKooJoywdmgSGPG6iPcOoMyfki+wxYDNDEYtejAepws+VxTt/GGpb/JRDnll5oNuQoh4nF9JA==", + "license": "MIT", "dependencies": { "@emotion/core": "^10.0.4", "prop-types": "^15.5.10", @@ -91739,8 +91117,7 @@ }, "node_modules/react-spring": { "version": "8.0.27", - "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz", - "integrity": "sha512-nDpWBe3ZVezukNRandTeLSPcwwTMjNVu1IDq9qA/AMiUqHuRN4BeSWvKr3eIxxg1vtiYiOLy4FqdfCP5IoP77g==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "prop-types": "^15.5.8" @@ -91752,8 +91129,7 @@ }, "node_modules/react-streaming": { "version": "0.3.19", - "resolved": "https://registry.npmjs.org/react-streaming/-/react-streaming-0.3.19.tgz", - "integrity": "sha512-kpxnj/nynMbdVVLUZKAI+AlSx7bJNX0WZO14LSJNtfIcbQJd7YH0ilnP+AFwKkvrjuG8zuNL36W5WCsczM62zg==", + "license": "MIT", "dependencies": { "@brillout/import": "^0.2.3", "@brillout/json-serializer": "^0.5.1", @@ -91915,8 +91291,7 @@ }, "node_modules/react-use-measure": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/react-use-measure/-/react-use-measure-2.1.1.tgz", - "integrity": "sha512-nocZhN26cproIiIduswYpV5y5lQpSQS1y/4KuvUCjSKmw7ZWIS/+g3aFnX3WdBkyuGUtTLif3UTqnLLhbDoQig==", + "license": "MIT", "dependencies": { "debounce": "^1.2.1" }, @@ -92474,8 +91849,7 @@ }, "node_modules/recompose": { "version": "0.30.0", - "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz", - "integrity": "sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.0.0", "change-emitter": "^0.1.2", @@ -92490,13 +91864,11 @@ }, "node_modules/recompose/node_modules/hoist-non-react-statics": { "version": "2.5.5", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", - "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + "license": "BSD-3-Clause" }, "node_modules/recompose/node_modules/symbol-observable": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -92549,9 +91921,8 @@ }, "node_modules/redeyed": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz", - "integrity": "sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==", "dev": true, + "license": "MIT", "dependencies": { "esprima": "~4.0.0" } @@ -93794,16 +93165,13 @@ }, "node_modules/ripemd160-min": { "version": "0.0.6", - "resolved": "https://registry.npmjs.org/ripemd160-min/-/ripemd160-min-0.0.6.tgz", - "integrity": "sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A==", "engines": { "node": ">=8" } }, "node_modules/rive-react-native": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/rive-react-native/-/rive-react-native-6.2.0.tgz", - "integrity": "sha512-1ojHCMJokN56k5v7y4LxoUx3iKlcXzKCh8An9CL9fcDZF8jdazMgIy04JHxftBQocF+a8rt97yauSHNIp65bwg==", + "license": "MIT", "engines": { "node": ">=16" }, @@ -94987,8 +94355,7 @@ }, "node_modules/rpc-utils": { "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rpc-utils/-/rpc-utils-0.6.2.tgz", - "integrity": "sha512-kzk1OflbBckfDBAo8JwsmtQSHzj+6hxRt5G+u8A8ZSmunBw1nhWvRkSq8j1+EvWBqBRLy1aiGLUW5644CZqQtA==", + "license": "(Apache-2.0 OR MIT)", "dependencies": { "nanoid": "^3.3.1" }, @@ -95042,9 +94409,8 @@ }, "node_modules/rrweb-cssom": { "version": "0.6.0", - "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", - "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/rsvp": { "version": "4.8.5", @@ -96807,8 +96173,7 @@ }, "node_modules/sift": { "version": "16.0.1", - "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.1.tgz", - "integrity": "sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ==" + "license": "MIT" }, "node_modules/siginfo": { "version": "2.0.0", @@ -96972,8 +96337,7 @@ }, "node_modules/simplebar-core": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/simplebar-core/-/simplebar-core-1.2.4.tgz", - "integrity": "sha512-P+Sqshef4fq3++gQ82TgNYcgl3qZFSCP5jS2/8NMmw18oagXOijMzs1G+vm6RUY3oMvpwH3wGoqh9u6SyDjHfQ==", + "license": "MIT", "dependencies": { "@types/lodash-es": "^4.17.6", "can-use-dom": "^0.1.0", @@ -97217,8 +96581,7 @@ }, "node_modules/socket.io-client": { "version": "4.7.4", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.4.tgz", - "integrity": "sha512-wh+OkeF0rAVCrABWQBaEjLfb7DVPotMbu0cgWgyR0v6eA4EoVnAwcIeIbcdTE3GT/H3kbdLl7OoH2+asoDRIIg==", + "license": "MIT", "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.2", @@ -97231,8 +96594,7 @@ }, "node_modules/socket.io-parser": { "version": "4.2.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", - "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", + "license": "MIT", "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1" @@ -97446,8 +96808,7 @@ }, "node_modules/sparse-bitfield": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", - "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "license": "MIT", "dependencies": { "memory-pager": "^1.0.2" } @@ -97592,8 +96953,6 @@ }, "node_modules/split": { "version": "0.2.10", - "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz", - "integrity": "sha512-e0pKq+UUH2Xq/sXbYpZBZc3BawsfDZ7dgv+JtRTUPNcvF5CMR4Y9cvJqkMY0MoxWzTHvZuz1beg6pNEKlszPiQ==", "dependencies": { "through": "2" }, @@ -102780,8 +102139,7 @@ }, "node_modules/tiny-typed-emitter": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", - "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==" + "license": "MIT" }, "node_modules/tiny-warning": { "version": "1.0.3", @@ -102880,8 +102238,7 @@ }, "node_modules/to-camel-case": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-camel-case/-/to-camel-case-1.0.0.tgz", - "integrity": "sha512-nD8pQi5H34kyu1QDMFjzEIYqk0xa9Alt6ZfrdEMuHCFOfTLhDG5pgTu/aAM9Wt9lXILwlXmWP43b8sav0GNE8Q==", + "license": "MIT", "dependencies": { "to-space-case": "^1.0.0" } @@ -102895,8 +102252,7 @@ }, "node_modules/to-no-case": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz", - "integrity": "sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==" + "license": "MIT" }, "node_modules/to-object-path": { "version": "0.3.0", @@ -103009,8 +102365,7 @@ }, "node_modules/to-space-case": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz", - "integrity": "sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==", + "license": "MIT", "dependencies": { "to-no-case": "^1.0.0" } @@ -103131,8 +102486,7 @@ }, "node_modules/toucan-js": { "version": "3.3.1", - "resolved": "https://registry.npmjs.org/toucan-js/-/toucan-js-3.3.1.tgz", - "integrity": "sha512-9BpkHb/Pzsrtl1ItNq9OEQPnuUHwzce0nV2uG+DYFiQ4fPyiA6mKTBcDwQzcvNkfSER038U+8TzvdkCev+Maww==", + "license": "MIT", "dependencies": { "@sentry/core": "7.76.0", "@sentry/integrations": "7.76.0", @@ -103142,8 +102496,7 @@ }, "node_modules/toucan-js/node_modules/@sentry/core": { "version": "7.76.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.76.0.tgz", - "integrity": "sha512-M+ptkCTeCNf6fn7p2MmEb1Wd9/JXUWxIT/0QEc+t11DNR4FYy1ZP2O9Zb3Zp2XacO7ORrlL3Yc+VIfl5JTgjfw==", + "license": "MIT", "dependencies": { "@sentry/types": "7.76.0", "@sentry/utils": "7.76.0" @@ -103154,8 +102507,7 @@ }, "node_modules/toucan-js/node_modules/@sentry/integrations": { "version": "7.76.0", - "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.76.0.tgz", - "integrity": "sha512-4ea0PNZrGN9wKuE/8bBCRrxxw4Cq5T710y8rhdKHAlSUpbLqr/atRF53h8qH3Fi+ec0m38PB+MivKem9zUwlwA==", + "license": "MIT", "dependencies": { "@sentry/core": "7.76.0", "@sentry/types": "7.76.0", @@ -103168,16 +102520,14 @@ }, "node_modules/toucan-js/node_modules/@sentry/types": { "version": "7.76.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.76.0.tgz", - "integrity": "sha512-vj6z+EAbVrKAXmJPxSv/clpwS9QjPqzkraMFk2hIdE/kii8s8kwnkBwTSpIrNc8GnzV3qYC4r3qD+BXDxAGPaw==", + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/toucan-js/node_modules/@sentry/utils": { "version": "7.76.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.76.0.tgz", - "integrity": "sha512-40jFD+yfQaKpFYINghdhovzec4IEpB7aAuyH/GtE7E0gLpcqnC72r55krEIVILfqIR2Mlr5OKUzyeoCyWAU/yw==", + "license": "MIT", "dependencies": { "@sentry/types": "7.76.0" }, @@ -103381,8 +102731,7 @@ }, "node_modules/ts-invariant": { "version": "0.6.2", - "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.6.2.tgz", - "integrity": "sha512-hsVurayufl1gXg8CHtgZkB7X0KtA3TrI3xcJ9xkRr8FeJHnM/TIEQkgBq9XkpduyBWWUdlRIR9xWf4Lxq3LJTg==", + "license": "MIT", "dependencies": { "@types/ungap__global-this": "^0.3.1", "@ungap/global-this": "^0.4.2", @@ -104780,8 +104129,6 @@ }, "node_modules/ua-parser-js": { "version": "0.7.37", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz", - "integrity": "sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==", "funding": [ { "type": "opencollective", @@ -104796,6 +104143,7 @@ "url": "https://github.com/sponsors/faisalman" } ], + "license": "MIT", "engines": { "node": "*" } @@ -105737,10 +105085,9 @@ }, "node_modules/usb": { "version": "2.9.0", - "resolved": "https://registry.npmjs.org/usb/-/usb-2.9.0.tgz", - "integrity": "sha512-G0I/fPgfHUzWH8xo2KkDxTTFruUWfppgSFJ+bQxz/kVY2x15EQ/XDB7dqD1G432G4gBG4jYQuF3U7j/orSs5nw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@types/w3c-web-usb": "^1.0.6", "node-addon-api": "^6.0.0", @@ -105752,9 +105099,8 @@ }, "node_modules/usb/node_modules/node-addon-api": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/use": { "version": "3.1.1", @@ -105791,8 +105137,7 @@ }, "node_modules/use-debounce": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-5.2.1.tgz", - "integrity": "sha512-BQG5uEypYHd/ASF6imzYR8tJHh5qGn28oZG/5iVAbljV6MUrfyT4jzxA8co+L+WLCT1U8VBwzzvlb3CHmUDpEA==", + "license": "MIT", "engines": { "node": ">= 10.0.0" }, @@ -105957,9 +105302,8 @@ }, "node_modules/utility-types": { "version": "3.11.0", - "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.11.0.tgz", - "integrity": "sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } @@ -106102,13 +105446,11 @@ }, "node_modules/varintes": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/varintes/-/varintes-2.0.5.tgz", - "integrity": "sha512-iF3jlHLko9NrYjaUZvT3VwypP3V20KNNhT1tzqblyIyrVjNiW7HseGOhuP+apgZBp9X/8+5pxa7kNikhJeZlIw==" + "license": "(MIT OR Apache-2.0)" }, "node_modules/varuint-bitcoin": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz", - "integrity": "sha512-4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==", + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.1" } @@ -106331,8 +105673,7 @@ }, "node_modules/vike": { "version": "0.4.150", - "resolved": "https://registry.npmjs.org/vike/-/vike-0.4.150.tgz", - "integrity": "sha512-R2cfpRWTZb0WOgMDsh5oLGq9yJV4aPjEyjpnvy0Rkntv9YpX4EXp9MmNHUTqNJJqBeURtJKHQpfPbFRgbPjIbQ==", + "license": "MIT", "dependencies": { "@brillout/import": "0.2.3", "@brillout/json-serializer": "^0.5.8", @@ -106365,8 +105706,7 @@ }, "node_modules/vike-react": { "version": "0.3.9", - "resolved": "https://registry.npmjs.org/vike-react/-/vike-react-0.3.9.tgz", - "integrity": "sha512-klqi6eKdiDRsYbBKPJKXTf9cKOVIRrapZ+SG6melt1IdsQwbzZX0WeHXKn7tfHcKL7HqxMmPuamLJYQA06hVdw==", + "license": "MIT", "dependencies": { "react-streaming": "^0.3.19" }, @@ -106377,58 +105717,12 @@ "vite": "^4.3.8 || ^5.0.10" } }, - "node_modules/vike/node_modules/@esbuild/android-arm": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz", - "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/android-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz", - "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/android-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz", - "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/vike/node_modules/@esbuild/darwin-arm64": { "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz", - "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -106437,280 +105731,9 @@ "node": ">=12" } }, - "node_modules/vike/node_modules/@esbuild/darwin-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz", - "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz", - "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/freebsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz", - "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/linux-arm": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz", - "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==", - "cpu": [ - "arm" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/linux-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz", - "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/linux-ia32": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz", - "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==", - "cpu": [ - "ia32" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/linux-loong64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz", - "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==", - "cpu": [ - "loong64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/linux-mips64el": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz", - "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==", - "cpu": [ - "mips64el" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/linux-ppc64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz", - "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==", - "cpu": [ - "ppc64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/linux-riscv64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz", - "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==", - "cpu": [ - "riscv64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/linux-s390x": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz", - "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==", - "cpu": [ - "s390x" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/linux-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz", - "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/netbsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz", - "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/openbsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz", - "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/sunos-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz", - "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/win32-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz", - "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/win32-ia32": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz", - "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==", - "cpu": [ - "ia32" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vike/node_modules/@esbuild/win32-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz", - "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/vike/node_modules/acorn": { "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -106720,9 +105743,8 @@ }, "node_modules/vike/node_modules/esbuild": { "version": "0.17.19", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz", - "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==", "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -106756,16 +105778,14 @@ }, "node_modules/vike/node_modules/mrmime": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", - "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", + "license": "MIT", "engines": { "node": ">=10" } }, "node_modules/vike/node_modules/sirv": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz", - "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==", + "license": "MIT", "dependencies": { "@polka/url": "^1.0.0-next.24", "mrmime": "^2.0.0", @@ -106777,17 +105797,15 @@ }, "node_modules/vike/node_modules/totalist": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", - "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/vite": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", - "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", @@ -107460,9 +106478,8 @@ }, "node_modules/vite-plugin-top-level-await": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/vite-plugin-top-level-await/-/vite-plugin-top-level-await-1.3.1.tgz", - "integrity": "sha512-55M1h4NAwkrpxPNOJIBzKZFihqLUzIgnElLSmPNPMR2Fn9+JHKaNg3sVX1Fq+VgvuBksQYxiD3OnwQAUu7kaPQ==", "dev": true, + "license": "MIT", "dependencies": { "@rollup/plugin-virtual": "^3.0.1", "@swc/core": "^1.3.10", @@ -107474,22 +106491,20 @@ }, "node_modules/vite-plugin-top-level-await/node_modules/uuid": { "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "dev": true, "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], + "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } }, "node_modules/vite-plugin-wasm": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/vite-plugin-wasm/-/vite-plugin-wasm-3.2.2.tgz", - "integrity": "sha512-cdbBUNR850AEoMd5nvLmnyeq63CSfoP1ctD/L2vLk/5+wsgAPlAVAzUK5nGKWO/jtehNlrSSHLteN+gFQw7VOA==", "dev": true, + "license": "MIT", "peerDependencies": { "vite": "^2 || ^3 || ^4" } @@ -112155,8 +111170,6 @@ }, "node_modules/xmlhttprequest-ssl": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz", - "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==", "engines": { "node": ">=0.4.0" } @@ -112337,8 +111350,7 @@ }, "node_modules/zen-observable": { "version": "0.8.15", - "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz", - "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==" + "license": "MIT" }, "node_modules/zod": { "version": "3.21.4", @@ -112762,39 +111774,7 @@ "@pedalboard/trending-challenge-rewards": "*" } }, - "packages/ddex": { - "name": "@audius/ddex", - "version": "0.0.6", - "dependencies": { - "@audius/sdk": "*", - "@types/multer": "1.4.11", - "cors": "2.8.5", - "decompress": "4.2.1", - "dotenv": "16.3.1", - "express": "4.18.2", - "fast-xml-parser": "4.3.2", - "fastq": "1.16.0", - "linkedom": "0.15.6", - "multer": "1.4.5-lts.1", - "postgres": "3.4.3", - "uuid": "9.0.1" - }, - "devDependencies": { - "@types/decompress": "4.2.7", - "@types/express": "4.17.21", - "@types/node": "20.10.6", - "@types/uuid": "9.0.7", - "@typescript-eslint/eslint-plugin": "6.17.0", - "@typescript-eslint/parser": "6.17.0", - "eslint": "8.56.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.2", - "nodemon": "3.0.2", - "prettier": "3.1.1", - "ts-node": "10.9.2", - "typescript": "5.3.3" - } - }, + "packages/ddex": {}, "packages/ddex/client": { "name": "@audius/ddex-client", "version": "0.0.8", @@ -112940,8 +111920,7 @@ }, "packages/ddex/node_modules/@optimizely/js-sdk-datafile-manager": { "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-datafile-manager/-/js-sdk-datafile-manager-0.9.5.tgz", - "integrity": "sha512-O4ujr1nBBAQBtx8YoKNpzzaEZgsE+aU4dxubT17ePqv/YVUWE+JOY21tSRrqZy/BlbbyzL+ElT8hrGB5ZzVoIQ==", + "license": "Apache-2.0", "dependencies": { "@optimizely/js-sdk-logging": "^0.3.1", "@optimizely/js-sdk-utils": "^0.4.0", @@ -112961,8 +111940,7 @@ }, "packages/ddex/node_modules/@optimizely/js-sdk-event-processor": { "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-event-processor/-/js-sdk-event-processor-0.9.5.tgz", - "integrity": "sha512-g5zqAjJuexxgbNvn7dacFkQXQxH3+OtjELfmSswvhxP9EHkyNR0ZdQF/kBxFxr335F2/RRPvAJ9tQBPkwaBg8g==", + "license": "Apache-2.0", "dependencies": { "@optimizely/js-sdk-logging": "^0.3.1", "@optimizely/js-sdk-utils": "^0.4.0" @@ -112982,33 +111960,28 @@ }, "packages/ddex/node_modules/@optimizely/js-sdk-logging": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-logging/-/js-sdk-logging-0.3.1.tgz", - "integrity": "sha512-K71Jf283FP0E4oXehcXTTM3gvgHZHr7FUrIsw//0mdJlotHJT4Nss4hE0CWPbBxO7LJAtwNnO+VIA/YOcO4vHg==", + "license": "Apache-2.0", "dependencies": { "@optimizely/js-sdk-utils": "^0.4.0" } }, "packages/ddex/node_modules/@optimizely/js-sdk-utils": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-utils/-/js-sdk-utils-0.4.0.tgz", - "integrity": "sha512-QG2oytnITW+VKTJK+l0RxjaS5VrA6W+AZMzpeg4LCB4Rn4BEKtF+EcW/5S1fBDLAviGq/0TLpkjM3DlFkJ9/Gw==", + "license": "Apache-2.0", "dependencies": { "uuid": "^3.3.2" } }, "packages/ddex/node_modules/@optimizely/js-sdk-utils/node_modules/uuid": { "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "license": "MIT", "bin": { "uuid": "bin/uuid" } }, "packages/ddex/node_modules/@optimizely/optimizely-sdk": { "version": "4.9.2", - "resolved": "https://registry.npmjs.org/@optimizely/optimizely-sdk/-/optimizely-sdk-4.9.2.tgz", - "integrity": "sha512-aPUU2KGDgo0VmbYNXeUCttXQgbBr59leUhyNPidy1J3YixEhzo0Q9UXCzhf4SgCTCtHCwahE7g0Lf36U0IVPgQ==", + "license": "Apache-2.0", "dependencies": { "@optimizely/js-sdk-datafile-manager": "^0.9.5", "@optimizely/js-sdk-event-processor": "^0.9.2", @@ -113023,17 +111996,14 @@ }, "packages/ddex/node_modules/@optimizely/optimizely-sdk/node_modules/uuid": { "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "license": "MIT", "bin": { "uuid": "bin/uuid" } }, "packages/ddex/node_modules/@react-spring/web": { "version": "9.7.3", - "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz", - "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==", + "license": "MIT", "dependencies": { "@react-spring/animated": "~9.7.3", "@react-spring/core": "~9.7.3", @@ -113047,17 +112017,15 @@ }, "packages/ddex/node_modules/@remix-run/router": { "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.13.0.tgz", - "integrity": "sha512-5dMOnVnefRsl4uRnAdoWjtVTdh8e6aZqgM4puy9nmEADH72ck+uXwzpJLEKE9Q6F8ZljNewLgmTfkxUrBdv4WA==", + "license": "MIT", "engines": { "node": ">=14.0.0" } }, "packages/ddex/node_modules/@types/express": { "version": "4.17.21", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", - "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.33", @@ -113067,31 +112035,27 @@ }, "packages/ddex/node_modules/@types/node": { "version": "20.10.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz", - "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==", + "license": "MIT", "dependencies": { "undici-types": "~5.26.4" } }, "packages/ddex/node_modules/@types/semver": { "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", - "dev": true + "dev": true, + "license": "MIT" }, "packages/ddex/node_modules/@types/ws": { "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "license": "MIT", "dependencies": { "@types/node": "*" } }, "packages/ddex/node_modules/@typescript-eslint/eslint-plugin": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.17.0.tgz", - "integrity": "sha512-Vih/4xLXmY7V490dGwBQJTpIZxH4ZFH6eCVmQ4RFkB+wmaCTDAx4dtgoWwMNGKLkqRY1L6rPqzEbjorRnDo4rQ==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.5.1", "@typescript-eslint/scope-manager": "6.17.0", @@ -113124,9 +112088,8 @@ }, "packages/ddex/node_modules/@typescript-eslint/parser": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.17.0.tgz", - "integrity": "sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "6.17.0", "@typescript-eslint/types": "6.17.0", @@ -113152,9 +112115,8 @@ }, "packages/ddex/node_modules/@typescript-eslint/scope-manager": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.17.0.tgz", - "integrity": "sha512-RX7a8lwgOi7am0k17NUO0+ZmMOX4PpjLtLRgLmT1d3lBYdWH4ssBUbwdmc5pdRX8rXon8v9x8vaoOSpkHfcXGA==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/types": "6.17.0", "@typescript-eslint/visitor-keys": "6.17.0" @@ -113169,9 +112131,8 @@ }, "packages/ddex/node_modules/@typescript-eslint/type-utils": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.17.0.tgz", - "integrity": "sha512-hDXcWmnbtn4P2B37ka3nil3yi3VCQO2QEB9gBiHJmQp5wmyQWqnjA85+ZcE8c4FqnaB6lBwMrPkgd4aBYz3iNg==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "6.17.0", "@typescript-eslint/utils": "6.17.0", @@ -113196,9 +112157,8 @@ }, "packages/ddex/node_modules/@typescript-eslint/types": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.17.0.tgz", - "integrity": "sha512-qRKs9tvc3a4RBcL/9PXtKSehI/q8wuU9xYJxe97WFxnzH8NWWtcW3ffNS+EWg8uPvIerhjsEZ+rHtDqOCiH57A==", "dev": true, + "license": "MIT", "engines": { "node": "^16.0.0 || >=18.0.0" }, @@ -113209,9 +112169,8 @@ }, "packages/ddex/node_modules/@typescript-eslint/typescript-estree": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.17.0.tgz", - "integrity": "sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/types": "6.17.0", "@typescript-eslint/visitor-keys": "6.17.0", @@ -113237,9 +112196,8 @@ }, "packages/ddex/node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -113252,9 +112210,8 @@ }, "packages/ddex/node_modules/@typescript-eslint/utils": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.17.0.tgz", - "integrity": "sha512-LofsSPjN/ITNkzV47hxas2JCsNCEnGhVvocfyOcLzT9c/tSZE7SfhS/iWtzP1lKNOEfLhRTZz6xqI8N2RzweSQ==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", @@ -113277,9 +112234,8 @@ }, "packages/ddex/node_modules/@typescript-eslint/visitor-keys": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.17.0.tgz", - "integrity": "sha512-H6VwB/k3IuIeQOyYczyyKN8wH6ed8EwliaYHLxOIhyF0dYEIsN8+Bk3GE19qafeMKyZJJHP8+O1HiFhFLUNKSg==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/types": "6.17.0", "eslint-visitor-keys": "^3.4.1" @@ -113325,9 +112281,8 @@ }, "packages/ddex/node_modules/anymatch": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -113344,17 +112299,15 @@ }, "packages/ddex/node_modules/binary-extensions": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "packages/ddex/node_modules/body-parser": { "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.4", @@ -113376,31 +112329,27 @@ }, "packages/ddex/node_modules/body-parser/node_modules/debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "packages/ddex/node_modules/body-parser/node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "license": "MIT" }, "packages/ddex/node_modules/brace-expansion": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, "packages/ddex/node_modules/braces": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.0.1" }, @@ -113410,8 +112359,6 @@ }, "packages/ddex/node_modules/busboy": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", - "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", "dependencies": { "streamsearch": "^1.1.0" }, @@ -113421,8 +112368,7 @@ }, "packages/ddex/node_modules/bytes": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -113445,8 +112391,6 @@ }, "packages/ddex/node_modules/chokidar": { "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, "funding": [ { @@ -113473,9 +112417,8 @@ }, "packages/ddex/node_modules/chokidar/node_modules/glob-parent": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -113485,13 +112428,11 @@ }, "packages/ddex/node_modules/classnames": { "version": "2.5.1", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", - "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" + "license": "MIT" }, "packages/ddex/node_modules/content-disposition": { "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" }, @@ -113501,24 +112442,21 @@ }, "packages/ddex/node_modules/cookie": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "packages/ddex/node_modules/copy-to-clipboard": { "version": "3.3.3", - "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz", - "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==", + "license": "MIT", "dependencies": { "toggle-selection": "^1.0.6" } }, "packages/ddex/node_modules/cross-fetch": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", - "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", + "license": "MIT", "dependencies": { "node-fetch": "^2.6.12" } @@ -113539,21 +112477,18 @@ }, "packages/ddex/node_modules/csstype": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" + "license": "MIT" }, "packages/ddex/node_modules/depd": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "packages/ddex/node_modules/destroy": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -113561,9 +112496,8 @@ }, "packages/ddex/node_modules/eslint-config-prettier": { "version": "9.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", - "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, + "license": "MIT", "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -113573,9 +112507,8 @@ }, "packages/ddex/node_modules/eslint-plugin-prettier": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.2.tgz", - "integrity": "sha512-dhlpWc9vOwohcWmClFcA+HjlvUpuyynYs0Rf+L/P6/0iQE6vlHW9l5bkfzN62/Stm9fbq8ku46qzde76T1xlSg==", "dev": true, + "license": "MIT", "dependencies": { "prettier-linter-helpers": "^1.0.0", "synckit": "^0.8.6" @@ -113619,9 +112552,8 @@ }, "packages/ddex/node_modules/eslint-visitor-keys": { "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -113631,8 +112563,7 @@ }, "packages/ddex/node_modules/express": { "version": "4.18.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", - "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -113672,30 +112603,26 @@ }, "packages/ddex/node_modules/express/node_modules/debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "packages/ddex/node_modules/express/node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "license": "MIT" }, "packages/ddex/node_modules/fastq": { "version": "1.16.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz", - "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==", + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } }, "packages/ddex/node_modules/fill-range": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -113705,8 +112632,7 @@ }, "packages/ddex/node_modules/finalhandler": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -113722,16 +112648,14 @@ }, "packages/ddex/node_modules/finalhandler/node_modules/debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "packages/ddex/node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "license": "MIT" }, "packages/ddex/node_modules/find-up": { "version": "5.0.0", @@ -113751,10 +112675,8 @@ }, "packages/ddex/node_modules/fsevents": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -113792,8 +112714,7 @@ }, "packages/ddex/node_modules/http-errors": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -113807,8 +112728,7 @@ }, "packages/ddex/node_modules/iconv-lite": { "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -113818,8 +112738,7 @@ }, "packages/ddex/node_modules/inline-style-prefixer": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz", - "integrity": "sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ==", + "license": "MIT", "dependencies": { "css-in-js-utils": "^3.1.0", "fast-loops": "^1.1.3" @@ -113827,9 +112746,8 @@ }, "packages/ddex/node_modules/is-binary-path": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -113839,9 +112757,8 @@ }, "packages/ddex/node_modules/is-number": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -113860,8 +112777,7 @@ }, "packages/ddex/node_modules/json-schema": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" + "license": "(AFL-2.1 OR BSD-3-Clause)" }, "packages/ddex/node_modules/locate-path": { "version": "6.0.0", @@ -113880,9 +112796,8 @@ }, "packages/ddex/node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -113892,8 +112807,7 @@ }, "packages/ddex/node_modules/mime": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -113903,13 +112817,11 @@ }, "packages/ddex/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "license": "MIT" }, "packages/ddex/node_modules/multer": { "version": "1.4.5-lts.1", - "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz", - "integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==", + "license": "MIT", "dependencies": { "append-field": "^1.0.0", "busboy": "^1.0.0", @@ -113925,8 +112837,7 @@ }, "packages/ddex/node_modules/nano-css": { "version": "5.6.1", - "resolved": "https://registry.npmjs.org/nano-css/-/nano-css-5.6.1.tgz", - "integrity": "sha512-T2Mhc//CepkTa3X4pUhKgbEheJHYAxD0VptuqFhDbGMUWVV2m+lkNiW/Ieuj35wrfC8Zm0l7HvssQh7zcEttSw==", + "license": "Unlicense", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15", "css-tree": "^1.1.2", @@ -113944,8 +112855,7 @@ }, "packages/ddex/node_modules/node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -113963,9 +112873,8 @@ }, "packages/ddex/node_modules/nodemon": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.2.tgz", - "integrity": "sha512-9qIN2LNTrEzpOPBaWHTm4Asy1LxXLSickZStAQ4IZe7zsoIpD/A7LWxhZV3t4Zu352uBcqVnRsDXSMR2Sc3lTA==", "dev": true, + "license": "MIT", "dependencies": { "chokidar": "^3.5.2", "debug": "^4", @@ -113991,18 +112900,16 @@ }, "packages/ddex/node_modules/nodemon/node_modules/has-flag": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "packages/ddex/node_modules/nodemon/node_modules/supports-color": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -114012,8 +112919,7 @@ }, "packages/ddex/node_modules/on-finished": { "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -114047,14 +112953,12 @@ }, "packages/ddex/node_modules/path-to-regexp": { "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "license": "MIT" }, "packages/ddex/node_modules/prettier": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", - "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -114067,8 +112971,7 @@ }, "packages/ddex/node_modules/qs": { "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.4" }, @@ -114081,8 +112984,7 @@ }, "packages/ddex/node_modules/raw-body": { "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -114095,8 +112997,7 @@ }, "packages/ddex/node_modules/react-merge-refs": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/react-merge-refs/-/react-merge-refs-2.1.1.tgz", - "integrity": "sha512-jLQXJ/URln51zskhgppGJ2ub7b2WFKGq3cl3NYKtlHoTG+dN2q7EzWrn3hN3EgPsTMvpR9tpq5ijdp7YwFZkag==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/gregberge" @@ -114104,8 +113005,7 @@ }, "packages/ddex/node_modules/react-router": { "version": "6.20.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.20.0.tgz", - "integrity": "sha512-pVvzsSsgUxxtuNfTHC4IxjATs10UaAtvLGVSA1tbUE4GDaOSU1Esu2xF5nWLz7KPiMuW8BJWuPFdlGYJ7/rW0w==", + "license": "MIT", "dependencies": { "@remix-run/router": "1.13.0" }, @@ -114118,8 +113018,7 @@ }, "packages/ddex/node_modules/react-router-dom": { "version": "6.20.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.20.0.tgz", - "integrity": "sha512-CbcKjEyiSVpA6UtCHOIYLUYn/UJfwzp55va4yEfpk7JBN3GPqWfHrdLkAvNCcpXr8QoihcDMuk0dzWZxtlB/mQ==", + "license": "MIT", "dependencies": { "@remix-run/router": "1.13.0", "react-router": "6.20.0" @@ -114134,8 +113033,7 @@ }, "packages/ddex/node_modules/react-use": { "version": "17.4.2", - "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.4.2.tgz", - "integrity": "sha512-1jPtmWLD8OJJNYCdYLJEH/HM+bPDfJuyGwCYeJFgPmWY8ttwpgZnW5QnzgM55CYUByUiTjHxsGOnEpLl6yQaoQ==", + "license": "Unlicense", "dependencies": { "@types/js-cookie": "^2.2.6", "@xobotyi/scrollbar-width": "^1.9.5", @@ -114159,9 +113057,8 @@ }, "packages/ddex/node_modules/readdirp": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -114171,9 +113068,8 @@ }, "packages/ddex/node_modules/rollup": { "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "dev": true, + "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -114187,9 +113083,8 @@ }, "packages/ddex/node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -114202,8 +113097,7 @@ }, "packages/ddex/node_modules/send": { "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -114225,21 +113119,18 @@ }, "packages/ddex/node_modules/send/node_modules/debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "packages/ddex/node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "license": "MIT" }, "packages/ddex/node_modules/serve-static": { "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "license": "MIT", "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -114252,8 +113143,7 @@ }, "packages/ddex/node_modules/setprototypeof": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + "license": "ISC" }, "packages/ddex/node_modules/shebang-command": { "version": "2.0.0", @@ -114278,24 +113168,20 @@ }, "packages/ddex/node_modules/statuses": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", "engines": { "node": ">= 0.8" } }, "packages/ddex/node_modules/streamsearch": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", - "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", "engines": { "node": ">=10.0.0" } }, "packages/ddex/node_modules/stylis": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz", - "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==" + "license": "MIT" }, "packages/ddex/node_modules/supports-color": { "version": "7.2.0", @@ -114311,9 +113197,8 @@ }, "packages/ddex/node_modules/synckit": { "version": "0.8.8", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz", - "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==", "dev": true, + "license": "MIT", "dependencies": { "@pkgr/core": "^0.1.0", "tslib": "^2.6.2" @@ -114327,9 +113212,8 @@ }, "packages/ddex/node_modules/to-regex-range": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -114339,13 +113223,11 @@ }, "packages/ddex/node_modules/tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "license": "MIT" }, "packages/ddex/node_modules/tslib": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "license": "0BSD" }, "packages/ddex/node_modules/type-fest": { "version": "0.20.2", @@ -114361,9 +113243,8 @@ }, "packages/ddex/node_modules/typescript": { "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -114374,21 +113255,19 @@ }, "packages/ddex/node_modules/uuid": { "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], + "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } }, "packages/ddex/node_modules/vite": { "version": "4.4.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.5.tgz", - "integrity": "sha512-4m5kEtAWHYr0O1Fu7rZp64CfO1PsRGZlD3TAB32UmQlpd7qg15VF7ROqGN5CyqN7HFuwr7ICNM2+fDWRqFEKaA==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.26", @@ -114441,9 +113320,8 @@ }, "packages/ddex/node_modules/vite-tsconfig-paths": { "version": "4.2.2", - "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.2.tgz", - "integrity": "sha512-dq0FjyxHHDnp0uS3P12WEOX2W7NeuLzX9AWP38D7Zw2CTbFErapwQVlCiT5DMJcVWKQ1MMdTe92PZl/rBQ7qcw==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.1.1", "globrex": "^0.1.2", @@ -114460,8 +113338,7 @@ }, "packages/ddex/node_modules/web3": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/web3/-/web3-4.3.0.tgz", - "integrity": "sha512-YiLCsb5wmgJlSxRLzt7Z7H+CmlVVIKD8VaUQaZ+xKVG3Q7CpsO5Z6jmeKnlr6M9c6fDDsDnRM6G8g+nchZehbA==", + "license": "LGPL-3.0", "dependencies": { "web3-core": "^4.3.2", "web3-errors": "^1.1.4", @@ -114487,8 +113364,7 @@ }, "packages/ddex/node_modules/web3-core": { "version": "4.3.2", - "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.3.2.tgz", - "integrity": "sha512-uIMVd/j4BgOnwfpY8ZT+QKubOyM4xohEhFZXz9xB8wimXWMMlYVlIK/TbfHqFolS9uOerdSGhsMbcK9lETae8g==", + "license": "LGPL-3.0", "dependencies": { "web3-errors": "^1.1.4", "web3-eth-accounts": "^4.1.0", @@ -114508,21 +113384,20 @@ } }, "packages/ddex/node_modules/web3-eth": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.3.1.tgz", - "integrity": "sha512-zJir3GOXooHQT85JB8SrufE+Voo5TtXdjhf1D8IGXmxM8MrhI8AT+Pgt4siBTupJcu5hF17iGmTP/Nj2XnaibQ==", + "version": "4.4.0", + "license": "LGPL-3.0", "dependencies": { "setimmediate": "^1.0.5", - "web3-core": "^4.3.0", - "web3-errors": "^1.1.3", - "web3-eth-abi": "^4.1.4", - "web3-eth-accounts": "^4.1.0", + "web3-core": "^4.3.2", + "web3-errors": "^1.1.4", + "web3-eth-abi": "^4.2.0", + "web3-eth-accounts": "^4.1.1", "web3-net": "^4.0.7", "web3-providers-ws": "^4.0.7", - "web3-rpc-methods": "^1.1.3", - "web3-types": "^1.3.0", - "web3-utils": "^4.0.7", - "web3-validator": "^2.0.3" + "web3-rpc-methods": "^1.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.1", + "web3-validator": "^2.0.4" }, "engines": { "node": ">=14", @@ -114530,15 +113405,14 @@ } }, "packages/ddex/node_modules/web3-eth-abi": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.4.tgz", - "integrity": "sha512-YLOBVVxxxLYKXjaiwZjEWYEnkMmmrm0nswZsvzSsINy/UgbWbzfoiZU+zn4YNWIEhORhx1p37iS3u/dP6VyC2w==", + "version": "4.2.0", + "license": "LGPL-3.0", "dependencies": { "abitype": "0.7.1", - "web3-errors": "^1.1.3", - "web3-types": "^1.3.0", - "web3-utils": "^4.0.7", - "web3-validator": "^2.0.3" + "web3-errors": "^1.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.1", + "web3-validator": "^2.0.4" }, "engines": { "node": ">=14", @@ -114546,17 +113420,16 @@ } }, "packages/ddex/node_modules/web3-eth-accounts": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.1.0.tgz", - "integrity": "sha512-UFtAsOANsvihTQ6SSvOKguupmQkResyR9M9JNuOxYpKh7+3W+sTnbLXw2UbOSYIsKlc1mpqqW9bVr1SjqHDpUQ==", + "version": "4.1.1", + "license": "LGPL-3.0", "dependencies": { "@ethereumjs/rlp": "^4.0.1", "crc-32": "^1.2.2", "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.3", - "web3-types": "^1.3.0", - "web3-utils": "^4.0.7", - "web3-validator": "^2.0.3" + "web3-errors": "^1.1.4", + "web3-types": "^1.3.1", + "web3-utils": "^4.1.1", + "web3-validator": "^2.0.4" }, "engines": { "node": ">=14", @@ -114564,17 +113437,16 @@ } }, "packages/ddex/node_modules/web3-eth-contract": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.1.4.tgz", - "integrity": "sha512-tJ4z6QLgtu8EQu2sXnLA7g427oxmngnbAUh+9kJKbP6Yep/oe+z79PqJv7H3MwqwUNW9T+/FeB2PnSQSyxz6ig==", + "version": "4.2.0", + "license": "LGPL-3.0", "dependencies": { "web3-core": "^4.3.2", "web3-errors": "^1.1.4", - "web3-eth": "^4.3.1", - "web3-eth-abi": "^4.1.4", + "web3-eth": "^4.4.0", + "web3-eth-abi": "^4.2.0", "web3-types": "^1.3.1", - "web3-utils": "^4.1.0", - "web3-validator": "^2.0.3" + "web3-utils": "^4.1.1", + "web3-validator": "^2.0.4" }, "engines": { "node": ">=14", @@ -114583,8 +113455,7 @@ }, "packages/ddex/node_modules/web3-eth-ens": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.8.tgz", - "integrity": "sha512-nj0JfeD45BbzVJcVYpUJnSo8iwDcY9CQ7CZhhIVVOFjvpMAPw0zEwjTvZEIQyCW61OoDG9xcBzwxe2tZoYhMRw==", + "license": "LGPL-3.0", "dependencies": { "@adraffy/ens-normalize": "^1.8.8", "web3-core": "^4.3.0", @@ -114603,8 +113474,7 @@ }, "packages/ddex/node_modules/web3-eth-iban": { "version": "4.0.7", - "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.7.tgz", - "integrity": "sha512-8weKLa9KuKRzibC87vNLdkinpUE30gn0IGY027F8doeJdcPUfsa4IlBgNC4k4HLBembBB2CTU0Kr/HAOqMeYVQ==", + "license": "LGPL-3.0", "dependencies": { "web3-errors": "^1.1.3", "web3-types": "^1.3.0", @@ -114618,8 +113488,7 @@ }, "packages/ddex/node_modules/web3-eth-personal": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.8.tgz", - "integrity": "sha512-sXeyLKJ7ddQdMxz1BZkAwImjqh7OmKxhXoBNF3isDmD4QDpMIwv/t237S3q4Z0sZQamPa/pHebJRWVuvP8jZdw==", + "license": "LGPL-3.0", "dependencies": { "web3-core": "^4.3.0", "web3-eth": "^4.3.1", @@ -114635,8 +113504,7 @@ }, "packages/ddex/node_modules/web3-net": { "version": "4.0.7", - "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.7.tgz", - "integrity": "sha512-SzEaXFrBjY25iQGk5myaOfO9ZyfTwQEa4l4Ps4HDNVMibgZji3WPzpjq8zomVHMwi8bRp6VV7YS71eEsX7zLow==", + "license": "LGPL-3.0", "dependencies": { "web3-core": "^4.3.0", "web3-rpc-methods": "^1.1.3", @@ -114650,8 +113518,7 @@ }, "packages/ddex/node_modules/web3-providers-http": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.1.0.tgz", - "integrity": "sha512-6qRUGAhJfVQM41E5t+re5IHYmb5hSaLc02BE2MaRQsz2xKA6RjmHpOA5h/+ojJxEpI9NI2CrfDKOAgtJfoUJQg==", + "license": "LGPL-3.0", "dependencies": { "cross-fetch": "^4.0.0", "web3-errors": "^1.1.3", @@ -114665,8 +113532,7 @@ }, "packages/ddex/node_modules/web3-providers-ipc": { "version": "4.0.7", - "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.7.tgz", - "integrity": "sha512-YbNqY4zUvIaK2MHr1lQFE53/8t/ejHtJchrWn9zVbFMGXlTsOAbNoIoZWROrg1v+hCBvT2c9z8xt7e/+uz5p1g==", + "license": "LGPL-3.0", "optional": true, "dependencies": { "web3-errors": "^1.1.3", @@ -114680,8 +113546,7 @@ }, "packages/ddex/node_modules/web3-providers-ws": { "version": "4.0.7", - "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.7.tgz", - "integrity": "sha512-n4Dal9/rQWjS7d6LjyEPM2R458V8blRm0eLJupDEJOOIBhGYlxw5/4FthZZ/cqB7y/sLVi7K09DdYx2MeRtU5w==", + "license": "LGPL-3.0", "dependencies": { "@types/ws": "8.5.3", "isomorphic-ws": "^5.0.0", @@ -114697,8 +113562,7 @@ }, "packages/ddex/node_modules/web3-rpc-methods": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.4.tgz", - "integrity": "sha512-LTFNg4LFaeU8K9ecuT8fHDp/LOXyxCneeZjCrRYIW1u82Ly52SrY55FIzMIISGoG/iT5Wh7UiHOB3CQsWLBmbQ==", + "license": "LGPL-3.0", "dependencies": { "web3-core": "^4.3.2", "web3-types": "^1.3.1", @@ -114710,14 +113574,28 @@ } }, "packages/ddex/node_modules/web3-utils": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.1.0.tgz", - "integrity": "sha512-+VJWR6FtCsgwuJr5tvSvQlSEG06586df8h2CxGc9tcNtIDyJKNkSDDWJkdNPvyDhhXFzQYFh8QOGymD1CIP6fw==", + "version": "4.1.1", + "license": "LGPL-3.0", "dependencies": { "ethereum-cryptography": "^2.0.0", "web3-errors": "^1.1.4", "web3-types": "^1.3.1", - "web3-validator": "^2.0.3" + "web3-validator": "^2.0.4" + }, + "engines": { + "node": ">=14", + "npm": ">=6.12.0" + } + }, + "packages/ddex/node_modules/web3-validator": { + "version": "2.0.4", + "license": "LGPL-3.0", + "dependencies": { + "ethereum-cryptography": "^2.0.0", + "util": "^0.12.5", + "web3-errors": "^1.1.4", + "web3-types": "^1.3.1", + "zod": "^3.21.4" }, "engines": { "node": ">=14", @@ -114726,13 +113604,11 @@ }, "packages/ddex/node_modules/webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "license": "BSD-2-Clause" }, "packages/ddex/node_modules/whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -114740,8 +113616,7 @@ }, "packages/ddex/node_modules/ws": { "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -114765,8 +113640,7 @@ }, "packages/ddex/node_modules/zod": { "version": "3.22.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz", - "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -114841,22 +113715,6 @@ "@babel/highlight": "^7.10.4" } }, - "packages/discovery-provider/plugins/pedalboard/apps/app-template/node_modules/@esbuild/linux-loong64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz", - "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, "packages/discovery-provider/plugins/pedalboard/apps/app-template/node_modules/@eslint/eslintrc": { "version": "0.4.3", "dev": true, @@ -117081,22 +115939,6 @@ "@babel/highlight": "^7.10.4" } }, - "packages/discovery-provider/plugins/pedalboard/apps/relay/node_modules/@esbuild/linux-loong64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz", - "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, "packages/discovery-provider/plugins/pedalboard/apps/relay/node_modules/@eslint/eslintrc": { "version": "0.4.3", "dev": true, @@ -119656,8 +118498,10 @@ }, "packages/discovery-provider/plugins/pedalboard/apps/relay/node_modules/redis": { "version": "4.6.11", - "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.11.tgz", - "integrity": "sha512-kg1Lt4NZLYkAjPOj/WcyIGWfZfnyfKo1Wg9YKVSlzhFwxpFIl3LYI8BWy1Ab963LLDsTz2+OwdsesHKljB3WMQ==", + "license": "MIT", + "workspaces": [ + "./packages/*" + ], "dependencies": { "@redis/bloom": "1.2.0", "@redis/client": "1.5.12", @@ -120055,22 +118899,6 @@ "@babel/highlight": "^7.10.4" } }, - "packages/discovery-provider/plugins/pedalboard/apps/sla-auditor/node_modules/@esbuild/linux-loong64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz", - "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, "packages/discovery-provider/plugins/pedalboard/apps/sla-auditor/node_modules/@eslint/eslintrc": { "version": "0.4.3", "dev": true, @@ -122557,54 +121385,6 @@ "esbuild-windows-arm64": "0.14.38" } }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-android-64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.38.tgz", - "integrity": "sha512-aRFxR3scRKkbmNuGAK+Gee3+yFxkTJO/cx83Dkyzo4CnQl/2zVSurtG6+G86EQIZ+w+VYngVyK7P3HyTBKu3nw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-android-arm64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.38.tgz", - "integrity": "sha512-L2NgQRWuHFI89IIZIlpAcINy9FvBk6xFVZ7xGdOwIm8VyhX1vNCEqUJO3DPSSy945Gzdg98cxtNt8Grv1CsyhA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-darwin-64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.38.tgz", - "integrity": "sha512-5JJvgXkX87Pd1Og0u/NJuO7TSqAikAcQQ74gyJ87bqWRVeouky84ICoV4sN6VV53aTW+NE87qLdGY4QA2S7KNA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-darwin-arm64": { "version": "0.14.38", "cpu": [ @@ -122620,198 +121400,6 @@ "node": ">=12" } }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-freebsd-64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.38.tgz", - "integrity": "sha512-epnPbhZUt93xV5cgeY36ZxPXDsQeO55DppzsIgWM8vgiG/Rz+qYDLmh5ts3e+Ln1wA9dQ+nZmVHw+RjaW3I5Ig==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-freebsd-arm64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.38.tgz", - "integrity": "sha512-/9icXUYJWherhk+y5fjPI5yNUdFPtXHQlwP7/K/zg8t8lQdHVj20SqU9/udQmeUo5pDFHMYzcEFfJqgOVeKNNQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-32": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.38.tgz", - "integrity": "sha512-QfgfeNHRFvr2XeHFzP8kOZVnal3QvST3A0cgq32ZrHjSMFTdgXhMhmWdKzRXP/PKcfv3e2OW9tT9PpcjNvaq6g==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.38.tgz", - "integrity": "sha512-uuZHNmqcs+Bj1qiW9k/HZU3FtIHmYiuxZ/6Aa+/KHb/pFKr7R3aVqvxlAudYI9Fw3St0VCPfv7QBpUITSmBR1Q==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-arm": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.38.tgz", - "integrity": "sha512-FiFvQe8J3VKTDXG01JbvoVRXQ0x6UZwyrU4IaLBZeq39Bsbatd94Fuc3F1RGqPF5RbIWW7RvkVQjn79ejzysnA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-arm64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.38.tgz", - "integrity": "sha512-HlMGZTEsBrXrivr64eZ/EO0NQM8H8DuSENRok9d+Jtvq8hOLzrxfsAT9U94K3KOGk2XgCmkaI2KD8hX7F97lvA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-mips64le": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.38.tgz", - "integrity": "sha512-qd1dLf2v7QBiI5wwfil9j0HG/5YMFBAmMVmdeokbNAMbcg49p25t6IlJFXAeLzogv1AvgaXRXvgFNhScYEUXGQ==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-ppc64le": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.38.tgz", - "integrity": "sha512-mnbEm7o69gTl60jSuK+nn+pRsRHGtDPfzhrqEUXyCl7CTOCLtWN2bhK8bgsdp6J/2NyS/wHBjs1x8aBWwP2X9Q==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-riscv64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.38.tgz", - "integrity": "sha512-+p6YKYbuV72uikChRk14FSyNJZ4WfYkffj6Af0/Tw63/6TJX6TnIKE+6D3xtEc7DeDth1fjUOEqm+ApKFXbbVQ==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-s390x": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.38.tgz", - "integrity": "sha512-0zUsiDkGJiMHxBQ7JDU8jbaanUY975CdOW1YDrurjrM0vWHfjv9tLQsW9GSyEb/heSK1L5gaweRjzfUVBFoybQ==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-netbsd-64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.38.tgz", - "integrity": "sha512-cljBAApVwkpnJZfnRVThpRBGzCi+a+V9Ofb1fVkKhtrPLDYlHLrSYGtmnoTVWDQdU516qYI8+wOgcGZ4XIZh0Q==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-openbsd-64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.38.tgz", - "integrity": "sha512-CDswYr2PWPGEPpLDUO50mL3WO/07EMjnZDNKpmaxUPsrW+kVM3LoAqr/CE8UbzugpEiflYqJsGPLirThRB18IQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-register": { "version": "3.3.2", "dev": true, @@ -122820,70 +121408,6 @@ "esbuild": ">=0.12 <1" } }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-sunos-64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.38.tgz", - "integrity": "sha512-2mfIoYW58gKcC3bck0j7lD3RZkqYA7MmujFYmSn9l6TiIcAMpuEvqksO+ntBgbLep/eyjpgdplF7b+4T9VJGOA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-windows-32": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.38.tgz", - "integrity": "sha512-L2BmEeFZATAvU+FJzJiRLFUP+d9RHN+QXpgaOrs2klshoAm1AE6Us4X6fS9k33Uy5SzScn2TpcgecbqJza1Hjw==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-windows-64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.38.tgz", - "integrity": "sha512-Khy4wVmebnzue8aeSXLC+6clo/hRYeNIm0DyikoEqX+3w3rcvrhzpoix0S+MF9vzh6JFskkIGD7Zx47ODJNyCw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-windows-arm64": { - "version": "0.14.38", - "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.38.tgz", - "integrity": "sha512-k3FGCNmHBkqdJXuJszdWciAH77PukEyDsdIryEHn9cKLQFxzhT39dSumeTuggaQcXY57UlmLGIkklWZo2qzHpw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/eslint": { "version": "7.32.0", "dev": true, @@ -123573,22 +122097,6 @@ "@babel/highlight": "^7.10.4" } }, - "packages/discovery-provider/plugins/pedalboard/apps/trending-challenge-rewards/node_modules/@esbuild/linux-loong64": { - "version": "0.14.54", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz", - "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, "packages/discovery-provider/plugins/pedalboard/apps/trending-challenge-rewards/node_modules/@eslint/eslintrc": { "version": "0.4.3", "dev": true, @@ -131352,9 +129860,8 @@ }, "packages/es-indexer/node_modules/@types/node": { "version": "17.0.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", - "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==", - "dev": true + "dev": true, + "license": "MIT" }, "packages/es-indexer/node_modules/acorn": { "version": "8.11.2", @@ -131855,6 +130362,7 @@ "@emotion/styled": "11.11.0", "@radix-ui/react-slot": "1.0.2", "@react-spring/web": "9.7.2", + "@rollup/plugin-alias": "5.0.1", "@storybook/addon-a11y": "7.4.0", "@storybook/addon-actions": "7.4.2", "@storybook/addon-essentials": "7.4.2", @@ -131976,6 +130484,25 @@ "node": ">=10.10.0" } }, + "packages/harmony/node_modules/@rollup/plugin-alias": { + "version": "5.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "slash": "^4.0.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, "packages/harmony/node_modules/@rollup/pluginutils": { "version": "4.2.1", "dev": true, @@ -132271,9 +130798,8 @@ }, "packages/harmony/node_modules/classnames": { "version": "2.5.1", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", - "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==", - "dev": true + "dev": true, + "license": "MIT" }, "packages/harmony/node_modules/cross-spawn": { "version": "7.0.3", @@ -132798,9 +131324,8 @@ }, "packages/harmony/node_modules/rollup": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.3.0.tgz", - "integrity": "sha512-scIi1NrKLDIYSPK66jjECtII7vIgdAMFmFo8h6qm++I6nN9qDSV35Ku6erzGVqYjx+lj+j5wkusRMr++8SyDZg==", "dev": true, + "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -132899,6 +131424,17 @@ "node": ">=8" } }, + "packages/harmony/node_modules/slash": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "packages/harmony/node_modules/source-map": { "version": "0.6.1", "dev": true, @@ -136067,8 +134603,7 @@ }, "packages/libs/node_modules/@babel/core": { "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz", - "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==", + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", @@ -136137,8 +134672,7 @@ }, "packages/libs/node_modules/@babel/helpers": { "version": "7.23.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.8.tgz", - "integrity": "sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==", + "license": "MIT", "dependencies": { "@babel/template": "^7.22.15", "@babel/traverse": "^7.23.7", @@ -136348,8 +134882,7 @@ }, "packages/libs/node_modules/@babel/traverse": { "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", - "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", @@ -136746,8 +135279,7 @@ }, "packages/libs/node_modules/cross-fetch": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", - "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", + "license": "MIT", "dependencies": { "node-fetch": "^2.6.12" } @@ -137252,8 +135784,7 @@ }, "packages/libs/node_modules/node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -137607,8 +136138,7 @@ }, "packages/libs/node_modules/tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "license": "MIT" }, "packages/libs/node_modules/ts-mocha": { "version": "9.0.2", @@ -137743,13 +136273,11 @@ }, "packages/libs/node_modules/webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "license": "BSD-2-Clause" }, "packages/libs/node_modules/whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -138622,9 +137150,8 @@ }, "packages/mobile/node_modules/@storybook/addon-ondevice-actions": { "version": "6.5.7", - "resolved": "https://registry.npmjs.org/@storybook/addon-ondevice-actions/-/addon-ondevice-actions-6.5.7.tgz", - "integrity": "sha512-Zrk75yQbJ3fOf/e5XROeBYfT/UYz24he+LWNicIajNTPRz+YhnOmWedWYF/vEVQ+exnAi3U4cFkX3qUq9blI3w==", "dev": true, + "license": "MIT", "dependencies": { "@storybook/addons": "^6.5.14", "@storybook/core-events": "^6.5.14", @@ -138638,15 +137165,13 @@ }, "packages/mobile/node_modules/@storybook/addon-ondevice-actions/node_modules/fast-deep-equal": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==", - "dev": true + "dev": true, + "license": "MIT" }, "packages/mobile/node_modules/@storybook/addon-ondevice-backgrounds": { "version": "6.5.7", - "resolved": "https://registry.npmjs.org/@storybook/addon-ondevice-backgrounds/-/addon-ondevice-backgrounds-6.5.7.tgz", - "integrity": "sha512-JY+kLkI+VGV9ry3oIdn9bNHzd/dE1X5F//LXppx8pcbqswgCrwIkuZJJQ3A7ppPr34YxtnGJptKdAId7FFpB3w==", "dev": true, + "license": "MIT", "dependencies": { "@storybook/addons": "^6.5.14", "@storybook/api": "^6.5.14", @@ -138662,9 +137187,8 @@ }, "packages/mobile/node_modules/@storybook/addon-ondevice-controls": { "version": "6.5.7", - "resolved": "https://registry.npmjs.org/@storybook/addon-ondevice-controls/-/addon-ondevice-controls-6.5.7.tgz", - "integrity": "sha512-dy3d2D8TzEIGaEufS3mB3X7K0Wa5qBc6QEGE1b0S8ra9pa9Hw5YD43fk7xvwSJ1QIbOFCr7QWbfnB1c2QwyFSQ==", "dev": true, + "license": "MIT", "dependencies": { "@storybook/addons": "^6.5.14", "@storybook/client-logger": "^6.5.14", @@ -138687,9 +137211,8 @@ }, "packages/mobile/node_modules/@storybook/addon-ondevice-controls/node_modules/react-native-modal-datetime-picker": { "version": "14.0.1", - "resolved": "https://registry.npmjs.org/react-native-modal-datetime-picker/-/react-native-modal-datetime-picker-14.0.1.tgz", - "integrity": "sha512-wQt4Pjxt2jiTsVhLMG0E7WrRTYBEQx2d/nUrFVCbRqJ7lrXocXaT5UZsyMpV93TnKcyut62OprbO88wYq/vh0g==", "dev": true, + "license": "MIT", "dependencies": { "prop-types": "^15.7.2" }, @@ -139131,8 +137654,7 @@ }, "packages/mobile/node_modules/color": { "version": "4.2.3", - "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", - "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1", "color-string": "^1.9.0" @@ -139869,8 +138391,7 @@ }, "packages/mobile/node_modules/react-native-track-player": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/react-native-track-player/-/react-native-track-player-4.0.1.tgz", - "integrity": "sha512-DpqKL4TQS0kGlHwEtmMrL++mdgWb+uc75eQiP3vfYSlgvAJjbXbkL9h+cofndSuq4TTCp8jclAK+hZKqtMw6+A==", + "license": "Apache-2.0", "funding": { "url": "https://github.com/doublesymmetry/react-native-track-player?sponsor=1" }, @@ -145990,8 +144511,7 @@ }, "packages/trpc-server/node_modules/@elastic/elasticsearch": { "version": "8.11.0", - "resolved": "https://registry.npmjs.org/@elastic/elasticsearch/-/elasticsearch-8.11.0.tgz", - "integrity": "sha512-1UEQFdGLuKdROLJnMTjegasRM3X9INm/PVADoIVgdTfuv6DeJ17UMuNwYSkCrLrC0trLjjGV4YganpbJJX/VLg==", + "license": "Apache-2.0", "dependencies": { "@elastic/transport": "^8.4.0", "tslib": "^2.4.0" @@ -146002,8 +144522,7 @@ }, "packages/trpc-server/node_modules/@elastic/transport": { "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@elastic/transport/-/transport-8.4.0.tgz", - "integrity": "sha512-Yb3fDa7yGD0ca3uMbL64M3vM1cE5h5uHmBcTjkdB4VpCasRNKSd09iDpwqX8zX1tbBtxcaKYLceKthWvPeIxTw==", + "license": "Apache-2.0", "dependencies": { "debug": "^4.3.4", "hpagent": "^1.0.0", @@ -146040,24 +144559,21 @@ }, "packages/trpc-server/node_modules/@types/cors": { "version": "2.8.13", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz", - "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } }, "packages/trpc-server/node_modules/@types/node": { "version": "18.16.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.16.tgz", - "integrity": "sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g==", - "dev": true + "dev": true, + "license": "MIT" }, "packages/trpc-server/node_modules/@types/swagger-ui-express": { "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.4.tgz", - "integrity": "sha512-h6dfIPFveCJKpStDtjrB+4pig4DAf9Uu2Z51RB7Fj3s6AifexmqhZxBoG50K/k3Afz7wyXsIAY5ZIDTlC2VjrQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/express": "*", "@types/serve-static": "*" @@ -146383,10 +144899,8 @@ }, "packages/trpc-server/node_modules/fsevents": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -146519,6 +145033,17 @@ "version": "0.1.7", "license": "MIT" }, + "packages/trpc-server/node_modules/postgres": { + "version": "3.4.3", + "license": "Unlicense", + "engines": { + "node": ">=12" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/porsager" + } + }, "packages/trpc-server/node_modules/qs": { "version": "6.11.0", "license": "BSD-3-Clause", @@ -146638,9 +145163,8 @@ }, "packages/trpc-server/node_modules/tsx": { "version": "3.12.7", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.7.tgz", - "integrity": "sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==", "dev": true, + "license": "MIT", "dependencies": { "@esbuild-kit/cjs-loader": "^2.4.2", "@esbuild-kit/core-utils": "^3.0.0", @@ -146890,25 +145414,23 @@ "typescript": "5.0.4", "typescript-plugin-css-modules": "^3.4.0", "url": "^0.11.0", - "vite": "4.5.0", + "vite": "^4.2.2", "vite-plugin-glslify": "2.0.2", "vite-plugin-svgr": "4.1.0", - "vite-tsconfig-paths": "4.2.1", + "vite-tsconfig-paths": "^4.2.1", "vitest": "0.34.6" } }, "packages/web/node_modules/@cloudflare/kv-asset-handler": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.2.0.tgz", - "integrity": "sha512-MVbXLbTcAotOPUj0pAMhVtJ+3/kFkwJqc5qNOleOZTv6QkZZABDMS21dSrSlVswEHwrpWC03e4fWytjqKvuE2A==", + "license": "MIT OR Apache-2.0", "dependencies": { "mime": "^3.0.0" } }, "packages/web/node_modules/@cloudflare/kv-asset-handler/node_modules/mime": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", - "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -146918,9 +145440,8 @@ }, "packages/web/node_modules/@electron/get": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", - "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.1.1", "env-paths": "^2.2.0", @@ -146939,9 +145460,8 @@ }, "packages/web/node_modules/@electron/notarize": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.0.tgz", - "integrity": "sha512-Sf7RG47rafeGuUm+kLEbTXMN8XZeYXN70dMBstrcgiykxCq3SLl1uqxFWndxSI1LfMqv4Eq9PTDHLPwiya31Kg==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.1.1", "fs-extra": "^9.0.1", @@ -146953,9 +145473,8 @@ }, "packages/web/node_modules/@electron/notarize/node_modules/fs-extra": { "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, + "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -146968,9 +145487,8 @@ }, "packages/web/node_modules/@electron/universal": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.4.1.tgz", - "integrity": "sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==", "dev": true, + "license": "MIT", "dependencies": { "@electron/asar": "^3.2.1", "@malept/cross-spawn-promise": "^1.1.0", @@ -146986,9 +145504,8 @@ }, "packages/web/node_modules/@electron/universal/node_modules/fs-extra": { "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, + "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -146999,576 +145516,6 @@ "node": ">=10" } }, - "packages/web/node_modules/@ethersproject/abi": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", - "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/abstract-provider": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", - "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/abstract-signer": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", - "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/address": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", - "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/rlp": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/base64": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", - "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/basex": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.7.0.tgz", - "integrity": "sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/contracts": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.7.0.tgz", - "integrity": "sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/hash": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", - "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/hdnode": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.7.0.tgz", - "integrity": "sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/basex": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/pbkdf2": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/wordlists": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/json-wallets": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz", - "integrity": "sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hdnode": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/pbkdf2": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "aes-js": "3.0.0", - "scrypt-js": "3.0.1" - } - }, - "packages/web/node_modules/@ethersproject/networks": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", - "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/pbkdf2": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz", - "integrity": "sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/sha2": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/properties": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", - "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/providers": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.7.2.tgz", - "integrity": "sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/basex": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0", - "bech32": "1.1.4", - "ws": "7.4.6" - } - }, - "packages/web/node_modules/@ethersproject/random": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.7.0.tgz", - "integrity": "sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/rlp": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", - "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/signing-key": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", - "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "bn.js": "^5.2.1", - "elliptic": "6.5.4", - "hash.js": "1.1.7" - } - }, - "packages/web/node_modules/@ethersproject/signing-key/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", - "dev": true - }, - "packages/web/node_modules/@ethersproject/solidity": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.7.0.tgz", - "integrity": "sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/transactions": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", - "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/units": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.7.0.tgz", - "integrity": "sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/wallet": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.7.0.tgz", - "integrity": "sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/hdnode": "^5.7.0", - "@ethersproject/json-wallets": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/wordlists": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/web": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", - "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "packages/web/node_modules/@ethersproject/wordlists": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.7.0.tgz", - "integrity": "sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, "packages/web/node_modules/@humanwhocodes/config-array": { "version": "0.9.5", "dev": true, @@ -148044,21 +145991,18 @@ }, "packages/web/node_modules/@project-serum/anchor/node_modules/bn.js": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" + "license": "MIT" }, "packages/web/node_modules/@project-serum/anchor/node_modules/cross-fetch": { "version": "3.1.8", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", - "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", + "license": "MIT", "dependencies": { "node-fetch": "^2.6.12" } }, "packages/web/node_modules/@project-serum/anchor/node_modules/node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -148076,9 +146020,8 @@ }, "packages/web/node_modules/@sindresorhus/is": { "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", - "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -148088,9 +146031,8 @@ }, "packages/web/node_modules/@szmarczak/http-timer": { "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", - "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", "dev": true, + "license": "MIT", "dependencies": { "defer-to-connect": "^2.0.0" }, @@ -148114,15 +146056,8 @@ }, "packages/web/node_modules/7zip-bin": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", - "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==", - "dev": true - }, - "packages/web/node_modules/aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==", - "dev": true + "dev": true, + "license": "MIT" }, "packages/web/node_modules/ajv": { "version": "7.2.4", @@ -148183,9 +146118,8 @@ }, "packages/web/node_modules/app-builder-lib": { "version": "24.9.1", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.9.1.tgz", - "integrity": "sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g==", "dev": true, + "license": "MIT", "dependencies": { "@develar/schema-utils": "~2.6.5", "@electron/notarize": "2.1.0", @@ -148222,9 +146156,8 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/@electron/notarize": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.1.0.tgz", - "integrity": "sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.1.1", "fs-extra": "^9.0.1", @@ -148236,9 +146169,8 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/@electron/notarize/node_modules/fs-extra": { "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, + "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -148251,9 +146183,8 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/fs-extra": { "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -148265,9 +146196,8 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/js-yaml": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -148277,9 +146207,8 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/minimatch": { "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -148289,9 +146218,8 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/mkdirp": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, + "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" }, @@ -148301,9 +146229,8 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -148316,9 +146243,8 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/tar": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", - "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "dev": true, + "license": "ISC", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -148335,54 +146261,22 @@ "version": "2.0.1", "license": "Python-2.0" }, - "packages/web/node_modules/armada-cli": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/armada-cli/-/armada-cli-0.4.0.tgz", - "integrity": "sha512-yXNGmimBG0xUYXmFHi5VimJTJM4HrkoM/v2tks2zL8J1tky0cuHa2auc4TWqWPrS5nxkQ/xaJlBEZcQHcV6tpg==", - "dev": true, - "dependencies": { - "@ethersproject/constants": "^5.7.0", - "@ledgerhq/hw-app-eth": "^6.29.10", - "@ledgerhq/hw-transport-node-hid": "^6.27.6", - "@oclif/core": "^1.20.2", - "@oclif/plugin-help": "^5.1.17", - "ethers": "^5.7.1", - "inquirer": "^7.1.4", - "keytar": "^7.9.0", - "tar": "^6.1.11", - "yargs": "^17.6.0" - }, - "bin": { - "armada": "bin/run" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "packages/web/node_modules/bech32": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", - "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==", - "dev": true - }, "packages/web/node_modules/body-scroll-lock": { "version": "4.0.0-beta.0", "license": "MIT" }, "packages/web/node_modules/brace-expansion": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, "packages/web/node_modules/builder-util": { "version": "24.8.1", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.8.1.tgz", - "integrity": "sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw==", "dev": true, + "license": "MIT", "dependencies": { "@types/debug": "^4.1.6", "7zip-bin": "~5.2.0", @@ -148404,8 +146298,7 @@ }, "packages/web/node_modules/builder-util-runtime": { "version": "9.2.3", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz", - "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==", + "license": "MIT", "dependencies": { "debug": "^4.3.4", "sax": "^1.2.4" @@ -148416,9 +146309,8 @@ }, "packages/web/node_modules/builder-util/node_modules/cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -148430,9 +146322,8 @@ }, "packages/web/node_modules/builder-util/node_modules/fs-extra": { "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -148444,9 +146335,8 @@ }, "packages/web/node_modules/builder-util/node_modules/js-yaml": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -148456,18 +146346,16 @@ }, "packages/web/node_modules/cacheable-lookup": { "version": "5.0.4", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", - "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.6.0" } }, "packages/web/node_modules/cacheable-request": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", - "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", "dev": true, + "license": "MIT", "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -148508,16 +146396,14 @@ }, "packages/web/node_modules/cross-fetch": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", - "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", + "license": "MIT", "dependencies": { "node-fetch": "^2.6.12" } }, "packages/web/node_modules/cross-fetch/node_modules/node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -148542,18 +146428,16 @@ }, "packages/web/node_modules/defer-to-connect": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } }, "packages/web/node_modules/dir-compare": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-3.3.0.tgz", - "integrity": "sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==", "dev": true, + "license": "MIT", "dependencies": { "buffer-equal": "^1.0.0", "minimatch": "^3.0.4" @@ -148561,9 +146445,8 @@ }, "packages/web/node_modules/dmg-builder": { "version": "24.9.1", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.9.1.tgz", - "integrity": "sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ==", "dev": true, + "license": "MIT", "dependencies": { "app-builder-lib": "24.9.1", "builder-util": "24.8.1", @@ -148578,9 +146461,8 @@ }, "packages/web/node_modules/dmg-builder/node_modules/fs-extra": { "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -148592,9 +146474,8 @@ }, "packages/web/node_modules/dmg-builder/node_modules/js-yaml": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -148604,19 +146485,17 @@ }, "packages/web/node_modules/dotenv": { "version": "9.0.2", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz", - "integrity": "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=10" } }, "packages/web/node_modules/electron": { "version": "28.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-28.1.0.tgz", - "integrity": "sha512-82Y7o4PSWPn1o/aVwYPsgmBw6Gyf2lVHpaBu3Ef8LrLWXxytg7ZRZr/RtDqEMOzQp3+mcuy3huH84MyjdmP50Q==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^18.11.18", @@ -148631,9 +146510,8 @@ }, "packages/web/node_modules/electron-builder": { "version": "24.9.1", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.9.1.tgz", - "integrity": "sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg==", "dev": true, + "license": "MIT", "dependencies": { "app-builder-lib": "24.9.1", "builder-util": "24.8.1", @@ -148657,9 +146535,8 @@ }, "packages/web/node_modules/electron-builder/node_modules/fs-extra": { "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -148671,17 +146548,15 @@ }, "packages/web/node_modules/electron-log": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.3.tgz", - "integrity": "sha512-jUgAuRjfpCD9tmH1F6fb195YsFfM/DkqkZLhFeo0VAAstantn11bxmgx63uE6KG/JljHG7sIkgM2QEjDimJI0g==", + "license": "MIT", "engines": { "node": ">= 14" } }, "packages/web/node_modules/electron-publish": { "version": "24.8.1", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.8.1.tgz", - "integrity": "sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==", "dev": true, + "license": "MIT", "dependencies": { "@types/fs-extra": "^9.0.11", "builder-util": "24.8.1", @@ -148694,9 +146569,8 @@ }, "packages/web/node_modules/electron-publish/node_modules/fs-extra": { "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -148708,8 +146582,7 @@ }, "packages/web/node_modules/electron-updater": { "version": "6.1.7", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.7.tgz", - "integrity": "sha512-SNOhYizjkm4ET+Y8ilJyUzcVsFJDtINzVN1TyHnZeMidZEG3YoBebMyXc/J6WSiXdUaOjC7ngekN6rNp6ardHA==", + "license": "MIT", "dependencies": { "builder-util-runtime": "9.2.3", "fs-extra": "^10.1.0", @@ -148723,8 +146596,7 @@ }, "packages/web/node_modules/electron-updater/node_modules/fs-extra": { "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -148736,8 +146608,7 @@ }, "packages/web/node_modules/electron-updater/node_modules/js-yaml": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -148747,8 +146618,7 @@ }, "packages/web/node_modules/electron-updater/node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -148761,9 +146631,8 @@ }, "packages/web/node_modules/electron/node_modules/@types/node": { "version": "18.19.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.4.tgz", - "integrity": "sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A==", "dev": true, + "license": "MIT", "dependencies": { "undici-types": "~5.26.4" } @@ -148903,54 +146772,6 @@ "dev": true, "license": "MIT" }, - "packages/web/node_modules/ethers": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.7.2.tgz", - "integrity": "sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abi": "5.7.0", - "@ethersproject/abstract-provider": "5.7.0", - "@ethersproject/abstract-signer": "5.7.0", - "@ethersproject/address": "5.7.0", - "@ethersproject/base64": "5.7.0", - "@ethersproject/basex": "5.7.0", - "@ethersproject/bignumber": "5.7.0", - "@ethersproject/bytes": "5.7.0", - "@ethersproject/constants": "5.7.0", - "@ethersproject/contracts": "5.7.0", - "@ethersproject/hash": "5.7.0", - "@ethersproject/hdnode": "5.7.0", - "@ethersproject/json-wallets": "5.7.0", - "@ethersproject/keccak256": "5.7.0", - "@ethersproject/logger": "5.7.0", - "@ethersproject/networks": "5.7.1", - "@ethersproject/pbkdf2": "5.7.0", - "@ethersproject/properties": "5.7.0", - "@ethersproject/providers": "5.7.2", - "@ethersproject/random": "5.7.0", - "@ethersproject/rlp": "5.7.0", - "@ethersproject/sha2": "5.7.0", - "@ethersproject/signing-key": "5.7.0", - "@ethersproject/solidity": "5.7.0", - "@ethersproject/strings": "5.7.0", - "@ethersproject/transactions": "5.7.0", - "@ethersproject/units": "5.7.0", - "@ethersproject/wallet": "5.7.0", - "@ethersproject/web": "5.7.1", - "@ethersproject/wordlists": "5.7.0" - } - }, "packages/web/node_modules/file-type": { "version": "9.0.0", "license": "MIT", @@ -148960,9 +146781,8 @@ }, "packages/web/node_modules/form-data": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -149010,9 +146830,8 @@ }, "packages/web/node_modules/got": { "version": "11.8.6", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", - "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", "dev": true, + "license": "MIT", "dependencies": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -149035,9 +146854,8 @@ }, "packages/web/node_modules/got/node_modules/decompress-response": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "dev": true, + "license": "MIT", "dependencies": { "mimic-response": "^3.1.0" }, @@ -149050,9 +146868,8 @@ }, "packages/web/node_modules/http2-wrapper": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", - "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", "dev": true, + "license": "MIT", "dependencies": { "quick-lru": "^5.1.1", "resolve-alpn": "^1.0.0" @@ -149063,9 +146880,8 @@ }, "packages/web/node_modules/iconv-lite": { "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -149073,35 +146889,10 @@ "node": ">=0.10.0" } }, - "packages/web/node_modules/inquirer": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", - "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.19", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.6.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "engines": { - "node": ">=8.0.0" - } - }, "packages/web/node_modules/isbinaryfile": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.0.tgz", - "integrity": "sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 14.0.0" }, @@ -149134,8 +146925,7 @@ }, "packages/web/node_modules/jsonfile": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -149145,17 +146935,15 @@ }, "packages/web/node_modules/lowercase-keys": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "packages/web/node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -149165,9 +146953,8 @@ }, "packages/web/node_modules/mimic-response": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -149181,9 +146968,8 @@ }, "packages/web/node_modules/minipass": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, + "license": "ISC", "engines": { "node": ">=8" } @@ -149200,9 +146986,8 @@ }, "packages/web/node_modules/normalize-url": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -149212,9 +146997,8 @@ }, "packages/web/node_modules/p-cancelable": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", - "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -149244,9 +147028,8 @@ }, "packages/web/node_modules/quick-lru": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -149280,9 +147063,8 @@ }, "packages/web/node_modules/read-config-file": { "version": "6.3.2", - "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz", - "integrity": "sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==", "dev": true, + "license": "MIT", "dependencies": { "config-file-ts": "^0.2.4", "dotenv": "^9.0.2", @@ -149297,9 +147079,8 @@ }, "packages/web/node_modules/read-config-file/node_modules/js-yaml": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -149309,9 +147090,8 @@ }, "packages/web/node_modules/responselike": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", - "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", "dev": true, + "license": "MIT", "dependencies": { "lowercase-keys": "^2.0.0" }, @@ -149319,28 +147099,9 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/web/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "packages/web/node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "packages/web/node_modules/sax": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", - "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==" + "license": "ISC" }, "packages/web/node_modules/shebang-command": { "version": "2.0.0", @@ -149388,8 +147149,7 @@ }, "packages/web/node_modules/tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "license": "MIT" }, "packages/web/node_modules/tslib": { "version": "2.6.2", @@ -149407,51 +147167,26 @@ }, "packages/web/node_modules/universalify": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", "engines": { "node": ">= 10.0.0" } }, "packages/web/node_modules/webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "license": "BSD-2-Clause" }, "packages/web/node_modules/whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, - "packages/web/node_modules/ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "packages/web/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "license": "ISC" }, "protocol-dashboard": { "name": "audius-protocol-dashboard", @@ -149558,8 +147293,6 @@ }, "protocol-dashboard/node_modules/@audius/stems": { "version": "0.3.10", - "resolved": "https://registry.npmjs.org/@audius/stems/-/stems-0.3.10.tgz", - "integrity": "sha512-EbsdoVSSi8zKXOsAtZrJotNDS1LYVxKpdykgQ+qmQUSt4FjHZMhMObr/VYBDbVp60PIRFRWVLTSPQ8maXNUMKQ==", "dependencies": { "classnames": "^2.2.6", "lodash": "^4.17.20", @@ -149579,8 +147312,7 @@ }, "protocol-dashboard/node_modules/@audius/stems/node_modules/react-spring": { "version": "8.0.27", - "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz", - "integrity": "sha512-nDpWBe3ZVezukNRandTeLSPcwwTMjNVu1IDq9qA/AMiUqHuRN4BeSWvKr3eIxxg1vtiYiOLy4FqdfCP5IoP77g==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "prop-types": "^15.5.8" @@ -149590,596 +147322,10 @@ "react-dom": ">= 16.8.0" } }, - "protocol-dashboard/node_modules/@ethersproject/abi": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", - "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/abstract-provider": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", - "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/abstract-signer": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", - "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/address": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", - "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/rlp": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/base64": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", - "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/basex": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.7.0.tgz", - "integrity": "sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/contracts": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.7.0.tgz", - "integrity": "sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/hash": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", - "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/hdnode": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.7.0.tgz", - "integrity": "sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/basex": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/pbkdf2": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/wordlists": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/json-wallets": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz", - "integrity": "sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hdnode": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/pbkdf2": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "aes-js": "3.0.0", - "scrypt-js": "3.0.1" - } - }, - "protocol-dashboard/node_modules/@ethersproject/networks": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", - "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/pbkdf2": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz", - "integrity": "sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/sha2": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/properties": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", - "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/providers": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.7.2.tgz", - "integrity": "sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/basex": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0", - "bech32": "1.1.4", - "ws": "7.4.6" - } - }, - "protocol-dashboard/node_modules/@ethersproject/providers/node_modules/ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "protocol-dashboard/node_modules/@ethersproject/random": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.7.0.tgz", - "integrity": "sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/rlp": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", - "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/signing-key": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", - "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "bn.js": "^5.2.1", - "elliptic": "6.5.4", - "hash.js": "1.1.7" - } - }, - "protocol-dashboard/node_modules/@ethersproject/solidity": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.7.0.tgz", - "integrity": "sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/transactions": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", - "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/units": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.7.0.tgz", - "integrity": "sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/wallet": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.7.0.tgz", - "integrity": "sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/hdnode": "^5.7.0", - "@ethersproject/json-wallets": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/wordlists": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/web": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", - "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "protocol-dashboard/node_modules/@ethersproject/wordlists": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.7.0.tgz", - "integrity": "sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, "protocol-dashboard/node_modules/@jest/types": { "version": "24.9.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", - "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", "dev": true, + "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", @@ -150191,8 +147337,7 @@ }, "protocol-dashboard/node_modules/@react-spring/web": { "version": "9.7.3", - "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz", - "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==", + "license": "MIT", "dependencies": { "@react-spring/animated": "~9.7.3", "@react-spring/core": "~9.7.3", @@ -150206,8 +147351,7 @@ }, "protocol-dashboard/node_modules/@reduxjs/toolkit": { "version": "1.9.7", - "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.7.tgz", - "integrity": "sha512-t7v8ZPxhhKgOKtU+uyJT13lu4vL7az5aFi4IdoDs/eS548edn2M8Ik9h8fxgvMjGoAUVFSt6ZC1P5cWmQ014QQ==", + "license": "MIT", "dependencies": { "immer": "^9.0.21", "redux": "^4.2.1", @@ -150229,17 +147373,15 @@ }, "protocol-dashboard/node_modules/@remix-run/router": { "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.10.0.tgz", - "integrity": "sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw==", + "license": "MIT", "engines": { "node": ">=14.0.0" } }, "protocol-dashboard/node_modules/@rollup/plugin-inject": { "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz", - "integrity": "sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==", "dev": true, + "license": "MIT", "dependencies": { "@rollup/pluginutils": "^5.0.1", "estree-walker": "^2.0.2", @@ -150259,9 +147401,8 @@ }, "protocol-dashboard/node_modules/@rollup/pluginutils": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", - "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", "dev": true, + "license": "MIT", "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", @@ -150281,8 +147422,7 @@ }, "protocol-dashboard/node_modules/@tanstack/query-core": { "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.0.5.tgz", - "integrity": "sha512-MThCETMkHDHTnFZHp71L+SqTtD5d6XHftFCVR1xRJdWM3qGrlQ2VCXaj0SKVcyJej2e1Opa2c7iknu1llxCDNQ==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -150290,8 +147430,7 @@ }, "protocol-dashboard/node_modules/@tanstack/react-query": { "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.0.5.tgz", - "integrity": "sha512-ZG0Q4HZ0iuI8mWiZ2/MdVYPHbrmAVhMn7+gLOkxJh6zLIgCL4luSZlohzN5Xt4MjxfxxWioO1nemwpudaTsmQg==", + "license": "MIT", "dependencies": { "@tanstack/query-core": "5.0.5" }, @@ -150313,23 +147452,6 @@ } } }, - "protocol-dashboard/node_modules/@tanstack/react-query-devtools": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.1.0.tgz", - "integrity": "sha512-Ms/GMccsrTBZQ+0v2pyIlaU0NlZXjhutPyhiQCviBqBbvYwsp/N/mT66YFaphzK/bhXzx5+NHbq8GI6V7KMY1Q==", - "dependencies": { - "@tanstack/query-devtools": "5.1.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "peerDependencies": { - "@tanstack/react-query": "^5.0.5", - "react": "^18.0.0", - "react-dom": "^18.0.0" - } - }, "protocol-dashboard/node_modules/@types/bn.js": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz", @@ -150341,21 +147463,18 @@ }, "protocol-dashboard/node_modules/@types/classnames": { "version": "2.2.10", - "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.10.tgz", - "integrity": "sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/@types/estree": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/@types/istanbul-reports": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", - "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", "dev": true, + "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*", "@types/istanbul-lib-report": "*" @@ -150363,63 +147482,55 @@ }, "protocol-dashboard/node_modules/@types/jest": { "version": "24.9.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz", - "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==", "dev": true, + "license": "MIT", "dependencies": { "jest-diff": "^24.3.0" } }, "protocol-dashboard/node_modules/@types/lodash": { "version": "4.14.160", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.160.tgz", - "integrity": "sha512-aP03BShJoO+WVndoVj/WNcB/YBPt+CIU1mvaao2GRAHy2yg4pT/XS4XnVHEQBjPJGycWf/9seKEO9vopTJGkvA==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/@types/node": { "version": "12.0.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.10.tgz", - "integrity": "sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/@types/numeral": { "version": "0.0.28", - "resolved": "https://registry.npmjs.org/@types/numeral/-/numeral-0.0.28.tgz", - "integrity": "sha512-Sjsy10w6XFHDktJJdXzBJmoondAKW+LcGpRFH+9+zXEDj0cOH8BxJuZA9vUDSMAzU1YRJlsPKmZEEiTYDlICLw==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/@types/react-dom": { "version": "18.2.14", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.14.tgz", - "integrity": "sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } }, "protocol-dashboard/node_modules/@types/react-helmet": { "version": "5.0.16", - "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-5.0.16.tgz", - "integrity": "sha512-++KMqwodVBg75hT2ZT4jobvDPi6iPUl/Lhrn0nP1XTcmFLtccaDb4FTAxzrj3egL7WQYTDnpHuPj52FSFkJqzA==", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } }, "protocol-dashboard/node_modules/@types/react-lottie": { "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@types/react-lottie/-/react-lottie-1.2.5.tgz", - "integrity": "sha512-g5c7r0VN8g0hLsFEtR71ZFDWDp6niY4D/7llcAcLjV3LpaoyANmaQ9jispskWpkAUP+NYQcFllMtoGIWUM6VRw==", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } }, "protocol-dashboard/node_modules/@types/react-redux": { "version": "7.1.28", - "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.28.tgz", - "integrity": "sha512-EQr7cChVzVUuqbA+J8ArWK1H0hLAHKOs21SIMrskKZ3nHNeE+LFYA+IsoZGhVOT8Ktjn3M20v4rnZKN3fLbypw==", "dev": true, + "license": "MIT", "dependencies": { "@types/hoist-non-react-statics": "^3.3.0", "@types/react": "*", @@ -150429,9 +147540,8 @@ }, "protocol-dashboard/node_modules/@types/react-virtualized": { "version": "9.21.10", - "resolved": "https://registry.npmjs.org/@types/react-virtualized/-/react-virtualized-9.21.10.tgz", - "integrity": "sha512-f5Ti3A7gGdLkPPFNHTrvKblpsPNBiQoSorOEOD+JPx72g/Ng2lOt4MYfhvQFQNgyIrAro+Z643jbcKafsMW2ag==", "dev": true, + "license": "MIT", "dependencies": { "@types/prop-types": "*", "@types/react": "*" @@ -150439,24 +147549,21 @@ }, "protocol-dashboard/node_modules/@types/semver": { "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.2.1.tgz", - "integrity": "sha512-+beqKQOh9PYxuHvijhVl+tIHvT6tuwOrE9m14zd+MT2A38KoKZhh7pYJ0SNleLtwDsiIxHDsIk9bv01oOxvSvA==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/@types/yargs": { "version": "13.0.12", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz", - "integrity": "sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/yargs-parser": "*" } }, "protocol-dashboard/node_modules/@vitejs/plugin-react-swc": { "version": "3.4.0", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.4.0.tgz", - "integrity": "sha512-m7UaA4Uvz82N/0EOVpZL4XsFIakRqrFKeSNxa1FBLSXGvWrWRBwmZb4qxk+ZIVAZcW3c3dn5YosomDgx62XWcQ==", "dev": true, + "license": "MIT", "dependencies": { "@swc/core": "^1.3.85" }, @@ -150464,26 +147571,18 @@ "vite": "^4" } }, - "protocol-dashboard/node_modules/aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==", - "dev": true - }, "protocol-dashboard/node_modules/ansi-regex": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", - "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "protocol-dashboard/node_modules/ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -150491,46 +147590,9 @@ "node": ">=4" } }, - "protocol-dashboard/node_modules/armada-cli": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/armada-cli/-/armada-cli-0.4.0.tgz", - "integrity": "sha512-yXNGmimBG0xUYXmFHi5VimJTJM4HrkoM/v2tks2zL8J1tky0cuHa2auc4TWqWPrS5nxkQ/xaJlBEZcQHcV6tpg==", - "dev": true, - "dependencies": { - "@ethersproject/constants": "^5.7.0", - "@ledgerhq/hw-app-eth": "^6.29.10", - "@ledgerhq/hw-transport-node-hid": "^6.27.6", - "@oclif/core": "^1.20.2", - "@oclif/plugin-help": "^5.1.17", - "ethers": "^5.7.1", - "inquirer": "^7.1.4", - "keytar": "^7.9.0", - "tar": "^6.1.11", - "yargs": "^17.6.0" - }, - "bin": { - "armada": "bin/run" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "protocol-dashboard/node_modules/bech32": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", - "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==", - "dev": true - }, - "protocol-dashboard/node_modules/bn.js": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", - "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", - "dev": true - }, "protocol-dashboard/node_modules/ccount": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz", - "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -150538,9 +147600,8 @@ }, "protocol-dashboard/node_modules/chalk": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -150552,43 +147613,37 @@ }, "protocol-dashboard/node_modules/classnames": { "version": "2.5.1", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", - "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" + "license": "MIT" }, "protocol-dashboard/node_modules/clsx": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", - "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==", + "license": "MIT", "engines": { "node": ">=6" } }, "protocol-dashboard/node_modules/color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "1.1.3" } }, "protocol-dashboard/node_modules/color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/commander": { "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/cssstyle": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz", - "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==", "dev": true, + "license": "MIT", "dependencies": { "rrweb-cssom": "^0.6.0" }, @@ -150598,9 +147653,8 @@ }, "protocol-dashboard/node_modules/data-urls": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz", - "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==", "dev": true, + "license": "MIT", "dependencies": { "abab": "^2.0.6", "whatwg-mimetype": "^3.0.0", @@ -150612,23 +147666,20 @@ }, "protocol-dashboard/node_modules/dayjs": { "version": "1.8.36", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz", - "integrity": "sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==" + "license": "MIT" }, "protocol-dashboard/node_modules/diff-sequences": { "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } }, "protocol-dashboard/node_modules/enhanced-resolve": { "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -150639,9 +147690,8 @@ }, "protocol-dashboard/node_modules/env-cmd": { "version": "9.0.3", - "resolved": "https://registry.npmjs.org/env-cmd/-/env-cmd-9.0.3.tgz", - "integrity": "sha512-DXNeSkLMlYOmq9At+GyvqpdIDuy3gRvz2Z77kN4cAhRbAGVmeiYaqdWqgHSTJ9wCck6ZD0rtbhHVcN7cc2j7rw==", "dev": true, + "license": "MIT", "dependencies": { "commander": "^2.0.0", "cross-spawn": "^6.0.0" @@ -150655,66 +147705,16 @@ }, "protocol-dashboard/node_modules/escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.0" } }, - "protocol-dashboard/node_modules/ethers": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.7.2.tgz", - "integrity": "sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "dependencies": { - "@ethersproject/abi": "5.7.0", - "@ethersproject/abstract-provider": "5.7.0", - "@ethersproject/abstract-signer": "5.7.0", - "@ethersproject/address": "5.7.0", - "@ethersproject/base64": "5.7.0", - "@ethersproject/basex": "5.7.0", - "@ethersproject/bignumber": "5.7.0", - "@ethersproject/bytes": "5.7.0", - "@ethersproject/constants": "5.7.0", - "@ethersproject/contracts": "5.7.0", - "@ethersproject/hash": "5.7.0", - "@ethersproject/hdnode": "5.7.0", - "@ethersproject/json-wallets": "5.7.0", - "@ethersproject/keccak256": "5.7.0", - "@ethersproject/logger": "5.7.0", - "@ethersproject/networks": "5.7.1", - "@ethersproject/pbkdf2": "5.7.0", - "@ethersproject/properties": "5.7.0", - "@ethersproject/providers": "5.7.2", - "@ethersproject/random": "5.7.0", - "@ethersproject/rlp": "5.7.0", - "@ethersproject/sha2": "5.7.0", - "@ethersproject/signing-key": "5.7.0", - "@ethersproject/solidity": "5.7.0", - "@ethersproject/strings": "5.7.0", - "@ethersproject/transactions": "5.7.0", - "@ethersproject/units": "5.7.0", - "@ethersproject/wallet": "5.7.0", - "@ethersproject/web": "5.7.1", - "@ethersproject/wordlists": "5.7.0" - } - }, "protocol-dashboard/node_modules/form-data": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -150726,9 +147726,7 @@ }, "protocol-dashboard/node_modules/fsevents": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -150739,129 +147737,31 @@ }, "protocol-dashboard/node_modules/graphql": { "version": "15.5.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz", - "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==", + "license": "MIT", "engines": { "node": ">= 10.x" } }, "protocol-dashboard/node_modules/has-flag": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "protocol-dashboard/node_modules/immer": { "version": "9.0.21", - "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz", - "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==", + "license": "MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/immer" } }, - "protocol-dashboard/node_modules/inquirer": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", - "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.19", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.6.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "protocol-dashboard/node_modules/inquirer/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "protocol-dashboard/node_modules/inquirer/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "protocol-dashboard/node_modules/inquirer/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "protocol-dashboard/node_modules/inquirer/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "protocol-dashboard/node_modules/inquirer/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "protocol-dashboard/node_modules/inquirer/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "protocol-dashboard/node_modules/jest-diff": { "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", - "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^2.0.1", "diff-sequences": "^24.9.0", @@ -150874,18 +147774,16 @@ }, "protocol-dashboard/node_modules/jest-get-type": { "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", - "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } }, "protocol-dashboard/node_modules/jsdom": { "version": "22.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", - "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==", "dev": true, + "license": "MIT", "dependencies": { "abab": "^2.0.6", "cssstyle": "^3.0.0", @@ -150925,8 +147823,7 @@ }, "protocol-dashboard/node_modules/longest-streak": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", - "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -150934,9 +147831,8 @@ }, "protocol-dashboard/node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -150946,9 +147842,8 @@ }, "protocol-dashboard/node_modules/magic-string": { "version": "0.30.5", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", - "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, @@ -150958,8 +147853,7 @@ }, "protocol-dashboard/node_modules/markdown-table": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", - "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", + "license": "MIT", "dependencies": { "repeat-string": "^1.0.0" }, @@ -150970,8 +147864,7 @@ }, "protocol-dashboard/node_modules/mdast-util-find-and-replace": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz", - "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==", + "license": "MIT", "dependencies": { "escape-string-regexp": "^4.0.0", "unist-util-is": "^4.0.0", @@ -150984,8 +147877,7 @@ }, "protocol-dashboard/node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -150995,8 +147887,7 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz", - "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==", + "license": "MIT", "dependencies": { "mdast-util-gfm-autolink-literal": "^0.1.0", "mdast-util-gfm-strikethrough": "^0.2.0", @@ -151011,8 +147902,7 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm-autolink-literal": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz", - "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==", + "license": "MIT", "dependencies": { "ccount": "^1.0.0", "mdast-util-find-and-replace": "^1.1.0", @@ -151025,8 +147915,7 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm-strikethrough": { "version": "0.2.3", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz", - "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==", + "license": "MIT", "dependencies": { "mdast-util-to-markdown": "^0.6.0" }, @@ -151037,8 +147926,7 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm-table": { "version": "0.1.6", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz", - "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==", + "license": "MIT", "dependencies": { "markdown-table": "^2.0.0", "mdast-util-to-markdown": "~0.6.0" @@ -151050,8 +147938,7 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm-task-list-item": { "version": "0.1.6", - "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz", - "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==", + "license": "MIT", "dependencies": { "mdast-util-to-markdown": "~0.6.0" }, @@ -151062,8 +147949,7 @@ }, "protocol-dashboard/node_modules/mdast-util-to-markdown": { "version": "0.6.5", - "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", - "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", + "license": "MIT", "dependencies": { "@types/unist": "^2.0.0", "longest-streak": "^2.0.0", @@ -151079,8 +147965,7 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz", - "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==", + "license": "MIT", "dependencies": { "micromark": "~2.11.0", "micromark-extension-gfm-autolink-literal": "~0.5.0", @@ -151096,8 +147981,7 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-autolink-literal": { "version": "0.5.7", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz", - "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==", + "license": "MIT", "dependencies": { "micromark": "~2.11.3" }, @@ -151108,8 +147992,7 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-strikethrough": { "version": "0.6.5", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz", - "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==", + "license": "MIT", "dependencies": { "micromark": "~2.11.0" }, @@ -151120,8 +148003,7 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-table": { "version": "0.4.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz", - "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==", + "license": "MIT", "dependencies": { "micromark": "~2.11.0" }, @@ -151132,8 +148014,7 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-tagfilter": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz", - "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==", + "license": "MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" @@ -151141,8 +148022,7 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-task-list-item": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz", - "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==", + "license": "MIT", "dependencies": { "micromark": "~2.11.0" }, @@ -151153,8 +148033,6 @@ }, "protocol-dashboard/node_modules/postcss": { "version": "8.4.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", - "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", "dev": true, "funding": [ { @@ -151166,6 +148044,7 @@ "url": "https://tidelift.com/funding/github/npm/postcss" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.4", "picocolors": "^1.0.0", @@ -151177,9 +148056,8 @@ }, "protocol-dashboard/node_modules/prettier": { "version": "1.19.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin-prettier.js" }, @@ -151189,9 +148067,8 @@ }, "protocol-dashboard/node_modules/pretty-format": { "version": "24.9.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", - "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", "dev": true, + "license": "MIT", "dependencies": { "@jest/types": "^24.9.0", "ansi-regex": "^4.0.0", @@ -151204,14 +148081,12 @@ }, "protocol-dashboard/node_modules/punycode": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/react-chartjs-2": { "version": "2.10.0", - "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.10.0.tgz", - "integrity": "sha512-1MjWEkUn8LLFf6GVyYUOrruJTW3yVU5hlEJOwGj3MiokuC+jH/BahjWVGAMonbe9UYbEIUbd2Rn36iVlC0Hb7w==", + "license": "MIT", "dependencies": { "lodash": "^4.17.19", "prop-types": "^15.7.2" @@ -151224,8 +148099,7 @@ }, "protocol-dashboard/node_modules/react-merge-refs": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/react-merge-refs/-/react-merge-refs-2.1.1.tgz", - "integrity": "sha512-jLQXJ/URln51zskhgppGJ2ub7b2WFKGq3cl3NYKtlHoTG+dN2q7EzWrn3hN3EgPsTMvpR9tpq5ijdp7YwFZkag==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/gregberge" @@ -151233,8 +148107,7 @@ }, "protocol-dashboard/node_modules/react-redux": { "version": "8.1.3", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.1.3.tgz", - "integrity": "sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.1", "@types/hoist-non-react-statics": "^3.3.1", @@ -151271,13 +148144,11 @@ }, "protocol-dashboard/node_modules/react-redux/node_modules/react-is": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + "license": "MIT" }, "protocol-dashboard/node_modules/react-router": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.17.0.tgz", - "integrity": "sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA==", + "license": "MIT", "dependencies": { "@remix-run/router": "1.10.0" }, @@ -151290,8 +148161,7 @@ }, "protocol-dashboard/node_modules/react-router-dom": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.17.0.tgz", - "integrity": "sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ==", + "license": "MIT", "dependencies": { "@remix-run/router": "1.10.0", "react-router": "6.17.0" @@ -151306,8 +148176,7 @@ }, "protocol-dashboard/node_modules/react-spring": { "version": "8.0.25", - "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.25.tgz", - "integrity": "sha512-KLSLI9ccpoxvxzCbtTqSOHNHhndxAeEcHsgFZoyybP3GpGh0axmtauUAH8c3XkozIW8r9gScvrCWw3F1EPIcBw==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "prop-types": "^15.5.8" @@ -151319,8 +148188,7 @@ }, "protocol-dashboard/node_modules/react-virtualized": { "version": "9.22.2", - "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.22.2.tgz", - "integrity": "sha512-5j4h4FhxTdOpBKtePSs1yk6LDNT4oGtUwjT7Nkh61Z8vv3fTG/XeOf8J4li1AYaexOwTXnw0HFVxsV0GBUqwRw==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", "clsx": "^1.0.4", @@ -151334,28 +148202,17 @@ "react-dom": "^15.3.0 || ^16.0.0-alpha" } }, - "protocol-dashboard/node_modules/redux": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", - "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", - "dependencies": { - "@babel/runtime": "^7.9.2" - } - }, "protocol-dashboard/node_modules/redux-devtools-extension": { "version": "2.13.9", - "resolved": "https://registry.npmjs.org/redux-devtools-extension/-/redux-devtools-extension-2.13.9.tgz", - "integrity": "sha512-cNJ8Q/EtjhQaZ71c8I9+BPySIBVEKssbPpskBfsXqb8HJ002A3KRVHfeRzwRo6mGPqsm7XuHTqNSNeS1Khig0A==", - "deprecated": "Package moved to @redux-devtools/extension.", "dev": true, + "license": "MIT", "peerDependencies": { "redux": "^3.1.0 || ^4.0.0" } }, "protocol-dashboard/node_modules/remark-gfm": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz", - "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==", + "license": "MIT", "dependencies": { "mdast-util-gfm": "^0.1.0", "micromark-extension-gfm": "^0.3.0" @@ -151367,13 +148224,11 @@ }, "protocol-dashboard/node_modules/reselect": { "version": "4.1.8", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", - "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==" + "license": "MIT" }, "protocol-dashboard/node_modules/rollup": { "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -151385,22 +148240,9 @@ "fsevents": "~2.3.2" } }, - "protocol-dashboard/node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, "protocol-dashboard/node_modules/simplebar-react": { "version": "3.0.0-beta.5", - "resolved": "https://registry.npmjs.org/simplebar-react/-/simplebar-react-3.0.0-beta.5.tgz", - "integrity": "sha512-PHkTNjZkRmH7bB5SmkydkORaNT538n6huEHxTqu7xbFYSP72Z58c6YC2CUlnr0l8x7eMVPLX1XwdEbU6SF63zg==", + "license": "MIT", "dependencies": { "babel-runtime": "^6.26.0", "core-js": "^3.6.5", @@ -151414,9 +148256,8 @@ }, "protocol-dashboard/node_modules/supports-color": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -151426,9 +148267,8 @@ }, "protocol-dashboard/node_modules/tr46": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", - "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", "dev": true, + "license": "MIT", "dependencies": { "punycode": "^2.3.0" }, @@ -151438,18 +148278,16 @@ }, "protocol-dashboard/node_modules/tr46/node_modules/punycode": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "protocol-dashboard/node_modules/ts-loader": { "version": "9.4.4", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.4.tgz", - "integrity": "sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "enhanced-resolve": "^5.0.0", @@ -151466,9 +148304,8 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -151481,9 +148318,8 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/chalk": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -151497,9 +148333,8 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -151509,24 +148344,21 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/color-name": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "protocol-dashboard/node_modules/ts-loader/node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "protocol-dashboard/node_modules/ts-loader/node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -151539,9 +148371,8 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -151551,9 +148382,8 @@ }, "protocol-dashboard/node_modules/typescript": { "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -151564,8 +148394,7 @@ }, "protocol-dashboard/node_modules/unist-util-is": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", + "license": "MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" @@ -151573,8 +148402,7 @@ }, "protocol-dashboard/node_modules/unist-util-visit-parents": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", - "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", + "license": "MIT", "dependencies": { "@types/unist": "^2.0.0", "unist-util-is": "^4.0.0" @@ -151586,9 +148414,8 @@ }, "protocol-dashboard/node_modules/url": { "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", "dev": true, + "license": "MIT", "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -151596,14 +148423,12 @@ }, "protocol-dashboard/node_modules/url-join": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz", - "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==" + "license": "MIT" }, "protocol-dashboard/node_modules/util": { "version": "0.12.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", - "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "is-arguments": "^1.0.4", @@ -151615,8 +148440,7 @@ }, "protocol-dashboard/node_modules/vite": { "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "license": "MIT", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", @@ -151669,9 +148493,11 @@ }, "protocol-dashboard/node_modules/vite-plugin-node-polyfills": { "version": "0.15.0", - "resolved": "https://registry.npmjs.org/vite-plugin-node-polyfills/-/vite-plugin-node-polyfills-0.15.0.tgz", - "integrity": "sha512-IF9aTSPV9zebrcC6ezJA3Ym4r4U1C3jKUAnG16Sq7+UPtisNEOcNOAu3p5wcgFFOuuUwAUjQlIeJHMcnSXXemQ==", "dev": true, + "license": "MIT", + "workspaces": [ + "." + ], "dependencies": { "@rollup/plugin-inject": "^5.0.3", "buffer-polyfill": "npm:buffer@^6.0.3", @@ -151687,8 +148513,6 @@ }, "protocol-dashboard/node_modules/vite/node_modules/postcss": { "version": "8.4.33", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", - "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", "funding": [ { "type": "opencollective", @@ -151703,6 +148527,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.0.0", @@ -151714,9 +148539,8 @@ }, "protocol-dashboard/node_modules/whatwg-url": { "version": "12.0.1", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz", - "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==", "dev": true, + "license": "MIT", "dependencies": { "tr46": "^4.1.1", "webidl-conversions": "^7.0.0" @@ -151727,9 +148551,8 @@ }, "protocol-dashboard/node_modules/ws": { "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -151748,14 +148571,12 @@ }, "protocol-dashboard/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "protocol-dashboard/node_modules/zwitch": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", - "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" diff --git a/packages/common/package.json b/packages/common/package.json index 0140a10de5d..43321816619 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -8,8 +8,8 @@ "license": "", "main": "dist/index.js", "types": "dist/index.d.ts", - "module": "dist/index.js", - "exports": "./dist/index.js", + "module": "dist/index.es.js", + "exports": "./src/index.ts", "files": [ "src" ], diff --git a/packages/common/src/services/audius-backend/AudiusBackend.ts b/packages/common/src/services/audius-backend/AudiusBackend.ts index 7bc2829ce2d..ca4c394801f 100644 --- a/packages/common/src/services/audius-backend/AudiusBackend.ts +++ b/packages/common/src/services/audius-backend/AudiusBackend.ts @@ -84,6 +84,7 @@ import { import type { DiscoveryNodeSelectorService } from '../sdk/discovery-node-selector' import { MonitoringCallbacks } from './types' +console.log('wow 2') type DisplayEncoding = 'utf8' | 'hex' type PhantomEvent = 'disconnect' | 'connect' | 'accountChanged' diff --git a/packages/common/src/services/remote-config/index.ts b/packages/common/src/services/remote-config/index.ts index 30a302983ab..3a1aba5e0a7 100644 --- a/packages/common/src/services/remote-config/index.ts +++ b/packages/common/src/services/remote-config/index.ts @@ -1,8 +1,8 @@ export { IntKeys, StringKeys, DoubleKeys, BooleanKeys } from './types' -export { AllRemoteConfigKeys } from './types' +export type { AllRemoteConfigKeys } from './types' export { FeatureFlags } from './feature-flags' export { remoteConfig } from './remote-config' -export { RemoteConfigInstance } from './remote-config' +export type { RemoteConfigInstance } from './remote-config' export { remoteConfigIntDefaults, remoteConfigDoubleDefaults, diff --git a/packages/common/src/store/pages/deactivate-account/index.ts b/packages/common/src/store/pages/deactivate-account/index.ts index eccc917e6d5..9b28b827a50 100644 --- a/packages/common/src/store/pages/deactivate-account/index.ts +++ b/packages/common/src/store/pages/deactivate-account/index.ts @@ -1,7 +1,7 @@ export { default as deactivateAccountReducer, - actions as deactivateAccountActions, - DeactivateAccountState + actions as deactivateAccountActions } from './slice' +export type { DeactivateAccountState } from './slice' export * as deactivateAccountSelectors from './selectors' diff --git a/packages/common/src/store/pages/index.ts b/packages/common/src/store/pages/index.ts index b5a1d9c9432..0bcf66812e1 100644 --- a/packages/common/src/store/pages/index.ts +++ b/packages/common/src/store/pages/index.ts @@ -25,7 +25,7 @@ export * as trackPageLineupActions from './track/lineup/actions' export { default as trackPageReducer } from './track/reducer' export * as trackPageActions from './track/actions' export * as trackPageSelectors from './track/selectors' -export { default as TrackPageState } from './track/types' +export type { TrackPageState } from './track/types' export * as tokenDashboardPageSelectors from './token-dashboard/selectors' export * from './token-dashboard/types' @@ -80,11 +80,8 @@ export { initialState as aiPageLineupInitialState } from './ai/lineup/reducer' export { tracksActions as aiPageLineupActions } from './ai/lineup/actions' -export { - default as aiPageReducer, - actions as aiPageActions, - FetchAiUserAction -} from './ai/slice' +export { default as aiPageReducer, actions as aiPageActions } from './ai/slice' +export type { FetchAiUserAction } from './ai/slice' export * as aiPageSelectors from './ai/selectors' export { default as profilePageFeedLineupReducer } from './profile/lineups/feed/reducer' diff --git a/packages/common/src/store/pages/track/types.ts b/packages/common/src/store/pages/track/types.ts index 7643013a793..97fe8b1c880 100644 --- a/packages/common/src/store/pages/track/types.ts +++ b/packages/common/src/store/pages/track/types.ts @@ -1,6 +1,6 @@ import { ID, LineupState } from '../../../models' -export default interface TrackPageState { +export interface TrackPageState { trackId: ID | null trackPermalink: string | null rank: { diff --git a/packages/common/src/store/recovery-email/index.ts b/packages/common/src/store/recovery-email/index.ts index 41703a84af4..ee30058aab5 100644 --- a/packages/common/src/store/recovery-email/index.ts +++ b/packages/common/src/store/recovery-email/index.ts @@ -1,7 +1,7 @@ export { default as recoveryEmailReducer, - actions as recoveryEmailActions, - RecoveryEmailState + actions as recoveryEmailActions } from './slice' +export type { RecoveryEmailState } from './slice' export * as recoveryEmailSelectors from './selectors' diff --git a/packages/common/src/store/ui/index.ts b/packages/common/src/store/ui/index.ts index a4da5747cd5..8b8e1b26174 100644 --- a/packages/common/src/store/ui/index.ts +++ b/packages/common/src/store/ui/index.ts @@ -99,12 +99,8 @@ export { export * from './share-sound-to-tiktok-modal/types' export * as shareSoundToTiktokModalSelectors from './share-sound-to-tiktok-modal/selectors' -export { - default as themeReducer, - actions as themeActions, - SetThemeAction, - SetSystemAppearanceAction -} from './theme/slice' +export { default as themeReducer, actions as themeActions } from './theme/slice' +export type { SetThemeAction, SetSystemAppearanceAction } from './theme/slice' export * as themeSelectors from './theme/selectors' export { default as toastReducer, actions as toastActions } from './toast/slice' @@ -151,8 +147,8 @@ export * from './transaction-details/types' export { default as searchUsersModalReducer, - actions as searchUsersModalActions, - SearchUsersModalState + actions as searchUsersModalActions } from './search-users-modal/slice' +export type { SearchUsersModalState } from './search-users-modal/slice' export * as searchUsersModalSelectors from './search-users-modal/selectors' export { default as searchUsersModalSagas } from './search-users-modal/sagas' diff --git a/packages/common/src/utils/index.ts b/packages/common/src/utils/index.ts index 751a5e07ba3..9b9d9225ab7 100644 --- a/packages/common/src/utils/index.ts +++ b/packages/common/src/utils/index.ts @@ -23,7 +23,7 @@ export * from './constants' export * from './stringUtils' export * from './challenges' export * as creativeCommons from './creativeCommons' -export { License } from './creativeCommons' +export type { License } from './creativeCommons' export * from './array' export * from './chatUtils' export * from './twitter' diff --git a/packages/harmony/package.json b/packages/harmony/package.json index 7d961100027..2c18543757d 100644 --- a/packages/harmony/package.json +++ b/packages/harmony/package.json @@ -37,6 +37,7 @@ "@emotion/styled": "11.11.0", "@radix-ui/react-slot": "1.0.2", "@react-spring/web": "9.7.2", + "@rollup/plugin-alias": "5.0.1", "@storybook/addon-a11y": "7.4.0", "@storybook/addon-actions": "7.4.2", "@storybook/addon-essentials": "7.4.2", diff --git a/packages/harmony/rollup.config.mjs b/packages/harmony/rollup.config.mjs index 01e56667f5e..c5d40ac492c 100644 --- a/packages/harmony/rollup.config.mjs +++ b/packages/harmony/rollup.config.mjs @@ -4,6 +4,7 @@ import svgr from '@svgr/rollup' import json from 'rollup-plugin-json' import postcss from 'rollup-plugin-postcss' import rollupTypescript from 'rollup-plugin-typescript2' +import alias from '@rollup/plugin-alias' import pkg from './package.json' assert { type: 'json' } @@ -32,6 +33,10 @@ export default { ], plugins: [ json(), + alias({ + // Properly resolve json files from assets folder + entries: [{ find: /^assets\/(.*)/, replacement: 'src/assets/$1' }] + }), postcss({ minimize: true, extract: 'harmony.css', diff --git a/packages/web/package.json b/packages/web/package.json index 43d4904435f..7169616d0a4 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -268,10 +268,10 @@ "typescript": "5.0.4", "typescript-plugin-css-modules": "^3.4.0", "url": "^0.11.0", - "vite": "4.5.0", + "vite": "^4.2.2", "vite-plugin-glslify": "2.0.2", "vite-plugin-svgr": "4.1.0", - "vite-tsconfig-paths": "4.2.1", + "vite-tsconfig-paths": "^4.2.1", "vitest": "0.34.6" } } diff --git a/packages/web/src/assets/styles/index.css b/packages/web/src/assets/styles/index.css index 6e767ff880f..be8ce3a5519 100644 --- a/packages/web/src/assets/styles/index.css +++ b/packages/web/src/assets/styles/index.css @@ -1,9 +1,9 @@ -@import 'assets/styles/colors.css'; -@import 'assets/styles/sizing.css'; -@import 'assets/styles/type.css'; -@import 'assets/styles/emoji.css'; -@import 'assets/styles/ant-overrides.css'; -@import 'assets/styles/shadows.css'; +@import './colors.css'; +@import './sizing.css'; +@import './type.css'; +@import './emoji.css'; +@import './ant-overrides.css'; +@import './shadows.css'; #root *, body * { diff --git a/packages/web/src/index.css b/packages/web/src/index.css index 8bc95d48e46..68aaf1d090b 100644 --- a/packages/web/src/index.css +++ b/packages/web/src/index.css @@ -1,5 +1,5 @@ @import 'antd/dist/antd.min.css'; -@import 'assets/styles/index.css'; +@import './assets/styles/index.css'; @import 'react-perfect-scrollbar/dist/css/styles.css'; /* Begin Reset.css */ diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index 2cecddb9f4b..6c71f352c36 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -24,5 +24,5 @@ "@audius/trpc-server": ["../trpc-server/src/index.ts"], } }, - "include": ["src"] + "include": ["src", "src/**/*.css"] } diff --git a/packages/web/vite.config.ts b/packages/web/vite.config.ts index 9d5e4a9771b..f7a22492cd4 100644 --- a/packages/web/vite.config.ts +++ b/packages/web/vite.config.ts @@ -8,6 +8,7 @@ import vike from 'vike/plugin' import { defineConfig, loadEnv } from 'vite' import glslify from 'vite-plugin-glslify' import svgr from 'vite-plugin-svgr' +import tsconfigPaths from 'vite-tsconfig-paths' import { env as APP_ENV } from './src/services/env' @@ -61,11 +62,9 @@ export default defineConfig(({ mode }) => { } }, plugins: [ - // TODO: Enable once https://github.com/aleclarson/vite-tsconfig-paths/issues/110 - // is resolved - // tsconfigPaths({ - // root: './packages' - // }), + tsconfigPaths({ + projects: ['.', '../common'] + }), glslify(), svgr({ include: '**/*.svg' @@ -119,20 +118,6 @@ export default defineConfig(({ mode }) => { ], resolve: { alias: { - // Should be able to use vite-tsconfig-paths instead - app: '/src/app', - assets: '/src/assets', - common: '/src/common', - components: '/src/components', - hooks: '/src/hooks', - pages: '/src/pages', - 'public-site': '/src/public-site', - services: '/src/services', - store: '/src/store', - workers: '/src/workers', - utils: '/src/utils', - ssr: '/src/ssr', - os: require.resolve('os-browserify'), path: require.resolve('path-browserify'), url: require.resolve('url'), From 17c6aecf1e43706cb060b42994f69fa4675a869d Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Mon, 29 Jan 2024 13:23:13 -0800 Subject: [PATCH 02/64] Remove messages from common/index --- packages/common/package.json | 7 +++++-- packages/common/src/index.ts | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 43321816619..8d72fd80c83 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -8,8 +8,11 @@ "license": "", "main": "dist/index.js", "types": "dist/index.d.ts", - "module": "dist/index.es.js", - "exports": "./src/index.ts", + "module": "dist/index.js", + "exports": { + ".": "./dist/index.js", + "./messages": "./src/messages/index.ts" + }, "files": [ "src" ], diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 7a8a1fb440d..b6b8ebea66c 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -8,4 +8,3 @@ export * from './hooks' export * from './store' export * from './schemas' export * from './assets' -export * from './messages' From e2f5db73661de320a4dbad27e5290e7d9ac91316 Mon Sep 17 00:00:00 2001 From: sliptype Date: Mon, 29 Jan 2024 13:28:51 -0800 Subject: [PATCH 03/64] Lint fix --- .../common/src/services/audius-backend/AudiusBackend.ts | 1 - packages/common/src/store/buy-usdc/sagas.ts | 4 ++-- packages/common/src/store/reducers.ts | 6 +++--- packages/common/src/store/ui/modals/reducers.ts | 2 +- packages/common/src/store/ui/modals/types.ts | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/common/src/services/audius-backend/AudiusBackend.ts b/packages/common/src/services/audius-backend/AudiusBackend.ts index ca4c394801f..7bc2829ce2d 100644 --- a/packages/common/src/services/audius-backend/AudiusBackend.ts +++ b/packages/common/src/services/audius-backend/AudiusBackend.ts @@ -84,7 +84,6 @@ import { import type { DiscoveryNodeSelectorService } from '../sdk/discovery-node-selector' import { MonitoringCallbacks } from './types' -console.log('wow 2') type DisplayEncoding = 'utf8' | 'hex' type PhantomEvent = 'disconnect' | 'connect' | 'accountChanged' diff --git a/packages/common/src/store/buy-usdc/sagas.ts b/packages/common/src/store/buy-usdc/sagas.ts index 8218bae91ce..768eacc6ed1 100644 --- a/packages/common/src/store/buy-usdc/sagas.ts +++ b/packages/common/src/store/buy-usdc/sagas.ts @@ -9,6 +9,7 @@ import { Name } from 'models/Analytics' import { ErrorLevel } from 'models/ErrorReporting' import { PurchaseVendor } from 'models/PurchaseContent' import { Status } from 'models/Status' +import { StringUSDC } from 'models/Wallet' import { createPaymentRouterRouteTransaction, createRootWalletRecoveryTransaction, @@ -31,6 +32,7 @@ import { import { coinflowOnrampModalActions } from 'store/ui/modals/coinflow-onramp-modal' import { setVisibility } from 'store/ui/modals/parentSlice' import { initializeStripeModal } from 'store/ui/stripe-modal/slice' +import { setUSDCBalance } from 'store/wallet/slice' import { waitForValue } from 'utils' import { @@ -46,8 +48,6 @@ import { } from './slice' import { BuyUSDCError, BuyUSDCErrorCode } from './types' import { getBuyUSDCRemoteConfig, getUSDCUserBank } from './utils' -import { setUSDCBalance } from 'store/wallet/slice' -import { StringUSDC } from 'models/Wallet' type PurchaseStepParams = { desiredAmount: number diff --git a/packages/common/src/store/reducers.ts b/packages/common/src/store/reducers.ts index 27133eed8df..6f853e781e9 100644 --- a/packages/common/src/store/reducers.ts +++ b/packages/common/src/store/reducers.ts @@ -60,11 +60,11 @@ import { SettingsPageState } from './pages/settings/types' import smartCollection from './pages/smart-collection/slice' import tokenDashboardSlice from './pages/token-dashboard/slice' import track from './pages/track/reducer' -import TrackPageState from './pages/track/types' -import trendingPlaylists from './pages/trending-playlists/slice' -import trendingUnderground from './pages/trending-underground/slice' +import { TrackPageState } from './pages/track/types' import trending from './pages/trending/reducer' import { TrendingPageState } from './pages/trending/types' +import trendingPlaylists from './pages/trending-playlists/slice' +import trendingUnderground from './pages/trending-underground/slice' import { PlaybackPositionState } from './playback-position' import playbackPosition from './playback-position/slice' import player, { PlayerState } from './player/slice' diff --git a/packages/common/src/store/ui/modals/reducers.ts b/packages/common/src/store/ui/modals/reducers.ts index 6c1734df22c..30581930156 100644 --- a/packages/common/src/store/ui/modals/reducers.ts +++ b/packages/common/src/store/ui/modals/reducers.ts @@ -2,6 +2,7 @@ import { Action, combineReducers, Reducer } from '@reduxjs/toolkit' import { addFundsModalReducer } from './add-funds-modal' import { coinflowOnrampModalReducer } from './coinflow-onramp-modal' +import { coinflowWithdrawModalReducer } from './coinflow-withdraw-modal' import { createChatModalReducer } from './create-chat-modal' import { BaseModalState } from './createModal' import { editPlaylistModalReducer } from './edit-playlist-modal' @@ -15,7 +16,6 @@ import { usdcManualTransferModalReducer } from './usdc-manual-transfer-modal' import { usdcPurchaseDetailsModalReducer } from './usdc-purchase-details-modal' import { usdcTransactionDetailsModalReducer } from './usdc-transaction-details-modal' import { withdrawUSDCModalReducer } from './withdraw-usdc-modal' -import { coinflowWithdrawModalReducer } from './coinflow-withdraw-modal' /** * Create a bunch of reducers that do nothing, so that the state is maintained and not lost through the child reducers diff --git a/packages/common/src/store/ui/modals/types.ts b/packages/common/src/store/ui/modals/types.ts index e0025c5fa13..41aa5336bb5 100644 --- a/packages/common/src/store/ui/modals/types.ts +++ b/packages/common/src/store/ui/modals/types.ts @@ -2,6 +2,7 @@ import { ModalSource } from 'models/Analytics' import { AddFundsModalState } from './add-funds-modal' import { CoinflowOnrampModalState } from './coinflow-onramp-modal' +import { CoinflowWithdrawModalState } from './coinflow-withdraw-modal' import { CreateChatModalState } from './create-chat-modal' import { BaseModalState } from './createModal' import { EditPlaylistModalState } from './edit-playlist-modal' @@ -13,7 +14,6 @@ import { USDCManualTransferModalState } from './usdc-manual-transfer-modal' import { USDCPurchaseDetailsModalState } from './usdc-purchase-details-modal' import { USDCTransactionDetailsModalState } from './usdc-transaction-details-modal' import { WithdrawUSDCModalState } from './withdraw-usdc-modal' -import { CoinflowWithdrawModalState } from './coinflow-withdraw-modal' export type Modals = | 'TiersExplainer' From a6bbf6668f85450b0200d6121f7c865bdbf39cc8 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Mon, 29 Jan 2024 13:59:51 -0800 Subject: [PATCH 04/64] Add common messages to mobile --- .../screens/sign-on-screen/components/EmailInUseHint.tsx | 6 ++---- .../src/screens/sign-on-screen/components/HandleField.tsx | 6 ++---- .../components/PasswordCompletionChecklist.tsx | 4 ++-- .../sign-on-screen/components/SignUpFlowInstagramAuth.tsx | 8 ++------ .../sign-on-screen/components/SignUpFlowTwitterAuth.tsx | 2 +- .../sign-on-screen/components/SignUpPolicyText.tsx | 2 +- .../components/SocialMediaSignUpButtons.tsx | 3 ++- .../screens/sign-on-screen/components/WelcomeDrawer.tsx | 7 ++----- .../screens/sign-on-screen/screens/ConfirmEmailScreen.tsx | 4 ++-- .../screens/sign-on-screen/screens/CreateEmailScreen.tsx | 7 ++----- .../sign-on-screen/screens/CreateLoginDetailsScreen.tsx | 2 +- .../sign-on-screen/screens/CreatePasswordScreen.tsx | 6 ++---- .../sign-on-screen/screens/FinishProfileScreen.tsx | 7 ++----- .../screens/sign-on-screen/screens/PickHandleScreen.tsx | 7 ++----- .../screens/sign-on-screen/screens/ReviewHandleScreen.tsx | 7 ++----- .../screens/SelectArtistScreen/SelectArtistsScreen.tsx | 2 +- .../screens/sign-on-screen/screens/SelectGenresScreen.tsx | 7 ++----- .../src/screens/sign-on-screen/screens/SignInScreen.tsx | 7 ++----- packages/mobile/tsconfig.json | 1 + .../web/src/pages/sign-up-page/components/HandleField.tsx | 6 ++++-- .../web/src/pages/sign-up-page/components/ImageField.tsx | 3 ++- 21 files changed, 39 insertions(+), 65 deletions(-) diff --git a/packages/mobile/src/screens/sign-on-screen/components/EmailInUseHint.tsx b/packages/mobile/src/screens/sign-on-screen/components/EmailInUseHint.tsx index ac5d7cd8ba5..9953f2c2d49 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/EmailInUseHint.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/EmailInUseHint.tsx @@ -1,7 +1,5 @@ -import { - emailSchemaMessages, - createEmailPageMessages as messages -} from '@audius/common' +import { emailSchemaMessages } from '@audius/common' +import { createEmailPageMessages as messages } from '@audius/common/messages' import { Hint, IconError, Text, TextLink } from '@audius/harmony-native' diff --git a/packages/mobile/src/screens/sign-on-screen/components/HandleField.tsx b/packages/mobile/src/screens/sign-on-screen/components/HandleField.tsx index 229acb400e1..470d3a564ea 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/HandleField.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/HandleField.tsx @@ -1,7 +1,5 @@ -import { - MAX_HANDLE_LENGTH, - pickHandlePageMessages as messages -} from '@audius/common' +import { MAX_HANDLE_LENGTH } from '@audius/common' +import { pickHandlePageMessages as messages } from '@audius/common/messages' import { useField, useFormikContext } from 'formik' import { IconCheck } from '@audius/harmony-native' diff --git a/packages/mobile/src/screens/sign-on-screen/components/PasswordCompletionChecklist.tsx b/packages/mobile/src/screens/sign-on-screen/components/PasswordCompletionChecklist.tsx index d415356cb62..1ba6a688dcf 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/PasswordCompletionChecklist.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/PasswordCompletionChecklist.tsx @@ -1,8 +1,8 @@ +import { passwordSchema } from '@audius/common' import { - passwordSchema, createPasswordPageMessages, type CompletionChecklistType -} from '@audius/common' +} from '@audius/common/messages' import { useField } from 'formik' import { useAsync } from 'react-use' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx index a91e7352b6a..e4701c40ed7 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx @@ -1,11 +1,7 @@ import React, { useState } from 'react' -import { - Name, - pickHandleSchema, - socialMediaMessages, - useAudiusQueryContext -} from '@audius/common' +import { Name, pickHandleSchema, useAudiusQueryContext } from '@audius/common' +import { socialMediaMessages } from '@audius/common/messages' import * as signOnActions from 'common/store/pages/signon/actions' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx index 62b074b5c0d..63a64d75b90 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx @@ -3,9 +3,9 @@ import React, { useState } from 'react' import { formatTwitterProfile, pickHandleSchema, - socialMediaMessages, useAudiusQueryContext } from '@audius/common' +import { socialMediaMessages } from '@audius/common/messages' import { useAsync } from 'react-use' import { SocialButton } from '@audius/harmony-native' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpPolicyText.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpPolicyText.tsx index 9b25d3f3ee5..f23dbba840c 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpPolicyText.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpPolicyText.tsx @@ -1,4 +1,4 @@ -import { signUpPolicyMessages as messages } from '@audius/common' +import { signUpPolicyMessages as messages } from '@audius/common/messages' import { BASE_URL, PRIVACY_POLICY, diff --git a/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx b/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx index f9871397d27..3f533aeab74 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx @@ -1,4 +1,5 @@ -import { BooleanKeys, useRemoteVar, socialMediaMessages } from '@audius/common' +import { BooleanKeys, useRemoteVar } from '@audius/common' +import { socialMediaMessages } from '@audius/common/messages' import { Flex } from '@audius/harmony-native' import { useToast } from 'app/hooks/useToast' diff --git a/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx b/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx index cf0441a1f2c..7989a82bd32 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx @@ -1,10 +1,7 @@ import { useCallback } from 'react' -import { - fillString, - welcomeModalMessages as messages, - settingsPageActions -} from '@audius/common' +import { fillString, settingsPageActions } from '@audius/common' +import { welcomeModalMessages as messages } from '@audius/common/messages' import { css } from '@emotion/native' import { getNameField } from 'audius-client/src/common/store/pages/signon/selectors' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx index bcf96500777..72820a237a1 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx @@ -3,9 +3,9 @@ import { useCallback, useEffect, useState } from 'react' import { confirmEmailErrorMessages, confirmEmailSchema, - formatOtp, - confirmEmailMessages as messages + formatOtp } from '@audius/common' +import { confirmEmailMessages as messages } from '@audius/common/messages' import { setValueField, signIn } from 'common/store/pages/signon/actions' import { getEmailField, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx index 3a4d7fc57e4..c88650090d8 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx @@ -1,10 +1,7 @@ import { useCallback, useMemo } from 'react' -import { - emailSchema, - useAudiusQueryContext, - createEmailPageMessages as messages -} from '@audius/common' +import { emailSchema, useAudiusQueryContext } from '@audius/common' +import { createEmailPageMessages as messages } from '@audius/common/messages' import { setLinkedSocialOnFirstPage, setValueField, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx index 3ae1bd9019a..ee21e2559a7 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx @@ -3,9 +3,9 @@ import { useCallback, useMemo } from 'react' import { createLoginDetailsSchema, useAudiusQueryContext, - createLoginDetailsPageMessages as messages, emailSchema } from '@audius/common' +import { createLoginDetailsPageMessages as messages } from '@audius/common/messages' import { css } from '@emotion/native' import { setValueField } from 'audius-client/src/common/store/pages/signon/actions' import { diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx index 901f1ea9a45..3bc298a11b7 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx @@ -1,9 +1,7 @@ import { useCallback, useState } from 'react' -import { - createPasswordPageMessages as messages, - passwordSchema -} from '@audius/common' +import { passwordSchema } from '@audius/common' +import { createPasswordPageMessages as messages } from '@audius/common/messages' import { setValueField } from 'common/store/pages/signon/actions' import { Formik } from 'formik' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx index ef50eb6cb35..cafd1117bca 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' -import { - MAX_DISPLAY_NAME_LENGTH, - finishProfileSchema, - finishProfilePageMessages as messages -} from '@audius/common' +import { MAX_DISPLAY_NAME_LENGTH, finishProfileSchema } from '@audius/common' import type { Image } from '@audius/common' +import { finishProfilePageMessages as messages } from '@audius/common/messages' import { css } from '@emotion/native' import { getHandleField, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx index d82344ce1af..92c38a5b128 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx @@ -1,10 +1,7 @@ import { useCallback, useMemo } from 'react' -import { - pickHandlePageMessages as messages, - pickHandleSchema, - useAudiusQueryContext -} from '@audius/common' +import { pickHandleSchema, useAudiusQueryContext } from '@audius/common' +import { pickHandlePageMessages as messages } from '@audius/common/messages' import { css } from '@emotion/native' import { getIsSocialConnected } from 'audius-client/src/common/store/pages/signon/selectors' import { diff --git a/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx index 719522dfc4f..a6e82d6b21e 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx @@ -1,10 +1,7 @@ import { useCallback, useMemo } from 'react' -import { - pickHandleSchema, - useAudiusQueryContext, - reviewHandlePageMessages as messages -} from '@audius/common' +import { pickHandleSchema, useAudiusQueryContext } from '@audius/common' +import { reviewHandlePageMessages as messages } from '@audius/common/messages' import { setValueField } from 'audius-client/src/common/store/pages/signon/actions' import { getCoverPhotoField, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectArtistsScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectArtistsScreen.tsx index 7e561fb0e0a..a596460c573 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectArtistsScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectArtistsScreen.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { selectArtstsPageMessages as messages } from '@audius/common' +import { selectArtstsPageMessages as messages } from '@audius/common/messages' import { finishSignUp } from 'audius-client/src/common/store/pages/signon/actions' import { EditingStatus } from 'audius-client/src/common/store/pages/signon/types' import { diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx index 2f09e38138e..dd36f088921 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx @@ -1,11 +1,8 @@ import { memo, useCallback, useEffect, useState } from 'react' import type { GENRES } from '@audius/common' -import { - selectGenresPageMessages as messages, - selectGenresSchema, - selectableGenres -} from '@audius/common' +import { selectGenresSchema, selectableGenres } from '@audius/common' +import { selectGenresPageMessages as messages } from '@audius/common/messages' import { setField } from 'common/store/pages/signon/actions' import { Formik, useField } from 'formik' import { ScrollView } from 'react-native' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx index 15f283b8590..15c3c8e7cad 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx @@ -1,10 +1,7 @@ import { useCallback, useEffect } from 'react' -import { - signInPageMessages as messages, - signInErrorMessages, - signInSchema -} from '@audius/common' +import { signInErrorMessages, signInSchema } from '@audius/common' +import { signInPageMessages as messages } from '@audius/common/messages' import { getEmailField, getPasswordField, diff --git a/packages/mobile/tsconfig.json b/packages/mobile/tsconfig.json index 1ca1559b16d..19f253fe2e4 100644 --- a/packages/mobile/tsconfig.json +++ b/packages/mobile/tsconfig.json @@ -5,6 +5,7 @@ "lib": ["dom", "es2019"], "paths": { "@audius/harmony-native": ["./src/harmony-native/index.ts"], + "@audius/common/messages": ["../../node_modules/common/src/messages"], "app/*": ["./src/*"], // Remove these when no longer dependent on audius-client "audio/*": ["../../node_modules/audius-client/src/audio/*"], diff --git a/packages/web/src/pages/sign-up-page/components/HandleField.tsx b/packages/web/src/pages/sign-up-page/components/HandleField.tsx index 91e5594253f..51da26fba3f 100644 --- a/packages/web/src/pages/sign-up-page/components/HandleField.tsx +++ b/packages/web/src/pages/sign-up-page/components/HandleField.tsx @@ -2,11 +2,13 @@ import { Ref, forwardRef, useCallback, useContext } from 'react' import { MAX_HANDLE_LENGTH, - socialMediaMessages, pickHandleErrorMessages, - pickHandlePageMessages as messages, useIsWaitingForValidation } from '@audius/common' +import { + socialMediaMessages, + pickHandlePageMessages as messages +} from '@audius/common/messages' import { TextLink } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/components/ImageField.tsx b/packages/web/src/pages/sign-up-page/components/ImageField.tsx index 305905dbf73..30c0cc39071 100644 --- a/packages/web/src/pages/sign-up-page/components/ImageField.tsx +++ b/packages/web/src/pages/sign-up-page/components/ImageField.tsx @@ -1,6 +1,7 @@ import { ReactNode, useCallback } from 'react' -import { Nullable, finishProfilePageMessages as messages } from '@audius/common' +import { Nullable } from '@audius/common' +import { finishProfilePageMessages as messages } from '@audius/common/messages' import cn from 'classnames' import { useField } from 'formik' import ReactDropzone, { DropFilesEventHandler } from 'react-dropzone' From 84c5d5a5a5b0fca503746f8c0143c302fb4c3c8a Mon Sep 17 00:00:00 2001 From: sliptype Date: Mon, 29 Jan 2024 15:34:30 -0800 Subject: [PATCH 05/64] Get web consuming unbundled common --- packages/common/package.json | 6 ------ .../components/welcome-modal/WelcomeModal.tsx | 18 ++++++++---------- packages/web/src/public-site/PublicSite.tsx | 2 +- packages/web/tsconfig.json | 4 ++-- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 8d72fd80c83..54009550f40 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -6,16 +6,10 @@ "author": "Audius", "homepage": "https://github.com/AudiusProject/audius-client#readme", "license": "", - "main": "dist/index.js", - "types": "dist/index.d.ts", - "module": "dist/index.js", "exports": { ".": "./dist/index.js", "./messages": "./src/messages/index.ts" }, - "files": [ - "src" - ], "repository": { "type": "git", "url": "git+https://github.com/AudiusProject/audius-client.git" diff --git a/packages/web/src/components/welcome-modal/WelcomeModal.tsx b/packages/web/src/components/welcome-modal/WelcomeModal.tsx index bef3dda077d..4eb0a48c2f0 100644 --- a/packages/web/src/components/welcome-modal/WelcomeModal.tsx +++ b/packages/web/src/components/welcome-modal/WelcomeModal.tsx @@ -1,12 +1,7 @@ import { useCallback, useEffect } from 'react' -import { - Name, - SquareSizes, - accountSelectors, - fillString, - welcomeModalMessages as messages -} from '@audius/common' +import { Name, SquareSizes, accountSelectors, fillString } from '@audius/common' +import { welcomeModalMessages } from '@audius/common/messages' import { Button, Flex, @@ -101,15 +96,18 @@ export const WelcomeModal = () => { id='welcome-title' color='accent' > - {fillString(messages.welcome, userName ? `, ${userName}` : ' ')} + {fillString( + welcomeModalMessages.welcome, + userName ? `, ${userName}` : ' ' + )} - {messages.youreIn} + {welcomeModalMessages.youreIn} diff --git a/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx index 72820a237a1..27577cfa785 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx @@ -5,7 +5,7 @@ import { confirmEmailSchema, formatOtp } from '@audius/common' -import { confirmEmailMessages as messages } from '@audius/common/messages' +import { confirmEmailMessages } from '@audius/common/messages' import { setValueField, signIn } from 'common/store/pages/signon/actions' import { getEmailField, @@ -56,10 +56,13 @@ export const ConfirmEmailScreen = () => { validationSchema={ConfirmEmailSchema} > - + - {messages.noEmailNotice} + {confirmEmailMessages.noEmailNotice} @@ -85,8 +88,8 @@ const VerificationCodeField = () => { ) @@ -101,13 +104,13 @@ const ResendCodeLink = () => { const handleClick = useCallback(() => { dispatch(signIn(email, password)) - toast({ content: messages.resentToast }) + toast({ content: confirmEmailMessages.resentToast }) setHasResendCode(true) }, [dispatch, email, password, toast]) return ( - {messages.resendCode} + {confirmEmailMessages.resendCode} ) } diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx index c88650090d8..acc8fa7f519 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo } from 'react' import { emailSchema, useAudiusQueryContext } from '@audius/common' -import { createEmailPageMessages as messages } from '@audius/common/messages' +import { createEmailPageMessages } from '@audius/common/messages' import { setLinkedSocialOnFirstPage, setValueField, @@ -101,12 +101,12 @@ export const CreateEmailScreen = (props: SignOnScreenProps) => { ) : null} - {messages.subHeader.line1} + {createEmailPageMessages.subHeader.line1} {'\n'} - {messages.subHeader.line2} + {createEmailPageMessages.subHeader.line2} } centered @@ -114,12 +114,12 @@ export const CreateEmailScreen = (props: SignOnScreenProps) => { - {messages.socialsDividerText} + {createEmailPageMessages.socialsDividerText} { fullWidth iconRight={IconArrowRight} > - {messages.signUp} + {createEmailPageMessages.signUp} - {messages.haveAccount}{' '} + {createEmailPageMessages.haveAccount}{' '} onChangeScreen('sign-in')} > - {messages.signIn} + {createEmailPageMessages.signIn} diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx index ee21e2559a7..a477d2cbe22 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx @@ -5,7 +5,7 @@ import { useAudiusQueryContext, emailSchema } from '@audius/common' -import { createLoginDetailsPageMessages as messages } from '@audius/common/messages' +import { createLoginDetailsPageMessages } from '@audius/common/messages' import { css } from '@emotion/native' import { setValueField } from 'audius-client/src/common/store/pages/signon/actions' import { @@ -56,7 +56,7 @@ const EmailField = ({ onChangeScreen }: { onChangeScreen: () => void }) => { return ( ) @@ -105,13 +105,13 @@ export const CreateLoginDetailsScreen = () => { {({ isValid, dirty }) => ( @@ -129,10 +129,13 @@ export const CreateLoginDetailsScreen = () => { } /> - + diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx index 3bc298a11b7..db84827b721 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' import { passwordSchema } from '@audius/common' -import { createPasswordPageMessages as messages } from '@audius/common/messages' +import { createPasswordPageMessages } from '@audius/common/messages' import { setValueField } from 'common/store/pages/signon/actions' import { Formik } from 'formik' import { useDispatch } from 'react-redux' @@ -63,8 +63,8 @@ export const CreatePasswordScreen = () => { > { }) }} > - - + + diff --git a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx index cafd1117bca..941563d5d60 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react' import { MAX_DISPLAY_NAME_LENGTH, finishProfileSchema } from '@audius/common' import type { Image } from '@audius/common' -import { finishProfilePageMessages as messages } from '@audius/common/messages' +import { finishProfilePageMessages } from '@audius/common/messages' import { css } from '@emotion/native' import { getHandleField, @@ -70,13 +70,16 @@ export const FinishProfileScreen = () => { validationSchema={finishProfileFormikSchema} > - + { entering={FadeIn.duration(motion.calm.duration)} exiting={FadeOut.duration(motion.calm.duration)} > - {messages.uploadProfilePhoto} + {finishProfilePageMessages.uploadProfilePhoto} ) } diff --git a/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx index 92c38a5b128..1c37c904bd3 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo } from 'react' import { pickHandleSchema, useAudiusQueryContext } from '@audius/common' -import { pickHandlePageMessages as messages } from '@audius/common/messages' +import { pickHandlePageMessages } from '@audius/common/messages' import { css } from '@emotion/native' import { getIsSocialConnected } from 'audius-client/src/common/store/pages/signon/selectors' import { @@ -60,12 +60,12 @@ const SocialMediaSection = ({ - {messages.claimHandleHeaderPrefix}{' '} - @{messages.handle} + {pickHandlePageMessages.claimHandleHeaderPrefix}{' '} + @{pickHandlePageMessages.handle} - {messages.claimHandleDescription} + {pickHandlePageMessages.claimHandleDescription} - {messages.claimHandleHeadsUp} + {pickHandlePageMessages.claimHandleHeadsUp} ) @@ -145,7 +145,10 @@ export const PickHandleScreen = () => { {isWaitingForSocialLogin ? ( ) : null} - + @@ -155,7 +158,7 @@ export const PickHandleScreen = () => { size='s' style={css({ textTransform: 'uppercase' })} > - {messages.or} + {pickHandlePageMessages.or} { {({ isValid }) => ( {hasImages ? ( diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectArtistsScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectArtistsScreen.tsx index a596460c573..dd94c109479 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectArtistsScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectArtistsScreen.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { selectArtstsPageMessages as messages } from '@audius/common/messages' +import { selectArtistsPageMessages } from '@audius/common/messages' import { finishSignUp } from 'audius-client/src/common/store/pages/signon/actions' import { EditingStatus } from 'audius-client/src/common/store/pages/signon/types' import { @@ -42,8 +42,8 @@ export const SelectArtistsScreen = () => { { }} postfix={ - {messages.selected} {selectedArtists.length || 0}/3 + {selectArtistsPageMessages.selected} {selectedArtists.length || 0} + /3 } /> diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx index dd36f088921..c5fe1d80577 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx @@ -2,7 +2,7 @@ import { memo, useCallback, useEffect, useState } from 'react' import type { GENRES } from '@audius/common' import { selectGenresSchema, selectableGenres } from '@audius/common' -import { selectGenresPageMessages as messages } from '@audius/common/messages' +import { selectGenresPageMessages } from '@audius/common/messages' import { setField } from 'common/store/pages/signon/actions' import { Formik, useField } from 'formik' import { ScrollView } from 'react-native' @@ -97,8 +97,8 @@ export const SelectGenresScreen = () => { diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx index 15c3c8e7cad..cc8338af111 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect } from 'react' import { signInErrorMessages, signInSchema } from '@audius/common' -import { signInPageMessages as messages } from '@audius/common/messages' +import { signInPageMessages } from '@audius/common/messages' import { getEmailField, getPasswordField, @@ -71,9 +71,9 @@ export const SignInScreen = () => { > {({ handleSubmit }) => ( <> - + - + @@ -84,7 +84,7 @@ export const SignInScreen = () => { isLoading={signInStatus === 'loading'} onPress={() => handleSubmit()} > - {messages.signIn} + {signInPageMessages.signIn} { textAlign='center' onPress={onOpen} > - {messages.forgotPassword} + {signInPageMessages.forgotPassword} @@ -113,5 +113,7 @@ const SignInPasswordField = () => { } }, [setError, signInError]) - return + return ( + + ) } From dcfc6e67e4564371d41943eecc74bf56a8e03b3a Mon Sep 17 00:00:00 2001 From: sliptype Date: Mon, 29 Jan 2024 15:51:53 -0800 Subject: [PATCH 07/64] Fix web imports for messages --- packages/common/src/messages/sign-on/pages.ts | 2 +- .../components/welcome-modal/WelcomeModal.tsx | 2 +- .../pages/sign-in-page/ConfirmEmailPage.tsx | 19 +++++++------ .../web/src/pages/sign-in-page/SignInPage.tsx | 26 +++++++++++------- .../src/pages/sign-in-page/SignInRootPage.tsx | 6 ++--- .../sign-up-page/components/EmailField.tsx | 10 +++---- .../PasswordCompletionChecklist.tsx | 10 +++---- .../components/SignUpPolicyText.tsx | 10 +++---- .../components/SocialMediaLoginOptions.tsx | 5 ++-- .../sign-up-page/pages/CreateEmailPage.tsx | 27 +++++++++---------- .../sign-up-page/pages/CreateLoginDetails.tsx | 20 +++++++------- .../sign-up-page/pages/CreatePasswordPage.tsx | 12 ++++----- .../sign-up-page/pages/FinishProfilePage.tsx | 24 +++++++++-------- .../sign-up-page/pages/PickHandlePage.tsx | 25 +++++++++-------- .../sign-up-page/pages/SelectArtistsPage.tsx | 17 +++++++----- .../sign-up-page/pages/SelectGenresPage.tsx | 6 ++--- 16 files changed, 114 insertions(+), 107 deletions(-) diff --git a/packages/common/src/messages/sign-on/pages.ts b/packages/common/src/messages/sign-on/pages.ts index 664db1e0606..e878f2e78b4 100644 --- a/packages/common/src/messages/sign-on/pages.ts +++ b/packages/common/src/messages/sign-on/pages.ts @@ -111,7 +111,7 @@ export const createLoginDetailsPageMessages = { signIn: 'Sign In' } -export const selectArtstsPageMessages = { +export const selectArtistsPageMessages = { header: 'Follow At Least 3 Artists', description: 'Curate your feed with tracks uploaded or reposted by anyone you follow. Click the artist’s photo to preview their music.', diff --git a/packages/web/src/components/welcome-modal/WelcomeModal.tsx b/packages/web/src/components/welcome-modal/WelcomeModal.tsx index 4eb0a48c2f0..b4d403dbf4e 100644 --- a/packages/web/src/components/welcome-modal/WelcomeModal.tsx +++ b/packages/web/src/components/welcome-modal/WelcomeModal.tsx @@ -123,7 +123,7 @@ export const WelcomeModal = () => { ) }} > - {messages.upload} + {welcomeModalMessages.upload} diff --git a/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx b/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx index cac1f20eabc..77e30a4b067 100644 --- a/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx +++ b/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx @@ -3,8 +3,7 @@ import { useCallback, useContext, useEffect, useState } from 'react' import { confirmEmailErrorMessages, confirmEmailSchema, - formatOtp, - confirmEmailMessages as messages + formatOtp } from '@audius/common' import { Text, TextLink } from '@audius/harmony' import { Form, Formik, useField } from 'formik' @@ -22,6 +21,7 @@ import { ToastContext } from 'components/toast/ToastContext' import { useMedia } from 'hooks/useMedia' import { Heading, Page, PageFooter } from 'pages/sign-up-page/components/layout' import { useSelector } from 'utils/reducer' +import { confirmEmailMessages } from '@audius/common/messages' const initialValues = { otp: '' @@ -58,10 +58,13 @@ export const ConfirmEmailPage = () => { validationSchema={ConfirmEmailSchema} > - + - {messages.noEmailNotice} + {confirmEmailMessages.noEmailNotice} @@ -86,8 +89,8 @@ const VerificationCodeField = () => { return ( ) @@ -102,13 +105,13 @@ const ResendCodeLink = () => { const handleClick = useCallback(() => { dispatch(signIn(email, password)) - toast(messages.resentToast) + toast(confirmEmailMessages.resentToast) setHasResendCode(true) }, [dispatch, email, password, toast]) return ( - {messages.resendCode} + {confirmEmailMessages.resendCode} ) } diff --git a/packages/web/src/pages/sign-in-page/SignInPage.tsx b/packages/web/src/pages/sign-in-page/SignInPage.tsx index f5e9815ad01..e231fc22e3b 100644 --- a/packages/web/src/pages/sign-in-page/SignInPage.tsx +++ b/packages/web/src/pages/sign-in-page/SignInPage.tsx @@ -1,10 +1,6 @@ import { useCallback, useEffect, useState } from 'react' -import { - signInPageMessages as messages, - signInErrorMessages, - signInSchema -} from '@audius/common' +import { signInErrorMessages, signInSchema } from '@audius/common' import { Flex, IconAudiusLogoHorizontalColor, @@ -37,6 +33,7 @@ import { useSelector } from 'utils/reducer' import { SIGN_IN_CONFIRM_EMAIL_PAGE, SIGN_UP_PAGE } from 'utils/route' import { SignInWithMetaMaskButton } from './SignInWithMetaMaskButton' +import { signInPageMessages } from '@audius/common/messages' const SignInSchema = toFormikValidationSchema(signInSchema) @@ -112,7 +109,11 @@ export const SignInPage = () => { /> )} - + @@ -124,7 +125,7 @@ export const SignInPage = () => { isLoading={signInStatus === 'loading'} fullWidth > - {messages.signIn} + {signInPageMessages.signIn} {!isMobile ? : null} { setShowForgotPassword(true) }} > - {messages.forgotPassword} + {signInPageMessages.forgotPassword} {!isMobile ? ( ) : null} @@ -166,5 +167,10 @@ const SignInPasswordField = () => { } }, [setError, signInError]) - return + return ( + + ) } diff --git a/packages/web/src/pages/sign-in-page/SignInRootPage.tsx b/packages/web/src/pages/sign-in-page/SignInRootPage.tsx index 2e5ec05fc7b..27a7b52b533 100644 --- a/packages/web/src/pages/sign-in-page/SignInRootPage.tsx +++ b/packages/web/src/pages/sign-in-page/SignInRootPage.tsx @@ -1,4 +1,3 @@ -import { signInPageMessages as messages } from '@audius/common' import { Helmet } from 'react-helmet' import { Redirect, Route, Switch } from 'react-router-dom' import { useFirstMountState } from 'react-use' @@ -7,6 +6,7 @@ import { SIGN_IN_PAGE, SIGN_IN_CONFIRM_EMAIL_PAGE } from 'utils/route' import { ConfirmEmailPage } from './ConfirmEmailPage' import { SignInPage } from './SignInPage' +import { signInPageMessages } from '@audius/common/messages' export const SignInRootPage = () => { // Redirect users from confirm-email page on first mount @@ -15,8 +15,8 @@ export const SignInRootPage = () => { return ( <> - {messages.metaTitle} - + {signInPageMessages.metaTitle} + diff --git a/packages/web/src/pages/sign-up-page/components/EmailField.tsx b/packages/web/src/pages/sign-up-page/components/EmailField.tsx index 2a41f4eb01b..941d23573a3 100644 --- a/packages/web/src/pages/sign-up-page/components/EmailField.tsx +++ b/packages/web/src/pages/sign-up-page/components/EmailField.tsx @@ -1,9 +1,6 @@ import { ChangeEvent } from 'react' -import { - emailSchemaMessages, - createEmailPageMessages as messages -} from '@audius/common' +import { emailSchemaMessages } from '@audius/common' import { Hint, IconError, TextLink } from '@audius/harmony' import { useField, useFormikContext } from 'formik' import { useDispatch } from 'react-redux' @@ -16,6 +13,7 @@ import { HarmonyTextFieldProps } from 'components/form-fields/HarmonyTextField' import { SIGN_IN_PAGE } from 'utils/route' +import { createEmailPageMessages } from '@audius/common/messages' export const EmailField = (props: Partial) => { const dispatch = useDispatch() @@ -29,7 +27,7 @@ export const EmailField = (props: Partial) => { { const signInLink = ( - {messages.signIn} + {createEmailPageMessages.signIn} ) diff --git a/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx b/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx index 51f9810c0ef..94c77c9abb3 100644 --- a/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx +++ b/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx @@ -1,13 +1,13 @@ -import { - passwordSchema, - createPasswordPageMessages, - type CompletionChecklistType -} from '@audius/common' +import { passwordSchema } from '@audius/common' import { CompletionCheck, Flex, Text } from '@audius/harmony' import { useField } from 'formik' import { useAsync } from 'react-use' import { useMedia } from 'hooks/useMedia' +import { + createPasswordPageMessages, + CompletionChecklistType +} from '@audius/common/messages' const messages: Record = createPasswordPageMessages.completionChecklist diff --git a/packages/web/src/pages/sign-up-page/components/SignUpPolicyText.tsx b/packages/web/src/pages/sign-up-page/components/SignUpPolicyText.tsx index 0d45dea1ed0..6d4fdcf1b3a 100644 --- a/packages/web/src/pages/sign-up-page/components/SignUpPolicyText.tsx +++ b/packages/web/src/pages/sign-up-page/components/SignUpPolicyText.tsx @@ -1,4 +1,4 @@ -import { signUpPolicyMessages as messages } from '@audius/common' +import { signUpPolicyMessages } from '@audius/common/messages' import { Text, TextLink } from '@audius/harmony' import { PRIVACY_POLICY, TERMS_OF_SERVICE } from 'utils/route' @@ -6,13 +6,13 @@ import { PRIVACY_POLICY, TERMS_OF_SERVICE } from 'utils/route' export const SignUpAgreementText = () => { return ( - {messages.agreeTo} + {signUpPolicyMessages.agreeTo} - {messages.termsOfService} + {signUpPolicyMessages.termsOfService} - {messages.and} + {signUpPolicyMessages.and} - {messages.privacyPolicy} + {signUpPolicyMessages.privacyPolicy} ) diff --git a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx index 0cf745f77a6..49ce117ef3d 100644 --- a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx +++ b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx @@ -1,8 +1,6 @@ import { useContext } from 'react' -import { platform } from 'os' - -import { BooleanKeys, socialMediaMessages } from '@audius/common' +import { BooleanKeys } from '@audius/common' import { Box, Flex, SocialButton } from '@audius/harmony' import { ToastContext } from 'components/toast/ToastContext' @@ -11,6 +9,7 @@ import { useRemoteVar } from 'hooks/useRemoteConfig' import { SignupFlowInstagramAuth } from './SignupFlowInstagramAuth' import { SignupFlowTikTokAuth } from './SignupFlowTikTokAuth' import { SignupFlowTwitterAuth } from './SignupFlowTwitterAuth' +import { socialMediaMessages } from '@audius/common/messages' export type SocialPlatform = 'twitter' | 'instagram' | 'tiktok' diff --git a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx index 61431d25e39..6cf2ca37738 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx @@ -1,10 +1,6 @@ import { useCallback, useMemo } from 'react' -import { - emailSchema, - createEmailPageMessages as messages, - useAudiusQueryContext -} from '@audius/common' +import { emailSchema, useAudiusQueryContext } from '@audius/common' import { Box, Button, @@ -47,6 +43,7 @@ import { SignUpWithMetaMaskButton } from '../components/SignUpWithMetaMaskButton import { SocialMediaLoading } from '../components/SocialMediaLoading' import { Heading, Page } from '../components/layout' import { useSocialMediaLoader } from '../hooks/useSocialMediaLoader' +import { createEmailPageMessages } from '@audius/common/messages' export type SignUpEmailValues = { email: string @@ -104,7 +101,7 @@ export const CreateEmailPage = () => { const signInLink = ( - {messages.signIn} + {createEmailPageMessages.signIn} ) @@ -135,11 +132,11 @@ export const CreateEmailPage = () => { )} - {messages.subHeader.line1} -
{messages.subHeader.line2} + {createEmailPageMessages.subHeader.line1} +
{createEmailPageMessages.subHeader.line2} } tag='h1' @@ -149,7 +146,7 @@ export const CreateEmailPage = () => { - {messages.socialsDividerText} + {createEmailPageMessages.socialsDividerText} { iconRight={IconArrowRight} isLoading={isSubmitting} > - {messages.signUp} + {createEmailPageMessages.signUp} { size={isMobile ? 'm' : 'l'} textAlign={isMobile ? 'center' : undefined} > - {messages.haveAccount} {signInLink} + {createEmailPageMessages.haveAccount} {signInLink} {!isMobile && window.ethereum ? ( - {messages.metaMaskNotRecommended}{' '} - {messages.learnMore} + {createEmailPageMessages.metaMaskNotRecommended}{' '} + + {createEmailPageMessages.learnMore} + ) : null} diff --git a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx index fcc142a54ba..e4a4323a2fb 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx @@ -1,10 +1,6 @@ import { useCallback, useMemo } from 'react' -import { - emailSchema, - createLoginDetailsPageMessages as messages, - useAudiusQueryContext -} from '@audius/common' +import { emailSchema, useAudiusQueryContext } from '@audius/common' import { Flex, IconVerified, useTheme } from '@audius/harmony' import { Form, Formik, useField } from 'formik' import { useDispatch, useSelector } from 'react-redux' @@ -26,6 +22,7 @@ import { PasswordCompletionChecklist } from '../components/PasswordCompletionChe import { SignUpAgreementText } from '../components/SignUpPolicyText' import { Heading, Page, PageFooter, ReadOnlyField } from '../components/layout' import { loginDetailsSchema } from '../utils/loginDetailsSchema' +import { createLoginDetailsPageMessages } from '@audius/common/messages' export type CreateLoginDetailsValues = { email: string @@ -95,13 +92,13 @@ export const CreateLoginDetailsPage = () => { {({ isValid, dirty }) => ( @{handleField.value} @@ -114,10 +111,13 @@ export const CreateLoginDetailsPage = () => { } /> - + diff --git a/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx b/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx index dbd1dc2a047..c6991a33657 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx @@ -1,9 +1,6 @@ import { useCallback, useRef } from 'react' -import { - createPasswordPageMessages as messages, - passwordSchema -} from '@audius/common' +import { passwordSchema } from '@audius/common' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' @@ -18,6 +15,7 @@ import { SIGN_UP_HANDLE_PAGE } from 'utils/route' import { EnterPasswordSection } from '../components/EnterPasswordSection' import { SignUpAgreementText } from '../components/SignUpPolicyText' import { Heading, Page, PageFooter, ReadOnlyField } from '../components/layout' +import { createPasswordPageMessages } from '@audius/common/messages' const initialValues = { password: '', @@ -61,12 +59,12 @@ export const CreatePasswordPage = () => { autoFocusInputRef={passwordInputRef} > diff --git a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx index 089bb8ce4d0..f1d1426207b 100644 --- a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx @@ -3,8 +3,7 @@ import { useCallback, useRef } from 'react' import { MAX_DISPLAY_NAME_LENGTH, Name, - finishProfileSchema, - finishProfilePageMessages as messages + finishProfileSchema } from '@audius/common' import { Flex, Paper, PlainButton, Text, useTheme } from '@audius/harmony' import { Formik, Form, useField, useFormikContext } from 'formik' @@ -37,6 +36,7 @@ import { AccountHeader } from '../components/AccountHeader' import { ImageFieldValue } from '../components/ImageField' import { OutOfText } from '../components/OutOfText' import { Heading, Page, PageFooter } from '../components/layout' +import { finishProfilePageMessages } from '@audius/common/messages' export type FinishProfileValues = { profileImage?: ImageFieldValue @@ -49,14 +49,16 @@ const formSchema = toFormikValidationSchema(finishProfileSchema) const ImageUploadErrorText = () => { const { errors } = useFormikContext() let errorText - if (errors.coverPhoto === messages.coverPhotoUploadError) { + if (errors.coverPhoto === finishProfilePageMessages.coverPhotoUploadError) { errorText = errors.coverPhoto } // Profile image error takes priority - if (errors.profileImage === messages.profileImageUploadError) { + if ( + errors.profileImage === finishProfilePageMessages.profileImageUploadError + ) { // If both images have errors, we show a combined error message if (errorText !== undefined) { - errorText = messages.bothImageUploadError + errorText = finishProfilePageMessages.bothImageUploadError } else { errorText = errors.profileImage } @@ -156,8 +158,8 @@ export const FinishProfilePage = () => { ) } - heading={messages.header} - description={messages.description} + heading={finishProfilePageMessages.header} + description={finishProfilePageMessages.description} centered={!isMobile} /> @@ -172,8 +174,8 @@ export const FinishProfilePage = () => { setDisplayName(e.currentTarget.value)} css={(theme) => ({ @@ -190,7 +192,7 @@ export const FinishProfilePage = () => { postfix={ isMobile || isSocialConnected ? null : ( - {messages.goBack} + {finishProfilePageMessages.goBack} ) } @@ -216,7 +218,7 @@ const UploadProfilePhotoHelperText = () => { transition: `opacity ${motion.calm}` }} > - {messages.uploadProfilePhoto} + {finishProfilePageMessages.uploadProfilePhoto} ) } diff --git a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx index 0c09e83fc9b..7c83981bb6b 100644 --- a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx @@ -1,11 +1,6 @@ import { useCallback, useContext, useMemo, useRef } from 'react' -import { - socialMediaMessages, - pickHandlePageMessages as messages, - pickHandleSchema, - AudiusQueryContext -} from '@audius/common' +import { pickHandleSchema, AudiusQueryContext } from '@audius/common' import { Divider, Flex, IconVerified, Paper, Text } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' @@ -39,6 +34,10 @@ import { } from '../components/SocialMediaLoginOptions' import { Heading, Page, PageFooter } from '../components/layout' import { useSocialMediaLoader } from '../hooks/useSocialMediaLoader' +import { + pickHandlePageMessages, + socialMediaMessages +} from '@audius/common/messages' type PickHandleValues = { handle: string @@ -64,9 +63,9 @@ const SocialMediaSection = (props: SocialMediaSectionProps) => { variant={isMobile ? 'title' : 'heading'} size={isMobile ? 'm' : 's'} > - {messages.claimHandleHeaderPrefix}{' '} + {pickHandlePageMessages.claimHandleHeaderPrefix}{' '} - @{messages.handle} + @{pickHandlePageMessages.handle} {' '} { /> - {messages.claimHandleDescription} + {pickHandlePageMessages.claimHandleDescription} { onCompleteSocialMediaLogin={onCompleteSocialMediaLogin} /> - {messages.claimHandleHeadsUp} + {pickHandlePageMessages.claimHandleHeadsUp} ) @@ -178,8 +177,8 @@ export const PickHandlePage = () => { prefix={ isMobile ? null : } - heading={messages.title} - description={messages.description} + heading={pickHandlePageMessages.title} + description={pickHandlePageMessages.description} centered={!isMobile} /> @@ -196,7 +195,7 @@ export const PickHandlePage = () => { size='s' css={{ textTransform: 'uppercase' }} > - {messages.or} + {pickHandlePageMessages.or} { { { justifyContent={isMobile ? 'flex-start' : 'center'} role='radiogroup' onChange={handleChangeGenre} - aria-label={messages.genresLabel} + aria-label={selectArtistsPageMessages.genresLabel} disableScroll={!isMobile} > {artistGenres.map((genre) => ( @@ -194,7 +196,7 @@ export const SelectArtistsPage = () => { direction='column' > - {messages.pickArtists(currentGenre)} + {selectArtistsPageMessages.pickArtists(currentGenre)} {isLoading || !isMobile ? null : } @@ -223,7 +225,8 @@ export const SelectArtistsPage = () => { }} postfix={ - {messages.selected} {selectedArtists.length || 0}/3 + {selectArtistsPageMessages.selected}{' '} + {selectedArtists.length || 0}/3 } /> diff --git a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx index 7fcf383681a..ca7037e6bf0 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx @@ -3,7 +3,6 @@ import { MouseEventHandler, useCallback, useState } from 'react' import { Genre, Name, - selectGenresPageMessages as messages, selectGenresSchema, selectableGenres } from '@audius/common' @@ -22,6 +21,7 @@ import { SIGN_UP_ARTISTS_PAGE } from 'utils/route' import { AccountHeader } from '../components/AccountHeader' import { Heading, Page, PageFooter, ScrollView } from '../components/layout' +import { selectGenresPageMessages } from '@audius/common/messages' type SelectGenresValue = { genres: Genre[] } @@ -90,8 +90,8 @@ export const SelectGenresPage = () => { css={!isMobile ? { maxWidth: '641px' } : undefined} > Date: Mon, 29 Jan 2024 15:54:25 -0800 Subject: [PATCH 08/64] Fix import locations --- packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx | 2 +- packages/web/src/pages/sign-in-page/SignInPage.tsx | 2 +- packages/web/src/pages/sign-in-page/SignInRootPage.tsx | 2 +- .../web/src/pages/sign-up-page/components/EmailField.tsx | 2 +- .../components/PasswordCompletionChecklist.tsx | 8 ++++---- .../sign-up-page/components/SocialMediaLoginOptions.tsx | 2 +- .../web/src/pages/sign-up-page/pages/CreateEmailPage.tsx | 2 +- .../src/pages/sign-up-page/pages/CreateLoginDetails.tsx | 2 +- .../src/pages/sign-up-page/pages/CreatePasswordPage.tsx | 2 +- .../src/pages/sign-up-page/pages/FinishProfilePage.tsx | 2 +- .../web/src/pages/sign-up-page/pages/PickHandlePage.tsx | 8 ++++---- .../src/pages/sign-up-page/pages/SelectArtistsPage.tsx | 2 +- .../web/src/pages/sign-up-page/pages/SelectGenresPage.tsx | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx b/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx index 77e30a4b067..fe9586c55f4 100644 --- a/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx +++ b/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx @@ -5,6 +5,7 @@ import { confirmEmailSchema, formatOtp } from '@audius/common' +import { confirmEmailMessages } from '@audius/common/messages' import { Text, TextLink } from '@audius/harmony' import { Form, Formik, useField } from 'formik' import { useDispatch } from 'react-redux' @@ -21,7 +22,6 @@ import { ToastContext } from 'components/toast/ToastContext' import { useMedia } from 'hooks/useMedia' import { Heading, Page, PageFooter } from 'pages/sign-up-page/components/layout' import { useSelector } from 'utils/reducer' -import { confirmEmailMessages } from '@audius/common/messages' const initialValues = { otp: '' diff --git a/packages/web/src/pages/sign-in-page/SignInPage.tsx b/packages/web/src/pages/sign-in-page/SignInPage.tsx index e231fc22e3b..b0d85831072 100644 --- a/packages/web/src/pages/sign-in-page/SignInPage.tsx +++ b/packages/web/src/pages/sign-in-page/SignInPage.tsx @@ -1,6 +1,7 @@ import { useCallback, useEffect, useState } from 'react' import { signInErrorMessages, signInSchema } from '@audius/common' +import { signInPageMessages } from '@audius/common/messages' import { Flex, IconAudiusLogoHorizontalColor, @@ -33,7 +34,6 @@ import { useSelector } from 'utils/reducer' import { SIGN_IN_CONFIRM_EMAIL_PAGE, SIGN_UP_PAGE } from 'utils/route' import { SignInWithMetaMaskButton } from './SignInWithMetaMaskButton' -import { signInPageMessages } from '@audius/common/messages' const SignInSchema = toFormikValidationSchema(signInSchema) diff --git a/packages/web/src/pages/sign-in-page/SignInRootPage.tsx b/packages/web/src/pages/sign-in-page/SignInRootPage.tsx index 27a7b52b533..9c9980fc49f 100644 --- a/packages/web/src/pages/sign-in-page/SignInRootPage.tsx +++ b/packages/web/src/pages/sign-in-page/SignInRootPage.tsx @@ -1,3 +1,4 @@ +import { signInPageMessages } from '@audius/common/messages' import { Helmet } from 'react-helmet' import { Redirect, Route, Switch } from 'react-router-dom' import { useFirstMountState } from 'react-use' @@ -6,7 +7,6 @@ import { SIGN_IN_PAGE, SIGN_IN_CONFIRM_EMAIL_PAGE } from 'utils/route' import { ConfirmEmailPage } from './ConfirmEmailPage' import { SignInPage } from './SignInPage' -import { signInPageMessages } from '@audius/common/messages' export const SignInRootPage = () => { // Redirect users from confirm-email page on first mount diff --git a/packages/web/src/pages/sign-up-page/components/EmailField.tsx b/packages/web/src/pages/sign-up-page/components/EmailField.tsx index 941d23573a3..71ef97f4c7f 100644 --- a/packages/web/src/pages/sign-up-page/components/EmailField.tsx +++ b/packages/web/src/pages/sign-up-page/components/EmailField.tsx @@ -1,6 +1,7 @@ import { ChangeEvent } from 'react' import { emailSchemaMessages } from '@audius/common' +import { createEmailPageMessages } from '@audius/common/messages' import { Hint, IconError, TextLink } from '@audius/harmony' import { useField, useFormikContext } from 'formik' import { useDispatch } from 'react-redux' @@ -13,7 +14,6 @@ import { HarmonyTextFieldProps } from 'components/form-fields/HarmonyTextField' import { SIGN_IN_PAGE } from 'utils/route' -import { createEmailPageMessages } from '@audius/common/messages' export const EmailField = (props: Partial) => { const dispatch = useDispatch() diff --git a/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx b/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx index 94c77c9abb3..ca4bc51d09f 100644 --- a/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx +++ b/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx @@ -1,13 +1,13 @@ import { passwordSchema } from '@audius/common' +import { + createPasswordPageMessages, + CompletionChecklistType +} from '@audius/common/messages' import { CompletionCheck, Flex, Text } from '@audius/harmony' import { useField } from 'formik' import { useAsync } from 'react-use' import { useMedia } from 'hooks/useMedia' -import { - createPasswordPageMessages, - CompletionChecklistType -} from '@audius/common/messages' const messages: Record = createPasswordPageMessages.completionChecklist diff --git a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx index 49ce117ef3d..1a7968b4317 100644 --- a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx +++ b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx @@ -1,6 +1,7 @@ import { useContext } from 'react' import { BooleanKeys } from '@audius/common' +import { socialMediaMessages } from '@audius/common/messages' import { Box, Flex, SocialButton } from '@audius/harmony' import { ToastContext } from 'components/toast/ToastContext' @@ -9,7 +10,6 @@ import { useRemoteVar } from 'hooks/useRemoteConfig' import { SignupFlowInstagramAuth } from './SignupFlowInstagramAuth' import { SignupFlowTikTokAuth } from './SignupFlowTikTokAuth' import { SignupFlowTwitterAuth } from './SignupFlowTwitterAuth' -import { socialMediaMessages } from '@audius/common/messages' export type SocialPlatform = 'twitter' | 'instagram' | 'tiktok' diff --git a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx index 6cf2ca37738..c3de2125733 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx @@ -1,6 +1,7 @@ import { useCallback, useMemo } from 'react' import { emailSchema, useAudiusQueryContext } from '@audius/common' +import { createEmailPageMessages } from '@audius/common/messages' import { Box, Button, @@ -43,7 +44,6 @@ import { SignUpWithMetaMaskButton } from '../components/SignUpWithMetaMaskButton import { SocialMediaLoading } from '../components/SocialMediaLoading' import { Heading, Page } from '../components/layout' import { useSocialMediaLoader } from '../hooks/useSocialMediaLoader' -import { createEmailPageMessages } from '@audius/common/messages' export type SignUpEmailValues = { email: string diff --git a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx index e4a4323a2fb..c9eff8331ea 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx @@ -1,6 +1,7 @@ import { useCallback, useMemo } from 'react' import { emailSchema, useAudiusQueryContext } from '@audius/common' +import { createLoginDetailsPageMessages } from '@audius/common/messages' import { Flex, IconVerified, useTheme } from '@audius/harmony' import { Form, Formik, useField } from 'formik' import { useDispatch, useSelector } from 'react-redux' @@ -22,7 +23,6 @@ import { PasswordCompletionChecklist } from '../components/PasswordCompletionChe import { SignUpAgreementText } from '../components/SignUpPolicyText' import { Heading, Page, PageFooter, ReadOnlyField } from '../components/layout' import { loginDetailsSchema } from '../utils/loginDetailsSchema' -import { createLoginDetailsPageMessages } from '@audius/common/messages' export type CreateLoginDetailsValues = { email: string diff --git a/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx b/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx index c6991a33657..81eb3915c90 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx @@ -1,6 +1,7 @@ import { useCallback, useRef } from 'react' import { passwordSchema } from '@audius/common' +import { createPasswordPageMessages } from '@audius/common/messages' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' @@ -15,7 +16,6 @@ import { SIGN_UP_HANDLE_PAGE } from 'utils/route' import { EnterPasswordSection } from '../components/EnterPasswordSection' import { SignUpAgreementText } from '../components/SignUpPolicyText' import { Heading, Page, PageFooter, ReadOnlyField } from '../components/layout' -import { createPasswordPageMessages } from '@audius/common/messages' const initialValues = { password: '', diff --git a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx index f1d1426207b..2da67111917 100644 --- a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx @@ -5,6 +5,7 @@ import { Name, finishProfileSchema } from '@audius/common' +import { finishProfilePageMessages } from '@audius/common/messages' import { Flex, Paper, PlainButton, Text, useTheme } from '@audius/harmony' import { Formik, Form, useField, useFormikContext } from 'formik' import { useDispatch, useSelector } from 'react-redux' @@ -36,7 +37,6 @@ import { AccountHeader } from '../components/AccountHeader' import { ImageFieldValue } from '../components/ImageField' import { OutOfText } from '../components/OutOfText' import { Heading, Page, PageFooter } from '../components/layout' -import { finishProfilePageMessages } from '@audius/common/messages' export type FinishProfileValues = { profileImage?: ImageFieldValue diff --git a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx index 7c83981bb6b..d1d3141149f 100644 --- a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx @@ -1,6 +1,10 @@ import { useCallback, useContext, useMemo, useRef } from 'react' import { pickHandleSchema, AudiusQueryContext } from '@audius/common' +import { + pickHandlePageMessages, + socialMediaMessages +} from '@audius/common/messages' import { Divider, Flex, IconVerified, Paper, Text } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' @@ -34,10 +38,6 @@ import { } from '../components/SocialMediaLoginOptions' import { Heading, Page, PageFooter } from '../components/layout' import { useSocialMediaLoader } from '../hooks/useSocialMediaLoader' -import { - pickHandlePageMessages, - socialMediaMessages -} from '@audius/common/messages' type PickHandleValues = { handle: string diff --git a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx index 1cfed43ce9b..dcd5f0943b1 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx @@ -9,6 +9,7 @@ import { useGetTopArtistsInGenre, selectArtistsSchema } from '@audius/common' +import { selectArtistsPageMessages } from '@audius/common/messages' import { Flex, Text, SelectablePill, Paper, useTheme } from '@audius/harmony' import { useSpring, animated } from '@react-spring/web' import { Form, Formik } from 'formik' @@ -39,7 +40,6 @@ import { ScrollView } from '../components/layout' import { SelectArtistsPreviewContextProvider } from '../utils/selectArtistsPreviewContext' -import { selectArtistsPageMessages } from '@audius/common/messages' const AnimatedFlex = animated(Flex) diff --git a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx index ca7037e6bf0..52a98fa740c 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx @@ -6,6 +6,7 @@ import { selectGenresSchema, selectableGenres } from '@audius/common' +import { selectGenresPageMessages } from '@audius/common/messages' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' @@ -21,7 +22,6 @@ import { SIGN_UP_ARTISTS_PAGE } from 'utils/route' import { AccountHeader } from '../components/AccountHeader' import { Heading, Page, PageFooter, ScrollView } from '../components/layout' -import { selectGenresPageMessages } from '@audius/common/messages' type SelectGenresValue = { genres: Genre[] } From 3d1c0e72941418da627019ed5bf9093ce67f5ab4 Mon Sep 17 00:00:00 2001 From: sliptype Date: Mon, 29 Jan 2024 16:07:55 -0800 Subject: [PATCH 09/64] Remove vite-tsconfig-paths --- package-lock.json | 1 - packages/web/package.json | 1 - packages/web/vite.config.ts | 18 ++++++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9804f613e78..36e3f7b7768 100644 --- a/package-lock.json +++ b/package-lock.json @@ -145417,7 +145417,6 @@ "vite": "^4.2.2", "vite-plugin-glslify": "2.0.2", "vite-plugin-svgr": "4.1.0", - "vite-tsconfig-paths": "^4.2.1", "vitest": "0.34.6" } }, diff --git a/packages/web/package.json b/packages/web/package.json index 7169616d0a4..093d6f94030 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -271,7 +271,6 @@ "vite": "^4.2.2", "vite-plugin-glslify": "2.0.2", "vite-plugin-svgr": "4.1.0", - "vite-tsconfig-paths": "^4.2.1", "vitest": "0.34.6" } } diff --git a/packages/web/vite.config.ts b/packages/web/vite.config.ts index f7a22492cd4..9dba9f95416 100644 --- a/packages/web/vite.config.ts +++ b/packages/web/vite.config.ts @@ -8,7 +8,6 @@ import vike from 'vike/plugin' import { defineConfig, loadEnv } from 'vite' import glslify from 'vite-plugin-glslify' import svgr from 'vite-plugin-svgr' -import tsconfigPaths from 'vite-tsconfig-paths' import { env as APP_ENV } from './src/services/env' @@ -62,9 +61,6 @@ export default defineConfig(({ mode }) => { } }, plugins: [ - tsconfigPaths({ - projects: ['.', '../common'] - }), glslify(), svgr({ include: '**/*.svg' @@ -118,6 +114,20 @@ export default defineConfig(({ mode }) => { ], resolve: { alias: { + // Can't use vite-tsconfig-paths because of vike + app: '/src/app', + assets: '/src/assets', + common: '/src/common', + components: '/src/components', + hooks: '/src/hooks', + pages: '/src/pages', + 'public-site': '/src/public-site', + services: '/src/services', + store: '/src/store', + workers: '/src/workers', + utils: '/src/utils', + ssr: '/src/ssr', + os: require.resolve('os-browserify'), path: require.resolve('path-browserify'), url: require.resolve('url'), From a520f517ed3433e9598ad8fa52048c74d867c265 Mon Sep 17 00:00:00 2001 From: sliptype Date: Mon, 29 Jan 2024 16:30:01 -0800 Subject: [PATCH 10/64] Rm sdk dist before building --- packages/libs/package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/libs/package.json b/packages/libs/package.json index 961e2f33a9a..b125f455765 100644 --- a/packages/libs/package.json +++ b/packages/libs/package.json @@ -31,13 +31,13 @@ "test:unit:watch": "ts-mocha 'src/[!sdk]**/*.test.{js,ts}' --ignore 'src/sdk/**/*.test.{js,ts}' --watch", "test:integration": "ts-mocha tests/index.js", "setup": "./scripts/migrate_contracts.sh", - "build": "rollup -c --configPlugin typescript", - "build:sdk": "rollup -c rollup.sdk.config.ts --configPlugin typescript", - "build:sdk:browser": "rollup -c rollup.sdk.browser.config.ts --configPlugin typescript", - "build:sdk:browser:dist": "rollup -c rollup.sdk.browser.dist.config.ts --configPlugin typescript", - "build:sdk:native": "rollup -c rollup.sdk.native.config.ts --configPlugin typescript", - "build:legacy:browser": "rollup -c rollup.legacy.browser.config.ts --configPlugin typescript", - "build:legacy:native": "rollup -c rollup.legacy.native.config.ts --configPlugin typescript", + "build": "rm -rf ./dist && rollup -c --configPlugin typescript", + "build:sdk": "rm -rf ./dist && rollup -c rollup.sdk.config.ts --configPlugin typescript", + "build:sdk:browser": "rm -rf ./dist && rollup -c rollup.sdk.browser.config.ts --configPlugin typescript", + "build:sdk:browser:dist": "rm -rf ./dist && rollup -c rollup.sdk.browser.dist.config.ts --configPlugin typescript", + "build:sdk:native": "rm -rf ./dist && rollup -c rollup.sdk.native.config.ts --configPlugin typescript", + "build:legacy:browser": "rm -rf ./dist && rollup -c rollup.legacy.browser.config.ts --configPlugin typescript", + "build:legacy:native": "rm -rf ./dist && rollup -c rollup.legacy.native.config.ts --configPlugin typescript", "start": "rollup -c -w --configPlugin typescript", "start:sdk": "rollup -c rollup.sdk.config.ts -w --configPlugin typescript", "start:sdk:browser": "rollup -c rollup.sdk.browser.config.ts -w --configPlugin typescript", From ad80b3af1e8fd67085966cf1c9a4c3b54cda02bf Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Mon, 29 Jan 2024 18:13:46 -0800 Subject: [PATCH 11/64] Hot reload common in mobile --- package-lock.json | 158 ++++++++++++++++++++++++++++++++ packages/common/package.json | 1 + packages/mobile/babel.config.js | 12 ++- packages/mobile/package.json | 1 + packages/mobile/tsconfig.json | 2 +- 5 files changed, 172 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36e3f7b7768..747db995894 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43187,6 +43187,150 @@ "npm": ">=6" } }, + "node_modules/babel-plugin-module-resolver": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz", + "integrity": "sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q==", + "dev": true, + "dependencies": { + "find-babel-config": "^2.0.0", + "glob": "^8.0.3", + "pkg-up": "^3.1.0", + "reselect": "^4.1.7", + "resolve": "^1.22.1" + }, + "engines": { + "node": ">= 16" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/pkg-up": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/reselect": { + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", + "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==", + "dev": true + }, "node_modules/babel-plugin-named-asset-import": { "version": "0.2.3", "dev": true, @@ -56377,6 +56521,19 @@ "version": "2.0.0", "license": "MIT" }, + "node_modules/find-babel-config": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-2.0.0.tgz", + "integrity": "sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw==", + "dev": true, + "dependencies": { + "json5": "^2.1.1", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/find-cache-dir": { "version": "2.1.0", "license": "MIT", @@ -136507,6 +136664,7 @@ "babel-jest": "29.6.3", "babel-loader": "8.3.0", "babel-plugin-macros": "3.1.0", + "babel-plugin-module-resolver": "^5.0.0", "babel-plugin-transform-remove-console": "6.9.4", "detox": "20.12.1", "eslint": "8.56.0", diff --git a/packages/common/package.json b/packages/common/package.json index 54009550f40..8ab83fd0765 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -6,6 +6,7 @@ "author": "Audius", "homepage": "https://github.com/AudiusProject/audius-client#readme", "license": "", + "main": "./dist/index.js", "exports": { ".": "./dist/index.js", "./messages": "./src/messages/index.ts" diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js index d160bf0637e..eacf17315ef 100644 --- a/packages/mobile/babel.config.js +++ b/packages/mobile/babel.config.js @@ -1,7 +1,17 @@ module.exports = (api) => { const babelEnv = api.env() const plugins = [ - ['@babel/plugin-transform-react-jsx', { runtime: 'automatic' }] + ['@babel/plugin-transform-react-jsx', { runtime: 'automatic' }], + [ + 'module-resolver', + { + extensions: ['.js', '.jsx', '.ts', '.tsx'], + root: ['.'], + alias: { + '@audius/common/messages': '../common/src/messages' + } + } + ] ] if (babelEnv !== 'development') { diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 7b54368dcdd..f5a71de0efa 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -213,6 +213,7 @@ "babel-jest": "29.6.3", "babel-loader": "8.3.0", "babel-plugin-macros": "3.1.0", + "babel-plugin-module-resolver": "5.0.0", "babel-plugin-transform-remove-console": "6.9.4", "detox": "20.12.1", "eslint": "8.56.0", diff --git a/packages/mobile/tsconfig.json b/packages/mobile/tsconfig.json index 19f253fe2e4..5cb8db4993c 100644 --- a/packages/mobile/tsconfig.json +++ b/packages/mobile/tsconfig.json @@ -5,7 +5,7 @@ "lib": ["dom", "es2019"], "paths": { "@audius/harmony-native": ["./src/harmony-native/index.ts"], - "@audius/common/messages": ["../../node_modules/common/src/messages"], + "@audius/common/messages": ["../../node_modules/common/src/messages/index.ts"], "app/*": ["./src/*"], // Remove these when no longer dependent on audius-client "audio/*": ["../../node_modules/audius-client/src/audio/*"], From c4f662df54487ed927fc34934d032bfc5dc1a563 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Mon, 29 Jan 2024 18:23:03 -0800 Subject: [PATCH 12/64] Revert lock --- package-lock.json | 6774 ++++++++++++++++++++++++++++++++------------- 1 file changed, 4898 insertions(+), 1876 deletions(-) diff --git a/package-lock.json b/package-lock.json index 747db995894..682584a8da5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -206,7 +206,8 @@ }, "node_modules/@apollo/client": { "version": "3.3.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.3.7.tgz", + "integrity": "sha512-Cb0OqqvlehlRHtHIXRIS/Pe5WYU4hHl1FznXTRSxBAN42WmBUM3zy/Unvw183RdWMyV6Kc2pFKOEuaG1K7JTAQ==", "dependencies": { "@graphql-typed-document-node/core": "^3.0.0", "@types/zen-observable": "^0.8.0", @@ -238,7 +239,8 @@ }, "node_modules/@apollo/client/node_modules/symbol-observable": { "version": "2.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz", + "integrity": "sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==", "engines": { "node": ">=0.10" } @@ -2754,30 +2756,36 @@ }, "node_modules/@brillout/import": { "version": "0.2.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@brillout/import/-/import-0.2.3.tgz", + "integrity": "sha512-1T8WlD75eeFSMrptGy8jiLHmfHgMmSjWvLOIUvHmSVZt+6k0eQqYUoK4KbmE4T9pVLIfxvZSOm2D68VEqKRHRw==" }, "node_modules/@brillout/json-serializer": { "version": "0.5.8", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@brillout/json-serializer/-/json-serializer-0.5.8.tgz", + "integrity": "sha512-vEuXw30ok+mJfJutOxXKBb4lBJ0HymA7lev9PcYK6W/hzjhCTPk9Bdk85HrcNcKZWRQiwoWtw0F2Di4TRJ7ssQ==" }, "node_modules/@brillout/picocolors": { "version": "1.0.10", - "license": "ISC" + "resolved": "https://registry.npmjs.org/@brillout/picocolors/-/picocolors-1.0.10.tgz", + "integrity": "sha512-dh+JJlsBf3QYX+91Ezma8RLKNOjGDoBBmORv/NzRpQuasdyzwQCMXGGjsDu12ZhGz92TqQbL9pv79rvbheI21A==" }, "node_modules/@brillout/require-shim": { "version": "0.1.2", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@brillout/require-shim/-/require-shim-0.1.2.tgz", + "integrity": "sha512-3I4LRHnVZXoSAsEoni5mosq9l6eiJED58d9V954W4CIZ88AUfYBanWGBGbJG3NztaRTpFHEA6wB3Hn93BmmJdg==" }, "node_modules/@brillout/vite-plugin-import-build": { "version": "0.2.22", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@brillout/vite-plugin-import-build/-/vite-plugin-import-build-0.2.22.tgz", + "integrity": "sha512-n5sv0HdCB5WC2QJSnTN6iS/F+sJsF0AmtsCCaQ+5+dRjgsoGGsa3auinJV8tuEog5WsX+3MF8RIwn3A/u0e04w==", "dependencies": { "@brillout/import": "^0.2.3" } }, "node_modules/@ceramicnetwork/3id-did-resolver": { "version": "2.32.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@ceramicnetwork/3id-did-resolver/-/3id-did-resolver-2.32.0.tgz", + "integrity": "sha512-9jnibtXIYCPUbS+FlBakh5ghUt7/ItGn2nuRfw8kMGdO4JsfN3jVjLHyah1b2X3AVsGG+V1k1CYH3otgdfvftA==", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/stream-tile": "^2.35.0", @@ -2790,7 +2798,8 @@ }, "node_modules/@ceramicnetwork/3id-did-resolver/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2798,14 +2807,16 @@ }, "node_modules/@ceramicnetwork/3id-did-resolver/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/3id-did-resolver/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2813,7 +2824,8 @@ }, "node_modules/@ceramicnetwork/codecs": { "version": "1.14.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@ceramicnetwork/codecs/-/codecs-1.14.0.tgz", + "integrity": "sha512-UElVFFIHWHGc/cr5pZxQTfd7DJIf95cFtADTFQ+O78c+X+OOO323F40KLCP+vuwooyiVbGArHiaU5WsrHCz7bg==", "dependencies": { "@ceramicnetwork/streamid": "^2.17.0", "cartonne": "^2.1.1", @@ -2825,7 +2837,8 @@ }, "node_modules/@ceramicnetwork/codecs/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2833,14 +2846,16 @@ }, "node_modules/@ceramicnetwork/codecs/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/codecs/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2848,7 +2863,8 @@ }, "node_modules/@ceramicnetwork/common": { "version": "2.39.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@ceramicnetwork/common/-/common-2.39.0.tgz", + "integrity": "sha512-NB/6XzPqualWK5Kyti664VHhJug3Z8XDFNpYxM0dLz13lgtNnLWUt6xFG0I7chB0ecbhexanKRE/dh7Ltjczvw==", "dependencies": { "@ceramicnetwork/codecs": "^1.14.0", "@ceramicnetwork/streamid": "^2.17.0", @@ -2872,7 +2888,8 @@ }, "node_modules/@ceramicnetwork/common/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2880,14 +2897,16 @@ }, "node_modules/@ceramicnetwork/common/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/common/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -2895,7 +2914,8 @@ }, "node_modules/@ceramicnetwork/http-client": { "version": "2.36.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@ceramicnetwork/http-client/-/http-client-2.36.0.tgz", + "integrity": "sha512-N2iTPPAYER81PiU21tIVE7eh8PpNhSXaV7qsOdOZb2F3fmgcbO7PpOHki/1AaaAZUAXUNb0SOOjZGKIzJR1bhw==", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/stream-caip10-link": "^2.34.0", @@ -2910,21 +2930,24 @@ }, "node_modules/@ceramicnetwork/http-client/node_modules/decode-uri-component": { "version": "0.2.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "engines": { "node": ">=0.10" } }, "node_modules/@ceramicnetwork/http-client/node_modules/filter-obj": { "version": "1.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", + "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==", "engines": { "node": ">=0.10.0" } }, "node_modules/@ceramicnetwork/http-client/node_modules/query-string": { "version": "7.1.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz", + "integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==", "dependencies": { "decode-uri-component": "^0.2.2", "filter-obj": "^1.1.0", @@ -2940,14 +2963,16 @@ }, "node_modules/@ceramicnetwork/http-client/node_modules/split-on-first": { "version": "1.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", + "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==", "engines": { "node": ">=6" } }, "node_modules/@ceramicnetwork/stream-caip10-link": { "version": "2.34.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@ceramicnetwork/stream-caip10-link/-/stream-caip10-link-2.34.0.tgz", + "integrity": "sha512-bBxzPLc+NX+k7nKpmB7rcGy30R31pgU2/3FR1x+rezPY3n3trMZLcHqeNtUtuJv/tDLL2z+EDmfdXK91kBUTag==", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/streamid": "^2.17.0", @@ -2958,11 +2983,13 @@ }, "node_modules/@ceramicnetwork/stream-caip10-link/node_modules/did-resolver": { "version": "4.1.0", - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-4.1.0.tgz", + "integrity": "sha512-S6fWHvCXkZg2IhS4RcVHxwuyVejPR7c+a4Go0xbQ9ps5kILa8viiYQgrM4gfTyeTjJ0ekgJH9gk/BawTpmkbZA==" }, "node_modules/@ceramicnetwork/stream-model": { "version": "1.21.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@ceramicnetwork/stream-model/-/stream-model-1.21.0.tgz", + "integrity": "sha512-OOIG7LU5XlBKi+7+lb5o1vtfJI9yblIzww1G7yeLW8W3axEzvnkrk/Hyyeeg1R2R7B6zE+AEWi93mBE1FP96VA==", "dependencies": { "@ceramicnetwork/codecs": "^1.14.0", "@ceramicnetwork/common": "^2.39.0", @@ -2980,7 +3007,8 @@ }, "node_modules/@ceramicnetwork/stream-model-instance": { "version": "1.21.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@ceramicnetwork/stream-model-instance/-/stream-model-instance-1.21.0.tgz", + "integrity": "sha512-XxnLSv9HvzIuAYGlwSh/ODLolzgxrqnflk3rVj0cYODOmFYHi0/cYr2Sh/TTR7VpE3Xm6o1ch8BeLNozx6NGvg==", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/streamid": "^2.17.0", @@ -2993,7 +3021,8 @@ }, "node_modules/@ceramicnetwork/stream-model-instance/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3001,14 +3030,16 @@ }, "node_modules/@ceramicnetwork/stream-model-instance/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/stream-model/node_modules/ajv": { "version": "8.12.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -3022,11 +3053,13 @@ }, "node_modules/@ceramicnetwork/stream-model/node_modules/json-schema-traverse": { "version": "1.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" }, "node_modules/@ceramicnetwork/stream-model/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3034,14 +3067,16 @@ }, "node_modules/@ceramicnetwork/stream-model/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/stream-model/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3049,7 +3084,8 @@ }, "node_modules/@ceramicnetwork/stream-tile": { "version": "2.35.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@ceramicnetwork/stream-tile/-/stream-tile-2.35.0.tgz", + "integrity": "sha512-pkUsgAyEo7cd7Zj+T4OfXxDnaIN3cUiqkWOg2rj7ESXBKCVnTMXexsDNM2I+HvlXCCSuY+ek4TYu6QwVe1yiIA==", "dependencies": { "@ceramicnetwork/common": "^2.39.0", "@ceramicnetwork/streamid": "^2.17.0", @@ -3063,7 +3099,8 @@ }, "node_modules/@ceramicnetwork/stream-tile/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3071,14 +3108,16 @@ }, "node_modules/@ceramicnetwork/stream-tile/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/streamid": { "version": "2.17.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@ceramicnetwork/streamid/-/streamid-2.17.0.tgz", + "integrity": "sha512-LC6YL8dcN2XqOdPEDKqWAloyJNXBIyw30JAm4gvWLsUuOaL8hTJWpu2HndFp/Jn4Mab9090/fwVZ2O8CWno58w==", "dependencies": { "@ipld/dag-cbor": "^7.0.0", "@stablelib/sha256": "^1.0.1", @@ -3091,7 +3130,8 @@ }, "node_modules/@ceramicnetwork/streamid/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3099,14 +3139,16 @@ }, "node_modules/@ceramicnetwork/streamid/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@ceramicnetwork/streamid/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3114,7 +3156,8 @@ }, "node_modules/@ceramicnetwork/streamid/node_modules/varint": { "version": "6.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", + "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==" }, "node_modules/@certusone/wormhole-sdk": { "version": "0.1.1", @@ -3450,7 +3493,8 @@ }, "node_modules/@coinflowlabs/react": { "version": "3.1.5", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@coinflowlabs/react/-/react-3.1.5.tgz", + "integrity": "sha512-XloIfXGXaOjv9l0DAptpl1ZeIDvuPpG6SUsX3vCi1yyzO6MNPgG9kjEi8lRF0SdfGV02knxdODNYITLdH1I8Ow==", "dependencies": { "bn.js": "^5.2.1", "bs58": "^5.0.0", @@ -3590,11 +3634,13 @@ }, "node_modules/@coinflowlabs/react/node_modules/base-x": { "version": "4.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", + "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" }, "node_modules/@coinflowlabs/react/node_modules/bs58": { "version": "5.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz", + "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==", "dependencies": { "base-x": "^4.0.0" } @@ -3791,7 +3837,8 @@ }, "node_modules/@didtools/cacao": { "version": "2.1.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@didtools/cacao/-/cacao-2.1.0.tgz", + "integrity": "sha512-35gopj+mOmAlA3nHoHiYMvNMXJtbJDJnVpIlCf/Wf/+/x+uG9aIQefXfF35D6JuaTCZ0apabjpT2umL5h3EXcw==", "dependencies": { "@didtools/codecs": "^1.0.1", "@didtools/siwx": "1.0.0", @@ -3806,7 +3853,8 @@ }, "node_modules/@didtools/cacao/node_modules/@ipld/dag-cbor": { "version": "9.0.8", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.0.8.tgz", + "integrity": "sha512-ETWJ7p7lmGw5X+BuI/7rf4/k56xyOvAOVNUVuQmnGYBdJjObLPgS+vyFxRk4odATlkyZqCq2MLNY52bhE6SlRA==", "dependencies": { "cborg": "^4.0.0", "multiformats": "^13.0.0" @@ -3818,18 +3866,21 @@ }, "node_modules/@didtools/cacao/node_modules/@ipld/dag-cbor/node_modules/multiformats": { "version": "13.0.1", - "license": "Apache-2.0 OR MIT" + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.1.tgz", + "integrity": "sha512-bt3R5iXe2O8xpp3wkmQhC73b/lC4S2ihU8Dndwcsysqbydqb8N+bpP116qMcClZ17g58iSIwtXUTcg2zT4sniA==" }, "node_modules/@didtools/cacao/node_modules/cborg": { "version": "4.0.8", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/cborg/-/cborg-4.0.8.tgz", + "integrity": "sha512-/6QDK0Hw//cV4YNWZZjdIUMFNw0DZmb56jdVGJPwXP7874gSN0AMYqM07mVKpAm+6Nn7U8lvYFzPgBGatC+5xw==", "bin": { "cborg": "lib/bin.js" } }, "node_modules/@didtools/cacao/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3837,14 +3888,16 @@ }, "node_modules/@didtools/cacao/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@didtools/cacao/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3852,7 +3905,8 @@ }, "node_modules/@didtools/codecs": { "version": "1.0.1", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@didtools/codecs/-/codecs-1.0.1.tgz", + "integrity": "sha512-6PYXOCX7mwVWUcudKQ3eW5LtI8v5esozazbf2q2F01PE+LoeEvTytvgU9FEspj4pATpq3hPx1eenX2uLirDJ8w==", "dependencies": { "codeco": "^1.1.0", "multiformats": "^11.0.1", @@ -3864,7 +3918,8 @@ }, "node_modules/@didtools/codecs/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3872,14 +3927,16 @@ }, "node_modules/@didtools/codecs/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@didtools/codecs/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -3887,7 +3944,8 @@ }, "node_modules/@didtools/pkh-ethereum": { "version": "0.1.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@didtools/pkh-ethereum/-/pkh-ethereum-0.1.0.tgz", + "integrity": "sha512-Abmc6uvWU8zkOrQbPUAsRtTW293vhx+rzd+/bbduTLrRGEqZ3niakQkxMqvQKZ6/9w+n0IjQVXSHE5vzc5cAeg==", "dependencies": { "@didtools/cacao": "^2.0.0", "@ethersproject/wallet": "^5.7.0", @@ -3900,6 +3958,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/abstract-provider": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", + "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", "funding": [ { "type": "individual", @@ -3910,7 +3970,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -3923,6 +3982,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/abstract-signer": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", + "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", "funding": [ { "type": "individual", @@ -3933,7 +3994,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -3944,6 +4004,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/address": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", + "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", "funding": [ { "type": "individual", @@ -3954,7 +4016,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -3965,6 +4026,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/base64": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", + "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", "funding": [ { "type": "individual", @@ -3975,13 +4038,14 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0" } }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/basex": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.7.0.tgz", + "integrity": "sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==", "funding": [ { "type": "individual", @@ -3992,7 +4056,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/properties": "^5.7.0" @@ -4000,6 +4063,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/hash": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", + "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", "funding": [ { "type": "individual", @@ -4010,7 +4075,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -4025,6 +4089,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/hdnode": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.7.0.tgz", + "integrity": "sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==", "funding": [ { "type": "individual", @@ -4035,7 +4101,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/basex": "^5.7.0", @@ -4053,6 +4118,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/json-wallets": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz", + "integrity": "sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==", "funding": [ { "type": "individual", @@ -4063,7 +4130,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -4082,6 +4148,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/networks": { "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", + "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", "funding": [ { "type": "individual", @@ -4092,13 +4160,14 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/pbkdf2": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz", + "integrity": "sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==", "funding": [ { "type": "individual", @@ -4109,7 +4178,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/sha2": "^5.7.0" @@ -4117,6 +4185,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/properties": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", + "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", "funding": [ { "type": "individual", @@ -4127,13 +4197,14 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/random": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.7.0.tgz", + "integrity": "sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==", "funding": [ { "type": "individual", @@ -4144,7 +4215,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -4152,6 +4222,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/rlp": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", + "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", "funding": [ { "type": "individual", @@ -4162,7 +4234,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -4170,6 +4241,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/signing-key": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", + "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", "funding": [ { "type": "individual", @@ -4180,7 +4253,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0", @@ -4192,6 +4264,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/transactions": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", + "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", "funding": [ { "type": "individual", @@ -4202,7 +4276,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -4217,6 +4290,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/wallet": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.7.0.tgz", + "integrity": "sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==", "funding": [ { "type": "individual", @@ -4227,7 +4302,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", @@ -4248,6 +4322,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/web": { "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", + "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", "funding": [ { "type": "individual", @@ -4258,7 +4334,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/base64": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -4269,6 +4344,8 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/@ethersproject/wordlists": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.7.0.tgz", + "integrity": "sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==", "funding": [ { "type": "individual", @@ -4279,7 +4356,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/hash": "^5.7.0", @@ -4290,11 +4366,13 @@ }, "node_modules/@didtools/pkh-ethereum/node_modules/aes-js": { "version": "3.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", + "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==" }, "node_modules/@didtools/pkh-solana": { "version": "0.1.1", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@didtools/pkh-solana/-/pkh-solana-0.1.1.tgz", + "integrity": "sha512-2Sn4xSg8otqAeXA0tDYUM+3KQtzOr2gBcu0wbJyOn/30Ocj3jxHFQg7NfumEsiQtQ0HtnmsGZUrnCgoxHqLwWg==", "dependencies": { "@didtools/cacao": "^2.0.0", "@noble/curves": "^1.0.0", @@ -4308,7 +4386,8 @@ }, "node_modules/@didtools/pkh-solana/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -4316,14 +4395,16 @@ }, "node_modules/@didtools/pkh-solana/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@didtools/pkh-stacks": { "version": "0.1.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@didtools/pkh-stacks/-/pkh-stacks-0.1.0.tgz", + "integrity": "sha512-dEgyHleiIa2afibchNqs07tSqddFS6pX9D5BNxbWH0NAr+FisVCA4nUXajcbd9TUbSuplClfQ4EXjjJAGqlgeg==", "dependencies": { "@didtools/cacao": "^2.0.0", "@stablelib/random": "^1.0.2", @@ -4339,7 +4420,8 @@ }, "node_modules/@didtools/pkh-tezos": { "version": "0.2.2", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@didtools/pkh-tezos/-/pkh-tezos-0.2.2.tgz", + "integrity": "sha512-pUzquLujQJQ4tQoGrXjozFZePNt+VLX7Bk32r1DPbkp8FaLoAA5UoaP1qf+fM/J9EsxCfdnpntqqGU+MmvIpHA==", "dependencies": { "@didtools/cacao": "^2.0.0", "@noble/curves": "^1.0.0", @@ -4354,7 +4436,8 @@ }, "node_modules/@didtools/pkh-tezos/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -4362,14 +4445,16 @@ }, "node_modules/@didtools/pkh-tezos/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/@didtools/siwx": { "version": "1.0.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@didtools/siwx/-/siwx-1.0.0.tgz", + "integrity": "sha512-b7sPDTNHdySoJ+Rp2p06x3rg1iTxI4yPTTA3PrPh40xcvFJ0K/YhdIb/Rzff13t92arcJ+VYGFhqtJorauV91g==", "dependencies": { "codeco": "^1.1.0" }, @@ -4434,8 +4519,9 @@ }, "node_modules/@electron/asar": { "version": "3.2.8", + "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz", + "integrity": "sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg==", "dev": true, - "license": "MIT", "dependencies": { "commander": "^5.0.0", "glob": "^7.1.6", @@ -4450,16 +4536,18 @@ }, "node_modules/@electron/asar/node_modules/commander": { "version": "5.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 6" } }, "node_modules/@electron/osx-sign": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz", + "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "compare-version": "^0.1.2", "debug": "^4.3.4", @@ -4478,8 +4566,9 @@ }, "node_modules/@electron/osx-sign/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, - "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -4491,8 +4580,9 @@ }, "node_modules/@electron/osx-sign/node_modules/jsonfile": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, - "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -4502,8 +4592,9 @@ }, "node_modules/@electron/osx-sign/node_modules/universalify": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 10.0.0" } @@ -4563,7 +4654,8 @@ }, "node_modules/@emotion/core": { "version": "10.3.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.3.1.tgz", + "integrity": "sha512-447aUEjPIm0MnE6QYIaFz9VQOHSXf4Iu6EWOIqq11EAPqinkSZmfymPTmlOE3QjLv846lH4JVZBUOtwGbuQoww==", "dependencies": { "@babel/runtime": "^7.5.5", "@emotion/cache": "^10.0.27", @@ -4578,7 +4670,8 @@ }, "node_modules/@emotion/core/node_modules/@emotion/cache": { "version": "10.0.29", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz", + "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==", "dependencies": { "@emotion/sheet": "0.9.4", "@emotion/stylis": "0.8.5", @@ -4588,7 +4681,8 @@ }, "node_modules/@emotion/core/node_modules/@emotion/css": { "version": "10.0.27", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.27.tgz", + "integrity": "sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==", "dependencies": { "@emotion/serialize": "^0.11.15", "@emotion/utils": "0.11.3", @@ -4597,15 +4691,18 @@ }, "node_modules/@emotion/core/node_modules/@emotion/hash": { "version": "0.8.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", + "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" }, "node_modules/@emotion/core/node_modules/@emotion/memoize": { "version": "0.7.4", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", + "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==" }, "node_modules/@emotion/core/node_modules/@emotion/serialize": { "version": "0.11.16", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz", + "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==", "dependencies": { "@emotion/hash": "0.8.0", "@emotion/memoize": "0.7.4", @@ -4616,23 +4713,28 @@ }, "node_modules/@emotion/core/node_modules/@emotion/sheet": { "version": "0.9.4", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz", + "integrity": "sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==" }, "node_modules/@emotion/core/node_modules/@emotion/unitless": { "version": "0.7.5", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", + "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" }, "node_modules/@emotion/core/node_modules/@emotion/utils": { "version": "0.11.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz", + "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==" }, "node_modules/@emotion/core/node_modules/@emotion/weak-memoize": { "version": "0.2.5", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", + "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "node_modules/@emotion/core/node_modules/csstype": { "version": "2.6.21", - "license": "MIT" + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" }, "node_modules/@emotion/css": { "version": "11.11.2", @@ -4731,7 +4833,8 @@ }, "node_modules/@emotion/styled": { "version": "11.11.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.11.0.tgz", + "integrity": "sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==", "dependencies": { "@babel/runtime": "^7.18.3", "@emotion/babel-plugin": "^11.11.0", @@ -4775,8 +4878,9 @@ }, "node_modules/@esbuild-kit/cjs-loader": { "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@esbuild-kit/cjs-loader/-/cjs-loader-2.4.4.tgz", + "integrity": "sha512-NfsJX4PdzhwSkfJukczyUiZGc7zNNWZcEAyqeISpDnn0PTfzMJR1aR8xAIPskBejIxBJbIgCCMzbaYa9SXepIg==", "dev": true, - "license": "MIT", "dependencies": { "@esbuild-kit/core-utils": "^3.2.3", "get-tsconfig": "^4.7.0" @@ -4784,8 +4888,9 @@ }, "node_modules/@esbuild-kit/core-utils": { "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz", + "integrity": "sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "~0.18.20", "source-map-support": "^0.5.21" @@ -4793,8 +4898,9 @@ }, "node_modules/@esbuild-kit/esm-loader": { "version": "2.6.5", + "resolved": "https://registry.npmjs.org/@esbuild-kit/esm-loader/-/esm-loader-2.6.5.tgz", + "integrity": "sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==", "dev": true, - "license": "MIT", "dependencies": { "@esbuild-kit/core-utils": "^3.3.2", "get-tsconfig": "^4.7.0" @@ -4808,12 +4914,58 @@ "esbuild": "*" } }, + "node_modules/@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@esbuild/darwin-arm64": { "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "darwin" @@ -4822,6 +4974,276 @@ "node": ">=12" } }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "cpu": [ + "loong64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "cpu": [ + "mips64el" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "cpu": [ + "ppc64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "cpu": [ + "riscv64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "cpu": [ + "s390x" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@escape.tech/mookme": { "version": "2.4.1", "license": "MIT", @@ -6117,14 +6539,16 @@ }, "node_modules/@glazed/constants": { "version": "0.2.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@glazed/constants/-/constants-0.2.0.tgz", + "integrity": "sha512-+umVEKMhoH8o+M9sPBKhoo0vHJg9Tei5huM+vApB7IgffbVMD7O3luQsHbO/QIVtt8azQXUODnvg14a3IgYEWQ==", "engines": { "node": ">=14.14" } }, "node_modules/@glazed/datamodel": { "version": "0.3.1", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@glazed/datamodel/-/datamodel-0.3.1.tgz", + "integrity": "sha512-UBd+z9yoHZkFDXKOE3VmnUPdkE0ERla+3jU8Q09jo4pCQPwzk/IvMlLNlRfIqUbGuoYkz8pZkdcuTB012yS/dw==", "dependencies": { "@glazed/tile-loader": "^0.2.1" }, @@ -6134,7 +6558,8 @@ }, "node_modules/@glazed/did-datastore": { "version": "0.3.2", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@glazed/did-datastore/-/did-datastore-0.3.2.tgz", + "integrity": "sha512-/sNasgFF1bvUFIc4KVIihPzD+Zo2kr/uJ8cZHU1U+rRVsCL1AeYcx/bF27OaaMvxfDlJ9nXMmiaPl5kwnyzviQ==", "dependencies": { "@ceramicnetwork/streamid": "^2.1.0", "@glazed/constants": "^0.2.0", @@ -6147,7 +6572,8 @@ }, "node_modules/@glazed/tile-loader": { "version": "0.2.1", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@glazed/tile-loader/-/tile-loader-0.2.1.tgz", + "integrity": "sha512-opICtDY1OIhIYJD8UVTO8BdNDMGD+Ui4MPA1JifpVeUWAO97PtgsXZ1irLLab5l5zDiakmajoiWZxv2PbVGTlA==", "dependencies": { "@ceramicnetwork/stream-tile": "^2.2.2", "dataloader": "^2.1.0" @@ -6158,7 +6584,8 @@ }, "node_modules/@google/model-viewer": { "version": "3.3.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@google/model-viewer/-/model-viewer-3.3.0.tgz", + "integrity": "sha512-nQQXi9VUpO7odH42EfnN5L3E/1DT5M50H7eOMd5Q9xI2X6J4we6IsfHPzxxFXffK9fMSw026OE2YAvkUcBxT3A==", "dependencies": { "lit": "^2.7.2" }, @@ -6182,7 +6609,8 @@ }, "node_modules/@graphql-typed-document-node/core": { "version": "3.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz", + "integrity": "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==", "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } @@ -6260,7 +6688,8 @@ }, "node_modules/@ipld/dag-cbor": { "version": "7.0.3", - "license": "(Apache-2.0 AND MIT)", + "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-7.0.3.tgz", + "integrity": "sha512-1VVh2huHsuohdXC1bGJNE8WR72slZ9XE2T3wbBBq31dm7ZBatmKLLxrB+XAqafxfRFjv08RZmj/W/ZqaM13AuA==", "dependencies": { "cborg": "^1.6.0", "multiformats": "^9.5.4" @@ -8374,8 +8803,9 @@ }, "node_modules/@ledgerhq/cryptoassets": { "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/cryptoassets/-/cryptoassets-11.4.0.tgz", + "integrity": "sha512-1M0iNyZlmf4MbLGk6vl5CK3gyHAT0yeUzkMbQn+Eo3JL0Y8ng7bl39GGRVasD7X7d/ue2nrG1bX6peGhLcDL/Q==", "dev": true, - "license": "Apache-2.0", "dependencies": { "axios": "^1.6.0", "bs58check": "^2.1.2", @@ -8383,9 +8813,10 @@ } }, "node_modules/@ledgerhq/cryptoassets/node_modules/axios": { - "version": "1.6.5", + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", + "integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", "dev": true, - "license": "MIT", "dependencies": { "follow-redirects": "^1.15.4", "form-data": "^4.0.0", @@ -8394,6 +8825,8 @@ }, "node_modules/@ledgerhq/cryptoassets/node_modules/follow-redirects": { "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -8401,7 +8834,6 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -8413,8 +8845,9 @@ }, "node_modules/@ledgerhq/cryptoassets/node_modules/form-data": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, - "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -8426,8 +8859,9 @@ }, "node_modules/@ledgerhq/devices": { "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.2.0.tgz", + "integrity": "sha512-XROTW2gTmmuy+YPPDjdtKKTQ3mfxrPtKtV+a9QFbj8f5MnjVMV0Zpy1BIB4CyIMsVVi4z6+nI67auT7IlsM3SQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ledgerhq/errors": "^6.16.1", "@ledgerhq/logs": "^6.12.0", @@ -8437,8 +8871,9 @@ }, "node_modules/@ledgerhq/devices/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -8448,8 +8883,9 @@ }, "node_modules/@ledgerhq/devices/node_modules/semver": { "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -8462,13 +8898,15 @@ }, "node_modules/@ledgerhq/devices/node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/@ledgerhq/domain-service": { "version": "1.1.17", + "resolved": "https://registry.npmjs.org/@ledgerhq/domain-service/-/domain-service-1.1.17.tgz", + "integrity": "sha512-EAnbuuuWJpFYHp1a4fMh8cNk5Lic+4Rwf4xGXAOHKcUUT90Q3/VYiom1+ZZwKA8PBgebbxE695UDKK1SzPvh8Q==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ledgerhq/errors": "^6.16.1", "@ledgerhq/logs": "^6.12.0", @@ -8480,9 +8918,10 @@ } }, "node_modules/@ledgerhq/domain-service/node_modules/axios": { - "version": "1.6.5", + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", + "integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", "dev": true, - "license": "MIT", "dependencies": { "follow-redirects": "^1.15.4", "form-data": "^4.0.0", @@ -8491,6 +8930,8 @@ }, "node_modules/@ledgerhq/domain-service/node_modules/follow-redirects": { "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -8498,7 +8939,6 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -8510,8 +8950,9 @@ }, "node_modules/@ledgerhq/domain-service/node_modules/form-data": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, - "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -8523,13 +8964,15 @@ }, "node_modules/@ledgerhq/errors": { "version": "6.16.1", - "dev": true, - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.16.1.tgz", + "integrity": "sha512-4D4wKecGzQpIu7sx03Sg4uE1e8g1oZUndWgw9gw776H8h9ov9c5TxPaldTn2j6orPECAERViLf7LTO4L5pE2Cw==", + "dev": true }, "node_modules/@ledgerhq/evm-tools": { "version": "1.0.14", + "resolved": "https://registry.npmjs.org/@ledgerhq/evm-tools/-/evm-tools-1.0.14.tgz", + "integrity": "sha512-L1fj3mbcZPueCJ/ZwxKXQegpY561NkxGd8nljF/JVqwH/B1N+usdZb9HZswrsgWjQdxqeQykgz7ZZgYolU+vlg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ledgerhq/cryptoassets": "^11.4.0", "@ledgerhq/live-env": "^0.9.0", @@ -8540,6 +8983,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/abi": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", + "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", "dev": true, "funding": [ { @@ -8551,7 +8996,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -8566,6 +9010,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/abstract-provider": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", + "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", "dev": true, "funding": [ { @@ -8577,7 +9023,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -8590,6 +9035,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/abstract-signer": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", + "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", "dev": true, "funding": [ { @@ -8601,7 +9048,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -8612,6 +9058,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/address": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", + "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", "dev": true, "funding": [ { @@ -8623,7 +9071,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -8634,6 +9081,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/base64": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", + "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", "dev": true, "funding": [ { @@ -8645,13 +9094,14 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0" } }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/basex": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.7.0.tgz", + "integrity": "sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==", "dev": true, "funding": [ { @@ -8663,7 +9113,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/properties": "^5.7.0" @@ -8671,6 +9120,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/contracts": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.7.0.tgz", + "integrity": "sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==", "dev": true, "funding": [ { @@ -8682,7 +9133,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abi": "^5.7.0", "@ethersproject/abstract-provider": "^5.7.0", @@ -8698,6 +9148,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/hash": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", + "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", "dev": true, "funding": [ { @@ -8709,7 +9161,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -8724,6 +9175,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/hdnode": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.7.0.tgz", + "integrity": "sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==", "dev": true, "funding": [ { @@ -8735,7 +9188,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/basex": "^5.7.0", @@ -8753,6 +9205,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/json-wallets": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz", + "integrity": "sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==", "dev": true, "funding": [ { @@ -8764,7 +9218,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -8783,6 +9236,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/networks": { "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", + "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", "dev": true, "funding": [ { @@ -8794,13 +9249,14 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/pbkdf2": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz", + "integrity": "sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==", "dev": true, "funding": [ { @@ -8812,7 +9268,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/sha2": "^5.7.0" @@ -8820,6 +9275,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/properties": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", + "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", "dev": true, "funding": [ { @@ -8831,13 +9288,14 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/providers": { "version": "5.7.2", + "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.7.2.tgz", + "integrity": "sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==", "dev": true, "funding": [ { @@ -8849,7 +9307,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", @@ -8875,6 +9332,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/random": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.7.0.tgz", + "integrity": "sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==", "dev": true, "funding": [ { @@ -8886,7 +9345,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -8894,6 +9352,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/rlp": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", + "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", "dev": true, "funding": [ { @@ -8905,7 +9365,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -8913,6 +9372,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/signing-key": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", + "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", "dev": true, "funding": [ { @@ -8924,7 +9385,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0", @@ -8936,6 +9396,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/solidity": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.7.0.tgz", + "integrity": "sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==", "dev": true, "funding": [ { @@ -8947,7 +9409,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -8959,6 +9420,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/transactions": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", + "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", "dev": true, "funding": [ { @@ -8970,7 +9433,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -8985,6 +9447,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/units": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.7.0.tgz", + "integrity": "sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==", "dev": true, "funding": [ { @@ -8996,7 +9460,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/constants": "^5.7.0", @@ -9005,6 +9468,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/wallet": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.7.0.tgz", + "integrity": "sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==", "dev": true, "funding": [ { @@ -9016,7 +9481,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", @@ -9037,6 +9501,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/web": { "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", + "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", "dev": true, "funding": [ { @@ -9048,7 +9514,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/base64": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9059,6 +9524,8 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/@ethersproject/wordlists": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.7.0.tgz", + "integrity": "sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==", "dev": true, "funding": [ { @@ -9070,7 +9537,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/hash": "^5.7.0", @@ -9081,16 +9547,20 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/aes-js": { "version": "3.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", + "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==", + "dev": true }, "node_modules/@ledgerhq/evm-tools/node_modules/bech32": { "version": "1.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", + "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==", + "dev": true }, "node_modules/@ledgerhq/evm-tools/node_modules/ethers": { "version": "5.7.2", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.7.2.tgz", + "integrity": "sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==", "dev": true, "funding": [ { @@ -9102,7 +9572,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abi": "5.7.0", "@ethersproject/abstract-provider": "5.7.0", @@ -9138,8 +9607,9 @@ }, "node_modules/@ledgerhq/evm-tools/node_modules/ws": { "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.3.0" }, @@ -9158,8 +9628,9 @@ }, "node_modules/@ledgerhq/hw-app-eth": { "version": "6.35.3", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-app-eth/-/hw-app-eth-6.35.3.tgz", + "integrity": "sha512-nt5kWQj9xmNmIMzueKJlNrM2MYo9zfPwUqo6haF/F1DsNK5LeIzrCqDaamAv+kfsiK6Y40d/jO5B6ukHG2qD+w==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ethersproject/abi": "^5.5.0", "@ethersproject/rlp": "^5.5.0", @@ -9177,6 +9648,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/abi": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", + "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", "dev": true, "funding": [ { @@ -9188,7 +9661,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -9203,6 +9675,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/abstract-provider": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", + "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", "dev": true, "funding": [ { @@ -9214,7 +9688,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9227,6 +9700,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/abstract-signer": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", + "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", "dev": true, "funding": [ { @@ -9238,7 +9713,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-provider": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -9249,6 +9723,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/address": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", + "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", "dev": true, "funding": [ { @@ -9260,7 +9736,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9271,6 +9746,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/base64": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", + "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", "dev": true, "funding": [ { @@ -9282,13 +9759,14 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0" } }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/hash": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", + "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", "dev": true, "funding": [ { @@ -9300,7 +9778,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/address": "^5.7.0", @@ -9315,6 +9792,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/networks": { "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", + "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", "dev": true, "funding": [ { @@ -9326,13 +9805,14 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/properties": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", + "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", "dev": true, "funding": [ { @@ -9344,13 +9824,14 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/logger": "^5.7.0" } }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/rlp": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", + "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", "dev": true, "funding": [ { @@ -9362,7 +9843,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0" @@ -9370,6 +9850,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/signing-key": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", + "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", "dev": true, "funding": [ { @@ -9381,7 +9863,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/logger": "^5.7.0", @@ -9393,6 +9874,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/transactions": { "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", + "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", "dev": true, "funding": [ { @@ -9404,7 +9887,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/address": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", @@ -9419,6 +9901,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/@ethersproject/web": { "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", + "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", "dev": true, "funding": [ { @@ -9430,7 +9914,6 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], - "license": "MIT", "dependencies": { "@ethersproject/base64": "^5.7.0", "@ethersproject/bytes": "^5.7.0", @@ -9440,9 +9923,10 @@ } }, "node_modules/@ledgerhq/hw-app-eth/node_modules/axios": { - "version": "1.6.5", + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", + "integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", "dev": true, - "license": "MIT", "dependencies": { "follow-redirects": "^1.15.4", "form-data": "^4.0.0", @@ -9451,6 +9935,8 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/follow-redirects": { "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -9458,7 +9944,6 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -9470,8 +9955,9 @@ }, "node_modules/@ledgerhq/hw-app-eth/node_modules/form-data": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, - "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -9483,8 +9969,9 @@ }, "node_modules/@ledgerhq/hw-transport": { "version": "6.30.2", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.30.2.tgz", + "integrity": "sha512-iTB0cwQaISvUXwrnPOLAmPoAOMvW14XmtKsuQce0qYJZC/1/eUPNFu6sOD8X0qUBbMfWhre8X9AmMuWTPQH3lA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ledgerhq/devices": "^8.2.0", "@ledgerhq/errors": "^6.16.1", @@ -9494,8 +9981,9 @@ }, "node_modules/@ledgerhq/hw-transport-mocker": { "version": "6.28.2", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-mocker/-/hw-transport-mocker-6.28.2.tgz", + "integrity": "sha512-sR/J+yDOM1uFdoTUpUWFVwsv8DQpbFxshYqb6gjp/lwOosSCZyztDc0i8+CwLAe+fze2QqKlsqie6bnGNE35NQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ledgerhq/hw-transport": "^6.30.2", "@ledgerhq/logs": "^6.12.0", @@ -9504,8 +9992,9 @@ }, "node_modules/@ledgerhq/hw-transport-node-hid": { "version": "6.28.2", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.28.2.tgz", + "integrity": "sha512-6PaW+eNdIbVt0BWJId8g9xyIYwScGRGmLUDYyfY6Ws+KTtqYeVjOhrgGT0nVUuF767zvTOOW9Nfl8f0Yvx4kLQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ledgerhq/devices": "^8.2.0", "@ledgerhq/errors": "^6.16.1", @@ -9519,8 +10008,9 @@ }, "node_modules/@ledgerhq/hw-transport-node-hid-noevents": { "version": "6.29.2", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.29.2.tgz", + "integrity": "sha512-bVRHCWxSTwIW5AQFqMrqg45U6Ae1IdF1eCDMGDg1bHzgOOHGtWrhdMf3GatUVI9FO3l0khYdGuRbheSfantjJg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ledgerhq/devices": "^8.2.0", "@ledgerhq/errors": "^6.16.1", @@ -9531,16 +10021,18 @@ }, "node_modules/@ledgerhq/hw-transport/node_modules/events": { "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.x" } }, "node_modules/@ledgerhq/live-env": { "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/live-env/-/live-env-0.9.0.tgz", + "integrity": "sha512-IRRyYw17Bc5TepOY1c0E1fG9YaCD7Mjl8SCn6VGhGtH932nJkqaGwPqJnrFhFjHXDx4unMSYedmMRWoaR2j0+Q==", "dev": true, - "license": "Apache-2.0", "dependencies": { "rxjs": "^7.8.1", "utility-types": "^3.10.0" @@ -9548,8 +10040,9 @@ }, "node_modules/@ledgerhq/live-network": { "version": "1.1.11", + "resolved": "https://registry.npmjs.org/@ledgerhq/live-network/-/live-network-1.1.11.tgz", + "integrity": "sha512-TamiftFWGC8tPkDNv1xSWtPxEbpu5xCmTbmXo9QD+pjjCApWqukuaJeNrW7VkkRYWdY7K8HA4Jz/PgPllNKs5A==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ledgerhq/errors": "^6.16.1", "@ledgerhq/live-env": "^0.9.0", @@ -9562,14 +10055,17 @@ }, "node_modules/@ledgerhq/live-network/node_modules/axios": { "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "dev": true, - "license": "MIT", "dependencies": { "follow-redirects": "^1.14.8" } }, "node_modules/@ledgerhq/live-network/node_modules/follow-redirects": { "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -9577,7 +10073,6 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -9589,29 +10084,33 @@ }, "node_modules/@ledgerhq/live-network/node_modules/lru-cache": { "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", "dev": true, - "license": "ISC", "engines": { "node": ">=12" } }, "node_modules/@ledgerhq/live-promise": { "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@ledgerhq/live-promise/-/live-promise-0.0.3.tgz", + "integrity": "sha512-/49dRz5XoxUw4TFq0kytU2Vz9w+FoGgG28U8RH9nuUWVPjVhAPvhY/QXUQA+7qqaorEIAYPHF0Rappalawhr+g==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@ledgerhq/logs": "^6.12.0" } }, "node_modules/@ledgerhq/logs": { "version": "6.12.0", - "dev": true, - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-6.12.0.tgz", + "integrity": "sha512-ExDoj1QV5eC6TEbMdLUMMk9cfvNKhhv5gXol4SmULRVCx/3iyCPhJ74nsb3S0Vb+/f+XujBEj3vQn5+cwS0fNA==", + "dev": true }, "node_modules/@ledgerhq/types-live": { "version": "6.44.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/types-live/-/types-live-6.44.0.tgz", + "integrity": "sha512-WFXLHsgAm+rJ5oxCl5c+Cr0lNVsX0av0wctEQjLZUF2FSWFvAiqmGMLUd5B0NsLhJaQYFw+iFo7C178DRfoh3w==", "dev": true, - "license": "Apache-2.0", "dependencies": { "bignumber.js": "^9.1.2", "rxjs": "^7.8.1" @@ -9619,11 +10118,13 @@ }, "node_modules/@lit-labs/ssr-dom-shim": { "version": "1.1.2", - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.2.tgz", + "integrity": "sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g==" }, "node_modules/@lit/reactive-element": { "version": "1.6.3", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.6.3.tgz", + "integrity": "sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ==", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.0.0" } @@ -9883,7 +10384,8 @@ }, "node_modules/@mongodb-js/saslprep": { "version": "1.1.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.4.tgz", + "integrity": "sha512-8zJ8N1x51xo9hwPh6AWnKdLGEC5N3lDa6kms1YHmFBoRhTpJR6HG8wWk0td1MVCu9cD4YBrvjZEtd5Obw0Fbnw==", "dependencies": { "sparse-bitfield": "^3.0.3" } @@ -9961,7 +10463,8 @@ }, "node_modules/@multiformats/base-x": { "version": "4.0.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@multiformats/base-x/-/base-x-4.0.1.tgz", + "integrity": "sha512-eMk0b9ReBbV23xXU693TAIrLyeO5iTgBZGSJfpqriG8UkYvr/hC9u9pyMlAakDNHWmbhMZCDs6KQO0jzKD8OTw==" }, "node_modules/@multiformats/murmur3": { "version": "1.1.3", @@ -10140,7 +10643,8 @@ }, "node_modules/@noble/ciphers": { "version": "0.4.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-0.4.1.tgz", + "integrity": "sha512-QCOA9cgf3Rc33owG0AYBB9wszz+Ul2kramWN8tXG44Gyciud/tbkEqvxRF/IpqQaBpRBNi9f4jdNxqB2CQCIXg==", "funding": { "url": "https://paulmillr.com/funding/" } @@ -10705,8 +11209,9 @@ }, "node_modules/@oclif/core": { "version": "1.26.2", + "resolved": "https://registry.npmjs.org/@oclif/core/-/core-1.26.2.tgz", + "integrity": "sha512-6jYuZgXvHfOIc9GIaS4T3CIKGTjPmfAxuMcbCbMRKJJl4aq/4xeRlEz0E8/hz8HxvxZBGvN2GwAUHlrGWQVrVw==", "dev": true, - "license": "MIT", "dependencies": { "@oclif/linewrap": "^1.0.0", "@oclif/screen": "^3.0.4", @@ -10743,8 +11248,9 @@ }, "node_modules/@oclif/core/node_modules/ansi-styles": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -10757,8 +11263,9 @@ }, "node_modules/@oclif/core/node_modules/chalk": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -10772,8 +11279,9 @@ }, "node_modules/@oclif/core/node_modules/chalk/node_modules/supports-color": { "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -10783,8 +11291,9 @@ }, "node_modules/@oclif/core/node_modules/clean-stack": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz", + "integrity": "sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==", "dev": true, - "license": "MIT", "dependencies": { "escape-string-regexp": "4.0.0" }, @@ -10797,8 +11306,9 @@ }, "node_modules/@oclif/core/node_modules/fs-extra": { "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, - "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -10811,8 +11321,9 @@ }, "node_modules/@oclif/core/node_modules/js-yaml": { "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -10823,8 +11334,9 @@ }, "node_modules/@oclif/core/node_modules/jsonfile": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, - "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -10834,8 +11346,9 @@ }, "node_modules/@oclif/core/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -10845,8 +11358,9 @@ }, "node_modules/@oclif/core/node_modules/semver": { "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -10859,21 +11373,24 @@ }, "node_modules/@oclif/core/node_modules/tslib": { "version": "2.6.2", - "dev": true, - "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "dev": true }, "node_modules/@oclif/core/node_modules/universalify": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 10.0.0" } }, "node_modules/@oclif/core/node_modules/widest-line": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", + "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", "dev": true, - "license": "MIT", "dependencies": { "string-width": "^4.0.0" }, @@ -10883,8 +11400,9 @@ }, "node_modules/@oclif/core/node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -10899,18 +11417,21 @@ }, "node_modules/@oclif/core/node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/@oclif/linewrap": { "version": "1.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz", + "integrity": "sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==", + "dev": true }, "node_modules/@oclif/plugin-help": { "version": "5.2.20", + "resolved": "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-5.2.20.tgz", + "integrity": "sha512-u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ==", "dev": true, - "license": "MIT", "dependencies": { "@oclif/core": "^2.15.0" }, @@ -10920,8 +11441,9 @@ }, "node_modules/@oclif/plugin-help/node_modules/@oclif/core": { "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@oclif/core/-/core-2.15.0.tgz", + "integrity": "sha512-fNEMG5DzJHhYmI3MgpByTvltBOMyFcnRIUMxbiz2ai8rhaYgaTHMG3Q38HcosfIvtw9nCjxpcQtC8MN8QtVCcA==", "dev": true, - "license": "MIT", "dependencies": { "@types/cli-progress": "^3.11.0", "ansi-escapes": "^4.3.2", @@ -10958,8 +11480,9 @@ }, "node_modules/@oclif/plugin-help/node_modules/ansi-styles": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -10972,8 +11495,9 @@ }, "node_modules/@oclif/plugin-help/node_modules/chalk": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -10987,8 +11511,9 @@ }, "node_modules/@oclif/plugin-help/node_modules/chalk/node_modules/supports-color": { "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -10998,8 +11523,9 @@ }, "node_modules/@oclif/plugin-help/node_modules/clean-stack": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz", + "integrity": "sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==", "dev": true, - "license": "MIT", "dependencies": { "escape-string-regexp": "4.0.0" }, @@ -11012,8 +11538,9 @@ }, "node_modules/@oclif/plugin-help/node_modules/js-yaml": { "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -11024,8 +11551,9 @@ }, "node_modules/@oclif/plugin-help/node_modules/slice-ansi": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -11040,13 +11568,15 @@ }, "node_modules/@oclif/plugin-help/node_modules/tslib": { "version": "2.6.2", - "dev": true, - "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "dev": true }, "node_modules/@oclif/plugin-help/node_modules/widest-line": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", + "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", "dev": true, - "license": "MIT", "dependencies": { "string-width": "^4.0.0" }, @@ -11056,13 +11586,15 @@ }, "node_modules/@oclif/plugin-help/node_modules/wordwrap": { "version": "1.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true }, "node_modules/@oclif/plugin-help/node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -11077,8 +11609,9 @@ }, "node_modules/@oclif/screen": { "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.8.tgz", + "integrity": "sha512-yx6KAqlt3TAHBduS2fMQtJDL2ufIHnDRArrJEOoTTuizxqmjLT+psGYOHpmMl3gvQpFJ11Hs76guUUktzAF9Bg==", "dev": true, - "license": "MIT", "engines": { "node": ">=12.0.0" } @@ -12220,8 +12753,9 @@ }, "node_modules/@pkgr/core": { "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.0.tgz", + "integrity": "sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ==", "dev": true, - "license": "MIT", "engines": { "node": "^12.20.0 || ^14.18.0 || >=16.0.0" }, @@ -12663,7 +13197,8 @@ }, "node_modules/@polka/url": { "version": "1.0.0-next.24", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz", + "integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==" }, "node_modules/@project-serum/anchor": { "version": "0.24.1", @@ -13139,7 +13674,8 @@ }, "node_modules/@radix-ui/react-slot": { "version": "1.0.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz", + "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==", "dependencies": { "@babel/runtime": "^7.13.10", "@radix-ui/react-compose-refs": "1.0.1" @@ -16324,8 +16860,9 @@ }, "node_modules/@rollup/plugin-virtual": { "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-3.0.2.tgz", + "integrity": "sha512-10monEYsBp3scM4/ND4LNH5Rxvh3e/cVeL3jWTgZ2SrQ+BmUoQcopVQvnaMcOnykb1VkxUFuDAN+0FnpTFRy2A==", "dev": true, - "license": "MIT", "engines": { "node": ">=14.0.0" }, @@ -16359,26 +16896,171 @@ "dev": true, "license": "MIT" }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.3.0.tgz", + "integrity": "sha512-/4pns6BYi8MXdwnXM44yoGAcFYVHL/BYlB2q1HXZ6AzH++LaiEVWFpBWQ/glXhbMbv3E3o09igrHFbP/snhAvA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.3.0.tgz", + "integrity": "sha512-nLO/JsL9idr416vzi3lHm3Xm+QZh4qHij8k3Er13kZr5YhL7/+kBAx84kDmPc7HMexLmwisjDCeDIKNFp8mDlQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, "node_modules/@rollup/rollup-darwin-arm64": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.3.0.tgz", + "integrity": "sha512-dGhVBlllt4iHwTGy21IEoMOTN5wZoid19zEIxsdY29xcEiOEHqzDa7Sqrkh5OE7LKCowL61eFJXxYe/+pYa7ZQ==", "cpu": [ "arm64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "darwin" ] }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.3.0.tgz", + "integrity": "sha512-h8wRfHeLEbU3NzaP1Oku7BYXCJQiTRr+8U0lklyOQXxXiEpHLL8tk1hFl+tezoRKLcPJD7joKaK74ASsqt3Ekg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.3.0.tgz", + "integrity": "sha512-wP4VgR/gfV18sylTuym3sxRTkAgUR2vh6YLeX/GEznk5jCYcYSlx585XlcUcl0c8UffIZlRJ09raWSX3JDb4GA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.3.0.tgz", + "integrity": "sha512-v/14JCYVkqRSJeQbxFx4oUkwVQQw6lFMN7bd4vuARBc3X2lmomkxBsc+BFiIDL/BK+CTx5AOh/k9XmqDnKWRVg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.3.0.tgz", + "integrity": "sha512-tNhfYqFH5OxtRzfkTOKdgFYlPSZnlDLNW4+leNEvQZhwTJxoTwsZAAhR97l3qVry/kkLyJPBK+Q8EAJLPinDIg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.3.0.tgz", + "integrity": "sha512-pw77m8QywdsoFdFOgmc8roF1inBI0rciqzO8ffRUgLoq7+ee9o5eFqtEcS6hHOOplgifAUUisP8cAnwl9nUYPw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.3.0.tgz", + "integrity": "sha512-tJs7v2MnV2F8w6X1UpPHl/43OfxjUy9SuJ2ZPoxn79v9vYteChVYO/ueLHCpRMmyTUIVML3N9z4azl9ENH8Xxg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.3.0.tgz", + "integrity": "sha512-OKGxp6kATQdTyI2DF+e9s+hB3/QZB45b6e+dzcfW1SUqiF6CviWyevhmT4USsMEdP3mlpC9zxLz3Oh+WaTMOSw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.3.0.tgz", + "integrity": "sha512-DDZ5AH68JJ2ClQFEA1aNnfA7Ybqyeh0644rGbrLOdNehTmzfICHiWSn0OprzYi9HAshTPQvlwrM+bi2kuaIOjQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.3.0.tgz", + "integrity": "sha512-dMvGV8p92GQ8jhNlGIKpyhVZPzJlT258pPrM5q2F8lKcc9Iv9BbfdnhX1OfinYWnb9ms5zLw6MlaMnqLfUkKnQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@rushstack/eslint-patch": { "version": "1.5.1", "license": "MIT" }, "node_modules/@scarf/scarf": { "version": "1.3.0", - "hasInstallScript": true, - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.3.0.tgz", + "integrity": "sha512-lHKK8M5CTcpFj2hZDB3wIjb0KAbEOgDmiJGDv1WBRfQgRm/a8/XMEkG/N1iM01xgbUDsPQwi42D+dFo1XPAKew==", + "hasInstallScript": true }, "node_modules/@scure/base": { "version": "1.1.1", @@ -16435,7 +17117,8 @@ }, "node_modules/@self.id/3box-legacy": { "version": "0.3.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@self.id/3box-legacy/-/3box-legacy-0.3.0.tgz", + "integrity": "sha512-RHCnKyouQrPb0k1RaoyydENK0ELIXFGWZvmM3G4NQ7/XqmiF/EGShkGKxmf8Dj2zPLN55FSAgQNdxYUlyKKMTg==", "dependencies": { "cross-fetch": "^3.1.4" }, @@ -16445,7 +17128,8 @@ }, "node_modules/@self.id/core": { "version": "0.4.1", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@self.id/core/-/core-0.4.1.tgz", + "integrity": "sha512-sczQxU4iujPk0G8qhEi+++QZ3wFk0HOK/PbLwMRA+N8V8fMM2ujQO6MassX4DfpqtB6DWILO2WAlxPp8VmCEFA==", "dependencies": { "@ceramicnetwork/3id-did-resolver": "^2.0.0", "@ceramicnetwork/http-client": "^2.0.0", @@ -16520,7 +17204,8 @@ }, "node_modules/@sentry-internal/tracing": { "version": "7.65.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.65.0.tgz", + "integrity": "sha512-TEYkiq5vKr1Y79YIu+UYr1sO3vEMttQOBsOZLziDbqiC7TvKUARBR4W5XWfb9qBVDeon87EFNKluW0/+7rzYWw==", "dependencies": { "@sentry/core": "7.65.0", "@sentry/types": "7.65.0", @@ -16533,7 +17218,8 @@ }, "node_modules/@sentry/browser": { "version": "7.65.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.65.0.tgz", + "integrity": "sha512-TUzZPAXNJ/Y1yakFODYhsEtdDpLdkgjTfrx5i9MOnXQLrcRR0C4TC1KitqbP6Tv7Xha9WiR0TDZkh7gS/9RxEA==", "dependencies": { "@sentry-internal/tracing": "7.65.0", "@sentry/core": "7.65.0", @@ -16548,7 +17234,8 @@ }, "node_modules/@sentry/cli": { "version": "2.23.0", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.23.0.tgz", + "integrity": "sha512-xFTv7YOaKWMCSPgN8A1jZpxJQhwdES89pqMTWjJOgjmkwFvziuaTM7O7kazps/cACDhJp2lK2j6AT6imhr4t9w==", "dependencies": { "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.7", @@ -16574,7 +17261,8 @@ }, "node_modules/@sentry/cli-darwin": { "version": "2.23.0", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.23.0.tgz", + "integrity": "sha512-tWuTxvb6P5pA0E+O1/7jKQ6AP45DOOW+BAd7mwBMHZ+5xG3nsvvrRS9hOIzBNPTeB2RyIEXgpQ2Mb6NdD21DBQ==", "optional": true, "os": [ "darwin" @@ -16583,9 +17271,106 @@ "node": ">=10" } }, + "node_modules/@sentry/cli-linux-arm": { + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.23.0.tgz", + "integrity": "sha512-1R8ngBDKtPw++Km6VnVTx76ndrBL9BuBBNpF9TUCGftK3ArdaifqoIx8cZ8aKu8sWXLAKO7lHzxL4BNPZvlDiw==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux", + "freebsd" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-linux-arm64": { + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.23.0.tgz", + "integrity": "sha512-KsOckP+b0xAzrRuoP4eiqJ6ASD6SqIplL8BCHOAODQfvWn9rgNwsJWOgKlWwfrJnkJYkpWVYvYeyx0oeUx3N0g==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux", + "freebsd" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-linux-i686": { + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.23.0.tgz", + "integrity": "sha512-KRqB98KstBkKh33ZqUq+q8O0U4c01aTWCNPpVrqAX7zikSk0AAJTG8eAtqwDSx949IkKUl8xa6PFLfz+Nb2EMQ==", + "cpu": [ + "x86", + "ia32" + ], + "optional": true, + "os": [ + "linux", + "freebsd" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-linux-x64": { + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.23.0.tgz", + "integrity": "sha512-USHZ0zzg9qujGYAyRjLeUfLDZOMgNjCr82m0BSBMmlFs4oKwHmO6bSvdi9UzNNcpmkOavNAdUM4jnZWk11i46Q==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux", + "freebsd" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-win32-i686": { + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.23.0.tgz", + "integrity": "sha512-lS/B3pONDl18IEu/I//3vcMnosThobyXpqfAm4WYUtFTiw/wwDHgwGgaIjZWm5wMRkPFzYoRFpZfPlUrJd/4cQ==", + "cpu": [ + "x86", + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@sentry/cli-win32-x64": { + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.23.0.tgz", + "integrity": "sha512-7LP6wA3w93ViYKQR8tMN2i/SfpQzaXqM2SAHI3yfJ3bdREHOV3+/N0mNiWVRvgL0TKNQJS42v2IILLhiDxufHQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, "node_modules/@sentry/cli/node_modules/node-fetch": { "version": "2.7.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -16603,15 +17388,18 @@ }, "node_modules/@sentry/cli/node_modules/tr46": { "version": "0.0.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/@sentry/cli/node_modules/webidl-conversions": { "version": "3.0.1", - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/@sentry/cli/node_modules/whatwg-url": { "version": "5.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -16619,7 +17407,8 @@ }, "node_modules/@sentry/core": { "version": "7.65.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.65.0.tgz", + "integrity": "sha512-EwZABW8CtAbRGXV69FqeCqcNApA+Jbq308dko0W+MFdFe+9t2RGubUkpPxpJcbWy/dN2j4LiuENu1T7nWn0ZAQ==", "dependencies": { "@sentry/types": "7.65.0", "@sentry/utils": "7.65.0", @@ -16631,7 +17420,8 @@ }, "node_modules/@sentry/hub": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.2.5.tgz", + "integrity": "sha512-YlEFdEhcfqpl2HC+/dWXBsBJEljyMzFS7LRRjCk8QANcOdp9PhwQjwebUB4/ulOBjHPP2WZk7fBBd/IKDasTUg==", "dependencies": { "@sentry/types": "6.2.5", "@sentry/utils": "6.2.5", @@ -16643,14 +17433,16 @@ }, "node_modules/@sentry/hub/node_modules/@sentry/types": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.5.tgz", + "integrity": "sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w==", "engines": { "node": ">=6" } }, "node_modules/@sentry/hub/node_modules/@sentry/utils": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.5.tgz", + "integrity": "sha512-fJoLUZHrd5MPylV1dT4qL74yNFDl1Ur/dab+pKNSyvnHPnbZ/LRM7aJ8VaRY/A7ZdpRowU+E14e/Yeem2c6gtQ==", "dependencies": { "@sentry/types": "6.2.5", "tslib": "^1.9.3" @@ -16661,7 +17453,8 @@ }, "node_modules/@sentry/integrations": { "version": "7.65.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.65.0.tgz", + "integrity": "sha512-9b54p0UrkWe9+RAWWTObJQ2k/uStqaUj7BkNFyuaxfKQ4IZViqc4Sa7d7zX2X1oynGNL3ic7iqcgVTh7NvNsAQ==", "dependencies": { "@sentry/types": "7.65.0", "@sentry/utils": "7.65.0", @@ -16674,7 +17467,8 @@ }, "node_modules/@sentry/minimal": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.2.5.tgz", + "integrity": "sha512-RKP4Qx3p7Cv0oX1cPKAkNVFYM7p2k1t32cNk1+rrVQS4hwlJ7Eg6m6fsqsO+85jd6Ne/FnyYsfo9cDD3ImTlWQ==", "dependencies": { "@sentry/hub": "6.2.5", "@sentry/types": "6.2.5", @@ -16686,14 +17480,16 @@ }, "node_modules/@sentry/minimal/node_modules/@sentry/types": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.5.tgz", + "integrity": "sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w==", "engines": { "node": ">=6" } }, "node_modules/@sentry/node": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-6.2.5.tgz", + "integrity": "sha512-/iM3khzGnUH713VFhZBAEYJhb/saEQSVz7Udogml+O7mFQ4rutnwJhgoGcB9YYrwMv2m7qOSszkdZbemDV6k2g==", "dependencies": { "@sentry/core": "6.2.5", "@sentry/hub": "6.2.5", @@ -16711,7 +17507,8 @@ }, "node_modules/@sentry/node/node_modules/@sentry/core": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.2.5.tgz", + "integrity": "sha512-I+AkgIFO6sDUoHQticP6I27TT3L+i6TUS03in3IEtpBcSeP2jyhlxI8l/wdA7gsBqUPdQ4GHOOaNgtFIcr8qag==", "dependencies": { "@sentry/hub": "6.2.5", "@sentry/minimal": "6.2.5", @@ -16725,14 +17522,16 @@ }, "node_modules/@sentry/node/node_modules/@sentry/types": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.5.tgz", + "integrity": "sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w==", "engines": { "node": ">=6" } }, "node_modules/@sentry/node/node_modules/@sentry/utils": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.5.tgz", + "integrity": "sha512-fJoLUZHrd5MPylV1dT4qL74yNFDl1Ur/dab+pKNSyvnHPnbZ/LRM7aJ8VaRY/A7ZdpRowU+E14e/Yeem2c6gtQ==", "dependencies": { "@sentry/types": "6.2.5", "tslib": "^1.9.3" @@ -16743,7 +17542,8 @@ }, "node_modules/@sentry/react": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.81.1.tgz", + "integrity": "sha512-kk0plP/mf8KgVLOiImIpp1liYysmh3Un8uXcVAToomSuHZPGanelFAdP0XhY+0HlWU9KIfxTjhMte1iSwQ8pYw==", "dependencies": { "@sentry/browser": "7.81.1", "@sentry/types": "7.81.1", @@ -16759,7 +17559,8 @@ }, "node_modules/@sentry/react-native": { "version": "5.15.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/react-native/-/react-native-5.15.2.tgz", + "integrity": "sha512-X9yYdgIvVloR4WUrX8zSU0SXbmqY5Yq1W68TT2xe4LyKpWYJHFFbeJUaFAXFn65JXOSJvjEpEFYYyGJ9dzQ9rg==", "dependencies": { "@sentry/browser": "7.81.1", "@sentry/cli": "2.23.0", @@ -16777,7 +17578,8 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry-internal/tracing": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.81.1.tgz", + "integrity": "sha512-E5xm27xrLXL10knH2EWDQsQYh5nb4SxxZzJ3sJwDGG9XGKzBdlp20UUhKqx00wixooVX9uCj3e4Jg8SvNB1hKg==", "dependencies": { "@sentry/core": "7.81.1", "@sentry/types": "7.81.1", @@ -16789,7 +17591,8 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/browser": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.81.1.tgz", + "integrity": "sha512-DNtS7bZEnFPKVoGazKs5wHoWC0FwsOFOOMNeDvEfouUqKKbjO7+RDHbr7H6Bo83zX4qmZWRBf8V+3n3YPIiJFw==", "dependencies": { "@sentry-internal/tracing": "7.81.1", "@sentry/core": "7.81.1", @@ -16803,7 +17606,8 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/core": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.81.1.tgz", + "integrity": "sha512-tU37yAmckOGCw/moWKSwekSCWWJP15O6luIq+u7wal22hE88F3Vc5Avo8SeF3upnPR+4ejaOFH+BJTr6bgrs6Q==", "dependencies": { "@sentry/types": "7.81.1", "@sentry/utils": "7.81.1" @@ -16814,7 +17618,8 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/hub": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-7.81.1.tgz", + "integrity": "sha512-25cvsI3HKiRLJBZGFC8ntuy7/yB8M1w8YLTjr3tIqydYmjFUX7f18w0iuWEtd204d8OQSPBJDapbGMdfkE5x6w==", "dependencies": { "@sentry/core": "7.81.1", "@sentry/types": "7.81.1", @@ -16826,7 +17631,8 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/integrations": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.81.1.tgz", + "integrity": "sha512-DN5ONn0/LX5HHVPf1EBGHFssIZaZmLgkqUIeMqCNYBpB4DiOrJANnGwTcWKDPphqhdPxjnPv9AGRLaU0PdvvZQ==", "dependencies": { "@sentry/core": "7.81.1", "@sentry/types": "7.81.1", @@ -16839,7 +17645,8 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/replay": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.81.1.tgz", + "integrity": "sha512-4ueT0C4bYjngN/9p0fEYH10dTMLovHyk9HxJ6zSTgePvGVexhg+cSEHXisoBDwHeRZVnbIvsVM0NA7rmEDXJJw==", "dependencies": { "@sentry-internal/tracing": "7.81.1", "@sentry/core": "7.81.1", @@ -16852,14 +17659,16 @@ }, "node_modules/@sentry/react-native/node_modules/@sentry/types": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.81.1.tgz", + "integrity": "sha512-dvJvGyctiaPMIQqa46k56Re5IODWMDxiHJ1UjBs/WYDLrmWFPGrEbyJ8w8CYLhYA+7qqrCyIZmHbWSTRIxstHw==", "engines": { "node": ">=8" } }, "node_modules/@sentry/react-native/node_modules/@sentry/utils": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.81.1.tgz", + "integrity": "sha512-gq+MDXIirHKxNZ+c9/lVvCXd6y2zaZANujwlFggRH2u9SRiPaIXVilLpvMm4uJqmqBMEcY81ArujExtHvkbCqg==", "dependencies": { "@sentry/types": "7.81.1" }, @@ -16869,7 +17678,8 @@ }, "node_modules/@sentry/react/node_modules/@sentry-internal/tracing": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.81.1.tgz", + "integrity": "sha512-E5xm27xrLXL10knH2EWDQsQYh5nb4SxxZzJ3sJwDGG9XGKzBdlp20UUhKqx00wixooVX9uCj3e4Jg8SvNB1hKg==", "dependencies": { "@sentry/core": "7.81.1", "@sentry/types": "7.81.1", @@ -16881,7 +17691,8 @@ }, "node_modules/@sentry/react/node_modules/@sentry/browser": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.81.1.tgz", + "integrity": "sha512-DNtS7bZEnFPKVoGazKs5wHoWC0FwsOFOOMNeDvEfouUqKKbjO7+RDHbr7H6Bo83zX4qmZWRBf8V+3n3YPIiJFw==", "dependencies": { "@sentry-internal/tracing": "7.81.1", "@sentry/core": "7.81.1", @@ -16895,7 +17706,8 @@ }, "node_modules/@sentry/react/node_modules/@sentry/core": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.81.1.tgz", + "integrity": "sha512-tU37yAmckOGCw/moWKSwekSCWWJP15O6luIq+u7wal22hE88F3Vc5Avo8SeF3upnPR+4ejaOFH+BJTr6bgrs6Q==", "dependencies": { "@sentry/types": "7.81.1", "@sentry/utils": "7.81.1" @@ -16906,7 +17718,8 @@ }, "node_modules/@sentry/react/node_modules/@sentry/replay": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.81.1.tgz", + "integrity": "sha512-4ueT0C4bYjngN/9p0fEYH10dTMLovHyk9HxJ6zSTgePvGVexhg+cSEHXisoBDwHeRZVnbIvsVM0NA7rmEDXJJw==", "dependencies": { "@sentry-internal/tracing": "7.81.1", "@sentry/core": "7.81.1", @@ -16919,14 +17732,16 @@ }, "node_modules/@sentry/react/node_modules/@sentry/types": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.81.1.tgz", + "integrity": "sha512-dvJvGyctiaPMIQqa46k56Re5IODWMDxiHJ1UjBs/WYDLrmWFPGrEbyJ8w8CYLhYA+7qqrCyIZmHbWSTRIxstHw==", "engines": { "node": ">=8" } }, "node_modules/@sentry/react/node_modules/@sentry/utils": { "version": "7.81.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.81.1.tgz", + "integrity": "sha512-gq+MDXIirHKxNZ+c9/lVvCXd6y2zaZANujwlFggRH2u9SRiPaIXVilLpvMm4uJqmqBMEcY81ArujExtHvkbCqg==", "dependencies": { "@sentry/types": "7.81.1" }, @@ -16936,7 +17751,8 @@ }, "node_modules/@sentry/replay": { "version": "7.65.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.65.0.tgz", + "integrity": "sha512-vhlk5F9RrhMQ+gOjNlLoWXamAPLNIT6wNII1O9ae+DRhZFmiUYirP5ag6dH5lljvNZndKl+xw+lJGJ3YdjXKlQ==", "dependencies": { "@sentry/core": "7.65.0", "@sentry/types": "7.65.0", @@ -16948,7 +17764,8 @@ }, "node_modules/@sentry/tracing": { "version": "6.2.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.2.5.tgz", + "integrity": "sha512-j/hM0BoHxfrNLxPeEJ5Vq4R34hO/TOHMEpLR3FdnunBXbsmjoKMMygIkPxnpML5XWtvukAehbwpDXldwMYz83w==", "dependencies": { "@sentry/hub": "6.2.5", "@sentry/minimal": "6.2.5", @@ -16962,14 +17779,16 @@ }, "node_modules/@sentry/tracing/node_modules/@sentry/types": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.2.5.tgz", + "integrity": "sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w==", "engines": { "node": ">=6" } }, "node_modules/@sentry/tracing/node_modules/@sentry/utils": { "version": "6.2.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.2.5.tgz", + "integrity": "sha512-fJoLUZHrd5MPylV1dT4qL74yNFDl1Ur/dab+pKNSyvnHPnbZ/LRM7aJ8VaRY/A7ZdpRowU+E14e/Yeem2c6gtQ==", "dependencies": { "@sentry/types": "6.2.5", "tslib": "^1.9.3" @@ -16980,14 +17799,16 @@ }, "node_modules/@sentry/types": { "version": "7.65.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.65.0.tgz", + "integrity": "sha512-YYq7IDLLhpSBTmHoyWFtq/5ZDaEJ01r7xGuhB0aSIq33cm2I7im/B3ipzoOP/ukGZSIhuYVW9t531xZEO0+6og==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { "version": "7.65.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.65.0.tgz", + "integrity": "sha512-2JEBf4jzRSClhp+LJpX/E3QgHEeKvXqFMeNhmwQ07qqd6szhfH2ckYFj4gXk6YiGGY4Act3C6oxLfdZovG71bw==", "dependencies": { "@sentry/types": "7.65.0", "tslib": "^2.4.1 || ^1.9.3" @@ -17640,7 +18461,8 @@ }, "node_modules/@socket.io/component-emitter": { "version": "3.1.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" }, "node_modules/@solana-mobile/mobile-wallet-adapter-protocol": { "version": "0.9.9", @@ -17712,8 +18534,9 @@ }, "node_modules/@solana/wallet-adapter-base": { "version": "0.9.23", + "resolved": "https://registry.npmjs.org/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.23.tgz", + "integrity": "sha512-apqMuYwFp1jFi55NxDfvXUX2x1T0Zh07MxhZ/nCCTGys5raSfYUh82zen2BLv8BSDj/JxZ2P/s7jrQZGrX8uAw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@solana/wallet-standard-features": "^1.1.0", "@wallet-standard/base": "^1.0.1", @@ -17729,8 +18552,9 @@ }, "node_modules/@solana/wallet-standard-features": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@solana/wallet-standard-features/-/wallet-standard-features-1.1.0.tgz", + "integrity": "sha512-oVyygxfYkkF5INYL0GuD8GFmNO/wd45zNesIqGCFE6X66BYxmI6HmyzQJCcZTZ0BNsezlVg4t+3MCL5AhfFoGA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@wallet-standard/base": "^1.0.1", "@wallet-standard/features": "^1.0.3" @@ -17823,14 +18647,16 @@ }, "node_modules/@stablelib/binary": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@stablelib/binary/-/binary-1.0.1.tgz", + "integrity": "sha512-ClJWvmL6UBM/wjkvv/7m5VP3GMr9t0osr4yVgLZsLCOz4hGN9gIAFEqnJ0TsSMAN+n840nf2cHZnA5/KFqHC7Q==", "dependencies": { "@stablelib/int": "^1.0.1" } }, "node_modules/@stablelib/ed25519": { "version": "1.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@stablelib/ed25519/-/ed25519-1.0.3.tgz", + "integrity": "sha512-puIMWaX9QlRsbhxfDc5i+mNPMY+0TmQEskunY1rZEBPi1acBCVQAhnsk/1Hk50DGPtVsZtAWQg4NHGlVaO9Hqg==", "dependencies": { "@stablelib/random": "^1.0.2", "@stablelib/sha512": "^1.0.1", @@ -17839,15 +18665,18 @@ }, "node_modules/@stablelib/hash": { "version": "1.0.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@stablelib/hash/-/hash-1.0.1.tgz", + "integrity": "sha512-eTPJc/stDkdtOcrNMZ6mcMK1e6yBbqRBaNW55XA1jU8w/7QdnCF0CmMmOD1m7VSkBR44PWrMHU2l6r8YEQHMgg==" }, "node_modules/@stablelib/int": { "version": "1.0.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@stablelib/int/-/int-1.0.1.tgz", + "integrity": "sha512-byr69X/sDtDiIjIV6m4roLVWnNNlRGzsvxw+agj8CIEazqWGOQp2dTYgQhtyVXV9wpO6WyXRQUzLV/JRNumT2w==" }, "node_modules/@stablelib/random": { "version": "1.0.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@stablelib/random/-/random-1.0.2.tgz", + "integrity": "sha512-rIsE83Xpb7clHPVRlBj8qNe5L8ISQOzjghYQm/dZ7VaM2KHYwMW5adjQjrzTZCchFnNCNhkwtnOBa9HTMJCI8w==", "dependencies": { "@stablelib/binary": "^1.0.1", "@stablelib/wipe": "^1.0.1" @@ -17855,7 +18684,8 @@ }, "node_modules/@stablelib/sha256": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@stablelib/sha256/-/sha256-1.0.1.tgz", + "integrity": "sha512-GIIH3e6KH+91FqGV42Kcj71Uefd/QEe7Dy42sBTeqppXV95ggCcxLTk39bEr+lZfJmp+ghsR07J++ORkRELsBQ==", "dependencies": { "@stablelib/binary": "^1.0.1", "@stablelib/hash": "^1.0.1", @@ -17864,7 +18694,8 @@ }, "node_modules/@stablelib/sha512": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@stablelib/sha512/-/sha512-1.0.1.tgz", + "integrity": "sha512-13gl/iawHV9zvDKciLo1fQ8Bgn2Pvf7OV6amaRVKiq3pjQ3UmEpXxWiAfV8tYjUpeZroBxtyrwtdooQT/i3hzw==", "dependencies": { "@stablelib/binary": "^1.0.1", "@stablelib/hash": "^1.0.1", @@ -17873,19 +18704,22 @@ }, "node_modules/@stablelib/wipe": { "version": "1.0.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@stablelib/wipe/-/wipe-1.0.1.tgz", + "integrity": "sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg==" }, "node_modules/@stacks/common": { "version": "6.10.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@stacks/common/-/common-6.10.0.tgz", + "integrity": "sha512-6x5Z7AKd9/kj3+DYE9xIDIkFLHihBH614i2wqrZIjN02WxVo063hWSjIlUxlx8P4gl6olVzlOy5LzhLJD9OP0A==", "dependencies": { "@types/bn.js": "^5.1.0", "@types/node": "^18.0.4" } }, "node_modules/@stacks/encryption": { - "version": "6.11.3", - "license": "MIT", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.11.2.tgz", + "integrity": "sha512-lkTlAmsmc8feLk57SVeTn08Z1brMX7kyxJ1KT02lAYvlhq34Hf/GoNLnHaowBRR6cExI2rAQYtOX162+mgJ5aQ==", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", @@ -17900,33 +18734,36 @@ }, "node_modules/@stacks/encryption/node_modules/@noble/hashes": { "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz", + "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } - ], - "license": "MIT" + ] }, "node_modules/@stacks/encryption/node_modules/@noble/secp256k1": { "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", + "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } - ], - "license": "MIT" + ] }, "node_modules/@stacks/encryption/node_modules/@scure/bip39": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz", + "integrity": "sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } ], - "license": "MIT", "dependencies": { "@noble/hashes": "~1.1.1", "@scure/base": "~1.1.0" @@ -17934,54 +18771,60 @@ }, "node_modules/@stacks/encryption/node_modules/base-x": { "version": "4.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", + "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" }, "node_modules/@stacks/encryption/node_modules/bs58": { "version": "5.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz", + "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==", "dependencies": { "base-x": "^4.0.0" } }, "node_modules/@stacks/network": { - "version": "6.11.3", - "license": "MIT", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.10.0.tgz", + "integrity": "sha512-mbiZ8nlsyy77ndmBdaqhHXii22IFdK4ThRcOQs9j/O00DkAr04jCM4GV5Q+VLUnZ9OBoJq7yOV7Pf6jglh+0hw==", "dependencies": { "@stacks/common": "^6.10.0", "cross-fetch": "^3.1.5" } }, "node_modules/@stacks/transactions": { - "version": "6.11.3", - "license": "MIT", + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.11.2.tgz", + "integrity": "sha512-Ojz+8gEl0NcLNnlKqu2itLqqcdzH8zrkmyRUU2zcOJseKy6q7JID16wxMdEI8dSUcL7gxLYJzNMhx8BoI9CMPQ==", "dependencies": { "@noble/hashes": "1.1.5", "@noble/secp256k1": "1.7.1", "@stacks/common": "^6.10.0", - "@stacks/network": "^6.11.3", + "@stacks/network": "^6.10.0", "c32check": "^2.0.0", "lodash.clonedeep": "^4.5.0" } }, "node_modules/@stacks/transactions/node_modules/@noble/hashes": { "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz", + "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } - ], - "license": "MIT" + ] }, "node_modules/@stacks/transactions/node_modules/@noble/secp256k1": { "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", + "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==", "funding": [ { "type": "individual", "url": "https://paulmillr.com/funding/" } - ], - "license": "MIT" + ] }, "node_modules/@storybook/addon-a11y": { "version": "7.4.0", @@ -34736,8 +35579,9 @@ }, "node_modules/@tanstack/eslint-plugin-query": { "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@tanstack/eslint-plugin-query/-/eslint-plugin-query-5.0.5.tgz", + "integrity": "sha512-kYbh5Cboz1BzN6LeUWnI1B0BCikXMYQjxaEO7cV+0rycllU0qZqSEkd2LdgWIZhuLTc4WBt0li1s+O6RhM5Cog==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/utils": "^5.54.0" }, @@ -34751,7 +35595,8 @@ }, "node_modules/@tanstack/query-core": { "version": "4.35.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.35.7.tgz", + "integrity": "sha512-PgDJtX75ubFS0WCYFM7DqEoJ4QbxU3S5OH3gJSI40xr7UVVax3/J4CM3XUMOTs+EOT5YGEfssi3tfRVGte4DEw==", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -34759,7 +35604,8 @@ }, "node_modules/@tanstack/query-devtools": { "version": "5.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.1.0.tgz", + "integrity": "sha512-EZhYS6clf4yyzFwE3b+7P2J46zgiweIwatc80MhfuzScz/Z4m1kPsKvNK0j54v4y1WvG4pN14qfOXjp4ac7f/Q==", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -34767,7 +35613,8 @@ }, "node_modules/@tanstack/react-query": { "version": "4.35.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-4.35.7.tgz", + "integrity": "sha512-0MankquP/6EOM2ATfEov6ViiKemey5uTbjGlFMX1xGotwNaqC76YKDMJdHumZupPbZcZPWAeoPGEHQmVKIKoOQ==", "dependencies": { "@tanstack/query-core": "4.35.7", "use-sync-external-store": "^1.2.0" @@ -34790,22 +35637,6 @@ } } }, - "node_modules/@tanstack/react-query-devtools": { - "version": "5.1.0", - "license": "MIT", - "dependencies": { - "@tanstack/query-devtools": "5.1.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "peerDependencies": { - "@tanstack/react-query": "^5.0.5", - "react": "^18.0.0", - "react-dom": "^18.0.0" - } - }, "node_modules/@terra-dev/browser-check": { "version": "2.5.3", "license": "Apache-2.0", @@ -35423,20 +36254,22 @@ }, "node_modules/@trpc/client": { "version": "10.38.4", + "resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.38.4.tgz", + "integrity": "sha512-svpZ9Iq9cnn+XfXQZF8PMt1YxAtNYeGiKZ/pGpcume7RqJrra/kWwU41gbax8d/cAg3YKUgNft9dZFKMYtXuYw==", "funding": [ "https://trpc.io/sponsor" ], - "license": "MIT", "peerDependencies": { "@trpc/server": "10.38.4" } }, "node_modules/@trpc/react-query": { "version": "10.38.4", + "resolved": "https://registry.npmjs.org/@trpc/react-query/-/react-query-10.38.4.tgz", + "integrity": "sha512-wEreUn9E+ZMKn/oRWlhHzmSgG5SG9WpmE1F27PPjn3I0S92aYRQvVsmV43v2OAL1VUYP2aHLk7gXx2luKLLRyw==", "funding": [ "https://trpc.io/sponsor" ], - "license": "MIT", "peerDependencies": { "@tanstack/react-query": "^4.18.0", "@trpc/client": "10.38.4", @@ -35447,10 +36280,11 @@ }, "node_modules/@trpc/server": { "version": "10.38.4", + "resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.38.4.tgz", + "integrity": "sha512-xSMTwnKA/Unxu5fbAkQ7cApHeWj1rTEA3XgrGDcPHn03fmeIidIKxronM46N46ZF4CCexey4JWzu89XxA16uIA==", "funding": [ "https://trpc.io/sponsor" - ], - "license": "MIT" + ] }, "node_modules/@truffle/blockchain-utils": { "version": "0.0.18", @@ -36126,8 +36960,8 @@ "license": "Apache-2.0", "dependencies": { "debug": "^2.2.0", - "gulp": "^4.0.2", - "nan": "^2.11.0", + "es5-ext": "^0.10.50", + "nan": "^2.14.0", "typedarray-to-buffer": "^3.1.5", "yaeti": "^0.0.6" }, @@ -37184,8 +38018,9 @@ }, "node_modules/@types/3box": { "version": "1.22.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/3box/-/3box-1.22.0.tgz", + "integrity": "sha512-IuB9Y1FaxIObBpiuEMwI6hNAhAjrJrXssMJowaOgWOmquICaMq5a1wlhOEgv9YDW/oK8WfAw8gXTCkj2K2O0lA==", + "dev": true }, "node_modules/@types/acorn": { "version": "4.0.6", @@ -37326,32 +38161,36 @@ }, "node_modules/@types/cli-progress": { "version": "3.11.5", + "resolved": "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.5.tgz", + "integrity": "sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/color": { "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@types/color/-/color-3.0.6.tgz", + "integrity": "sha512-NMiNcZFRUAiUUCCf7zkAelY8eV3aKqfbzyFQlXpPIEeoNDbsEHGpb854V3gzTsGKYj830I5zPuOwU/TP5/cW6A==", "dev": true, - "license": "MIT", "dependencies": { "@types/color-convert": "*" } }, "node_modules/@types/color-convert": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/color-convert/-/color-convert-2.0.3.tgz", + "integrity": "sha512-2Q6wzrNiuEvYxVQqhh7sXM2mhIhvZR/Paq4FdsQkOMgWsCIkKvSGj8Le1/XalulrmgOzPMqNa0ix+ePY4hTrfg==", "dev": true, - "license": "MIT", "dependencies": { "@types/color-name": "*" } }, "node_modules/@types/color-name": { "version": "1.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-87W6MJCKZYDhLAx/J1ikW8niMvmGRyY+rpUxWpL1cO7F8Uu5CHuQoFv+R0/L5pgNdW4jTyda42kv60uwVIPjLw==", + "dev": true }, "node_modules/@types/compute-lcm": { "version": "1.1.1", @@ -37722,7 +38561,8 @@ }, "node_modules/@types/lodash-es": { "version": "4.17.12", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz", + "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", "dependencies": { "@types/lodash": "*" } @@ -37793,8 +38633,9 @@ }, "node_modules/@types/node-cron": { "version": "3.0.11", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/node-cron/-/node-cron-3.0.11.tgz", + "integrity": "sha512-0ikrnug3/IyneSHqCBeslAhlK2aBfYek1fGo4bP4QnZPmiqSGRK+Oy7ZMisLWkesffJvQ1cqAcBnJC+8+nxIAg==", + "dev": true }, "node_modules/@types/node-fetch": { "version": "2.6.8", @@ -37966,7 +38807,8 @@ }, "node_modules/@types/react": { "version": "18.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.0.tgz", + "integrity": "sha512-0FLj93y5USLHdnhIhABk83rm8XEGA7kH3cr+YUlvxoUGp1xNt/DINUMvqPxLyOQMzLmZe8i4RTHbvb8MC7NmrA==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -37993,8 +38835,9 @@ }, "node_modules/@types/react-dom": { "version": "18.2.0", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-8yQrvS6sMpSwIovhPOwfyNf2Wz6v/B62LFSVYQ85+Rq3tLsBIG7rP5geMxaijTUxSkrO6RzN/IRuIAADYQsleA==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } @@ -38084,8 +38927,9 @@ }, "node_modules/@types/react-tooltip": { "version": "3.11.0", + "resolved": "https://registry.npmjs.org/@types/react-tooltip/-/react-tooltip-3.11.0.tgz", + "integrity": "sha512-TkXMgkZ5aAKkFE9Wvt8OlOiPtF9ufgBOL9xWlRSzLBaoL12qSOBiyMcU4/8TyED1fuWkm5VTVarScwOPLSArYw==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } @@ -38341,7 +39185,8 @@ }, "node_modules/@types/trusted-types": { "version": "2.0.7", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==" }, "node_modules/@types/tsscmp": { "version": "1.0.1", @@ -38349,7 +39194,8 @@ }, "node_modules/@types/ungap__global-this": { "version": "0.3.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/ungap__global-this/-/ungap__global-this-0.3.3.tgz", + "integrity": "sha512-xQmbka2Nc/tILZsXWigqr60nniHaHCddbilYy2ozU9V5wBoNd6qhLXsdK4/7LzHRcod+setcpeWemcxfOj61Cg==" }, "node_modules/@types/unist": { "version": "2.0.9", @@ -38357,8 +39203,9 @@ }, "node_modules/@types/url-join": { "version": "4.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz", + "integrity": "sha512-awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw==", + "dev": true }, "node_modules/@types/use-sync-external-store": { "version": "0.0.3", @@ -38377,8 +39224,9 @@ }, "node_modules/@types/w3c-web-usb": { "version": "1.0.10", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/w3c-web-usb/-/w3c-web-usb-1.0.10.tgz", + "integrity": "sha512-CHgUI5kTc/QLMP8hODUHhge0D4vx+9UiAwIGiT0sTy/B2XpdX1U5rJt6JSISgr6ikRT7vxV9EVAFeYZqUnl1gQ==", + "dev": true }, "node_modules/@types/wait-on": { "version": "5.3.3", @@ -38390,7 +39238,8 @@ }, "node_modules/@types/webidl-conversions": { "version": "7.0.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" }, "node_modules/@types/webpack": { "version": "5.28.1", @@ -38408,7 +39257,8 @@ }, "node_modules/@types/whatwg-url": { "version": "11.0.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.4.tgz", + "integrity": "sha512-lXCmTWSHJvf0TRSO58nm978b8HJ/EdsSsEKLd3ODHFjo+3VGAyyTp4v50nWvwtzBxSMQrVOK7tcuN0zGPLICMw==", "dependencies": { "@types/webidl-conversions": "*" } @@ -38441,7 +39291,8 @@ }, "node_modules/@types/zen-observable": { "version": "0.8.7", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.7.tgz", + "integrity": "sha512-LKzNTjj+2j09wAo/vvVjzgw5qckJJzhdGgWHW7j69QIGdq/KnZrMAMIHQiWGl3Ccflh5/CudBAntTPYdprPltA==" }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "6.16.0", @@ -39152,7 +40003,8 @@ }, "node_modules/@ungap/global-this": { "version": "0.4.4", - "license": "ISC" + "resolved": "https://registry.npmjs.org/@ungap/global-this/-/global-this-0.4.4.tgz", + "integrity": "sha512-mHkm6FvepJECMNthFuIgpAEFmPOk71UyXuIxYfjytvFTnSDBIz7jmViO+LfHI/AjrazWije0PnSP3+/NlwzqtA==" }, "node_modules/@ungap/promise-all-settled": { "version": "1.1.2", @@ -39353,16 +40205,18 @@ }, "node_modules/@wallet-standard/base": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@wallet-standard/base/-/base-1.0.1.tgz", + "integrity": "sha512-1To3ekMfzhYxe0Yhkpri+Fedq0SYcfrOfJi3vbLjMwF2qiKPjTGLwZkf2C9ftdQmxES+hmxhBzTwF4KgcOwf8w==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=16" } }, "node_modules/@wallet-standard/features": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@wallet-standard/features/-/features-1.0.3.tgz", + "integrity": "sha512-m8475I6W5LTatTZuUz5JJNK42wFRgkJTB0I9tkruMwfqBF2UN2eomkYNVf9RbrsROelCRzSFmugqjKZBFaubsA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@wallet-standard/base": "^1.0.1" }, @@ -40010,7 +40864,8 @@ }, "node_modules/@wry/context": { "version": "0.5.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@wry/context/-/context-0.5.4.tgz", + "integrity": "sha512-/pktJKHUXDr4D6TJqWgudOPJW2Z+Nb+bqk40jufA3uTkLbnCRKdJPiYDIa/c7mfcPH8Hr6O8zjCERpg5Sq04Zg==", "dependencies": { "tslib": "^1.14.1" }, @@ -40020,7 +40875,8 @@ }, "node_modules/@wry/equality": { "version": "0.3.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@wry/equality/-/equality-0.3.4.tgz", + "integrity": "sha512-1gQQhCPenzxw/1HzLlvSIs/59eBHJf9ZDIussjjZhqNSqQuPKQIzN6SWt4kemvlBPDi7RqMuUa03pId7MAE93g==", "dependencies": { "tslib": "^1.14.1" }, @@ -40030,7 +40886,8 @@ }, "node_modules/@wry/trie": { "version": "0.2.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@wry/trie/-/trie-0.2.2.tgz", + "integrity": "sha512-OxqBB39x6MfHaa2HpMiRMfhuUnQTddD32Ko020eBeJXq87ivX6xnSSnzKHVbA21p7iqBASz8n/07b6W5wW1BVQ==", "dependencies": { "tslib": "^1.14.1" }, @@ -40106,14 +40963,16 @@ }, "node_modules/@yornaath/batshit": { "version": "0.9.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@yornaath/batshit/-/batshit-0.9.0.tgz", + "integrity": "sha512-QdI1hQUPlpFT+o1iKLi9fQEKCli8c3UG7q4Ih8MP4jn+pyAjbfC4xaK5PwqSsSZgT0YeAZ0GWbbO9+1xAtWXlQ==", "dependencies": { "@yornaath/batshit-devtools": "^1.6.0" } }, "node_modules/@yornaath/batshit-devtools": { "version": "1.6.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@yornaath/batshit-devtools/-/batshit-devtools-1.6.0.tgz", + "integrity": "sha512-ckKxrdfuFSRFz54tYU+VkD1eZOOaxa92U4eKOPtlxc1itB12Cqb1Dmk8Rqv6mARxp8YvocVGKbccrXoCwH2Lew==" }, "node_modules/@zeit/schemas": { "version": "2.6.0", @@ -40259,7 +41118,8 @@ }, "node_modules/add-px-to-style": { "version": "1.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/add-px-to-style/-/add-px-to-style-1.0.0.tgz", + "integrity": "sha512-YMyxSlXpPjD8uWekCQGuN40lV4bnZagUwqa2m/uFv1z/tNImSk9fnXVMUI5qwME/zzI3MMQRvjZ+69zyfSSyew==" }, "node_modules/address": { "version": "1.0.3", @@ -41073,721 +41933,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/armada-cli": { - "version": "0.4.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@ethersproject/constants": "^5.7.0", - "@ledgerhq/hw-app-eth": "^6.29.10", - "@ledgerhq/hw-transport-node-hid": "^6.27.6", - "@oclif/core": "^1.20.2", - "@oclif/plugin-help": "^5.1.17", - "ethers": "^5.7.1", - "inquirer": "^7.1.4", - "keytar": "^7.9.0", - "tar": "^6.1.11", - "yargs": "^17.6.0" - }, - "bin": { - "armada": "bin/run" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/abi": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/abstract-provider": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/abstract-signer": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/address": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/rlp": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/base64": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/basex": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/properties": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/contracts": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/abi": "^5.7.0", - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/transactions": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/hash": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/hdnode": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/basex": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/pbkdf2": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/wordlists": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/json-wallets": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hdnode": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/pbkdf2": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "aes-js": "3.0.0", - "scrypt-js": "3.0.1" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/networks": { - "version": "5.7.1", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/pbkdf2": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/sha2": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/properties": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/providers": { - "version": "5.7.2", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/base64": "^5.7.0", - "@ethersproject/basex": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/networks": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/strings": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/web": "^5.7.0", - "bech32": "1.1.4", - "ws": "7.4.6" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/random": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/rlp": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/signing-key": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "bn.js": "^5.2.1", - "elliptic": "6.5.4", - "hash.js": "1.1.7" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/solidity": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/sha2": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/transactions": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/rlp": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/units": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/constants": "^5.7.0", - "@ethersproject/logger": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/wallet": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/abstract-provider": "^5.7.0", - "@ethersproject/abstract-signer": "^5.7.0", - "@ethersproject/address": "^5.7.0", - "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/hdnode": "^5.7.0", - "@ethersproject/json-wallets": "^5.7.0", - "@ethersproject/keccak256": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/random": "^5.7.0", - "@ethersproject/signing-key": "^5.7.0", - "@ethersproject/transactions": "^5.7.0", - "@ethersproject/wordlists": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/web": { - "version": "5.7.1", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/base64": "^5.7.0", - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/@ethersproject/wordlists": { - "version": "5.7.0", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/bytes": "^5.7.0", - "@ethersproject/hash": "^5.7.0", - "@ethersproject/logger": "^5.7.0", - "@ethersproject/properties": "^5.7.0", - "@ethersproject/strings": "^5.7.0" - } - }, - "node_modules/armada-cli/node_modules/aes-js": { - "version": "3.0.0", - "dev": true, - "license": "MIT" - }, - "node_modules/armada-cli/node_modules/ansi-styles": { - "version": "4.3.0", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/armada-cli/node_modules/bech32": { - "version": "1.1.4", - "dev": true, - "license": "MIT" - }, - "node_modules/armada-cli/node_modules/chalk": { - "version": "4.1.2", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/armada-cli/node_modules/ethers": { - "version": "5.7.2", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" - }, - { - "type": "individual", - "url": "https://www.buymeacoffee.com/ricmoo" - } - ], - "license": "MIT", - "dependencies": { - "@ethersproject/abi": "5.7.0", - "@ethersproject/abstract-provider": "5.7.0", - "@ethersproject/abstract-signer": "5.7.0", - "@ethersproject/address": "5.7.0", - "@ethersproject/base64": "5.7.0", - "@ethersproject/basex": "5.7.0", - "@ethersproject/bignumber": "5.7.0", - "@ethersproject/bytes": "5.7.0", - "@ethersproject/constants": "5.7.0", - "@ethersproject/contracts": "5.7.0", - "@ethersproject/hash": "5.7.0", - "@ethersproject/hdnode": "5.7.0", - "@ethersproject/json-wallets": "5.7.0", - "@ethersproject/keccak256": "5.7.0", - "@ethersproject/logger": "5.7.0", - "@ethersproject/networks": "5.7.1", - "@ethersproject/pbkdf2": "5.7.0", - "@ethersproject/properties": "5.7.0", - "@ethersproject/providers": "5.7.2", - "@ethersproject/random": "5.7.0", - "@ethersproject/rlp": "5.7.0", - "@ethersproject/sha2": "5.7.0", - "@ethersproject/signing-key": "5.7.0", - "@ethersproject/solidity": "5.7.0", - "@ethersproject/strings": "5.7.0", - "@ethersproject/transactions": "5.7.0", - "@ethersproject/units": "5.7.0", - "@ethersproject/wallet": "5.7.0", - "@ethersproject/web": "5.7.1", - "@ethersproject/wordlists": "5.7.0" - } - }, - "node_modules/armada-cli/node_modules/inquirer": { - "version": "7.3.3", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.19", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.6.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/armada-cli/node_modules/rxjs": { - "version": "6.6.7", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/armada-cli/node_modules/supports-color": { - "version": "7.2.0", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/armada-cli/node_modules/ws": { - "version": "7.4.6", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/arr-diff": { "version": "4.0.0", "dev": true, @@ -43071,7 +43216,8 @@ }, "node_modules/babel-plugin-emotion": { "version": "10.2.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz", + "integrity": "sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA==", "dependencies": { "@babel/helper-module-imports": "^7.0.0", "@emotion/hash": "0.8.0", @@ -43087,15 +43233,18 @@ }, "node_modules/babel-plugin-emotion/node_modules/@emotion/hash": { "version": "0.8.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", + "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" }, "node_modules/babel-plugin-emotion/node_modules/@emotion/memoize": { "version": "0.7.4", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", + "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==" }, "node_modules/babel-plugin-emotion/node_modules/@emotion/serialize": { "version": "0.11.16", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz", + "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==", "dependencies": { "@emotion/hash": "0.8.0", "@emotion/memoize": "0.7.4", @@ -43106,15 +43255,18 @@ }, "node_modules/babel-plugin-emotion/node_modules/@emotion/unitless": { "version": "0.7.5", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", + "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" }, "node_modules/babel-plugin-emotion/node_modules/@emotion/utils": { "version": "0.11.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz", + "integrity": "sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==" }, "node_modules/babel-plugin-emotion/node_modules/babel-plugin-macros": { "version": "2.8.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz", + "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==", "dependencies": { "@babel/runtime": "^7.7.2", "cosmiconfig": "^6.0.0", @@ -43123,7 +43275,8 @@ }, "node_modules/babel-plugin-emotion/node_modules/cosmiconfig": { "version": "6.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", + "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.1.0", @@ -43137,11 +43290,13 @@ }, "node_modules/babel-plugin-emotion/node_modules/csstype": { "version": "2.6.21", - "license": "MIT" + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" }, "node_modules/babel-plugin-emotion/node_modules/escape-string-regexp": { "version": "1.0.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "engines": { "node": ">=0.8.0" } @@ -43187,150 +43342,6 @@ "npm": ">=6" } }, - "node_modules/babel-plugin-module-resolver": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz", - "integrity": "sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q==", - "dev": true, - "dependencies": { - "find-babel-config": "^2.0.0", - "glob": "^8.0.3", - "pkg-up": "^3.1.0", - "reselect": "^4.1.7", - "resolve": "^1.22.1" - }, - "engines": { - "node": ">= 16" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/pkg-up": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", - "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", - "dev": true, - "dependencies": { - "find-up": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/babel-plugin-module-resolver/node_modules/reselect": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", - "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==", - "dev": true - }, "node_modules/babel-plugin-named-asset-import": { "version": "0.2.3", "dev": true, @@ -44642,7 +44653,8 @@ }, "node_modules/bigint-mod-arith": { "version": "3.3.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bigint-mod-arith/-/bigint-mod-arith-3.3.1.tgz", + "integrity": "sha512-pX/cYW3dCa87Jrzv6DAr8ivbbJRzEX5yGhdt8IutnX/PCIXfpx+mabWNK/M8qqh+zQ0J3thftUBHW0ByuUlG0w==", "engines": { "node": ">=10.4.0" } @@ -45248,7 +45260,8 @@ }, "node_modules/bson": { "version": "6.2.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.2.0.tgz", + "integrity": "sha512-ID1cI+7bazPDyL9wYy9GaQ8gEEohWvcUl/Yf0dIdutJxnmInEEyCsb4awy/OiBfall7zBA179Pahi3vCdFze3Q==", "engines": { "node": ">=16.20.1" } @@ -45657,7 +45670,8 @@ }, "node_modules/c32check": { "version": "2.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/c32check/-/c32check-2.0.0.tgz", + "integrity": "sha512-rpwfAcS/CMqo0oCqDf3r9eeLgScRE3l/xHDCXhM3UyrfvIn7PrLq63uHh7yYbv8NzaZn5MVsVhIRpQ+5GZ5HyA==", "dependencies": { "@noble/hashes": "^1.1.2", "base-x": "^4.0.0" @@ -45668,7 +45682,8 @@ }, "node_modules/c32check/node_modules/base-x": { "version": "4.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", + "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" }, "node_modules/c8": { "version": "7.14.0", @@ -46088,7 +46103,8 @@ }, "node_modules/caip": { "version": "1.1.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/caip/-/caip-1.1.0.tgz", + "integrity": "sha512-yOO3Fu4ygyKYAdznuoaqschMKIZzcdgyMpBNtrIfrUhnOeaOWG+dh0c13wcOS6B/46IGGbncoyzJlio79jU7rw==" }, "node_modules/call-bind": { "version": "1.0.5", @@ -46247,7 +46263,8 @@ }, "node_modules/canonicalize": { "version": "2.0.0", - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/canonicalize/-/canonicalize-2.0.0.tgz", + "integrity": "sha512-ulDEYPv7asdKvqahuAY35c1selLdzDwHqugK92hfkzvlDCwXRRelDkR+Er33md/PtnpqHemgkuDPanZ4fiYZ8w==" }, "node_modules/canvas-fit": { "version": "1.5.0", @@ -46303,8 +46320,9 @@ }, "node_modules/cardinal": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz", + "integrity": "sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==", "dev": true, - "license": "MIT", "dependencies": { "ansicolors": "~0.3.2", "redeyed": "~2.1.0" @@ -46315,7 +46333,8 @@ }, "node_modules/cartonne": { "version": "2.2.0", - "license": "(Apache-2.0 AND MIT)", + "resolved": "https://registry.npmjs.org/cartonne/-/cartonne-2.2.0.tgz", + "integrity": "sha512-O1rA2AQKnposZJ7oT+GtCQpcv4kfs+gqkCs5rFLBfegP3K0nWNmHj5q4d8NlUxqe3EHvAddCci6WO+ogupl3MA==", "dependencies": { "@ipld/dag-cbor": "^9.0.0", "multiformats": "^11.0.2", @@ -46325,7 +46344,8 @@ }, "node_modules/cartonne/node_modules/@ipld/dag-cbor": { "version": "9.0.8", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.0.8.tgz", + "integrity": "sha512-ETWJ7p7lmGw5X+BuI/7rf4/k56xyOvAOVNUVuQmnGYBdJjObLPgS+vyFxRk4odATlkyZqCq2MLNY52bhE6SlRA==", "dependencies": { "cborg": "^4.0.0", "multiformats": "^13.0.0" @@ -46337,18 +46357,21 @@ }, "node_modules/cartonne/node_modules/@ipld/dag-cbor/node_modules/multiformats": { "version": "13.0.1", - "license": "Apache-2.0 OR MIT" + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.1.tgz", + "integrity": "sha512-bt3R5iXe2O8xpp3wkmQhC73b/lC4S2ihU8Dndwcsysqbydqb8N+bpP116qMcClZ17g58iSIwtXUTcg2zT4sniA==" }, "node_modules/cartonne/node_modules/cborg": { "version": "4.0.8", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/cborg/-/cborg-4.0.8.tgz", + "integrity": "sha512-/6QDK0Hw//cV4YNWZZjdIUMFNw0DZmb56jdVGJPwXP7874gSN0AMYqM07mVKpAm+6Nn7U8lvYFzPgBGatC+5xw==", "bin": { "cborg": "lib/bin.js" } }, "node_modules/cartonne/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -46368,7 +46391,8 @@ }, "node_modules/cborg": { "version": "1.10.2", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/cborg/-/cborg-1.10.2.tgz", + "integrity": "sha512-b3tFPA9pUr2zCUiCfRd2+wok2/LBSNUMKOuRRok+WlvvAgEt/PlbgPTsZUcwCOs53IJvLgTp0eotwtosE6njug==", "bin": { "cborg": "cli.js" } @@ -46444,7 +46468,8 @@ }, "node_modules/change-emitter": { "version": "0.1.6", - "license": "MIT" + "resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz", + "integrity": "sha512-YXzt1cQ4a2jqazhcuSWEOc1K2q8g9H6eWNsyZgi640LDzRWVQ2eDe+Y/kVdftH+vYdPF2rgDb3dLdpxE1jvAxw==" }, "node_modules/char-regex": { "version": "1.0.2", @@ -46865,8 +46890,9 @@ }, "node_modules/cli-progress": { "version": "3.12.0", + "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz", + "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==", "dev": true, - "license": "MIT", "dependencies": { "string-width": "^4.2.3" }, @@ -47328,7 +47354,8 @@ }, "node_modules/codeco": { "version": "1.2.0", - "license": "(MIT OR Apache-2.0)" + "resolved": "https://registry.npmjs.org/codeco/-/codeco-1.2.0.tgz", + "integrity": "sha512-SHTBW7QsiDtHGqEyhX10gZesmWlWV00gXteFyU2xLqyZmy658/+HlPyXG5EvY05+csQNWjBIfGg2mZrklR1RtQ==" }, "node_modules/collect-v8-coverage": { "version": "1.0.2", @@ -47669,8 +47696,9 @@ }, "node_modules/config-file-ts": { "version": "0.2.6", + "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.6.tgz", + "integrity": "sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==", "dev": true, - "license": "MIT", "dependencies": { "glob": "^10.3.10", "typescript": "^5.3.3" @@ -47678,16 +47706,18 @@ }, "node_modules/config-file-ts/node_modules/brace-expansion": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, "node_modules/config-file-ts/node_modules/cross-spawn": { "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -47699,8 +47729,9 @@ }, "node_modules/config-file-ts/node_modules/foreground-child": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", "dev": true, - "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -47714,8 +47745,9 @@ }, "node_modules/config-file-ts/node_modules/glob": { "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, - "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.3.5", @@ -47735,8 +47767,9 @@ }, "node_modules/config-file-ts/node_modules/minimatch": { "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -47749,24 +47782,27 @@ }, "node_modules/config-file-ts/node_modules/minipass": { "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, - "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, "node_modules/config-file-ts/node_modules/path-key": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/config-file-ts/node_modules/shebang-command": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, - "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -47776,16 +47812,18 @@ }, "node_modules/config-file-ts/node_modules/shebang-regex": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/config-file-ts/node_modules/signal-exit": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "license": "ISC", "engines": { "node": ">=14" }, @@ -47795,8 +47833,9 @@ }, "node_modules/config-file-ts/node_modules/typescript": { "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -48599,8 +48638,9 @@ }, "node_modules/crypto-js": { "version": "4.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==", + "dev": true }, "node_modules/crypto-random-string": { "version": "2.0.0", @@ -49561,7 +49601,8 @@ }, "node_modules/dag-jose": { "version": "4.0.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/dag-jose/-/dag-jose-4.0.0.tgz", + "integrity": "sha512-tw595L3UYoOUT9dSJPbBEG/qpRpw24kRZxa5SLRnlnr+g5L7O8oEs1d3W5TiVA1oJZbthVsf0Vi3zFN66qcEBA==", "dependencies": { "@ipld/dag-cbor": "^9.0.0", "multiformats": "^11.0.0" @@ -49569,7 +49610,8 @@ }, "node_modules/dag-jose-utils": { "version": "3.0.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/dag-jose-utils/-/dag-jose-utils-3.0.0.tgz", + "integrity": "sha512-gu+XutOTy3kD8fDcA1SMjZ2U0mUOb/hxoRVZaMCizXN7Ssbc5dKOzeXQ4GquV4BdQzs3w5Y7irOpn2plFPIJfg==", "dependencies": { "@ipld/dag-cbor": "^7.0.1", "multiformats": "^11.0.1" @@ -49577,7 +49619,8 @@ }, "node_modules/dag-jose-utils/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -49585,7 +49628,8 @@ }, "node_modules/dag-jose/node_modules/@ipld/dag-cbor": { "version": "9.0.8", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.0.8.tgz", + "integrity": "sha512-ETWJ7p7lmGw5X+BuI/7rf4/k56xyOvAOVNUVuQmnGYBdJjObLPgS+vyFxRk4odATlkyZqCq2MLNY52bhE6SlRA==", "dependencies": { "cborg": "^4.0.0", "multiformats": "^13.0.0" @@ -49597,18 +49641,21 @@ }, "node_modules/dag-jose/node_modules/@ipld/dag-cbor/node_modules/multiformats": { "version": "13.0.1", - "license": "Apache-2.0 OR MIT" + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.1.tgz", + "integrity": "sha512-bt3R5iXe2O8xpp3wkmQhC73b/lC4S2ihU8Dndwcsysqbydqb8N+bpP116qMcClZ17g58iSIwtXUTcg2zT4sniA==" }, "node_modules/dag-jose/node_modules/cborg": { "version": "4.0.8", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/cborg/-/cborg-4.0.8.tgz", + "integrity": "sha512-/6QDK0Hw//cV4YNWZZjdIUMFNw0DZmb56jdVGJPwXP7874gSN0AMYqM07mVKpAm+6Nn7U8lvYFzPgBGatC+5xw==", "bin": { "cborg": "lib/bin.js" } }, "node_modules/dag-jose/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -49816,7 +49863,8 @@ }, "node_modules/decompress": { "version": "4.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz", + "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==", "dependencies": { "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", @@ -51090,7 +51138,8 @@ }, "node_modules/did-jwt": { "version": "7.4.7", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/did-jwt/-/did-jwt-7.4.7.tgz", + "integrity": "sha512-Apz7nIfIHSKWIMaEP5L/K8xkwByvjezjTG0xiqwKdnNj1x8M0+Yasury5Dm/KPltxi2PlGfRPf3IejRKZrT8mQ==", "dependencies": { "@noble/ciphers": "^0.4.0", "@noble/curves": "^1.0.0", @@ -51105,18 +51154,22 @@ }, "node_modules/did-jwt/node_modules/@scure/base": { "version": "1.1.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", + "integrity": "sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ==", "funding": { "url": "https://paulmillr.com/funding/" } }, "node_modules/did-jwt/node_modules/did-resolver": { "version": "4.1.0", - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-4.1.0.tgz", + "integrity": "sha512-S6fWHvCXkZg2IhS4RcVHxwuyVejPR7c+a4Go0xbQ9ps5kILa8viiYQgrM4gfTyeTjJ0ekgJH9gk/BawTpmkbZA==" }, "node_modules/did-jwt/node_modules/multibase": { "version": "4.0.6", - "license": "MIT", + "resolved": "https://registry.npmjs.org/multibase/-/multibase-4.0.6.tgz", + "integrity": "sha512-x23pDe5+svdLz/k5JPGCVdfn7Q5mZVMBETiC+ORfO+sor9Sgs0smJzAjfTbM5tckeCqnaUuMYoz+k3RXMmJClQ==", + "deprecated": "This module has been superseded by the multiformats module", "dependencies": { "@multiformats/base-x": "^4.0.1" }, @@ -51127,11 +51180,13 @@ }, "node_modules/did-resolver": { "version": "3.2.2", - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-3.2.2.tgz", + "integrity": "sha512-Eeo2F524VM5N3W4GwglZrnul2y6TLTwMQP3In62JdG34NZoqihYyOZLk+5wUW8sSgvIYIcJM8Dlt3xsdKZZ3tg==" }, "node_modules/dids": { "version": "4.0.4", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/dids/-/dids-4.0.4.tgz", + "integrity": "sha512-PKxQP0QFqgeMe0dbL7LCRdPJVhZU2ejj8RWCfJ6vro3a+o5o32cWNM1X6YXpdIWq6G5fTJw9KO2dHj2ZzYDc7w==", "dependencies": { "@didtools/cacao": "^2.1.0", "@didtools/codecs": "^1.0.1", @@ -51151,7 +51206,8 @@ }, "node_modules/dids/node_modules/@didtools/pkh-ethereum": { "version": "0.4.1", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/@didtools/pkh-ethereum/-/pkh-ethereum-0.4.1.tgz", + "integrity": "sha512-oE5bbyTauJ/WddaWnDK7bWns2E2LG4Ut33ICEcEQdlMoXM0902/vnGm8+6QE/yuLOyAllgf7DnDKvERF5IY6uQ==", "dependencies": { "@didtools/cacao": "^2.1.0", "@noble/curves": "^1.1.0", @@ -51165,11 +51221,13 @@ }, "node_modules/dids/node_modules/did-resolver": { "version": "4.1.0", - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-4.1.0.tgz", + "integrity": "sha512-S6fWHvCXkZg2IhS4RcVHxwuyVejPR7c+a4Go0xbQ9ps5kILa8viiYQgrM4gfTyeTjJ0ekgJH9gk/BawTpmkbZA==" }, "node_modules/dids/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -51177,14 +51235,16 @@ }, "node_modules/dids/node_modules/uint8arrays": { "version": "4.0.10", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-4.0.10.tgz", + "integrity": "sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==", "dependencies": { "multiformats": "^12.0.1" } }, "node_modules/dids/node_modules/uint8arrays/node_modules/multiformats": { "version": "12.1.3", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-12.1.3.tgz", + "integrity": "sha512-eajQ/ZH7qXZQR2AgtfpmSMizQzmyYVmCql7pdhldPuYQi4atACekbJaQplk6dWyIi10jCaFnd6pqvcEFXjbaJw==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -51334,7 +51394,8 @@ }, "node_modules/dom-css": { "version": "2.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/dom-css/-/dom-css-2.1.0.tgz", + "integrity": "sha512-w9kU7FAbaSh3QKijL6n59ofAhkkmMJ31GclJIz/vyQdjogfyxcB6Zf8CZyibOERI5o0Hxz30VmJS7+7r5fEj2Q==", "dependencies": { "add-px-to-style": "1.0.0", "prefix-style": "2.0.1", @@ -51719,8 +51780,9 @@ }, "node_modules/eip55": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/eip55/-/eip55-2.1.1.tgz", + "integrity": "sha512-WcagVAmNu2Ww2cDUfzuWVntYwFxbvZ5MvIyLZpMjTTkjD6sCvkGOiS86jTppzu9/gWsc8isLHAeMBWK02OnZmA==", "dev": true, - "license": "MIT", "dependencies": { "keccak": "^3.0.3" } @@ -51850,7 +51912,8 @@ }, "node_modules/engine.io-client": { "version": "6.5.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz", + "integrity": "sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==", "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1", @@ -51861,7 +51924,8 @@ }, "node_modules/engine.io-client/node_modules/ws": { "version": "8.11.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", + "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", "engines": { "node": ">=10.0.0" }, @@ -51880,7 +51944,8 @@ }, "node_modules/engine.io-parser": { "version": "5.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz", + "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==", "engines": { "node": ">=10.0.0" } @@ -52370,8 +52435,9 @@ }, "node_modules/esbuild": { "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "hasInstallScript": true, - "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -52403,6 +52469,54 @@ "@esbuild/win32-x64": "0.18.20" } }, + "node_modules/esbuild-android-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz", + "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-android-arm64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz", + "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz", + "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/esbuild-darwin-arm64": { "version": "0.14.54", "cpu": [ @@ -52418,6 +52532,198 @@ "node": ">=12" } }, + "node_modules/esbuild-freebsd-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz", + "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-arm64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz", + "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-32": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz", + "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz", + "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz", + "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz", + "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-mips64le": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz", + "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-ppc64le": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz", + "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-riscv64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz", + "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-s390x": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz", + "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-netbsd-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz", + "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-openbsd-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz", + "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/esbuild-plugin-alias": { "version": "0.2.1", "dev": true, @@ -52434,6 +52740,70 @@ "esbuild": ">=0.12 <1" } }, + "node_modules/esbuild-sunos-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz", + "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-32": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz", + "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz", + "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-arm64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz", + "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/escalade": { "version": "3.1.1", "license": "MIT", @@ -53555,8 +53925,9 @@ }, "node_modules/eslint-plugin-react-refresh": { "version": "0.4.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.5.tgz", + "integrity": "sha512-D53FYKJa+fDmZMtriODxvhwrO+IOqrxoEo21gMA0sjHdU6dPVH4OhyFip9ypl8HOF5RV5KdTo+rBQLvnY2cO8w==", "dev": true, - "license": "MIT", "peerDependencies": { "eslint": ">=7" } @@ -56094,6 +56465,8 @@ }, "node_modules/fast-xml-parser": { "version": "4.3.2", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz", + "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==", "funding": [ { "type": "github", @@ -56104,7 +56477,6 @@ "url": "https://paypal.me/naturalintelligence" } ], - "license": "MIT", "dependencies": { "strnum": "^1.0.5" }, @@ -56168,7 +56540,8 @@ }, "node_modules/fbjs": { "version": "0.8.18", - "license": "MIT", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.18.tgz", + "integrity": "sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==", "dependencies": { "core-js": "^1.0.0", "isomorphic-fetch": "^2.1.1", @@ -56181,11 +56554,14 @@ }, "node_modules/fbjs/node_modules/core-js": { "version": "1.2.7", - "license": "MIT" + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==", + "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js." }, "node_modules/fbjs/node_modules/promise": { "version": "7.3.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "dependencies": { "asap": "~2.0.3" } @@ -56521,19 +56897,6 @@ "version": "2.0.0", "license": "MIT" }, - "node_modules/find-babel-config": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-2.0.0.tgz", - "integrity": "sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw==", - "dev": true, - "dependencies": { - "json5": "^2.1.1", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, "node_modules/find-cache-dir": { "version": "2.1.0", "license": "MIT", @@ -58644,7 +59007,8 @@ }, "node_modules/graphql-tag": { "version": "2.12.6", - "license": "MIT", + "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz", + "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==", "dependencies": { "tslib": "^2.1.0" }, @@ -58657,7 +59021,8 @@ }, "node_modules/graphql-tag/node_modules/tslib": { "version": "2.6.2", - "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/growl": { "version": "1.10.5", @@ -59559,7 +59924,8 @@ }, "node_modules/html-to-react": { "version": "1.7.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/html-to-react/-/html-to-react-1.7.0.tgz", + "integrity": "sha512-b5HTNaTGyOj5GGIMiWVr1k57egAZ/vGy0GGefnCQ1VW5hu9+eku8AXHtf2/DeD95cj/FKBKYa1J7SWBOX41yUQ==", "dependencies": { "domhandler": "^5.0", "htmlparser2": "^9.0", @@ -59571,7 +59937,8 @@ }, "node_modules/html-to-react/node_modules/dom-serializer": { "version": "2.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -59583,17 +59950,19 @@ }, "node_modules/html-to-react/node_modules/domelementtype": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/fb55" } - ], - "license": "BSD-2-Clause" + ] }, "node_modules/html-to-react/node_modules/domhandler": { "version": "5.0.3", - "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dependencies": { "domelementtype": "^2.3.0" }, @@ -59606,7 +59975,8 @@ }, "node_modules/html-to-react/node_modules/domutils": { "version": "3.1.0", - "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", @@ -59618,7 +59988,8 @@ }, "node_modules/html-to-react/node_modules/entities": { "version": "4.5.0", - "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "engines": { "node": ">=0.12" }, @@ -59628,6 +59999,8 @@ }, "node_modules/html-to-react/node_modules/htmlparser2": { "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -59635,7 +60008,6 @@ "url": "https://github.com/sponsors/fb55" } ], - "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", @@ -59894,8 +60266,9 @@ }, "node_modules/hyperlinker": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz", + "integrity": "sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } @@ -59952,7 +60325,8 @@ }, "node_modules/identicon.js": { "version": "2.3.3", - "license": "BSD" + "resolved": "https://registry.npmjs.org/identicon.js/-/identicon.js-2.3.3.tgz", + "integrity": "sha512-/qgOkXKZ7YbeCYbawJ9uQQ3XJ3uBg9VDpvHjabCAPp6aRMhjLaFAxG90+1TxzrhKaj6AYpVGrx6UXQfQA41UEA==" }, "node_modules/identity-obj-proxy": { "version": "3.0.0", @@ -61333,7 +61707,8 @@ }, "node_modules/isbot-fast": { "version": "1.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/isbot-fast/-/isbot-fast-1.2.0.tgz", + "integrity": "sha512-twjuQzy2gKMDVfKGQyQqrx6Uy4opu/fiVUTTpdqtFsd7OQijIp5oXvb27n5EemYXaijh5fomndJt/SPRLsEdSg==", "engines": { "node": ">=6.0.0" } @@ -61366,7 +61741,8 @@ }, "node_modules/isomorphic-fetch": { "version": "2.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==", "dependencies": { "node-fetch": "^1.0.1", "whatwg-fetch": ">=0.10.0" @@ -61374,14 +61750,16 @@ }, "node_modules/isomorphic-fetch/node_modules/is-stream": { "version": "1.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", "engines": { "node": ">=0.10.0" } }, "node_modules/isomorphic-fetch/node_modules/node-fetch": { "version": "1.7.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", "dependencies": { "encoding": "^0.1.11", "is-stream": "^1.0.1" @@ -66993,14 +67371,16 @@ }, "node_modules/jet-logger": { "version": "1.2.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/jet-logger/-/jet-logger-1.2.2.tgz", + "integrity": "sha512-Kbw4G3BC45+Umz5XBnsE50pHplruJTVKGRy5X1YfCu3Te7f8ggTL8Tm10YegAD2QP41MVQ3o/Y9MFAZzfythqw==", "dependencies": { "colors": "1.3.0" } }, "node_modules/jet-logger/node_modules/colors": { "version": "1.3.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz", + "integrity": "sha512-EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==", "engines": { "node": ">=0.1.90" } @@ -67619,7 +67999,8 @@ }, "node_modules/json-schema-typed": { "version": "8.0.1", - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.1.tgz", + "integrity": "sha512-XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg==" }, "node_modules/json-stable-stringify": { "version": "1.0.2", @@ -67716,7 +68097,8 @@ }, "node_modules/jsontokens": { "version": "4.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/jsontokens/-/jsontokens-4.0.1.tgz", + "integrity": "sha512-+MO415LEN6M+3FGsRz4wU20g7N2JA+2j9d9+pGaNJHviG4L8N0qzavGyENw6fJqsq9CcrHOIL6iWX5yeTZ86+Q==", "dependencies": { "@noble/hashes": "^1.1.2", "@noble/secp256k1": "^1.6.3", @@ -67888,7 +68270,8 @@ }, "node_modules/kareem": { "version": "2.5.1", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz", + "integrity": "sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==", "engines": { "node": ">=12.0.0" } @@ -67920,7 +68303,8 @@ }, "node_modules/key-did-resolver": { "version": "2.3.0", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/key-did-resolver/-/key-did-resolver-2.3.0.tgz", + "integrity": "sha512-q3ChQILPe+u8qkpWP196fEoxsygEyjM3K25qrGaMSolVaUdfgj7qwMz2DE/GRIlfNK2HgKW6KXA8RZMy8aL4MA==", "dependencies": { "@stablelib/ed25519": "^1.0.2", "bigint-mod-arith": "^3.1.0", @@ -67932,16 +68316,18 @@ }, "node_modules/key-did-resolver/node_modules/varint": { "version": "6.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", + "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==" }, "node_modules/keymirror": { "version": "0.1.1" }, "node_modules/keytar": { "version": "7.9.0", + "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz", + "integrity": "sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==", "dev": true, "hasInstallScript": true, - "license": "MIT", "dependencies": { "node-addon-api": "^4.3.0", "prebuild-install": "^7.0.1" @@ -67949,8 +68335,9 @@ }, "node_modules/keytar/node_modules/node-addon-api": { "version": "4.3.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", + "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==", + "dev": true }, "node_modules/keyv": { "version": "4.5.4", @@ -68166,7 +68553,8 @@ }, "node_modules/least-recent": { "version": "1.0.3", - "license": "(MIT OR Apache-2.0)", + "resolved": "https://registry.npmjs.org/least-recent/-/least-recent-1.0.3.tgz", + "integrity": "sha512-PH9ZuFAKFf5fY7j0wizus6f/Ni2wSaby4eQYEUmR+sK6lY7OEbVz/iEh/tTgEmgOivWJhay89wVyUe5VnXoUSQ==", "dependencies": { "nanoevents": "^8.0.0" } @@ -68472,7 +68860,8 @@ }, "node_modules/lit": { "version": "2.8.0", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/lit/-/lit-2.8.0.tgz", + "integrity": "sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA==", "dependencies": { "@lit/reactive-element": "^1.6.0", "lit-element": "^3.3.0", @@ -68481,7 +68870,8 @@ }, "node_modules/lit-element": { "version": "3.3.3", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.3.3.tgz", + "integrity": "sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA==", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.1.0", "@lit/reactive-element": "^1.3.0", @@ -68490,7 +68880,8 @@ }, "node_modules/lit-html": { "version": "2.8.0", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.8.0.tgz", + "integrity": "sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==", "dependencies": { "@types/trusted-types": "^2.0.2" } @@ -68704,7 +69095,8 @@ }, "node_modules/lodash": { "version": "4.17.21", - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash-es": { "version": "4.17.21", @@ -68738,7 +69130,8 @@ }, "node_modules/lodash.escaperegexp": { "version": "4.1.2", - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", + "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==" }, "node_modules/lodash.flatmap": { "version": "4.5.0", @@ -68975,7 +69368,8 @@ }, "node_modules/logfmt": { "version": "1.4.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/logfmt/-/logfmt-1.4.0.tgz", + "integrity": "sha512-p1Ow0C2dDJYaQBhRHt+HVMP6ELuBm4jYSYNHPMfz0J5wJ9qA6/7oBOlBZBfT1InqguTYcvJzNea5FItDxTcbyw==", "dependencies": { "split": "0.2.x", "through": "2.3.x" @@ -69503,7 +69897,8 @@ }, "node_modules/mapmoize": { "version": "1.2.1", - "license": "(MIT OR Apache-2.0)", + "resolved": "https://registry.npmjs.org/mapmoize/-/mapmoize-1.2.1.tgz", + "integrity": "sha512-LK8ArSM1wbfRPTnl+LpdxW1pwkfY6GxtM9p+STr6aDtM7ImR8jLuf4ekei43/AN0f7XDSrohzwwK57eGHSDAuA==", "engines": { "node": "^14.0.0 || ^16.0.0 || >=18.0.0" } @@ -69599,14 +69994,16 @@ }, "node_modules/mdast-add-list-metadata": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mdast-add-list-metadata/-/mdast-add-list-metadata-1.0.1.tgz", + "integrity": "sha512-fB/VP4MJ0LaRsog7hGPxgOrSL3gE/2uEdZyDuSEnKCv/8IkYHiDkIQSbChiJoHyxZZXZ9bzckyRk+vNxFzh8rA==", "dependencies": { "unist-util-visit-parents": "1.1.2" } }, "node_modules/mdast-add-list-metadata/node_modules/unist-util-visit-parents": { "version": "1.1.2", - "license": "MIT" + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-1.1.2.tgz", + "integrity": "sha512-yvo+MMLjEwdc3RhhPYSximset7rwjMrdt9E41Smmvg25UQIenzrN83cRnF1JMzoMi9zZOQeYXHSDf7p+IQkW3Q==" }, "node_modules/mdast-util-definitions": { "version": "4.0.0", @@ -70619,7 +71016,8 @@ }, "node_modules/memory-pager": { "version": "1.5.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" }, "node_modules/meow": { "version": "6.1.1", @@ -72538,7 +72936,8 @@ }, "node_modules/mongodb": { "version": "6.3.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.3.0.tgz", + "integrity": "sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==", "dependencies": { "@mongodb-js/saslprep": "^1.1.0", "bson": "^6.2.0", @@ -72582,7 +72981,8 @@ }, "node_modules/mongodb-connection-string-url": { "version": "3.0.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.0.tgz", + "integrity": "sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ==", "dependencies": { "@types/whatwg-url": "^11.0.2", "whatwg-url": "^13.0.0" @@ -72590,14 +72990,16 @@ }, "node_modules/mongodb-connection-string-url/node_modules/punycode": { "version": "2.3.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "engines": { "node": ">=6" } }, "node_modules/mongodb-connection-string-url/node_modules/tr46": { "version": "4.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", "dependencies": { "punycode": "^2.3.0" }, @@ -72607,7 +73009,8 @@ }, "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": { "version": "13.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", + "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", "dependencies": { "tr46": "^4.1.1", "webidl-conversions": "^7.0.0" @@ -72618,7 +73021,8 @@ }, "node_modules/mongoose": { "version": "8.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.1.0.tgz", + "integrity": "sha512-kOA4Xnq2goqNpN9EmYElGNWfxA9H80fxcr7UdJKWi3UMflza0R7wpTihCpM67dE/0MNFljoa0sjQtlXVkkySAQ==", "dependencies": { "bson": "^6.2.0", "kareem": "2.5.1", @@ -72638,7 +73042,8 @@ }, "node_modules/mongoose/node_modules/ms": { "version": "2.1.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/morgan": { "version": "1.10.0", @@ -72716,14 +73121,16 @@ }, "node_modules/mpath": { "version": "0.9.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz", + "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==", "engines": { "node": ">=4.0.0" } }, "node_modules/mquery": { "version": "5.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz", + "integrity": "sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==", "dependencies": { "debug": "4.x" }, @@ -73236,7 +73643,8 @@ }, "node_modules/multihashes-sync": { "version": "1.1.3", - "license": "(MIT OR Apache-2.0)", + "resolved": "https://registry.npmjs.org/multihashes-sync/-/multihashes-sync-1.1.3.tgz", + "integrity": "sha512-996qBYdXxol6Pjjw++lsdgrEMI/6S6Su4bt0D/vb5TGpJsqicVxkramwIbuRaJU4WYUTytYPGRru2s626Qkzlw==", "dependencies": { "@noble/hashes": "^1.3.0", "multiformats": "^11.0.0" @@ -73244,7 +73652,8 @@ }, "node_modules/multihashes-sync/node_modules/multiformats": { "version": "11.0.2", - "license": "Apache-2.0 OR MIT", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-11.0.2.tgz", + "integrity": "sha512-b5mYMkOkARIuVZCpvijFj9a6m5wMVLC7cf/jIPd5D/ARDOfLC5+IFkbgDXQgcU2goIsTD/O9NY4DI/Mt4OGvlg==", "engines": { "node": ">=16.0.0", "npm": ">=7.0.0" @@ -73375,7 +73784,8 @@ }, "node_modules/nanoevents": { "version": "8.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/nanoevents/-/nanoevents-8.0.0.tgz", + "integrity": "sha512-bYYwNCdNc5ea6/Lwh1uioU1/7aaKa3EPmNQ2weTm8PWSpbWrsaWHePe0Zq4SF+D3F3JX3cn+QdktOPCf1meOqw==", "engines": { "node": "^16.0.0 || ^18.0.0 || >=20.0.0" } @@ -73499,8 +73909,9 @@ }, "node_modules/natural-orderby": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz", + "integrity": "sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==", "dev": true, - "license": "MIT", "engines": { "node": "*" } @@ -73643,7 +74054,8 @@ }, "node_modules/nist-weierstrauss": { "version": "1.6.1", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/nist-weierstrauss/-/nist-weierstrauss-1.6.1.tgz", + "integrity": "sha512-FpjCOnPV/s3ZVIkeldCVSml2K4lruabPbBgoEitpCK1JL0KTVoWb56CFTU6rZn5i6VqAjdwcOp0FDwJACPmeFA==", "dependencies": { "multiformats": "^9.6.5", "uint8arrays": "^2.1.4" @@ -73651,7 +74063,8 @@ }, "node_modules/nist-weierstrauss/node_modules/uint8arrays": { "version": "2.1.10", - "license": "MIT", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-2.1.10.tgz", + "integrity": "sha512-Q9/hhJa2836nQfEJSZTmr+pg9+cDJS9XEAp7N2Vg5MzL3bK/mkMVfjscRGYruP9jNda6MAdf4QD/y78gSzkp6A==", "dependencies": { "multiformats": "^9.4.2" } @@ -73743,7 +74156,8 @@ }, "node_modules/node-cron": { "version": "3.0.3", - "license": "ISC", + "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.3.tgz", + "integrity": "sha512-dOal67//nohNgYWb+nWmg5dkFdIwDm8EpeGYMekPMrngV3637lqnX0lbUcCtgibHTz6SEz7DAIjKvKDFYCnO1A==", "dependencies": { "uuid": "8.3.2" }, @@ -73753,7 +74167,8 @@ }, "node_modules/node-cron/node_modules/uuid": { "version": "8.3.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "bin": { "uuid": "dist/bin/uuid" } @@ -73909,9 +74324,10 @@ }, "node_modules/node-hid": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/node-hid/-/node-hid-2.2.0.tgz", + "integrity": "sha512-vj48zh9j555DZzUhMc8tk/qw6xPFrDyPBH1ST1Z/hWaA/juBJw7IuSxPeOgpzNFNU36mGYj+THioRMt1xOdm/g==", "dev": true, "hasInstallScript": true, - "license": "(MIT OR X11)", "dependencies": { "bindings": "^1.5.0", "node-addon-api": "^3.0.2", @@ -73926,8 +74342,9 @@ }, "node_modules/node-hid/node_modules/node-addon-api": { "version": "3.2.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "dev": true }, "node_modules/node-html-parser": { "version": "6.1.12", @@ -76397,15 +76814,17 @@ }, "node_modules/object-sizeof": { "version": "2.6.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/object-sizeof/-/object-sizeof-2.6.4.tgz", + "integrity": "sha512-YuJAf7Bi61KROcYmXm8RCeBrBw8UOaJDzTm1gp0eU7RjYi1xEte3/Nmg/VyPaHcJZ3sNojs1Y0xvSrgwkLmcFw==", "dependencies": { "buffer": "^6.0.3" } }, "node_modules/object-treeify": { "version": "1.1.33", + "resolved": "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.33.tgz", + "integrity": "sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==", "dev": true, - "license": "MIT", "engines": { "node": ">= 10" } @@ -76667,7 +77086,8 @@ }, "node_modules/optimism": { "version": "0.14.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.14.1.tgz", + "integrity": "sha512-7+1lSN+LJEtaj3uBLLFk8uFCFKy3txLvcvln5Dh1szXjF9yghEMeWclmnk0qdtYZ+lcMNyu48RmQQRw+LRYKSQ==", "dependencies": { "@wry/context": "^0.5.2", "@wry/trie": "^0.2.1" @@ -77442,8 +77862,9 @@ }, "node_modules/password-prompt": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz", + "integrity": "sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==", "dev": true, - "license": "0BSD", "dependencies": { "ansi-escapes": "^4.3.2", "cross-spawn": "^7.0.3" @@ -77451,8 +77872,9 @@ }, "node_modules/password-prompt/node_modules/cross-spawn": { "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -77464,16 +77886,18 @@ }, "node_modules/password-prompt/node_modules/path-key": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/password-prompt/node_modules/shebang-command": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, - "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -77483,8 +77907,9 @@ }, "node_modules/password-prompt/node_modules/shebang-regex": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -82163,6 +82588,18 @@ "node": ">=0.10.0" } }, + "node_modules/postgres": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.3.tgz", + "integrity": "sha512-iHJn4+M9vbTdHSdDzNkC0crHq+1CUdFhx+YqCE+SqWxPjm+Zu63jq7yZborOBF64c8pc58O5uMudyL1FQcHacA==", + "engines": { + "node": ">=12" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/porsager" + } + }, "node_modules/postgres-array": { "version": "2.0.0", "license": "MIT", @@ -82234,7 +82671,8 @@ }, "node_modules/prefix-style": { "version": "2.0.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/prefix-style/-/prefix-style-2.0.1.tgz", + "integrity": "sha512-gdr1MBNVT0drzTq95CbSNdsrBDoHGlb2aDJP/FoY+1e+jSDPOb1Cv554gH2MGiSr2WTcXi/zu+NaFzfcHQkfBQ==" }, "node_modules/prelude-ls": { "version": "1.2.1", @@ -84312,7 +84750,8 @@ }, "node_modules/react-country-flag": { "version": "3.0.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-country-flag/-/react-country-flag-3.0.2.tgz", + "integrity": "sha512-JPaz+q3QD0/nZtHBKj5x3O7r/SgSG9kxbymdaIU0RqlDAcorJIe4KV0DFhWIdKh69q5cPVkIVERcMYGZdvXgAA==", "engines": { "node": ">=12" }, @@ -84322,7 +84761,8 @@ }, "node_modules/react-custom-scrollbars": { "version": "4.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-custom-scrollbars/-/react-custom-scrollbars-4.2.1.tgz", + "integrity": "sha512-VtJTUvZ7kPh/auZWIbBRceGPkE30XBYe+HktFxuMWBR2eVQQ+Ur6yFJMoaYcNpyGq22uYJ9Wx4UAEcC0K+LNPQ==", "dependencies": { "dom-css": "^2.0.0", "prop-types": "^15.5.10", @@ -85169,7 +85609,8 @@ }, "node_modules/react-markdown": { "version": "5.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-5.0.3.tgz", + "integrity": "sha512-jDWOc1AvWn0WahpjW6NK64mtx6cwjM4iSsLHJPNBqoAgGOVoIdJMqaKX4++plhOtdd4JksdqzlDibgPx6B/M2w==", "dependencies": { "@types/mdast": "^3.0.3", "@types/unist": "^2.0.3", @@ -85193,7 +85634,8 @@ }, "node_modules/react-markdown/node_modules/bail": { "version": "1.0.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", + "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -85201,6 +85643,8 @@ }, "node_modules/react-markdown/node_modules/is-buffer": { "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", "funding": [ { "type": "github", @@ -85215,14 +85659,14 @@ "url": "https://feross.org/support" } ], - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/react-markdown/node_modules/remark-parse": { "version": "9.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", + "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", "dependencies": { "mdast-util-from-markdown": "^0.8.0" }, @@ -85233,7 +85677,8 @@ }, "node_modules/react-markdown/node_modules/trough": { "version": "1.0.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", + "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -85241,7 +85686,8 @@ }, "node_modules/react-markdown/node_modules/unified": { "version": "9.2.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", + "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", "dependencies": { "bail": "^1.0.0", "extend": "^3.0.0", @@ -85257,7 +85703,8 @@ }, "node_modules/react-markdown/node_modules/unist-util-is": { "version": "4.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", + "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" @@ -85265,7 +85712,8 @@ }, "node_modules/react-markdown/node_modules/unist-util-visit": { "version": "2.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz", + "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==", "dependencies": { "@types/unist": "^2.0.0", "unist-util-is": "^4.0.0", @@ -85278,7 +85726,8 @@ }, "node_modules/react-markdown/node_modules/unist-util-visit-parents": { "version": "3.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", + "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", "dependencies": { "@types/unist": "^2.0.0", "unist-util-is": "^4.0.0" @@ -85290,7 +85739,8 @@ }, "node_modules/react-markdown/node_modules/vfile": { "version": "4.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", + "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", "dependencies": { "@types/unist": "^2.0.0", "is-buffer": "^2.0.0", @@ -85304,7 +85754,8 @@ }, "node_modules/react-markdown/node_modules/vfile-message": { "version": "2.0.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", + "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", "dependencies": { "@types/unist": "^2.0.0", "unist-util-stringify-position": "^2.0.0" @@ -85433,7 +85884,9 @@ }, "node_modules/react-native-collapsible-tab-view": { "version": "2.0.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-native-collapsible-tab-view/-/react-native-collapsible-tab-view-2.0.2.tgz", + "integrity": "sha512-83fme3FnMFIMIbhE6J7Iqmt2HG5q7A8d49X38VrSRegC1UG4sIAVjS3MSSVMgCip+WscqBc0aiJFQInTUzkUEw==", + "deprecated": "Deprecated in favor of v4", "dependencies": { "use-debounce": "^5.1.0" }, @@ -85552,7 +86005,8 @@ }, "node_modules/react-native-fs": { "version": "2.20.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-native-fs/-/react-native-fs-2.20.0.tgz", + "integrity": "sha512-VkTBzs7fIDUiy/XajOSNk0XazFE9l+QlMAce7lGuebZcag5CnjszB+u4BdqzwaQOdcYb5wsJIsqq4kxInIRpJQ==", "dependencies": { "base-64": "^0.1.0", "utf8": "^3.0.0" @@ -85594,7 +86048,8 @@ }, "node_modules/react-native-inset-shadow": { "version": "1.0.3", - "license": "Unlicense", + "resolved": "https://registry.npmjs.org/react-native-inset-shadow/-/react-native-inset-shadow-1.0.3.tgz", + "integrity": "sha512-4UXuSrenJtOWKcV0zSqHLQ47Oxn+BXdmxFxYXf5rE8KletbTvQq8ziZsX8MSEegUGWDcJJ3Mw+1OVbPJxm4lZg==", "dependencies": { "prop-types": "^15.7.2" }, @@ -85697,7 +86152,8 @@ }, "node_modules/react-native-safe-area-context": { "version": "4.8.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.8.2.tgz", + "integrity": "sha512-ffUOv8BJQ6RqO3nLml5gxJ6ab3EestPiyWekxdzO/1MQ7NF8fW1Mzh1C5QE9yq573Xefnc7FuzGXjtesZGv7cQ==", "peerDependencies": { "react": "*", "react-native": "*" @@ -85717,7 +86173,8 @@ }, "node_modules/react-native-svg": { "version": "13.14.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.14.0.tgz", + "integrity": "sha512-27ZnxUkHgWICimhuj6MuqBkISN53lVvgWJB7pIypjXysAyM+nqgQBPh4vXg+7MbqLBoYvR4PiBgKfwwGAqVxHg==", "dependencies": { "css-select": "^5.1.0", "css-tree": "^1.1.3" @@ -86142,7 +86599,8 @@ }, "node_modules/react-native-svg/node_modules/css-select": { "version": "5.1.0", - "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", "dependencies": { "boolbase": "^1.0.0", "css-what": "^6.1.0", @@ -86156,7 +86614,8 @@ }, "node_modules/react-native-svg/node_modules/dom-serializer": { "version": "2.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", @@ -86168,17 +86627,19 @@ }, "node_modules/react-native-svg/node_modules/domelementtype": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/fb55" } - ], - "license": "BSD-2-Clause" + ] }, "node_modules/react-native-svg/node_modules/domhandler": { "version": "5.0.3", - "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "dependencies": { "domelementtype": "^2.3.0" }, @@ -86191,7 +86652,8 @@ }, "node_modules/react-native-svg/node_modules/domutils": { "version": "3.1.0", - "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", @@ -86203,7 +86665,8 @@ }, "node_modules/react-native-svg/node_modules/entities": { "version": "4.5.0", - "license": "BSD-2-Clause", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "engines": { "node": ">=0.12" }, @@ -86628,7 +87091,8 @@ }, "node_modules/react-perfect-scrollbar": { "version": "1.5.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-perfect-scrollbar/-/react-perfect-scrollbar-1.5.8.tgz", + "integrity": "sha512-bQ46m70gp/HJtiBOF3gRzBISSZn8FFGNxznTdmTG8AAwpxG1bJCyn7shrgjEvGSQ5FJEafVEiosY+ccER11OSA==", "dependencies": { "perfect-scrollbar": "^1.5.0", "prop-types": "^15.6.1" @@ -91261,7 +91725,8 @@ }, "node_modules/react-spinners": { "version": "0.5.12", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-spinners/-/react-spinners-0.5.12.tgz", + "integrity": "sha512-A1UG87Yd+pdmPQKooJoywdmgSGPG6iPcOoMyfki+wxYDNDEYtejAepws+VxTt/GGpb/JRDnll5oNuQoh4nF9JA==", "dependencies": { "@emotion/core": "^10.0.4", "prop-types": "^15.5.10", @@ -91274,7 +91739,8 @@ }, "node_modules/react-spring": { "version": "8.0.27", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz", + "integrity": "sha512-nDpWBe3ZVezukNRandTeLSPcwwTMjNVu1IDq9qA/AMiUqHuRN4BeSWvKr3eIxxg1vtiYiOLy4FqdfCP5IoP77g==", "dependencies": { "@babel/runtime": "^7.3.1", "prop-types": "^15.5.8" @@ -91286,7 +91752,8 @@ }, "node_modules/react-streaming": { "version": "0.3.19", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-streaming/-/react-streaming-0.3.19.tgz", + "integrity": "sha512-kpxnj/nynMbdVVLUZKAI+AlSx7bJNX0WZO14LSJNtfIcbQJd7YH0ilnP+AFwKkvrjuG8zuNL36W5WCsczM62zg==", "dependencies": { "@brillout/import": "^0.2.3", "@brillout/json-serializer": "^0.5.1", @@ -91448,7 +91915,8 @@ }, "node_modules/react-use-measure": { "version": "2.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-use-measure/-/react-use-measure-2.1.1.tgz", + "integrity": "sha512-nocZhN26cproIiIduswYpV5y5lQpSQS1y/4KuvUCjSKmw7ZWIS/+g3aFnX3WdBkyuGUtTLif3UTqnLLhbDoQig==", "dependencies": { "debounce": "^1.2.1" }, @@ -92006,7 +92474,8 @@ }, "node_modules/recompose": { "version": "0.30.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz", + "integrity": "sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==", "dependencies": { "@babel/runtime": "^7.0.0", "change-emitter": "^0.1.2", @@ -92021,11 +92490,13 @@ }, "node_modules/recompose/node_modules/hoist-non-react-statics": { "version": "2.5.5", - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" }, "node_modules/recompose/node_modules/symbol-observable": { "version": "1.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", "engines": { "node": ">=0.10.0" } @@ -92078,8 +92549,9 @@ }, "node_modules/redeyed": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz", + "integrity": "sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==", "dev": true, - "license": "MIT", "dependencies": { "esprima": "~4.0.0" } @@ -93322,13 +93794,16 @@ }, "node_modules/ripemd160-min": { "version": "0.0.6", + "resolved": "https://registry.npmjs.org/ripemd160-min/-/ripemd160-min-0.0.6.tgz", + "integrity": "sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A==", "engines": { "node": ">=8" } }, "node_modules/rive-react-native": { "version": "6.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/rive-react-native/-/rive-react-native-6.2.0.tgz", + "integrity": "sha512-1ojHCMJokN56k5v7y4LxoUx3iKlcXzKCh8An9CL9fcDZF8jdazMgIy04JHxftBQocF+a8rt97yauSHNIp65bwg==", "engines": { "node": ">=16" }, @@ -94512,7 +94987,8 @@ }, "node_modules/rpc-utils": { "version": "0.6.2", - "license": "(Apache-2.0 OR MIT)", + "resolved": "https://registry.npmjs.org/rpc-utils/-/rpc-utils-0.6.2.tgz", + "integrity": "sha512-kzk1OflbBckfDBAo8JwsmtQSHzj+6hxRt5G+u8A8ZSmunBw1nhWvRkSq8j1+EvWBqBRLy1aiGLUW5644CZqQtA==", "dependencies": { "nanoid": "^3.3.1" }, @@ -94566,8 +95042,9 @@ }, "node_modules/rrweb-cssom": { "version": "0.6.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", + "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==", + "dev": true }, "node_modules/rsvp": { "version": "4.8.5", @@ -96330,7 +96807,8 @@ }, "node_modules/sift": { "version": "16.0.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.1.tgz", + "integrity": "sha512-Wv6BjQ5zbhW7VFefWusVP33T/EM0vYikCaQ2qR8yULbsilAT8/wQaXvuQ3ptGLpoKx+lihJE3y2UTgKDyyNHZQ==" }, "node_modules/siginfo": { "version": "2.0.0", @@ -96494,7 +96972,8 @@ }, "node_modules/simplebar-core": { "version": "1.2.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/simplebar-core/-/simplebar-core-1.2.4.tgz", + "integrity": "sha512-P+Sqshef4fq3++gQ82TgNYcgl3qZFSCP5jS2/8NMmw18oagXOijMzs1G+vm6RUY3oMvpwH3wGoqh9u6SyDjHfQ==", "dependencies": { "@types/lodash-es": "^4.17.6", "can-use-dom": "^0.1.0", @@ -96738,7 +97217,8 @@ }, "node_modules/socket.io-client": { "version": "4.7.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.4.tgz", + "integrity": "sha512-wh+OkeF0rAVCrABWQBaEjLfb7DVPotMbu0cgWgyR0v6eA4EoVnAwcIeIbcdTE3GT/H3kbdLl7OoH2+asoDRIIg==", "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.2", @@ -96751,7 +97231,8 @@ }, "node_modules/socket.io-parser": { "version": "4.2.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", + "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1" @@ -96965,7 +97446,8 @@ }, "node_modules/sparse-bitfield": { "version": "3.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", "dependencies": { "memory-pager": "^1.0.2" } @@ -97110,6 +97592,8 @@ }, "node_modules/split": { "version": "0.2.10", + "resolved": "https://registry.npmjs.org/split/-/split-0.2.10.tgz", + "integrity": "sha512-e0pKq+UUH2Xq/sXbYpZBZc3BawsfDZ7dgv+JtRTUPNcvF5CMR4Y9cvJqkMY0MoxWzTHvZuz1beg6pNEKlszPiQ==", "dependencies": { "through": "2" }, @@ -102296,7 +102780,8 @@ }, "node_modules/tiny-typed-emitter": { "version": "2.1.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", + "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==" }, "node_modules/tiny-warning": { "version": "1.0.3", @@ -102395,7 +102880,8 @@ }, "node_modules/to-camel-case": { "version": "1.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/to-camel-case/-/to-camel-case-1.0.0.tgz", + "integrity": "sha512-nD8pQi5H34kyu1QDMFjzEIYqk0xa9Alt6ZfrdEMuHCFOfTLhDG5pgTu/aAM9Wt9lXILwlXmWP43b8sav0GNE8Q==", "dependencies": { "to-space-case": "^1.0.0" } @@ -102409,7 +102895,8 @@ }, "node_modules/to-no-case": { "version": "1.0.2", - "license": "MIT" + "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz", + "integrity": "sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==" }, "node_modules/to-object-path": { "version": "0.3.0", @@ -102522,7 +103009,8 @@ }, "node_modules/to-space-case": { "version": "1.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz", + "integrity": "sha512-rLdvwXZ39VOn1IxGL3V6ZstoTbwLRckQmn/U8ZDLuWwIXNpuZDhQ3AiRUlhTbOXFVE9C+dR51wM0CBDhk31VcA==", "dependencies": { "to-no-case": "^1.0.0" } @@ -102643,7 +103131,8 @@ }, "node_modules/toucan-js": { "version": "3.3.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/toucan-js/-/toucan-js-3.3.1.tgz", + "integrity": "sha512-9BpkHb/Pzsrtl1ItNq9OEQPnuUHwzce0nV2uG+DYFiQ4fPyiA6mKTBcDwQzcvNkfSER038U+8TzvdkCev+Maww==", "dependencies": { "@sentry/core": "7.76.0", "@sentry/integrations": "7.76.0", @@ -102653,7 +103142,8 @@ }, "node_modules/toucan-js/node_modules/@sentry/core": { "version": "7.76.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.76.0.tgz", + "integrity": "sha512-M+ptkCTeCNf6fn7p2MmEb1Wd9/JXUWxIT/0QEc+t11DNR4FYy1ZP2O9Zb3Zp2XacO7ORrlL3Yc+VIfl5JTgjfw==", "dependencies": { "@sentry/types": "7.76.0", "@sentry/utils": "7.76.0" @@ -102664,7 +103154,8 @@ }, "node_modules/toucan-js/node_modules/@sentry/integrations": { "version": "7.76.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.76.0.tgz", + "integrity": "sha512-4ea0PNZrGN9wKuE/8bBCRrxxw4Cq5T710y8rhdKHAlSUpbLqr/atRF53h8qH3Fi+ec0m38PB+MivKem9zUwlwA==", "dependencies": { "@sentry/core": "7.76.0", "@sentry/types": "7.76.0", @@ -102677,14 +103168,16 @@ }, "node_modules/toucan-js/node_modules/@sentry/types": { "version": "7.76.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.76.0.tgz", + "integrity": "sha512-vj6z+EAbVrKAXmJPxSv/clpwS9QjPqzkraMFk2hIdE/kii8s8kwnkBwTSpIrNc8GnzV3qYC4r3qD+BXDxAGPaw==", "engines": { "node": ">=8" } }, "node_modules/toucan-js/node_modules/@sentry/utils": { "version": "7.76.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.76.0.tgz", + "integrity": "sha512-40jFD+yfQaKpFYINghdhovzec4IEpB7aAuyH/GtE7E0gLpcqnC72r55krEIVILfqIR2Mlr5OKUzyeoCyWAU/yw==", "dependencies": { "@sentry/types": "7.76.0" }, @@ -102888,7 +103381,8 @@ }, "node_modules/ts-invariant": { "version": "0.6.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.6.2.tgz", + "integrity": "sha512-hsVurayufl1gXg8CHtgZkB7X0KtA3TrI3xcJ9xkRr8FeJHnM/TIEQkgBq9XkpduyBWWUdlRIR9xWf4Lxq3LJTg==", "dependencies": { "@types/ungap__global-this": "^0.3.1", "@ungap/global-this": "^0.4.2", @@ -104286,6 +104780,8 @@ }, "node_modules/ua-parser-js": { "version": "0.7.37", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz", + "integrity": "sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==", "funding": [ { "type": "opencollective", @@ -104300,7 +104796,6 @@ "url": "https://github.com/sponsors/faisalman" } ], - "license": "MIT", "engines": { "node": "*" } @@ -105242,9 +105737,10 @@ }, "node_modules/usb": { "version": "2.9.0", + "resolved": "https://registry.npmjs.org/usb/-/usb-2.9.0.tgz", + "integrity": "sha512-G0I/fPgfHUzWH8xo2KkDxTTFruUWfppgSFJ+bQxz/kVY2x15EQ/XDB7dqD1G432G4gBG4jYQuF3U7j/orSs5nw==", "dev": true, "hasInstallScript": true, - "license": "MIT", "dependencies": { "@types/w3c-web-usb": "^1.0.6", "node-addon-api": "^6.0.0", @@ -105256,8 +105752,9 @@ }, "node_modules/usb/node_modules/node-addon-api": { "version": "6.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", + "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", + "dev": true }, "node_modules/use": { "version": "3.1.1", @@ -105294,7 +105791,8 @@ }, "node_modules/use-debounce": { "version": "5.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-5.2.1.tgz", + "integrity": "sha512-BQG5uEypYHd/ASF6imzYR8tJHh5qGn28oZG/5iVAbljV6MUrfyT4jzxA8co+L+WLCT1U8VBwzzvlb3CHmUDpEA==", "engines": { "node": ">= 10.0.0" }, @@ -105459,8 +105957,9 @@ }, "node_modules/utility-types": { "version": "3.11.0", + "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.11.0.tgz", + "integrity": "sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4" } @@ -105603,11 +106102,13 @@ }, "node_modules/varintes": { "version": "2.0.5", - "license": "(MIT OR Apache-2.0)" + "resolved": "https://registry.npmjs.org/varintes/-/varintes-2.0.5.tgz", + "integrity": "sha512-iF3jlHLko9NrYjaUZvT3VwypP3V20KNNhT1tzqblyIyrVjNiW7HseGOhuP+apgZBp9X/8+5pxa7kNikhJeZlIw==" }, "node_modules/varuint-bitcoin": { "version": "1.1.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz", + "integrity": "sha512-4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==", "dependencies": { "safe-buffer": "^5.1.1" } @@ -105830,7 +106331,8 @@ }, "node_modules/vike": { "version": "0.4.150", - "license": "MIT", + "resolved": "https://registry.npmjs.org/vike/-/vike-0.4.150.tgz", + "integrity": "sha512-R2cfpRWTZb0WOgMDsh5oLGq9yJV4aPjEyjpnvy0Rkntv9YpX4EXp9MmNHUTqNJJqBeURtJKHQpfPbFRgbPjIbQ==", "dependencies": { "@brillout/import": "0.2.3", "@brillout/json-serializer": "^0.5.8", @@ -105863,7 +106365,8 @@ }, "node_modules/vike-react": { "version": "0.3.9", - "license": "MIT", + "resolved": "https://registry.npmjs.org/vike-react/-/vike-react-0.3.9.tgz", + "integrity": "sha512-klqi6eKdiDRsYbBKPJKXTf9cKOVIRrapZ+SG6melt1IdsQwbzZX0WeHXKn7tfHcKL7HqxMmPuamLJYQA06hVdw==", "dependencies": { "react-streaming": "^0.3.19" }, @@ -105874,12 +106377,58 @@ "vite": "^4.3.8 || ^5.0.10" } }, + "node_modules/vike/node_modules/@esbuild/android-arm": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz", + "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/android-arm64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz", + "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/android-x64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz", + "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/vike/node_modules/@esbuild/darwin-arm64": { "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz", + "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "darwin" @@ -105888,9 +106437,280 @@ "node": ">=12" } }, + "node_modules/vike/node_modules/@esbuild/darwin-x64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz", + "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/freebsd-arm64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz", + "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/freebsd-x64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz", + "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/linux-arm": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz", + "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/linux-arm64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz", + "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/linux-ia32": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz", + "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/linux-loong64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz", + "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==", + "cpu": [ + "loong64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/linux-mips64el": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz", + "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==", + "cpu": [ + "mips64el" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/linux-ppc64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz", + "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==", + "cpu": [ + "ppc64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/linux-riscv64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz", + "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==", + "cpu": [ + "riscv64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/linux-s390x": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz", + "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==", + "cpu": [ + "s390x" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/linux-x64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz", + "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/netbsd-x64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz", + "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/openbsd-x64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz", + "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/sunos-x64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz", + "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/win32-arm64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz", + "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/win32-ia32": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz", + "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vike/node_modules/@esbuild/win32-x64": { + "version": "0.17.19", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz", + "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/vike/node_modules/acorn": { "version": "8.11.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "bin": { "acorn": "bin/acorn" }, @@ -105900,8 +106720,9 @@ }, "node_modules/vike/node_modules/esbuild": { "version": "0.17.19", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz", + "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==", "hasInstallScript": true, - "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -105935,14 +106756,16 @@ }, "node_modules/vike/node_modules/mrmime": { "version": "2.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", + "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", "engines": { "node": ">=10" } }, "node_modules/vike/node_modules/sirv": { "version": "2.0.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz", + "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==", "dependencies": { "@polka/url": "^1.0.0-next.24", "mrmime": "^2.0.0", @@ -105954,15 +106777,17 @@ }, "node_modules/vike/node_modules/totalist": { "version": "3.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", + "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", "engines": { "node": ">=6" } }, "node_modules/vite": { "version": "4.5.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", + "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", @@ -106635,8 +107460,9 @@ }, "node_modules/vite-plugin-top-level-await": { "version": "1.3.1", + "resolved": "https://registry.npmjs.org/vite-plugin-top-level-await/-/vite-plugin-top-level-await-1.3.1.tgz", + "integrity": "sha512-55M1h4NAwkrpxPNOJIBzKZFihqLUzIgnElLSmPNPMR2Fn9+JHKaNg3sVX1Fq+VgvuBksQYxiD3OnwQAUu7kaPQ==", "dev": true, - "license": "MIT", "dependencies": { "@rollup/plugin-virtual": "^3.0.1", "@swc/core": "^1.3.10", @@ -106648,20 +107474,22 @@ }, "node_modules/vite-plugin-top-level-await/node_modules/uuid": { "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "dev": true, "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], - "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } }, "node_modules/vite-plugin-wasm": { "version": "3.2.2", + "resolved": "https://registry.npmjs.org/vite-plugin-wasm/-/vite-plugin-wasm-3.2.2.tgz", + "integrity": "sha512-cdbBUNR850AEoMd5nvLmnyeq63CSfoP1ctD/L2vLk/5+wsgAPlAVAzUK5nGKWO/jtehNlrSSHLteN+gFQw7VOA==", "dev": true, - "license": "MIT", "peerDependencies": { "vite": "^2 || ^3 || ^4" } @@ -111327,6 +112155,8 @@ }, "node_modules/xmlhttprequest-ssl": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz", + "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==", "engines": { "node": ">=0.4.0" } @@ -111507,7 +112337,8 @@ }, "node_modules/zen-observable": { "version": "0.8.15", - "license": "MIT" + "resolved": "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz", + "integrity": "sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==" }, "node_modules/zod": { "version": "3.21.4", @@ -111931,7 +112762,39 @@ "@pedalboard/trending-challenge-rewards": "*" } }, - "packages/ddex": {}, + "packages/ddex": { + "name": "@audius/ddex", + "version": "0.0.6", + "dependencies": { + "@audius/sdk": "*", + "@types/multer": "1.4.11", + "cors": "2.8.5", + "decompress": "4.2.1", + "dotenv": "16.3.1", + "express": "4.18.2", + "fast-xml-parser": "4.3.2", + "fastq": "1.16.0", + "linkedom": "0.15.6", + "multer": "1.4.5-lts.1", + "postgres": "3.4.3", + "uuid": "9.0.1" + }, + "devDependencies": { + "@types/decompress": "4.2.7", + "@types/express": "4.17.21", + "@types/node": "20.10.6", + "@types/uuid": "9.0.7", + "@typescript-eslint/eslint-plugin": "6.17.0", + "@typescript-eslint/parser": "6.17.0", + "eslint": "8.56.0", + "eslint-config-prettier": "9.1.0", + "eslint-plugin-prettier": "5.1.2", + "nodemon": "3.0.2", + "prettier": "3.1.1", + "ts-node": "10.9.2", + "typescript": "5.3.3" + } + }, "packages/ddex/client": { "name": "@audius/ddex-client", "version": "0.0.8", @@ -112077,7 +112940,8 @@ }, "packages/ddex/node_modules/@optimizely/js-sdk-datafile-manager": { "version": "0.9.5", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-datafile-manager/-/js-sdk-datafile-manager-0.9.5.tgz", + "integrity": "sha512-O4ujr1nBBAQBtx8YoKNpzzaEZgsE+aU4dxubT17ePqv/YVUWE+JOY21tSRrqZy/BlbbyzL+ElT8hrGB5ZzVoIQ==", "dependencies": { "@optimizely/js-sdk-logging": "^0.3.1", "@optimizely/js-sdk-utils": "^0.4.0", @@ -112097,7 +112961,8 @@ }, "packages/ddex/node_modules/@optimizely/js-sdk-event-processor": { "version": "0.9.5", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-event-processor/-/js-sdk-event-processor-0.9.5.tgz", + "integrity": "sha512-g5zqAjJuexxgbNvn7dacFkQXQxH3+OtjELfmSswvhxP9EHkyNR0ZdQF/kBxFxr335F2/RRPvAJ9tQBPkwaBg8g==", "dependencies": { "@optimizely/js-sdk-logging": "^0.3.1", "@optimizely/js-sdk-utils": "^0.4.0" @@ -112117,28 +112982,33 @@ }, "packages/ddex/node_modules/@optimizely/js-sdk-logging": { "version": "0.3.1", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-logging/-/js-sdk-logging-0.3.1.tgz", + "integrity": "sha512-K71Jf283FP0E4oXehcXTTM3gvgHZHr7FUrIsw//0mdJlotHJT4Nss4hE0CWPbBxO7LJAtwNnO+VIA/YOcO4vHg==", "dependencies": { "@optimizely/js-sdk-utils": "^0.4.0" } }, "packages/ddex/node_modules/@optimizely/js-sdk-utils": { "version": "0.4.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-utils/-/js-sdk-utils-0.4.0.tgz", + "integrity": "sha512-QG2oytnITW+VKTJK+l0RxjaS5VrA6W+AZMzpeg4LCB4Rn4BEKtF+EcW/5S1fBDLAviGq/0TLpkjM3DlFkJ9/Gw==", "dependencies": { "uuid": "^3.3.2" } }, "packages/ddex/node_modules/@optimizely/js-sdk-utils/node_modules/uuid": { "version": "3.4.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", "bin": { "uuid": "bin/uuid" } }, "packages/ddex/node_modules/@optimizely/optimizely-sdk": { "version": "4.9.2", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@optimizely/optimizely-sdk/-/optimizely-sdk-4.9.2.tgz", + "integrity": "sha512-aPUU2KGDgo0VmbYNXeUCttXQgbBr59leUhyNPidy1J3YixEhzo0Q9UXCzhf4SgCTCtHCwahE7g0Lf36U0IVPgQ==", "dependencies": { "@optimizely/js-sdk-datafile-manager": "^0.9.5", "@optimizely/js-sdk-event-processor": "^0.9.2", @@ -112153,14 +113023,17 @@ }, "packages/ddex/node_modules/@optimizely/optimizely-sdk/node_modules/uuid": { "version": "3.4.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", "bin": { "uuid": "bin/uuid" } }, "packages/ddex/node_modules/@react-spring/web": { "version": "9.7.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz", + "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==", "dependencies": { "@react-spring/animated": "~9.7.3", "@react-spring/core": "~9.7.3", @@ -112174,15 +113047,17 @@ }, "packages/ddex/node_modules/@remix-run/router": { "version": "1.13.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.13.0.tgz", + "integrity": "sha512-5dMOnVnefRsl4uRnAdoWjtVTdh8e6aZqgM4puy9nmEADH72ck+uXwzpJLEKE9Q6F8ZljNewLgmTfkxUrBdv4WA==", "engines": { "node": ">=14.0.0" } }, "packages/ddex/node_modules/@types/express": { "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.33", @@ -112192,27 +113067,31 @@ }, "packages/ddex/node_modules/@types/node": { "version": "20.10.6", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz", + "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==", "dependencies": { "undici-types": "~5.26.4" } }, "packages/ddex/node_modules/@types/semver": { "version": "7.5.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", + "dev": true }, "packages/ddex/node_modules/@types/ws": { "version": "8.5.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", + "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", "dependencies": { "@types/node": "*" } }, "packages/ddex/node_modules/@typescript-eslint/eslint-plugin": { "version": "6.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.17.0.tgz", + "integrity": "sha512-Vih/4xLXmY7V490dGwBQJTpIZxH4ZFH6eCVmQ4RFkB+wmaCTDAx4dtgoWwMNGKLkqRY1L6rPqzEbjorRnDo4rQ==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.5.1", "@typescript-eslint/scope-manager": "6.17.0", @@ -112245,8 +113124,9 @@ }, "packages/ddex/node_modules/@typescript-eslint/parser": { "version": "6.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.17.0.tgz", + "integrity": "sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "6.17.0", "@typescript-eslint/types": "6.17.0", @@ -112272,8 +113152,9 @@ }, "packages/ddex/node_modules/@typescript-eslint/scope-manager": { "version": "6.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.17.0.tgz", + "integrity": "sha512-RX7a8lwgOi7am0k17NUO0+ZmMOX4PpjLtLRgLmT1d3lBYdWH4ssBUbwdmc5pdRX8rXon8v9x8vaoOSpkHfcXGA==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/types": "6.17.0", "@typescript-eslint/visitor-keys": "6.17.0" @@ -112288,8 +113169,9 @@ }, "packages/ddex/node_modules/@typescript-eslint/type-utils": { "version": "6.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.17.0.tgz", + "integrity": "sha512-hDXcWmnbtn4P2B37ka3nil3yi3VCQO2QEB9gBiHJmQp5wmyQWqnjA85+ZcE8c4FqnaB6lBwMrPkgd4aBYz3iNg==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "6.17.0", "@typescript-eslint/utils": "6.17.0", @@ -112314,8 +113196,9 @@ }, "packages/ddex/node_modules/@typescript-eslint/types": { "version": "6.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.17.0.tgz", + "integrity": "sha512-qRKs9tvc3a4RBcL/9PXtKSehI/q8wuU9xYJxe97WFxnzH8NWWtcW3ffNS+EWg8uPvIerhjsEZ+rHtDqOCiH57A==", "dev": true, - "license": "MIT", "engines": { "node": "^16.0.0 || >=18.0.0" }, @@ -112326,8 +113209,9 @@ }, "packages/ddex/node_modules/@typescript-eslint/typescript-estree": { "version": "6.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.17.0.tgz", + "integrity": "sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/types": "6.17.0", "@typescript-eslint/visitor-keys": "6.17.0", @@ -112353,8 +113237,9 @@ }, "packages/ddex/node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -112367,8 +113252,9 @@ }, "packages/ddex/node_modules/@typescript-eslint/utils": { "version": "6.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.17.0.tgz", + "integrity": "sha512-LofsSPjN/ITNkzV47hxas2JCsNCEnGhVvocfyOcLzT9c/tSZE7SfhS/iWtzP1lKNOEfLhRTZz6xqI8N2RzweSQ==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", @@ -112391,8 +113277,9 @@ }, "packages/ddex/node_modules/@typescript-eslint/visitor-keys": { "version": "6.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.17.0.tgz", + "integrity": "sha512-H6VwB/k3IuIeQOyYczyyKN8wH6ed8EwliaYHLxOIhyF0dYEIsN8+Bk3GE19qafeMKyZJJHP8+O1HiFhFLUNKSg==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/types": "6.17.0", "eslint-visitor-keys": "^3.4.1" @@ -112438,8 +113325,9 @@ }, "packages/ddex/node_modules/anymatch": { "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, - "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -112456,15 +113344,17 @@ }, "packages/ddex/node_modules/binary-extensions": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "packages/ddex/node_modules/body-parser": { "version": "1.20.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.4", @@ -112486,27 +113376,31 @@ }, "packages/ddex/node_modules/body-parser/node_modules/debug": { "version": "2.6.9", - "license": "MIT", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dependencies": { "ms": "2.0.0" } }, "packages/ddex/node_modules/body-parser/node_modules/ms": { "version": "2.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "packages/ddex/node_modules/brace-expansion": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, "packages/ddex/node_modules/braces": { "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, - "license": "MIT", "dependencies": { "fill-range": "^7.0.1" }, @@ -112516,6 +113410,8 @@ }, "packages/ddex/node_modules/busboy": { "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", "dependencies": { "streamsearch": "^1.1.0" }, @@ -112525,7 +113421,8 @@ }, "packages/ddex/node_modules/bytes": { "version": "3.1.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "engines": { "node": ">= 0.8" } @@ -112548,6 +113445,8 @@ }, "packages/ddex/node_modules/chokidar": { "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, "funding": [ { @@ -112574,8 +113473,9 @@ }, "packages/ddex/node_modules/chokidar/node_modules/glob-parent": { "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -112585,11 +113485,13 @@ }, "packages/ddex/node_modules/classnames": { "version": "2.5.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "packages/ddex/node_modules/content-disposition": { "version": "0.5.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "dependencies": { "safe-buffer": "5.2.1" }, @@ -112599,21 +113501,24 @@ }, "packages/ddex/node_modules/cookie": { "version": "0.5.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", "engines": { "node": ">= 0.6" } }, "packages/ddex/node_modules/copy-to-clipboard": { "version": "3.3.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz", + "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==", "dependencies": { "toggle-selection": "^1.0.6" } }, "packages/ddex/node_modules/cross-fetch": { "version": "4.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", + "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", "dependencies": { "node-fetch": "^2.6.12" } @@ -112634,18 +113539,21 @@ }, "packages/ddex/node_modules/csstype": { "version": "3.1.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "packages/ddex/node_modules/depd": { "version": "2.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "engines": { "node": ">= 0.8" } }, "packages/ddex/node_modules/destroy": { "version": "1.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -112653,8 +113561,9 @@ }, "packages/ddex/node_modules/eslint-config-prettier": { "version": "9.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", + "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, - "license": "MIT", "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -112664,8 +113573,9 @@ }, "packages/ddex/node_modules/eslint-plugin-prettier": { "version": "5.1.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.2.tgz", + "integrity": "sha512-dhlpWc9vOwohcWmClFcA+HjlvUpuyynYs0Rf+L/P6/0iQE6vlHW9l5bkfzN62/Stm9fbq8ku46qzde76T1xlSg==", "dev": true, - "license": "MIT", "dependencies": { "prettier-linter-helpers": "^1.0.0", "synckit": "^0.8.6" @@ -112709,8 +113619,9 @@ }, "packages/ddex/node_modules/eslint-visitor-keys": { "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -112720,7 +113631,8 @@ }, "packages/ddex/node_modules/express": { "version": "4.18.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -112760,26 +113672,30 @@ }, "packages/ddex/node_modules/express/node_modules/debug": { "version": "2.6.9", - "license": "MIT", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dependencies": { "ms": "2.0.0" } }, "packages/ddex/node_modules/express/node_modules/ms": { "version": "2.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "packages/ddex/node_modules/fastq": { "version": "1.16.0", - "license": "ISC", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz", + "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==", "dependencies": { "reusify": "^1.0.4" } }, "packages/ddex/node_modules/fill-range": { "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, - "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -112789,7 +113705,8 @@ }, "packages/ddex/node_modules/finalhandler": { "version": "1.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -112805,14 +113722,16 @@ }, "packages/ddex/node_modules/finalhandler/node_modules/debug": { "version": "2.6.9", - "license": "MIT", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dependencies": { "ms": "2.0.0" } }, "packages/ddex/node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "packages/ddex/node_modules/find-up": { "version": "5.0.0", @@ -112832,8 +113751,10 @@ }, "packages/ddex/node_modules/fsevents": { "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "license": "MIT", + "hasInstallScript": true, "optional": true, "os": [ "darwin" @@ -112871,7 +113792,8 @@ }, "packages/ddex/node_modules/http-errors": { "version": "2.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -112885,7 +113807,8 @@ }, "packages/ddex/node_modules/iconv-lite": { "version": "0.4.24", - "license": "MIT", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -112895,7 +113818,8 @@ }, "packages/ddex/node_modules/inline-style-prefixer": { "version": "7.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz", + "integrity": "sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ==", "dependencies": { "css-in-js-utils": "^3.1.0", "fast-loops": "^1.1.3" @@ -112903,8 +113827,9 @@ }, "packages/ddex/node_modules/is-binary-path": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, - "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -112914,8 +113839,9 @@ }, "packages/ddex/node_modules/is-number": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -112934,7 +113860,8 @@ }, "packages/ddex/node_modules/json-schema": { "version": "0.4.0", - "license": "(AFL-2.1 OR BSD-3-Clause)" + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" }, "packages/ddex/node_modules/locate-path": { "version": "6.0.0", @@ -112953,8 +113880,9 @@ }, "packages/ddex/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -112964,7 +113892,8 @@ }, "packages/ddex/node_modules/mime": { "version": "1.6.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "bin": { "mime": "cli.js" }, @@ -112974,11 +113903,13 @@ }, "packages/ddex/node_modules/ms": { "version": "2.1.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "packages/ddex/node_modules/multer": { "version": "1.4.5-lts.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz", + "integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==", "dependencies": { "append-field": "^1.0.0", "busboy": "^1.0.0", @@ -112994,7 +113925,8 @@ }, "packages/ddex/node_modules/nano-css": { "version": "5.6.1", - "license": "Unlicense", + "resolved": "https://registry.npmjs.org/nano-css/-/nano-css-5.6.1.tgz", + "integrity": "sha512-T2Mhc//CepkTa3X4pUhKgbEheJHYAxD0VptuqFhDbGMUWVV2m+lkNiW/Ieuj35wrfC8Zm0l7HvssQh7zcEttSw==", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15", "css-tree": "^1.1.2", @@ -113012,7 +113944,8 @@ }, "packages/ddex/node_modules/node-fetch": { "version": "2.7.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -113030,8 +113963,9 @@ }, "packages/ddex/node_modules/nodemon": { "version": "3.0.2", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.2.tgz", + "integrity": "sha512-9qIN2LNTrEzpOPBaWHTm4Asy1LxXLSickZStAQ4IZe7zsoIpD/A7LWxhZV3t4Zu352uBcqVnRsDXSMR2Sc3lTA==", "dev": true, - "license": "MIT", "dependencies": { "chokidar": "^3.5.2", "debug": "^4", @@ -113057,16 +113991,18 @@ }, "packages/ddex/node_modules/nodemon/node_modules/has-flag": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "packages/ddex/node_modules/nodemon/node_modules/supports-color": { "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -113076,7 +114012,8 @@ }, "packages/ddex/node_modules/on-finished": { "version": "2.4.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dependencies": { "ee-first": "1.1.1" }, @@ -113110,12 +114047,14 @@ }, "packages/ddex/node_modules/path-to-regexp": { "version": "0.1.7", - "license": "MIT" + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, "packages/ddex/node_modules/prettier": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true, - "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -113128,7 +114067,8 @@ }, "packages/ddex/node_modules/qs": { "version": "6.11.0", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", "dependencies": { "side-channel": "^1.0.4" }, @@ -113141,7 +114081,8 @@ }, "packages/ddex/node_modules/raw-body": { "version": "2.5.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -113154,7 +114095,8 @@ }, "packages/ddex/node_modules/react-merge-refs": { "version": "2.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-merge-refs/-/react-merge-refs-2.1.1.tgz", + "integrity": "sha512-jLQXJ/URln51zskhgppGJ2ub7b2WFKGq3cl3NYKtlHoTG+dN2q7EzWrn3hN3EgPsTMvpR9tpq5ijdp7YwFZkag==", "funding": { "type": "github", "url": "https://github.com/sponsors/gregberge" @@ -113162,7 +114104,8 @@ }, "packages/ddex/node_modules/react-router": { "version": "6.20.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.20.0.tgz", + "integrity": "sha512-pVvzsSsgUxxtuNfTHC4IxjATs10UaAtvLGVSA1tbUE4GDaOSU1Esu2xF5nWLz7KPiMuW8BJWuPFdlGYJ7/rW0w==", "dependencies": { "@remix-run/router": "1.13.0" }, @@ -113175,7 +114118,8 @@ }, "packages/ddex/node_modules/react-router-dom": { "version": "6.20.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.20.0.tgz", + "integrity": "sha512-CbcKjEyiSVpA6UtCHOIYLUYn/UJfwzp55va4yEfpk7JBN3GPqWfHrdLkAvNCcpXr8QoihcDMuk0dzWZxtlB/mQ==", "dependencies": { "@remix-run/router": "1.13.0", "react-router": "6.20.0" @@ -113190,7 +114134,8 @@ }, "packages/ddex/node_modules/react-use": { "version": "17.4.2", - "license": "Unlicense", + "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.4.2.tgz", + "integrity": "sha512-1jPtmWLD8OJJNYCdYLJEH/HM+bPDfJuyGwCYeJFgPmWY8ttwpgZnW5QnzgM55CYUByUiTjHxsGOnEpLl6yQaoQ==", "dependencies": { "@types/js-cookie": "^2.2.6", "@xobotyi/scrollbar-width": "^1.9.5", @@ -113214,8 +114159,9 @@ }, "packages/ddex/node_modules/readdirp": { "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, - "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -113225,8 +114171,9 @@ }, "packages/ddex/node_modules/rollup": { "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "dev": true, - "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -113240,8 +114187,9 @@ }, "packages/ddex/node_modules/semver": { "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -113254,7 +114202,8 @@ }, "packages/ddex/node_modules/send": { "version": "0.18.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -113276,18 +114225,21 @@ }, "packages/ddex/node_modules/send/node_modules/debug": { "version": "2.6.9", - "license": "MIT", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dependencies": { "ms": "2.0.0" } }, "packages/ddex/node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "packages/ddex/node_modules/serve-static": { "version": "1.15.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -113300,7 +114252,8 @@ }, "packages/ddex/node_modules/setprototypeof": { "version": "1.2.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "packages/ddex/node_modules/shebang-command": { "version": "2.0.0", @@ -113325,20 +114278,24 @@ }, "packages/ddex/node_modules/statuses": { "version": "2.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "engines": { "node": ">= 0.8" } }, "packages/ddex/node_modules/streamsearch": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", "engines": { "node": ">=10.0.0" } }, "packages/ddex/node_modules/stylis": { "version": "4.3.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz", + "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==" }, "packages/ddex/node_modules/supports-color": { "version": "7.2.0", @@ -113354,8 +114311,9 @@ }, "packages/ddex/node_modules/synckit": { "version": "0.8.8", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz", + "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==", "dev": true, - "license": "MIT", "dependencies": { "@pkgr/core": "^0.1.0", "tslib": "^2.6.2" @@ -113369,8 +114327,9 @@ }, "packages/ddex/node_modules/to-regex-range": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -113380,11 +114339,13 @@ }, "packages/ddex/node_modules/tr46": { "version": "0.0.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "packages/ddex/node_modules/tslib": { "version": "2.6.2", - "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "packages/ddex/node_modules/type-fest": { "version": "0.20.2", @@ -113400,8 +114361,9 @@ }, "packages/ddex/node_modules/typescript": { "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -113412,19 +114374,21 @@ }, "packages/ddex/node_modules/uuid": { "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], - "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } }, "packages/ddex/node_modules/vite": { "version": "4.4.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.5.tgz", + "integrity": "sha512-4m5kEtAWHYr0O1Fu7rZp64CfO1PsRGZlD3TAB32UmQlpd7qg15VF7ROqGN5CyqN7HFuwr7ICNM2+fDWRqFEKaA==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.26", @@ -113477,8 +114441,9 @@ }, "packages/ddex/node_modules/vite-tsconfig-paths": { "version": "4.2.2", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.2.tgz", + "integrity": "sha512-dq0FjyxHHDnp0uS3P12WEOX2W7NeuLzX9AWP38D7Zw2CTbFErapwQVlCiT5DMJcVWKQ1MMdTe92PZl/rBQ7qcw==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^4.1.1", "globrex": "^0.1.2", @@ -113495,7 +114460,8 @@ }, "packages/ddex/node_modules/web3": { "version": "4.3.0", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3/-/web3-4.3.0.tgz", + "integrity": "sha512-YiLCsb5wmgJlSxRLzt7Z7H+CmlVVIKD8VaUQaZ+xKVG3Q7CpsO5Z6jmeKnlr6M9c6fDDsDnRM6G8g+nchZehbA==", "dependencies": { "web3-core": "^4.3.2", "web3-errors": "^1.1.4", @@ -113521,7 +114487,8 @@ }, "packages/ddex/node_modules/web3-core": { "version": "4.3.2", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-4.3.2.tgz", + "integrity": "sha512-uIMVd/j4BgOnwfpY8ZT+QKubOyM4xohEhFZXz9xB8wimXWMMlYVlIK/TbfHqFolS9uOerdSGhsMbcK9lETae8g==", "dependencies": { "web3-errors": "^1.1.4", "web3-eth-accounts": "^4.1.0", @@ -113541,20 +114508,21 @@ } }, "packages/ddex/node_modules/web3-eth": { - "version": "4.4.0", - "license": "LGPL-3.0", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-4.3.1.tgz", + "integrity": "sha512-zJir3GOXooHQT85JB8SrufE+Voo5TtXdjhf1D8IGXmxM8MrhI8AT+Pgt4siBTupJcu5hF17iGmTP/Nj2XnaibQ==", "dependencies": { "setimmediate": "^1.0.5", - "web3-core": "^4.3.2", - "web3-errors": "^1.1.4", - "web3-eth-abi": "^4.2.0", - "web3-eth-accounts": "^4.1.1", + "web3-core": "^4.3.0", + "web3-errors": "^1.1.3", + "web3-eth-abi": "^4.1.4", + "web3-eth-accounts": "^4.1.0", "web3-net": "^4.0.7", "web3-providers-ws": "^4.0.7", - "web3-rpc-methods": "^1.1.4", - "web3-types": "^1.3.1", - "web3-utils": "^4.1.1", - "web3-validator": "^2.0.4" + "web3-rpc-methods": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -113562,14 +114530,15 @@ } }, "packages/ddex/node_modules/web3-eth-abi": { - "version": "4.2.0", - "license": "LGPL-3.0", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-4.1.4.tgz", + "integrity": "sha512-YLOBVVxxxLYKXjaiwZjEWYEnkMmmrm0nswZsvzSsINy/UgbWbzfoiZU+zn4YNWIEhORhx1p37iS3u/dP6VyC2w==", "dependencies": { "abitype": "0.7.1", - "web3-errors": "^1.1.4", - "web3-types": "^1.3.1", - "web3-utils": "^4.1.1", - "web3-validator": "^2.0.4" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -113577,16 +114546,17 @@ } }, "packages/ddex/node_modules/web3-eth-accounts": { - "version": "4.1.1", - "license": "LGPL-3.0", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-4.1.0.tgz", + "integrity": "sha512-UFtAsOANsvihTQ6SSvOKguupmQkResyR9M9JNuOxYpKh7+3W+sTnbLXw2UbOSYIsKlc1mpqqW9bVr1SjqHDpUQ==", "dependencies": { "@ethereumjs/rlp": "^4.0.1", "crc-32": "^1.2.2", "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.4", - "web3-types": "^1.3.1", - "web3-utils": "^4.1.1", - "web3-validator": "^2.0.4" + "web3-errors": "^1.1.3", + "web3-types": "^1.3.0", + "web3-utils": "^4.0.7", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -113594,16 +114564,17 @@ } }, "packages/ddex/node_modules/web3-eth-contract": { - "version": "4.2.0", - "license": "LGPL-3.0", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-4.1.4.tgz", + "integrity": "sha512-tJ4z6QLgtu8EQu2sXnLA7g427oxmngnbAUh+9kJKbP6Yep/oe+z79PqJv7H3MwqwUNW9T+/FeB2PnSQSyxz6ig==", "dependencies": { "web3-core": "^4.3.2", "web3-errors": "^1.1.4", - "web3-eth": "^4.4.0", - "web3-eth-abi": "^4.2.0", + "web3-eth": "^4.3.1", + "web3-eth-abi": "^4.1.4", "web3-types": "^1.3.1", - "web3-utils": "^4.1.1", - "web3-validator": "^2.0.4" + "web3-utils": "^4.1.0", + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -113612,7 +114583,8 @@ }, "packages/ddex/node_modules/web3-eth-ens": { "version": "4.0.8", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-4.0.8.tgz", + "integrity": "sha512-nj0JfeD45BbzVJcVYpUJnSo8iwDcY9CQ7CZhhIVVOFjvpMAPw0zEwjTvZEIQyCW61OoDG9xcBzwxe2tZoYhMRw==", "dependencies": { "@adraffy/ens-normalize": "^1.8.8", "web3-core": "^4.3.0", @@ -113631,7 +114603,8 @@ }, "packages/ddex/node_modules/web3-eth-iban": { "version": "4.0.7", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-4.0.7.tgz", + "integrity": "sha512-8weKLa9KuKRzibC87vNLdkinpUE30gn0IGY027F8doeJdcPUfsa4IlBgNC4k4HLBembBB2CTU0Kr/HAOqMeYVQ==", "dependencies": { "web3-errors": "^1.1.3", "web3-types": "^1.3.0", @@ -113645,7 +114618,8 @@ }, "packages/ddex/node_modules/web3-eth-personal": { "version": "4.0.8", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-4.0.8.tgz", + "integrity": "sha512-sXeyLKJ7ddQdMxz1BZkAwImjqh7OmKxhXoBNF3isDmD4QDpMIwv/t237S3q4Z0sZQamPa/pHebJRWVuvP8jZdw==", "dependencies": { "web3-core": "^4.3.0", "web3-eth": "^4.3.1", @@ -113661,7 +114635,8 @@ }, "packages/ddex/node_modules/web3-net": { "version": "4.0.7", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-4.0.7.tgz", + "integrity": "sha512-SzEaXFrBjY25iQGk5myaOfO9ZyfTwQEa4l4Ps4HDNVMibgZji3WPzpjq8zomVHMwi8bRp6VV7YS71eEsX7zLow==", "dependencies": { "web3-core": "^4.3.0", "web3-rpc-methods": "^1.1.3", @@ -113675,7 +114650,8 @@ }, "packages/ddex/node_modules/web3-providers-http": { "version": "4.1.0", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3-providers-http/-/web3-providers-http-4.1.0.tgz", + "integrity": "sha512-6qRUGAhJfVQM41E5t+re5IHYmb5hSaLc02BE2MaRQsz2xKA6RjmHpOA5h/+ojJxEpI9NI2CrfDKOAgtJfoUJQg==", "dependencies": { "cross-fetch": "^4.0.0", "web3-errors": "^1.1.3", @@ -113689,7 +114665,8 @@ }, "packages/ddex/node_modules/web3-providers-ipc": { "version": "4.0.7", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3-providers-ipc/-/web3-providers-ipc-4.0.7.tgz", + "integrity": "sha512-YbNqY4zUvIaK2MHr1lQFE53/8t/ejHtJchrWn9zVbFMGXlTsOAbNoIoZWROrg1v+hCBvT2c9z8xt7e/+uz5p1g==", "optional": true, "dependencies": { "web3-errors": "^1.1.3", @@ -113703,7 +114680,8 @@ }, "packages/ddex/node_modules/web3-providers-ws": { "version": "4.0.7", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3-providers-ws/-/web3-providers-ws-4.0.7.tgz", + "integrity": "sha512-n4Dal9/rQWjS7d6LjyEPM2R458V8blRm0eLJupDEJOOIBhGYlxw5/4FthZZ/cqB7y/sLVi7K09DdYx2MeRtU5w==", "dependencies": { "@types/ws": "8.5.3", "isomorphic-ws": "^5.0.0", @@ -113719,7 +114697,8 @@ }, "packages/ddex/node_modules/web3-rpc-methods": { "version": "1.1.4", - "license": "LGPL-3.0", + "resolved": "https://registry.npmjs.org/web3-rpc-methods/-/web3-rpc-methods-1.1.4.tgz", + "integrity": "sha512-LTFNg4LFaeU8K9ecuT8fHDp/LOXyxCneeZjCrRYIW1u82Ly52SrY55FIzMIISGoG/iT5Wh7UiHOB3CQsWLBmbQ==", "dependencies": { "web3-core": "^4.3.2", "web3-types": "^1.3.1", @@ -113731,28 +114710,14 @@ } }, "packages/ddex/node_modules/web3-utils": { - "version": "4.1.1", - "license": "LGPL-3.0", - "dependencies": { - "ethereum-cryptography": "^2.0.0", - "web3-errors": "^1.1.4", - "web3-types": "^1.3.1", - "web3-validator": "^2.0.4" - }, - "engines": { - "node": ">=14", - "npm": ">=6.12.0" - } - }, - "packages/ddex/node_modules/web3-validator": { - "version": "2.0.4", - "license": "LGPL-3.0", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-4.1.0.tgz", + "integrity": "sha512-+VJWR6FtCsgwuJr5tvSvQlSEG06586df8h2CxGc9tcNtIDyJKNkSDDWJkdNPvyDhhXFzQYFh8QOGymD1CIP6fw==", "dependencies": { "ethereum-cryptography": "^2.0.0", - "util": "^0.12.5", "web3-errors": "^1.1.4", "web3-types": "^1.3.1", - "zod": "^3.21.4" + "web3-validator": "^2.0.3" }, "engines": { "node": ">=14", @@ -113761,11 +114726,13 @@ }, "packages/ddex/node_modules/webidl-conversions": { "version": "3.0.1", - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "packages/ddex/node_modules/whatwg-url": { "version": "5.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -113773,7 +114740,8 @@ }, "packages/ddex/node_modules/ws": { "version": "8.16.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "engines": { "node": ">=10.0.0" }, @@ -113797,7 +114765,8 @@ }, "packages/ddex/node_modules/zod": { "version": "3.22.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz", + "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==", "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -113872,6 +114841,22 @@ "@babel/highlight": "^7.10.4" } }, + "packages/discovery-provider/plugins/pedalboard/apps/app-template/node_modules/@esbuild/linux-loong64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz", + "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "packages/discovery-provider/plugins/pedalboard/apps/app-template/node_modules/@eslint/eslintrc": { "version": "0.4.3", "dev": true, @@ -116096,6 +117081,22 @@ "@babel/highlight": "^7.10.4" } }, + "packages/discovery-provider/plugins/pedalboard/apps/relay/node_modules/@esbuild/linux-loong64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz", + "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "packages/discovery-provider/plugins/pedalboard/apps/relay/node_modules/@eslint/eslintrc": { "version": "0.4.3", "dev": true, @@ -118655,10 +119656,8 @@ }, "packages/discovery-provider/plugins/pedalboard/apps/relay/node_modules/redis": { "version": "4.6.11", - "license": "MIT", - "workspaces": [ - "./packages/*" - ], + "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.11.tgz", + "integrity": "sha512-kg1Lt4NZLYkAjPOj/WcyIGWfZfnyfKo1Wg9YKVSlzhFwxpFIl3LYI8BWy1Ab963LLDsTz2+OwdsesHKljB3WMQ==", "dependencies": { "@redis/bloom": "1.2.0", "@redis/client": "1.5.12", @@ -119056,6 +120055,22 @@ "@babel/highlight": "^7.10.4" } }, + "packages/discovery-provider/plugins/pedalboard/apps/sla-auditor/node_modules/@esbuild/linux-loong64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz", + "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "packages/discovery-provider/plugins/pedalboard/apps/sla-auditor/node_modules/@eslint/eslintrc": { "version": "0.4.3", "dev": true, @@ -121542,6 +122557,54 @@ "esbuild-windows-arm64": "0.14.38" } }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-android-64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.38.tgz", + "integrity": "sha512-aRFxR3scRKkbmNuGAK+Gee3+yFxkTJO/cx83Dkyzo4CnQl/2zVSurtG6+G86EQIZ+w+VYngVyK7P3HyTBKu3nw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-android-arm64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.38.tgz", + "integrity": "sha512-L2NgQRWuHFI89IIZIlpAcINy9FvBk6xFVZ7xGdOwIm8VyhX1vNCEqUJO3DPSSy945Gzdg98cxtNt8Grv1CsyhA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-darwin-64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.38.tgz", + "integrity": "sha512-5JJvgXkX87Pd1Og0u/NJuO7TSqAikAcQQ74gyJ87bqWRVeouky84ICoV4sN6VV53aTW+NE87qLdGY4QA2S7KNA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-darwin-arm64": { "version": "0.14.38", "cpu": [ @@ -121557,6 +122620,198 @@ "node": ">=12" } }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-freebsd-64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.38.tgz", + "integrity": "sha512-epnPbhZUt93xV5cgeY36ZxPXDsQeO55DppzsIgWM8vgiG/Rz+qYDLmh5ts3e+Ln1wA9dQ+nZmVHw+RjaW3I5Ig==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-freebsd-arm64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.38.tgz", + "integrity": "sha512-/9icXUYJWherhk+y5fjPI5yNUdFPtXHQlwP7/K/zg8t8lQdHVj20SqU9/udQmeUo5pDFHMYzcEFfJqgOVeKNNQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-32": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.38.tgz", + "integrity": "sha512-QfgfeNHRFvr2XeHFzP8kOZVnal3QvST3A0cgq32ZrHjSMFTdgXhMhmWdKzRXP/PKcfv3e2OW9tT9PpcjNvaq6g==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.38.tgz", + "integrity": "sha512-uuZHNmqcs+Bj1qiW9k/HZU3FtIHmYiuxZ/6Aa+/KHb/pFKr7R3aVqvxlAudYI9Fw3St0VCPfv7QBpUITSmBR1Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-arm": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.38.tgz", + "integrity": "sha512-FiFvQe8J3VKTDXG01JbvoVRXQ0x6UZwyrU4IaLBZeq39Bsbatd94Fuc3F1RGqPF5RbIWW7RvkVQjn79ejzysnA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-arm64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.38.tgz", + "integrity": "sha512-HlMGZTEsBrXrivr64eZ/EO0NQM8H8DuSENRok9d+Jtvq8hOLzrxfsAT9U94K3KOGk2XgCmkaI2KD8hX7F97lvA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-mips64le": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.38.tgz", + "integrity": "sha512-qd1dLf2v7QBiI5wwfil9j0HG/5YMFBAmMVmdeokbNAMbcg49p25t6IlJFXAeLzogv1AvgaXRXvgFNhScYEUXGQ==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-ppc64le": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.38.tgz", + "integrity": "sha512-mnbEm7o69gTl60jSuK+nn+pRsRHGtDPfzhrqEUXyCl7CTOCLtWN2bhK8bgsdp6J/2NyS/wHBjs1x8aBWwP2X9Q==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-riscv64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.38.tgz", + "integrity": "sha512-+p6YKYbuV72uikChRk14FSyNJZ4WfYkffj6Af0/Tw63/6TJX6TnIKE+6D3xtEc7DeDth1fjUOEqm+ApKFXbbVQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-linux-s390x": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.38.tgz", + "integrity": "sha512-0zUsiDkGJiMHxBQ7JDU8jbaanUY975CdOW1YDrurjrM0vWHfjv9tLQsW9GSyEb/heSK1L5gaweRjzfUVBFoybQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-netbsd-64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.38.tgz", + "integrity": "sha512-cljBAApVwkpnJZfnRVThpRBGzCi+a+V9Ofb1fVkKhtrPLDYlHLrSYGtmnoTVWDQdU516qYI8+wOgcGZ4XIZh0Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-openbsd-64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.38.tgz", + "integrity": "sha512-CDswYr2PWPGEPpLDUO50mL3WO/07EMjnZDNKpmaxUPsrW+kVM3LoAqr/CE8UbzugpEiflYqJsGPLirThRB18IQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-register": { "version": "3.3.2", "dev": true, @@ -121565,6 +122820,70 @@ "esbuild": ">=0.12 <1" } }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-sunos-64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.38.tgz", + "integrity": "sha512-2mfIoYW58gKcC3bck0j7lD3RZkqYA7MmujFYmSn9l6TiIcAMpuEvqksO+ntBgbLep/eyjpgdplF7b+4T9VJGOA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-windows-32": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.38.tgz", + "integrity": "sha512-L2BmEeFZATAvU+FJzJiRLFUP+d9RHN+QXpgaOrs2klshoAm1AE6Us4X6fS9k33Uy5SzScn2TpcgecbqJza1Hjw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-windows-64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.38.tgz", + "integrity": "sha512-Khy4wVmebnzue8aeSXLC+6clo/hRYeNIm0DyikoEqX+3w3rcvrhzpoix0S+MF9vzh6JFskkIGD7Zx47ODJNyCw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/esbuild-windows-arm64": { + "version": "0.14.38", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.38.tgz", + "integrity": "sha512-k3FGCNmHBkqdJXuJszdWciAH77PukEyDsdIryEHn9cKLQFxzhT39dSumeTuggaQcXY57UlmLGIkklWZo2qzHpw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "packages/discovery-provider/plugins/pedalboard/apps/solana-relay/node_modules/eslint": { "version": "7.32.0", "dev": true, @@ -122254,6 +123573,22 @@ "@babel/highlight": "^7.10.4" } }, + "packages/discovery-provider/plugins/pedalboard/apps/trending-challenge-rewards/node_modules/@esbuild/linux-loong64": { + "version": "0.14.54", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz", + "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, "packages/discovery-provider/plugins/pedalboard/apps/trending-challenge-rewards/node_modules/@eslint/eslintrc": { "version": "0.4.3", "dev": true, @@ -130017,8 +131352,9 @@ }, "packages/es-indexer/node_modules/@types/node": { "version": "17.0.29", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.29.tgz", + "integrity": "sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA==", + "dev": true }, "packages/es-indexer/node_modules/acorn": { "version": "8.11.2", @@ -130519,7 +131855,6 @@ "@emotion/styled": "11.11.0", "@radix-ui/react-slot": "1.0.2", "@react-spring/web": "9.7.2", - "@rollup/plugin-alias": "5.0.1", "@storybook/addon-a11y": "7.4.0", "@storybook/addon-actions": "7.4.2", "@storybook/addon-essentials": "7.4.2", @@ -130641,25 +131976,6 @@ "node": ">=10.10.0" } }, - "packages/harmony/node_modules/@rollup/plugin-alias": { - "version": "5.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "slash": "^4.0.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" - }, - "peerDependenciesMeta": { - "rollup": { - "optional": true - } - } - }, "packages/harmony/node_modules/@rollup/pluginutils": { "version": "4.2.1", "dev": true, @@ -130955,8 +132271,9 @@ }, "packages/harmony/node_modules/classnames": { "version": "2.5.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==", + "dev": true }, "packages/harmony/node_modules/cross-spawn": { "version": "7.0.3", @@ -131481,8 +132798,9 @@ }, "packages/harmony/node_modules/rollup": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.3.0.tgz", + "integrity": "sha512-scIi1NrKLDIYSPK66jjECtII7vIgdAMFmFo8h6qm++I6nN9qDSV35Ku6erzGVqYjx+lj+j5wkusRMr++8SyDZg==", "dev": true, - "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -131581,17 +132899,6 @@ "node": ">=8" } }, - "packages/harmony/node_modules/slash": { - "version": "4.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/harmony/node_modules/source-map": { "version": "0.6.1", "dev": true, @@ -134760,7 +136067,8 @@ }, "packages/libs/node_modules/@babel/core": { "version": "7.23.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz", + "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", @@ -134829,7 +136137,8 @@ }, "packages/libs/node_modules/@babel/helpers": { "version": "7.23.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.8.tgz", + "integrity": "sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==", "dependencies": { "@babel/template": "^7.22.15", "@babel/traverse": "^7.23.7", @@ -135039,7 +136348,8 @@ }, "packages/libs/node_modules/@babel/traverse": { "version": "7.23.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", + "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", "dependencies": { "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", @@ -135436,7 +136746,8 @@ }, "packages/libs/node_modules/cross-fetch": { "version": "4.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", + "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", "dependencies": { "node-fetch": "^2.6.12" } @@ -135941,7 +137252,8 @@ }, "packages/libs/node_modules/node-fetch": { "version": "2.7.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -136295,7 +137607,8 @@ }, "packages/libs/node_modules/tr46": { "version": "0.0.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "packages/libs/node_modules/ts-mocha": { "version": "9.0.2", @@ -136430,11 +137743,13 @@ }, "packages/libs/node_modules/webidl-conversions": { "version": "3.0.1", - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "packages/libs/node_modules/whatwg-url": { "version": "5.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -136664,7 +137979,6 @@ "babel-jest": "29.6.3", "babel-loader": "8.3.0", "babel-plugin-macros": "3.1.0", - "babel-plugin-module-resolver": "^5.0.0", "babel-plugin-transform-remove-console": "6.9.4", "detox": "20.12.1", "eslint": "8.56.0", @@ -137308,8 +138622,9 @@ }, "packages/mobile/node_modules/@storybook/addon-ondevice-actions": { "version": "6.5.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-ondevice-actions/-/addon-ondevice-actions-6.5.7.tgz", + "integrity": "sha512-Zrk75yQbJ3fOf/e5XROeBYfT/UYz24he+LWNicIajNTPRz+YhnOmWedWYF/vEVQ+exnAi3U4cFkX3qUq9blI3w==", "dev": true, - "license": "MIT", "dependencies": { "@storybook/addons": "^6.5.14", "@storybook/core-events": "^6.5.14", @@ -137323,13 +138638,15 @@ }, "packages/mobile/node_modules/@storybook/addon-ondevice-actions/node_modules/fast-deep-equal": { "version": "2.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==", + "dev": true }, "packages/mobile/node_modules/@storybook/addon-ondevice-backgrounds": { "version": "6.5.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-ondevice-backgrounds/-/addon-ondevice-backgrounds-6.5.7.tgz", + "integrity": "sha512-JY+kLkI+VGV9ry3oIdn9bNHzd/dE1X5F//LXppx8pcbqswgCrwIkuZJJQ3A7ppPr34YxtnGJptKdAId7FFpB3w==", "dev": true, - "license": "MIT", "dependencies": { "@storybook/addons": "^6.5.14", "@storybook/api": "^6.5.14", @@ -137345,8 +138662,9 @@ }, "packages/mobile/node_modules/@storybook/addon-ondevice-controls": { "version": "6.5.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-ondevice-controls/-/addon-ondevice-controls-6.5.7.tgz", + "integrity": "sha512-dy3d2D8TzEIGaEufS3mB3X7K0Wa5qBc6QEGE1b0S8ra9pa9Hw5YD43fk7xvwSJ1QIbOFCr7QWbfnB1c2QwyFSQ==", "dev": true, - "license": "MIT", "dependencies": { "@storybook/addons": "^6.5.14", "@storybook/client-logger": "^6.5.14", @@ -137369,8 +138687,9 @@ }, "packages/mobile/node_modules/@storybook/addon-ondevice-controls/node_modules/react-native-modal-datetime-picker": { "version": "14.0.1", + "resolved": "https://registry.npmjs.org/react-native-modal-datetime-picker/-/react-native-modal-datetime-picker-14.0.1.tgz", + "integrity": "sha512-wQt4Pjxt2jiTsVhLMG0E7WrRTYBEQx2d/nUrFVCbRqJ7lrXocXaT5UZsyMpV93TnKcyut62OprbO88wYq/vh0g==", "dev": true, - "license": "MIT", "dependencies": { "prop-types": "^15.7.2" }, @@ -137812,7 +139131,8 @@ }, "packages/mobile/node_modules/color": { "version": "4.2.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", "dependencies": { "color-convert": "^2.0.1", "color-string": "^1.9.0" @@ -138549,7 +139869,8 @@ }, "packages/mobile/node_modules/react-native-track-player": { "version": "4.0.1", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/react-native-track-player/-/react-native-track-player-4.0.1.tgz", + "integrity": "sha512-DpqKL4TQS0kGlHwEtmMrL++mdgWb+uc75eQiP3vfYSlgvAJjbXbkL9h+cofndSuq4TTCp8jclAK+hZKqtMw6+A==", "funding": { "url": "https://github.com/doublesymmetry/react-native-track-player?sponsor=1" }, @@ -144669,7 +145990,8 @@ }, "packages/trpc-server/node_modules/@elastic/elasticsearch": { "version": "8.11.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@elastic/elasticsearch/-/elasticsearch-8.11.0.tgz", + "integrity": "sha512-1UEQFdGLuKdROLJnMTjegasRM3X9INm/PVADoIVgdTfuv6DeJ17UMuNwYSkCrLrC0trLjjGV4YganpbJJX/VLg==", "dependencies": { "@elastic/transport": "^8.4.0", "tslib": "^2.4.0" @@ -144680,7 +146002,8 @@ }, "packages/trpc-server/node_modules/@elastic/transport": { "version": "8.4.0", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@elastic/transport/-/transport-8.4.0.tgz", + "integrity": "sha512-Yb3fDa7yGD0ca3uMbL64M3vM1cE5h5uHmBcTjkdB4VpCasRNKSd09iDpwqX8zX1tbBtxcaKYLceKthWvPeIxTw==", "dependencies": { "debug": "^4.3.4", "hpagent": "^1.0.0", @@ -144717,21 +146040,24 @@ }, "packages/trpc-server/node_modules/@types/cors": { "version": "2.8.13", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz", + "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } }, "packages/trpc-server/node_modules/@types/node": { "version": "18.16.16", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.16.tgz", + "integrity": "sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g==", + "dev": true }, "packages/trpc-server/node_modules/@types/swagger-ui-express": { "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.4.tgz", + "integrity": "sha512-h6dfIPFveCJKpStDtjrB+4pig4DAf9Uu2Z51RB7Fj3s6AifexmqhZxBoG50K/k3Afz7wyXsIAY5ZIDTlC2VjrQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/express": "*", "@types/serve-static": "*" @@ -145057,8 +146383,10 @@ }, "packages/trpc-server/node_modules/fsevents": { "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "license": "MIT", + "hasInstallScript": true, "optional": true, "os": [ "darwin" @@ -145191,17 +146519,6 @@ "version": "0.1.7", "license": "MIT" }, - "packages/trpc-server/node_modules/postgres": { - "version": "3.4.3", - "license": "Unlicense", - "engines": { - "node": ">=12" - }, - "funding": { - "type": "individual", - "url": "https://github.com/sponsors/porsager" - } - }, "packages/trpc-server/node_modules/qs": { "version": "6.11.0", "license": "BSD-3-Clause", @@ -145321,8 +146638,9 @@ }, "packages/trpc-server/node_modules/tsx": { "version": "3.12.7", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.7.tgz", + "integrity": "sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==", "dev": true, - "license": "MIT", "dependencies": { "@esbuild-kit/cjs-loader": "^2.4.2", "@esbuild-kit/core-utils": "^3.0.0", @@ -145572,22 +146890,25 @@ "typescript": "5.0.4", "typescript-plugin-css-modules": "^3.4.0", "url": "^0.11.0", - "vite": "^4.2.2", + "vite": "4.5.0", "vite-plugin-glslify": "2.0.2", "vite-plugin-svgr": "4.1.0", + "vite-tsconfig-paths": "4.2.1", "vitest": "0.34.6" } }, "packages/web/node_modules/@cloudflare/kv-asset-handler": { "version": "0.2.0", - "license": "MIT OR Apache-2.0", + "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.2.0.tgz", + "integrity": "sha512-MVbXLbTcAotOPUj0pAMhVtJ+3/kFkwJqc5qNOleOZTv6QkZZABDMS21dSrSlVswEHwrpWC03e4fWytjqKvuE2A==", "dependencies": { "mime": "^3.0.0" } }, "packages/web/node_modules/@cloudflare/kv-asset-handler/node_modules/mime": { "version": "3.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", + "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", "bin": { "mime": "cli.js" }, @@ -145597,8 +146918,9 @@ }, "packages/web/node_modules/@electron/get": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", + "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^4.1.1", "env-paths": "^2.2.0", @@ -145617,8 +146939,9 @@ }, "packages/web/node_modules/@electron/notarize": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.0.tgz", + "integrity": "sha512-Sf7RG47rafeGuUm+kLEbTXMN8XZeYXN70dMBstrcgiykxCq3SLl1uqxFWndxSI1LfMqv4Eq9PTDHLPwiya31Kg==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^4.1.1", "fs-extra": "^9.0.1", @@ -145630,8 +146953,9 @@ }, "packages/web/node_modules/@electron/notarize/node_modules/fs-extra": { "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, - "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -145644,8 +146968,9 @@ }, "packages/web/node_modules/@electron/universal": { "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.4.1.tgz", + "integrity": "sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==", "dev": true, - "license": "MIT", "dependencies": { "@electron/asar": "^3.2.1", "@malept/cross-spawn-promise": "^1.1.0", @@ -145661,8 +146986,9 @@ }, "packages/web/node_modules/@electron/universal/node_modules/fs-extra": { "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, - "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -145673,6 +146999,576 @@ "node": ">=10" } }, + "packages/web/node_modules/@ethersproject/abi": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", + "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/abstract-provider": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", + "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/networks": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/web": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/abstract-signer": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", + "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/address": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", + "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/rlp": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/base64": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", + "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/basex": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.7.0.tgz", + "integrity": "sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/properties": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/contracts": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.7.0.tgz", + "integrity": "sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abi": "^5.7.0", + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/transactions": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/hash": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", + "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/base64": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/hdnode": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.7.0.tgz", + "integrity": "sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/basex": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/pbkdf2": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/sha2": "^5.7.0", + "@ethersproject/signing-key": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/wordlists": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/json-wallets": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz", + "integrity": "sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/hdnode": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/pbkdf2": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/random": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "aes-js": "3.0.0", + "scrypt-js": "3.0.1" + } + }, + "packages/web/node_modules/@ethersproject/networks": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", + "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/logger": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/pbkdf2": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz", + "integrity": "sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/sha2": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/properties": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", + "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/logger": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/providers": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.7.2.tgz", + "integrity": "sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/base64": "^5.7.0", + "@ethersproject/basex": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/networks": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/random": "^5.7.0", + "@ethersproject/rlp": "^5.7.0", + "@ethersproject/sha2": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/web": "^5.7.0", + "bech32": "1.1.4", + "ws": "7.4.6" + } + }, + "packages/web/node_modules/@ethersproject/random": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.7.0.tgz", + "integrity": "sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/rlp": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", + "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/signing-key": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", + "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "bn.js": "^5.2.1", + "elliptic": "6.5.4", + "hash.js": "1.1.7" + } + }, + "packages/web/node_modules/@ethersproject/signing-key/node_modules/bn.js": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "dev": true + }, + "packages/web/node_modules/@ethersproject/solidity": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.7.0.tgz", + "integrity": "sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/sha2": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/transactions": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", + "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/rlp": "^5.7.0", + "@ethersproject/signing-key": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/units": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.7.0.tgz", + "integrity": "sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/logger": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/wallet": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.7.0.tgz", + "integrity": "sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/hdnode": "^5.7.0", + "@ethersproject/json-wallets": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/random": "^5.7.0", + "@ethersproject/signing-key": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/wordlists": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/web": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", + "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/base64": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "packages/web/node_modules/@ethersproject/wordlists": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.7.0.tgz", + "integrity": "sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, "packages/web/node_modules/@humanwhocodes/config-array": { "version": "0.9.5", "dev": true, @@ -146148,18 +148044,21 @@ }, "packages/web/node_modules/@project-serum/anchor/node_modules/bn.js": { "version": "5.2.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==" }, "packages/web/node_modules/@project-serum/anchor/node_modules/cross-fetch": { "version": "3.1.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", + "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", "dependencies": { "node-fetch": "^2.6.12" } }, "packages/web/node_modules/@project-serum/anchor/node_modules/node-fetch": { "version": "2.7.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -146177,8 +148076,9 @@ }, "packages/web/node_modules/@sindresorhus/is": { "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -146188,8 +148088,9 @@ }, "packages/web/node_modules/@szmarczak/http-timer": { "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", + "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", "dev": true, - "license": "MIT", "dependencies": { "defer-to-connect": "^2.0.0" }, @@ -146213,8 +148114,15 @@ }, "packages/web/node_modules/7zip-bin": { "version": "5.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", + "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==", + "dev": true + }, + "packages/web/node_modules/aes-js": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", + "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==", + "dev": true }, "packages/web/node_modules/ajv": { "version": "7.2.4", @@ -146275,8 +148183,9 @@ }, "packages/web/node_modules/app-builder-lib": { "version": "24.9.1", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.9.1.tgz", + "integrity": "sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g==", "dev": true, - "license": "MIT", "dependencies": { "@develar/schema-utils": "~2.6.5", "@electron/notarize": "2.1.0", @@ -146313,8 +148222,9 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/@electron/notarize": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.1.0.tgz", + "integrity": "sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^4.1.1", "fs-extra": "^9.0.1", @@ -146326,8 +148236,9 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/@electron/notarize/node_modules/fs-extra": { "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, - "license": "MIT", "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -146340,8 +148251,9 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, - "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -146353,8 +148265,9 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/js-yaml": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -146364,8 +148277,9 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/minimatch": { "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -146375,8 +148289,9 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/mkdirp": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, - "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" }, @@ -146386,8 +148301,9 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/semver": { "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -146400,8 +148316,9 @@ }, "packages/web/node_modules/app-builder-lib/node_modules/tar": { "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", + "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", "dev": true, - "license": "ISC", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -146418,22 +148335,54 @@ "version": "2.0.1", "license": "Python-2.0" }, + "packages/web/node_modules/armada-cli": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/armada-cli/-/armada-cli-0.4.0.tgz", + "integrity": "sha512-yXNGmimBG0xUYXmFHi5VimJTJM4HrkoM/v2tks2zL8J1tky0cuHa2auc4TWqWPrS5nxkQ/xaJlBEZcQHcV6tpg==", + "dev": true, + "dependencies": { + "@ethersproject/constants": "^5.7.0", + "@ledgerhq/hw-app-eth": "^6.29.10", + "@ledgerhq/hw-transport-node-hid": "^6.27.6", + "@oclif/core": "^1.20.2", + "@oclif/plugin-help": "^5.1.17", + "ethers": "^5.7.1", + "inquirer": "^7.1.4", + "keytar": "^7.9.0", + "tar": "^6.1.11", + "yargs": "^17.6.0" + }, + "bin": { + "armada": "bin/run" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "packages/web/node_modules/bech32": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", + "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==", + "dev": true + }, "packages/web/node_modules/body-scroll-lock": { "version": "4.0.0-beta.0", "license": "MIT" }, "packages/web/node_modules/brace-expansion": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, "packages/web/node_modules/builder-util": { "version": "24.8.1", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.8.1.tgz", + "integrity": "sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw==", "dev": true, - "license": "MIT", "dependencies": { "@types/debug": "^4.1.6", "7zip-bin": "~5.2.0", @@ -146455,7 +148404,8 @@ }, "packages/web/node_modules/builder-util-runtime": { "version": "9.2.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz", + "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==", "dependencies": { "debug": "^4.3.4", "sax": "^1.2.4" @@ -146466,8 +148416,9 @@ }, "packages/web/node_modules/builder-util/node_modules/cross-spawn": { "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -146479,8 +148430,9 @@ }, "packages/web/node_modules/builder-util/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, - "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -146492,8 +148444,9 @@ }, "packages/web/node_modules/builder-util/node_modules/js-yaml": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -146503,16 +148456,18 @@ }, "packages/web/node_modules/cacheable-lookup": { "version": "5.0.4", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", + "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10.6.0" } }, "packages/web/node_modules/cacheable-request": { "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", + "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", "dev": true, - "license": "MIT", "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -146553,14 +148508,16 @@ }, "packages/web/node_modules/cross-fetch": { "version": "4.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", + "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==", "dependencies": { "node-fetch": "^2.6.12" } }, "packages/web/node_modules/cross-fetch/node_modules/node-fetch": { "version": "2.7.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -146585,16 +148542,18 @@ }, "packages/web/node_modules/defer-to-connect": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" } }, "packages/web/node_modules/dir-compare": { "version": "3.3.0", + "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-3.3.0.tgz", + "integrity": "sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==", "dev": true, - "license": "MIT", "dependencies": { "buffer-equal": "^1.0.0", "minimatch": "^3.0.4" @@ -146602,8 +148561,9 @@ }, "packages/web/node_modules/dmg-builder": { "version": "24.9.1", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.9.1.tgz", + "integrity": "sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ==", "dev": true, - "license": "MIT", "dependencies": { "app-builder-lib": "24.9.1", "builder-util": "24.8.1", @@ -146618,8 +148578,9 @@ }, "packages/web/node_modules/dmg-builder/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, - "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -146631,8 +148592,9 @@ }, "packages/web/node_modules/dmg-builder/node_modules/js-yaml": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -146642,17 +148604,19 @@ }, "packages/web/node_modules/dotenv": { "version": "9.0.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz", + "integrity": "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=10" } }, "packages/web/node_modules/electron": { "version": "28.1.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-28.1.0.tgz", + "integrity": "sha512-82Y7o4PSWPn1o/aVwYPsgmBw6Gyf2lVHpaBu3Ef8LrLWXxytg7ZRZr/RtDqEMOzQp3+mcuy3huH84MyjdmP50Q==", "dev": true, "hasInstallScript": true, - "license": "MIT", "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^18.11.18", @@ -146667,8 +148631,9 @@ }, "packages/web/node_modules/electron-builder": { "version": "24.9.1", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.9.1.tgz", + "integrity": "sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg==", "dev": true, - "license": "MIT", "dependencies": { "app-builder-lib": "24.9.1", "builder-util": "24.8.1", @@ -146692,8 +148657,9 @@ }, "packages/web/node_modules/electron-builder/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, - "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -146705,15 +148671,17 @@ }, "packages/web/node_modules/electron-log": { "version": "5.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.3.tgz", + "integrity": "sha512-jUgAuRjfpCD9tmH1F6fb195YsFfM/DkqkZLhFeo0VAAstantn11bxmgx63uE6KG/JljHG7sIkgM2QEjDimJI0g==", "engines": { "node": ">= 14" } }, "packages/web/node_modules/electron-publish": { "version": "24.8.1", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.8.1.tgz", + "integrity": "sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw==", "dev": true, - "license": "MIT", "dependencies": { "@types/fs-extra": "^9.0.11", "builder-util": "24.8.1", @@ -146726,8 +148694,9 @@ }, "packages/web/node_modules/electron-publish/node_modules/fs-extra": { "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dev": true, - "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -146739,7 +148708,8 @@ }, "packages/web/node_modules/electron-updater": { "version": "6.1.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.7.tgz", + "integrity": "sha512-SNOhYizjkm4ET+Y8ilJyUzcVsFJDtINzVN1TyHnZeMidZEG3YoBebMyXc/J6WSiXdUaOjC7ngekN6rNp6ardHA==", "dependencies": { "builder-util-runtime": "9.2.3", "fs-extra": "^10.1.0", @@ -146753,7 +148723,8 @@ }, "packages/web/node_modules/electron-updater/node_modules/fs-extra": { "version": "10.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -146765,7 +148736,8 @@ }, "packages/web/node_modules/electron-updater/node_modules/js-yaml": { "version": "4.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dependencies": { "argparse": "^2.0.1" }, @@ -146775,7 +148747,8 @@ }, "packages/web/node_modules/electron-updater/node_modules/semver": { "version": "7.5.4", - "license": "ISC", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -146788,8 +148761,9 @@ }, "packages/web/node_modules/electron/node_modules/@types/node": { "version": "18.19.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.4.tgz", + "integrity": "sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A==", "dev": true, - "license": "MIT", "dependencies": { "undici-types": "~5.26.4" } @@ -146929,6 +148903,54 @@ "dev": true, "license": "MIT" }, + "packages/web/node_modules/ethers": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.7.2.tgz", + "integrity": "sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abi": "5.7.0", + "@ethersproject/abstract-provider": "5.7.0", + "@ethersproject/abstract-signer": "5.7.0", + "@ethersproject/address": "5.7.0", + "@ethersproject/base64": "5.7.0", + "@ethersproject/basex": "5.7.0", + "@ethersproject/bignumber": "5.7.0", + "@ethersproject/bytes": "5.7.0", + "@ethersproject/constants": "5.7.0", + "@ethersproject/contracts": "5.7.0", + "@ethersproject/hash": "5.7.0", + "@ethersproject/hdnode": "5.7.0", + "@ethersproject/json-wallets": "5.7.0", + "@ethersproject/keccak256": "5.7.0", + "@ethersproject/logger": "5.7.0", + "@ethersproject/networks": "5.7.1", + "@ethersproject/pbkdf2": "5.7.0", + "@ethersproject/properties": "5.7.0", + "@ethersproject/providers": "5.7.2", + "@ethersproject/random": "5.7.0", + "@ethersproject/rlp": "5.7.0", + "@ethersproject/sha2": "5.7.0", + "@ethersproject/signing-key": "5.7.0", + "@ethersproject/solidity": "5.7.0", + "@ethersproject/strings": "5.7.0", + "@ethersproject/transactions": "5.7.0", + "@ethersproject/units": "5.7.0", + "@ethersproject/wallet": "5.7.0", + "@ethersproject/web": "5.7.1", + "@ethersproject/wordlists": "5.7.0" + } + }, "packages/web/node_modules/file-type": { "version": "9.0.0", "license": "MIT", @@ -146938,8 +148960,9 @@ }, "packages/web/node_modules/form-data": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, - "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -146987,8 +149010,9 @@ }, "packages/web/node_modules/got": { "version": "11.8.6", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", "dev": true, - "license": "MIT", "dependencies": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -147011,8 +149035,9 @@ }, "packages/web/node_modules/got/node_modules/decompress-response": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "dev": true, - "license": "MIT", "dependencies": { "mimic-response": "^3.1.0" }, @@ -147025,8 +149050,9 @@ }, "packages/web/node_modules/http2-wrapper": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", + "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", "dev": true, - "license": "MIT", "dependencies": { "quick-lru": "^5.1.1", "resolve-alpn": "^1.0.0" @@ -147037,8 +149063,9 @@ }, "packages/web/node_modules/iconv-lite": { "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, - "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -147046,10 +149073,35 @@ "node": ">=0.10.0" } }, + "packages/web/node_modules/inquirer": { + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", + "dev": true, + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.19", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "engines": { + "node": ">=8.0.0" + } + }, "packages/web/node_modules/isbinaryfile": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.0.tgz", + "integrity": "sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 14.0.0" }, @@ -147082,7 +149134,8 @@ }, "packages/web/node_modules/jsonfile": { "version": "6.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dependencies": { "universalify": "^2.0.0" }, @@ -147092,15 +149145,17 @@ }, "packages/web/node_modules/lowercase-keys": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "packages/web/node_modules/lru-cache": { "version": "6.0.0", - "license": "ISC", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dependencies": { "yallist": "^4.0.0" }, @@ -147110,8 +149165,9 @@ }, "packages/web/node_modules/mimic-response": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -147125,8 +149181,9 @@ }, "packages/web/node_modules/minipass": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, - "license": "ISC", "engines": { "node": ">=8" } @@ -147143,8 +149200,9 @@ }, "packages/web/node_modules/normalize-url": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -147154,8 +149212,9 @@ }, "packages/web/node_modules/p-cancelable": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", + "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -147185,8 +149244,9 @@ }, "packages/web/node_modules/quick-lru": { "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -147220,8 +149280,9 @@ }, "packages/web/node_modules/read-config-file": { "version": "6.3.2", + "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz", + "integrity": "sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==", "dev": true, - "license": "MIT", "dependencies": { "config-file-ts": "^0.2.4", "dotenv": "^9.0.2", @@ -147236,8 +149297,9 @@ }, "packages/web/node_modules/read-config-file/node_modules/js-yaml": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -147247,8 +149309,9 @@ }, "packages/web/node_modules/responselike": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", + "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", "dev": true, - "license": "MIT", "dependencies": { "lowercase-keys": "^2.0.0" }, @@ -147256,9 +149319,28 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "packages/web/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "packages/web/node_modules/rxjs/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "packages/web/node_modules/sax": { "version": "1.3.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", + "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==" }, "packages/web/node_modules/shebang-command": { "version": "2.0.0", @@ -147306,7 +149388,8 @@ }, "packages/web/node_modules/tr46": { "version": "0.0.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "packages/web/node_modules/tslib": { "version": "2.6.2", @@ -147324,26 +149407,51 @@ }, "packages/web/node_modules/universalify": { "version": "2.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", "engines": { "node": ">= 10.0.0" } }, "packages/web/node_modules/webidl-conversions": { "version": "3.0.1", - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "packages/web/node_modules/whatwg-url": { "version": "5.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, + "packages/web/node_modules/ws": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", + "dev": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "packages/web/node_modules/yallist": { "version": "4.0.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "protocol-dashboard": { "name": "audius-protocol-dashboard", @@ -147450,6 +149558,8 @@ }, "protocol-dashboard/node_modules/@audius/stems": { "version": "0.3.10", + "resolved": "https://registry.npmjs.org/@audius/stems/-/stems-0.3.10.tgz", + "integrity": "sha512-EbsdoVSSi8zKXOsAtZrJotNDS1LYVxKpdykgQ+qmQUSt4FjHZMhMObr/VYBDbVp60PIRFRWVLTSPQ8maXNUMKQ==", "dependencies": { "classnames": "^2.2.6", "lodash": "^4.17.20", @@ -147469,7 +149579,8 @@ }, "protocol-dashboard/node_modules/@audius/stems/node_modules/react-spring": { "version": "8.0.27", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.27.tgz", + "integrity": "sha512-nDpWBe3ZVezukNRandTeLSPcwwTMjNVu1IDq9qA/AMiUqHuRN4BeSWvKr3eIxxg1vtiYiOLy4FqdfCP5IoP77g==", "dependencies": { "@babel/runtime": "^7.3.1", "prop-types": "^15.5.8" @@ -147479,10 +149590,596 @@ "react-dom": ">= 16.8.0" } }, + "protocol-dashboard/node_modules/@ethersproject/abi": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.7.0.tgz", + "integrity": "sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/abstract-provider": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", + "integrity": "sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/networks": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/web": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/abstract-signer": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.7.0.tgz", + "integrity": "sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/address": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.7.0.tgz", + "integrity": "sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/rlp": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/base64": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.7.0.tgz", + "integrity": "sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/basex": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.7.0.tgz", + "integrity": "sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/properties": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/contracts": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.7.0.tgz", + "integrity": "sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abi": "^5.7.0", + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/transactions": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/hash": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.7.0.tgz", + "integrity": "sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/base64": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/hdnode": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.7.0.tgz", + "integrity": "sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/basex": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/pbkdf2": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/sha2": "^5.7.0", + "@ethersproject/signing-key": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/wordlists": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/json-wallets": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.7.0.tgz", + "integrity": "sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/hdnode": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/pbkdf2": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/random": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "aes-js": "3.0.0", + "scrypt-js": "3.0.1" + } + }, + "protocol-dashboard/node_modules/@ethersproject/networks": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.7.1.tgz", + "integrity": "sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/logger": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/pbkdf2": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.7.0.tgz", + "integrity": "sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/sha2": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/properties": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.7.0.tgz", + "integrity": "sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/logger": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/providers": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.7.2.tgz", + "integrity": "sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/base64": "^5.7.0", + "@ethersproject/basex": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/networks": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/random": "^5.7.0", + "@ethersproject/rlp": "^5.7.0", + "@ethersproject/sha2": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/web": "^5.7.0", + "bech32": "1.1.4", + "ws": "7.4.6" + } + }, + "protocol-dashboard/node_modules/@ethersproject/providers/node_modules/ws": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", + "dev": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "protocol-dashboard/node_modules/@ethersproject/random": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.7.0.tgz", + "integrity": "sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/rlp": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.7.0.tgz", + "integrity": "sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/signing-key": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.7.0.tgz", + "integrity": "sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "bn.js": "^5.2.1", + "elliptic": "6.5.4", + "hash.js": "1.1.7" + } + }, + "protocol-dashboard/node_modules/@ethersproject/solidity": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.7.0.tgz", + "integrity": "sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/sha2": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/transactions": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.7.0.tgz", + "integrity": "sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/rlp": "^5.7.0", + "@ethersproject/signing-key": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/units": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.7.0.tgz", + "integrity": "sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/constants": "^5.7.0", + "@ethersproject/logger": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/wallet": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.7.0.tgz", + "integrity": "sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/address": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/hdnode": "^5.7.0", + "@ethersproject/json-wallets": "^5.7.0", + "@ethersproject/keccak256": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/random": "^5.7.0", + "@ethersproject/signing-key": "^5.7.0", + "@ethersproject/transactions": "^5.7.0", + "@ethersproject/wordlists": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/web": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.7.1.tgz", + "integrity": "sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/base64": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, + "protocol-dashboard/node_modules/@ethersproject/wordlists": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.7.0.tgz", + "integrity": "sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/hash": "^5.7.0", + "@ethersproject/logger": "^5.7.0", + "@ethersproject/properties": "^5.7.0", + "@ethersproject/strings": "^5.7.0" + } + }, "protocol-dashboard/node_modules/@jest/types": { "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", + "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", "dev": true, - "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", @@ -147494,7 +150191,8 @@ }, "protocol-dashboard/node_modules/@react-spring/web": { "version": "9.7.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz", + "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==", "dependencies": { "@react-spring/animated": "~9.7.3", "@react-spring/core": "~9.7.3", @@ -147508,7 +150206,8 @@ }, "protocol-dashboard/node_modules/@reduxjs/toolkit": { "version": "1.9.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.7.tgz", + "integrity": "sha512-t7v8ZPxhhKgOKtU+uyJT13lu4vL7az5aFi4IdoDs/eS548edn2M8Ik9h8fxgvMjGoAUVFSt6ZC1P5cWmQ014QQ==", "dependencies": { "immer": "^9.0.21", "redux": "^4.2.1", @@ -147530,15 +150229,17 @@ }, "protocol-dashboard/node_modules/@remix-run/router": { "version": "1.10.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.10.0.tgz", + "integrity": "sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw==", "engines": { "node": ">=14.0.0" } }, "protocol-dashboard/node_modules/@rollup/plugin-inject": { "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz", + "integrity": "sha512-2+DEJbNBoPROPkgTDNe8/1YXWcqxbN5DTjASVIOx8HS+pITXushyNiBV56RB08zuptzz8gT3YfkqriTBVycepg==", "dev": true, - "license": "MIT", "dependencies": { "@rollup/pluginutils": "^5.0.1", "estree-walker": "^2.0.2", @@ -147558,8 +150259,9 @@ }, "protocol-dashboard/node_modules/@rollup/pluginutils": { "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", "dev": true, - "license": "MIT", "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", @@ -147579,7 +150281,8 @@ }, "protocol-dashboard/node_modules/@tanstack/query-core": { "version": "5.0.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.0.5.tgz", + "integrity": "sha512-MThCETMkHDHTnFZHp71L+SqTtD5d6XHftFCVR1xRJdWM3qGrlQ2VCXaj0SKVcyJej2e1Opa2c7iknu1llxCDNQ==", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -147587,7 +150290,8 @@ }, "protocol-dashboard/node_modules/@tanstack/react-query": { "version": "5.0.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.0.5.tgz", + "integrity": "sha512-ZG0Q4HZ0iuI8mWiZ2/MdVYPHbrmAVhMn7+gLOkxJh6zLIgCL4luSZlohzN5Xt4MjxfxxWioO1nemwpudaTsmQg==", "dependencies": { "@tanstack/query-core": "5.0.5" }, @@ -147609,6 +150313,23 @@ } } }, + "protocol-dashboard/node_modules/@tanstack/react-query-devtools": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.1.0.tgz", + "integrity": "sha512-Ms/GMccsrTBZQ+0v2pyIlaU0NlZXjhutPyhiQCviBqBbvYwsp/N/mT66YFaphzK/bhXzx5+NHbq8GI6V7KMY1Q==", + "dependencies": { + "@tanstack/query-devtools": "5.1.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "@tanstack/react-query": "^5.0.5", + "react": "^18.0.0", + "react-dom": "^18.0.0" + } + }, "protocol-dashboard/node_modules/@types/bn.js": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.2.tgz", @@ -147620,18 +150341,21 @@ }, "protocol-dashboard/node_modules/@types/classnames": { "version": "2.2.10", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.10.tgz", + "integrity": "sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==", + "dev": true }, "protocol-dashboard/node_modules/@types/estree": { "version": "1.0.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true }, "protocol-dashboard/node_modules/@types/istanbul-reports": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", + "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", "dev": true, - "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*", "@types/istanbul-lib-report": "*" @@ -147639,55 +150363,63 @@ }, "protocol-dashboard/node_modules/@types/jest": { "version": "24.9.1", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz", + "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==", "dev": true, - "license": "MIT", "dependencies": { "jest-diff": "^24.3.0" } }, "protocol-dashboard/node_modules/@types/lodash": { "version": "4.14.160", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.160.tgz", + "integrity": "sha512-aP03BShJoO+WVndoVj/WNcB/YBPt+CIU1mvaao2GRAHy2yg4pT/XS4XnVHEQBjPJGycWf/9seKEO9vopTJGkvA==", + "dev": true }, "protocol-dashboard/node_modules/@types/node": { "version": "12.0.10", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.10.tgz", + "integrity": "sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ==", + "dev": true }, "protocol-dashboard/node_modules/@types/numeral": { "version": "0.0.28", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/numeral/-/numeral-0.0.28.tgz", + "integrity": "sha512-Sjsy10w6XFHDktJJdXzBJmoondAKW+LcGpRFH+9+zXEDj0cOH8BxJuZA9vUDSMAzU1YRJlsPKmZEEiTYDlICLw==", + "dev": true }, "protocol-dashboard/node_modules/@types/react-dom": { "version": "18.2.14", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.14.tgz", + "integrity": "sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } }, "protocol-dashboard/node_modules/@types/react-helmet": { "version": "5.0.16", + "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-5.0.16.tgz", + "integrity": "sha512-++KMqwodVBg75hT2ZT4jobvDPi6iPUl/Lhrn0nP1XTcmFLtccaDb4FTAxzrj3egL7WQYTDnpHuPj52FSFkJqzA==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } }, "protocol-dashboard/node_modules/@types/react-lottie": { "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@types/react-lottie/-/react-lottie-1.2.5.tgz", + "integrity": "sha512-g5c7r0VN8g0hLsFEtR71ZFDWDp6niY4D/7llcAcLjV3LpaoyANmaQ9jispskWpkAUP+NYQcFllMtoGIWUM6VRw==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } }, "protocol-dashboard/node_modules/@types/react-redux": { "version": "7.1.28", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.28.tgz", + "integrity": "sha512-EQr7cChVzVUuqbA+J8ArWK1H0hLAHKOs21SIMrskKZ3nHNeE+LFYA+IsoZGhVOT8Ktjn3M20v4rnZKN3fLbypw==", "dev": true, - "license": "MIT", "dependencies": { "@types/hoist-non-react-statics": "^3.3.0", "@types/react": "*", @@ -147697,8 +150429,9 @@ }, "protocol-dashboard/node_modules/@types/react-virtualized": { "version": "9.21.10", + "resolved": "https://registry.npmjs.org/@types/react-virtualized/-/react-virtualized-9.21.10.tgz", + "integrity": "sha512-f5Ti3A7gGdLkPPFNHTrvKblpsPNBiQoSorOEOD+JPx72g/Ng2lOt4MYfhvQFQNgyIrAro+Z643jbcKafsMW2ag==", "dev": true, - "license": "MIT", "dependencies": { "@types/prop-types": "*", "@types/react": "*" @@ -147706,21 +150439,24 @@ }, "protocol-dashboard/node_modules/@types/semver": { "version": "6.2.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.2.1.tgz", + "integrity": "sha512-+beqKQOh9PYxuHvijhVl+tIHvT6tuwOrE9m14zd+MT2A38KoKZhh7pYJ0SNleLtwDsiIxHDsIk9bv01oOxvSvA==", + "dev": true }, "protocol-dashboard/node_modules/@types/yargs": { "version": "13.0.12", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz", + "integrity": "sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/yargs-parser": "*" } }, "protocol-dashboard/node_modules/@vitejs/plugin-react-swc": { "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.4.0.tgz", + "integrity": "sha512-m7UaA4Uvz82N/0EOVpZL4XsFIakRqrFKeSNxa1FBLSXGvWrWRBwmZb4qxk+ZIVAZcW3c3dn5YosomDgx62XWcQ==", "dev": true, - "license": "MIT", "dependencies": { "@swc/core": "^1.3.85" }, @@ -147728,18 +150464,26 @@ "vite": "^4" } }, + "protocol-dashboard/node_modules/aes-js": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", + "integrity": "sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==", + "dev": true + }, "protocol-dashboard/node_modules/ansi-regex": { "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "protocol-dashboard/node_modules/ansi-styles": { "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -147747,9 +150491,46 @@ "node": ">=4" } }, + "protocol-dashboard/node_modules/armada-cli": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/armada-cli/-/armada-cli-0.4.0.tgz", + "integrity": "sha512-yXNGmimBG0xUYXmFHi5VimJTJM4HrkoM/v2tks2zL8J1tky0cuHa2auc4TWqWPrS5nxkQ/xaJlBEZcQHcV6tpg==", + "dev": true, + "dependencies": { + "@ethersproject/constants": "^5.7.0", + "@ledgerhq/hw-app-eth": "^6.29.10", + "@ledgerhq/hw-transport-node-hid": "^6.27.6", + "@oclif/core": "^1.20.2", + "@oclif/plugin-help": "^5.1.17", + "ethers": "^5.7.1", + "inquirer": "^7.1.4", + "keytar": "^7.9.0", + "tar": "^6.1.11", + "yargs": "^17.6.0" + }, + "bin": { + "armada": "bin/run" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "protocol-dashboard/node_modules/bech32": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", + "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==", + "dev": true + }, + "protocol-dashboard/node_modules/bn.js": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "dev": true + }, "protocol-dashboard/node_modules/ccount": { "version": "1.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz", + "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -147757,8 +150538,9 @@ }, "protocol-dashboard/node_modules/chalk": { "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -147770,37 +150552,43 @@ }, "protocol-dashboard/node_modules/classnames": { "version": "2.5.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "protocol-dashboard/node_modules/clsx": { "version": "1.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", + "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==", "engines": { "node": ">=6" } }, "protocol-dashboard/node_modules/color-convert": { "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "1.1.3" } }, "protocol-dashboard/node_modules/color-name": { "version": "1.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true }, "protocol-dashboard/node_modules/commander": { "version": "2.20.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true }, "protocol-dashboard/node_modules/cssstyle": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz", + "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==", "dev": true, - "license": "MIT", "dependencies": { "rrweb-cssom": "^0.6.0" }, @@ -147810,8 +150598,9 @@ }, "protocol-dashboard/node_modules/data-urls": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz", + "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==", "dev": true, - "license": "MIT", "dependencies": { "abab": "^2.0.6", "whatwg-mimetype": "^3.0.0", @@ -147823,20 +150612,23 @@ }, "protocol-dashboard/node_modules/dayjs": { "version": "1.8.36", - "license": "MIT" + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz", + "integrity": "sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==" }, "protocol-dashboard/node_modules/diff-sequences": { "version": "24.9.0", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", + "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", "dev": true, - "license": "MIT", "engines": { "node": ">= 6" } }, "protocol-dashboard/node_modules/enhanced-resolve": { "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, - "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -147847,8 +150639,9 @@ }, "protocol-dashboard/node_modules/env-cmd": { "version": "9.0.3", + "resolved": "https://registry.npmjs.org/env-cmd/-/env-cmd-9.0.3.tgz", + "integrity": "sha512-DXNeSkLMlYOmq9At+GyvqpdIDuy3gRvz2Z77kN4cAhRbAGVmeiYaqdWqgHSTJ9wCck6ZD0rtbhHVcN7cc2j7rw==", "dev": true, - "license": "MIT", "dependencies": { "commander": "^2.0.0", "cross-spawn": "^6.0.0" @@ -147862,16 +150655,66 @@ }, "protocol-dashboard/node_modules/escape-string-regexp": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.0" } }, + "protocol-dashboard/node_modules/ethers": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.7.2.tgz", + "integrity": "sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@ethersproject/abi": "5.7.0", + "@ethersproject/abstract-provider": "5.7.0", + "@ethersproject/abstract-signer": "5.7.0", + "@ethersproject/address": "5.7.0", + "@ethersproject/base64": "5.7.0", + "@ethersproject/basex": "5.7.0", + "@ethersproject/bignumber": "5.7.0", + "@ethersproject/bytes": "5.7.0", + "@ethersproject/constants": "5.7.0", + "@ethersproject/contracts": "5.7.0", + "@ethersproject/hash": "5.7.0", + "@ethersproject/hdnode": "5.7.0", + "@ethersproject/json-wallets": "5.7.0", + "@ethersproject/keccak256": "5.7.0", + "@ethersproject/logger": "5.7.0", + "@ethersproject/networks": "5.7.1", + "@ethersproject/pbkdf2": "5.7.0", + "@ethersproject/properties": "5.7.0", + "@ethersproject/providers": "5.7.2", + "@ethersproject/random": "5.7.0", + "@ethersproject/rlp": "5.7.0", + "@ethersproject/sha2": "5.7.0", + "@ethersproject/signing-key": "5.7.0", + "@ethersproject/solidity": "5.7.0", + "@ethersproject/strings": "5.7.0", + "@ethersproject/transactions": "5.7.0", + "@ethersproject/units": "5.7.0", + "@ethersproject/wallet": "5.7.0", + "@ethersproject/web": "5.7.1", + "@ethersproject/wordlists": "5.7.0" + } + }, "protocol-dashboard/node_modules/form-data": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, - "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -147883,7 +150726,9 @@ }, "protocol-dashboard/node_modules/fsevents": { "version": "2.3.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, "optional": true, "os": [ "darwin" @@ -147894,31 +150739,129 @@ }, "protocol-dashboard/node_modules/graphql": { "version": "15.5.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz", + "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==", "engines": { "node": ">= 10.x" } }, "protocol-dashboard/node_modules/has-flag": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "protocol-dashboard/node_modules/immer": { "version": "9.0.21", - "license": "MIT", + "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz", + "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==", "funding": { "type": "opencollective", "url": "https://opencollective.com/immer" } }, + "protocol-dashboard/node_modules/inquirer": { + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", + "dev": true, + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.19", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "protocol-dashboard/node_modules/inquirer/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "protocol-dashboard/node_modules/inquirer/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "protocol-dashboard/node_modules/inquirer/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "protocol-dashboard/node_modules/inquirer/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "protocol-dashboard/node_modules/inquirer/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "protocol-dashboard/node_modules/inquirer/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "protocol-dashboard/node_modules/jest-diff": { "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", + "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", "dev": true, - "license": "MIT", "dependencies": { "chalk": "^2.0.1", "diff-sequences": "^24.9.0", @@ -147931,16 +150874,18 @@ }, "protocol-dashboard/node_modules/jest-get-type": { "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", + "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", "dev": true, - "license": "MIT", "engines": { "node": ">= 6" } }, "protocol-dashboard/node_modules/jsdom": { "version": "22.1.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", + "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==", "dev": true, - "license": "MIT", "dependencies": { "abab": "^2.0.6", "cssstyle": "^3.0.0", @@ -147980,7 +150925,8 @@ }, "protocol-dashboard/node_modules/longest-streak": { "version": "2.0.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", + "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -147988,8 +150934,9 @@ }, "protocol-dashboard/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -147999,8 +150946,9 @@ }, "protocol-dashboard/node_modules/magic-string": { "version": "0.30.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", + "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", "dev": true, - "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, @@ -148010,7 +150958,8 @@ }, "protocol-dashboard/node_modules/markdown-table": { "version": "2.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", + "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", "dependencies": { "repeat-string": "^1.0.0" }, @@ -148021,7 +150970,8 @@ }, "protocol-dashboard/node_modules/mdast-util-find-and-replace": { "version": "1.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz", + "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==", "dependencies": { "escape-string-regexp": "^4.0.0", "unist-util-is": "^4.0.0", @@ -148034,7 +150984,8 @@ }, "protocol-dashboard/node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": { "version": "4.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "engines": { "node": ">=10" }, @@ -148044,7 +150995,8 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm": { "version": "0.1.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz", + "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==", "dependencies": { "mdast-util-gfm-autolink-literal": "^0.1.0", "mdast-util-gfm-strikethrough": "^0.2.0", @@ -148059,7 +151011,8 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm-autolink-literal": { "version": "0.1.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz", + "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==", "dependencies": { "ccount": "^1.0.0", "mdast-util-find-and-replace": "^1.1.0", @@ -148072,7 +151025,8 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm-strikethrough": { "version": "0.2.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz", + "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==", "dependencies": { "mdast-util-to-markdown": "^0.6.0" }, @@ -148083,7 +151037,8 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm-table": { "version": "0.1.6", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz", + "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==", "dependencies": { "markdown-table": "^2.0.0", "mdast-util-to-markdown": "~0.6.0" @@ -148095,7 +151050,8 @@ }, "protocol-dashboard/node_modules/mdast-util-gfm-task-list-item": { "version": "0.1.6", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz", + "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==", "dependencies": { "mdast-util-to-markdown": "~0.6.0" }, @@ -148106,7 +151062,8 @@ }, "protocol-dashboard/node_modules/mdast-util-to-markdown": { "version": "0.6.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", + "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", "dependencies": { "@types/unist": "^2.0.0", "longest-streak": "^2.0.0", @@ -148122,7 +151079,8 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm": { "version": "0.3.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz", + "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==", "dependencies": { "micromark": "~2.11.0", "micromark-extension-gfm-autolink-literal": "~0.5.0", @@ -148138,7 +151096,8 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-autolink-literal": { "version": "0.5.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz", + "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==", "dependencies": { "micromark": "~2.11.3" }, @@ -148149,7 +151108,8 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-strikethrough": { "version": "0.6.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz", + "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==", "dependencies": { "micromark": "~2.11.0" }, @@ -148160,7 +151120,8 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-table": { "version": "0.4.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz", + "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==", "dependencies": { "micromark": "~2.11.0" }, @@ -148171,7 +151132,8 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-tagfilter": { "version": "0.3.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz", + "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==", "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" @@ -148179,7 +151141,8 @@ }, "protocol-dashboard/node_modules/micromark-extension-gfm-task-list-item": { "version": "0.3.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz", + "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==", "dependencies": { "micromark": "~2.11.0" }, @@ -148190,6 +151153,8 @@ }, "protocol-dashboard/node_modules/postcss": { "version": "8.4.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", + "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", "dev": true, "funding": [ { @@ -148201,7 +151166,6 @@ "url": "https://tidelift.com/funding/github/npm/postcss" } ], - "license": "MIT", "dependencies": { "nanoid": "^3.3.4", "picocolors": "^1.0.0", @@ -148213,8 +151177,9 @@ }, "protocol-dashboard/node_modules/prettier": { "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true, - "license": "MIT", "bin": { "prettier": "bin-prettier.js" }, @@ -148224,8 +151189,9 @@ }, "protocol-dashboard/node_modules/pretty-format": { "version": "24.9.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", + "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", "dev": true, - "license": "MIT", "dependencies": { "@jest/types": "^24.9.0", "ansi-regex": "^4.0.0", @@ -148238,12 +151204,14 @@ }, "protocol-dashboard/node_modules/punycode": { "version": "1.3.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", + "dev": true }, "protocol-dashboard/node_modules/react-chartjs-2": { "version": "2.10.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.10.0.tgz", + "integrity": "sha512-1MjWEkUn8LLFf6GVyYUOrruJTW3yVU5hlEJOwGj3MiokuC+jH/BahjWVGAMonbe9UYbEIUbd2Rn36iVlC0Hb7w==", "dependencies": { "lodash": "^4.17.19", "prop-types": "^15.7.2" @@ -148256,7 +151224,8 @@ }, "protocol-dashboard/node_modules/react-merge-refs": { "version": "2.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-merge-refs/-/react-merge-refs-2.1.1.tgz", + "integrity": "sha512-jLQXJ/URln51zskhgppGJ2ub7b2WFKGq3cl3NYKtlHoTG+dN2q7EzWrn3hN3EgPsTMvpR9tpq5ijdp7YwFZkag==", "funding": { "type": "github", "url": "https://github.com/sponsors/gregberge" @@ -148264,7 +151233,8 @@ }, "protocol-dashboard/node_modules/react-redux": { "version": "8.1.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.1.3.tgz", + "integrity": "sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==", "dependencies": { "@babel/runtime": "^7.12.1", "@types/hoist-non-react-statics": "^3.3.1", @@ -148301,11 +151271,13 @@ }, "protocol-dashboard/node_modules/react-redux/node_modules/react-is": { "version": "18.2.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, "protocol-dashboard/node_modules/react-router": { "version": "6.17.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.17.0.tgz", + "integrity": "sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA==", "dependencies": { "@remix-run/router": "1.10.0" }, @@ -148318,7 +151290,8 @@ }, "protocol-dashboard/node_modules/react-router-dom": { "version": "6.17.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.17.0.tgz", + "integrity": "sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ==", "dependencies": { "@remix-run/router": "1.10.0", "react-router": "6.17.0" @@ -148333,7 +151306,8 @@ }, "protocol-dashboard/node_modules/react-spring": { "version": "8.0.25", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-spring/-/react-spring-8.0.25.tgz", + "integrity": "sha512-KLSLI9ccpoxvxzCbtTqSOHNHhndxAeEcHsgFZoyybP3GpGh0axmtauUAH8c3XkozIW8r9gScvrCWw3F1EPIcBw==", "dependencies": { "@babel/runtime": "^7.3.1", "prop-types": "^15.5.8" @@ -148345,7 +151319,8 @@ }, "protocol-dashboard/node_modules/react-virtualized": { "version": "9.22.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.22.2.tgz", + "integrity": "sha512-5j4h4FhxTdOpBKtePSs1yk6LDNT4oGtUwjT7Nkh61Z8vv3fTG/XeOf8J4li1AYaexOwTXnw0HFVxsV0GBUqwRw==", "dependencies": { "@babel/runtime": "^7.7.2", "clsx": "^1.0.4", @@ -148359,17 +151334,28 @@ "react-dom": "^15.3.0 || ^16.0.0-alpha" } }, + "protocol-dashboard/node_modules/redux": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", + "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", + "dependencies": { + "@babel/runtime": "^7.9.2" + } + }, "protocol-dashboard/node_modules/redux-devtools-extension": { "version": "2.13.9", + "resolved": "https://registry.npmjs.org/redux-devtools-extension/-/redux-devtools-extension-2.13.9.tgz", + "integrity": "sha512-cNJ8Q/EtjhQaZ71c8I9+BPySIBVEKssbPpskBfsXqb8HJ002A3KRVHfeRzwRo6mGPqsm7XuHTqNSNeS1Khig0A==", + "deprecated": "Package moved to @redux-devtools/extension.", "dev": true, - "license": "MIT", "peerDependencies": { "redux": "^3.1.0 || ^4.0.0" } }, "protocol-dashboard/node_modules/remark-gfm": { "version": "1.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz", + "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==", "dependencies": { "mdast-util-gfm": "^0.1.0", "micromark-extension-gfm": "^0.3.0" @@ -148381,11 +151367,13 @@ }, "protocol-dashboard/node_modules/reselect": { "version": "4.1.8", - "license": "MIT" + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", + "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==" }, "protocol-dashboard/node_modules/rollup": { "version": "3.29.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "bin": { "rollup": "dist/bin/rollup" }, @@ -148397,9 +151385,22 @@ "fsevents": "~2.3.2" } }, + "protocol-dashboard/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, "protocol-dashboard/node_modules/simplebar-react": { "version": "3.0.0-beta.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/simplebar-react/-/simplebar-react-3.0.0-beta.5.tgz", + "integrity": "sha512-PHkTNjZkRmH7bB5SmkydkORaNT538n6huEHxTqu7xbFYSP72Z58c6YC2CUlnr0l8x7eMVPLX1XwdEbU6SF63zg==", "dependencies": { "babel-runtime": "^6.26.0", "core-js": "^3.6.5", @@ -148413,8 +151414,9 @@ }, "protocol-dashboard/node_modules/supports-color": { "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -148424,8 +151426,9 @@ }, "protocol-dashboard/node_modules/tr46": { "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", "dev": true, - "license": "MIT", "dependencies": { "punycode": "^2.3.0" }, @@ -148435,16 +151438,18 @@ }, "protocol-dashboard/node_modules/tr46/node_modules/punycode": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "protocol-dashboard/node_modules/ts-loader": { "version": "9.4.4", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.4.tgz", + "integrity": "sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==", "dev": true, - "license": "MIT", "dependencies": { "chalk": "^4.1.0", "enhanced-resolve": "^5.0.0", @@ -148461,8 +151466,9 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/ansi-styles": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -148475,8 +151481,9 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/chalk": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -148490,8 +151497,9 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/color-convert": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -148501,21 +151509,24 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/color-name": { "version": "1.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "protocol-dashboard/node_modules/ts-loader/node_modules/has-flag": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "protocol-dashboard/node_modules/ts-loader/node_modules/semver": { "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -148528,8 +151539,9 @@ }, "protocol-dashboard/node_modules/ts-loader/node_modules/supports-color": { "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -148539,8 +151551,9 @@ }, "protocol-dashboard/node_modules/typescript": { "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -148551,7 +151564,8 @@ }, "protocol-dashboard/node_modules/unist-util-is": { "version": "4.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", + "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" @@ -148559,7 +151573,8 @@ }, "protocol-dashboard/node_modules/unist-util-visit-parents": { "version": "3.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", + "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", "dependencies": { "@types/unist": "^2.0.0", "unist-util-is": "^4.0.0" @@ -148571,8 +151586,9 @@ }, "protocol-dashboard/node_modules/url": { "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", "dev": true, - "license": "MIT", "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" @@ -148580,12 +151596,14 @@ }, "protocol-dashboard/node_modules/url-join": { "version": "4.0.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz", + "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==" }, "protocol-dashboard/node_modules/util": { "version": "0.12.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz", + "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==", "dev": true, - "license": "MIT", "dependencies": { "inherits": "^2.0.3", "is-arguments": "^1.0.4", @@ -148597,7 +151615,8 @@ }, "protocol-dashboard/node_modules/vite": { "version": "4.4.9", - "license": "MIT", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", + "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", @@ -148650,11 +151669,9 @@ }, "protocol-dashboard/node_modules/vite-plugin-node-polyfills": { "version": "0.15.0", + "resolved": "https://registry.npmjs.org/vite-plugin-node-polyfills/-/vite-plugin-node-polyfills-0.15.0.tgz", + "integrity": "sha512-IF9aTSPV9zebrcC6ezJA3Ym4r4U1C3jKUAnG16Sq7+UPtisNEOcNOAu3p5wcgFFOuuUwAUjQlIeJHMcnSXXemQ==", "dev": true, - "license": "MIT", - "workspaces": [ - "." - ], "dependencies": { "@rollup/plugin-inject": "^5.0.3", "buffer-polyfill": "npm:buffer@^6.0.3", @@ -148670,6 +151687,8 @@ }, "protocol-dashboard/node_modules/vite/node_modules/postcss": { "version": "8.4.33", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", + "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", "funding": [ { "type": "opencollective", @@ -148684,7 +151703,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.0.0", @@ -148696,8 +151714,9 @@ }, "protocol-dashboard/node_modules/whatwg-url": { "version": "12.0.1", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz", + "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==", "dev": true, - "license": "MIT", "dependencies": { "tr46": "^4.1.1", "webidl-conversions": "^7.0.0" @@ -148708,8 +151727,9 @@ }, "protocol-dashboard/node_modules/ws": { "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -148728,12 +151748,14 @@ }, "protocol-dashboard/node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "protocol-dashboard/node_modules/zwitch": { "version": "1.0.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", + "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" From 51ed43593ab16e0c4944203c94103988e3c32412 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Mon, 29 Jan 2024 18:24:23 -0800 Subject: [PATCH 13/64] Add stuff --- package-lock.json | 194 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 192 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 682584a8da5..e540583562d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43342,6 +43342,150 @@ "npm": ">=6" } }, + "node_modules/babel-plugin-module-resolver": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz", + "integrity": "sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q==", + "dev": true, + "dependencies": { + "find-babel-config": "^2.0.0", + "glob": "^8.0.3", + "pkg-up": "^3.1.0", + "reselect": "^4.1.7", + "resolve": "^1.22.1" + }, + "engines": { + "node": ">= 16" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/pkg-up": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-module-resolver/node_modules/reselect": { + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", + "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==", + "dev": true + }, "node_modules/babel-plugin-named-asset-import": { "version": "0.2.3", "dev": true, @@ -56897,6 +57041,19 @@ "version": "2.0.0", "license": "MIT" }, + "node_modules/find-babel-config": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-2.0.0.tgz", + "integrity": "sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw==", + "dev": true, + "dependencies": { + "json5": "^2.1.1", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/find-cache-dir": { "version": "2.1.0", "license": "MIT", @@ -131855,6 +132012,7 @@ "@emotion/styled": "11.11.0", "@radix-ui/react-slot": "1.0.2", "@react-spring/web": "9.7.2", + "@rollup/plugin-alias": "5.0.1", "@storybook/addon-a11y": "7.4.0", "@storybook/addon-actions": "7.4.2", "@storybook/addon-essentials": "7.4.2", @@ -131976,6 +132134,26 @@ "node": ">=10.10.0" } }, + "packages/harmony/node_modules/@rollup/plugin-alias": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-5.0.1.tgz", + "integrity": "sha512-JObvbWdOHoMy9W7SU0lvGhDtWq9PllP5mjpAy+TUslZG/WzOId9u80Hsqq1vCUn9pFJ0cxpdcnAv+QzU2zFH3Q==", + "dev": true, + "dependencies": { + "slash": "^4.0.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, "packages/harmony/node_modules/@rollup/pluginutils": { "version": "4.2.1", "dev": true, @@ -132899,6 +133077,18 @@ "node": ">=8" } }, + "packages/harmony/node_modules/slash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "packages/harmony/node_modules/source-map": { "version": "0.6.1", "dev": true, @@ -137979,6 +138169,7 @@ "babel-jest": "29.6.3", "babel-loader": "8.3.0", "babel-plugin-macros": "3.1.0", + "babel-plugin-module-resolver": "5.0.0", "babel-plugin-transform-remove-console": "6.9.4", "detox": "20.12.1", "eslint": "8.56.0", @@ -146890,10 +147081,9 @@ "typescript": "5.0.4", "typescript-plugin-css-modules": "^3.4.0", "url": "^0.11.0", - "vite": "4.5.0", + "vite": "^4.2.2", "vite-plugin-glslify": "2.0.2", "vite-plugin-svgr": "4.1.0", - "vite-tsconfig-paths": "4.2.1", "vitest": "0.34.6" } }, From 215930911383217f1a84f2fd13ecd0fe51c07e97 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 11:08:25 -0800 Subject: [PATCH 14/64] Transform hooks --- packages/common/package.json | 3 +- packages/common/src/index.ts | 4 +- packages/convert-exports.js | 113 ++++++++++++++++++ packages/web/src/app/App.tsx | 3 +- .../add-funds-modal/AddFundsModal.tsx | 2 +- .../web/src/components/add-funds/AddFunds.tsx | 8 +- .../components/address-tile/AddressTile.tsx | 3 +- .../AnimatedButtonProvider.tsx | 2 +- .../animated-switch/AnimatedSwitch.tsx | 2 +- .../audio-balance-pill/AUDIOBalancePill.tsx | 6 +- .../CoinflowOnrampModal.tsx | 7 +- .../components/CollectibleDetailsModal.tsx | 4 +- .../components/CollectiblesPage.tsx | 2 +- .../data-entry/AccessAndSaleTriggerLegacy.tsx | 2 +- .../download-buttons/DownloadButtons.tsx | 7 +- .../src/components/dragndrop/Droppable.tsx | 3 +- packages/web/src/components/drawer/Drawer.tsx | 2 +- .../components/dynamic-image/DynamicImage.tsx | 2 +- .../edit-playlist/mobile/EditPlaylistPage.tsx | 2 +- .../FeatureFlagOverrideModal.tsx | 8 +- .../form-fields/HarmonyTextField.tsx | 2 +- .../header/mobile/HeaderContextProvider.tsx | 2 +- .../image-selection/ImageSelectionPopup.jsx | 2 +- .../InboxSettingsModal.tsx | 3 +- .../LockedContentModal.tsx | 7 +- .../MobilePageContainer.tsx | 3 +- .../components/nav/desktop/NavPopupMenu.tsx | 2 +- .../nav/desktop/NowPlayingArtworkTile.tsx | 4 +- .../Notification/TipReactionNotification.tsx | 2 +- .../Notification/TipReceivedNotification.tsx | 2 +- .../Notification/TipSentNotification.tsx | 2 +- .../components/TwitterShareButton.tsx | 2 +- .../src/components/now-playing/NowPlaying.tsx | 2 +- .../now-playing/NowPlayingDrawer.tsx | 3 +- .../desktop/components/PlayingTrackInfo.tsx | 2 +- .../desktop/components/SocialActions.tsx | 2 +- .../components/play-bar/mobile/PlayBar.tsx | 4 +- .../PremiumContentPurchaseModal.tsx | 10 +- .../components/PayExtraFormSection.tsx | 8 +- .../components/PurchaseContentFormFields.tsx | 16 +-- .../components/PurchaseContentFormFooter.tsx | 4 +- .../hooks/usePurchaseContentFormState.ts | 4 +- .../hooks/usePurchaseSummaryValues.ts | 14 +-- .../scroll-provider/ScrollProvider.tsx | 2 +- .../search-users-modal/SearchUsersModal.tsx | 2 +- .../tipping/support/SupportingList.tsx | 2 +- .../components/tipping/tip-audio/SendTip.tsx | 2 +- packages/web/src/components/track/Artwork.tsx | 8 +- .../web/src/components/track/DownloadRow.tsx | 2 +- .../src/components/track/DownloadSection.tsx | 6 +- .../track/desktop/ConnectedTrackTile.tsx | 2 +- .../track/mobile/ConnectedTrackTile.tsx | 2 +- .../components/track/mobile/TrackTileArt.tsx | 9 +- .../components/tracks-table/TracksTable.tsx | 9 +- .../TwitterShareButton.tsx | 2 +- .../src/components/upload/TrackPreviewNew.tsx | 4 +- .../USDCBalanceFetcher.tsx | 3 +- .../usdc-balance-pill/USDCBalancePill.tsx | 4 +- .../USDCManualTransfer.tsx | 5 +- .../user-badges/ProfilePageBadge.tsx | 3 +- .../src/components/user-badges/UserBadges.tsx | 3 +- .../withdraw-usdc-modal/WithdrawUSDCModal.tsx | 8 +- .../components/CoinflowWithdrawModal.tsx | 7 +- .../components/ConfirmTransferDetails.tsx | 2 +- .../components/EnterTransferDetails.tsx | 5 +- .../components/ErrorPage.tsx | 2 +- .../components/TransferInProgress.tsx | 2 +- .../components/TransferSuccessful.tsx | 2 +- packages/web/src/hooks/useAsyncPoll.ts | 4 +- packages/web/src/hooks/useCardWeight.ts | 2 +- .../web/src/hooks/useCollectionCoverArt.ts | 2 +- packages/web/src/hooks/useCoverPhoto.ts | 2 +- packages/web/src/hooks/useDelayedEffect.ts | 4 +- packages/web/src/hooks/useHasChangedRoute.ts | 2 +- packages/web/src/hooks/useImageSize.test.tsx | 4 +- packages/web/src/hooks/useIsUSDCEnabled.ts | 3 +- packages/web/src/hooks/useLocalStorage.ts | 3 +- packages/web/src/hooks/useRemoteConfig.ts | 7 +- packages/web/src/hooks/useTabs/useTabs.tsx | 2 +- packages/web/src/hooks/useTikTokAuth.ts | 9 +- packages/web/src/hooks/useTrackCoverArt.ts | 2 +- .../web/src/hooks/useUserProfilePicture.ts | 2 +- packages/web/src/hooks/wallet.tsx | 7 +- .../src/pages/audio-rewards-page/Tiers.tsx | 4 +- .../components/ReceiveBody.tsx | 4 +- .../AudioMatchingRewardsModalContent.tsx | 2 +- packages/web/src/pages/chat-page/ChatPage.tsx | 8 +- .../pages/chat-page/components/ChatHeader.tsx | 8 +- .../chat-page/components/ChatListItem.tsx | 3 +- .../chat-page/components/ChatMessageList.tsx | 4 +- .../components/ChatMessageListItem.tsx | 5 +- .../components/ChatMessagePlaylist.tsx | 3 +- .../chat-page/components/ChatMessageTrack.tsx | 5 +- .../chat-page/components/LinkPreview.tsx | 7 +- .../components/mobile/CollectionPage.tsx | 4 +- .../components/desktop/FeedPageContent.tsx | 4 +- .../components/mobile/HistoryPage.tsx | 3 +- .../pay-and-earn-page/components/USDCCard.tsx | 2 +- .../components/WithdrawalsTab.tsx | 2 +- .../components/desktop/ProfilePage.tsx | 2 +- .../components/mobile/GrowingCoverPhoto.tsx | 2 +- .../components/mobile/ProfilePage.tsx | 4 +- .../components/mobile/SavedPage.tsx | 8 +- .../sign-on/components/desktop/SignInPage.tsx | 2 +- .../sign-up-page/components/HandleField.tsx | 7 +- .../components/desktop/TrackPage.tsx | 4 +- .../components/mobile/TrackPage.tsx | 4 +- .../upload-page/fields/AccessAndSaleField.tsx | 8 +- .../RemixSettingsMenuFields.tsx | 2 +- .../CollectibleGatedRadioField.tsx | 4 +- .../UsdcPurchaseGatedRadioField.tsx | 5 +- .../remote-config/featureFlagHelpers.ts | 7 +- 112 files changed, 322 insertions(+), 245 deletions(-) create mode 100644 packages/convert-exports.js diff --git a/packages/common/package.json b/packages/common/package.json index 8ab83fd0765..60de8c62cd0 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -9,7 +9,8 @@ "main": "./dist/index.js", "exports": { ".": "./dist/index.js", - "./messages": "./src/messages/index.ts" + "./messages": "./src/messages/index.ts", + "./hooks": "./src/hooks/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index b6b8ebea66c..d75c3aba300 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,10 +1,12 @@ +// import * as hooks from './hooks' +// console.log('hook exports', hooks) + export * from './api' export * from './audius-query' export * from './context' export * from './models' export * from './utils' export * from './services' -export * from './hooks' export * from './store' export * from './schemas' export * from './assets' diff --git a/packages/convert-exports.js b/packages/convert-exports.js new file mode 100644 index 00000000000..b3b063ae356 --- /dev/null +++ b/packages/convert-exports.js @@ -0,0 +1,113 @@ +const glob = require('glob') +const fs = require('fs') + +var getDirectories = function (callback) { + glob('./web/src/**/*', callback) +} + +const DIRECTORY = 'hooks' +const EXPORTS = [ + 'useBooleanOnce', + 'FEATURE_FLAG_OVERRIDE_KEY', + 'useRecomputeToggle', + 'createUseFeatureFlagHook', + 'useFeatureFlag', + 'createUseRemoteVarHook', + 'useRemoteVar', + 'ButtonState', + 'ButtonType', + 'useCurrentStems', + 'useDownloadTrackButtons', + 'useImageSize', + 'useLoadImageWithTimeout', + 'useInstanceVar', + 'createUseLocalStorageHook', + 'createUseTikTokAuthHook', + 'useTwitterButtonStatus', + 'useUIAudio', + 'useSelectTierInfo', + 'useGetFirstOrTopSupporter', + 'useRankedSupportingForUser', + 'createProxySelectorHook', + 'useProxySelector', + 'useAccountHasClaimableRewards', + 'useGatedContentAccess', + 'useGatedContentAccessMap', + 'useStreamConditionsEntity', + 'useLockedContent', + 'useDownloadableContentAccess', + 'useLinkUnfurlMetadata', + 'useThrottledCallback', + 'useDebouncedCallback', + 'useAccountAlbums', + 'useAccountPlaylists', + 'useFetchedSavedCollections', + 'useCanSendMessage', + 'useSetInboxPermissions', + 'usePlayTrack', + 'usePauseTrack', + 'useToggleTrack', + 'useGeneratePlaylistArtwork', + 'useUSDCBalance', + 'useTotalBalanceWithFallback', + 'usePurchaseContentFormConfiguration', + 'useChallengeCooldownSchedule', + 'useAudioMatchingChallengeCooldownSchedule', + 'useUSDCPurchaseConfig', + 'usePurchaseContentErrorMessage', + 'usePayExtraPresets', + 'getExtraAmount', + 'isTrackPurchaseable', + 'PayExtraPreset', + 'CUSTOM_AMOUNT', + 'AMOUNT_PRESET', + 'PURCHASE_METHOD', + 'PURCHASE_VENDOR', + 'PAGE', + 'minimumPayExtraAmountCents', + 'maximumPayExtraAmountCents', + 'CENTS_TO_USDC_MULTIPLIER', + 'DEFAULT_PURCHASE_AMOUNT_CENTS', + 'PurchaseContentSchema', + 'useAccessAndRemixSettings', + 'useInterval', + 'useCreateUserbankIfNeeded', + 'usePurchaseMethod', + 'useCoinflowAdapter', + 'useIsWaitingForValidation' +] + +getDirectories(async function (err, res) { + res + .filter((path) => path.match(/\/[^\/]+\.(ts|tsx|js|jsx)$/)) + .forEach((path) => { + const content = fs.readFileSync(path, { encoding: 'utf8', flag: 'r' }) + + let matches = [] + let newContent = content + EXPORTS.forEach((exportName) => { + let regex = new RegExp( + `(import\\s{[^}]* )(${exportName}( as [^,]*)*[, \\n])([^}]*}\\s*from '@audius/common')` + ) + + let match = content.match(regex)?.[2] + + if (match) { + matches.push(exportName) + + // Delete old import + newContent = newContent.replace(regex, '$1$4') + } + }) + + // Add new imports + if (matches.length) { + console.log('matches', matches) + const matchesList = matches.join(', ') + newContent = `import { ${matchesList} } from '@audius/common/${DIRECTORY}' + ${newContent}` + + fs.writeFileSync(path, newContent) + } + }) +}) diff --git a/packages/web/src/app/App.tsx b/packages/web/src/app/App.tsx index fe3e730dad9..7ed2dbcc2a2 100644 --- a/packages/web/src/app/App.tsx +++ b/packages/web/src/app/App.tsx @@ -2,7 +2,8 @@ import { useEffect, Suspense, lazy } from 'react' -import { FeatureFlags, useFeatureFlag } from '@audius/common' +import { FeatureFlags } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' import { CoinflowPurchaseProtection } from '@coinflowlabs/react' import { Redirect, Route, Switch } from 'react-router-dom' diff --git a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx index 98ede56d9ea..2dd5e10991e 100644 --- a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx +++ b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx @@ -4,11 +4,11 @@ import { useAddFundsModal, buyUSDCActions, PurchaseMethod, - DEFAULT_PURCHASE_AMOUNT_CENTS, PurchaseVendor, buyUSDCSelectors, BuyUSDCStage } from '@audius/common' +import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' import { ModalContent, ModalHeader } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/add-funds/AddFunds.tsx b/packages/web/src/components/add-funds/AddFunds.tsx index c2cf2491d6a..69d5f7ec0ec 100644 --- a/packages/web/src/components/add-funds/AddFunds.tsx +++ b/packages/web/src/components/add-funds/AddFunds.tsx @@ -1,11 +1,7 @@ import { useState } from 'react' -import { - PurchaseMethod, - PurchaseVendor, - useCreateUserbankIfNeeded, - useUSDCBalance -} from '@audius/common' +import { PurchaseMethod, PurchaseVendor } from '@audius/common' +import { useUSDCBalance, useCreateUserbankIfNeeded } from '@audius/common/hooks' import { USDC } from '@audius/fixed-decimal' import { Box, Button, Flex, Text, IconLogoCircleUSDC } from '@audius/harmony' import { BN } from 'bn.js' diff --git a/packages/web/src/components/address-tile/AddressTile.tsx b/packages/web/src/components/address-tile/AddressTile.tsx index 07d4231accb..736c2483bbe 100644 --- a/packages/web/src/components/address-tile/AddressTile.tsx +++ b/packages/web/src/components/address-tile/AddressTile.tsx @@ -1,6 +1,7 @@ import { useCallback, useContext } from 'react' -import { shortenSPLAddress, useUSDCBalance } from '@audius/common' +import { shortenSPLAddress } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import { USDC } from '@audius/fixed-decimal' import { Text, diff --git a/packages/web/src/components/animated-button/AnimatedButtonProvider.tsx b/packages/web/src/components/animated-button/AnimatedButtonProvider.tsx index 807d22d0db5..8b569be428f 100644 --- a/packages/web/src/components/animated-button/AnimatedButtonProvider.tsx +++ b/packages/web/src/components/animated-button/AnimatedButtonProvider.tsx @@ -7,7 +7,7 @@ import { MouseEvent } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import cn from 'classnames' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/animated-switch/AnimatedSwitch.tsx b/packages/web/src/components/animated-switch/AnimatedSwitch.tsx index fdadc820f47..615f4a5d602 100644 --- a/packages/web/src/components/animated-switch/AnimatedSwitch.tsx +++ b/packages/web/src/components/animated-switch/AnimatedSwitch.tsx @@ -7,7 +7,7 @@ import { CSSProperties } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { Switch, useHistory } from 'react-router-dom' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useTransition, animated } from 'react-spring' diff --git a/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx b/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx index 23d5eb348aa..a63bb251238 100644 --- a/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx +++ b/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx @@ -1,12 +1,10 @@ import { cloneElement } from 'react' +import { accountSelectors, formatWei, isNullOrUndefined } from '@audius/common' import { - accountSelectors, - formatWei, - isNullOrUndefined, useSelectTierInfo, useTotalBalanceWithFallback -} from '@audius/common' +} from '@audius/common/hooks' import BN from 'bn.js' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx b/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx index 9aee9472716..0176c450923 100644 --- a/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx +++ b/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx @@ -1,10 +1,7 @@ import { useCallback, useEffect, useState } from 'react' -import { - useCoinflowOnrampModal, - coinflowModalUIActions, - useCoinflowAdapter -} from '@audius/common' +import { useCoinflowOnrampModal, coinflowModalUIActions } from '@audius/common' +import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowPurchase } from '@coinflowlabs/react' import { Transaction } from '@solana/web3.js' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx index e543666c315..07c77975d1f 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx @@ -15,9 +15,9 @@ import { accountSelectors, badgeTiers, collectibleDetailsUISelectors, - collectibleDetailsUIActions, - useSelectTierInfo + collectibleDetailsUIActions } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import { Button, ButtonSize, diff --git a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx index 2fe8b41a8bb..1d7f615052b 100644 --- a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx +++ b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx @@ -10,12 +10,12 @@ import { import { Collectible, CollectiblesMetadata, - useInstanceVar, ProfileUser, collectibleDetailsUISelectors, collectibleDetailsUIActions, getHash } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { Button, ButtonSize, diff --git a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx index af0f6cae783..87dda0a98af 100644 --- a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx +++ b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx @@ -12,10 +12,10 @@ import { isContentFollowGated, isContentTipGated, isContentUSDCPurchaseGated, - useUSDCPurchaseConfig, Nullable, AccessConditions } from '@audius/common' +import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { Button, ButtonSize, diff --git a/packages/web/src/components/download-buttons/DownloadButtons.tsx b/packages/web/src/components/download-buttons/DownloadButtons.tsx index 1d8e117aa00..6a7aa1bc7e1 100644 --- a/packages/web/src/components/download-buttons/DownloadButtons.tsx +++ b/packages/web/src/components/download-buttons/DownloadButtons.tsx @@ -1,12 +1,11 @@ import { memo, useCallback } from 'react' +import { ID, toastActions } from '@audius/common' import { - ID, ButtonState, ButtonType, - useDownloadTrackButtons, - toastActions -} from '@audius/common' + useDownloadTrackButtons +} from '@audius/common/hooks' import { IconDownload, IconButton } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/dragndrop/Droppable.tsx b/packages/web/src/components/dragndrop/Droppable.tsx index 28c4d0c88fd..78c00e6fe4d 100644 --- a/packages/web/src/components/dragndrop/Droppable.tsx +++ b/packages/web/src/components/dragndrop/Droppable.tsx @@ -6,7 +6,8 @@ import { ReactNode } from 'react' -import { ID, useDebouncedCallback } from '@audius/common' +import { ID } from '@audius/common' +import { useDebouncedCallback } from '@audius/common/hooks' import { Slot } from '@radix-ui/react-slot' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/drawer/Drawer.tsx b/packages/web/src/components/drawer/Drawer.tsx index 0cd8cc4f76f..e5b65575a02 100644 --- a/packages/web/src/components/drawer/Drawer.tsx +++ b/packages/web/src/components/drawer/Drawer.tsx @@ -7,7 +7,7 @@ import { RefObject } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { IconRemove } from '@audius/stems' import { disableBodyScroll, clearAllBodyScrollLocks } from 'body-scroll-lock' import cn from 'classnames' diff --git a/packages/web/src/components/dynamic-image/DynamicImage.tsx b/packages/web/src/components/dynamic-image/DynamicImage.tsx index e0e14a52c0e..6deaaa41d7f 100644 --- a/packages/web/src/components/dynamic-image/DynamicImage.tsx +++ b/packages/web/src/components/dynamic-image/DynamicImage.tsx @@ -6,7 +6,7 @@ import { ComponentPropsWithoutRef } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { Box } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index eec1eab3cb3..2e4ef9204ec 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -11,11 +11,11 @@ import { collectionPageLineupActions as tracksActions, imageBlank as placeholderCoverArt, newCollectionMetadata, - useGatedContentAccessMap, EditPlaylistValues, cacheCollectionsSelectors, useEditPlaylistModal } from '@audius/common' +import { useGatedContentAccessMap } from '@audius/common/hooks' import { capitalize } from 'lodash' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx index a4ddeebed44..39bcea92c52 100644 --- a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx +++ b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx @@ -1,11 +1,7 @@ import { useCallback, useEffect, useRef, useState } from 'react' -import { - FeatureFlags, - FEATURE_FLAG_OVERRIDE_KEY, - OverrideSetting, - accountSelectors -} from '@audius/common' +import { FeatureFlags, OverrideSetting, accountSelectors } from '@audius/common' +import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' import { Modal, ModalContent, diff --git a/packages/web/src/components/form-fields/HarmonyTextField.tsx b/packages/web/src/components/form-fields/HarmonyTextField.tsx index 176c8639180..9c7e2064a4d 100644 --- a/packages/web/src/components/form-fields/HarmonyTextField.tsx +++ b/packages/web/src/components/form-fields/HarmonyTextField.tsx @@ -1,6 +1,6 @@ import { Ref, forwardRef, useEffect } from 'react' -import { useDebouncedCallback } from '@audius/common' +import { useDebouncedCallback } from '@audius/common/hooks' import { TextInput, TextInputProps } from '@audius/harmony' import { useField, useFormikContext } from 'formik' diff --git a/packages/web/src/components/header/mobile/HeaderContextProvider.tsx b/packages/web/src/components/header/mobile/HeaderContextProvider.tsx index 431015c4f81..d417cb0431f 100644 --- a/packages/web/src/components/header/mobile/HeaderContextProvider.tsx +++ b/packages/web/src/components/header/mobile/HeaderContextProvider.tsx @@ -7,7 +7,7 @@ import { useContext } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { useHistory } from 'react-router-dom' import { useIsMobile } from 'hooks/useIsMobile' diff --git a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx index 33dbecde066..1dacd030907 100644 --- a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx +++ b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx @@ -4,9 +4,9 @@ import { RandomImage, accountSelectors, badgeTiers, - useSelectTierInfo, removeNullable } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import { Button, ButtonType, Popup, SegmentedControl } from '@audius/stems' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx b/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx index 596d853c862..ec43298b12c 100644 --- a/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx +++ b/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx @@ -1,6 +1,7 @@ import { ChangeEvent, useCallback, useEffect } from 'react' -import { Status, useSetInboxPermissions } from '@audius/common' +import { Status } from '@audius/common' +import { useSetInboxPermissions } from '@audius/common/hooks' import { ChatPermission } from '@audius/sdk' import { Button, diff --git a/packages/web/src/components/locked-content-modal/LockedContentModal.tsx b/packages/web/src/components/locked-content-modal/LockedContentModal.tsx index d74a31530f4..002c3193c7f 100644 --- a/packages/web/src/components/locked-content-modal/LockedContentModal.tsx +++ b/packages/web/src/components/locked-content-modal/LockedContentModal.tsx @@ -1,10 +1,7 @@ import { useCallback } from 'react' -import { - gatedContentActions, - useLockedContent, - useGatedContentAccess -} from '@audius/common' +import { gatedContentActions } from '@audius/common' +import { useGatedContentAccess, useLockedContent } from '@audius/common/hooks' import { IconLock, ModalContent, ModalHeader, ModalTitle } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/mobile-page-container/MobilePageContainer.tsx b/packages/web/src/components/mobile-page-container/MobilePageContainer.tsx index ce670aa2b2a..1cd033b6fa0 100644 --- a/packages/web/src/components/mobile-page-container/MobilePageContainer.tsx +++ b/packages/web/src/components/mobile-page-container/MobilePageContainer.tsx @@ -1,6 +1,7 @@ import { ReactNode, useEffect, useContext } from 'react' -import { playerSelectors, useInstanceVar } from '@audius/common' +import { playerSelectors } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx index b5a3c5eaf5e..b1ac918c770 100644 --- a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx +++ b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx @@ -3,9 +3,9 @@ import { FeatureFlags, chatSelectors, Name, - useAccountHasClaimableRewards, StringKeys } from '@audius/common' +import { useAccountHasClaimableRewards } from '@audius/common/hooks' import { IconCrown, IconDashboard, diff --git a/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx b/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx index 1d5ca587b17..ed150757cb8 100644 --- a/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx +++ b/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx @@ -7,9 +7,9 @@ import { CommonState, accountSelectors, averageColorSelectors, - DogEarType, - useGatedContentAccess + DogEarType } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { IconButton } from '@audius/stems' import { animated, useSpring } from '@react-spring/web' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx index 1671648447b..f36557ec9e2 100644 --- a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx @@ -2,11 +2,11 @@ import { useCallback } from 'react' import { Name, - useUIAudio, notificationsSelectors, ReactionNotification, getReactionFromRawValue } from '@audius/common' +import { useUIAudio } from '@audius/common/hooks' import { make } from 'common/store/analytics/actions' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx index c9357a99e65..fce57e93539 100644 --- a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx @@ -3,7 +3,6 @@ import { ComponentType, useCallback, useState } from 'react' import { Name, Nullable, - useUIAudio, notificationsSelectors, TipReceiveNotification, reactionOrder, @@ -11,6 +10,7 @@ import { reactionsUIActions, reactionsUISelectors } from '@audius/common' +import { useUIAudio } from '@audius/common/hooks' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/notification/Notification/TipSentNotification.tsx b/packages/web/src/components/notification/Notification/TipSentNotification.tsx index c539dc26310..8c0cf74502d 100644 --- a/packages/web/src/components/notification/Notification/TipSentNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipSentNotification.tsx @@ -2,10 +2,10 @@ import { useCallback } from 'react' import { Name, - useUIAudio, notificationsSelectors, TipSendNotification } from '@audius/common' +import { useUIAudio } from '@audius/common/hooks' import { make } from 'common/store/analytics/actions' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx index 0b5a26e898b..8574ea022de 100644 --- a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx +++ b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx @@ -2,11 +2,11 @@ import { MouseEventHandler, useCallback } from 'react' import { Nullable, - useTwitterButtonStatus, CommonState, cacheUsersActions, cacheUsersSelectors } from '@audius/common' +import { useTwitterButtonStatus } from '@audius/common/hooks' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/now-playing/NowPlaying.tsx b/packages/web/src/components/now-playing/NowPlaying.tsx index 05d661320c7..0392b31898d 100644 --- a/packages/web/src/components/now-playing/NowPlaying.tsx +++ b/packages/web/src/components/now-playing/NowPlaying.tsx @@ -23,13 +23,13 @@ import { playerSelectors, queueSelectors, playbackRateValueMap, - useGatedContentAccess, DogEarType, gatedContentSelectors, usePremiumContentPurchaseModal, ModalSource, FeatureFlags } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { Scrubber } from '@audius/stems' import { Location } from 'history' import { connect, useSelector } from 'react-redux' diff --git a/packages/web/src/components/now-playing/NowPlayingDrawer.tsx b/packages/web/src/components/now-playing/NowPlayingDrawer.tsx index fc609156a5c..aa1dae1d059 100644 --- a/packages/web/src/components/now-playing/NowPlayingDrawer.tsx +++ b/packages/web/src/components/now-playing/NowPlayingDrawer.tsx @@ -1,6 +1,7 @@ import { useEffect, useCallback } from 'react' -import { useInstanceVar, nowPlayingUIActions } from '@audius/common' +import { nowPlayingUIActions } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { useDispatch } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useSpring, animated } from 'react-spring' diff --git a/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx b/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx index 496f5fa79d2..abfd18904d0 100644 --- a/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx +++ b/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx @@ -7,9 +7,9 @@ import { SquareSizes, CommonState, cacheTracksSelectors, - useGatedContentAccess, playerSelectors } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import cn from 'classnames' import { useSelector } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx b/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx index f0f25dd4dd3..596319278ad 100644 --- a/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx +++ b/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx @@ -5,11 +5,11 @@ import { gatedContentSelectors, themeSelectors, Theme, - useGatedContentAccess, cacheTracksSelectors, CommonState, ModalSource } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { useSelector } from 'react-redux' import FavoriteButton from 'components/alt-button/FavoriteButton' diff --git a/packages/web/src/components/play-bar/mobile/PlayBar.tsx b/packages/web/src/components/play-bar/mobile/PlayBar.tsx index f839c9b90ad..8c42d78bc20 100644 --- a/packages/web/src/components/play-bar/mobile/PlayBar.tsx +++ b/packages/web/src/components/play-bar/mobile/PlayBar.tsx @@ -9,9 +9,9 @@ import { queueActions, tracksSocialActions, playerSelectors, - queueSelectors, - useGatedContentAccess + queueSelectors } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { IconLock } from '@audius/stems' import cn from 'classnames' import { connect, useSelector } from 'react-redux' diff --git a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx index 92590a448f6..4d8b48f5af1 100644 --- a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx @@ -4,20 +4,22 @@ import { PurchaseableTrackMetadata, PurchaseContentStage, Track, - isTrackPurchaseable, useGetTrackById, usePremiumContentPurchaseModal, - usePurchaseContentFormConfiguration, buyUSDCActions, purchaseContentActions, purchaseContentSelectors, isContentPurchaseInProgress, - usePayExtraPresets, PurchaseContentPage, - useFeatureFlag, FeatureFlags, PurchaseVendor } from '@audius/common' +import { + useFeatureFlag, + usePurchaseContentFormConfiguration, + usePayExtraPresets, + isTrackPurchaseable +} from '@audius/common/hooks' import { USDC } from '@audius/fixed-decimal' import { Flex } from '@audius/harmony' import { diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx index 0fc7e665b9e..04e89a2a22c 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx @@ -1,9 +1,9 @@ +import { PayExtraAmountPresetValues } from '@audius/common' import { - AMOUNT_PRESET, + PayExtraPreset, CUSTOM_AMOUNT, - PayExtraAmountPresetValues, - PayExtraPreset -} from '@audius/common' + AMOUNT_PRESET +} from '@audius/common/hooks' import { Text, Flex, SelectablePill } from '@audius/harmony' import { useField } from 'formik' diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx index ccb0b0db3f2..c7058cf20d9 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx @@ -2,18 +2,20 @@ import { useCallback, useEffect } from 'react' import { PurchaseContentStage, - usePayExtraPresets, - useUSDCBalance, - PURCHASE_METHOD, PurchaseVendor, - PURCHASE_VENDOR, - usePurchaseMethod, PurchaseMethod, - useFeatureFlag, FeatureFlags, - useRemoteVar, IntKeys } from '@audius/common' +import { + useFeatureFlag, + useRemoteVar, + useUSDCBalance, + usePayExtraPresets, + PURCHASE_METHOD, + PURCHASE_VENDOR, + usePurchaseMethod +} from '@audius/common/hooks' import { Flex } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx index 59aaa945c51..810f760fd23 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx @@ -5,9 +5,9 @@ import { PurchaseableTrackMetadata, PurchaseContentError, PurchaseContentStage, - formatPrice, - usePurchaseContentErrorMessage + formatPrice } from '@audius/common' +import { usePurchaseContentErrorMessage } from '@audius/common/hooks' import { Button } from '@audius/harmony' import { HarmonyPlainButton, diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts index 2e142df0c09..75e57e9ec03 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts @@ -1,8 +1,8 @@ import { purchaseContentSelectors, - isContentPurchaseInProgress, - useUSDCBalance + isContentPurchaseInProgress } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import { useSelector } from 'react-redux' import { usePurchaseSummaryValues } from './usePurchaseSummaryValues' diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts index 04d275f50b9..4a040dc3f00 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts @@ -1,14 +1,12 @@ +import { Nullable, BNUSDC, getPurchaseSummaryValues } from '@audius/common' import { - Nullable, - BNUSDC, - CUSTOM_AMOUNT, - AMOUNT_PRESET, + useUSDCPurchaseConfig, + usePayExtraPresets, getExtraAmount, - getPurchaseSummaryValues, PayExtraPreset, - usePayExtraPresets, - useUSDCPurchaseConfig -} from '@audius/common' + CUSTOM_AMOUNT, + AMOUNT_PRESET +} from '@audius/common/hooks' import { useField } from 'formik' export const usePurchaseSummaryValues = ({ diff --git a/packages/web/src/components/scroll-provider/ScrollProvider.tsx b/packages/web/src/components/scroll-provider/ScrollProvider.tsx index 87887df1606..4d80d5b8f5e 100644 --- a/packages/web/src/components/scroll-provider/ScrollProvider.tsx +++ b/packages/web/src/components/scroll-provider/ScrollProvider.tsx @@ -1,6 +1,6 @@ import { memo, createContext, useCallback } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { matchPath } from 'react-router-dom' import { useIsMobile } from 'hooks/useIsMobile' diff --git a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx index 663fcc9aac2..e2a4fd21d9f 100644 --- a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx +++ b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx @@ -11,11 +11,11 @@ import { cacheUsersSelectors, searchUsersModalSelectors, searchUsersModalActions, - useProxySelector, User, ID, Status } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { IconButton, IconRemove, diff --git a/packages/web/src/components/tipping/support/SupportingList.tsx b/packages/web/src/components/tipping/support/SupportingList.tsx index 1b9af2eea8b..c99914a2ceb 100644 --- a/packages/web/src/components/tipping/support/SupportingList.tsx +++ b/packages/web/src/components/tipping/support/SupportingList.tsx @@ -3,10 +3,10 @@ import { useCallback } from 'react' import { profilePageSelectors, MAX_PROFILE_SUPPORTING_TILES, - useRankedSupportingForUser, User, formatCount } from '@audius/common' +import { useRankedSupportingForUser } from '@audius/common/hooks' import { IconArrow } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/SendTip.tsx b/packages/web/src/components/tipping/tip-audio/SendTip.tsx index af1df5cba47..e6e0bea1b0c 100644 --- a/packages/web/src/components/tipping/tip-audio/SendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/SendTip.tsx @@ -19,13 +19,13 @@ import { tippingActions, walletSelectors, getTierAndNumberForBalance, - useGetFirstOrTopSupporter, OnRampProvider, buyAudioActions, FeatureFlags, StringKeys, isNullOrUndefined } from '@audius/common' +import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import { IconTrophy, TokenAmountInput, diff --git a/packages/web/src/components/track/Artwork.tsx b/packages/web/src/components/track/Artwork.tsx index 25c72e9707d..869469e074d 100644 --- a/packages/web/src/components/track/Artwork.tsx +++ b/packages/web/src/components/track/Artwork.tsx @@ -1,11 +1,7 @@ import { memo } from 'react' -import { - ID, - SquareSizes, - CoverArtSizes, - useLoadImageWithTimeout -} from '@audius/common' +import { ID, SquareSizes, CoverArtSizes } from '@audius/common' +import { useLoadImageWithTimeout } from '@audius/common/hooks' import { PbIconPlay as IconPlay, PbIconPause as IconPause, diff --git a/packages/web/src/components/track/DownloadRow.tsx b/packages/web/src/components/track/DownloadRow.tsx index 4dda4a31d2a..ef25c6cb4f8 100644 --- a/packages/web/src/components/track/DownloadRow.tsx +++ b/packages/web/src/components/track/DownloadRow.tsx @@ -5,9 +5,9 @@ import { ID, cacheTracksSelectors, DownloadQuality, - useDownloadableContentAccess, toastActions } from '@audius/common' +import { useDownloadableContentAccess } from '@audius/common/hooks' import { Flex, IconReceive, PlainButton, Text } from '@audius/harmony' import { useDispatch, shallowEqual, useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/DownloadSection.tsx b/packages/web/src/components/track/DownloadSection.tsx index 9c9d9e9c16b..718514ad5c8 100644 --- a/packages/web/src/components/track/DownloadSection.tsx +++ b/packages/web/src/components/track/DownloadSection.tsx @@ -1,15 +1,17 @@ import { useCallback, useState } from 'react' import { - useCurrentStems, ID, CommonState, cacheTracksSelectors, DownloadQuality, - useDownloadableContentAccess, usePremiumContentPurchaseModal, ModalSource } from '@audius/common' +import { + useCurrentStems, + useDownloadableContentAccess +} from '@audius/common/hooks' import { USDC } from '@audius/fixed-decimal' import { Flex, diff --git a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx index 3ddb00a02ac..712d0dd7113 100644 --- a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx @@ -19,10 +19,10 @@ import { tracksSocialActions, shareModalUIActions, playerSelectors, - useGatedContentAccess, gatedContentActions, Genre } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import cn from 'classnames' import { connect, useDispatch } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx index 2c048465598..7ab23e5c28e 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx @@ -19,10 +19,10 @@ import { repostsUserListActions, favoritesUserListActions, playerSelectors, - useGatedContentAccess, FeatureFlags, Genre } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/TrackTileArt.tsx b/packages/web/src/components/track/mobile/TrackTileArt.tsx index c91f78946af..e218ee273fa 100644 --- a/packages/web/src/components/track/mobile/TrackTileArt.tsx +++ b/packages/web/src/components/track/mobile/TrackTileArt.tsx @@ -1,12 +1,7 @@ import { memo } from 'react' -import { - ID, - CoverArtSizes, - SquareSizes, - Remix, - useLoadImageWithTimeout -} from '@audius/common' +import { ID, CoverArtSizes, SquareSizes, Remix } from '@audius/common' +import { useLoadImageWithTimeout } from '@audius/common/hooks' import cn from 'classnames' import CoSign from 'components/co-sign/CoSign' diff --git a/packages/web/src/components/tracks-table/TracksTable.tsx b/packages/web/src/components/tracks-table/TracksTable.tsx index fd20a646f20..d020abaa40b 100644 --- a/packages/web/src/components/tracks-table/TracksTable.tsx +++ b/packages/web/src/components/tracks-table/TracksTable.tsx @@ -1,12 +1,7 @@ import { MouseEvent, useCallback, useMemo, useRef } from 'react' -import { - formatCount, - formatSeconds, - UID, - useGatedContentAccessMap, - UserTrack -} from '@audius/common' +import { formatCount, formatSeconds, UID, UserTrack } from '@audius/common' +import { useGatedContentAccessMap } from '@audius/common/hooks' import { IconHidden, IconLock } from '@audius/stems' import cn from 'classnames' import moment from 'moment' diff --git a/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx b/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx index 40ed9dd100f..b667336a6e7 100644 --- a/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx +++ b/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx @@ -2,11 +2,11 @@ import { MouseEventHandler, useCallback } from 'react' import { Nullable, - useTwitterButtonStatus, CommonState, cacheUsersActions, cacheUsersSelectors } from '@audius/common' +import { useTwitterButtonStatus } from '@audius/common/hooks' import { Button, ButtonProps } from '@audius/harmony' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/upload/TrackPreviewNew.tsx b/packages/web/src/components/upload/TrackPreviewNew.tsx index af0717699cf..02b22bdbba3 100644 --- a/packages/web/src/components/upload/TrackPreviewNew.tsx +++ b/packages/web/src/components/upload/TrackPreviewNew.tsx @@ -3,9 +3,9 @@ import { useState } from 'react' import { FeatureFlags, StemCategory, - stemCategoryFriendlyNames, - useFeatureFlag + stemCategoryFriendlyNames } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' import { Box, FilterButton, Flex, IconPenSquare } from '@audius/harmony' import { HarmonyPlainButton, IconTrash } from '@audius/stems' import numeral from 'numeral' diff --git a/packages/web/src/components/usdc-balance-fetcher/USDCBalanceFetcher.tsx b/packages/web/src/components/usdc-balance-fetcher/USDCBalanceFetcher.tsx index 1fc033196be..6653c45883d 100644 --- a/packages/web/src/components/usdc-balance-fetcher/USDCBalanceFetcher.tsx +++ b/packages/web/src/components/usdc-balance-fetcher/USDCBalanceFetcher.tsx @@ -1,4 +1,5 @@ -import { useUSDCBalance } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' +import {} from '@audius/common' export const USDCBalanceFetcher = () => { useUSDCBalance() diff --git a/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx b/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx index c5e881615e6..81e17ecab81 100644 --- a/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx +++ b/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx @@ -2,9 +2,9 @@ import { BNUSDC, Status, formatCurrencyBalance, - formatUSDCWeiToFloorCentsNumber, - useUSDCBalance + formatUSDCWeiToFloorCentsNumber } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import { LogoUSDC } from '@audius/stems' import BN from 'bn.js' import cn from 'classnames' diff --git a/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx b/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx index 638c6623ade..0e4f59a57f6 100644 --- a/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx +++ b/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx @@ -3,10 +3,9 @@ import { useCallback, useContext } from 'react' import { Name, isContentPurchaseInProgress, - purchaseContentSelectors, - useCreateUserbankIfNeeded, - useUSDCBalance + purchaseContentSelectors } from '@audius/common' +import { useUSDCBalance, useCreateUserbankIfNeeded } from '@audius/common/hooks' import { USDC } from '@audius/fixed-decimal' import { Button, Flex, IconLogoCircleUSDC } from '@audius/harmony' import { IconError } from '@audius/stems' diff --git a/packages/web/src/components/user-badges/ProfilePageBadge.tsx b/packages/web/src/components/user-badges/ProfilePageBadge.tsx index 8fe9f91154e..fbc35dfcda4 100644 --- a/packages/web/src/components/user-badges/ProfilePageBadge.tsx +++ b/packages/web/src/components/user-badges/ProfilePageBadge.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { ID, BadgeTier, modalsActions, useSelectTierInfo } from '@audius/common' +import { ID, BadgeTier, modalsActions } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/user-badges/UserBadges.tsx b/packages/web/src/components/user-badges/UserBadges.tsx index ce7067c5a8d..727fe404666 100644 --- a/packages/web/src/components/user-badges/UserBadges.tsx +++ b/packages/web/src/components/user-badges/UserBadges.tsx @@ -1,6 +1,7 @@ import { cloneElement, ReactElement } from 'react' -import { ID, BadgeTier, Nullable, useSelectTierInfo } from '@audius/common' +import { ID, BadgeTier, Nullable } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import cn from 'classnames' import IconBronzeBadgeSVG from 'assets/img/IconBronzeBadge.svg' diff --git a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx index fab362e9079..30d2572286b 100644 --- a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx @@ -2,7 +2,6 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { SolanaWalletAddress, - useUSDCBalance, useWithdrawUSDCModal, WithdrawUSDCModalPages, withdrawUSDCActions, @@ -13,11 +12,14 @@ import { Status, Name, WithdrawMethod, - useFeatureFlag, FeatureFlags, - useRemoteVar, IntKeys } from '@audius/common' +import { + useFeatureFlag, + useRemoteVar, + useUSDCBalance +} from '@audius/common/hooks' import { Modal, ModalContent, ModalHeader } from '@audius/stems' import BN from 'bn.js' import { Formik, FormikProps, useFormikContext } from 'formik' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx b/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx index 5549bc69ae3..13c0fc5a893 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx @@ -1,10 +1,7 @@ import { useCallback } from 'react' -import { - useCoinflowAdapter, - useCoinflowWithdrawModal, - withdrawUSDCActions -} from '@audius/common' +import { useCoinflowWithdrawModal, withdrawUSDCActions } from '@audius/common' +import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowWithdraw } from '@coinflowlabs/react' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx index e9c45b9b2a9..980f8434e30 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx @@ -4,11 +4,11 @@ import { WithdrawUSDCModalPages, decimalIntegerToHumanReadable, useWithdrawUSDCModal, - useUSDCBalance, formatUSDCWeiToFloorCentsNumber, BNUSDC, WithdrawMethod } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import { Button, IconQuestionCircle } from '@audius/harmony' import { Switch } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx index 4a50f2b9f8f..cc8c1d3a10a 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx @@ -6,7 +6,6 @@ import { } from 'react' import { - useUSDCBalance, BNUSDC, useWithdrawUSDCModal, WithdrawUSDCModalPages, @@ -16,9 +15,9 @@ import { decimalIntegerToHumanReadable, Name, WithdrawMethod, - FeatureFlags, - useFeatureFlag + FeatureFlags } from '@audius/common' +import { useFeatureFlag, useUSDCBalance } from '@audius/common/hooks' import { Button } from '@audius/harmony' import { SegmentedControl } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx index 9a54da83f2e..bed55501097 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { - useUSDCBalance, formatCurrencyBalance, BNUSDC, formatUSDCWeiToFloorDollarNumber, @@ -9,6 +8,7 @@ import { WithdrawUSDCModalPages, decimalIntegerToHumanReadable } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import BN from 'bn.js' import { useField } from 'formik' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx index 924d827f55b..5ba7a0fa4fc 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx @@ -1,9 +1,9 @@ import { - useUSDCBalance, BNUSDC, formatUSDCWeiToFloorCentsNumber, decimalIntegerToHumanReadable } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import BN from 'bn.js' import { useField } from 'formik' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx index 09df53ec7bf..1f91c6d08d9 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { - useUSDCBalance, BNUSDC, formatUSDCWeiToFloorCentsNumber, makeSolanaTransactionLink, @@ -11,6 +10,7 @@ import { Name, WithdrawMethod } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import { Button, Flex } from '@audius/harmony' import { HarmonyPlainButton, diff --git a/packages/web/src/hooks/useAsyncPoll.ts b/packages/web/src/hooks/useAsyncPoll.ts index fe341492991..41cdce94661 100644 --- a/packages/web/src/hooks/useAsyncPoll.ts +++ b/packages/web/src/hooks/useAsyncPoll.ts @@ -1,6 +1,8 @@ import { useEffect, useCallback } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' + +import {} from '@audius/common' type UseAsyncPoll = { // Call to make (usually an action), doesn't have to be async diff --git a/packages/web/src/hooks/useCardWeight.ts b/packages/web/src/hooks/useCardWeight.ts index 2101d3a6431..f557445ebae 100644 --- a/packages/web/src/hooks/useCardWeight.ts +++ b/packages/web/src/hooks/useCardWeight.ts @@ -1,6 +1,6 @@ import { useEffect, useRef, useCallback, MutableRefObject } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { InterpolationChain, useSpring } from 'react-spring' diff --git a/packages/web/src/hooks/useCollectionCoverArt.ts b/packages/web/src/hooks/useCollectionCoverArt.ts index f1030edd742..e809ec543d7 100644 --- a/packages/web/src/hooks/useCollectionCoverArt.ts +++ b/packages/web/src/hooks/useCollectionCoverArt.ts @@ -1,10 +1,10 @@ import { CoverArtSizes, SquareSizes, - useImageSize, cacheCollectionsActions, imageBlank as imageEmpty } from '@audius/common' +import { useImageSize } from '@audius/common/hooks' import { useDispatch } from 'react-redux' const { fetchCoverArt } = cacheCollectionsActions diff --git a/packages/web/src/hooks/useCoverPhoto.ts b/packages/web/src/hooks/useCoverPhoto.ts index 475ff3ea375..c4f653e8700 100644 --- a/packages/web/src/hooks/useCoverPhoto.ts +++ b/packages/web/src/hooks/useCoverPhoto.ts @@ -3,13 +3,13 @@ import { useCallback } from 'react' import { CoverPhotoSizes, WidthSizes, - useImageSize, cacheUsersActions, imageCoverPhotoBlank, cacheUsersSelectors, SquareSizes, imageProfilePicEmpty } from '@audius/common' +import { useImageSize } from '@audius/common/hooks' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/hooks/useDelayedEffect.ts b/packages/web/src/hooks/useDelayedEffect.ts index 13baa03f009..03a0e9d7f2a 100644 --- a/packages/web/src/hooks/useDelayedEffect.ts +++ b/packages/web/src/hooks/useDelayedEffect.ts @@ -1,6 +1,8 @@ import { useEffect } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' + +import {} from '@audius/common' /** * useDelayedEffect invokes a callback after a given delay on the satisfaction diff --git a/packages/web/src/hooks/useHasChangedRoute.ts b/packages/web/src/hooks/useHasChangedRoute.ts index ffc766120d1..8ec2e722fb8 100644 --- a/packages/web/src/hooks/useHasChangedRoute.ts +++ b/packages/web/src/hooks/useHasChangedRoute.ts @@ -1,6 +1,6 @@ import { useEffect } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { useHistory } from 'react-router-dom' /** diff --git a/packages/web/src/hooks/useImageSize.test.tsx b/packages/web/src/hooks/useImageSize.test.tsx index b1b424c51d1..70ea56cb8c8 100644 --- a/packages/web/src/hooks/useImageSize.test.tsx +++ b/packages/web/src/hooks/useImageSize.test.tsx @@ -2,9 +2,9 @@ import { BaseUserImageSizeProps, DefaultSizes, ImageSizesObject, - SquareSizes, - useImageSize + SquareSizes } from '@audius/common' +import { useImageSize } from '@audius/common/hooks' import { render } from '@testing-library/react' import type { Dispatch } from 'redux' import { expect, describe, it, vitest } from 'vitest' diff --git a/packages/web/src/hooks/useIsUSDCEnabled.ts b/packages/web/src/hooks/useIsUSDCEnabled.ts index 1964dad6a8d..cfae7b378db 100644 --- a/packages/web/src/hooks/useIsUSDCEnabled.ts +++ b/packages/web/src/hooks/useIsUSDCEnabled.ts @@ -1,4 +1,5 @@ -import { useFeatureFlag, FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' export const useIsUSDCEnabled = () => useFeatureFlag(FeatureFlags.USDC_PURCHASES).isEnabled diff --git a/packages/web/src/hooks/useLocalStorage.ts b/packages/web/src/hooks/useLocalStorage.ts index 367a1eca089..1ab49472579 100644 --- a/packages/web/src/hooks/useLocalStorage.ts +++ b/packages/web/src/hooks/useLocalStorage.ts @@ -1,4 +1,5 @@ -import { createUseLocalStorageHook } from '@audius/common' +import { createUseLocalStorageHook } from '@audius/common/hooks' +import {} from '@audius/common' const getJSONValue = (key: string) => { const val = window.localStorage.getItem(key) diff --git a/packages/web/src/hooks/useRemoteConfig.ts b/packages/web/src/hooks/useRemoteConfig.ts index bf7845baed2..f8e990d64c5 100644 --- a/packages/web/src/hooks/useRemoteConfig.ts +++ b/packages/web/src/hooks/useRemoteConfig.ts @@ -1,9 +1,8 @@ +import { accountSelectors, remoteConfigSelectors } from '@audius/common' import { createUseFeatureFlagHook, - createUseRemoteVarHook, - accountSelectors, - remoteConfigSelectors -} from '@audius/common' + createUseRemoteVarHook +} from '@audius/common/hooks' import { remoteConfigInstance } from 'services/remote-config/remote-config-instance' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/hooks/useTabs/useTabs.tsx b/packages/web/src/hooks/useTabs/useTabs.tsx index a2d88154681..aaf2dfc0957 100644 --- a/packages/web/src/hooks/useTabs/useTabs.tsx +++ b/packages/web/src/hooks/useTabs/useTabs.tsx @@ -13,7 +13,7 @@ import { createRef } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { disableBodyScroll, clearAllBodyScrollLocks } from 'body-scroll-lock' import cn from 'classnames' import { throttle } from 'lodash' diff --git a/packages/web/src/hooks/useTikTokAuth.ts b/packages/web/src/hooks/useTikTokAuth.ts index d3b3708e01b..0f95c707cd7 100644 --- a/packages/web/src/hooks/useTikTokAuth.ts +++ b/packages/web/src/hooks/useTikTokAuth.ts @@ -1,13 +1,8 @@ // Polyfills import 'whatwg-fetch' import 'url-search-params-polyfill' - -import { - Name, - Credentials, - UseTikTokAuthArguments, - createUseTikTokAuthHook -} from '@audius/common' +import { Name, Credentials, UseTikTokAuthArguments } from '@audius/common' +import { createUseTikTokAuthHook } from '@audius/common/hooks' import { useRecord, make } from 'common/store/analytics/actions' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' diff --git a/packages/web/src/hooks/useTrackCoverArt.ts b/packages/web/src/hooks/useTrackCoverArt.ts index 96504fc7620..6ce1029761b 100644 --- a/packages/web/src/hooks/useTrackCoverArt.ts +++ b/packages/web/src/hooks/useTrackCoverArt.ts @@ -1,13 +1,13 @@ import { CoverArtSizes, SquareSizes, - useImageSize, cacheTracksActions, imageBlank as imageEmpty, Maybe, cacheTracksSelectors, ID } from '@audius/common' +import { useImageSize } from '@audius/common/hooks' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/hooks/useUserProfilePicture.ts b/packages/web/src/hooks/useUserProfilePicture.ts index 3e57dcaeb4b..cd6f3c551e1 100644 --- a/packages/web/src/hooks/useUserProfilePicture.ts +++ b/packages/web/src/hooks/useUserProfilePicture.ts @@ -1,11 +1,11 @@ import { ProfilePictureSizes, SquareSizes, - useImageSize, cacheUsersActions, imageProfilePicEmpty as profilePicEmpty, cacheUsersSelectors } from '@audius/common' +import { useImageSize } from '@audius/common/hooks' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/hooks/wallet.tsx b/packages/web/src/hooks/wallet.tsx index 22207888d23..020a2fabbf4 100644 --- a/packages/web/src/hooks/wallet.tsx +++ b/packages/web/src/hooks/wallet.tsx @@ -1,8 +1,5 @@ -import { - accountSelectors, - profilePageSelectors, - useSelectTierInfo -} from '@audius/common' +import { accountSelectors, profilePageSelectors } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import { useSelector } from 'react-redux' const { getProfileUser } = profilePageSelectors diff --git a/packages/web/src/pages/audio-rewards-page/Tiers.tsx b/packages/web/src/pages/audio-rewards-page/Tiers.tsx index 7c1d78e2c10..769398fd1ed 100644 --- a/packages/web/src/pages/audio-rewards-page/Tiers.tsx +++ b/packages/web/src/pages/audio-rewards-page/Tiers.tsx @@ -7,9 +7,9 @@ import { badgeTiers, getTierNumber, vipDiscordModalActions, - musicConfettiActions, - useSelectTierInfo + musicConfettiActions } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import { Button, ButtonType, IconDiscord } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx index a0f7613626b..74a2cd22032 100644 --- a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx @@ -1,9 +1,9 @@ import { SolanaWalletAddress, WalletAddress, - FeatureFlags, - useCreateUserbankIfNeeded + FeatureFlags } from '@audius/common' +import { useCreateUserbankIfNeeded } from '@audius/common/hooks' import { Button, ButtonType, LogoSol } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx index eedd2dbb9e0..62ad2196185 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx @@ -5,9 +5,9 @@ import { OptimisticUserChallenge, challengeRewardsConfig, formatNumberCommas, - useAudioMatchingChallengeCooldownSchedule, challengesSelectors } from '@audius/common' +import { useAudioMatchingChallengeCooldownSchedule } from '@audius/common/hooks' import { IconArrowRight, IconCloudUpload, Text } from '@audius/harmony' import { HarmonyButton, diff --git a/packages/web/src/pages/chat-page/ChatPage.tsx b/packages/web/src/pages/chat-page/ChatPage.tsx index 3d1c17c6835..f61bec24a72 100644 --- a/packages/web/src/pages/chat-page/ChatPage.tsx +++ b/packages/web/src/pages/chat-page/ChatPage.tsx @@ -1,11 +1,7 @@ import { useCallback, useEffect, useRef } from 'react' -import { - chatActions, - FeatureFlags, - useCanSendMessage, - chatSelectors -} from '@audius/common' +import { chatActions, FeatureFlags, chatSelectors } from '@audius/common' +import { useCanSendMessage } from '@audius/common/hooks' import { ResizeObserver } from '@juggle/resize-observer' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/ChatHeader.tsx b/packages/web/src/pages/chat-page/components/ChatHeader.tsx index aa18e7159d4..62ffe08a8fa 100644 --- a/packages/web/src/pages/chat-page/components/ChatHeader.tsx +++ b/packages/web/src/pages/chat-page/components/ChatHeader.tsx @@ -1,11 +1,7 @@ import { forwardRef, useCallback, useState } from 'react' -import { - useProxySelector, - chatSelectors, - User, - useCreateChatModal -} from '@audius/common' +import { chatSelectors, User, useCreateChatModal } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { IconButton, IconCompose, diff --git a/packages/web/src/pages/chat-page/components/ChatListItem.tsx b/packages/web/src/pages/chat-page/components/ChatListItem.tsx index 2f5326249d7..6531365a3ab 100644 --- a/packages/web/src/pages/chat-page/components/ChatListItem.tsx +++ b/packages/web/src/pages/chat-page/components/ChatListItem.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { chatSelectors, useProxySelector } from '@audius/common' +import { chatSelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import type { UserChat } from '@audius/sdk' import cn from 'classnames' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageList.tsx b/packages/web/src/pages/chat-page/components/ChatMessageList.tsx index 07c4c9d5029..1ce87ec1cdf 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageList.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageList.tsx @@ -19,9 +19,9 @@ import { Status, hasTail, isEarliestUnread, - chatCanFetchMoreMessages, - useCanSendMessage + chatCanFetchMoreMessages } from '@audius/common' +import { useCanSendMessage } from '@audius/common/hooks' import { ResizeObserver } from '@juggle/resize-observer' import cn from 'classnames' import { throttle } from 'lodash' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx b/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx index a74ef478094..d4ee41b294d 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx @@ -7,14 +7,13 @@ import { decodeHashId, encodeHashId, ReactionTypes, - useProxySelector, formatMessageDate, isTrackUrl, isCollectionUrl, ChatMessageWithExtras, - Status, - useCanSendMessage + Status } from '@audius/common' +import { useProxySelector, useCanSendMessage } from '@audius/common/hooks' import { IconError, IconPlus, PopupPosition } from '@audius/stems' import cn from 'classnames' import { find } from 'linkifyjs' diff --git a/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx b/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx index 45862a1807f..a73f248ea5e 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx @@ -10,8 +10,6 @@ import { getPathFromPlaylistUrl, accountSelectors, useGetTracksByIds, - usePlayTrack, - usePauseTrack, ChatMessageTileProps, SquareSizes, cacheCollectionsActions, @@ -20,6 +18,7 @@ import { Name, useGetPlaylistByPermalink } from '@audius/common' +import { usePlayTrack, usePauseTrack } from '@audius/common/hooks' import { useDispatch, useSelector } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx index 222a48b4e23..c65c7d6e6ed 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx @@ -9,15 +9,14 @@ import { accountSelectors, useGetTrackByPermalink, getPathFromTrackUrl, - useToggleTrack, ID, TrackPlayback, ChatMessageTileProps, cacheTracksActions, SquareSizes, - Name, - useGatedContentAccess + Name } from '@audius/common' +import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' import { useDispatch, useSelector } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/chat-page/components/LinkPreview.tsx b/packages/web/src/pages/chat-page/components/LinkPreview.tsx index 9f33105d5e2..c068a85e829 100644 --- a/packages/web/src/pages/chat-page/components/LinkPreview.tsx +++ b/packages/web/src/pages/chat-page/components/LinkPreview.tsx @@ -1,10 +1,7 @@ import { MouseEventHandler, useCallback, useEffect } from 'react' -import { - isAudiusUrl, - useLinkUnfurlMetadata, - useLeavingAudiusModal -} from '@audius/common' +import { isAudiusUrl, useLeavingAudiusModal } from '@audius/common' +import { useLinkUnfurlMetadata } from '@audius/common/hooks' import cn from 'classnames' import styles from './LinkPreview.module.css' diff --git a/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx b/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx index 9cd8108fffb..bfa5776e30b 100644 --- a/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx @@ -10,9 +10,9 @@ import { User, CollectionsPageType, CollectionTrack, - OverflowAction, - useGatedContentAccessMap + OverflowAction } from '@audius/common' +import { useGatedContentAccessMap } from '@audius/common/hooks' import CollectionHeader from 'components/collection/mobile/CollectionHeader' import { HeaderContext } from 'components/header/mobile/HeaderContextProvider' diff --git a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx index 1353122fec4..98a32d5db25 100644 --- a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx +++ b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx @@ -2,9 +2,9 @@ import { Name, FeedFilter, feedPageLineupActions as feedActions, - FeatureFlags, - useFeatureFlag + FeatureFlags } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' import { make, useRecord } from 'common/store/analytics/actions' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx b/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx index 57f672fb5ec..a101a43909c 100644 --- a/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx +++ b/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx @@ -1,6 +1,7 @@ import { memo, useEffect, useCallback, useContext } from 'react' -import { ID, UID, LineupTrack, useGatedContentAccessMap } from '@audius/common' +import { ID, UID, LineupTrack } from '@audius/common' +import { useGatedContentAccessMap } from '@audius/common/hooks' import { Button, ButtonType } from '@audius/stems' import LoadingSpinner from 'components/loading-spinner/LoadingSpinner' diff --git a/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx b/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx index 70489398904..04985f0b54c 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx @@ -8,9 +8,9 @@ import { formatUSDCWeiToFloorCentsNumber, useWithdrawUSDCModal, useAddFundsModal, - useUSDCBalance, Status } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import { Button, PlainButton, IconQuestionCircle, Flex } from '@audius/harmony' import { LogoUSDC } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx index 7a81d9f0d12..35715035c0e 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx @@ -14,10 +14,10 @@ import { useAllPaginatedQuery, useGetUSDCTransactions, useGetUSDCTransactionsCount, - useUSDCBalance, useUSDCTransactionDetailsModal, useWithdrawUSDCModal } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import { full } from '@audius/sdk' import BN from 'bn.js' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx index a45ca26491f..5dc77a1f608 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx @@ -13,9 +13,9 @@ import { ProfilePageTabs, profilePageFeedLineupActions as feedActions, badgeTiers, - useSelectTierInfo, CreatePlaylistSource } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import IconAlbum from 'assets/img/iconAlbum.svg' import IconCollectibles from 'assets/img/iconCollectibles.svg' diff --git a/packages/web/src/pages/profile-page/components/mobile/GrowingCoverPhoto.tsx b/packages/web/src/pages/profile-page/components/mobile/GrowingCoverPhoto.tsx index 38d68b55934..e05cfe9d0a2 100644 --- a/packages/web/src/pages/profile-page/components/mobile/GrowingCoverPhoto.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/GrowingCoverPhoto.tsx @@ -1,6 +1,6 @@ import { useEffect, useCallback } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useSpring, animated } from 'react-spring' diff --git a/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx b/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx index 98801283248..8d6556d97ce 100644 --- a/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx @@ -13,9 +13,9 @@ import { ProfileUser, profilePageTracksLineupActions as tracksActions, profilePageFeedLineupActions as feedActions, - badgeTiers, - useSelectTierInfo + badgeTiers } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import cn from 'classnames' import IconAlbum from 'assets/img/iconAlbum.svg' diff --git a/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx b/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx index 1457cc1b735..69d70552c92 100644 --- a/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx +++ b/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx @@ -20,10 +20,12 @@ import { cacheCollectionsSelectors, cacheUsersSelectors, savedPageSelectors, - statusIsNotFinalized, - useDebouncedCallback, - useGatedContentAccessMap + statusIsNotFinalized } from '@audius/common' +import { + useGatedContentAccessMap, + useDebouncedCallback +} from '@audius/common/hooks' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-on/components/desktop/SignInPage.tsx b/packages/web/src/pages/sign-on/components/desktop/SignInPage.tsx index b2e0b7469fb..e76840066a5 100644 --- a/packages/web/src/pages/sign-on/components/desktop/SignInPage.tsx +++ b/packages/web/src/pages/sign-on/components/desktop/SignInPage.tsx @@ -6,7 +6,7 @@ import { KeyboardEvent } from 'react' -import { useInstanceVar } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/sign-up-page/components/HandleField.tsx b/packages/web/src/pages/sign-up-page/components/HandleField.tsx index 51da26fba3f..d4dded34cb1 100644 --- a/packages/web/src/pages/sign-up-page/components/HandleField.tsx +++ b/packages/web/src/pages/sign-up-page/components/HandleField.tsx @@ -1,10 +1,7 @@ import { Ref, forwardRef, useCallback, useContext } from 'react' -import { - MAX_HANDLE_LENGTH, - pickHandleErrorMessages, - useIsWaitingForValidation -} from '@audius/common' +import { MAX_HANDLE_LENGTH, pickHandleErrorMessages } from '@audius/common' +import { useIsWaitingForValidation } from '@audius/common/hooks' import { socialMediaMessages, pickHandlePageMessages as messages diff --git a/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx b/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx index 384085dc84d..1f7c1122877 100644 --- a/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx +++ b/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx @@ -4,9 +4,9 @@ import { Track, User, trackPageLineupActions, - QueueItem, - useGatedContentAccess + QueueItem } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import cn from 'classnames' import CoverPhoto from 'components/cover-photo/CoverPhoto' diff --git a/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx b/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx index 0aaa3b5a396..5def735c51c 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx @@ -7,9 +7,9 @@ import { User, trackPageLineupActions, QueueItem, - OverflowAction, - useGatedContentAccess + OverflowAction } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { HeaderContext } from 'components/header/mobile/HeaderContextProvider' import Lineup from 'components/lineup/Lineup' diff --git a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx index c8848e2f09f..c437cecf6ed 100644 --- a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx +++ b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx @@ -12,16 +12,18 @@ import { Nullable, TrackAvailabilityType, USDCPurchaseConfig, - useUSDCPurchaseConfig, - useAccessAndRemixSettings, CollectibleGatedConditions, USDCPurchaseConditions, FollowGatedConditions, TipGatedConditions, ID, - useFeatureFlag, AccessConditions } from '@audius/common' +import { + useFeatureFlag, + useUSDCPurchaseConfig, + useAccessAndRemixSettings +} from '@audius/common/hooks' import { IconCart, IconCollectible, diff --git a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx index 46aa587e094..e9a0bf3b4a7 100644 --- a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx +++ b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx @@ -4,10 +4,10 @@ import { getPathFromTrackUrl, useGetTrackByPermalink, accountSelectors, - useGatedContentAccess, isContentUSDCPurchaseGated, isContentCollectibleGated } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { useField } from 'formik' import { useSelector } from 'react-redux' import { useThrottle } from 'react-use' diff --git a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx index 746bc7c5aa0..be4023d2e84 100644 --- a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx @@ -1,9 +1,9 @@ import { AccessConditions, TrackAvailabilityType, - collectiblesSelectors, - useAccessAndRemixSettings + collectiblesSelectors } from '@audius/common' +import { useAccessAndRemixSettings } from '@audius/common/hooks' import { IconCollectible } from '@audius/stems' import { ModalRadioItem } from 'components/modal-radio/ModalRadioItem' diff --git a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx index 92321dbb1ac..3ad59981ca0 100644 --- a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx @@ -4,10 +4,9 @@ import { FeatureFlags, Name, AccessConditions, - TrackAvailabilityType, - useAccessAndRemixSettings, - useFeatureFlag + TrackAvailabilityType } from '@audius/common' +import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' import { IconCart, IconStars } from '@audius/stems' import { ExternalLink } from 'components/link' diff --git a/packages/web/src/services/remote-config/featureFlagHelpers.ts b/packages/web/src/services/remote-config/featureFlagHelpers.ts index 60f81175fee..e1497400e00 100644 --- a/packages/web/src/services/remote-config/featureFlagHelpers.ts +++ b/packages/web/src/services/remote-config/featureFlagHelpers.ts @@ -1,8 +1,5 @@ -import { - FeatureFlags, - FEATURE_FLAG_OVERRIDE_KEY, - OverrideSetting -} from '@audius/common' +import { FeatureFlags, OverrideSetting } from '@audius/common' +import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' import { remoteConfigInstance } from './remote-config-instance' From 4c92bc514168e17fb1031a4b58f4ba03d4116c94 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 11:59:21 -0800 Subject: [PATCH 15/64] Update import alias in common --- packages/common/src/api/account.ts | 2 +- packages/common/src/api/collection.ts | 6 +-- packages/common/src/api/developerApps.ts | 6 +-- packages/common/src/api/favorites.ts | 6 +-- packages/common/src/api/library.ts | 14 ++--- packages/common/src/api/purchases.ts | 10 ++-- packages/common/src/api/relatedArtists.ts | 4 +- packages/common/src/api/signUp.ts | 10 ++-- packages/common/src/api/suggestedTracks.ts | 22 ++++---- packages/common/src/api/topArtists.ts | 6 +-- packages/common/src/api/track.ts | 8 +-- packages/common/src/api/trending.ts | 12 ++--- packages/common/src/api/user.ts | 10 ++-- packages/common/src/api/utils.ts | 2 +- .../src/audius-query/AudiusQueryContext.ts | 4 +- packages/common/src/audius-query/createApi.ts | 26 +++++----- .../audius-query/hooks/usePaginatedQuery.ts | 2 +- packages/common/src/audius-query/schema.ts | 2 +- packages/common/src/audius-query/types.ts | 2 +- packages/common/src/audius-query/utils.ts | 4 +- packages/common/src/context/appContext.ts | 8 +-- packages/common/src/hooks/chats/types.ts | 2 +- .../src/hooks/chats/useCanSendMessage.ts | 8 +-- .../src/hooks/chats/useSetInboxPermissions.ts | 8 +-- .../common/src/hooks/chats/useTrackPlayer.ts | 10 ++-- packages/common/src/hooks/helpers.ts | 4 +- .../common/src/hooks/purchaseContent/types.ts | 2 +- .../useChallengeCooldownSchedule.ts | 10 ++-- .../purchaseContent/usePayExtraPresets.ts | 4 +- .../usePurchaseContentErrorMessage.ts | 8 +-- .../usePurchaseContentFormConfiguration.ts | 8 +-- .../purchaseContent/useUSDCPurchaseConfig.ts | 2 +- .../common/src/hooks/purchaseContent/utils.ts | 2 +- .../src/hooks/purchaseContent/validation.ts | 2 +- .../src/hooks/useAccessAndRemixSettings.ts | 8 +-- packages/common/src/hooks/useAudioBalance.ts | 8 +-- .../common/src/hooks/useCoinflowAdapter.ts | 2 +- .../src/hooks/useCreateUserbankIfNeeded.ts | 6 +-- .../src/hooks/useDownloadTrackButtons.ts | 2 +- packages/common/src/hooks/useFeatureFlag.ts | 2 +- packages/common/src/hooks/useGatedContent.ts | 16 +++--- .../src/hooks/useGeneratePlaylistArtwork.ts | 8 +-- .../src/hooks/useGetFirstOrTopSupporter.ts | 8 +-- .../common/src/hooks/useLinkUnfurlMetadata.ts | 4 +- .../common/src/hooks/usePurchaseMethod.ts | 2 +- .../common/src/hooks/useSavedCollections.ts | 4 +- packages/common/src/hooks/useTikTokAuth.ts | 2 +- .../src/hooks/useTwitterButtonStatus.ts | 4 +- packages/common/src/hooks/useUIAudio.ts | 4 +- packages/common/src/hooks/useUSDCBalance.ts | 12 ++--- packages/common/src/models/Analytics.ts | 14 ++--- packages/common/src/models/Cache.ts | 6 +-- packages/common/src/models/Chat.ts | 2 +- packages/common/src/models/Favorite.ts | 2 +- packages/common/src/models/Lineup.ts | 8 +-- packages/common/src/models/PlaylistLibrary.ts | 2 +- packages/common/src/models/Repost.ts | 2 +- packages/common/src/models/Search.ts | 2 +- packages/common/src/models/Stems.ts | 2 +- packages/common/src/models/Tipping.ts | 2 +- packages/common/src/models/Track.ts | 2 +- packages/common/src/models/User.ts | 14 ++--- packages/common/src/models/Wallet.ts | 2 +- .../sign-on/createLoginDetailsSchema.ts | 4 +- .../common/src/schemas/sign-on/emailSchema.ts | 4 +- .../schemas/sign-on/finishProfileSchema.ts | 2 +- .../src/schemas/sign-on/passwordSchema.ts | 2 +- .../src/schemas/sign-on/pickHandleSchema.ts | 6 +-- .../src/schemas/sign-on/selectGenresSchema.ts | 2 +- packages/common/src/services/Jupiter.ts | 4 +- packages/common/src/services/RandomImage.ts | 2 +- packages/common/src/services/audio-player.ts | 2 +- .../audius-api-client/ResponseAdapter.ts | 2 +- .../src/services/audius-api-client/helper.ts | 4 +- .../services/audius-backend/AudiusBackend.ts | 4 +- .../src/services/audius-backend/RecordIP.ts | 2 +- .../src/services/audius-backend/Rewards.ts | 4 +- .../src/services/audius-backend/solana.ts | 2 +- .../src/services/audius-backend/types.ts | 2 +- packages/common/src/services/env.ts | 2 +- .../services/local-storage/LocalStorage.ts | 4 +- .../src/services/oauth/formatSocialProfile.ts | 2 +- .../services/opensea-client/OpenSeaClient.ts | 2 +- .../services/remote-config/remote-config.ts | 4 +- .../src/services/sdk/storageNodeSelector.ts | 2 +- .../services/track-download/TrackDownload.ts | 2 +- .../services/wallet-client/WalletClient.ts | 8 +-- packages/common/src/store/account/sagas.ts | 4 +- .../common/src/store/account/selectors.ts | 6 +-- packages/common/src/store/account/slice.ts | 4 +- .../common/src/store/average-color/slice.ts | 2 +- packages/common/src/store/buy-crypto/sagas.ts | 30 +++++------ packages/common/src/store/buy-crypto/slice.ts | 6 +-- packages/common/src/store/buy-crypto/types.ts | 4 +- packages/common/src/store/buy-usdc/sagas.ts | 30 +++++------ .../common/src/store/buy-usdc/selectors.ts | 2 +- packages/common/src/store/buy-usdc/slice.ts | 6 +-- packages/common/src/store/buy-usdc/utils.ts | 10 ++-- packages/common/src/store/cache/actions.ts | 4 +- .../src/store/cache/collections/reducer.ts | 2 +- .../src/store/cache/collections/selectors.ts | 12 ++--- .../collections/utils/reformatCollection.ts | 4 +- packages/common/src/store/cache/reducer.ts | 4 +- packages/common/src/store/cache/selectors.ts | 4 +- .../common/src/store/cache/tracks/reducer.ts | 16 +++--- .../src/store/cache/tracks/selectors.ts | 4 +- .../common/src/store/cache/users/actions.ts | 2 +- .../store/cache/users/combinedSelectors.ts | 2 +- .../common/src/store/cache/users/reducer.ts | 16 +++--- .../common/src/store/cache/users/selectors.ts | 4 +- .../common/src/store/cache/users/utils.ts | 14 ++--- packages/common/src/store/cast/sagas.ts | 2 +- packages/common/src/store/cast/selectors.ts | 2 +- .../selectors/optimistic-challenges.ts | 8 +-- .../challenges/selectors/profile-progress.ts | 4 +- .../src/store/change-password/selectors.ts | 2 +- .../src/store/collectibles/selectors.ts | 2 +- packages/common/src/store/confirmer/sagas.ts | 4 +- .../common/src/store/confirmer/selectors.ts | 2 +- .../common/src/store/gated-content/sagas.ts | 22 ++++---- .../common/src/store/gated-content/slice.ts | 4 +- packages/common/src/store/lineup/actions.ts | 2 +- packages/common/src/store/lineup/reducer.ts | 4 +- packages/common/src/store/lineup/registry.ts | 4 +- packages/common/src/store/lineup/selectors.ts | 8 +-- .../src/store/notifications/selectors.ts | 12 ++--- .../common/src/store/notifications/slice.ts | 4 +- .../common/src/store/notifications/types.ts | 18 +++---- .../src/store/pages/ai/lineup/reducer.ts | 4 +- .../common/src/store/pages/ai/selectors.ts | 4 +- packages/common/src/store/pages/ai/slice.ts | 4 +- .../common/src/store/pages/chat/middleware.ts | 6 +-- packages/common/src/store/pages/chat/sagas.ts | 12 ++--- .../common/src/store/pages/chat/selectors.ts | 16 +++--- packages/common/src/store/pages/chat/slice.ts | 10 ++-- packages/common/src/store/pages/chat/utils.ts | 4 +- .../store/pages/collection/lineup/reducer.ts | 6 +-- .../src/store/pages/collection/reducer.ts | 2 +- .../src/store/pages/collection/selectors.ts | 10 ++-- .../src/store/pages/collection/types.ts | 4 +- .../explore/exploreCollections/selectors.ts | 6 +-- .../src/store/pages/explore/selectors.ts | 6 +-- .../src/store/pages/feed/lineup/reducer.ts | 6 +-- .../common/src/store/pages/feed/reducer.ts | 8 +-- .../common/src/store/pages/feed/selectors.ts | 6 +-- .../history-page/lineups/tracks/reducer.ts | 4 +- .../src/store/pages/history-page/reducer.ts | 2 +- .../src/store/pages/history-page/selectors.ts | 2 +- .../pages/premium-tracks/lineup/reducer.ts | 4 +- .../pages/premium-tracks/lineup/selectors.ts | 2 +- .../src/store/pages/premium-tracks/slice.ts | 2 +- .../common/src/store/pages/profile/actions.ts | 2 +- .../pages/profile/lineups/feed/reducer.ts | 6 +-- .../pages/profile/lineups/tracks/reducer.ts | 6 +-- .../common/src/store/pages/profile/reducer.ts | 8 +-- .../src/store/pages/profile/selectors.ts | 8 +-- .../src/store/pages/remixes/lineup/reducer.ts | 6 +-- .../src/store/pages/remixes/selectors.ts | 6 +-- .../common/src/store/pages/remixes/slice.ts | 2 +- .../src/store/pages/saved-page/actions.ts | 2 +- .../saved-page/lineups/tracks/reducer.ts | 6 +-- .../src/store/pages/saved-page/reducer.ts | 12 ++--- .../src/store/pages/saved-page/selectors.ts | 2 +- .../src/store/pages/saved-page/types.ts | 4 +- .../search-results/lineup/tracks/reducer.ts | 6 +-- .../src/store/pages/search-results/reducer.ts | 8 +-- .../store/pages/search-results/selectors.ts | 8 +-- .../src/store/pages/settings/actions.ts | 2 +- .../src/store/pages/settings/reducer.ts | 2 +- .../src/store/pages/settings/selectors.ts | 4 +- .../common/src/store/pages/settings/types.ts | 2 +- .../store/pages/smart-collection/selectors.ts | 2 +- .../src/store/pages/token-dashboard/slice.ts | 2 +- .../src/store/pages/track/lineup/reducer.ts | 6 +-- .../common/src/store/pages/track/reducer.ts | 8 +-- .../common/src/store/pages/track/selectors.ts | 8 +-- .../trending-playlists/lineups/reducer.ts | 4 +- .../trending-playlists/lineups/selectors.ts | 2 +- .../store/pages/trending-playlists/slice.ts | 2 +- .../trending-underground/lineup/reducer.ts | 4 +- .../trending-underground/lineup/selectors.ts | 2 +- .../store/pages/trending-underground/slice.ts | 2 +- .../src/store/pages/trending/actions.ts | 2 +- .../store/pages/trending/lineup/reducer.ts | 2 +- .../store/pages/trending/lineup/selectors.ts | 2 +- .../src/store/pages/trending/reducer.ts | 8 +-- .../src/store/pages/trending/selectors.ts | 2 +- .../src/store/playback-position/sagas.ts | 14 ++--- .../src/store/playback-position/selectors.ts | 2 +- .../src/store/playback-position/slice.ts | 2 +- .../src/store/playback-position/types.ts | 2 +- packages/common/src/store/player/sagas.ts | 4 +- .../src/store/playlist-library/helpers.ts | 4 +- .../src/store/playlist-library/selectors.ts | 4 +- .../playlist-updates/playlistUpdatesSagas.ts | 4 +- .../src/store/playlist-updates/types.ts | 2 +- .../src/store/purchase-content/sagas.ts | 52 +++++++++---------- .../src/store/purchase-content/selectors.ts | 2 +- .../src/store/purchase-content/slice.ts | 4 +- .../src/store/purchase-content/types.ts | 2 +- .../src/store/purchase-content/utils.test.ts | 4 +- .../src/store/purchase-content/utils.ts | 6 +-- .../common/src/store/reachability/sagas.ts | 2 +- .../src/store/reachability/selectors.ts | 2 +- packages/common/src/store/reducers.ts | 2 +- packages/common/src/store/sagas.ts | 20 +++---- .../src/store/saved-collections/selectors.ts | 4 +- packages/common/src/store/solana/selectors.ts | 2 +- .../src/store/stems-upload/selectors.ts | 2 +- .../store/ui/add-to-collection/selectors.ts | 2 +- .../src/store/ui/buy-audio/selectors.ts | 2 +- .../store/ui/collectible-details/selectors.ts | 2 +- .../selectors.ts | 2 +- .../slice.ts | 2 +- .../selectors.ts | 2 +- .../duplicate-add-confirmation-modal/slice.ts | 2 +- .../store/ui/mobile-overflow-menu/sagas.ts | 2 +- .../ui/mobile-overflow-menu/selectors.ts | 2 +- .../ui/modals/coinflow-onramp-modal/index.ts | 2 +- .../common/src/store/ui/modals/createModal.ts | 4 +- .../ui/modals/edit-playlist-modal/index.ts | 4 +- .../store/ui/modals/edit-track-modal/index.ts | 4 +- .../ui/modals/edit-track-modal/selectors.ts | 6 +-- .../modals/inbox-unavailable-modal/index.ts | 2 +- .../premium-content-purchase-modal/index.ts | 2 +- packages/common/src/store/ui/modals/sagas.ts | 4 +- .../common/src/store/ui/modals/selectors.ts | 2 +- packages/common/src/store/ui/modals/types.ts | 2 +- .../usdc-purchase-details-modal/index.ts | 2 +- .../usdc-transaction-details-modal/index.ts | 2 +- .../src/store/ui/now-playing/selectors.ts | 2 +- .../selectors.ts | 2 +- .../slice.ts | 2 +- .../selectors.ts | 2 +- .../src/store/ui/related-artists/sagas.ts | 14 ++--- .../src/store/ui/related-artists/selectors.ts | 8 +-- .../src/store/ui/related-artists/slice.ts | 2 +- .../src/store/ui/related-artists/types.ts | 2 +- .../src/store/ui/search-users-modal/sagas.ts | 14 ++--- .../store/ui/search-users-modal/selectors.ts | 2 +- .../src/store/ui/search-users-modal/slice.ts | 4 +- .../common/src/store/ui/share-modal/sagas.ts | 8 +-- .../src/store/ui/share-modal/selectors.ts | 2 +- .../common/src/store/ui/share-modal/types.ts | 2 +- .../share-sound-to-tiktok-modal/selectors.ts | 2 +- .../src/store/ui/stripe-modal/sagaHelpers.ts | 6 +-- .../common/src/store/ui/stripe-modal/sagas.ts | 8 +-- .../src/store/ui/stripe-modal/selectors.ts | 2 +- .../common/src/store/ui/stripe-modal/types.ts | 2 +- .../common/src/store/ui/theme/selectors.ts | 2 +- packages/common/src/store/ui/toast/sagas.ts | 2 +- .../common/src/store/ui/toast/selectors.ts | 2 +- .../store/ui/transaction-details/selectors.ts | 2 +- .../ui/upload-confirmation-modal/selectors.ts | 2 +- .../src/store/ui/withdraw-usdc/selectors.ts | 2 +- .../src/store/ui/withdraw-usdc/slice.ts | 2 +- .../store/user-list/favorites/selectors.ts | 2 +- .../src/store/user-list/favorites/types.ts | 2 +- .../store/user-list/followers/selectors.ts | 2 +- .../src/store/user-list/followers/types.ts | 2 +- .../store/user-list/following/selectors.ts | 2 +- .../src/store/user-list/following/types.ts | 2 +- .../src/store/user-list/mutuals/reducers.ts | 2 +- .../src/store/user-list/mutuals/selectors.ts | 2 +- .../src/store/user-list/mutuals/types.ts | 2 +- .../store/user-list/notifications/reducers.ts | 2 +- .../user-list/notifications/selectors.ts | 8 +-- .../store/user-list/notifications/types.ts | 2 +- .../user-list/related-artists/selectors.ts | 2 +- .../store/user-list/related-artists/types.ts | 2 +- .../src/store/user-list/reposts/selectors.ts | 2 +- .../src/store/user-list/reposts/types.ts | 2 +- packages/common/src/store/user-list/sagas.ts | 4 +- .../common/src/store/user-list/selectors.ts | 8 +-- .../store/user-list/supporting/selectors.ts | 2 +- .../src/store/user-list/supporting/types.ts | 2 +- .../user-list/top-supporters/selectors.ts | 2 +- .../store/user-list/top-supporters/types.ts | 2 +- packages/common/src/store/wallet/selectors.ts | 8 +-- packages/common/src/store/wallet/slice.ts | 2 +- packages/common/src/store/wallet/utils.ts | 8 +-- packages/common/src/utils/challenges.ts | 2 +- packages/common/src/utils/chatUtils.ts | 2 +- packages/common/src/utils/collectionUtils.ts | 4 +- packages/common/src/utils/dogEarUtils.ts | 4 +- packages/common/src/utils/formatUtil.test.ts | 2 +- packages/common/src/utils/formatUtil.ts | 2 +- packages/common/src/utils/sagaHelpers.ts | 2 +- packages/common/src/utils/streaming.ts | 4 +- packages/common/src/utils/uid.ts | 2 +- .../common/src/utils/updatePlaylistArtwork.ts | 8 +-- packages/common/src/utils/wallet.test.ts | 2 +- packages/common/src/utils/wallet.ts | 8 +-- packages/common/tsconfig.json | 11 +--- packages/convert-imports.js | 25 +++++++++ packages/web/tsconfig.json | 3 +- 296 files changed, 759 insertions(+), 742 deletions(-) create mode 100644 packages/convert-imports.js diff --git a/packages/common/src/api/account.ts b/packages/common/src/api/account.ts index 98282d6f9ac..7cb5e092795 100644 --- a/packages/common/src/api/account.ts +++ b/packages/common/src/api/account.ts @@ -1,4 +1,4 @@ -import { createApi } from 'audius-query' +import { createApi } from '~/audius-query' type ResetPasswordArgs = { email: string diff --git a/packages/common/src/api/collection.ts b/packages/common/src/api/collection.ts index d59b9d8a34b..07e549d4184 100644 --- a/packages/common/src/api/collection.ts +++ b/packages/common/src/api/collection.ts @@ -1,6 +1,6 @@ -import { createApi } from 'audius-query' -import { ID, Kind } from 'models' -import { Nullable } from 'utils' +import { createApi } from '~/audius-query' +import { ID, Kind } from '~/models' +import { Nullable } from '~/utils' const collectionApi = createApi({ reducerPath: 'collectionApi', diff --git a/packages/common/src/api/developerApps.ts b/packages/common/src/api/developerApps.ts index ec62ff9e7cc..c62877b68c7 100644 --- a/packages/common/src/api/developerApps.ts +++ b/packages/common/src/api/developerApps.ts @@ -1,8 +1,8 @@ import { z } from 'zod' -import { createApi } from 'audius-query' -import { ID } from 'models/Identifiers' -import { encodeHashId } from 'utils/hashIds' +import { createApi } from '~/audius-query' +import { ID } from '~/models/Identifiers' +import { encodeHashId } from '~/utils/hashIds' export const DEVELOPER_APP_DESCRIPTION_MAX_LENGTH = 128 export const DEVELOPER_APP_NAME_MAX_LENGTH = 50 diff --git a/packages/common/src/api/favorites.ts b/packages/common/src/api/favorites.ts index 64a1ec7ceaa..ca200d20eb1 100644 --- a/packages/common/src/api/favorites.ts +++ b/packages/common/src/api/favorites.ts @@ -1,6 +1,6 @@ -import { createApi } from 'audius-query' -import { ID } from 'models/Identifiers' -import { Nullable } from 'utils/typeUtils' +import { createApi } from '~/audius-query' +import { ID } from '~/models/Identifiers' +import { Nullable } from '~/utils/typeUtils' type GetFavoritedTrackListArgs = { currentUserId: Nullable diff --git a/packages/common/src/api/library.ts b/packages/common/src/api/library.ts index d6fc097add3..a4d21953136 100644 --- a/packages/common/src/api/library.ts +++ b/packages/common/src/api/library.ts @@ -1,12 +1,12 @@ import type { full } from '@audius/sdk' -import { AudiusQueryContextType, createApi } from 'audius-query' -import { UserCollectionMetadata } from 'models/Collection' -import { Kind } from 'models/Kind' -import { makeActivity } from 'services/audius-api-client/ResponseAdapter' -import { APIActivityV2 } from 'services/audius-api-client/types' -import { encodeHashId } from 'utils/hashIds' -import { removeNullable } from 'utils/typeUtils' +import { AudiusQueryContextType, createApi } from '~/audius-query' +import { UserCollectionMetadata } from '~/models/Collection' +import { Kind } from '~/models/Kind' +import { makeActivity } from '~/services/audius-api-client/ResponseAdapter' +import { APIActivityV2 } from '~/services/audius-api-client/types' +import { encodeHashId } from '~/utils/hashIds' +import { removeNullable } from '~/utils/typeUtils' type GetLibraryItemsArgs = { userId: number diff --git a/packages/common/src/api/purchases.ts b/packages/common/src/api/purchases.ts index b00cbb371cf..269cb847e1a 100644 --- a/packages/common/src/api/purchases.ts +++ b/packages/common/src/api/purchases.ts @@ -1,13 +1,13 @@ import type { full } from '@audius/sdk' -import { createApi } from 'audius-query' -import { ID } from 'models' +import { createApi } from '~/audius-query' +import { ID } from '~/models' import { USDCContentPurchaseType, USDCPurchaseDetails -} from 'models/USDCTransactions' -import { StringUSDC } from 'models/Wallet' -import { Nullable } from 'utils/typeUtils' +} from '~/models/USDCTransactions' +import { StringUSDC } from '~/models/Wallet' +import { Nullable } from '~/utils/typeUtils' import { trackApiFetch } from './track' import { HashId, Id } from './utils' diff --git a/packages/common/src/api/relatedArtists.ts b/packages/common/src/api/relatedArtists.ts index 653216de4bb..1ebe6ced52a 100644 --- a/packages/common/src/api/relatedArtists.ts +++ b/packages/common/src/api/relatedArtists.ts @@ -1,5 +1,5 @@ -import { createApi } from 'audius-query' -import { ID } from 'models/Identifiers' +import { createApi } from '~/audius-query' +import { ID } from '~/models/Identifiers' const relatedArtistsApi = createApi({ reducerPath: 'relatedArtistsApi', diff --git a/packages/common/src/api/signUp.ts b/packages/common/src/api/signUp.ts index cce4af1b6cc..96cad12d792 100644 --- a/packages/common/src/api/signUp.ts +++ b/packages/common/src/api/signUp.ts @@ -1,10 +1,10 @@ import { isEmpty } from 'lodash' -import { createApi } from 'audius-query' -import { FeatureFlags } from 'services/remote-config/feature-flags' -import { IntKeys } from 'services/remote-config/types' -import { parseHandleReservedStatusFromSocial } from 'utils/handleReservedStatus' -import { promiseWithTimeout } from 'utils/promiseWithTimeout' +import { createApi } from '~/audius-query' +import { FeatureFlags } from '~/services/remote-config/feature-flags' +import { IntKeys } from '~/services/remote-config/types' +import { parseHandleReservedStatusFromSocial } from '~/utils/handleReservedStatus' +import { promiseWithTimeout } from '~/utils/promiseWithTimeout' import { userApiFetch } from './user' diff --git a/packages/common/src/api/suggestedTracks.ts b/packages/common/src/api/suggestedTracks.ts index 882baec838a..39b26310c5c 100644 --- a/packages/common/src/api/suggestedTracks.ts +++ b/packages/common/src/api/suggestedTracks.ts @@ -3,17 +3,17 @@ import { useCallback, useEffect, useState } from 'react' import { difference, isEqual, shuffle } from 'lodash' import { useSelector, useDispatch } from 'react-redux' -import { usePaginatedQuery } from 'audius-query' -import { ID } from 'models/Identifiers' -import { Status } from 'models/Status' -import { TimeRange } from 'models/TimeRange' -import { Track, UserTrackMetadata } from 'models/Track' -import { getUserId } from 'store/account/selectors' -import { addTrackToPlaylist } from 'store/cache/collections/actions' -import { getCollection } from 'store/cache/collections/selectors' -import { getTrack } from 'store/cache/tracks/selectors' -import { CommonState } from 'store/index' -import { removeNullable } from 'utils/typeUtils' +import { usePaginatedQuery } from '~/audius-query' +import { ID } from '~/models/Identifiers' +import { Status } from '~/models/Status' +import { TimeRange } from '~/models/TimeRange' +import { Track, UserTrackMetadata } from '~/models/Track' +import { getUserId } from '~/store/account/selectors' +import { addTrackToPlaylist } from '~/store/cache/collections/actions' +import { getCollection } from '~/store/cache/collections/selectors' +import { getTrack } from '~/store/cache/tracks/selectors' +import { CommonState } from '~/store/index' +import { removeNullable } from '~/utils/typeUtils' import { useGetFavoritedTrackList } from './favorites' import { useGetTracksByIds } from './track' diff --git a/packages/common/src/api/topArtists.ts b/packages/common/src/api/topArtists.ts index 085559759e4..5631838c219 100644 --- a/packages/common/src/api/topArtists.ts +++ b/packages/common/src/api/topArtists.ts @@ -1,8 +1,8 @@ import { uniq } from 'lodash' -import { createApi } from 'audius-query' -import { ID } from 'models/Identifiers' -import { Kind } from 'models/Kind' +import { createApi } from '~/audius-query' +import { ID } from '~/models/Identifiers' +import { Kind } from '~/models/Kind' import { userApiFetch } from './user' diff --git a/packages/common/src/api/track.ts b/packages/common/src/api/track.ts index aa8d19e6b0e..200fbacd721 100644 --- a/packages/common/src/api/track.ts +++ b/packages/common/src/api/track.ts @@ -1,7 +1,7 @@ -import { createApi } from 'audius-query' -import { ID, Kind } from 'models' -import { parseTrackRouteFromPermalink } from 'utils/stringUtils' -import { Nullable } from 'utils/typeUtils' +import { createApi } from '~/audius-query' +import { ID, Kind } from '~/models' +import { parseTrackRouteFromPermalink } from '~/utils/stringUtils' +import { Nullable } from '~/utils/typeUtils' const trackApi = createApi({ reducerPath: 'trackApi', diff --git a/packages/common/src/api/trending.ts b/packages/common/src/api/trending.ts index 47567953099..b859e1c0b13 100644 --- a/packages/common/src/api/trending.ts +++ b/packages/common/src/api/trending.ts @@ -1,9 +1,9 @@ -import { createApi } from 'audius-query' -import { ID } from 'models/Identifiers' -import { Kind } from 'models/Kind' -import { TimeRange } from 'models/TimeRange' -import { Genre } from 'utils/genres' -import { Nullable } from 'utils/typeUtils' +import { createApi } from '~/audius-query' +import { ID } from '~/models/Identifiers' +import { Kind } from '~/models/Kind' +import { TimeRange } from '~/models/TimeRange' +import { Genre } from '~/utils/genres' +import { Nullable } from '~/utils/typeUtils' type GetTrendingArgs = { timeRange: TimeRange diff --git a/packages/common/src/api/user.ts b/packages/common/src/api/user.ts index f50a611af51..eb915cbee0f 100644 --- a/packages/common/src/api/user.ts +++ b/packages/common/src/api/user.ts @@ -1,14 +1,14 @@ import { full } from '@audius/sdk' -import { createApi } from 'audius-query' -import { ID, Kind, StringUSDC } from 'models' +import { createApi } from '~/audius-query' +import { ID, Kind, StringUSDC } from '~/models' import { USDCTransactionDetails, USDCTransactionMethod, USDCTransactionType -} from 'models/USDCTransactions' -import { getRootSolanaAccount } from 'services/audius-backend/solana' -import { Nullable } from 'utils/typeUtils' +} from '~/models/USDCTransactions' +import { getRootSolanaAccount } from '~/services/audius-backend/solana' +import { Nullable } from '~/utils/typeUtils' import { Id } from './utils' diff --git a/packages/common/src/api/utils.ts b/packages/common/src/api/utils.ts index b828533dcd1..035b0081c04 100644 --- a/packages/common/src/api/utils.ts +++ b/packages/common/src/api/utils.ts @@ -1,6 +1,6 @@ import { z } from 'zod' -import { decodeHashId, encodeHashId } from 'utils/hashIds' +import { decodeHashId, encodeHashId } from '~/utils/hashIds' export const HashId = z.string().transform((data: string, context) => { const id = decodeHashId(data) diff --git a/packages/common/src/audius-query/AudiusQueryContext.ts b/packages/common/src/audius-query/AudiusQueryContext.ts index 16fa0335e6f..619d316c79b 100644 --- a/packages/common/src/audius-query/AudiusQueryContext.ts +++ b/packages/common/src/audius-query/AudiusQueryContext.ts @@ -3,8 +3,8 @@ import { createContext, useContext } from 'react' import type { AudiusSdk } from '@audius/sdk' import type { Dispatch } from 'redux' -import type { AudiusAPIClient } from 'services/audius-api-client' -import { AudiusBackend, Env, RemoteConfigInstance } from 'services/index' +import type { AudiusAPIClient } from '~/services/audius-api-client' +import { AudiusBackend, Env, RemoteConfigInstance } from '~/services/index' import { ReportToSentryArgs } from '../models' diff --git a/packages/common/src/audius-query/createApi.ts b/packages/common/src/audius-query/createApi.ts index cb44e6bc5cb..1c59bd2014d 100644 --- a/packages/common/src/audius-query/createApi.ts +++ b/packages/common/src/audius-query/createApi.ts @@ -9,19 +9,19 @@ import { denormalize, normalize } from 'normalizr' import { useDispatch, useSelector } from 'react-redux' import { Dispatch } from 'redux' -import { useBooleanOnce } from 'hooks/useBooleanOnce' -import { CollectionMetadata, UserCollectionMetadata } from 'models/Collection' -import { ErrorLevel } from 'models/ErrorReporting' -import { Kind } from 'models/Kind' -import { Status, statusIsNotFinalized } from 'models/Status' -import { UserMetadata } from 'models/User' -import { getCollection } from 'store/cache/collections/selectors' -import { reformatCollection } from 'store/cache/collections/utils/reformatCollection' -import { getTrack } from 'store/cache/tracks/selectors' -import { reformatUser } from 'store/cache/users/utils' -import { CommonState } from 'store/reducers' -import { getErrorMessage } from 'utils/error' -import { Nullable, removeNullable } from 'utils/typeUtils' +import { useBooleanOnce } from '~/hooks/useBooleanOnce' +import { CollectionMetadata, UserCollectionMetadata } from '~/models/Collection' +import { ErrorLevel } from '~/models/ErrorReporting' +import { Kind } from '~/models/Kind' +import { Status, statusIsNotFinalized } from '~/models/Status' +import { UserMetadata } from '~/models/User' +import { getCollection } from '~/store/cache/collections/selectors' +import { reformatCollection } from '~/store/cache/collections/utils/reformatCollection' +import { getTrack } from '~/store/cache/tracks/selectors' +import { reformatUser } from '~/store/cache/users/utils' +import { CommonState } from '~/store/reducers' +import { getErrorMessage } from '~/utils/error' +import { Nullable, removeNullable } from '~/utils/typeUtils' import * as cacheActions from '../store/cache/actions' import * as cacheSelectors from '../store/cache/selectors' diff --git a/packages/common/src/audius-query/hooks/usePaginatedQuery.ts b/packages/common/src/audius-query/hooks/usePaginatedQuery.ts index 39cd7f39ad6..4be49170a68 100644 --- a/packages/common/src/audius-query/hooks/usePaginatedQuery.ts +++ b/packages/common/src/audius-query/hooks/usePaginatedQuery.ts @@ -3,7 +3,7 @@ import { useCallback, useState } from 'react' import { isEqual } from 'lodash' import { useCustomCompareEffect } from 'react-use' -import { Status } from 'models/Status' +import { Status } from '~/models/Status' import { QueryHookOptions, QueryHookResults } from '../types' diff --git a/packages/common/src/audius-query/schema.ts b/packages/common/src/audius-query/schema.ts index 660a7784eaf..767000cd8e9 100644 --- a/packages/common/src/audius-query/schema.ts +++ b/packages/common/src/audius-query/schema.ts @@ -1,6 +1,6 @@ import { schema } from 'normalizr' -import { Kind } from 'models/Kind' +import { Kind } from '~/models/Kind' export type SchemaKey = 'user' | 'users' | 'track' | 'tracks' diff --git a/packages/common/src/audius-query/types.ts b/packages/common/src/audius-query/types.ts index caaa4b47ccf..80aeda7bfb0 100644 --- a/packages/common/src/audius-query/types.ts +++ b/packages/common/src/audius-query/types.ts @@ -11,7 +11,7 @@ import { import AsyncRetry from 'async-retry' import { Dispatch } from 'redux' -import { Kind, Status } from 'models' +import { Kind, Status } from '~/models' import { AudiusQueryContextType } from './AudiusQueryContext' diff --git a/packages/common/src/audius-query/utils.ts b/packages/common/src/audius-query/utils.ts index a7d233368d2..ee0d1710950 100644 --- a/packages/common/src/audius-query/utils.ts +++ b/packages/common/src/audius-query/utils.ts @@ -1,7 +1,7 @@ import { mapValues } from 'lodash' -import { Kind } from 'models/Kind' -import { CommonState } from 'store/reducers' +import { Kind } from '~/models/Kind' +import { CommonState } from '~/store/reducers' import * as cacheSelectors from '../store/cache/selectors' diff --git a/packages/common/src/context/appContext.ts b/packages/common/src/context/appContext.ts index 366f5f14f28..baecb9ab834 100644 --- a/packages/common/src/context/appContext.ts +++ b/packages/common/src/context/appContext.ts @@ -2,10 +2,10 @@ import { createContext, useContext } from 'react' import type { StorageNodeSelectorService } from '@audius/sdk' -import { AnalyticsEvent, AllTrackingEvents } from 'models/Analytics' -import { AudiusBackend } from 'services/audius-backend' -import { LocalStorage } from 'services/local-storage' -import { RemoteConfigInstance } from 'services/remote-config' +import { AnalyticsEvent, AllTrackingEvents } from '~/models/Analytics' +import { AudiusBackend } from '~/services/audius-backend' +import { LocalStorage } from '~/services/local-storage' +import { RemoteConfigInstance } from '~/services/remote-config' type AppContextType = { analytics: { diff --git a/packages/common/src/hooks/chats/types.ts b/packages/common/src/hooks/chats/types.ts index 1f7a9975dde..d543f58251a 100644 --- a/packages/common/src/hooks/chats/types.ts +++ b/packages/common/src/hooks/chats/types.ts @@ -1,3 +1,3 @@ -import { Name } from 'models' +import { Name } from '~/models' export type TrackPlayback = Name.PLAYBACK_PLAY | Name.PLAYBACK_PAUSE diff --git a/packages/common/src/hooks/chats/useCanSendMessage.ts b/packages/common/src/hooks/chats/useCanSendMessage.ts index 6229d4f4fc5..28f19f653ef 100644 --- a/packages/common/src/hooks/chats/useCanSendMessage.ts +++ b/packages/common/src/hooks/chats/useCanSendMessage.ts @@ -1,12 +1,12 @@ import { useSelector } from 'react-redux' -import { useProxySelector } from 'hooks/useProxySelector' -import { User } from 'models/User' -import { ChatPermissionAction, CommonState } from 'store/index' +import { useProxySelector } from '~/hooks/useProxySelector' +import { User } from '~/models/User' +import { ChatPermissionAction, CommonState } from '~/store/index' import { getCanSendMessage, getOtherChatUsers -} from 'store/pages/chat/selectors' +} from '~/store/pages/chat/selectors' /** * Returns whether or not the current user can send messages to the current chat diff --git a/packages/common/src/hooks/chats/useSetInboxPermissions.ts b/packages/common/src/hooks/chats/useSetInboxPermissions.ts index c95019fc0f3..1325d0befed 100644 --- a/packages/common/src/hooks/chats/useSetInboxPermissions.ts +++ b/packages/common/src/hooks/chats/useSetInboxPermissions.ts @@ -4,11 +4,11 @@ import type { AudiusSdk } from '@audius/sdk' import { ChatPermission } from '@audius/sdk' import { useDispatch, useSelector } from 'react-redux' -import { Name } from 'models/Analytics' -import { Status } from 'models/Status' +import { Name } from '~/models/Analytics' +import { Status } from '~/models/Status' import { useAppContext } from 'src/context/appContext' -import { accountSelectors } from 'store/account' -import { chatActions, chatSelectors } from 'store/pages' +import { accountSelectors } from '~/store/account' +import { chatActions, chatSelectors } from '~/store/pages' const { fetchPermissions } = chatActions const { getUserChatPermissions } = chatSelectors diff --git a/packages/common/src/hooks/chats/useTrackPlayer.ts b/packages/common/src/hooks/chats/useTrackPlayer.ts index a3c13f71e39..8e852df93cb 100644 --- a/packages/common/src/hooks/chats/useTrackPlayer.ts +++ b/packages/common/src/hooks/chats/useTrackPlayer.ts @@ -2,11 +2,11 @@ import { useCallback } from 'react' import { useDispatch, useSelector } from 'react-redux' -import { ID, Name } from 'models' -import { getPlaying, getUid } from 'store/player/selectors' -import { QueueSource, Queueable, queueActions } from 'store/queue' -import { makeGetCurrent } from 'store/queue/selectors' -import { Nullable } from 'utils' +import { ID, Name } from '~/models' +import { getPlaying, getUid } from '~/store/player/selectors' +import { QueueSource, Queueable, queueActions } from '~/store/queue' +import { makeGetCurrent } from '~/store/queue/selectors' +import { Nullable } from '~/utils' import { TrackPlayback } from './types' diff --git a/packages/common/src/hooks/helpers.ts b/packages/common/src/hooks/helpers.ts index 1e04c3c5036..39050fbd022 100644 --- a/packages/common/src/hooks/helpers.ts +++ b/packages/common/src/hooks/helpers.ts @@ -1,7 +1,7 @@ import { useSelector } from 'react-redux' -import { getAccountUser } from 'store/account/selectors' -import { isRemoteConfigLoaded } from 'store/remote-config/selectors' +import { getAccountUser } from '~/store/account/selectors' +import { isRemoteConfigLoaded } from '~/store/remote-config/selectors' export const useHasAccount = () => !!useSelector(getAccountUser) export const useHasConfigLoaded = () => !!useSelector(isRemoteConfigLoaded) diff --git a/packages/common/src/hooks/purchaseContent/types.ts b/packages/common/src/hooks/purchaseContent/types.ts index d5651271073..48d2fc5ea2f 100644 --- a/packages/common/src/hooks/purchaseContent/types.ts +++ b/packages/common/src/hooks/purchaseContent/types.ts @@ -1,4 +1,4 @@ -import { USDCPurchaseConditions, UserTrackMetadata } from 'models/Track' +import { USDCPurchaseConditions, UserTrackMetadata } from '~/models/Track' /** Denotes the 3 preset amounts to show on the form, values are in cents. */ export type PayExtraAmountPresetValues = { diff --git a/packages/common/src/hooks/purchaseContent/useChallengeCooldownSchedule.ts b/packages/common/src/hooks/purchaseContent/useChallengeCooldownSchedule.ts index a9cae2e343f..0a3c77aa32e 100644 --- a/packages/common/src/hooks/purchaseContent/useChallengeCooldownSchedule.ts +++ b/packages/common/src/hooks/purchaseContent/useChallengeCooldownSchedule.ts @@ -1,13 +1,13 @@ import { useSelector } from 'react-redux' -import { ChallengeRewardID } from 'models/AudioRewards' +import { ChallengeRewardID } from '~/models/AudioRewards' import { UndisbursedUserChallenge, audioRewardsPageSelectors -} from 'store/pages' -import { isCooldownChallengeClaimable } from 'utils/challenges' -import dayjs, { Dayjs } from 'utils/dayjs' -import { utcToLocalTime } from 'utils/timeUtil' +} from '~/store/pages' +import { isCooldownChallengeClaimable } from '~/utils/challenges' +import dayjs, { Dayjs } from '~/utils/dayjs' +import { utcToLocalTime } from '~/utils/timeUtil' const { getUndisbursedUserChallenges } = audioRewardsPageSelectors diff --git a/packages/common/src/hooks/purchaseContent/usePayExtraPresets.ts b/packages/common/src/hooks/purchaseContent/usePayExtraPresets.ts index 3dc6e518086..bbaa70d86a3 100644 --- a/packages/common/src/hooks/purchaseContent/usePayExtraPresets.ts +++ b/packages/common/src/hooks/purchaseContent/usePayExtraPresets.ts @@ -1,7 +1,7 @@ import { useMemo } from 'react' -import { StringKeys } from 'services/remote-config' -import { parseIntList } from 'utils/stringUtils' +import { StringKeys } from '~/services/remote-config' +import { parseIntList } from '~/utils/stringUtils' import { useRemoteVar } from '../useRemoteVar' diff --git a/packages/common/src/hooks/purchaseContent/usePurchaseContentErrorMessage.ts b/packages/common/src/hooks/purchaseContent/usePurchaseContentErrorMessage.ts index 3f726cd54d4..af5176e0a8c 100644 --- a/packages/common/src/hooks/purchaseContent/usePurchaseContentErrorMessage.ts +++ b/packages/common/src/hooks/purchaseContent/usePurchaseContentErrorMessage.ts @@ -1,10 +1,10 @@ -import { BuyCryptoErrorCode } from 'store/buy-crypto/types' -import { BuyUSDCErrorCode } from 'store/index' +import { BuyCryptoErrorCode } from '~/store/buy-crypto/types' +import { BuyUSDCErrorCode } from '~/store/index' import { PurchaseContentErrorCode, PurchaseErrorCode -} from 'store/purchase-content' -import { formatPrice } from 'utils/formatUtil' +} from '~/store/purchase-content' +import { formatPrice } from '~/utils/formatUtil' import { useUSDCPurchaseConfig } from './useUSDCPurchaseConfig' diff --git a/packages/common/src/hooks/purchaseContent/usePurchaseContentFormConfiguration.ts b/packages/common/src/hooks/purchaseContent/usePurchaseContentFormConfiguration.ts index a36a9d2d97d..6dcca2c6de7 100644 --- a/packages/common/src/hooks/purchaseContent/usePurchaseContentFormConfiguration.ts +++ b/packages/common/src/hooks/purchaseContent/usePurchaseContentFormConfiguration.ts @@ -4,16 +4,16 @@ import { USDC } from '@audius/fixed-decimal' import BN from 'bn.js' import { useDispatch, useSelector } from 'react-redux' -import { PurchaseMethod, PurchaseVendor } from 'models/PurchaseContent' -import { UserTrackMetadata } from 'models/Track' +import { PurchaseMethod, PurchaseVendor } from '~/models/PurchaseContent' +import { UserTrackMetadata } from '~/models/Track' import { ContentType, PurchaseContentPage, isContentPurchaseInProgress, purchaseContentActions, purchaseContentSelectors -} from 'store/purchase-content' -import { Nullable } from 'utils/typeUtils' +} from '~/store/purchase-content' +import { Nullable } from '~/utils/typeUtils' import { useUSDCBalance } from '../useUSDCBalance' diff --git a/packages/common/src/hooks/purchaseContent/useUSDCPurchaseConfig.ts b/packages/common/src/hooks/purchaseContent/useUSDCPurchaseConfig.ts index 1c30cb871b2..a81b3f0ef01 100644 --- a/packages/common/src/hooks/purchaseContent/useUSDCPurchaseConfig.ts +++ b/packages/common/src/hooks/purchaseContent/useUSDCPurchaseConfig.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' -import { IntKeys } from 'services/remote-config' +import { IntKeys } from '~/services/remote-config' import { useRemoteVar } from '../useRemoteVar' diff --git a/packages/common/src/hooks/purchaseContent/utils.ts b/packages/common/src/hooks/purchaseContent/utils.ts index c14a9ff8598..a1aa9113562 100644 --- a/packages/common/src/hooks/purchaseContent/utils.ts +++ b/packages/common/src/hooks/purchaseContent/utils.ts @@ -1,4 +1,4 @@ -import { UserTrackMetadata, isContentUSDCPurchaseGated } from 'models/Track' +import { UserTrackMetadata, isContentUSDCPurchaseGated } from '~/models/Track' import { PayExtraAmountPresetValues, diff --git a/packages/common/src/hooks/purchaseContent/validation.ts b/packages/common/src/hooks/purchaseContent/validation.ts index c7e2ed4df95..5590687ce9a 100644 --- a/packages/common/src/hooks/purchaseContent/validation.ts +++ b/packages/common/src/hooks/purchaseContent/validation.ts @@ -1,6 +1,6 @@ import { z } from 'zod' -import { PurchaseMethod, PurchaseVendor } from 'models/PurchaseContent' +import { PurchaseMethod, PurchaseVendor } from '~/models/PurchaseContent' import { AMOUNT_PRESET, diff --git a/packages/common/src/hooks/useAccessAndRemixSettings.ts b/packages/common/src/hooks/useAccessAndRemixSettings.ts index b85971d7f57..4ae3ccd9a56 100644 --- a/packages/common/src/hooks/useAccessAndRemixSettings.ts +++ b/packages/common/src/hooks/useAccessAndRemixSettings.ts @@ -6,10 +6,10 @@ import { isContentFollowGated, isContentTipGated, isContentUSDCPurchaseGated -} from 'models/Track' -import { getSupportedUserCollections } from 'store/collectibles/selectors' -import { CommonState } from 'store/index' -import { Nullable } from 'utils/typeUtils' +} from '~/models/Track' +import { getSupportedUserCollections } from '~/store/collectibles/selectors' +import { CommonState } from '~/store/index' +import { Nullable } from '~/utils/typeUtils' type UseAccessAndRemixSettingsProps = { isUpload: boolean diff --git a/packages/common/src/hooks/useAudioBalance.ts b/packages/common/src/hooks/useAudioBalance.ts index 1bc88a8f5e0..964bd210fe2 100644 --- a/packages/common/src/hooks/useAudioBalance.ts +++ b/packages/common/src/hooks/useAudioBalance.ts @@ -3,10 +3,10 @@ import { useMemo } from 'react' import BN from 'bn.js' import { useSelector } from 'react-redux' -import { BNWei } from 'models/Wallet' -import { getAccountUser } from 'store/account/selectors' -import { getAccountTotalBalance } from 'store/wallet/selectors' -import { isNullOrUndefined } from 'utils/typeUtils' +import { BNWei } from '~/models/Wallet' +import { getAccountUser } from '~/store/account/selectors' +import { getAccountTotalBalance } from '~/store/wallet/selectors' +import { isNullOrUndefined } from '~/utils/typeUtils' /** * Pulls balances from account and wallet selectors. Will prefer the wallet diff --git a/packages/common/src/hooks/useCoinflowAdapter.ts b/packages/common/src/hooks/useCoinflowAdapter.ts index 48c7bf32bf3..ad436354347 100644 --- a/packages/common/src/hooks/useCoinflowAdapter.ts +++ b/packages/common/src/hooks/useCoinflowAdapter.ts @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react' import { TransactionHandler } from '@audius/sdk/dist/core' import { Connection, PublicKey, Transaction } from '@solana/web3.js' -import { getRootSolanaAccount } from 'services/audius-backend' +import { getRootSolanaAccount } from '~/services/audius-backend' import { useAppContext } from 'src/context' type CoinflowAdapter = { diff --git a/packages/common/src/hooks/useCreateUserbankIfNeeded.ts b/packages/common/src/hooks/useCreateUserbankIfNeeded.ts index 795e8354792..5090eff2a92 100644 --- a/packages/common/src/hooks/useCreateUserbankIfNeeded.ts +++ b/packages/common/src/hooks/useCreateUserbankIfNeeded.ts @@ -2,9 +2,9 @@ import { useEffect } from 'react' import { useSelector } from 'react-redux' -import { AnalyticsEvent } from 'models/Analytics' -import { AudiusBackend, createUserBankIfNeeded } from 'services/audius-backend' -import { solanaSelectors } from 'store/solana' +import { AnalyticsEvent } from '~/models/Analytics' +import { AudiusBackend, createUserBankIfNeeded } from '~/services/audius-backend' +import { solanaSelectors } from '~/store/solana' const { getFeePayer } = solanaSelectors export const useCreateUserbankIfNeeded = ({ diff --git a/packages/common/src/hooks/useDownloadTrackButtons.ts b/packages/common/src/hooks/useDownloadTrackButtons.ts index ee873213587..8103d408ac2 100644 --- a/packages/common/src/hooks/useDownloadTrackButtons.ts +++ b/packages/common/src/hooks/useDownloadTrackButtons.ts @@ -2,7 +2,7 @@ import { useMemo } from 'react' import { shallowEqual, useSelector } from 'react-redux' -import dayjs from 'utils/dayjs' +import dayjs from '~/utils/dayjs' import { ID } from '../models/Identifiers' import { stemCategoryFriendlyNames, StemCategory } from '../models/Stems' diff --git a/packages/common/src/hooks/useFeatureFlag.ts b/packages/common/src/hooks/useFeatureFlag.ts index e0f89e0f8e4..541f7fcad1e 100644 --- a/packages/common/src/hooks/useFeatureFlag.ts +++ b/packages/common/src/hooks/useFeatureFlag.ts @@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react' import { useEffectOnce } from 'react-use' import { useAppContext } from 'src/context/appContext' -import { Maybe } from 'utils/typeUtils' +import { Maybe } from '~/utils/typeUtils' import { FeatureFlags, RemoteConfigInstance } from '../services' diff --git a/packages/common/src/hooks/useGatedContent.ts b/packages/common/src/hooks/useGatedContent.ts index 2b9568dc164..ca574618911 100644 --- a/packages/common/src/hooks/useGatedContent.ts +++ b/packages/common/src/hooks/useGatedContent.ts @@ -2,8 +2,8 @@ import { useMemo } from 'react' import { useSelector } from 'react-redux' -import { Chain } from 'models/Chain' -import { ID } from 'models/Identifiers' +import { Chain } from '~/models/Chain' +import { ID } from '~/models/Identifiers' import { AccessConditions, Track, @@ -11,13 +11,13 @@ import { isContentFollowGated, isContentTipGated, isContentUSDCPurchaseGated -} from 'models/Track' +} from '~/models/Track' import { useGetCurrentUserId } from 'src/api' -import { getAccountUser } from 'store/account/selectors' -import { cacheTracksSelectors, cacheUsersSelectors } from 'store/cache' -import { gatedContentSelectors } from 'store/gated-content' -import { CommonState } from 'store/reducers' -import { Nullable, removeNullable } from 'utils' +import { getAccountUser } from '~/store/account/selectors' +import { cacheTracksSelectors, cacheUsersSelectors } from '~/store/cache' +import { gatedContentSelectors } from '~/store/gated-content' +import { CommonState } from '~/store/reducers' +import { Nullable, removeNullable } from '~/utils' const { getTrack } = cacheTracksSelectors const { getUser, getUsers } = cacheUsersSelectors diff --git a/packages/common/src/hooks/useGeneratePlaylistArtwork.ts b/packages/common/src/hooks/useGeneratePlaylistArtwork.ts index 65b70abbd11..3f3ac39584c 100644 --- a/packages/common/src/hooks/useGeneratePlaylistArtwork.ts +++ b/packages/common/src/hooks/useGeneratePlaylistArtwork.ts @@ -2,14 +2,14 @@ import { useCallback } from 'react' import { useSelector } from 'react-redux' -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' import { useAppContext } from 'src/context' import { getCollection, getCollectionTracks -} from 'store/cache/collections/selectors' -import { CommonState } from 'store/index' -import { updatePlaylistArtwork } from 'utils/updatePlaylistArtwork' +} from '~/store/cache/collections/selectors' +import { CommonState } from '~/store/index' +import { updatePlaylistArtwork } from '~/utils/updatePlaylistArtwork' export const useGeneratePlaylistArtwork = (collectionId: ID) => { const collection = useSelector((state: CommonState) => diff --git a/packages/common/src/hooks/useGetFirstOrTopSupporter.ts b/packages/common/src/hooks/useGetFirstOrTopSupporter.ts index 86c44da0dbc..9deb806c365 100644 --- a/packages/common/src/hooks/useGetFirstOrTopSupporter.ts +++ b/packages/common/src/hooks/useGetFirstOrTopSupporter.ts @@ -1,9 +1,9 @@ import { useEffect, useState } from 'react' -import { SupportersMap, SupportingMap } from 'store/tipping' -import { parseWeiNumber } from 'utils/formatUtil' -import { Nullable } from 'utils/typeUtils' -import { parseAudioInputToWei, stringWeiToBN } from 'utils/wallet' +import { SupportersMap, SupportingMap } from '~/store/tipping' +import { parseWeiNumber } from '~/utils/formatUtil' +import { Nullable } from '~/utils/typeUtils' +import { parseAudioInputToWei, stringWeiToBN } from '~/utils/wallet' import { ID, Supporter, User, BNWei, StringAudio, StringWei } from '../models' diff --git a/packages/common/src/hooks/useLinkUnfurlMetadata.ts b/packages/common/src/hooks/useLinkUnfurlMetadata.ts index e150fa53a3c..ba96906af52 100644 --- a/packages/common/src/hooks/useLinkUnfurlMetadata.ts +++ b/packages/common/src/hooks/useLinkUnfurlMetadata.ts @@ -2,8 +2,8 @@ import { useEffect } from 'react' import { useDispatch, useSelector } from 'react-redux' -import { CommonState } from 'store/index' -import { chatActions, chatSelectors } from 'store/pages/chat' +import { CommonState } from '~/store/index' +import { chatActions, chatSelectors } from '~/store/pages/chat' const { getUnfurlMetadata } = chatSelectors const { fetchLinkUnfurl } = chatActions diff --git a/packages/common/src/hooks/usePurchaseMethod.ts b/packages/common/src/hooks/usePurchaseMethod.ts index 14f798d5b40..0b468f84c90 100644 --- a/packages/common/src/hooks/usePurchaseMethod.ts +++ b/packages/common/src/hooks/usePurchaseMethod.ts @@ -3,7 +3,7 @@ import { useEffect } from 'react' import { USDC } from '@audius/fixed-decimal' import BN from 'bn.js' -import { PurchaseMethod } from 'models/PurchaseContent' +import { PurchaseMethod } from '~/models/PurchaseContent' import { useUSDCBalance } from './useUSDCBalance' diff --git a/packages/common/src/hooks/useSavedCollections.ts b/packages/common/src/hooks/useSavedCollections.ts index 1d74a90f3b1..6a87d55f659 100644 --- a/packages/common/src/hooks/useSavedCollections.ts +++ b/packages/common/src/hooks/useSavedCollections.ts @@ -2,8 +2,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react' import { useDispatch, useSelector } from 'react-redux' -import { ID } from 'models/Identifiers' -import { Status } from 'models/Status' +import { ID } from '~/models/Identifiers' +import { Status } from '~/models/Status' import { CommonState } from '../store' import { diff --git a/packages/common/src/hooks/useTikTokAuth.ts b/packages/common/src/hooks/useTikTokAuth.ts index 3c19f902ea3..0a55c88b837 100644 --- a/packages/common/src/hooks/useTikTokAuth.ts +++ b/packages/common/src/hooks/useTikTokAuth.ts @@ -1,4 +1,4 @@ -import dayjs from 'utils/dayjs' +import dayjs from '~/utils/dayjs' type CreateUseTikTokAuthHookArguments = { authenticate: () => Promise diff --git a/packages/common/src/hooks/useTwitterButtonStatus.ts b/packages/common/src/hooks/useTwitterButtonStatus.ts index 5f284d69a99..e63f9d0c240 100644 --- a/packages/common/src/hooks/useTwitterButtonStatus.ts +++ b/packages/common/src/hooks/useTwitterButtonStatus.ts @@ -1,7 +1,7 @@ import { useCallback, useEffect, useState } from 'react' -import { User } from 'models/User' -import { Nullable } from 'utils/typeUtils' +import { User } from '~/models/User' +import { Nullable } from '~/utils/typeUtils' type ShareStatus = 'idle' | 'loading' | 'success' diff --git a/packages/common/src/hooks/useUIAudio.ts b/packages/common/src/hooks/useUIAudio.ts index 93fa77d5631..636115e760f 100644 --- a/packages/common/src/hooks/useUIAudio.ts +++ b/packages/common/src/hooks/useUIAudio.ts @@ -2,8 +2,8 @@ import { useMemo } from 'react' import BN from 'bn.js' -import { BNWei, StringWei } from 'models/Wallet' -import { formatWei } from 'utils/wallet' +import { BNWei, StringWei } from '~/models/Wallet' +import { formatWei } from '~/utils/wallet' export const useUIAudio = (weiAudio: StringWei): number => useMemo(() => parseInt(formatWei(new BN(weiAudio) as BNWei), 10), [weiAudio]) diff --git a/packages/common/src/hooks/useUSDCBalance.ts b/packages/common/src/hooks/useUSDCBalance.ts index 1d58c38b995..a10c6214247 100644 --- a/packages/common/src/hooks/useUSDCBalance.ts +++ b/packages/common/src/hooks/useUSDCBalance.ts @@ -3,13 +3,13 @@ import { useCallback, useEffect, useState } from 'react' import BN from 'bn.js' import { useDispatch, useSelector } from 'react-redux' -import { Status } from 'models/Status' -import { BNUSDC, StringUSDC } from 'models/Wallet' -import { getUserbankAccountInfo } from 'services/index' +import { Status } from '~/models/Status' +import { BNUSDC, StringUSDC } from '~/models/Wallet' +import { getUserbankAccountInfo } from '~/services/index' import { useAppContext } from 'src/context/appContext' -import { getRecoveryStatus } from 'store/buy-usdc/selectors' -import { getUSDCBalance } from 'store/wallet/selectors' -import { setUSDCBalance } from 'store/wallet/slice' +import { getRecoveryStatus } from '~/store/buy-usdc/selectors' +import { getUSDCBalance } from '~/store/wallet/selectors' +import { setUSDCBalance } from '~/store/wallet/slice' import { useInterval } from './useInterval' diff --git a/packages/common/src/models/Analytics.ts b/packages/common/src/models/Analytics.ts index b9b9caf97d1..b248c5263b7 100644 --- a/packages/common/src/models/Analytics.ts +++ b/packages/common/src/models/Analytics.ts @@ -1,12 +1,12 @@ import { ChatPermission, Genre } from '@audius/sdk' -import { FeedFilter } from 'models/FeedFilter' -import { ID, PlayableType } from 'models/Identifiers' -import { MonitorPayload, ServiceMonitorType } from 'models/Services' -import { TimeRange } from 'models/TimeRange' -import { SolanaWalletAddress, StringAudio, WalletAddress } from 'models/Wallet' -import { MintName } from 'services/index' -import { Prettify } from 'utils/typeUtils' +import { FeedFilter } from '~/models/FeedFilter' +import { ID, PlayableType } from '~/models/Identifiers' +import { MonitorPayload, ServiceMonitorType } from '~/models/Services' +import { TimeRange } from '~/models/TimeRange' +import { SolanaWalletAddress, StringAudio, WalletAddress } from '~/models/Wallet' +import { MintName } from '~/services/index' +import { Prettify } from '~/utils/typeUtils' import { Chain } from './Chain' import { PlaylistLibraryKind } from './PlaylistLibrary' diff --git a/packages/common/src/models/Cache.ts b/packages/common/src/models/Cache.ts index 40ec083e544..4627cb70a21 100644 --- a/packages/common/src/models/Cache.ts +++ b/packages/common/src/models/Cache.ts @@ -1,6 +1,6 @@ -import { ID, UID } from 'models/Identifiers' -import { Kind } from 'models/Kind' -import { Status } from 'models/Status' +import { ID, UID } from '~/models/Identifiers' +import { Kind } from '~/models/Kind' +import { Status } from '~/models/Status' export type Cacheable = { metadata: T diff --git a/packages/common/src/models/Chat.ts b/packages/common/src/models/Chat.ts index 70e20160795..336204c130a 100644 --- a/packages/common/src/models/Chat.ts +++ b/packages/common/src/models/Chat.ts @@ -1,6 +1,6 @@ import type { ChatMessage, UnfurlResponse } from '@audius/sdk' -import { Status } from 'models' +import { Status } from '~/models' export type ChatMessageWithExtras = ChatMessage & { status?: Status diff --git a/packages/common/src/models/Favorite.ts b/packages/common/src/models/Favorite.ts index ca8716903ce..6113d835710 100644 --- a/packages/common/src/models/Favorite.ts +++ b/packages/common/src/models/Favorite.ts @@ -1,4 +1,4 @@ -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' export enum FavoriteType { TRACK = 'track', diff --git a/packages/common/src/models/Lineup.ts b/packages/common/src/models/Lineup.ts index 787a1da0a48..9ab2f499963 100644 --- a/packages/common/src/models/Lineup.ts +++ b/packages/common/src/models/Lineup.ts @@ -1,7 +1,7 @@ -import { ID, UID } from 'models/Identifiers' -import { Kind } from 'models/Kind' -import { Status } from 'models/Status' -import { Nullable } from 'utils/typeUtils' +import { ID, UID } from '~/models/Identifiers' +import { Kind } from '~/models/Kind' +import { Status } from '~/models/Status' +import { Nullable } from '~/utils/typeUtils' export type Lineup = { entries: T[] diff --git a/packages/common/src/models/PlaylistLibrary.ts b/packages/common/src/models/PlaylistLibrary.ts index ca09c7d25b1..4843bd7a5d6 100644 --- a/packages/common/src/models/PlaylistLibrary.ts +++ b/packages/common/src/models/PlaylistLibrary.ts @@ -1,4 +1,4 @@ -import { SmartCollectionVariant } from 'models/SmartCollectionVariant' +import { SmartCollectionVariant } from '~/models/SmartCollectionVariant' import { ID } from './Identifiers' diff --git a/packages/common/src/models/Repost.ts b/packages/common/src/models/Repost.ts index d16e926ebdb..bdfc6c02d04 100644 --- a/packages/common/src/models/Repost.ts +++ b/packages/common/src/models/Repost.ts @@ -1,4 +1,4 @@ -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' export type Repost = { repost_item_id: number diff --git a/packages/common/src/models/Search.ts b/packages/common/src/models/Search.ts index de8789cc8d8..c0e24b8b15c 100644 --- a/packages/common/src/models/Search.ts +++ b/packages/common/src/models/Search.ts @@ -1,4 +1,4 @@ -import { Nullable } from 'utils/typeUtils' +import { Nullable } from '~/utils/typeUtils' import { CollectionImage } from './Collection' import { Repost } from './Repost' diff --git a/packages/common/src/models/Stems.ts b/packages/common/src/models/Stems.ts index 73e4bc08f88..65dbb75183c 100644 --- a/packages/common/src/models/Stems.ts +++ b/packages/common/src/models/Stems.ts @@ -1,4 +1,4 @@ -import { Track } from 'models/Track' +import { Track } from '~/models/Track' export enum StemCategory { INSTRUMENTAL = 'INSTRUMENTAL', diff --git a/packages/common/src/models/Tipping.ts b/packages/common/src/models/Tipping.ts index 42d6e3e5abc..e0038d93f6f 100644 --- a/packages/common/src/models/Tipping.ts +++ b/packages/common/src/models/Tipping.ts @@ -1,4 +1,4 @@ -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' import { StringWei } from './Wallet' diff --git a/packages/common/src/models/Track.ts b/packages/common/src/models/Track.ts index 0b646c4b28a..dcf8283cb3d 100644 --- a/packages/common/src/models/Track.ts +++ b/packages/common/src/models/Track.ts @@ -1,4 +1,4 @@ -import { License } from 'utils/creativeCommons' +import { License } from '~/utils/creativeCommons' import { Nullable } from '../utils/typeUtils' diff --git a/packages/common/src/models/User.ts b/packages/common/src/models/User.ts index b44ff480726..cfbd990132c 100644 --- a/packages/common/src/models/User.ts +++ b/packages/common/src/models/User.ts @@ -1,10 +1,10 @@ -import { Collectible, CollectiblesMetadata } from 'models/Collectible' -import { Color } from 'models/Color' -import { CID, ID } from 'models/Identifiers' -import { CoverPhotoSizes, ProfilePictureSizes } from 'models/ImageSizes' -import { PlaylistLibrary } from 'models/PlaylistLibrary' -import { SolanaWalletAddress, StringWei, WalletAddress } from 'models/Wallet' -import { Nullable } from 'utils/typeUtils' +import { Collectible, CollectiblesMetadata } from '~/models/Collectible' +import { Color } from '~/models/Color' +import { CID, ID } from '~/models/Identifiers' +import { CoverPhotoSizes, ProfilePictureSizes } from '~/models/ImageSizes' +import { PlaylistLibrary } from '~/models/PlaylistLibrary' +import { SolanaWalletAddress, StringWei, WalletAddress } from '~/models/Wallet' +import { Nullable } from '~/utils/typeUtils' import { Timestamped } from './Timestamped' diff --git a/packages/common/src/models/Wallet.ts b/packages/common/src/models/Wallet.ts index 28fba7b365b..92b7636e4e1 100644 --- a/packages/common/src/models/Wallet.ts +++ b/packages/common/src/models/Wallet.ts @@ -1,6 +1,6 @@ import type BN from 'bn.js' -import { Brand } from 'utils/typeUtils' +import { Brand } from '~/utils/typeUtils' export type StringWei = Brand export type StringAudio = string diff --git a/packages/common/src/schemas/sign-on/createLoginDetailsSchema.ts b/packages/common/src/schemas/sign-on/createLoginDetailsSchema.ts index f77a038666d..6f2920abaa6 100644 --- a/packages/common/src/schemas/sign-on/createLoginDetailsSchema.ts +++ b/packages/common/src/schemas/sign-on/createLoginDetailsSchema.ts @@ -1,7 +1,7 @@ import { z } from 'zod' -import { AudiusQueryContextType } from 'audius-query' -import { isNotCommonPassword } from 'utils/commonPasswordCheck' +import { AudiusQueryContextType } from '~/audius-query' +import { isNotCommonPassword } from '~/utils/commonPasswordCheck' import { emailSchema } from './emailSchema' diff --git a/packages/common/src/schemas/sign-on/emailSchema.ts b/packages/common/src/schemas/sign-on/emailSchema.ts index 0538d9bb49e..5a8b538a09f 100644 --- a/packages/common/src/schemas/sign-on/emailSchema.ts +++ b/packages/common/src/schemas/sign-on/emailSchema.ts @@ -1,8 +1,8 @@ import { z } from 'zod' -import { AudiusQueryContextType } from 'audius-query' +import { AudiusQueryContextType } from '~/audius-query' import { signUpFetch } from 'src/api' -import { EMAIL_REGEX } from 'utils/email' +import { EMAIL_REGEX } from '~/utils/email' export const emailSchemaMessages = { emailRequired: 'Please enter an email.', diff --git a/packages/common/src/schemas/sign-on/finishProfileSchema.ts b/packages/common/src/schemas/sign-on/finishProfileSchema.ts index 21f7332fd93..d35f5317935 100644 --- a/packages/common/src/schemas/sign-on/finishProfileSchema.ts +++ b/packages/common/src/schemas/sign-on/finishProfileSchema.ts @@ -1,6 +1,6 @@ import { z } from 'zod' -import { MAX_DISPLAY_NAME_LENGTH } from 'services/oauth/formatSocialProfile' +import { MAX_DISPLAY_NAME_LENGTH } from '~/services/oauth/formatSocialProfile' export const finishProfileSchema = z.object({ displayName: z.string().max(MAX_DISPLAY_NAME_LENGTH, ''), diff --git a/packages/common/src/schemas/sign-on/passwordSchema.ts b/packages/common/src/schemas/sign-on/passwordSchema.ts index b3633e33398..89f38381948 100644 --- a/packages/common/src/schemas/sign-on/passwordSchema.ts +++ b/packages/common/src/schemas/sign-on/passwordSchema.ts @@ -1,6 +1,6 @@ import { z } from 'zod' -import { isNotCommonPassword } from 'utils/commonPasswordCheck' +import { isNotCommonPassword } from '~/utils/commonPasswordCheck' export const passwordSchema = z .object({ diff --git a/packages/common/src/schemas/sign-on/pickHandleSchema.ts b/packages/common/src/schemas/sign-on/pickHandleSchema.ts index 5fce36dfcc8..2961fb9b9d0 100644 --- a/packages/common/src/schemas/sign-on/pickHandleSchema.ts +++ b/packages/common/src/schemas/sign-on/pickHandleSchema.ts @@ -1,9 +1,9 @@ import { z } from 'zod' -import { AudiusQueryContextType } from 'audius-query' -import { MAX_HANDLE_LENGTH } from 'services/oauth' +import { AudiusQueryContextType } from '~/audius-query' +import { MAX_HANDLE_LENGTH } from '~/services/oauth' import { signUpFetch } from 'src/api' -import { restrictedHandles as commonRestrictedHandles } from 'utils/restrictedHandles' +import { restrictedHandles as commonRestrictedHandles } from '~/utils/restrictedHandles' export const pickHandleErrorMessages = { badCharacterError: 'Please only use A-Z, 0-9, . and _', diff --git a/packages/common/src/schemas/sign-on/selectGenresSchema.ts b/packages/common/src/schemas/sign-on/selectGenresSchema.ts index 12871961365..0e577eb726a 100644 --- a/packages/common/src/schemas/sign-on/selectGenresSchema.ts +++ b/packages/common/src/schemas/sign-on/selectGenresSchema.ts @@ -1,6 +1,6 @@ import { z } from 'zod' -import { GENRES, Genre, convertGenreLabelToValue } from 'utils/genres' +import { GENRES, Genre, convertGenreLabelToValue } from '~/utils/genres' const excludedGenres = new Set([ Genre.COMEDY, diff --git a/packages/common/src/services/Jupiter.ts b/packages/common/src/services/Jupiter.ts index 4206808c1c8..bdb584110c0 100644 --- a/packages/common/src/services/Jupiter.ts +++ b/packages/common/src/services/Jupiter.ts @@ -1,8 +1,8 @@ import { createJupiterApiClient, Instruction } from '@jup-ag/api' import { PublicKey, TransactionInstruction } from '@solana/web3.js' -import { Name } from 'models/Analytics' -import { CommonStoreContext } from 'store/storeContext' +import { Name } from '~/models/Analytics' +import { CommonStoreContext } from '~/store/storeContext' /** * The error that gets returned if the slippage is exceeded diff --git a/packages/common/src/services/RandomImage.ts b/packages/common/src/services/RandomImage.ts index 2f38c515585..b2bab436542 100644 --- a/packages/common/src/services/RandomImage.ts +++ b/packages/common/src/services/RandomImage.ts @@ -1,4 +1,4 @@ -import { Nullable } from 'utils/typeUtils' +import { Nullable } from '~/utils/typeUtils' const UNSPLASH_PUBLIC = 'https://source.unsplash.com/random' const UNSPLASH_API_GATEWAY = 'https://api.audius.co/unsplash/photos/random' diff --git a/packages/common/src/services/audio-player.ts b/packages/common/src/services/audio-player.ts index f27700f8c35..69d354ee390 100644 --- a/packages/common/src/services/audio-player.ts +++ b/packages/common/src/services/audio-player.ts @@ -1,4 +1,4 @@ -import { PlaybackRate } from 'store/player' +import { PlaybackRate } from '~/store/player' import { Nullable } from '../utils' diff --git a/packages/common/src/services/audius-api-client/ResponseAdapter.ts b/packages/common/src/services/audius-api-client/ResponseAdapter.ts index 911b4f8d04c..2c96eb24981 100644 --- a/packages/common/src/services/audius-api-client/ResponseAdapter.ts +++ b/packages/common/src/services/audius-api-client/ResponseAdapter.ts @@ -1,6 +1,6 @@ import { full } from '@audius/sdk' -import dayjs from 'utils/dayjs' +import dayjs from '~/utils/dayjs' import { ID, diff --git a/packages/common/src/services/audius-api-client/helper.ts b/packages/common/src/services/audius-api-client/helper.ts index 1595db88c6f..66ad62afcc5 100644 --- a/packages/common/src/services/audius-api-client/helper.ts +++ b/packages/common/src/services/audius-api-client/helper.ts @@ -1,5 +1,5 @@ -import { UserCollectionMetadata, UserTrackMetadata, UserMetadata } from 'models' -import { removeNullable } from 'utils' +import { UserCollectionMetadata, UserTrackMetadata, UserMetadata } from '~/models' +import { removeNullable } from '~/utils' import * as adapter from './ResponseAdapter' import { APIResponse, APISearch } from './types' diff --git a/packages/common/src/services/audius-backend/AudiusBackend.ts b/packages/common/src/services/audius-backend/AudiusBackend.ts index 7bc2829ce2d..4ae361ac6e5 100644 --- a/packages/common/src/services/audius-backend/AudiusBackend.ts +++ b/packages/common/src/services/audius-backend/AudiusBackend.ts @@ -17,8 +17,8 @@ import { import BN from 'bn.js' import queryString from 'query-string' -import { Env } from 'services/env' -import dayjs from 'utils/dayjs' +import { Env } from '~/services/env' +import dayjs from '~/utils/dayjs' import placeholderCoverArt from '../../assets/img/imageBlank2x.png' import imageCoverPhotoBlank from '../../assets/img/imageCoverPhotoBlank.jpg' diff --git a/packages/common/src/services/audius-backend/RecordIP.ts b/packages/common/src/services/audius-backend/RecordIP.ts index 9ae8bd2a0ba..e072f296e60 100644 --- a/packages/common/src/services/audius-backend/RecordIP.ts +++ b/packages/common/src/services/audius-backend/RecordIP.ts @@ -1,4 +1,4 @@ -import { getErrorMessage } from 'utils' +import { getErrorMessage } from '~/utils' import { AudiusBackend, AuthHeaders } from './AudiusBackend' diff --git a/packages/common/src/services/audius-backend/Rewards.ts b/packages/common/src/services/audius-backend/Rewards.ts index b65cc4d12e6..d78594677e2 100644 --- a/packages/common/src/services/audius-backend/Rewards.ts +++ b/packages/common/src/services/audius-backend/Rewards.ts @@ -1,5 +1,5 @@ -import { Name, AnalyticsEvent } from 'models/Analytics' -import { ErrorLevel, ReportToSentryArgs } from 'models/ErrorReporting' +import { Name, AnalyticsEvent } from '~/models/Analytics' +import { ErrorLevel, ReportToSentryArgs } from '~/models/ErrorReporting' /** * Reports Rewards claim outcome to Identity, Amplitude, Sentry diff --git a/packages/common/src/services/audius-backend/solana.ts b/packages/common/src/services/audius-backend/solana.ts index aefe5659a6c..c4dbc4dbafc 100644 --- a/packages/common/src/services/audius-backend/solana.ts +++ b/packages/common/src/services/audius-backend/solana.ts @@ -11,7 +11,7 @@ import { } from '@solana/web3.js' import BN from 'bn.js' -import { BN_USDC_CENT_WEI } from 'utils/wallet' +import { BN_USDC_CENT_WEI } from '~/utils/wallet' import { AnalyticsEvent, ID, Name, SolanaWalletAddress } from '../../models' diff --git a/packages/common/src/services/audius-backend/types.ts b/packages/common/src/services/audius-backend/types.ts index c3989bbecf7..f9c3093c7f3 100644 --- a/packages/common/src/services/audius-backend/types.ts +++ b/packages/common/src/services/audius-backend/types.ts @@ -1,4 +1,4 @@ -import { MonitorPayload } from 'models' +import { MonitorPayload } from '~/models' export type ServiceMonitoring = { healthCheck: (payload: MonitorPayload) => void diff --git a/packages/common/src/services/env.ts b/packages/common/src/services/env.ts index 3dff3318b3c..24a32b1e6fa 100644 --- a/packages/common/src/services/env.ts +++ b/packages/common/src/services/env.ts @@ -1,4 +1,4 @@ -import { Nullable } from 'utils/typeUtils' +import { Nullable } from '~/utils/typeUtils' export type Environment = 'development' | 'staging' | 'production' diff --git a/packages/common/src/services/local-storage/LocalStorage.ts b/packages/common/src/services/local-storage/LocalStorage.ts index d6332960e09..8b76e59cb20 100644 --- a/packages/common/src/services/local-storage/LocalStorage.ts +++ b/packages/common/src/services/local-storage/LocalStorage.ts @@ -1,7 +1,7 @@ import { CURRENT_USER_EXISTS_LOCAL_STORAGE_KEY } from '@audius/sdk/dist/core' -import { User } from 'models/User' -import { PLAYBACK_RATE_LS_KEY } from 'store/index' +import { User } from '~/models/User' +import { PLAYBACK_RATE_LS_KEY } from '~/store/index' import { Nullable } from '../../utils' diff --git a/packages/common/src/services/oauth/formatSocialProfile.ts b/packages/common/src/services/oauth/formatSocialProfile.ts index d742b505562..eef22ff726c 100644 --- a/packages/common/src/services/oauth/formatSocialProfile.ts +++ b/packages/common/src/services/oauth/formatSocialProfile.ts @@ -2,7 +2,7 @@ import { InstagramProfile, TikTokProfile, TwitterProfile -} from 'store/account/types' +} from '~/store/account/types' export const MAX_HANDLE_LENGTH = 30 export const MAX_DISPLAY_NAME_LENGTH = 32 diff --git a/packages/common/src/services/opensea-client/OpenSeaClient.ts b/packages/common/src/services/opensea-client/OpenSeaClient.ts index 229bcfda4b4..30f1ca79e98 100644 --- a/packages/common/src/services/opensea-client/OpenSeaClient.ts +++ b/packages/common/src/services/opensea-client/OpenSeaClient.ts @@ -1,4 +1,4 @@ -import { allSettled } from 'utils/allSettled' +import { allSettled } from '~/utils/allSettled' import { Collectible, diff --git a/packages/common/src/services/remote-config/remote-config.ts b/packages/common/src/services/remote-config/remote-config.ts index 9aeac93c311..7433824dbd8 100644 --- a/packages/common/src/services/remote-config/remote-config.ts +++ b/packages/common/src/services/remote-config/remote-config.ts @@ -2,8 +2,8 @@ import { EventEmitter } from 'events' import optimizely from '@optimizely/optimizely-sdk' -import { ID } from 'models' -import { Nullable } from 'utils' +import { ID } from '~/models' +import { Nullable } from '~/utils' import { Environment } from '../env' diff --git a/packages/common/src/services/sdk/storageNodeSelector.ts b/packages/common/src/services/sdk/storageNodeSelector.ts index b491b31056a..6b6fc639aa1 100644 --- a/packages/common/src/services/sdk/storageNodeSelector.ts +++ b/packages/common/src/services/sdk/storageNodeSelector.ts @@ -1,7 +1,7 @@ import type { Auth, StorageNodeSelectorService } from '@audius/sdk' import { StorageNodeSelector } from '@audius/sdk' -import { Maybe } from 'utils/typeUtils' +import { Maybe } from '~/utils/typeUtils' import { Env } from '../env' diff --git a/packages/common/src/services/track-download/TrackDownload.ts b/packages/common/src/services/track-download/TrackDownload.ts index a0ce676b9eb..c88e2b0f57e 100644 --- a/packages/common/src/services/track-download/TrackDownload.ts +++ b/packages/common/src/services/track-download/TrackDownload.ts @@ -1,4 +1,4 @@ -import { AudiusBackend } from 'services/audius-backend' +import { AudiusBackend } from '~/services/audius-backend' export type TrackDownloadConfig = { audiusBackend: AudiusBackend diff --git a/packages/common/src/services/wallet-client/WalletClient.ts b/packages/common/src/services/wallet-client/WalletClient.ts index 69bd3ce5365..5dd8e02092c 100644 --- a/packages/common/src/services/wallet-client/WalletClient.ts +++ b/packages/common/src/services/wallet-client/WalletClient.ts @@ -1,14 +1,14 @@ import BN from 'bn.js' -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' import { BNWei, SolanaWalletAddress, StringWei, WalletAddress -} from 'models/Wallet' -import { isNullOrUndefined } from 'utils/typeUtils' -import { stringWeiToBN } from 'utils/wallet' +} from '~/models/Wallet' +import { isNullOrUndefined } from '~/utils/typeUtils' +import { stringWeiToBN } from '~/utils/wallet' import { AudiusAPIClient } from '../audius-api-client' import { diff --git a/packages/common/src/store/account/sagas.ts b/packages/common/src/store/account/sagas.ts index 30366d21a66..0f96dc02cea 100644 --- a/packages/common/src/store/account/sagas.ts +++ b/packages/common/src/store/account/sagas.ts @@ -1,7 +1,7 @@ import { call, put, select, takeLatest } from 'typed-redux-saga' -import { getContext } from 'store/effects' -import { UPLOAD_TRACKS_SUCCEEDED } from 'store/upload/actions' +import { getContext } from '~/store/effects' +import { UPLOAD_TRACKS_SUCCEEDED } from '~/store/upload/actions' import { getUserId, getUserHandle } from './selectors' import { fetchAccountSucceeded, fetchHasTracks, setHasTracks } from './slice' diff --git a/packages/common/src/store/account/selectors.ts b/packages/common/src/store/account/selectors.ts index 2f2c85a1ea0..da5da767295 100644 --- a/packages/common/src/store/account/selectors.ts +++ b/packages/common/src/store/account/selectors.ts @@ -1,8 +1,8 @@ import { createSelector } from 'reselect' -import { getCollections } from 'store/cache/collections/selectors' -import { getUser, getUsers } from 'store/cache/users/selectors' -import { removeNullable } from 'utils/typeUtils' +import { getCollections } from '~/store/cache/collections/selectors' +import { getUser, getUsers } from '~/store/cache/users/selectors' +import { removeNullable } from '~/utils/typeUtils' import { CommonState } from '../commonStore' diff --git a/packages/common/src/store/account/slice.ts b/packages/common/src/store/account/slice.ts index 88e72f7ab89..28b86971cd3 100644 --- a/packages/common/src/store/account/slice.ts +++ b/packages/common/src/store/account/slice.ts @@ -1,8 +1,8 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { keyBy } from 'lodash' -import { User } from 'models' -import { Nullable } from 'utils/typeUtils' +import { User } from '~/models' +import { Nullable } from '~/utils/typeUtils' import { ID } from '../../models/Identifiers' import { Status } from '../../models/Status' diff --git a/packages/common/src/store/average-color/slice.ts b/packages/common/src/store/average-color/slice.ts index 60d41ce715a..ec38ffdd916 100644 --- a/packages/common/src/store/average-color/slice.ts +++ b/packages/common/src/store/average-color/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { Nullable } from 'utils/typeUtils' +import { Nullable } from '~/utils/typeUtils' import { Color } from '../../models/Color' import { CID } from '../../models/Identifiers' diff --git a/packages/common/src/store/buy-crypto/sagas.ts b/packages/common/src/store/buy-crypto/sagas.ts index 9e579101eb0..0943a88d5f5 100644 --- a/packages/common/src/store/buy-crypto/sagas.ts +++ b/packages/common/src/store/buy-crypto/sagas.ts @@ -22,14 +22,14 @@ import { takeLatest } from 'typed-redux-saga' -import { Name } from 'models/Analytics' -import { ErrorLevel } from 'models/ErrorReporting' +import { Name } from '~/models/Analytics' +import { ErrorLevel } from '~/models/ErrorReporting' import { SLIPPAGE_TOLERANCE_EXCEEDED_ERROR, jupiterInstance, parseJupiterInstruction, quoteWithAnalytics -} from 'services/Jupiter' +} from '~/services/Jupiter' import { MEMO_PROGRAM_ID, MintName, @@ -41,9 +41,9 @@ import { pollForBalanceChange, pollForTokenBalanceChange, relayVersionedTransaction -} from 'services/audius-backend/solana' -import { FeatureFlags } from 'services/index' -import { IntKeys } from 'services/remote-config/types' +} from '~/services/audius-backend/solana' +import { FeatureFlags } from '~/services/index' +import { IntKeys } from '~/services/remote-config/types' import { onrampCanceled, onrampFailed, @@ -54,15 +54,15 @@ import { buyCryptoSucceeded, buyCryptoRecoverySucceeded, buyCryptoRecoveryFailed -} from 'store/buy-crypto/slice' -import { getBuyUSDCRemoteConfig } from 'store/buy-usdc' -import { getContext } from 'store/commonStore' -import { getFeePayer } from 'store/solana/selectors' -import { TOKEN_LISTING_MAP } from 'store/ui/buy-audio/constants' -import { OnRampProvider } from 'store/ui/buy-audio/types' -import { setVisibility } from 'store/ui/modals/parentSlice' -import { initializeStripeModal } from 'store/ui/stripe-modal/slice' -import { waitForAccount, waitForValue } from 'utils/sagaHelpers' +} from '~/store/buy-crypto/slice' +import { getBuyUSDCRemoteConfig } from '~/store/buy-usdc' +import { getContext } from '~/store/commonStore' +import { getFeePayer } from '~/store/solana/selectors' +import { TOKEN_LISTING_MAP } from '~/store/ui/buy-audio/constants' +import { OnRampProvider } from '~/store/ui/buy-audio/types' +import { setVisibility } from '~/store/ui/modals/parentSlice' +import { initializeStripeModal } from '~/store/ui/stripe-modal/slice' +import { waitForAccount, waitForValue } from '~/utils/sagaHelpers' import { BuyCryptoConfig, diff --git a/packages/common/src/store/buy-crypto/slice.ts b/packages/common/src/store/buy-crypto/slice.ts index 4c2d0c8ab83..294af4c887b 100644 --- a/packages/common/src/store/buy-crypto/slice.ts +++ b/packages/common/src/store/buy-crypto/slice.ts @@ -1,8 +1,8 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { MintName } from 'services/index' -import { OnRampProvider } from 'store/ui/buy-audio/types' -import { StripeSessionCreationError } from 'store/ui/stripe-modal/types' +import { MintName } from '~/services/index' +import { OnRampProvider } from '~/store/ui/buy-audio/types' +import { StripeSessionCreationError } from '~/store/ui/stripe-modal/types' import { BuyCryptoError } from './types' diff --git a/packages/common/src/store/buy-crypto/types.ts b/packages/common/src/store/buy-crypto/types.ts index b0bc02a8e27..b5248afa673 100644 --- a/packages/common/src/store/buy-crypto/types.ts +++ b/packages/common/src/store/buy-crypto/types.ts @@ -1,5 +1,5 @@ -import { MintName } from 'services/index' -import { OnRampProvider } from 'store/ui/buy-audio/types' +import { MintName } from '~/services/index' +import { OnRampProvider } from '~/store/ui/buy-audio/types' export type BuyCryptoConfig = { /** diff --git a/packages/common/src/store/buy-usdc/sagas.ts b/packages/common/src/store/buy-usdc/sagas.ts index 768eacc6ed1..c48b2d18a5d 100644 --- a/packages/common/src/store/buy-usdc/sagas.ts +++ b/packages/common/src/store/buy-usdc/sagas.ts @@ -5,11 +5,11 @@ import BN from 'bn.js' import { takeLatest } from 'redux-saga/effects' import { call, put, race, select, take, takeLeading } from 'typed-redux-saga' -import { Name } from 'models/Analytics' -import { ErrorLevel } from 'models/ErrorReporting' -import { PurchaseVendor } from 'models/PurchaseContent' -import { Status } from 'models/Status' -import { StringUSDC } from 'models/Wallet' +import { Name } from '~/models/Analytics' +import { ErrorLevel } from '~/models/ErrorReporting' +import { PurchaseVendor } from '~/models/PurchaseContent' +import { Status } from '~/models/Status' +import { StringUSDC } from '~/models/Wallet' import { createPaymentRouterRouteTransaction, createRootWalletRecoveryTransaction, @@ -20,20 +20,20 @@ import { getTokenAccountInfo, pollForTokenBalanceChange, relayTransaction -} from 'services/audius-backend/solana' -import { getAccountUser } from 'store/account/selectors' -import { getContext } from 'store/effects' -import { getFeePayer } from 'store/solana/selectors' +} from '~/services/audius-backend/solana' +import { getAccountUser } from '~/store/account/selectors' +import { getContext } from '~/store/effects' +import { getFeePayer } from '~/store/solana/selectors' import { transactionCanceled as coinflowTransactionCanceled, transactionFailed as coinflowTransactionFailed, transactionSucceeded as coinflowTransactionSucceeded -} from 'store/ui/coinflow-modal/slice' -import { coinflowOnrampModalActions } from 'store/ui/modals/coinflow-onramp-modal' -import { setVisibility } from 'store/ui/modals/parentSlice' -import { initializeStripeModal } from 'store/ui/stripe-modal/slice' -import { setUSDCBalance } from 'store/wallet/slice' -import { waitForValue } from 'utils' +} from '~/store/ui/coinflow-modal/slice' +import { coinflowOnrampModalActions } from '~/store/ui/modals/coinflow-onramp-modal' +import { setVisibility } from '~/store/ui/modals/parentSlice' +import { initializeStripeModal } from '~/store/ui/stripe-modal/slice' +import { setUSDCBalance } from '~/store/wallet/slice' +import { waitForValue } from '~/utils' import { buyUSDCFlowFailed, diff --git a/packages/common/src/store/buy-usdc/selectors.ts b/packages/common/src/store/buy-usdc/selectors.ts index a4826eb4072..8659815bf1e 100644 --- a/packages/common/src/store/buy-usdc/selectors.ts +++ b/packages/common/src/store/buy-usdc/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/reducers' +import { CommonState } from '~/store/reducers' export const getBuyUSDCVendor = (state: CommonState) => state.buyUSDC.vendor diff --git a/packages/common/src/store/buy-usdc/slice.ts b/packages/common/src/store/buy-usdc/slice.ts index fd296957f99..57d86bf84f0 100644 --- a/packages/common/src/store/buy-usdc/slice.ts +++ b/packages/common/src/store/buy-usdc/slice.ts @@ -1,8 +1,8 @@ import { Action, createSlice, PayloadAction } from '@reduxjs/toolkit' -import { PurchaseVendor } from 'models/PurchaseContent' -import { Status } from 'models/Status' -import { StripeSessionCreationError } from 'store/ui/stripe-modal/types' +import { PurchaseVendor } from '~/models/PurchaseContent' +import { Status } from '~/models/Status' +import { StripeSessionCreationError } from '~/store/ui/stripe-modal/types' import { BuyUSDCStage, PurchaseInfo, BuyUSDCError } from './types' diff --git a/packages/common/src/store/buy-usdc/utils.ts b/packages/common/src/store/buy-usdc/utils.ts index 432b2a8e7f3..e458618e01e 100644 --- a/packages/common/src/store/buy-usdc/utils.ts +++ b/packages/common/src/store/buy-usdc/utils.ts @@ -1,16 +1,16 @@ import { call, select } from 'typed-redux-saga' -import { createUserBankIfNeeded } from 'services/audius-backend/solana' -import { IntKeys } from 'services/remote-config' +import { createUserBankIfNeeded } from '~/services/audius-backend/solana' +import { IntKeys } from '~/services/remote-config' import { MAX_CONTENT_PRICE_CENTS, MAX_USDC_PURCHASE_AMOUNT_CENTS, MIN_CONTENT_PRICE_CENTS, MIN_USDC_PURCHASE_AMOUNT_CENTS, BUY_TOKEN_VIA_SOL_SLIPPAGE_BPS -} from 'services/remote-config/defaults' -import { getContext } from 'store/effects' -import { getFeePayer } from 'store/solana/selectors' +} from '~/services/remote-config/defaults' +import { getContext } from '~/store/effects' +import { getFeePayer } from '~/store/solana/selectors' /** * Derives a USDC user bank for a given eth address, creating it if necessary. diff --git a/packages/common/src/store/cache/actions.ts b/packages/common/src/store/cache/actions.ts index 9082faa2d13..90b339b3dc5 100644 --- a/packages/common/src/store/cache/actions.ts +++ b/packages/common/src/store/cache/actions.ts @@ -1,7 +1,7 @@ // @ts-nocheck -import { ID, UID } from 'models/Identifiers' -import { Kind } from 'models/Kind' +import { ID, UID } from '~/models/Identifiers' +import { Kind } from '~/models/Kind' import { Metadata } from './types' diff --git a/packages/common/src/store/cache/collections/reducer.ts b/packages/common/src/store/cache/collections/reducer.ts index 3b5f6dab637..55e692b8d5f 100644 --- a/packages/common/src/store/cache/collections/reducer.ts +++ b/packages/common/src/store/cache/collections/reducer.ts @@ -1,4 +1,4 @@ -import { initialCacheState } from 'store/cache/reducer' +import { initialCacheState } from '~/store/cache/reducer' import { Collection, ID, Kind } from '../../../models' import { diff --git a/packages/common/src/store/cache/collections/selectors.ts b/packages/common/src/store/cache/collections/selectors.ts index df835914e9b..3a163fb4d04 100644 --- a/packages/common/src/store/cache/collections/selectors.ts +++ b/packages/common/src/store/cache/collections/selectors.ts @@ -1,13 +1,13 @@ -import { getAllEntries, getEntry } from 'store/cache/selectors' -import { getTrack, getTracks } from 'store/cache/tracks/selectors' +import { getAllEntries, getEntry } from '~/store/cache/selectors' +import { getTrack, getTracks } from '~/store/cache/tracks/selectors' import { getUser, getUser as getUserById, getUsers -} from 'store/cache/users/selectors' -import type { CommonState } from 'store/commonStore' -import { removeNullable } from 'utils/typeUtils' -import { Uid } from 'utils/uid' +} from '~/store/cache/users/selectors' +import type { CommonState } from '~/store/commonStore' +import { removeNullable } from '~/utils/typeUtils' +import { Uid } from '~/utils/uid' import type { ID, UID, Collection, User } from '../../../models' import { Status, Kind } from '../../../models' diff --git a/packages/common/src/store/cache/collections/utils/reformatCollection.ts b/packages/common/src/store/cache/collections/utils/reformatCollection.ts index 4fea1494d62..2fedd165c55 100644 --- a/packages/common/src/store/cache/collections/utils/reformatCollection.ts +++ b/packages/common/src/store/cache/collections/utils/reformatCollection.ts @@ -5,8 +5,8 @@ import { Variant, Collection, CollectionMetadata -} from 'models/Collection' -import type { AudiusBackend } from 'services/audius-backend/AudiusBackend' +} from '~/models/Collection' +import type { AudiusBackend } from '~/services/audius-backend/AudiusBackend' /** * Reformats a collection to be used internally within the client diff --git a/packages/common/src/store/cache/reducer.ts b/packages/common/src/store/cache/reducer.ts index 5cb7e348f03..3e2fe8b8122 100644 --- a/packages/common/src/store/cache/reducer.ts +++ b/packages/common/src/store/cache/reducer.ts @@ -1,7 +1,7 @@ import { mergeWith, add, isEqual } from 'lodash' -import { ID, UID } from 'models/Identifiers' -import { Status } from 'models/Status' +import { ID, UID } from '~/models/Identifiers' +import { Status } from '~/models/Status' import { Kind } from '../../models/Kind' diff --git a/packages/common/src/store/cache/selectors.ts b/packages/common/src/store/cache/selectors.ts index 1d01b914e46..7948da80991 100644 --- a/packages/common/src/store/cache/selectors.ts +++ b/packages/common/src/store/cache/selectors.ts @@ -1,5 +1,5 @@ -import { CommonState } from 'store/commonStore' -import { Uid } from 'utils/uid' +import { CommonState } from '~/store/commonStore' +import { Uid } from '~/utils/uid' import { Collection } from '../../models/Collection' import { ID, UID } from '../../models/Identifiers' diff --git a/packages/common/src/store/cache/tracks/reducer.ts b/packages/common/src/store/cache/tracks/reducer.ts index 7b50bb9ead2..29f1ae7c4b4 100644 --- a/packages/common/src/store/cache/tracks/reducer.ts +++ b/packages/common/src/store/cache/tracks/reducer.ts @@ -1,13 +1,13 @@ import snakecaseKeys from 'snakecase-keys' -import { Cache } from 'models/Cache' -import { ID } from 'models/Identifiers' -import { Kind } from 'models/Kind' -import { SsrPageProps } from 'models/SsrPageProps' -import { Track } from 'models/Track' -import { makeTrack } from 'services/audius-api-client/ResponseAdapter' -import { initialCacheState } from 'store/cache/reducer' -import { makeUid } from 'utils/uid' +import { Cache } from '~/models/Cache' +import { ID } from '~/models/Identifiers' +import { Kind } from '~/models/Kind' +import { SsrPageProps } from '~/models/SsrPageProps' +import { Track } from '~/models/Track' +import { makeTrack } from '~/services/audius-api-client/ResponseAdapter' +import { initialCacheState } from '~/store/cache/reducer' +import { makeUid } from '~/utils/uid' import { AddEntriesAction, diff --git a/packages/common/src/store/cache/tracks/selectors.ts b/packages/common/src/store/cache/tracks/selectors.ts index 33476c02ae6..e702737cc96 100644 --- a/packages/common/src/store/cache/tracks/selectors.ts +++ b/packages/common/src/store/cache/tracks/selectors.ts @@ -1,5 +1,5 @@ -import { getEntry, getAllEntries } from 'store/cache/selectors' -import { CommonState } from 'store/commonStore' +import { getEntry, getAllEntries } from '~/store/cache/selectors' +import { CommonState } from '~/store/commonStore' import { Kind, ID, UID, Status, Track } from '../../../models' diff --git a/packages/common/src/store/cache/users/actions.ts b/packages/common/src/store/cache/users/actions.ts index fabd3369ceb..55820e5ecfc 100644 --- a/packages/common/src/store/cache/users/actions.ts +++ b/packages/common/src/store/cache/users/actions.ts @@ -1,6 +1,6 @@ // @ts-nocheck -import { ID } from 'models' +import { ID } from '~/models' export const REMOVE_BY_HANDLE = 'CACHE/USERS/REMOVE_BY_HANDLE' diff --git a/packages/common/src/store/cache/users/combinedSelectors.ts b/packages/common/src/store/cache/users/combinedSelectors.ts index 33e2d6c44a0..7141410e4b2 100644 --- a/packages/common/src/store/cache/users/combinedSelectors.ts +++ b/packages/common/src/store/cache/users/combinedSelectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { ID, UID } from '../../../models' import { getCollection } from '../collections/selectors' diff --git a/packages/common/src/store/cache/users/reducer.ts b/packages/common/src/store/cache/users/reducer.ts index 178024627ee..38bff860935 100644 --- a/packages/common/src/store/cache/users/reducer.ts +++ b/packages/common/src/store/cache/users/reducer.ts @@ -1,13 +1,13 @@ import snakecaseKeys from 'snakecase-keys' -import { Cache } from 'models/Cache' -import { ID } from 'models/Identifiers' -import { Kind } from 'models/Kind' -import { SsrPageProps } from 'models/SsrPageProps' -import { User } from 'models/User' -import { makeUser } from 'services/audius-api-client/ResponseAdapter' -import { initialCacheState } from 'store/cache/reducer' -import { makeUid } from 'utils/uid' +import { Cache } from '~/models/Cache' +import { ID } from '~/models/Identifiers' +import { Kind } from '~/models/Kind' +import { SsrPageProps } from '~/models/SsrPageProps' +import { User } from '~/models/User' +import { makeUser } from '~/services/audius-api-client/ResponseAdapter' +import { initialCacheState } from '~/store/cache/reducer' +import { makeUid } from '~/utils/uid' import { AddEntriesAction, diff --git a/packages/common/src/store/cache/users/selectors.ts b/packages/common/src/store/cache/users/selectors.ts index e800a27fde6..b3f09ce25f7 100644 --- a/packages/common/src/store/cache/users/selectors.ts +++ b/packages/common/src/store/cache/users/selectors.ts @@ -2,8 +2,8 @@ import { getAllEntries, getEntry, getEntryTimestamp -} from 'store/cache/selectors' -import type { CommonState } from 'store/commonStore' +} from '~/store/cache/selectors' +import type { CommonState } from '~/store/commonStore' import { Kind } from '../../../models' import type { ID, UID, User } from '../../../models' diff --git a/packages/common/src/store/cache/users/utils.ts b/packages/common/src/store/cache/users/utils.ts index da34817410e..9e0f3ee7f50 100644 --- a/packages/common/src/store/cache/users/utils.ts +++ b/packages/common/src/store/cache/users/utils.ts @@ -1,12 +1,12 @@ import { put } from 'typed-redux-saga' -import { Kind } from 'models/Kind' -import { UserMetadata } from 'models/User' -import { AudiusBackend } from 'services/audius-backend' -import * as cacheActions from 'store/cache/actions' -import { getContext } from 'store/effects' -import { waitForRead } from 'utils/sagaHelpers' -import { makeUid } from 'utils/uid' +import { Kind } from '~/models/Kind' +import { UserMetadata } from '~/models/User' +import { AudiusBackend } from '~/services/audius-backend' +import * as cacheActions from '~/store/cache/actions' +import { getContext } from '~/store/effects' +import { waitForRead } from '~/utils/sagaHelpers' +import { makeUid } from '~/utils/uid' export function* processAndCacheUsers(users: UserMetadata[]) { yield* waitForRead() diff --git a/packages/common/src/store/cast/sagas.ts b/packages/common/src/store/cast/sagas.ts index 81250e892da..4b5c6a9481c 100644 --- a/packages/common/src/store/cast/sagas.ts +++ b/packages/common/src/store/cast/sagas.ts @@ -1,6 +1,6 @@ import { call, put, takeEvery } from 'typed-redux-saga' -import { getContext } from 'store/effects' +import { getContext } from '~/store/effects' import { updateMethod } from './slice' import { CastMethod, CAST_METHOD } from './types' diff --git a/packages/common/src/store/cast/selectors.ts b/packages/common/src/store/cast/selectors.ts index c56f7b9e311..8d22f2be783 100644 --- a/packages/common/src/store/cast/selectors.ts +++ b/packages/common/src/store/cast/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' const getBaseState = (state: CommonState) => state.cast diff --git a/packages/common/src/store/challenges/selectors/optimistic-challenges.ts b/packages/common/src/store/challenges/selectors/optimistic-challenges.ts index 8f75e8b9329..209945d93e8 100644 --- a/packages/common/src/store/challenges/selectors/optimistic-challenges.ts +++ b/packages/common/src/store/challenges/selectors/optimistic-challenges.ts @@ -2,10 +2,10 @@ import { getUndisbursedUserChallenges, getUserChallenges, getUserChallengesOverrides -} from 'store/pages/audio-rewards/selectors' -import { UndisbursedUserChallenge } from 'store/pages/audio-rewards/types' -import { isCooldownChallengeClaimable } from 'utils/challenges' -import { removeNullable } from 'utils/typeUtils' +} from '~/store/pages/audio-rewards/selectors' +import { UndisbursedUserChallenge } from '~/store/pages/audio-rewards/types' +import { isCooldownChallengeClaimable } from '~/utils/challenges' +import { removeNullable } from '~/utils/typeUtils' import { ChallengeRewardID, diff --git a/packages/common/src/store/challenges/selectors/profile-progress.ts b/packages/common/src/store/challenges/selectors/profile-progress.ts index 113e2d1ac29..d0756032d7b 100644 --- a/packages/common/src/store/challenges/selectors/profile-progress.ts +++ b/packages/common/src/store/challenges/selectors/profile-progress.ts @@ -1,5 +1,5 @@ -import { getAccountUser } from 'store/account/selectors' -import { getProfileUserHandle } from 'store/pages/profile/selectors' +import { getAccountUser } from '~/store/account/selectors' +import { getProfileUserHandle } from '~/store/pages/profile/selectors' import { Status } from '../../../models/Status' import { CommonState } from '../../commonStore' diff --git a/packages/common/src/store/change-password/selectors.ts b/packages/common/src/store/change-password/selectors.ts index eef2b9aa347..715f467497c 100644 --- a/packages/common/src/store/change-password/selectors.ts +++ b/packages/common/src/store/change-password/selectors.ts @@ -1,6 +1,6 @@ import { createSelector } from '@reduxjs/toolkit' -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' const changePasswordState = (state: CommonState) => state.ui.changePassword diff --git a/packages/common/src/store/collectibles/selectors.ts b/packages/common/src/store/collectibles/selectors.ts index 00dc6915079..491f9395322 100644 --- a/packages/common/src/store/collectibles/selectors.ts +++ b/packages/common/src/store/collectibles/selectors.ts @@ -1,6 +1,6 @@ import { createSelector } from 'reselect' -import { removeNullable } from 'utils/typeUtils' +import { removeNullable } from '~/utils/typeUtils' import { Chain, diff --git a/packages/common/src/store/confirmer/sagas.ts b/packages/common/src/store/confirmer/sagas.ts index 001bf1d12c5..f6dbd7cd0b5 100644 --- a/packages/common/src/store/confirmer/sagas.ts +++ b/packages/common/src/store/confirmer/sagas.ts @@ -1,7 +1,7 @@ import { call, delay, put, race, select, takeEvery } from 'redux-saga/effects' -import { getContext } from 'store/effects' -import { waitForValue } from 'utils/sagaHelpers' +import { getContext } from '~/store/effects' +import { waitForValue } from '~/utils/sagaHelpers' import * as confirmerActions from './actions' import { diff --git a/packages/common/src/store/confirmer/selectors.ts b/packages/common/src/store/confirmer/selectors.ts index 1b030b38196..8b8ae14b9ea 100644 --- a/packages/common/src/store/confirmer/selectors.ts +++ b/packages/common/src/store/confirmer/selectors.ts @@ -1,6 +1,6 @@ import { findLastIndex } from 'lodash' -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' // Confirmer selectors diff --git a/packages/common/src/store/gated-content/sagas.ts b/packages/common/src/store/gated-content/sagas.ts index ffbbac33114..ba2d837f41a 100644 --- a/packages/common/src/store/gated-content/sagas.ts +++ b/packages/common/src/store/gated-content/sagas.ts @@ -21,17 +21,17 @@ import { isContentFollowGated, isContentTipGated, isContentUSDCPurchaseGated -} from 'models' -import { User } from 'models/User' -import { IntKeys } from 'services/remote-config' -import { accountSelectors } from 'store/account' -import { cacheActions, cacheTracksSelectors } from 'store/cache' -import { collectiblesActions } from 'store/collectibles' -import { getContext } from 'store/effects' -import { musicConfettiActions } from 'store/music-confetti' -import { usersSocialActions } from 'store/social' -import { tippingActions } from 'store/tipping' -import { Nullable } from 'utils/typeUtils' +} from '~/models' +import { User } from '~/models/User' +import { IntKeys } from '~/services/remote-config' +import { accountSelectors } from '~/store/account' +import { cacheActions, cacheTracksSelectors } from '~/store/cache' +import { collectiblesActions } from '~/store/collectibles' +import { getContext } from '~/store/effects' +import { musicConfettiActions } from '~/store/music-confetti' +import { usersSocialActions } from '~/store/social' +import { tippingActions } from '~/store/tipping' +import { Nullable } from '~/utils/typeUtils' import * as gatedContentSelectors from './selectors' import { actions as gatedContentActions } from './slice' diff --git a/packages/common/src/store/gated-content/slice.ts b/packages/common/src/store/gated-content/slice.ts index 3dad2749684..aded50a4d21 100644 --- a/packages/common/src/store/gated-content/slice.ts +++ b/packages/common/src/store/gated-content/slice.ts @@ -1,7 +1,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { ID, AccessSignature, GatedTrackStatus } from 'models' -import { Nullable } from 'utils' +import { ID, AccessSignature, GatedTrackStatus } from '~/models' +import { Nullable } from '~/utils' type GatedContentState = { nftAccessSignatureMap: { [id: ID]: Nullable } diff --git a/packages/common/src/store/lineup/actions.ts b/packages/common/src/store/lineup/actions.ts index dc5057f828e..971c31cf091 100644 --- a/packages/common/src/store/lineup/actions.ts +++ b/packages/common/src/store/lineup/actions.ts @@ -1,4 +1,4 @@ -import { PlaybackSource } from 'models' +import { PlaybackSource } from '~/models' import { ID, UID } from '../../models/Identifiers' import { TrackMetadata } from '../../models/Track' diff --git a/packages/common/src/store/lineup/reducer.ts b/packages/common/src/store/lineup/reducer.ts index 68a562ae13a..8e2c12d4133 100644 --- a/packages/common/src/store/lineup/reducer.ts +++ b/packages/common/src/store/lineup/reducer.ts @@ -1,6 +1,6 @@ import { Reducer } from 'redux' -import { Status } from 'models/Status' +import { Status } from '~/models/Status' import { FETCH_LINEUP_METADATAS_REQUESTED, FETCH_LINEUP_METADATAS_SUCCEEDED, @@ -12,7 +12,7 @@ import { UPDATE_LINEUP_ORDER, SET_PAGE, stripPrefix -} from 'store/lineup/actions' +} from '~/store/lineup/actions' import { UID } from '../../models/Identifiers' import { LineupState, LineupStateTrack, Order } from '../../models/Lineup' diff --git a/packages/common/src/store/lineup/registry.ts b/packages/common/src/store/lineup/registry.ts index b62b2daca12..7b1f01ac9bb 100644 --- a/packages/common/src/store/lineup/registry.ts +++ b/packages/common/src/store/lineup/registry.ts @@ -1,4 +1,4 @@ -import { LineupState } from 'models/Lineup' +import { LineupState } from '~/models/Lineup' import { aiPageLineupActions, aiPageSelectors, @@ -25,7 +25,7 @@ import { trendingPlaylistsPageLineupSelectors, trendingUndergroundPageLineupActions, trendingUndergroundPageLineupSelectors -} from 'store/pages' +} from '~/store/pages' import { CommonState } from '..' diff --git a/packages/common/src/store/lineup/selectors.ts b/packages/common/src/store/lineup/selectors.ts index 1f7bb63d0b0..ad55aa6f874 100644 --- a/packages/common/src/store/lineup/selectors.ts +++ b/packages/common/src/store/lineup/selectors.ts @@ -1,9 +1,9 @@ import { createSelector } from 'reselect' -import { Kind } from 'models' -import { getTracksByUid } from 'store/cache/tracks/selectors' -import { getUsers } from 'store/cache/users/selectors' -import { Nullable, removeNullable } from 'utils/typeUtils' +import { Kind } from '~/models' +import { getTracksByUid } from '~/store/cache/tracks/selectors' +import { getUsers } from '~/store/cache/users/selectors' +import { Nullable, removeNullable } from '~/utils/typeUtils' import { LineupState } from '../../models/Lineup' diff --git a/packages/common/src/store/notifications/selectors.ts b/packages/common/src/store/notifications/selectors.ts index 775f26f5e54..84c1d342ea0 100644 --- a/packages/common/src/store/notifications/selectors.ts +++ b/packages/common/src/store/notifications/selectors.ts @@ -1,12 +1,12 @@ -import { getAccountUser } from 'store/account/selectors' +import { getAccountUser } from '~/store/account/selectors' import { getCollection, getCollections -} from 'store/cache/collections/selectors' -import { getTrack, getTracks } from 'store/cache/tracks/selectors' -import { getUser, getUsers } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' -import { Nullable } from 'utils' +} from '~/store/cache/collections/selectors' +import { getTrack, getTracks } from '~/store/cache/tracks/selectors' +import { getUser, getUsers } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' +import { Nullable } from '~/utils' import { Collection, ID, Status, Track } from '../../models' diff --git a/packages/common/src/store/notifications/slice.ts b/packages/common/src/store/notifications/slice.ts index 55c4f079cc1..d74b974950f 100644 --- a/packages/common/src/store/notifications/slice.ts +++ b/packages/common/src/store/notifications/slice.ts @@ -1,7 +1,7 @@ import { createEntityAdapter, createSlice } from '@reduxjs/toolkit' -import { Status } from 'models/Status' -import { signOut } from 'store/sign-out/slice' +import { Status } from '~/models/Status' +import { signOut } from '~/store/sign-out/slice' import { AddNotificationsAction, diff --git a/packages/common/src/store/notifications/types.ts b/packages/common/src/store/notifications/types.ts index cf4eb660f2e..91aa62ab3a7 100644 --- a/packages/common/src/store/notifications/types.ts +++ b/packages/common/src/store/notifications/types.ts @@ -1,14 +1,14 @@ import { EntityState, PayloadAction } from '@reduxjs/toolkit' -import { ChallengeRewardID } from 'models/AudioRewards' -import { BadgeTier } from 'models/BadgeTier' -import { Collection } from 'models/Collection' -import { ID } from 'models/Identifiers' -import { Status } from 'models/Status' -import { Track } from 'models/Track' -import { User } from 'models/User' -import { StringUSDC, StringWei } from 'models/Wallet' -import { Nullable } from 'utils' +import { ChallengeRewardID } from '~/models/AudioRewards' +import { BadgeTier } from '~/models/BadgeTier' +import { Collection } from '~/models/Collection' +import { ID } from '~/models/Identifiers' +import { Status } from '~/models/Status' +import { Track } from '~/models/Track' +import { User } from '~/models/User' +import { StringUSDC, StringWei } from '~/models/Wallet' +import { Nullable } from '~/utils' export enum NotificationType { Announcement = 'Announcement', diff --git a/packages/common/src/store/pages/ai/lineup/reducer.ts b/packages/common/src/store/pages/ai/lineup/reducer.ts index 54af1727784..d28d9dfd72e 100644 --- a/packages/common/src/store/pages/ai/lineup/reducer.ts +++ b/packages/common/src/store/pages/ai/lineup/reducer.ts @@ -1,5 +1,5 @@ -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' import { PREFIX } from './actions' diff --git a/packages/common/src/store/pages/ai/selectors.ts b/packages/common/src/store/pages/ai/selectors.ts index 9ca3a97d54b..f0cbe358dab 100644 --- a/packages/common/src/store/pages/ai/selectors.ts +++ b/packages/common/src/store/pages/ai/selectors.ts @@ -1,5 +1,5 @@ -import { getUser } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' +import { getUser } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' export const getBaseState = (state: CommonState) => state.pages.ai diff --git a/packages/common/src/store/pages/ai/slice.ts b/packages/common/src/store/pages/ai/slice.ts index 9ae6207a3c4..f609366d466 100644 --- a/packages/common/src/store/pages/ai/slice.ts +++ b/packages/common/src/store/pages/ai/slice.ts @@ -1,8 +1,8 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { combineReducers } from 'redux' -import { Status } from 'models/Status' -import { asLineup } from 'store/lineup/reducer' +import { Status } from '~/models/Status' +import { asLineup } from '~/store/lineup/reducer' import { ID } from '../../../models/Identifiers' diff --git a/packages/common/src/store/pages/chat/middleware.ts b/packages/common/src/store/pages/chat/middleware.ts index abfd0ba2dd6..2a7ab398ae0 100644 --- a/packages/common/src/store/pages/chat/middleware.ts +++ b/packages/common/src/store/pages/chat/middleware.ts @@ -1,9 +1,9 @@ import { type AudiusSdk, ChatEvents } from '@audius/sdk' import { Middleware } from 'redux' -import { Status } from 'models/Status' -import { getUserId } from 'store/account/selectors' -import { encodeHashId } from 'utils/hashIds' +import { Status } from '~/models/Status' +import { getUserId } from '~/store/account/selectors' +import { encodeHashId } from '~/utils/hashIds' import { actions as chatActions } from './slice' import { ChatWebsocketError } from './types' diff --git a/packages/common/src/store/pages/chat/sagas.ts b/packages/common/src/store/pages/chat/sagas.ts index 93cfe951c82..435a75bbb6b 100644 --- a/packages/common/src/store/pages/chat/sagas.ts +++ b/packages/common/src/store/pages/chat/sagas.ts @@ -14,13 +14,13 @@ import { } from 'typed-redux-saga' import { ulid } from 'ulid' -import { Name } from 'models/Analytics' -import { ErrorLevel } from 'models/ErrorReporting' -import { ID } from 'models/Identifiers' -import { Status } from 'models/Status' +import { Name } from '~/models/Analytics' +import { ErrorLevel } from '~/models/ErrorReporting' +import { ID } from '~/models/Identifiers' +import { Status } from '~/models/Status' import * as toastActions from 'src/store/ui/toast/slice' -import { getAccountUser, getUserId } from 'store/account/selectors' -import dayjs from 'utils/dayjs' +import { getAccountUser, getUserId } from '~/store/account/selectors' +import dayjs from '~/utils/dayjs' import { decodeHashId, encodeHashId, removeNullable } from '../../../utils' import { cacheUsersActions } from '../../cache' diff --git a/packages/common/src/store/pages/chat/selectors.ts b/packages/common/src/store/pages/chat/selectors.ts index e0e683142af..5de3d91b592 100644 --- a/packages/common/src/store/pages/chat/selectors.ts +++ b/packages/common/src/store/pages/chat/selectors.ts @@ -1,14 +1,14 @@ import { ChatPermission, UserChat } from '@audius/sdk' import { createSelector } from 'reselect' -import { ID } from 'models/Identifiers' -import { Status } from 'models/Status' -import { User } from 'models/User' -import { accountSelectors } from 'store/account' -import { cacheUsersSelectors } from 'store/cache' -import { CommonState } from 'store/reducers' -import { decodeHashId, encodeHashId } from 'utils/hashIds' -import { Maybe, removeNullable } from 'utils/typeUtils' +import { ID } from '~/models/Identifiers' +import { Status } from '~/models/Status' +import { User } from '~/models/User' +import { accountSelectors } from '~/store/account' +import { cacheUsersSelectors } from '~/store/cache' +import { CommonState } from '~/store/reducers' +import { decodeHashId, encodeHashId } from '~/utils/hashIds' +import { Maybe, removeNullable } from '~/utils/typeUtils' import { chatMessagesAdapter, chatsAdapter } from './slice' import { ChatPermissionAction } from './types' diff --git a/packages/common/src/store/pages/chat/slice.ts b/packages/common/src/store/pages/chat/slice.ts index fcbcaa9b86a..a5aca394787 100644 --- a/packages/common/src/store/pages/chat/slice.ts +++ b/packages/common/src/store/pages/chat/slice.ts @@ -15,11 +15,11 @@ import { EntityState } from '@reduxjs/toolkit' -import { ID, Status, ChatMessageWithExtras } from 'models' -import { signOut } from 'store/sign-out/slice' -import { hasTail } from 'utils/chatUtils' -import dayjs from 'utils/dayjs' -import { encodeHashId } from 'utils/hashIds' +import { ID, Status, ChatMessageWithExtras } from '~/models' +import { signOut } from '~/store/sign-out/slice' +import { hasTail } from '~/utils/chatUtils' +import dayjs from '~/utils/dayjs' +import { encodeHashId } from '~/utils/hashIds' import { ChatWebsocketError } from './types' diff --git a/packages/common/src/store/pages/chat/utils.ts b/packages/common/src/store/pages/chat/utils.ts index 0ceddb4eb85..38bcf7e46c7 100644 --- a/packages/common/src/store/pages/chat/utils.ts +++ b/packages/common/src/store/pages/chat/utils.ts @@ -1,5 +1,5 @@ -import { ID } from 'models/Identifiers' -import { encodeHashId } from 'utils/hashIds' +import { ID } from '~/models/Identifiers' +import { encodeHashId } from '~/utils/hashIds' export const makeChatId = (userIds: ID[]) => { return userIds.map(encodeHashId).sort().join(':') diff --git a/packages/common/src/store/pages/collection/lineup/reducer.ts b/packages/common/src/store/pages/collection/lineup/reducer.ts index d70a74daa36..4fddeccaec9 100644 --- a/packages/common/src/store/pages/collection/lineup/reducer.ts +++ b/packages/common/src/store/pages/collection/lineup/reducer.ts @@ -1,8 +1,8 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' -import { PREFIX } from 'store/pages/collection/lineup/actions' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' +import { PREFIX } from '~/store/pages/collection/lineup/actions' export const initialState = { ...initialLineupState, diff --git a/packages/common/src/store/pages/collection/reducer.ts b/packages/common/src/store/pages/collection/reducer.ts index d93160aa157..41f5a3d28a8 100644 --- a/packages/common/src/store/pages/collection/reducer.ts +++ b/packages/common/src/store/pages/collection/reducer.ts @@ -1,7 +1,7 @@ // @ts-nocheck import tracksReducer, { initialState as initialLineupState -} from 'store/pages/collection/lineup/reducer' +} from '~/store/pages/collection/lineup/reducer' import { Status } from '../../../models/Status' import { asLineup } from '../../../store/lineup/reducer' diff --git a/packages/common/src/store/pages/collection/selectors.ts b/packages/common/src/store/pages/collection/selectors.ts index a023c6aba55..df83bb0ec74 100644 --- a/packages/common/src/store/pages/collection/selectors.ts +++ b/packages/common/src/store/pages/collection/selectors.ts @@ -1,10 +1,10 @@ import { createSelector } from 'reselect' -import { getCollection as getCachedCollection } from 'store/cache/collections/selectors' -import { getUser as getCachedUser } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' -import { getCollection as getSmartCollection } from 'store/pages/smart-collection/selectors' -import { Nullable } from 'utils/typeUtils' +import { getCollection as getCachedCollection } from '~/store/cache/collections/selectors' +import { getUser as getCachedUser } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' +import { getCollection as getSmartCollection } from '~/store/pages/smart-collection/selectors' +import { Nullable } from '~/utils/typeUtils' import { ID, UID, Status } from '../../../models' diff --git a/packages/common/src/store/pages/collection/types.ts b/packages/common/src/store/pages/collection/types.ts index cb2818cbc52..8234c954463 100644 --- a/packages/common/src/store/pages/collection/types.ts +++ b/packages/common/src/store/pages/collection/types.ts @@ -6,8 +6,8 @@ import { SmartCollectionVariant, Status, LineupTrack -} from 'models' -import type { Dayjs } from 'utils/dayjs' +} from '~/models' +import type { Dayjs } from '~/utils/dayjs' export type CollectionTrack = LineupTrack & { dateAdded: Dayjs } & { collectible?: Collectible diff --git a/packages/common/src/store/pages/explore/exploreCollections/selectors.ts b/packages/common/src/store/pages/explore/exploreCollections/selectors.ts index f72f31b62cb..f41c6fa42c1 100644 --- a/packages/common/src/store/pages/explore/exploreCollections/selectors.ts +++ b/packages/common/src/store/pages/explore/exploreCollections/selectors.ts @@ -1,6 +1,6 @@ -import { getCollections as getCachedCollections } from 'store/cache/collections/selectors' -import { getUsers } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' +import { getCollections as getCachedCollections } from '~/store/cache/collections/selectors' +import { getUsers } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' import { Collection, Status } from '../../../../models' import { ExploreCollectionsVariant } from '../types' diff --git a/packages/common/src/store/pages/explore/selectors.ts b/packages/common/src/store/pages/explore/selectors.ts index 6871d2eb69e..f649e74be29 100644 --- a/packages/common/src/store/pages/explore/selectors.ts +++ b/packages/common/src/store/pages/explore/selectors.ts @@ -1,8 +1,8 @@ import { createSelector } from 'reselect' -import { getCollections } from 'store/cache/collections/selectors' -import { getUsers } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' +import { getCollections } from '~/store/cache/collections/selectors' +import { getUsers } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' import { UserCollection, Status, User } from '../../../models' import { removeNullable } from '../../../utils' diff --git a/packages/common/src/store/pages/feed/lineup/reducer.ts b/packages/common/src/store/pages/feed/lineup/reducer.ts index 9b75da90a00..ac080beb6a0 100644 --- a/packages/common/src/store/pages/feed/lineup/reducer.ts +++ b/packages/common/src/store/pages/feed/lineup/reducer.ts @@ -1,8 +1,8 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' -import { PREFIX } from 'store/pages/feed/lineup/actions' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' +import { PREFIX } from '~/store/pages/feed/lineup/actions' export const initialState = { ...initialLineupState, diff --git a/packages/common/src/store/pages/feed/reducer.ts b/packages/common/src/store/pages/feed/reducer.ts index ba927381b10..ea7b3c68b21 100644 --- a/packages/common/src/store/pages/feed/reducer.ts +++ b/packages/common/src/store/pages/feed/reducer.ts @@ -1,14 +1,14 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { asLineup } from 'store/lineup/reducer' +import { asLineup } from '~/store/lineup/reducer' import { SET_SUGGESTED_FOLLOWS, SET_FEED_FILTER -} from 'store/pages/feed/actions' -import { PREFIX as FeedPrefix } from 'store/pages/feed/lineup/actions' +} from '~/store/pages/feed/actions' +import { PREFIX as FeedPrefix } from '~/store/pages/feed/lineup/actions' import feedReducer, { initialState as feedLinupInitialState -} from 'store/pages/feed/lineup/reducer' +} from '~/store/pages/feed/lineup/reducer' import { FeedFilter } from '../../../models' diff --git a/packages/common/src/store/pages/feed/selectors.ts b/packages/common/src/store/pages/feed/selectors.ts index d55648f78a5..a7af94dcb88 100644 --- a/packages/common/src/store/pages/feed/selectors.ts +++ b/packages/common/src/store/pages/feed/selectors.ts @@ -1,6 +1,6 @@ -import { getUsers } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' -import { createShallowSelector } from 'utils/selectorHelpers' +import { getUsers } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' +import { createShallowSelector } from '~/utils/selectorHelpers' export const getSuggestedFollows = (state: CommonState) => state.pages.feed.suggestedFollows diff --git a/packages/common/src/store/pages/history-page/lineups/tracks/reducer.ts b/packages/common/src/store/pages/history-page/lineups/tracks/reducer.ts index fe7b1fd843a..17924ad3692 100644 --- a/packages/common/src/store/pages/history-page/lineups/tracks/reducer.ts +++ b/packages/common/src/store/pages/history-page/lineups/tracks/reducer.ts @@ -1,7 +1,7 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' import { PREFIX } from './actions' diff --git a/packages/common/src/store/pages/history-page/reducer.ts b/packages/common/src/store/pages/history-page/reducer.ts index 6be93e3651d..8a18d0588ef 100644 --- a/packages/common/src/store/pages/history-page/reducer.ts +++ b/packages/common/src/store/pages/history-page/reducer.ts @@ -1,6 +1,6 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { asLineup } from 'store/lineup/reducer' +import { asLineup } from '~/store/lineup/reducer' import { PREFIX as tracksPrefix } from './lineups/tracks/actions' import tracksReducer, { diff --git a/packages/common/src/store/pages/history-page/selectors.ts b/packages/common/src/store/pages/history-page/selectors.ts index 563d1cd70b6..674a1e58b0b 100644 --- a/packages/common/src/store/pages/history-page/selectors.ts +++ b/packages/common/src/store/pages/history-page/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getHistory = (state: CommonState) => state.pages.historyPage export const getHistoryTracksLineup = (state: CommonState) => diff --git a/packages/common/src/store/pages/premium-tracks/lineup/reducer.ts b/packages/common/src/store/pages/premium-tracks/lineup/reducer.ts index 2f90dfe3f64..8a146b04871 100644 --- a/packages/common/src/store/pages/premium-tracks/lineup/reducer.ts +++ b/packages/common/src/store/pages/premium-tracks/lineup/reducer.ts @@ -1,5 +1,5 @@ -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' import { Track, LineupState } from '../../../../models' diff --git a/packages/common/src/store/pages/premium-tracks/lineup/selectors.ts b/packages/common/src/store/pages/premium-tracks/lineup/selectors.ts index 7bec53c8077..6cabcc48788 100644 --- a/packages/common/src/store/pages/premium-tracks/lineup/selectors.ts +++ b/packages/common/src/store/pages/premium-tracks/lineup/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getLineup = (state: CommonState) => state.pages.premiumTracks.tracks diff --git a/packages/common/src/store/pages/premium-tracks/slice.ts b/packages/common/src/store/pages/premium-tracks/slice.ts index 0f401ebc188..43a712b5593 100644 --- a/packages/common/src/store/pages/premium-tracks/slice.ts +++ b/packages/common/src/store/pages/premium-tracks/slice.ts @@ -1,6 +1,6 @@ import { combineReducers, createSlice } from '@reduxjs/toolkit' -import { asLineup } from 'store/lineup/reducer' +import { asLineup } from '~/store/lineup/reducer' import { PREFIX } from './lineup/actions' import premiumTracksReducer, { diff --git a/packages/common/src/store/pages/profile/actions.ts b/packages/common/src/store/pages/profile/actions.ts index 3572b2391f3..254ad702860 100644 --- a/packages/common/src/store/pages/profile/actions.ts +++ b/packages/common/src/store/pages/profile/actions.ts @@ -1,4 +1,4 @@ -import { Nullable } from 'utils' +import { Nullable } from '~/utils' import { ID, User, UserMetadata } from '../../../models' diff --git a/packages/common/src/store/pages/profile/lineups/feed/reducer.ts b/packages/common/src/store/pages/profile/lineups/feed/reducer.ts index a3e85c91792..f75a6574d60 100644 --- a/packages/common/src/store/pages/profile/lineups/feed/reducer.ts +++ b/packages/common/src/store/pages/profile/lineups/feed/reducer.ts @@ -1,6 +1,6 @@ -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' -import { PREFIX } from 'store/pages/profile/lineups/feed/actions' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' +import { PREFIX } from '~/store/pages/profile/lineups/feed/actions' import { LineupState } from '../../../../../models' diff --git a/packages/common/src/store/pages/profile/lineups/tracks/reducer.ts b/packages/common/src/store/pages/profile/lineups/tracks/reducer.ts index ab0492ffdca..df1b11a07ca 100644 --- a/packages/common/src/store/pages/profile/lineups/tracks/reducer.ts +++ b/packages/common/src/store/pages/profile/lineups/tracks/reducer.ts @@ -1,8 +1,8 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' -import { PREFIX } from 'store/pages/profile/lineups/tracks/actions' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' +import { PREFIX } from '~/store/pages/profile/lineups/tracks/actions' export const initialState = { ...initialLineupState, diff --git a/packages/common/src/store/pages/profile/reducer.ts b/packages/common/src/store/pages/profile/reducer.ts index 6c2474079f1..62d53d878b6 100644 --- a/packages/common/src/store/pages/profile/reducer.ts +++ b/packages/common/src/store/pages/profile/reducer.ts @@ -1,14 +1,14 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { asLineup } from 'store/lineup/reducer' +import { asLineup } from '~/store/lineup/reducer' import feedReducer, { initialState as initialFeedLineupState -} from 'store/pages/profile/lineups/feed/reducer' +} from '~/store/pages/profile/lineups/feed/reducer' import tracksReducer, { initialState as initialTracksLineupState -} from 'store/pages/profile/lineups/tracks/reducer' -import { FollowType, CollectionSortMode } from 'store/pages/profile/types' +} from '~/store/pages/profile/lineups/tracks/reducer' +import { FollowType, CollectionSortMode } from '~/store/pages/profile/types' import { Status } from '../../../models' diff --git a/packages/common/src/store/pages/profile/selectors.ts b/packages/common/src/store/pages/profile/selectors.ts index 802ed29fb56..e9d7859379c 100644 --- a/packages/common/src/store/pages/profile/selectors.ts +++ b/packages/common/src/store/pages/profile/selectors.ts @@ -1,9 +1,9 @@ import { uniq } from 'lodash' -import { getCollections } from 'store/cache/collections/selectors' -import { getUser, getUsers } from 'store/cache/users/selectors' -import type { CommonState } from 'store/commonStore' -import { removeNullable, createDeepEqualSelector, dayjs } from 'utils' +import { getCollections } from '~/store/cache/collections/selectors' +import { getUser, getUsers } from '~/store/cache/users/selectors' +import type { CommonState } from '~/store/commonStore' +import { removeNullable, createDeepEqualSelector, dayjs } from '~/utils' import { Status } from '../../../models' import type { Collection, ID, User, UserCollection } from '../../../models' diff --git a/packages/common/src/store/pages/remixes/lineup/reducer.ts b/packages/common/src/store/pages/remixes/lineup/reducer.ts index 67f1cc37d70..393e5357190 100644 --- a/packages/common/src/store/pages/remixes/lineup/reducer.ts +++ b/packages/common/src/store/pages/remixes/lineup/reducer.ts @@ -1,6 +1,6 @@ -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' -import { PREFIX } from 'store/pages/remixes/lineup/actions' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' +import { PREFIX } from '~/store/pages/remixes/lineup/actions' export const initialState = { ...initialLineupState, diff --git a/packages/common/src/store/pages/remixes/selectors.ts b/packages/common/src/store/pages/remixes/selectors.ts index 119ef2e85d1..8ccdf575ea5 100644 --- a/packages/common/src/store/pages/remixes/selectors.ts +++ b/packages/common/src/store/pages/remixes/selectors.ts @@ -1,6 +1,6 @@ -import { getTrack as getCachedTrack } from 'store/cache/tracks/selectors' -import { getUserFromTrack } from 'store/cache/users/combinedSelectors' -import { CommonState } from 'store/commonStore' +import { getTrack as getCachedTrack } from '~/store/cache/tracks/selectors' +import { getUserFromTrack } from '~/store/cache/users/combinedSelectors' +import { CommonState } from '~/store/commonStore' export const getBaseState = (state: CommonState) => state.pages.remixes diff --git a/packages/common/src/store/pages/remixes/slice.ts b/packages/common/src/store/pages/remixes/slice.ts index 15f1d932897..6dac3912cad 100644 --- a/packages/common/src/store/pages/remixes/slice.ts +++ b/packages/common/src/store/pages/remixes/slice.ts @@ -1,7 +1,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { combineReducers } from 'redux' -import { asLineup } from 'store/lineup/reducer' +import { asLineup } from '~/store/lineup/reducer' import { ID } from '../../../models/Identifiers' diff --git a/packages/common/src/store/pages/saved-page/actions.ts b/packages/common/src/store/pages/saved-page/actions.ts index f5d2380e662..60363faaa26 100644 --- a/packages/common/src/store/pages/saved-page/actions.ts +++ b/packages/common/src/store/pages/saved-page/actions.ts @@ -1,4 +1,4 @@ -import { Favorite } from 'models/Favorite' +import { Favorite } from '~/models/Favorite' import { LibraryCategory, LibraryCategoryType, SavedPageTabs } from './types' diff --git a/packages/common/src/store/pages/saved-page/lineups/tracks/reducer.ts b/packages/common/src/store/pages/saved-page/lineups/tracks/reducer.ts index 5c61462bd8e..182240fa111 100644 --- a/packages/common/src/store/pages/saved-page/lineups/tracks/reducer.ts +++ b/packages/common/src/store/pages/saved-page/lineups/tracks/reducer.ts @@ -1,8 +1,8 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' -import { PREFIX } from 'store/pages/saved-page/lineups/tracks/actions' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' +import { PREFIX } from '~/store/pages/saved-page/lineups/tracks/actions' export const initialState = { ...initialLineupState, diff --git a/packages/common/src/store/pages/saved-page/reducer.ts b/packages/common/src/store/pages/saved-page/reducer.ts index 5ffb63ee0b9..c2dcd487cdc 100644 --- a/packages/common/src/store/pages/saved-page/reducer.ts +++ b/packages/common/src/store/pages/saved-page/reducer.ts @@ -1,7 +1,7 @@ import { Storage, persistReducer } from 'redux-persist' -import { ID } from 'models/Identifiers' -import { asLineup } from 'store/lineup/reducer' +import { ID } from '~/models/Identifiers' +import { asLineup } from '~/store/lineup/reducer' import { ADD_LOCAL_COLLECTION, ADD_LOCAL_TRACK, @@ -16,12 +16,12 @@ import { REMOVE_LOCAL_COLLECTION, REMOVE_LOCAL_TRACK, SET_SELECTED_CATEGORY -} from 'store/pages/saved-page/actions' +} from '~/store/pages/saved-page/actions' import tracksReducer, { initialState as initialLineupState -} from 'store/pages/saved-page/lineups/tracks/reducer' -import { signOut } from 'store/sign-out/slice' -import { ActionsMap } from 'utils/reducer' +} from '~/store/pages/saved-page/lineups/tracks/reducer' +import { signOut } from '~/store/sign-out/slice' +import { ActionsMap } from '~/utils/reducer' import { PREFIX as tracksPrefix } from './lineups/tracks/actions' import { LibraryCategory, LibraryCategoryType, SavedPageState } from './types' diff --git a/packages/common/src/store/pages/saved-page/selectors.ts b/packages/common/src/store/pages/saved-page/selectors.ts index fed17b8c015..13c281f910a 100644 --- a/packages/common/src/store/pages/saved-page/selectors.ts +++ b/packages/common/src/store/pages/saved-page/selectors.ts @@ -1,6 +1,6 @@ import { uniq } from 'lodash' -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { ID } from '../../../models/Identifiers' diff --git a/packages/common/src/store/pages/saved-page/types.ts b/packages/common/src/store/pages/saved-page/types.ts index b6c460f6a8b..466e0202dbf 100644 --- a/packages/common/src/store/pages/saved-page/types.ts +++ b/packages/common/src/store/pages/saved-page/types.ts @@ -1,7 +1,7 @@ import { full } from '@audius/sdk' -import type { Dayjs } from 'utils/dayjs' -import { ValueOf } from 'utils/typeUtils' +import type { Dayjs } from '~/utils/dayjs' +import { ValueOf } from '~/utils/typeUtils' import { UID, diff --git a/packages/common/src/store/pages/search-results/lineup/tracks/reducer.ts b/packages/common/src/store/pages/search-results/lineup/tracks/reducer.ts index 2c96f4efda5..a977ae82bad 100644 --- a/packages/common/src/store/pages/search-results/lineup/tracks/reducer.ts +++ b/packages/common/src/store/pages/search-results/lineup/tracks/reducer.ts @@ -1,6 +1,6 @@ -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' -import { PREFIX } from 'store/pages/search-results/lineup/tracks/actions' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' +import { PREFIX } from '~/store/pages/search-results/lineup/tracks/actions' import { LineupState, Track } from '../../../../../models' diff --git a/packages/common/src/store/pages/search-results/reducer.ts b/packages/common/src/store/pages/search-results/reducer.ts index 2affba8b5f4..b753207160a 100644 --- a/packages/common/src/store/pages/search-results/reducer.ts +++ b/packages/common/src/store/pages/search-results/reducer.ts @@ -1,4 +1,4 @@ -import { asLineup } from 'store/lineup/reducer' +import { asLineup } from '~/store/lineup/reducer' import { FETCH_SEARCH_PAGE_RESULTS, FETCH_SEARCH_PAGE_RESULTS_SUCCEEDED, @@ -12,11 +12,11 @@ import { FetchSearchPageTagsAction, FetchSearchPageTagsSucceededAction, FetchSearchPageTagsFailedAction -} from 'store/pages/search-results/actions' -import { PREFIX } from 'store/pages/search-results/lineup/tracks/actions' +} from '~/store/pages/search-results/actions' +import { PREFIX } from '~/store/pages/search-results/lineup/tracks/actions' import tracksReducer, { initialState as initialLineupState -} from 'store/pages/search-results/lineup/tracks/reducer' +} from '~/store/pages/search-results/lineup/tracks/reducer' import { Status } from '../../../models' diff --git a/packages/common/src/store/pages/search-results/selectors.ts b/packages/common/src/store/pages/search-results/selectors.ts index a4ad0f1e9da..c4045d31e71 100644 --- a/packages/common/src/store/pages/search-results/selectors.ts +++ b/packages/common/src/store/pages/search-results/selectors.ts @@ -1,9 +1,9 @@ import { createSelector } from 'reselect' -import { getCollections } from 'store/cache/collections/selectors' -import { getUsers } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' -import { createShallowSelector } from 'utils/selectorHelpers' +import { getCollections } from '~/store/cache/collections/selectors' +import { getUsers } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' +import { createShallowSelector } from '~/utils/selectorHelpers' // Search Results selectors export const getBaseState = (state: CommonState) => state.pages.searchResults diff --git a/packages/common/src/store/pages/settings/actions.ts b/packages/common/src/store/pages/settings/actions.ts index b2a517742b4..046e39dfb02 100644 --- a/packages/common/src/store/pages/settings/actions.ts +++ b/packages/common/src/store/pages/settings/actions.ts @@ -1,4 +1,4 @@ -import { Permission } from 'utils/browserNotifications' +import { Permission } from '~/utils/browserNotifications' import { BrowserNotificationSetting, diff --git a/packages/common/src/store/pages/settings/reducer.ts b/packages/common/src/store/pages/settings/reducer.ts index 15597dc70a9..20c70b4e3d6 100644 --- a/packages/common/src/store/pages/settings/reducer.ts +++ b/packages/common/src/store/pages/settings/reducer.ts @@ -1,4 +1,4 @@ -import { ActionsMap } from 'utils/reducer' +import { ActionsMap } from '~/utils/reducer' import { ToggleNotificationSetting, diff --git a/packages/common/src/store/pages/settings/selectors.ts b/packages/common/src/store/pages/settings/selectors.ts index 38ba87549ac..beabbbd133b 100644 --- a/packages/common/src/store/pages/settings/selectors.ts +++ b/packages/common/src/store/pages/settings/selectors.ts @@ -1,5 +1,5 @@ -import { getAccountUser } from 'store/account/selectors' -import { CommonState } from 'store/commonStore' +import { getAccountUser } from '~/store/account/selectors' +import { CommonState } from '~/store/commonStore' const getBaseState = (state: CommonState) => state.pages.settings diff --git a/packages/common/src/store/pages/settings/types.ts b/packages/common/src/store/pages/settings/types.ts index 8f993577b3b..f568797edc2 100644 --- a/packages/common/src/store/pages/settings/types.ts +++ b/packages/common/src/store/pages/settings/types.ts @@ -1,4 +1,4 @@ -import { Permission } from 'utils/browserNotifications' +import { Permission } from '~/utils/browserNotifications' export enum BrowserNotificationSetting { BrowserPush = 'browserPush', diff --git a/packages/common/src/store/pages/smart-collection/selectors.ts b/packages/common/src/store/pages/smart-collection/selectors.ts index 948a5537217..7efdb73e129 100644 --- a/packages/common/src/store/pages/smart-collection/selectors.ts +++ b/packages/common/src/store/pages/smart-collection/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { SmartCollectionVariant } from '../../../models/SmartCollectionVariant' diff --git a/packages/common/src/store/pages/token-dashboard/slice.ts b/packages/common/src/store/pages/token-dashboard/slice.ts index a05970eff55..3028b4630aa 100644 --- a/packages/common/src/store/pages/token-dashboard/slice.ts +++ b/packages/common/src/store/pages/token-dashboard/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { Nullable } from 'utils/typeUtils' +import { Nullable } from '~/utils/typeUtils' import { Chain } from '../../../models/Chain' import { BNWei, WalletAddress } from '../../../models/Wallet' diff --git a/packages/common/src/store/pages/track/lineup/reducer.ts b/packages/common/src/store/pages/track/lineup/reducer.ts index f6c277d67ec..930fb30fdef 100644 --- a/packages/common/src/store/pages/track/lineup/reducer.ts +++ b/packages/common/src/store/pages/track/lineup/reducer.ts @@ -1,8 +1,8 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' -import { PREFIX } from 'store/pages/track/lineup/actions' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' +import { PREFIX } from '~/store/pages/track/lineup/actions' export const initialState = { ...initialLineupState, diff --git a/packages/common/src/store/pages/track/reducer.ts b/packages/common/src/store/pages/track/reducer.ts index ee0ba019ea6..de69b43667c 100644 --- a/packages/common/src/store/pages/track/reducer.ts +++ b/packages/common/src/store/pages/track/reducer.ts @@ -1,12 +1,12 @@ // @ts-nocheck // TODO(nkang) - convert to TS -import { SsrPageProps } from 'models/SsrPageProps' -import { asLineup } from 'store/lineup/reducer' +import { SsrPageProps } from '~/models/SsrPageProps' +import { asLineup } from '~/store/lineup/reducer' import tracksReducer, { initialState as initialLineupState -} from 'store/pages/track/lineup/reducer' -import { decodeHashId } from 'utils/hashIds' +} from '~/store/pages/track/lineup/reducer' +import { decodeHashId } from '~/utils/hashIds' import { SET_TRACK_ID, diff --git a/packages/common/src/store/pages/track/selectors.ts b/packages/common/src/store/pages/track/selectors.ts index d169674203e..f5bc964768e 100644 --- a/packages/common/src/store/pages/track/selectors.ts +++ b/packages/common/src/store/pages/track/selectors.ts @@ -1,10 +1,10 @@ import { getTrack as getCachedTrack, getStatus as getCachedTrackStatus -} from 'store/cache/tracks/selectors' -import { getUser as getCachedUser } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' -import { PREFIX } from 'store/pages/track/lineup/actions' +} from '~/store/cache/tracks/selectors' +import { getUser as getCachedUser } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' +import { PREFIX } from '~/store/pages/track/lineup/actions' import { ID, Track, User } from '../../../models' import { Nullable } from '../../../utils/typeUtils' diff --git a/packages/common/src/store/pages/trending-playlists/lineups/reducer.ts b/packages/common/src/store/pages/trending-playlists/lineups/reducer.ts index 802ab34306b..448984b8892 100644 --- a/packages/common/src/store/pages/trending-playlists/lineups/reducer.ts +++ b/packages/common/src/store/pages/trending-playlists/lineups/reducer.ts @@ -1,5 +1,5 @@ -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' import { Collection, LineupState } from '../../../../models' diff --git a/packages/common/src/store/pages/trending-playlists/lineups/selectors.ts b/packages/common/src/store/pages/trending-playlists/lineups/selectors.ts index 38114a1ede0..138a0d74d5b 100644 --- a/packages/common/src/store/pages/trending-playlists/lineups/selectors.ts +++ b/packages/common/src/store/pages/trending-playlists/lineups/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getLineup = (state: CommonState) => state.pages.trendingPlaylists.trending diff --git a/packages/common/src/store/pages/trending-playlists/slice.ts b/packages/common/src/store/pages/trending-playlists/slice.ts index 32e198befc5..d2a36261bcb 100644 --- a/packages/common/src/store/pages/trending-playlists/slice.ts +++ b/packages/common/src/store/pages/trending-playlists/slice.ts @@ -1,6 +1,6 @@ import { combineReducers, createSlice } from '@reduxjs/toolkit' -import { asLineup } from 'store/lineup/reducer' +import { asLineup } from '~/store/lineup/reducer' import { PREFIX } from './lineups/actions' import playlistsReducer, { diff --git a/packages/common/src/store/pages/trending-underground/lineup/reducer.ts b/packages/common/src/store/pages/trending-underground/lineup/reducer.ts index fff4e675d21..a225f49facb 100644 --- a/packages/common/src/store/pages/trending-underground/lineup/reducer.ts +++ b/packages/common/src/store/pages/trending-underground/lineup/reducer.ts @@ -1,5 +1,5 @@ -import { RESET_SUCCEEDED, stripPrefix } from 'store/lineup/actions' -import { initialLineupState } from 'store/lineup/reducer' +import { RESET_SUCCEEDED, stripPrefix } from '~/store/lineup/actions' +import { initialLineupState } from '~/store/lineup/reducer' import { LineupState, Track } from '../../../../models' diff --git a/packages/common/src/store/pages/trending-underground/lineup/selectors.ts b/packages/common/src/store/pages/trending-underground/lineup/selectors.ts index 72793cb62c0..36e1771f542 100644 --- a/packages/common/src/store/pages/trending-underground/lineup/selectors.ts +++ b/packages/common/src/store/pages/trending-underground/lineup/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getLineup = (state: CommonState) => state.pages.trendingUnderground.trending diff --git a/packages/common/src/store/pages/trending-underground/slice.ts b/packages/common/src/store/pages/trending-underground/slice.ts index 32c758db67a..901a68a1bff 100644 --- a/packages/common/src/store/pages/trending-underground/slice.ts +++ b/packages/common/src/store/pages/trending-underground/slice.ts @@ -1,6 +1,6 @@ import { combineReducers, createSlice } from '@reduxjs/toolkit' -import { asLineup } from 'store/lineup/reducer' +import { asLineup } from '~/store/lineup/reducer' import { PREFIX } from './lineup/actions' import trendingReducer, { diff --git a/packages/common/src/store/pages/trending/actions.ts b/packages/common/src/store/pages/trending/actions.ts index 993cbcfcb60..da2d7adf680 100644 --- a/packages/common/src/store/pages/trending/actions.ts +++ b/packages/common/src/store/pages/trending/actions.ts @@ -1,4 +1,4 @@ -import { Genre } from 'utils' +import { Genre } from '~/utils' import { TimeRange } from '../../../models' diff --git a/packages/common/src/store/pages/trending/lineup/reducer.ts b/packages/common/src/store/pages/trending/lineup/reducer.ts index 29d03767a41..c00296c9096 100644 --- a/packages/common/src/store/pages/trending/lineup/reducer.ts +++ b/packages/common/src/store/pages/trending/lineup/reducer.ts @@ -1,4 +1,4 @@ -import { initialLineupState } from 'store/lineup/reducer' +import { initialLineupState } from '~/store/lineup/reducer' import { UID, LineupState, Track } from '../../../../models' import { RESET_SUCCEEDED, stripPrefix } from '../../../lineup/actions' diff --git a/packages/common/src/store/pages/trending/lineup/selectors.ts b/packages/common/src/store/pages/trending/lineup/selectors.ts index 690138ff906..7ba395f2c41 100644 --- a/packages/common/src/store/pages/trending/lineup/selectors.ts +++ b/packages/common/src/store/pages/trending/lineup/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { LineupStateTrack, TimeRange } from '../../../../models' diff --git a/packages/common/src/store/pages/trending/reducer.ts b/packages/common/src/store/pages/trending/reducer.ts index fce30602f71..2bbdcb7a59c 100644 --- a/packages/common/src/store/pages/trending/reducer.ts +++ b/packages/common/src/store/pages/trending/reducer.ts @@ -2,18 +2,18 @@ // TODO(nkang) - convert to TS import { History } from 'history' -import { asLineup } from 'store/lineup/reducer' +import { asLineup } from '~/store/lineup/reducer' import { SET_TRENDING_GENRE, SET_TRENDING_TIME_RANGE, SET_LAST_FETCHED_TRENDING_GENRE -} from 'store/pages/trending/actions' +} from '~/store/pages/trending/actions' import { TRENDING_WEEK_PREFIX, TRENDING_MONTH_PREFIX, TRENDING_ALL_TIME_PREFIX -} from 'store/pages/trending/lineup/actions' -import { GENRES } from 'utils/genres' +} from '~/store/pages/trending/lineup/actions' +import { GENRES } from '~/utils/genres' import { TimeRange } from '../../../models' diff --git a/packages/common/src/store/pages/trending/selectors.ts b/packages/common/src/store/pages/trending/selectors.ts index 99c6c6df25f..aca88d81827 100644 --- a/packages/common/src/store/pages/trending/selectors.ts +++ b/packages/common/src/store/pages/trending/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { TimeRange } from '../../../models' diff --git a/packages/common/src/store/playback-position/sagas.ts b/packages/common/src/store/playback-position/sagas.ts index 9b3818ebfa6..193a8769edd 100644 --- a/packages/common/src/store/playback-position/sagas.ts +++ b/packages/common/src/store/playback-position/sagas.ts @@ -1,12 +1,12 @@ import { call, delay, put, select, takeEvery } from 'typed-redux-saga' -import { AudioPlayer } from 'services/audio-player' -import { FeatureFlags } from 'services/remote-config' -import { getUserId } from 'store/account/selectors' -import { getTrack } from 'store/cache/tracks/selectors' -import { getContext } from 'store/effects' -import { getPlaying, getTrackId } from 'store/player/selectors' -import { Genre } from 'utils/genres' +import { AudioPlayer } from '~/services/audio-player' +import { FeatureFlags } from '~/services/remote-config' +import { getUserId } from '~/store/account/selectors' +import { getTrack } from '~/store/cache/tracks/selectors' +import { getContext } from '~/store/effects' +import { getPlaying, getTrackId } from '~/store/player/selectors' +import { Genre } from '~/utils/genres' import { getPlaybackPositions } from './selectors' import { diff --git a/packages/common/src/store/playback-position/selectors.ts b/packages/common/src/store/playback-position/selectors.ts index 7c0acdb6a71..2e6a8a377c3 100644 --- a/packages/common/src/store/playback-position/selectors.ts +++ b/packages/common/src/store/playback-position/selectors.ts @@ -1,4 +1,4 @@ -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' import { CommonState } from '../commonStore' diff --git a/packages/common/src/store/playback-position/slice.ts b/packages/common/src/store/playback-position/slice.ts index 460c31c26ca..8512656ddca 100644 --- a/packages/common/src/store/playback-position/slice.ts +++ b/packages/common/src/store/playback-position/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' import { PlaybackPositionInfo, PlaybackPositionState } from './types' diff --git a/packages/common/src/store/playback-position/types.ts b/packages/common/src/store/playback-position/types.ts index ce595a59fb9..59a45665a09 100644 --- a/packages/common/src/store/playback-position/types.ts +++ b/packages/common/src/store/playback-position/types.ts @@ -1,4 +1,4 @@ -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' export const LEGACY_PLAYBACK_POSITION_LS_KEY = 'playbackPosition' export const PLAYBACK_POSITION_LS_KEY = 'userPlaybackPositions' diff --git a/packages/common/src/store/player/sagas.ts b/packages/common/src/store/player/sagas.ts index 191a6238cbc..9b90f5c3b63 100644 --- a/packages/common/src/store/player/sagas.ts +++ b/packages/common/src/store/player/sagas.ts @@ -1,7 +1,7 @@ import { call, put, takeEvery } from 'typed-redux-saga' -import { FeatureFlags } from 'services/remote-config' -import { getContext } from 'store/effects' +import { FeatureFlags } from '~/services/remote-config' +import { getContext } from '~/store/effects' import { setPlaybackRate } from './slice' import { PlaybackRate, PLAYBACK_RATE_LS_KEY } from './types' diff --git a/packages/common/src/store/playlist-library/helpers.ts b/packages/common/src/store/playlist-library/helpers.ts index 543daa3db55..8773665b4a9 100644 --- a/packages/common/src/store/playlist-library/helpers.ts +++ b/packages/common/src/store/playlist-library/helpers.ts @@ -1,5 +1,5 @@ -import { Nullable } from 'utils/typeUtils' -import { uuid } from 'utils/uid' +import { Nullable } from '~/utils/typeUtils' +import { uuid } from '~/utils/uid' import { ID } from '../../models/Identifiers' import { diff --git a/packages/common/src/store/playlist-library/selectors.ts b/packages/common/src/store/playlist-library/selectors.ts index 6a1296e7734..6176711ffab 100644 --- a/packages/common/src/store/playlist-library/selectors.ts +++ b/packages/common/src/store/playlist-library/selectors.ts @@ -1,5 +1,5 @@ -import { getUserId } from 'store/account/selectors' -import { getUser } from 'store/cache/users/selectors' +import { getUserId } from '~/store/account/selectors' +import { getUser } from '~/store/cache/users/selectors' import { CommonState } from '../reducers' diff --git a/packages/common/src/store/playlist-updates/playlistUpdatesSagas.ts b/packages/common/src/store/playlist-updates/playlistUpdatesSagas.ts index b237aa11657..caece367c2d 100644 --- a/packages/common/src/store/playlist-updates/playlistUpdatesSagas.ts +++ b/packages/common/src/store/playlist-updates/playlistUpdatesSagas.ts @@ -1,7 +1,7 @@ import { call, takeEvery, select, put } from 'typed-redux-saga' -import { Name } from 'models/Analytics' -import { getContext } from 'store/effects' +import { Name } from '~/models/Analytics' +import { getContext } from '~/store/effects' import { getUserId } from '../account/selectors' diff --git a/packages/common/src/store/playlist-updates/types.ts b/packages/common/src/store/playlist-updates/types.ts index 239e1a44171..338edec6ce1 100644 --- a/packages/common/src/store/playlist-updates/types.ts +++ b/packages/common/src/store/playlist-updates/types.ts @@ -1,6 +1,6 @@ import { EntityState, PayloadAction } from '@reduxjs/toolkit' -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' export type PlaylistUpdate = { playlist_id: number diff --git a/packages/common/src/store/purchase-content/sagas.ts b/packages/common/src/store/purchase-content/sagas.ts index a601b4c6ed0..6337a50ced4 100644 --- a/packages/common/src/store/purchase-content/sagas.ts +++ b/packages/common/src/store/purchase-content/sagas.ts @@ -2,55 +2,55 @@ import BN from 'bn.js' import { takeLatest } from 'redux-saga/effects' import { call, put, race, select, take } from 'typed-redux-saga' -import { FavoriteSource, Name } from 'models/Analytics' -import { ErrorLevel } from 'models/ErrorReporting' -import { ID } from 'models/Identifiers' -import { PurchaseMethod, PurchaseVendor } from 'models/PurchaseContent' -import { Track, isContentUSDCPurchaseGated } from 'models/Track' -import { User } from 'models/User' -import { BNUSDC } from 'models/Wallet' +import { FavoriteSource, Name } from '~/models/Analytics' +import { ErrorLevel } from '~/models/ErrorReporting' +import { ID } from '~/models/Identifiers' +import { PurchaseMethod, PurchaseVendor } from '~/models/PurchaseContent' +import { Track, isContentUSDCPurchaseGated } from '~/models/Track' +import { User } from '~/models/User' +import { BNUSDC } from '~/models/Wallet' import { getRecentBlockhash, getRootSolanaAccount, getTokenAccountInfo, purchaseContent, purchaseContentWithPaymentRouter -} from 'services/audius-backend/solana' -import { FeatureFlags } from 'services/remote-config/feature-flags' -import { accountSelectors } from 'store/account' +} from '~/services/audius-backend/solana' +import { FeatureFlags } from '~/services/remote-config/feature-flags' +import { accountSelectors } from '~/store/account' import { buyCryptoCanceled, buyCryptoFailed, buyCryptoSucceeded, buyCryptoViaSol -} from 'store/buy-crypto/slice' -import { BuyCryptoError } from 'store/buy-crypto/types' +} from '~/store/buy-crypto/slice' +import { BuyCryptoError } from '~/store/buy-crypto/types' import { buyUSDCFlowFailed, buyUSDCFlowSucceeded, onrampOpened, onrampCanceled -} from 'store/buy-usdc/slice' -import { BuyUSDCError } from 'store/buy-usdc/types' -import { getBuyUSDCRemoteConfig, getUSDCUserBank } from 'store/buy-usdc/utils' -import { getTrack } from 'store/cache/tracks/selectors' -import { getUser } from 'store/cache/users/selectors' -import { getContext } from 'store/effects' -import { getPreviewing, getTrackId } from 'store/player/selectors' -import { stop } from 'store/player/slice' -import { saveTrack } from 'store/social/tracks/actions' -import { getFeePayer } from 'store/solana/selectors' -import { OnRampProvider } from 'store/ui/buy-audio/types' +} from '~/store/buy-usdc/slice' +import { BuyUSDCError } from '~/store/buy-usdc/types' +import { getBuyUSDCRemoteConfig, getUSDCUserBank } from '~/store/buy-usdc/utils' +import { getTrack } from '~/store/cache/tracks/selectors' +import { getUser } from '~/store/cache/users/selectors' +import { getContext } from '~/store/effects' +import { getPreviewing, getTrackId } from '~/store/player/selectors' +import { stop } from '~/store/player/slice' +import { saveTrack } from '~/store/social/tracks/actions' +import { getFeePayer } from '~/store/solana/selectors' +import { OnRampProvider } from '~/store/ui/buy-audio/types' import { transactionCanceled, transactionFailed, transactionSucceeded -} from 'store/ui/coinflow-modal/slice' +} from '~/store/ui/coinflow-modal/slice' import { CoinflowPurchaseMetadata, coinflowOnrampModalActions -} from 'store/ui/modals/coinflow-onramp-modal' -import { BN_USDC_CENT_WEI } from 'utils/wallet' +} from '~/store/ui/modals/coinflow-onramp-modal' +import { BN_USDC_CENT_WEI } from '~/utils/wallet' import { pollGatedTrack } from '../gated-content/sagas' import { updateGatedTrackStatus } from '../gated-content/slice' diff --git a/packages/common/src/store/purchase-content/selectors.ts b/packages/common/src/store/purchase-content/selectors.ts index db690dff85d..db8bfb602cb 100644 --- a/packages/common/src/store/purchase-content/selectors.ts +++ b/packages/common/src/store/purchase-content/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/reducers' +import { CommonState } from '~/store/reducers' export const getPurchaseContentId = (state: CommonState) => state.purchaseContent.contentId diff --git a/packages/common/src/store/purchase-content/slice.ts b/packages/common/src/store/purchase-content/slice.ts index f2dffc4de80..c217c820102 100644 --- a/packages/common/src/store/purchase-content/slice.ts +++ b/packages/common/src/store/purchase-content/slice.ts @@ -1,7 +1,7 @@ import { Action, createSlice, PayloadAction } from '@reduxjs/toolkit' -import { ID } from 'models/Identifiers' -import { PurchaseMethod, PurchaseVendor } from 'models/PurchaseContent' +import { ID } from '~/models/Identifiers' +import { PurchaseMethod, PurchaseVendor } from '~/models/PurchaseContent' import { ContentType, diff --git a/packages/common/src/store/purchase-content/types.ts b/packages/common/src/store/purchase-content/types.ts index a980ca954d0..5acf76766c0 100644 --- a/packages/common/src/store/purchase-content/types.ts +++ b/packages/common/src/store/purchase-content/types.ts @@ -1,4 +1,4 @@ -import { BuyCryptoErrorCode } from 'store/buy-crypto/types' +import { BuyCryptoErrorCode } from '~/store/buy-crypto/types' import { BuyUSDCErrorCode } from '../buy-usdc' diff --git a/packages/common/src/store/purchase-content/utils.test.ts b/packages/common/src/store/purchase-content/utils.test.ts index 1d36db05c33..1028dbeb3dc 100644 --- a/packages/common/src/store/purchase-content/utils.test.ts +++ b/packages/common/src/store/purchase-content/utils.test.ts @@ -1,7 +1,7 @@ import BN from 'bn.js' -import { BNUSDC } from 'models/Wallet' -import { BN_USDC_CENT_WEI } from 'utils/wallet' +import { BNUSDC } from '~/models/Wallet' +import { BN_USDC_CENT_WEI } from '~/utils/wallet' import { getBalanceNeeded, getPurchaseSummaryValues } from './utils' diff --git a/packages/common/src/store/purchase-content/utils.ts b/packages/common/src/store/purchase-content/utils.ts index 91ae54d98fe..440b54bc747 100644 --- a/packages/common/src/store/purchase-content/utils.ts +++ b/packages/common/src/store/purchase-content/utils.ts @@ -1,8 +1,8 @@ import BN from 'bn.js' -import { BNUSDC } from 'models/Wallet' -import { Nullable } from 'utils/typeUtils' -import { BN_USDC_CENT_WEI, ceilingBNUSDCToNearestCent } from 'utils/wallet' +import { BNUSDC } from '~/models/Wallet' +import { Nullable } from '~/utils/typeUtils' +import { BN_USDC_CENT_WEI, ceilingBNUSDCToNearestCent } from '~/utils/wallet' import { PurchaseContentStage } from './types' diff --git a/packages/common/src/store/reachability/sagas.ts b/packages/common/src/store/reachability/sagas.ts index f9337719a03..cacc4e1ceed 100644 --- a/packages/common/src/store/reachability/sagas.ts +++ b/packages/common/src/store/reachability/sagas.ts @@ -1,6 +1,6 @@ import { takeEvery, select, all, take } from 'typed-redux-saga' -import { getContext } from 'store/effects' +import { getContext } from '~/store/effects' import * as reachabilityActions from './actions' import * as reachabilitySelectors from './selectors' diff --git a/packages/common/src/store/reachability/selectors.ts b/packages/common/src/store/reachability/selectors.ts index 2038685e1e5..b1f383ef0ce 100644 --- a/packages/common/src/store/reachability/selectors.ts +++ b/packages/common/src/store/reachability/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getIsReachable = (state: CommonState) => state.reachability.networkReachable diff --git a/packages/common/src/store/reducers.ts b/packages/common/src/store/reducers.ts index 6f853e781e9..b4890e6e133 100644 --- a/packages/common/src/store/reducers.ts +++ b/packages/common/src/store/reducers.ts @@ -2,7 +2,7 @@ import { History } from 'history' import { combineReducers } from 'redux' import type { Storage } from 'redux-persist' -import { SsrPageProps } from 'models/SsrPageProps' +import { SsrPageProps } from '~/models/SsrPageProps' import apiReducer from '../api/reducer' import { Kind } from '../models' diff --git a/packages/common/src/store/sagas.ts b/packages/common/src/store/sagas.ts index eff0ccd0e18..4be9f86ad11 100644 --- a/packages/common/src/store/sagas.ts +++ b/packages/common/src/store/sagas.ts @@ -6,15 +6,15 @@ // import recoveryEmailSagas from 'common/store/recovery-email/sagas' // import signOutSagas from 'common/store/sign-out/sagas' -import { accountSagas } from 'store/account' -import { buyUSDCSagas } from 'store/buy-usdc' -import { sagas as castSagas } from 'store/cast/sagas' -import { gatedContentSagas } from 'store/gated-content' -import { chatSagas } from 'store/pages/chat' -import { playbackPositionSagas } from 'store/playback-position' -import { playerSagas } from 'store/player' -import { purchaseContentSagas } from 'store/purchase-content' -import remoteConfigSagas from 'store/remote-config/sagas' +import { accountSagas } from '~/store/account' +import { buyUSDCSagas } from '~/store/buy-usdc' +import { sagas as castSagas } from '~/store/cast/sagas' +import { gatedContentSagas } from '~/store/gated-content' +import { chatSagas } from '~/store/pages/chat' +import { playbackPositionSagas } from '~/store/playback-position' +import { playerSagas } from '~/store/player' +import { purchaseContentSagas } from '~/store/purchase-content' +import remoteConfigSagas from '~/store/remote-config/sagas' import { searchUsersModalSagas, toastSagas, @@ -27,7 +27,7 @@ import { uploadConfirmationModalUISagas, publishTrackConfirmationModalUISagas, modalsSagas -} from 'store/ui' +} from '~/store/ui' import { buyCryptoSagas } from './buy-crypto' import { playlistUpdatesSagas } from './playlist-updates' diff --git a/packages/common/src/store/saved-collections/selectors.ts b/packages/common/src/store/saved-collections/selectors.ts index a037de04808..14ee92fba7c 100644 --- a/packages/common/src/store/saved-collections/selectors.ts +++ b/packages/common/src/store/saved-collections/selectors.ts @@ -1,7 +1,7 @@ import { createSelector } from '@reduxjs/toolkit' -import { ID } from 'models/Identifiers' -import { getUsers } from 'store/cache/users/selectors' +import { ID } from '~/models/Identifiers' +import { getUsers } from '~/store/cache/users/selectors' import { getAccountStatus } from '../account/selectors' import { getCollections } from '../cache/collections/selectors' diff --git a/packages/common/src/store/solana/selectors.ts b/packages/common/src/store/solana/selectors.ts index 6060b4b18ab..d3d8069774e 100644 --- a/packages/common/src/store/solana/selectors.ts +++ b/packages/common/src/store/solana/selectors.ts @@ -1,3 +1,3 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getFeePayer = (state: CommonState) => state.solana.feePayer diff --git a/packages/common/src/store/stems-upload/selectors.ts b/packages/common/src/store/stems-upload/selectors.ts index f3c99550231..417648dda7c 100644 --- a/packages/common/src/store/stems-upload/selectors.ts +++ b/packages/common/src/store/stems-upload/selectors.ts @@ -1,6 +1,6 @@ import { createSelector } from 'reselect' -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { ID } from '../../models/Identifiers' diff --git a/packages/common/src/store/ui/add-to-collection/selectors.ts b/packages/common/src/store/ui/add-to-collection/selectors.ts index 3b11be093fb..823c663cf44 100644 --- a/packages/common/src/store/ui/add-to-collection/selectors.ts +++ b/packages/common/src/store/ui/add-to-collection/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' const getBaseState = (state: CommonState) => state.ui.addToCollection diff --git a/packages/common/src/store/ui/buy-audio/selectors.ts b/packages/common/src/store/ui/buy-audio/selectors.ts index bdf59327bba..f2028a88e43 100644 --- a/packages/common/src/store/ui/buy-audio/selectors.ts +++ b/packages/common/src/store/ui/buy-audio/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/reducers' +import { CommonState } from '~/store/reducers' export const getBuyAudioProvider = (state: CommonState) => state.ui.buyAudio.provider diff --git a/packages/common/src/store/ui/collectible-details/selectors.ts b/packages/common/src/store/ui/collectible-details/selectors.ts index 7ceaf517f7d..477c024068b 100644 --- a/packages/common/src/store/ui/collectible-details/selectors.ts +++ b/packages/common/src/store/ui/collectible-details/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getCollectibleDetails = (state: CommonState) => { return state.ui.collectibleDetails diff --git a/packages/common/src/store/ui/delete-playlist-confirmation-modal/selectors.ts b/packages/common/src/store/ui/delete-playlist-confirmation-modal/selectors.ts index 85936180eee..72a969a802c 100644 --- a/packages/common/src/store/ui/delete-playlist-confirmation-modal/selectors.ts +++ b/packages/common/src/store/ui/delete-playlist-confirmation-modal/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getPlaylistId = (state: CommonState) => state.ui.deletePlaylistConfirmationModal.playlistId diff --git a/packages/common/src/store/ui/delete-playlist-confirmation-modal/slice.ts b/packages/common/src/store/ui/delete-playlist-confirmation-modal/slice.ts index 2acd9f0eabe..874e1b5f8f9 100644 --- a/packages/common/src/store/ui/delete-playlist-confirmation-modal/slice.ts +++ b/packages/common/src/store/ui/delete-playlist-confirmation-modal/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { Nullable } from 'utils/typeUtils' +import { Nullable } from '~/utils/typeUtils' import { ID } from '../../../models/Identifiers' diff --git a/packages/common/src/store/ui/duplicate-add-confirmation-modal/selectors.ts b/packages/common/src/store/ui/duplicate-add-confirmation-modal/selectors.ts index 0ffa395a360..9595f40ecbf 100644 --- a/packages/common/src/store/ui/duplicate-add-confirmation-modal/selectors.ts +++ b/packages/common/src/store/ui/duplicate-add-confirmation-modal/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getPlaylistId = (state: CommonState) => state.ui.duplicateAddConfirmationModal.playlistId diff --git a/packages/common/src/store/ui/duplicate-add-confirmation-modal/slice.ts b/packages/common/src/store/ui/duplicate-add-confirmation-modal/slice.ts index 49711ae1e8e..e5f233dae05 100644 --- a/packages/common/src/store/ui/duplicate-add-confirmation-modal/slice.ts +++ b/packages/common/src/store/ui/duplicate-add-confirmation-modal/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { Nullable } from 'utils/typeUtils' +import { Nullable } from '~/utils/typeUtils' import { ID } from '../../../models/Identifiers' diff --git a/packages/common/src/store/ui/mobile-overflow-menu/sagas.ts b/packages/common/src/store/ui/mobile-overflow-menu/sagas.ts index df5091ac17c..354664efa0a 100644 --- a/packages/common/src/store/ui/mobile-overflow-menu/sagas.ts +++ b/packages/common/src/store/ui/mobile-overflow-menu/sagas.ts @@ -1,6 +1,6 @@ import { put, takeEvery } from 'typed-redux-saga' -import { setVisibility } from 'store/ui/modals/parentSlice' +import { setVisibility } from '~/store/ui/modals/parentSlice' import { open } from './slice' diff --git a/packages/common/src/store/ui/mobile-overflow-menu/selectors.ts b/packages/common/src/store/ui/mobile-overflow-menu/selectors.ts index 1444d027dd8..db7f687161c 100644 --- a/packages/common/src/store/ui/mobile-overflow-menu/selectors.ts +++ b/packages/common/src/store/ui/mobile-overflow-menu/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getMobileOverflowModal = (state: CommonState) => state.ui.mobileOverflowModal diff --git a/packages/common/src/store/ui/modals/coinflow-onramp-modal/index.ts b/packages/common/src/store/ui/modals/coinflow-onramp-modal/index.ts index dd89a139524..5b1a049c8c0 100644 --- a/packages/common/src/store/ui/modals/coinflow-onramp-modal/index.ts +++ b/packages/common/src/store/ui/modals/coinflow-onramp-modal/index.ts @@ -1,6 +1,6 @@ import { Action } from '@reduxjs/toolkit' -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' import { createModal } from '../createModal' diff --git a/packages/common/src/store/ui/modals/createModal.ts b/packages/common/src/store/ui/modals/createModal.ts index 7069ccdc37f..2d18826a5c1 100644 --- a/packages/common/src/store/ui/modals/createModal.ts +++ b/packages/common/src/store/ui/modals/createModal.ts @@ -3,8 +3,8 @@ import { useCallback } from 'react' import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { useDispatch, useSelector } from 'react-redux' -import { ModalSource } from 'models/Analytics' -import { CommonState } from 'store/index' +import { ModalSource } from '~/models/Analytics' +import { CommonState } from '~/store/index' import { actions } from './parentSlice' diff --git a/packages/common/src/store/ui/modals/edit-playlist-modal/index.ts b/packages/common/src/store/ui/modals/edit-playlist-modal/index.ts index 89ea9473e2b..30703a0d0eb 100644 --- a/packages/common/src/store/ui/modals/edit-playlist-modal/index.ts +++ b/packages/common/src/store/ui/modals/edit-playlist-modal/index.ts @@ -1,5 +1,5 @@ -import { ID } from 'models/Identifiers' -import { Nullable } from 'utils/typeUtils' +import { ID } from '~/models/Identifiers' +import { Nullable } from '~/utils/typeUtils' import { createModal } from '../createModal' diff --git a/packages/common/src/store/ui/modals/edit-track-modal/index.ts b/packages/common/src/store/ui/modals/edit-track-modal/index.ts index 11b6996b7b9..b11c9de2b10 100644 --- a/packages/common/src/store/ui/modals/edit-track-modal/index.ts +++ b/packages/common/src/store/ui/modals/edit-track-modal/index.ts @@ -1,5 +1,5 @@ -import { ID } from 'models/Identifiers' -import { Nullable } from 'utils/typeUtils' +import { ID } from '~/models/Identifiers' +import { Nullable } from '~/utils/typeUtils' import { createModal } from '../createModal' diff --git a/packages/common/src/store/ui/modals/edit-track-modal/selectors.ts b/packages/common/src/store/ui/modals/edit-track-modal/selectors.ts index b7352020d65..b9a1b1e435d 100644 --- a/packages/common/src/store/ui/modals/edit-track-modal/selectors.ts +++ b/packages/common/src/store/ui/modals/edit-track-modal/selectors.ts @@ -1,6 +1,6 @@ -import { StemTrack } from 'models/Track' -import { cacheTracksSelectors } from 'store/cache' -import { CommonState } from 'store/commonStore' +import { StemTrack } from '~/models/Track' +import { cacheTracksSelectors } from '~/store/cache' +import { CommonState } from '~/store/commonStore' const { getTrack, getTracks } = cacheTracksSelectors diff --git a/packages/common/src/store/ui/modals/inbox-unavailable-modal/index.ts b/packages/common/src/store/ui/modals/inbox-unavailable-modal/index.ts index 1b14bf7b25c..e82d209bdc0 100644 --- a/packages/common/src/store/ui/modals/inbox-unavailable-modal/index.ts +++ b/packages/common/src/store/ui/modals/inbox-unavailable-modal/index.ts @@ -1,6 +1,6 @@ import { Action } from '@reduxjs/toolkit' -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' import { createModal } from '../createModal' diff --git a/packages/common/src/store/ui/modals/premium-content-purchase-modal/index.ts b/packages/common/src/store/ui/modals/premium-content-purchase-modal/index.ts index ef916039af9..fec9b153c83 100644 --- a/packages/common/src/store/ui/modals/premium-content-purchase-modal/index.ts +++ b/packages/common/src/store/ui/modals/premium-content-purchase-modal/index.ts @@ -1,4 +1,4 @@ -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' import { createModal } from '../createModal' diff --git a/packages/common/src/store/ui/modals/sagas.ts b/packages/common/src/store/ui/modals/sagas.ts index 4d96d11aecd..a5cb36a959f 100644 --- a/packages/common/src/store/ui/modals/sagas.ts +++ b/packages/common/src/store/ui/modals/sagas.ts @@ -1,7 +1,7 @@ import { takeEvery, call } from 'typed-redux-saga' -import { Name } from 'models/Analytics' -import { getContext } from 'store/effects' +import { Name } from '~/models/Analytics' +import { getContext } from '~/store/effects' import { actions } from './parentSlice' const { trackModalOpened, trackModalClosed } = actions diff --git a/packages/common/src/store/ui/modals/selectors.ts b/packages/common/src/store/ui/modals/selectors.ts index 83dc82b12d2..112eaf32310 100644 --- a/packages/common/src/store/ui/modals/selectors.ts +++ b/packages/common/src/store/ui/modals/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { Modals } from './types' diff --git a/packages/common/src/store/ui/modals/types.ts b/packages/common/src/store/ui/modals/types.ts index 41aa5336bb5..8f77aac8889 100644 --- a/packages/common/src/store/ui/modals/types.ts +++ b/packages/common/src/store/ui/modals/types.ts @@ -1,4 +1,4 @@ -import { ModalSource } from 'models/Analytics' +import { ModalSource } from '~/models/Analytics' import { AddFundsModalState } from './add-funds-modal' import { CoinflowOnrampModalState } from './coinflow-onramp-modal' diff --git a/packages/common/src/store/ui/modals/usdc-purchase-details-modal/index.ts b/packages/common/src/store/ui/modals/usdc-purchase-details-modal/index.ts index 1e41ee2f524..6d1bd48e8ba 100644 --- a/packages/common/src/store/ui/modals/usdc-purchase-details-modal/index.ts +++ b/packages/common/src/store/ui/modals/usdc-purchase-details-modal/index.ts @@ -1,4 +1,4 @@ -import { USDCPurchaseDetails } from 'models/USDCTransactions' +import { USDCPurchaseDetails } from '~/models/USDCTransactions' import { createModal } from '../createModal' diff --git a/packages/common/src/store/ui/modals/usdc-transaction-details-modal/index.ts b/packages/common/src/store/ui/modals/usdc-transaction-details-modal/index.ts index 0b6d571fafa..ccef453b8ee 100644 --- a/packages/common/src/store/ui/modals/usdc-transaction-details-modal/index.ts +++ b/packages/common/src/store/ui/modals/usdc-transaction-details-modal/index.ts @@ -1,4 +1,4 @@ -import { USDCTransactionDetails } from 'models/USDCTransactions' +import { USDCTransactionDetails } from '~/models/USDCTransactions' import { createModal } from '../createModal' diff --git a/packages/common/src/store/ui/now-playing/selectors.ts b/packages/common/src/store/ui/now-playing/selectors.ts index e02907bff50..8d23bca58b3 100644 --- a/packages/common/src/store/ui/now-playing/selectors.ts +++ b/packages/common/src/store/ui/now-playing/selectors.ts @@ -1,3 +1,3 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getIsOpen = (state: CommonState) => state.ui.nowPlaying.isOpen diff --git a/packages/common/src/store/ui/publish-playlist-confirmation-modal/selectors.ts b/packages/common/src/store/ui/publish-playlist-confirmation-modal/selectors.ts index ab16d0ecf68..396f329ca19 100644 --- a/packages/common/src/store/ui/publish-playlist-confirmation-modal/selectors.ts +++ b/packages/common/src/store/ui/publish-playlist-confirmation-modal/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getPlaylistId = (state: CommonState) => state.ui.publishPlaylistConfirmationModal.playlistId diff --git a/packages/common/src/store/ui/publish-playlist-confirmation-modal/slice.ts b/packages/common/src/store/ui/publish-playlist-confirmation-modal/slice.ts index 1e122d659e3..83ea5ad7c2a 100644 --- a/packages/common/src/store/ui/publish-playlist-confirmation-modal/slice.ts +++ b/packages/common/src/store/ui/publish-playlist-confirmation-modal/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { Nullable } from 'utils/typeUtils' +import { Nullable } from '~/utils/typeUtils' import { ID } from '../../../models/Identifiers' diff --git a/packages/common/src/store/ui/publish-track-confirmation-modal/selectors.ts b/packages/common/src/store/ui/publish-track-confirmation-modal/selectors.ts index 6fa4dc2f481..f3b9d088ee1 100644 --- a/packages/common/src/store/ui/publish-track-confirmation-modal/selectors.ts +++ b/packages/common/src/store/ui/publish-track-confirmation-modal/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getConfirmCallback = (state: CommonState) => state.ui.publishTrackConfirmationModal.confirmCallback diff --git a/packages/common/src/store/ui/related-artists/sagas.ts b/packages/common/src/store/ui/related-artists/sagas.ts index 20f055d4f62..152c06478b1 100644 --- a/packages/common/src/store/ui/related-artists/sagas.ts +++ b/packages/common/src/store/ui/related-artists/sagas.ts @@ -2,13 +2,13 @@ import { PayloadAction } from '@reduxjs/toolkit' import { shuffle } from 'lodash' import { call, put, select, takeEvery } from 'typed-redux-saga' -import { ID, UserMetadata } from 'models' -import { DoubleKeys } from 'services/remote-config' -import { accountSelectors } from 'store/account' -import { processAndCacheUsers } from 'store/cache' -import { getContext } from 'store/effects' -import { waitForRead } from 'utils/sagaHelpers' -import { removeNullable } from 'utils/typeUtils' +import { ID, UserMetadata } from '~/models' +import { DoubleKeys } from '~/services/remote-config' +import { accountSelectors } from '~/store/account' +import { processAndCacheUsers } from '~/store/cache' +import { getContext } from '~/store/effects' +import { waitForRead } from '~/utils/sagaHelpers' +import { removeNullable } from '~/utils/typeUtils' import { actions as relatedArtistsActions } from './slice' diff --git a/packages/common/src/store/ui/related-artists/selectors.ts b/packages/common/src/store/ui/related-artists/selectors.ts index 4c121b28040..506e976cb11 100644 --- a/packages/common/src/store/ui/related-artists/selectors.ts +++ b/packages/common/src/store/ui/related-artists/selectors.ts @@ -1,7 +1,7 @@ -import { ID, User } from 'models' -import { getUsers } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' -import { removeNullable, createDeepEqualSelector } from 'utils' +import { ID, User } from '~/models' +import { getUsers } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' +import { removeNullable, createDeepEqualSelector } from '~/utils' import { relatedArtistsAdapater } from './slice' diff --git a/packages/common/src/store/ui/related-artists/slice.ts b/packages/common/src/store/ui/related-artists/slice.ts index 1d38d163f03..6f4d02b8710 100644 --- a/packages/common/src/store/ui/related-artists/slice.ts +++ b/packages/common/src/store/ui/related-artists/slice.ts @@ -4,7 +4,7 @@ import { PayloadAction } from '@reduxjs/toolkit' -import { ID, Status } from 'models' +import { ID, Status } from '~/models' import { RelatedArtists } from './types' diff --git a/packages/common/src/store/ui/related-artists/types.ts b/packages/common/src/store/ui/related-artists/types.ts index 0061a1ba740..6c10361d88e 100644 --- a/packages/common/src/store/ui/related-artists/types.ts +++ b/packages/common/src/store/ui/related-artists/types.ts @@ -1,6 +1,6 @@ import { EntityState } from '@reduxjs/toolkit' -import { ID, Status } from 'models' +import { ID, Status } from '~/models' export type RelatedArtists = { artistId: ID diff --git a/packages/common/src/store/ui/search-users-modal/sagas.ts b/packages/common/src/store/ui/search-users-modal/sagas.ts index 5d098861198..23570d84492 100644 --- a/packages/common/src/store/ui/search-users-modal/sagas.ts +++ b/packages/common/src/store/ui/search-users-modal/sagas.ts @@ -1,12 +1,12 @@ import { call, put, select, takeLatest } from 'typed-redux-saga' -import { User } from 'models/User' -import { accountSelectors } from 'store/account' -import { processAndCacheUsers } from 'store/cache/users/utils' -import { getContext } from 'store/effects' -import { SearchKind } from 'store/pages/search-results/types' -import * as searchUsersModalSelectors from 'store/ui/search-users-modal/selectors' -import { actions as searchUsersModalActions } from 'store/ui/search-users-modal/slice' +import { User } from '~/models/User' +import { accountSelectors } from '~/store/account' +import { processAndCacheUsers } from '~/store/cache/users/utils' +import { getContext } from '~/store/effects' +import { SearchKind } from '~/store/pages/search-results/types' +import * as searchUsersModalSelectors from '~/store/ui/search-users-modal/selectors' +import { actions as searchUsersModalActions } from '~/store/ui/search-users-modal/slice' const { getUserId } = accountSelectors const { searchUsers, searchUsersSucceeded } = searchUsersModalActions diff --git a/packages/common/src/store/ui/search-users-modal/selectors.ts b/packages/common/src/store/ui/search-users-modal/selectors.ts index 59f4d2546d3..44691cc74c3 100644 --- a/packages/common/src/store/ui/search-users-modal/selectors.ts +++ b/packages/common/src/store/ui/search-users-modal/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/reducers' +import { CommonState } from '~/store/reducers' export const getUserList = (state: CommonState) => state.ui.searchUsersModal.userList diff --git a/packages/common/src/store/ui/search-users-modal/slice.ts b/packages/common/src/store/ui/search-users-modal/slice.ts index a847dba4d2a..122b592c337 100644 --- a/packages/common/src/store/ui/search-users-modal/slice.ts +++ b/packages/common/src/store/ui/search-users-modal/slice.ts @@ -1,7 +1,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { ID } from 'models/Identifiers' -import { Status } from 'models/Status' +import { ID } from '~/models/Identifiers' +import { Status } from '~/models/Status' export type SearchUsersModalState = { userList: { diff --git a/packages/common/src/store/ui/share-modal/sagas.ts b/packages/common/src/store/ui/share-modal/sagas.ts index 2164b8e1ce6..de03686c23e 100644 --- a/packages/common/src/store/ui/share-modal/sagas.ts +++ b/packages/common/src/store/ui/share-modal/sagas.ts @@ -1,9 +1,9 @@ import { takeEvery, put, select } from 'typed-redux-saga' -import { getCollection as getCollectionBase } from 'store/cache/collections/selectors' -import { getTrack as getTrackBase } from 'store/cache/tracks/selectors' -import { getUser as getUserBase } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' +import { getCollection as getCollectionBase } from '~/store/cache/collections/selectors' +import { getTrack as getTrackBase } from '~/store/cache/tracks/selectors' +import { getUser as getUserBase } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' import { ID } from '../../../models' import { setVisibility } from '../modals/parentSlice' diff --git a/packages/common/src/store/ui/share-modal/selectors.ts b/packages/common/src/store/ui/share-modal/selectors.ts index 370f65f0b9c..17b9adb5c99 100644 --- a/packages/common/src/store/ui/share-modal/selectors.ts +++ b/packages/common/src/store/ui/share-modal/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const shareModalState = (state: CommonState) => state.ui.shareModal diff --git a/packages/common/src/store/ui/share-modal/types.ts b/packages/common/src/store/ui/share-modal/types.ts index c125f8c688b..46694b00f54 100644 --- a/packages/common/src/store/ui/share-modal/types.ts +++ b/packages/common/src/store/ui/share-modal/types.ts @@ -1,6 +1,6 @@ import { PayloadAction } from '@reduxjs/toolkit' -import { Nullable } from 'utils/typeUtils' +import { Nullable } from '~/utils/typeUtils' import { ID, ShareSource, Collection, Track, User } from '../../../models' diff --git a/packages/common/src/store/ui/share-sound-to-tiktok-modal/selectors.ts b/packages/common/src/store/ui/share-sound-to-tiktok-modal/selectors.ts index cf7b72d068d..0e2493eae51 100644 --- a/packages/common/src/store/ui/share-sound-to-tiktok-modal/selectors.ts +++ b/packages/common/src/store/ui/share-sound-to-tiktok-modal/selectors.ts @@ -1,6 +1,6 @@ import { createSelector } from '@reduxjs/toolkit' -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' const shareSoundToTikTokModalState = (state: CommonState) => state.ui.shareSoundToTikTokModal diff --git a/packages/common/src/store/ui/stripe-modal/sagaHelpers.ts b/packages/common/src/store/ui/stripe-modal/sagaHelpers.ts index df8cf94e9e7..1b1070187e1 100644 --- a/packages/common/src/store/ui/stripe-modal/sagaHelpers.ts +++ b/packages/common/src/store/ui/stripe-modal/sagaHelpers.ts @@ -1,8 +1,8 @@ import { call } from 'typed-redux-saga' -import { Name, StripeEventFields } from 'models/Analytics' -import { ErrorLevel } from 'models/ErrorReporting' -import { getContext } from 'store/effects' +import { Name, StripeEventFields } from '~/models/Analytics' +import { ErrorLevel } from '~/models/ErrorReporting' +import { getContext } from '~/store/effects' import { StripeSessionData } from './types' diff --git a/packages/common/src/store/ui/stripe-modal/sagas.ts b/packages/common/src/store/ui/stripe-modal/sagas.ts index b559c438070..f8010ae3313 100644 --- a/packages/common/src/store/ui/stripe-modal/sagas.ts +++ b/packages/common/src/store/ui/stripe-modal/sagas.ts @@ -10,10 +10,10 @@ import { FixedTask } from 'typed-redux-saga' -import { Name } from 'models/Analytics' -import { ErrorLevel } from 'models/ErrorReporting' -import { createStripeSession } from 'services/audius-backend/stripe' -import { getContext } from 'store/effects' +import { Name } from '~/models/Analytics' +import { ErrorLevel } from '~/models/ErrorReporting' +import { createStripeSession } from '~/services/audius-backend/stripe' +import { getContext } from '~/store/effects' import { setVisibility } from '../modals/parentSlice' import { toast } from '../toast/slice' diff --git a/packages/common/src/store/ui/stripe-modal/selectors.ts b/packages/common/src/store/ui/stripe-modal/selectors.ts index abb79b5d9db..5467b7f04d8 100644 --- a/packages/common/src/store/ui/stripe-modal/selectors.ts +++ b/packages/common/src/store/ui/stripe-modal/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getStripeModalState = (state: CommonState) => state.ui.stripeModal diff --git a/packages/common/src/store/ui/stripe-modal/types.ts b/packages/common/src/store/ui/stripe-modal/types.ts index 1b2af7c9f9f..07aa729a2bf 100644 --- a/packages/common/src/store/ui/stripe-modal/types.ts +++ b/packages/common/src/store/ui/stripe-modal/types.ts @@ -5,7 +5,7 @@ import type { OnrampSessionStatus } from '@stripe/crypto' -import { DeepNullable, Nullable } from 'utils/typeUtils' +import { DeepNullable, Nullable } from '~/utils/typeUtils' export type StripeSessionStatus = OnrampSessionStatus diff --git a/packages/common/src/store/ui/theme/selectors.ts b/packages/common/src/store/ui/theme/selectors.ts index c781dfddc0c..d8724f84cee 100644 --- a/packages/common/src/store/ui/theme/selectors.ts +++ b/packages/common/src/store/ui/theme/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' const getBaseState = (state: CommonState) => state.ui.theme diff --git a/packages/common/src/store/ui/toast/sagas.ts b/packages/common/src/store/ui/toast/sagas.ts index d7b7737418e..a975aaa5ee2 100644 --- a/packages/common/src/store/ui/toast/sagas.ts +++ b/packages/common/src/store/ui/toast/sagas.ts @@ -1,6 +1,6 @@ import { put, takeEvery, delay } from 'typed-redux-saga' -import { uuid } from 'utils/uid' +import { uuid } from '~/utils/uid' import { registerToast, dismissToast, toast } from './slice' import { ToastAction } from './types' diff --git a/packages/common/src/store/ui/toast/selectors.ts b/packages/common/src/store/ui/toast/selectors.ts index 7cd5dfade68..244f4479a0c 100644 --- a/packages/common/src/store/ui/toast/selectors.ts +++ b/packages/common/src/store/ui/toast/selectors.ts @@ -1,3 +1,3 @@ -import { CommonState } from 'store/reducers' +import { CommonState } from '~/store/reducers' export const getToasts = (state: CommonState) => state.ui.toast.toasts diff --git a/packages/common/src/store/ui/transaction-details/selectors.ts b/packages/common/src/store/ui/transaction-details/selectors.ts index c4ba12aac59..417d3d0ec28 100644 --- a/packages/common/src/store/ui/transaction-details/selectors.ts +++ b/packages/common/src/store/ui/transaction-details/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/reducers' +import { CommonState } from '~/store/reducers' export const getTransactionDetails = (state: CommonState) => state.ui.transactionDetails diff --git a/packages/common/src/store/ui/upload-confirmation-modal/selectors.ts b/packages/common/src/store/ui/upload-confirmation-modal/selectors.ts index fff90a38603..e67cebfcdb5 100644 --- a/packages/common/src/store/ui/upload-confirmation-modal/selectors.ts +++ b/packages/common/src/store/ui/upload-confirmation-modal/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getHasPublicTracks = (state: CommonState) => state.ui.uploadConfirmationModal.hasPublicTracks diff --git a/packages/common/src/store/ui/withdraw-usdc/selectors.ts b/packages/common/src/store/ui/withdraw-usdc/selectors.ts index ecf8587485e..0d4ff7d21a5 100644 --- a/packages/common/src/store/ui/withdraw-usdc/selectors.ts +++ b/packages/common/src/store/ui/withdraw-usdc/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getWithdrawDestinationAddress = (state: CommonState) => { return state.withdrawUSDC.destinationAddress diff --git a/packages/common/src/store/ui/withdraw-usdc/slice.ts b/packages/common/src/store/ui/withdraw-usdc/slice.ts index d805d14e60c..366bc77ad11 100644 --- a/packages/common/src/store/ui/withdraw-usdc/slice.ts +++ b/packages/common/src/store/ui/withdraw-usdc/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { Status } from 'models/Status' +import { Status } from '~/models/Status' import { CoinflowWithdrawState, WithdrawMethod } from './types' diff --git a/packages/common/src/store/user-list/favorites/selectors.ts b/packages/common/src/store/user-list/favorites/selectors.ts index cde3ff58242..44619d9e4f5 100644 --- a/packages/common/src/store/user-list/favorites/selectors.ts +++ b/packages/common/src/store/user-list/favorites/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { FavoriteType } from '../../../models/Favorite' import { ID } from '../../../models/Identifiers' diff --git a/packages/common/src/store/user-list/favorites/types.ts b/packages/common/src/store/user-list/favorites/types.ts index 072879e6b98..c5b94898a60 100644 --- a/packages/common/src/store/user-list/favorites/types.ts +++ b/packages/common/src/store/user-list/favorites/types.ts @@ -1,4 +1,4 @@ -import { UserListStoreState } from 'store/user-list/types' +import { UserListStoreState } from '~/store/user-list/types' import { ID, FavoriteType } from '../../../models' diff --git a/packages/common/src/store/user-list/followers/selectors.ts b/packages/common/src/store/user-list/followers/selectors.ts index 6c01b3690f9..b70a8f10b5b 100644 --- a/packages/common/src/store/user-list/followers/selectors.ts +++ b/packages/common/src/store/user-list/followers/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { ID } from '../../../models/Identifiers' import { UserListStoreState } from '../types' diff --git a/packages/common/src/store/user-list/followers/types.ts b/packages/common/src/store/user-list/followers/types.ts index f3200842e90..47fa8ca438f 100644 --- a/packages/common/src/store/user-list/followers/types.ts +++ b/packages/common/src/store/user-list/followers/types.ts @@ -1,4 +1,4 @@ -import { UserListStoreState } from 'store/user-list/types' +import { UserListStoreState } from '~/store/user-list/types' import { ID } from '../../../models' diff --git a/packages/common/src/store/user-list/following/selectors.ts b/packages/common/src/store/user-list/following/selectors.ts index d89191f112e..1791f5f6327 100644 --- a/packages/common/src/store/user-list/following/selectors.ts +++ b/packages/common/src/store/user-list/following/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { ID } from '../../../models/Identifiers' import { UserListStoreState } from '../types' diff --git a/packages/common/src/store/user-list/following/types.ts b/packages/common/src/store/user-list/following/types.ts index ad90cf77b8e..54643ccf421 100644 --- a/packages/common/src/store/user-list/following/types.ts +++ b/packages/common/src/store/user-list/following/types.ts @@ -1,4 +1,4 @@ -import { UserListStoreState } from 'store/user-list/types' +import { UserListStoreState } from '~/store/user-list/types' import { ID } from '../../../models' diff --git a/packages/common/src/store/user-list/mutuals/reducers.ts b/packages/common/src/store/user-list/mutuals/reducers.ts index 54999ee47d0..408ac073107 100644 --- a/packages/common/src/store/user-list/mutuals/reducers.ts +++ b/packages/common/src/store/user-list/mutuals/reducers.ts @@ -1,7 +1,7 @@ import { combineReducers } from 'redux' import { createReducer, ActionType } from 'typesafe-actions' -import { UserListReducerFactory } from 'store/user-list/reducer' +import { UserListReducerFactory } from '~/store/user-list/reducer' import * as actions from './actions' import { MUTUALS_USER_LIST_TAG, MutualsOwnState } from './types' diff --git a/packages/common/src/store/user-list/mutuals/selectors.ts b/packages/common/src/store/user-list/mutuals/selectors.ts index 87ca7f3de4e..e6615b9bacc 100644 --- a/packages/common/src/store/user-list/mutuals/selectors.ts +++ b/packages/common/src/store/user-list/mutuals/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' export const getId = (state: CommonState) => state.ui.userList.mutuals.mutualsPage.id diff --git a/packages/common/src/store/user-list/mutuals/types.ts b/packages/common/src/store/user-list/mutuals/types.ts index 91c43ba6296..670947b2aa6 100644 --- a/packages/common/src/store/user-list/mutuals/types.ts +++ b/packages/common/src/store/user-list/mutuals/types.ts @@ -1,4 +1,4 @@ -import { UserListStoreState } from 'store/user-list/types' +import { UserListStoreState } from '~/store/user-list/types' import { ID } from '../../../models' diff --git a/packages/common/src/store/user-list/notifications/reducers.ts b/packages/common/src/store/user-list/notifications/reducers.ts index 2efde9b63ed..17a8d483be1 100644 --- a/packages/common/src/store/user-list/notifications/reducers.ts +++ b/packages/common/src/store/user-list/notifications/reducers.ts @@ -1,7 +1,7 @@ import { combineReducers } from 'redux' import { createReducer, ActionType } from 'typesafe-actions' -import { UserListReducerFactory } from 'store/user-list/reducer' +import { UserListReducerFactory } from '~/store/user-list/reducer' import * as actions from './actions' import { diff --git a/packages/common/src/store/user-list/notifications/selectors.ts b/packages/common/src/store/user-list/notifications/selectors.ts index e087bcb45f0..e407022f3fb 100644 --- a/packages/common/src/store/user-list/notifications/selectors.ts +++ b/packages/common/src/store/user-list/notifications/selectors.ts @@ -1,7 +1,7 @@ -import { CommonState } from 'store/commonStore' -import { getNotificationById } from 'store/notifications/selectors' -import { NotificationType } from 'store/notifications/types' -import { formatCount } from 'utils/formatUtil' +import { CommonState } from '~/store/commonStore' +import { getNotificationById } from '~/store/notifications/selectors' +import { NotificationType } from '~/store/notifications/types' +import { formatCount } from '~/utils/formatUtil' const getBaseState = (state: CommonState) => state.ui.userList.notifications diff --git a/packages/common/src/store/user-list/notifications/types.ts b/packages/common/src/store/user-list/notifications/types.ts index 215434acf8e..db5f61ea56f 100644 --- a/packages/common/src/store/user-list/notifications/types.ts +++ b/packages/common/src/store/user-list/notifications/types.ts @@ -1,4 +1,4 @@ -import { UserListStoreState } from 'store/user-list/types' +import { UserListStoreState } from '~/store/user-list/types' export const NOTIFICATIONS_USER_LIST_TAG = 'NOTIFICATION' diff --git a/packages/common/src/store/user-list/related-artists/selectors.ts b/packages/common/src/store/user-list/related-artists/selectors.ts index f7a6c9ff500..4e8f9e30c78 100644 --- a/packages/common/src/store/user-list/related-artists/selectors.ts +++ b/packages/common/src/store/user-list/related-artists/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { ID } from '../../../models/Identifiers' import { UserListStoreState } from '../types' diff --git a/packages/common/src/store/user-list/related-artists/types.ts b/packages/common/src/store/user-list/related-artists/types.ts index 23088439eb7..523811e3a4b 100644 --- a/packages/common/src/store/user-list/related-artists/types.ts +++ b/packages/common/src/store/user-list/related-artists/types.ts @@ -1,4 +1,4 @@ -import { UserListStoreState } from 'store/user-list/types' +import { UserListStoreState } from '~/store/user-list/types' import { ID } from '../../../models' diff --git a/packages/common/src/store/user-list/reposts/selectors.ts b/packages/common/src/store/user-list/reposts/selectors.ts index 13b3e1b6ecf..e9a09ecd346 100644 --- a/packages/common/src/store/user-list/reposts/selectors.ts +++ b/packages/common/src/store/user-list/reposts/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { ID } from '../../../models/Identifiers' import { UserListStoreState } from '../types' diff --git a/packages/common/src/store/user-list/reposts/types.ts b/packages/common/src/store/user-list/reposts/types.ts index a0299315be5..f66c5a3d222 100644 --- a/packages/common/src/store/user-list/reposts/types.ts +++ b/packages/common/src/store/user-list/reposts/types.ts @@ -1,4 +1,4 @@ -import { UserListStoreState } from 'store/user-list/types' +import { UserListStoreState } from '~/store/user-list/types' import { ID } from '../../../models' diff --git a/packages/common/src/store/user-list/sagas.ts b/packages/common/src/store/user-list/sagas.ts index af28cc38ac7..45bc8352773 100644 --- a/packages/common/src/store/user-list/sagas.ts +++ b/packages/common/src/store/user-list/sagas.ts @@ -1,7 +1,7 @@ import { call, put, takeLatest, select, all } from 'redux-saga/effects' -import { CommonState } from 'store/commonStore' -import { toErrorWithMessage } from 'utils/error' +import { CommonState } from '~/store/commonStore' +import { toErrorWithMessage } from '~/utils/error' import * as userListActions from './actions' import { FetchUserIdsSaga, UserListStoreState } from './types' diff --git a/packages/common/src/store/user-list/selectors.ts b/packages/common/src/store/user-list/selectors.ts index 9edd8b53c68..5eab872b79f 100644 --- a/packages/common/src/store/user-list/selectors.ts +++ b/packages/common/src/store/user-list/selectors.ts @@ -5,10 +5,10 @@ import { getOptimisticSupporting, getSupportersOverrides, getSupportingOverrides -} from 'store/tipping/selectors' -import { getId as getSupportingId } from 'store/user-list/supporting/selectors' -import { getId as getSupportersId } from 'store/user-list/top-supporters/selectors' -import { stringWeiToBN } from 'utils/wallet' +} from '~/store/tipping/selectors' +import { getId as getSupportingId } from '~/store/user-list/supporting/selectors' +import { getId as getSupportersId } from '~/store/user-list/top-supporters/selectors' +import { stringWeiToBN } from '~/utils/wallet' import { ID } from '../../models' diff --git a/packages/common/src/store/user-list/supporting/selectors.ts b/packages/common/src/store/user-list/supporting/selectors.ts index d6f81d74d26..42b408148c5 100644 --- a/packages/common/src/store/user-list/supporting/selectors.ts +++ b/packages/common/src/store/user-list/supporting/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { ID } from '../../../models/Identifiers' import { UserListStoreState } from '../types' diff --git a/packages/common/src/store/user-list/supporting/types.ts b/packages/common/src/store/user-list/supporting/types.ts index 7852cb4613d..47bb0560caf 100644 --- a/packages/common/src/store/user-list/supporting/types.ts +++ b/packages/common/src/store/user-list/supporting/types.ts @@ -1,4 +1,4 @@ -import { UserListStoreState } from 'store/user-list/types' +import { UserListStoreState } from '~/store/user-list/types' import { ID } from '../../../models' diff --git a/packages/common/src/store/user-list/top-supporters/selectors.ts b/packages/common/src/store/user-list/top-supporters/selectors.ts index 03e79ba6c83..62d99190fa4 100644 --- a/packages/common/src/store/user-list/top-supporters/selectors.ts +++ b/packages/common/src/store/user-list/top-supporters/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from 'store/commonStore' +import { CommonState } from '~/store/commonStore' import { ID } from '../../../models/Identifiers' import { UserListStoreState } from '../types' diff --git a/packages/common/src/store/user-list/top-supporters/types.ts b/packages/common/src/store/user-list/top-supporters/types.ts index f4ea29210b7..548b11d547f 100644 --- a/packages/common/src/store/user-list/top-supporters/types.ts +++ b/packages/common/src/store/user-list/top-supporters/types.ts @@ -1,4 +1,4 @@ -import { UserListStoreState } from 'store/user-list/types' +import { UserListStoreState } from '~/store/user-list/types' import { ID } from '../../../models' diff --git a/packages/common/src/store/wallet/selectors.ts b/packages/common/src/store/wallet/selectors.ts index fa4a3674df8..f7859679a9d 100644 --- a/packages/common/src/store/wallet/selectors.ts +++ b/packages/common/src/store/wallet/selectors.ts @@ -1,10 +1,10 @@ import { createSelector } from '@reduxjs/toolkit' import BN from 'bn.js' -import { BNUSDC } from 'models/Wallet' -import { CommonState } from 'store/commonStore' -import { Nullable, isNullOrUndefined } from 'utils/typeUtils' -import { stringWeiToBN } from 'utils/wallet' +import { BNUSDC } from '~/models/Wallet' +import { CommonState } from '~/store/commonStore' +import { Nullable, isNullOrUndefined } from '~/utils/typeUtils' +import { stringWeiToBN } from '~/utils/wallet' // Previously, the getAccountBalance selector would return different // values (although numerically the same) because of the return of a diff --git a/packages/common/src/store/wallet/slice.ts b/packages/common/src/store/wallet/slice.ts index 67773bc192f..e1f51b9fe2d 100644 --- a/packages/common/src/store/wallet/slice.ts +++ b/packages/common/src/store/wallet/slice.ts @@ -1,7 +1,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import BN from 'bn.js' -import { isNullOrUndefined, Nullable } from 'utils/typeUtils' +import { isNullOrUndefined, Nullable } from '~/utils/typeUtils' import { Chain } from '../../models/Chain' import { StringUSDC, StringWei } from '../../models/Wallet' diff --git a/packages/common/src/store/wallet/utils.ts b/packages/common/src/store/wallet/utils.ts index ebd701c940d..67c217225b8 100644 --- a/packages/common/src/store/wallet/utils.ts +++ b/packages/common/src/store/wallet/utils.ts @@ -1,9 +1,9 @@ import { createSelector } from 'reselect' -import { getAccountUser } from 'store/account/selectors' -import { getUser } from 'store/cache/users/selectors' -import { CommonState } from 'store/commonStore' -import { stringAudioToBN, stringWeiToAudioBN } from 'utils/wallet' +import { getAccountUser } from '~/store/account/selectors' +import { getUser } from '~/store/cache/users/selectors' +import { CommonState } from '~/store/commonStore' +import { stringAudioToBN, stringWeiToAudioBN } from '~/utils/wallet' import { BadgeTier } from '../../models/BadgeTier' import { ID } from '../../models/Identifiers' diff --git a/packages/common/src/utils/challenges.ts b/packages/common/src/utils/challenges.ts index 61c5ac60a0b..b70f7053f4f 100644 --- a/packages/common/src/utils/challenges.ts +++ b/packages/common/src/utils/challenges.ts @@ -1,4 +1,4 @@ -import { UndisbursedUserChallenge } from 'store/pages' +import { UndisbursedUserChallenge } from '~/store/pages' import { ChallengeRewardID, diff --git a/packages/common/src/utils/chatUtils.ts b/packages/common/src/utils/chatUtils.ts index 2f564813470..5e207fa9a82 100644 --- a/packages/common/src/utils/chatUtils.ts +++ b/packages/common/src/utils/chatUtils.ts @@ -1,6 +1,6 @@ import type { ChatMessage } from '@audius/sdk' -import { Status } from 'models/Status' +import { Status } from '~/models/Status' import { MESSAGE_GROUP_THRESHOLD_MINUTES } from './constants' import dayjs from './dayjs' diff --git a/packages/common/src/utils/collectionUtils.ts b/packages/common/src/utils/collectionUtils.ts index 207acb897e4..3bb2b2f9000 100644 --- a/packages/common/src/utils/collectionUtils.ts +++ b/packages/common/src/utils/collectionUtils.ts @@ -1,5 +1,5 @@ -import { AccountCollection } from 'store/account' -import { EnhancedCollection } from 'store/cache/collections/selectors' +import { AccountCollection } from '~/store/account' +import { EnhancedCollection } from '~/store/cache/collections/selectors' type FilterCollectionsOptions = { filterText?: string diff --git a/packages/common/src/utils/dogEarUtils.ts b/packages/common/src/utils/dogEarUtils.ts index 17a3e32aa7f..dfd0e9006c7 100644 --- a/packages/common/src/utils/dogEarUtils.ts +++ b/packages/common/src/utils/dogEarUtils.ts @@ -1,7 +1,7 @@ import { isEmpty } from 'lodash' -import { DogEarType } from 'models/DogEar' -import { AccessConditions } from 'models/Track' +import { DogEarType } from '~/models/DogEar' +import { AccessConditions } from '~/models/Track' import { Nullable } from './typeUtils' diff --git a/packages/common/src/utils/formatUtil.test.ts b/packages/common/src/utils/formatUtil.test.ts index b2e87d692c4..edb925130b9 100644 --- a/packages/common/src/utils/formatUtil.test.ts +++ b/packages/common/src/utils/formatUtil.test.ts @@ -1,7 +1,7 @@ import { AUDIO, FixedDecimal, USDC, wAUDIO } from '@audius/fixed-decimal' import BN from 'bn.js' -import { BNWei } from 'models/Wallet' +import { BNWei } from '~/models/Wallet' import { formatCurrencyBalance, diff --git a/packages/common/src/utils/formatUtil.ts b/packages/common/src/utils/formatUtil.ts index 7500fbc4b7d..c8b74b1ebfc 100644 --- a/packages/common/src/utils/formatUtil.ts +++ b/packages/common/src/utils/formatUtil.ts @@ -1,7 +1,7 @@ import BN from 'bn.js' import numeral from 'numeral' -import { BNWei } from 'models/Wallet' +import { BNWei } from '~/models/Wallet' import dayjs from './dayjs' diff --git a/packages/common/src/utils/sagaHelpers.ts b/packages/common/src/utils/sagaHelpers.ts index 20b0562e65f..94fd814fd3f 100644 --- a/packages/common/src/utils/sagaHelpers.ts +++ b/packages/common/src/utils/sagaHelpers.ts @@ -14,7 +14,7 @@ import { } from 'typed-redux-saga' import { Action } from 'typesafe-actions' -import { waitForReachability } from 'store/reachability/sagas' +import { waitForReachability } from '~/store/reachability/sagas' import { Status } from '../models/Status' diff --git a/packages/common/src/utils/streaming.ts b/packages/common/src/utils/streaming.ts index d08cd88c1ea..4ab0baf0923 100644 --- a/packages/common/src/utils/streaming.ts +++ b/packages/common/src/utils/streaming.ts @@ -1,5 +1,5 @@ -import { AccessSignature, Track } from 'models' -import { AudiusBackend, QueryParams } from 'services/index' +import { AccessSignature, Track } from '~/models' +import { AudiusBackend, QueryParams } from '~/services/index' import { Nullable } from './typeUtils' diff --git a/packages/common/src/utils/uid.ts b/packages/common/src/utils/uid.ts index b76f0581280..988d1d4c5d1 100644 --- a/packages/common/src/utils/uid.ts +++ b/packages/common/src/utils/uid.ts @@ -1,6 +1,6 @@ // Auto-increment the uid so that items with the -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' // same kind, id, and source have unique IDs let count = 0 diff --git a/packages/common/src/utils/updatePlaylistArtwork.ts b/packages/common/src/utils/updatePlaylistArtwork.ts index 6fa5d54e04d..f9bbd1d431b 100644 --- a/packages/common/src/utils/updatePlaylistArtwork.ts +++ b/packages/common/src/utils/updatePlaylistArtwork.ts @@ -1,9 +1,9 @@ import { isEqual } from 'lodash' -import { Collection } from 'models/Collection' -import { SquareSizes } from 'models/ImageSizes' -import { Track } from 'models/Track' -import { AudiusBackend } from 'services/audius-backend' +import { Collection } from '~/models/Collection' +import { SquareSizes } from '~/models/ImageSizes' +import { Track } from '~/models/Track' +import { AudiusBackend } from '~/services/audius-backend' import { Nullable } from './typeUtils' diff --git a/packages/common/src/utils/wallet.test.ts b/packages/common/src/utils/wallet.test.ts index 90ff6d34b10..2c1123d4a66 100644 --- a/packages/common/src/utils/wallet.test.ts +++ b/packages/common/src/utils/wallet.test.ts @@ -1,7 +1,7 @@ import { AUDIO, wAUDIO, USDC, FixedDecimal } from '@audius/fixed-decimal' import BN from 'bn.js' -import { BNWei, BNUSDC } from 'models/Wallet' +import { BNWei, BNUSDC } from '~/models/Wallet' import { parseAudioInputToWei, diff --git a/packages/common/src/utils/wallet.ts b/packages/common/src/utils/wallet.ts index 33e7baa1196..e97c7e009ce 100644 --- a/packages/common/src/utils/wallet.ts +++ b/packages/common/src/utils/wallet.ts @@ -7,8 +7,8 @@ import { StringAudio, StringUSDC, StringWei -} from 'models/Wallet' -import { AmountObject } from 'store/ui' +} from '~/models/Wallet' +import { AmountObject } from '~/store/ui' import { WEI_DIVISOR, trimRightZeros, @@ -16,8 +16,8 @@ import { formatWeiToAudioString, parseWeiNumber, convertFloatToWei -} from 'utils/formatUtil' -import { Nullable } from 'utils/typeUtils' +} from '~/utils/formatUtil' +import { Nullable } from '~/utils/typeUtils' /** AUDIO utils */ const WEI_DECIMALS = 18 // 18 decimals on ETH AUDIO diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json index d931a4b57c7..d107299800d 100644 --- a/packages/common/tsconfig.json +++ b/packages/common/tsconfig.json @@ -3,16 +3,7 @@ "outDir": "dist", "baseUrl": ".", "paths": { - "audius-query": ["src/audius-query/index.ts"], - "assets/*": ["src/assets/*"], - "hooks/*": ["src/hooks/*"], - "models/*": ["src/models/*"], - "models": ["src/models"], - "schemas/*": ["src/schemas/*"], - "services/*": ["src/services/*"], - "store/*": ["src/store/*"], - "utils/*": ["src/utils/*"], - "utils": ["src/utils"] + "~/*": ["src/*"] }, "plugins": [ { "transform": "typescript-transform-paths" }, diff --git a/packages/convert-imports.js b/packages/convert-imports.js new file mode 100644 index 00000000000..d1fc01e1d66 --- /dev/null +++ b/packages/convert-imports.js @@ -0,0 +1,25 @@ +const glob = require('glob') +const fs = require('fs') + +var getDirectories = function (callback) { + glob('./common/src/**/*', callback) +} + +getDirectories(async function (err, res) { + res + .filter((path) => path.match(/\/[^\/]+\.(ts|tsx|js|jsx)$/)) + .forEach((path) => { + const content = fs.readFileSync(path, { encoding: 'utf8', flag: 'r' }) + + let regex = new RegExp( + `(from ')(audius-query|assets|hooks|models|schemas|services|store|utils)([^']*')`, + 'gm' + ) + + let newContent = content.replace(regex, (...args) => { + return `${args[1]}~/${args[2]}${args[3]}` + }) + + fs.writeFileSync(path, newContent) + }) +}) diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index 97b6e5c24c6..6226833c450 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -21,7 +21,8 @@ "noFallthroughCasesInSwitch": true, "types": ["vite/client"], "paths": { - "@audius/trpc-server": ["../trpc-server/src/index.ts"] + "@audius/trpc-server": ["../trpc-server/src/index.ts"], + "~/*": ["../../common/src/*"] } }, "include": ["src", "src/**/*.css"] From 0bd92ab515e808da40eccfc2da1a9c4a20b88793 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 12:37:17 -0800 Subject: [PATCH 16/64] Fix rest of imports, update web tsconfig --- packages/common/src/hooks/chats/useSetInboxPermissions.ts | 2 +- packages/common/src/hooks/useCoinflowAdapter.ts | 2 +- packages/common/src/hooks/useFeatureFlag.ts | 2 +- packages/common/src/hooks/useGatedContent.ts | 2 +- packages/common/src/hooks/useGeneratePlaylistArtwork.ts | 2 +- packages/common/src/hooks/useRemoteVar.ts | 2 +- packages/common/src/hooks/useUSDCBalance.ts | 2 +- packages/common/src/schemas/sign-on/emailSchema.ts | 2 +- packages/common/src/schemas/sign-on/pickHandleSchema.ts | 2 +- packages/common/src/store/pages/chat/sagas.ts | 2 +- packages/web/tsconfig.json | 2 ++ 11 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/common/src/hooks/chats/useSetInboxPermissions.ts b/packages/common/src/hooks/chats/useSetInboxPermissions.ts index 1325d0befed..33bbc2e826b 100644 --- a/packages/common/src/hooks/chats/useSetInboxPermissions.ts +++ b/packages/common/src/hooks/chats/useSetInboxPermissions.ts @@ -6,7 +6,7 @@ import { useDispatch, useSelector } from 'react-redux' import { Name } from '~/models/Analytics' import { Status } from '~/models/Status' -import { useAppContext } from 'src/context/appContext' +import { useAppContext } from '~/context/appContext' import { accountSelectors } from '~/store/account' import { chatActions, chatSelectors } from '~/store/pages' diff --git a/packages/common/src/hooks/useCoinflowAdapter.ts b/packages/common/src/hooks/useCoinflowAdapter.ts index ad436354347..a07dceff1ad 100644 --- a/packages/common/src/hooks/useCoinflowAdapter.ts +++ b/packages/common/src/hooks/useCoinflowAdapter.ts @@ -4,7 +4,7 @@ import { TransactionHandler } from '@audius/sdk/dist/core' import { Connection, PublicKey, Transaction } from '@solana/web3.js' import { getRootSolanaAccount } from '~/services/audius-backend' -import { useAppContext } from 'src/context' +import { useAppContext } from '~/context' type CoinflowAdapter = { wallet: { diff --git a/packages/common/src/hooks/useFeatureFlag.ts b/packages/common/src/hooks/useFeatureFlag.ts index 541f7fcad1e..9ede2e39535 100644 --- a/packages/common/src/hooks/useFeatureFlag.ts +++ b/packages/common/src/hooks/useFeatureFlag.ts @@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react' import { useEffectOnce } from 'react-use' -import { useAppContext } from 'src/context/appContext' +import { useAppContext } from '~/context/appContext' import { Maybe } from '~/utils/typeUtils' import { FeatureFlags, RemoteConfigInstance } from '../services' diff --git a/packages/common/src/hooks/useGatedContent.ts b/packages/common/src/hooks/useGatedContent.ts index ca574618911..645cfd370de 100644 --- a/packages/common/src/hooks/useGatedContent.ts +++ b/packages/common/src/hooks/useGatedContent.ts @@ -12,7 +12,7 @@ import { isContentTipGated, isContentUSDCPurchaseGated } from '~/models/Track' -import { useGetCurrentUserId } from 'src/api' +import { useGetCurrentUserId } from '~/api' import { getAccountUser } from '~/store/account/selectors' import { cacheTracksSelectors, cacheUsersSelectors } from '~/store/cache' import { gatedContentSelectors } from '~/store/gated-content' diff --git a/packages/common/src/hooks/useGeneratePlaylistArtwork.ts b/packages/common/src/hooks/useGeneratePlaylistArtwork.ts index 3f3ac39584c..893067d0fe3 100644 --- a/packages/common/src/hooks/useGeneratePlaylistArtwork.ts +++ b/packages/common/src/hooks/useGeneratePlaylistArtwork.ts @@ -3,7 +3,7 @@ import { useCallback } from 'react' import { useSelector } from 'react-redux' import { ID } from '~/models/Identifiers' -import { useAppContext } from 'src/context' +import { useAppContext } from '~/context' import { getCollection, getCollectionTracks diff --git a/packages/common/src/hooks/useRemoteVar.ts b/packages/common/src/hooks/useRemoteVar.ts index c71c4a90bd6..daf600ed060 100644 --- a/packages/common/src/hooks/useRemoteVar.ts +++ b/packages/common/src/hooks/useRemoteVar.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' -import { useAppContext } from 'src/context' +import { useAppContext } from '~/context' import { AllRemoteConfigKeys, diff --git a/packages/common/src/hooks/useUSDCBalance.ts b/packages/common/src/hooks/useUSDCBalance.ts index a10c6214247..72540c6bdce 100644 --- a/packages/common/src/hooks/useUSDCBalance.ts +++ b/packages/common/src/hooks/useUSDCBalance.ts @@ -6,7 +6,7 @@ import { useDispatch, useSelector } from 'react-redux' import { Status } from '~/models/Status' import { BNUSDC, StringUSDC } from '~/models/Wallet' import { getUserbankAccountInfo } from '~/services/index' -import { useAppContext } from 'src/context/appContext' +import { useAppContext } from '~/context/appContext' import { getRecoveryStatus } from '~/store/buy-usdc/selectors' import { getUSDCBalance } from '~/store/wallet/selectors' import { setUSDCBalance } from '~/store/wallet/slice' diff --git a/packages/common/src/schemas/sign-on/emailSchema.ts b/packages/common/src/schemas/sign-on/emailSchema.ts index 5a8b538a09f..27858707013 100644 --- a/packages/common/src/schemas/sign-on/emailSchema.ts +++ b/packages/common/src/schemas/sign-on/emailSchema.ts @@ -1,7 +1,7 @@ import { z } from 'zod' import { AudiusQueryContextType } from '~/audius-query' -import { signUpFetch } from 'src/api' +import { signUpFetch } from '~/api' import { EMAIL_REGEX } from '~/utils/email' export const emailSchemaMessages = { diff --git a/packages/common/src/schemas/sign-on/pickHandleSchema.ts b/packages/common/src/schemas/sign-on/pickHandleSchema.ts index 2961fb9b9d0..8c8f43775c8 100644 --- a/packages/common/src/schemas/sign-on/pickHandleSchema.ts +++ b/packages/common/src/schemas/sign-on/pickHandleSchema.ts @@ -2,7 +2,7 @@ import { z } from 'zod' import { AudiusQueryContextType } from '~/audius-query' import { MAX_HANDLE_LENGTH } from '~/services/oauth' -import { signUpFetch } from 'src/api' +import { signUpFetch } from '~/api' import { restrictedHandles as commonRestrictedHandles } from '~/utils/restrictedHandles' export const pickHandleErrorMessages = { diff --git a/packages/common/src/store/pages/chat/sagas.ts b/packages/common/src/store/pages/chat/sagas.ts index 435a75bbb6b..16ac4dc789a 100644 --- a/packages/common/src/store/pages/chat/sagas.ts +++ b/packages/common/src/store/pages/chat/sagas.ts @@ -18,7 +18,7 @@ import { Name } from '~/models/Analytics' import { ErrorLevel } from '~/models/ErrorReporting' import { ID } from '~/models/Identifiers' import { Status } from '~/models/Status' -import * as toastActions from 'src/store/ui/toast/slice' +import * as toastActions from '~/store/ui/toast/slice' import { getAccountUser, getUserId } from '~/store/account/selectors' import dayjs from '~/utils/dayjs' diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index 6226833c450..65975493b53 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -19,6 +19,8 @@ "jsxImportSource": "@emotion/react", "downlevelIteration": true, "noFallthroughCasesInSwitch": true, + "suppressImplicitAnyIndexErrors": true, + "ignoreDeprecations": "5.0", "types": ["vite/client"], "paths": { "@audius/trpc-server": ["../trpc-server/src/index.ts"], From 8b90868e7203129acc672492641113481a071d57 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 13:20:01 -0800 Subject: [PATCH 17/64] Update convert-exports.js to support types --- packages/convert-exports.js | 82 +++---------------- packages/get-type-exports.js | 25 ++++++ .../FeatureFlagOverrideModal.tsx | 7 +- .../PremiumContentPurchaseModal.tsx | 2 +- .../components/PayExtraFormSection.tsx | 3 +- .../components/PurchaseContentFormFooter.tsx | 6 +- packages/web/src/hooks/useImageSize.test.tsx | 9 +- packages/web/src/hooks/useTikTokAuth.ts | 8 +- .../chat-page/components/ChatMessageTrack.tsx | 7 +- .../upload-page/fields/AccessAndSaleField.tsx | 2 +- .../remote-config/featureFlagHelpers.ts | 7 +- 11 files changed, 69 insertions(+), 89 deletions(-) create mode 100644 packages/get-type-exports.js diff --git a/packages/convert-exports.js b/packages/convert-exports.js index b3b063ae356..869e113029e 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -7,74 +7,18 @@ var getDirectories = function (callback) { const DIRECTORY = 'hooks' const EXPORTS = [ - 'useBooleanOnce', - 'FEATURE_FLAG_OVERRIDE_KEY', - 'useRecomputeToggle', - 'createUseFeatureFlagHook', - 'useFeatureFlag', - 'createUseRemoteVarHook', - 'useRemoteVar', - 'ButtonState', - 'ButtonType', - 'useCurrentStems', - 'useDownloadTrackButtons', - 'useImageSize', - 'useLoadImageWithTimeout', - 'useInstanceVar', - 'createUseLocalStorageHook', - 'createUseTikTokAuthHook', - 'useTwitterButtonStatus', - 'useUIAudio', - 'useSelectTierInfo', - 'useGetFirstOrTopSupporter', - 'useRankedSupportingForUser', - 'createProxySelectorHook', - 'useProxySelector', - 'useAccountHasClaimableRewards', - 'useGatedContentAccess', - 'useGatedContentAccessMap', - 'useStreamConditionsEntity', - 'useLockedContent', - 'useDownloadableContentAccess', - 'useLinkUnfurlMetadata', - 'useThrottledCallback', - 'useDebouncedCallback', - 'useAccountAlbums', - 'useAccountPlaylists', - 'useFetchedSavedCollections', - 'useCanSendMessage', - 'useSetInboxPermissions', - 'usePlayTrack', - 'usePauseTrack', - 'useToggleTrack', - 'useGeneratePlaylistArtwork', - 'useUSDCBalance', - 'useTotalBalanceWithFallback', - 'usePurchaseContentFormConfiguration', - 'useChallengeCooldownSchedule', - 'useAudioMatchingChallengeCooldownSchedule', - 'useUSDCPurchaseConfig', - 'usePurchaseContentErrorMessage', - 'usePayExtraPresets', - 'getExtraAmount', - 'isTrackPurchaseable', - 'PayExtraPreset', - 'CUSTOM_AMOUNT', - 'AMOUNT_PRESET', - 'PURCHASE_METHOD', - 'PURCHASE_VENDOR', - 'PAGE', - 'minimumPayExtraAmountCents', - 'maximumPayExtraAmountCents', - 'CENTS_TO_USDC_MULTIPLIER', - 'DEFAULT_PURCHASE_AMOUNT_CENTS', - 'PurchaseContentSchema', - 'useAccessAndRemixSettings', - 'useInterval', - 'useCreateUserbankIfNeeded', - 'usePurchaseMethod', - 'useCoinflowAdapter', - 'useIsWaitingForValidation' + 'TrackPlayback', + 'PayExtraAmountPresetValues', + 'PurchaseableTrackMetadata', + 'USDCPurchaseConfig', + 'PurchasePage', + 'PurchaseContentValues', + 'DownloadButtonConfig', + 'OverrideSetting', + 'BaseUserImageSizeProps { let regex = new RegExp( - `(import\\s{[^}]* )(${exportName}( as [^,]*)*[, \\n])([^}]*}\\s*from '@audius/common')` + `(import[^{]*{[^}]* )(${exportName}( as [^,]*)*[, \\n])([^}]*}\\s*from '@audius/common')` ) let match = content.match(regex)?.[2] diff --git a/packages/get-type-exports.js b/packages/get-type-exports.js new file mode 100644 index 00000000000..7b0ca7bc228 --- /dev/null +++ b/packages/get-type-exports.js @@ -0,0 +1,25 @@ +const glob = require('glob') +const fs = require('fs') + +var getDirectories = function (callback) { + glob('./common/dist/hooks/**/*', callback) +} + +getDirectories(async function (err, res) { + let exports = [] + res + .filter((path) => path.match(/\/[^\/]+\.(d.ts)$/)) + .forEach((path) => { + const content = fs.readFileSync(path, { encoding: 'utf8', flag: 'r' }) + + let regex = new RegExp('export (type|interface) ([^ ]+)', 'gm') + + let match + while ((match = regex.exec(content)) !== null) { + const exportName = match[2] + exports.push(exportName) + } + }) + + console.log(exports) +}) diff --git a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx index 39bcea92c52..0ea8da07ceb 100644 --- a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx +++ b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx @@ -1,7 +1,10 @@ import { useCallback, useEffect, useRef, useState } from 'react' -import { FeatureFlags, OverrideSetting, accountSelectors } from '@audius/common' -import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' +import { FeatureFlags, accountSelectors } from '@audius/common' +import { + OverrideSetting, + FEATURE_FLAG_OVERRIDE_KEY +} from '@audius/common/hooks' import { Modal, ModalContent, diff --git a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx index 4d8b48f5af1..cb8f6340fc8 100644 --- a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx @@ -1,7 +1,6 @@ import { useCallback, useEffect } from 'react' import { - PurchaseableTrackMetadata, PurchaseContentStage, Track, useGetTrackById, @@ -15,6 +14,7 @@ import { PurchaseVendor } from '@audius/common' import { + PurchaseableTrackMetadata, useFeatureFlag, usePurchaseContentFormConfiguration, usePayExtraPresets, diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx index 04e89a2a22c..5a1ccb70bb5 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx @@ -1,9 +1,10 @@ -import { PayExtraAmountPresetValues } from '@audius/common' import { + PayExtraAmountPresetValues, PayExtraPreset, CUSTOM_AMOUNT, AMOUNT_PRESET } from '@audius/common/hooks' +import {} from '@audius/common' import { Text, Flex, SelectablePill } from '@audius/harmony' import { useField } from 'formik' diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx index 810f760fd23..4a0907cb59e 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx @@ -2,12 +2,14 @@ import { useCallback } from 'react' import { Name, - PurchaseableTrackMetadata, PurchaseContentError, PurchaseContentStage, formatPrice } from '@audius/common' -import { usePurchaseContentErrorMessage } from '@audius/common/hooks' +import { + PurchaseableTrackMetadata, + usePurchaseContentErrorMessage +} from '@audius/common/hooks' import { Button } from '@audius/harmony' import { HarmonyPlainButton, diff --git a/packages/web/src/hooks/useImageSize.test.tsx b/packages/web/src/hooks/useImageSize.test.tsx index 70ea56cb8c8..78a8dcc6215 100644 --- a/packages/web/src/hooks/useImageSize.test.tsx +++ b/packages/web/src/hooks/useImageSize.test.tsx @@ -1,10 +1,5 @@ -import { - BaseUserImageSizeProps, - DefaultSizes, - ImageSizesObject, - SquareSizes -} from '@audius/common' -import { useImageSize } from '@audius/common/hooks' +import { DefaultSizes, ImageSizesObject, SquareSizes } from '@audius/common' +import { useImageSize, BaseUserImageSizeProps } from '@audius/common/hooks' import { render } from '@testing-library/react' import type { Dispatch } from 'redux' import { expect, describe, it, vitest } from 'vitest' diff --git a/packages/web/src/hooks/useTikTokAuth.ts b/packages/web/src/hooks/useTikTokAuth.ts index 0f95c707cd7..7d4ff1a753c 100644 --- a/packages/web/src/hooks/useTikTokAuth.ts +++ b/packages/web/src/hooks/useTikTokAuth.ts @@ -1,8 +1,12 @@ // Polyfills import 'whatwg-fetch' import 'url-search-params-polyfill' -import { Name, Credentials, UseTikTokAuthArguments } from '@audius/common' -import { createUseTikTokAuthHook } from '@audius/common/hooks' +import { Name } from '@audius/common' +import { + createUseTikTokAuthHook, + UseTikTokAuthArguments, + Credentials +} from '@audius/common/hooks' import { useRecord, make } from 'common/store/analytics/actions' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx index c65c7d6e6ed..b7eae18fe5a 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx @@ -10,13 +10,16 @@ import { useGetTrackByPermalink, getPathFromTrackUrl, ID, - TrackPlayback, ChatMessageTileProps, cacheTracksActions, SquareSizes, Name } from '@audius/common' -import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' +import { + TrackPlayback, + useGatedContentAccess, + useToggleTrack +} from '@audius/common/hooks' import { useDispatch, useSelector } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx index c437cecf6ed..88ca9b805fb 100644 --- a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx +++ b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx @@ -11,7 +11,6 @@ import { isContentUSDCPurchaseGated, Nullable, TrackAvailabilityType, - USDCPurchaseConfig, CollectibleGatedConditions, USDCPurchaseConditions, FollowGatedConditions, @@ -20,6 +19,7 @@ import { AccessConditions } from '@audius/common' import { + USDCPurchaseConfig, useFeatureFlag, useUSDCPurchaseConfig, useAccessAndRemixSettings diff --git a/packages/web/src/services/remote-config/featureFlagHelpers.ts b/packages/web/src/services/remote-config/featureFlagHelpers.ts index e1497400e00..17401fcf73c 100644 --- a/packages/web/src/services/remote-config/featureFlagHelpers.ts +++ b/packages/web/src/services/remote-config/featureFlagHelpers.ts @@ -1,5 +1,8 @@ -import { FeatureFlags, OverrideSetting } from '@audius/common' -import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common' +import { + OverrideSetting, + FEATURE_FLAG_OVERRIDE_KEY +} from '@audius/common/hooks' import { remoteConfigInstance } from './remote-config-instance' From a1ce2646f085f32a783e89463a01d5e74c2ac5b3 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 13:25:22 -0800 Subject: [PATCH 18/64] Update mobile type imports --- .../premium-track-purchase-drawer/PayExtraFormSection.tsx | 2 +- .../PremiumTrackPurchaseDrawer.tsx | 6 ++---- packages/mobile/src/hooks/useTikTokAuth.ts | 2 +- .../mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx | 3 ++- .../mobile/src/screens/chat-screen/ChatMessageTrack.tsx | 3 ++- .../FeatureFlagOverrideScreen.tsx | 2 +- .../mobile/src/services/remote-config/getFeatureEnabled.ts | 3 ++- packages/mobile/src/store/oauth/types.ts | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx index e0637a32ef5..cf9d40858ed 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx @@ -1,5 +1,5 @@ -import type { PayExtraAmountPresetValues } from '@audius/common' import { AMOUNT_PRESET, CUSTOM_AMOUNT, PayExtraPreset } from '@audius/common' +import type { PayExtraAmountPresetValues } from '@audius/common/hooks' import { useField } from 'formik' import { View } from 'react-native' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx index 08ed26056f0..037a96b8a3b 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx @@ -1,9 +1,6 @@ import { useCallback, type ReactNode, useEffect } from 'react' -import type { - PurchaseableTrackMetadata, - PurchaseContentError -} from '@audius/common' +import type { PurchaseContentError } from '@audius/common' import { PurchaseContentPage, FeatureFlags, @@ -28,6 +25,7 @@ import { IntKeys, PurchaseVendor } from '@audius/common' +import type { PurchaseableTrackMetadata } from '@audius/common/hooks' import { Formik, useField, useFormikContext } from 'formik' import { Linking, diff --git a/packages/mobile/src/hooks/useTikTokAuth.ts b/packages/mobile/src/hooks/useTikTokAuth.ts index 11315528513..54c7e4135a2 100644 --- a/packages/mobile/src/hooks/useTikTokAuth.ts +++ b/packages/mobile/src/hooks/useTikTokAuth.ts @@ -1,5 +1,5 @@ -import type { Credentials, UseTikTokAuthArguments } from '@audius/common' import { createUseTikTokAuthHook } from '@audius/common' +import type { UseTikTokAuthArguments, Credentials } from '@audius/common/hooks' import AsyncStorage from '@react-native-async-storage/async-storage' import CookieManager from '@react-native-cookies/cookies' import { Linking } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx index 44f7735fa86..03f4cee0782 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo, useEffect } from 'react' -import type { ChatMessageTileProps, ID, TrackPlayback } from '@audius/common' +import type { ChatMessageTileProps, ID } from '@audius/common' import { Name, Kind, @@ -15,6 +15,7 @@ import { usePauseTrack, useGetPlaylistByPermalink } from '@audius/common' +import type { TrackPlayback } from '@audius/common/hooks' import { useSelector } from 'react-redux' import { CollectionTile } from 'app/components/lineup-tile' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx index f4d05e53bc3..8a9ebe546f9 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useMemo } from 'react' -import type { ChatMessageTileProps, ID, TrackPlayback } from '@audius/common' +import type { ChatMessageTileProps, ID } from '@audius/common' import { Name, Kind, @@ -13,6 +13,7 @@ import { useToggleTrack, useGatedContentAccess } from '@audius/common' +import type { TrackPlayback } from '@audius/common/hooks' import { useSelector } from 'react-redux' import { TrackTile } from 'app/components/lineup-tile' diff --git a/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx b/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx index 19e3a800f76..90b1462c7ae 100644 --- a/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx +++ b/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo, useState } from 'react' -import type { OverrideSetting } from '@audius/common' import { FEATURE_FLAG_OVERRIDE_KEY, FeatureFlags } from '@audius/common' +import type { OverrideSetting } from '@audius/common/hooks' import AsyncStorage from '@react-native-async-storage/async-storage' import { createNativeStackNavigator } from '@react-navigation/native-stack' import { FlatList } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/services/remote-config/getFeatureEnabled.ts b/packages/mobile/src/services/remote-config/getFeatureEnabled.ts index 6483e555ac6..9a5e93d3d77 100644 --- a/packages/mobile/src/services/remote-config/getFeatureEnabled.ts +++ b/packages/mobile/src/services/remote-config/getFeatureEnabled.ts @@ -1,5 +1,6 @@ -import type { FeatureFlags, OverrideSetting } from '@audius/common' +import type { FeatureFlags } from '@audius/common' import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common' +import type { OverrideSetting } from '@audius/common/hooks' import AsyncStorage from '@react-native-async-storage/async-storage' import { remoteConfigInstance } from './remote-config-instance' diff --git a/packages/mobile/src/store/oauth/types.ts b/packages/mobile/src/store/oauth/types.ts index 52ebf8c8ac0..04504426099 100644 --- a/packages/mobile/src/store/oauth/types.ts +++ b/packages/mobile/src/store/oauth/types.ts @@ -1,4 +1,4 @@ -import type { Credentials as TikTokCredentials } from '@audius/common' +import type { Credentials as TikTokCredentials } from '@audius/common/hooks' export type InstagramCredentials = { code: string From 3f9b97fb3eb4ddf85c9e421cf1f224c4f22af940 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 14:09:27 -0800 Subject: [PATCH 19/64] Resolve ~ alias in vite --- packages/web/vite.config.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/web/vite.config.ts b/packages/web/vite.config.ts index 9dba9f95416..9d426086a9c 100644 --- a/packages/web/vite.config.ts +++ b/packages/web/vite.config.ts @@ -10,6 +10,7 @@ import glslify from 'vite-plugin-glslify' import svgr from 'vite-plugin-svgr' import { env as APP_ENV } from './src/services/env' +import path from 'path' const fixAcceptHeader404 = () => ({ // Fix issue with vite dev server and `wait-on` @@ -127,6 +128,7 @@ export default defineConfig(({ mode }) => { workers: '/src/workers', utils: '/src/utils', ssr: '/src/ssr', + '~': path.resolve(__dirname, '../../packages/common/src'), os: require.resolve('os-browserify'), path: require.resolve('path-browserify'), From fcbb08f9aaf6766913f01715c40f64ba382b28ce Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 14:30:14 -0800 Subject: [PATCH 20/64] Update mobile context and hooks --- package-lock.json | 17 ++++++++++++++++ packages/common/package.json | 3 ++- packages/common/src/index.ts | 1 - packages/mobile/babel.config.js | 5 ++++- packages/mobile/metro.config.js | 1 + packages/mobile/package.json | 1 + .../mobile/src/app/AppContextProvider.tsx | 2 +- .../add-funds-drawer/AddFundsDrawer.tsx | 4 ++-- .../audio-balance-pill/AUDIOBalancePill.tsx | 6 ++---- .../audio-rewards/TiersExplainerDrawer.tsx | 7 ++----- .../CooldownSummaryTable.tsx | 2 +- .../CoinflowOnrampDrawer.tsx | 7 ++----- .../src/components/core/DynamicImage.tsx | 2 +- .../src/components/core/UserDisplayName.tsx | 3 ++- .../components/details-tile/DetailsTile.tsx | 2 +- .../details-tile/DetailsTileActionButtons.tsx | 2 +- .../details-tile/DetailsTileHasAccess.tsx | 4 ++-- .../details-tile/DetailsTileNoAccess.tsx | 2 +- .../components/feed-tip-tile/FeedTipTile.tsx | 4 ++-- .../components/fields/HarmonyTextField.tsx | 2 +- .../src/components/fields/TextField.tsx | 2 +- .../components/lineup-tile/CollectionTile.tsx | 2 +- .../src/components/lineup-tile/LineupTile.tsx | 2 +- .../LockedContentDrawer.tsx | 7 ++----- .../now-playing-drawer/ActionsBar.tsx | 2 +- .../components/now-playing-drawer/Artwork.tsx | 2 +- .../components/now-playing-drawer/PlayBar.tsx | 4 ++-- .../now-playing-drawer/TrackInfo.tsx | 2 +- .../PayExtraFormSection.tsx | 7 ++++++- .../PremiumTrackPurchaseDrawer.tsx | 20 ++++++++++--------- .../hooks/usePurchaseContentFormState.ts | 4 ++-- .../hooks/usePurchaseSummaryValues.ts | 12 +++++------ .../PurchaseVendorDrawer.tsx | 3 ++- .../SuggestedArtistsList.tsx | 3 ++- .../track-details-tile/TrackDetailsTile.tsx | 2 +- .../components/track-list/TrackListItem.tsx | 2 +- .../twitter-button/TwitterButton.tsx | 2 +- .../usdc-balance-pill/USDCBalancePill.tsx | 4 ++-- .../usdc-balance-row/USDCBalanceRow.tsx | 4 ++-- .../USDCManualTransfer.tsx | 3 ++- .../src/components/user-badges/UserBadges.tsx | 2 +- packages/mobile/src/hooks/useImageSize.ts | 6 +++--- packages/mobile/src/hooks/useIsUSDCEnabled.ts | 3 ++- .../mobile/src/hooks/useOfflineTrackStatus.ts | 3 ++- packages/mobile/src/hooks/useProxySelector.ts | 2 +- packages/mobile/src/hooks/useRemoteConfig.ts | 7 +++---- packages/mobile/src/hooks/useTikTokAuth.ts | 2 +- .../left-nav-drawer/LeftNavDrawer.tsx | 2 +- .../app-screen/AccountPictureHeader.tsx | 2 +- .../src/screens/chat-screen/ChatListItem.tsx | 3 ++- .../chat-screen/ChatMessagePlaylist.tsx | 3 +-- .../screens/chat-screen/ChatMessageTrack.tsx | 5 ++--- .../src/screens/chat-screen/ChatScreen.tsx | 4 ++-- .../screens/chat-screen/ChatUnavailable.tsx | 7 ++----- .../chat-screen/ChatUserListScreen.tsx | 2 +- .../src/screens/chat-screen/LinkPreview.tsx | 4 ++-- .../collection-screen/CollectionHeader.tsx | 2 +- .../collection-screen/CollectionScreen.tsx | 2 +- .../PlaylistArtworkField.tsx | 2 +- .../edit-track-screen/EditTrackScreen.tsx | 4 ++-- .../PremiumRadioField/PremiumRadioField.tsx | 8 ++------ .../screens/AccessAndSaleScreen.tsx | 5 ++--- .../screens/RemixSettingsScreen.tsx | 4 ++-- .../explore-screen/tabs/ArtistsTab.tsx | 4 ++-- .../explore-screen/tabs/PlaylistsTab.tsx | 2 +- .../DownloadFavoritesSwitch.tsx | 3 ++- .../useCollectionsScreenData.ts | 2 +- .../FeatureFlagOverrideScreen.tsx | 3 ++- .../src/screens/feed-screen/FeedScreen.tsx | 4 ++-- .../MoodCollectionScreen.tsx | 4 ++-- .../AddTrackToPlaylistNotification.tsx | 3 ++- .../Notifications/FavoriteNotification.tsx | 8 ++------ .../FavoriteOfRepostNotification.tsx | 8 ++------ .../Notifications/FollowNotification.tsx | 7 ++----- .../Notifications/MilestoneNotification.tsx | 7 ++----- .../Notifications/RemixCosignNotification.tsx | 3 ++- .../Notifications/RepostNotification.tsx | 8 ++------ .../RepostOfRepostNotification.tsx | 8 ++------ .../Notifications/TipReactionNotification.tsx | 7 ++----- .../Notifications/TipReceivedNotification.tsx | 2 +- .../Notifications/TipSentNotification.tsx | 3 ++- .../UserSubscriptionNotification.tsx | 3 ++- .../screens/pay-and-earn-screen/USDCCard.tsx | 4 ++-- .../ProfileHeader/ProfileHeader.tsx | 3 ++- .../ProfileHeader/ProfileSocials.tsx | 3 ++- .../ProfileHeader/ProfileTierTile.tsx | 3 ++- .../ProfileHeader/SupportingList.tsx | 7 ++----- .../ProfileHeader/TopSupporters.tsx | 2 +- .../ProfileHeader/ViewAllSupportingTile.tsx | 6 ++++-- .../ProfileTabs/CollectiblesTab.tsx | 3 ++- .../profile-screen/ProfileTabs/RepostsTab.tsx | 2 +- .../profile-screen/ProfileTabs/TracksTab.tsx | 4 ++-- .../src/screens/profile-screen/selectors.ts | 8 ++------ .../src/screens/profile-screen/utils.ts | 3 ++- .../search-results-screen/tabs/AlbumsTab.tsx | 8 ++------ .../tabs/PlaylistsTab.tsx | 8 ++------ .../tabs/ProfilesTab.tsx | 8 ++------ .../src/screens/search-screen/SearchBar.tsx | 3 ++- .../settings-screen/AppearanceSettingsRow.tsx | 4 ++-- .../settings-screen/InboxSettingsScreen.tsx | 2 +- .../ListeningHistoryScreen.tsx | 4 ++-- .../components/SocialMediaSignUpButtons.tsx | 3 ++- .../tip-artist-screen/SendTipScreen.tsx | 4 ++-- .../src/screens/track-screen/DownloadRow.tsx | 2 +- .../screens/track-screen/DownloadSection.tsx | 6 ++++-- .../src/screens/track-screen/TrackScreen.tsx | 2 +- .../track-screen/TrackScreenDetailsTile.tsx | 2 +- .../TrackScreenDownloadButtons.tsx | 11 ++++------ .../remote-config/getFeatureEnabled.ts | 2 +- packages/mobile/tsconfig.json | 3 +++ 110 files changed, 223 insertions(+), 236 deletions(-) diff --git a/package-lock.json b/package-lock.json index e540583562d..29868bd287f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -138142,6 +138142,7 @@ }, "devDependencies": { "@babel/core": "7.21.0", + "@babel/plugin-transform-export-namespace-from": "7.23.4", "@babel/plugin-transform-react-jsx": "7.21.0", "@babel/preset-env": "7.20.2", "@babel/runtime": "7.21.0", @@ -138271,6 +138272,22 @@ "@babel/core": "^7.0.0-0" } }, + "packages/mobile/node_modules/@babel/plugin-transform-export-namespace-from": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz", + "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "packages/mobile/node_modules/@babel/preset-env": { "version": "7.20.2", "dev": true, diff --git a/packages/common/package.json b/packages/common/package.json index 60de8c62cd0..4c78effe360 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -10,7 +10,8 @@ "exports": { ".": "./dist/index.js", "./messages": "./src/messages/index.ts", - "./hooks": "./src/hooks/index.ts" + "./hooks": "./src/hooks/index.ts", + "./context": "./src/context/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index d75c3aba300..7fb96ac3729 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -3,7 +3,6 @@ export * from './api' export * from './audius-query' -export * from './context' export * from './models' export * from './utils' export * from './services' diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js index eacf17315ef..f8234b28e6d 100644 --- a/packages/mobile/babel.config.js +++ b/packages/mobile/babel.config.js @@ -2,13 +2,16 @@ module.exports = (api) => { const babelEnv = api.env() const plugins = [ ['@babel/plugin-transform-react-jsx', { runtime: 'automatic' }], + '@babel/plugin-transform-export-namespace-from', [ 'module-resolver', { extensions: ['.js', '.jsx', '.ts', '.tsx'], root: ['.'], alias: { - '@audius/common/messages': '../common/src/messages' + '@audius/common/messages': '../common/src/messages', + '@audius/common/hooks': '../common/src/hooks', + '@audius/common/context': '../common/src/context' } } ] diff --git a/packages/mobile/metro.config.js b/packages/mobile/metro.config.js index c3a2bbe7e23..c01d109d3e2 100644 --- a/packages/mobile/metro.config.js +++ b/packages/mobile/metro.config.js @@ -74,6 +74,7 @@ const config = { // Alias for 'src' to allow for absolute paths app: path.resolve(__dirname, 'src'), '@audius/harmony-native': path.resolve(__dirname, 'src/harmony-native'), + '~': path.resolve(__dirname, '../common/src'), // The following imports are needed for @audius/common // and audius-client to compile correctly diff --git a/packages/mobile/package.json b/packages/mobile/package.json index f5a71de0efa..3ed6ae8a1a9 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -186,6 +186,7 @@ }, "devDependencies": { "@babel/core": "7.21.0", + "@babel/plugin-transform-export-namespace-from": "7.23.4", "@babel/plugin-transform-react-jsx": "7.21.0", "@babel/preset-env": "7.20.2", "@babel/runtime": "7.21.0", diff --git a/packages/mobile/src/app/AppContextProvider.tsx b/packages/mobile/src/app/AppContextProvider.tsx index 88e33a72bdf..eb887291bd7 100644 --- a/packages/mobile/src/app/AppContextProvider.tsx +++ b/packages/mobile/src/app/AppContextProvider.tsx @@ -1,6 +1,6 @@ import { useMemo, type ReactNode } from 'react' -import { AppContext } from '@audius/common' +import { AppContext } from '@audius/common/context' import { useAsync } from 'react-use' import * as analytics from 'app/services/analytics' diff --git a/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx b/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx index c0ebb100b6a..84e5b43a023 100644 --- a/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx +++ b/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx @@ -5,9 +5,9 @@ import { useAddFundsModal, useUSDCManualTransferModal, buyUSDCActions, - PurchaseMethod, - DEFAULT_PURCHASE_AMOUNT_CENTS + PurchaseMethod } from '@audius/common' +import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx index 7df29308c30..72b15c95233 100644 --- a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx +++ b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx @@ -1,11 +1,9 @@ import type { User } from '@audius/common' +import { accountSelectors, formatWei, isNullOrUndefined } from '@audius/common' import { - accountSelectors, - formatWei, - isNullOrUndefined, useSelectTierInfo, useTotalBalanceWithFallback -} from '@audius/common' +} from '@audius/common/hooks' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx b/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx index 45103366d33..35d25d80484 100644 --- a/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx +++ b/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx @@ -1,9 +1,6 @@ -import { - profilePageSelectors, - badgeTiers, - useSelectTierInfo -} from '@audius/common' +import { profilePageSelectors, badgeTiers } from '@audius/common' import type { BadgeTierInfo } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import { Text, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/CooldownSummaryTable.tsx b/packages/mobile/src/components/challenge-rewards-drawer/CooldownSummaryTable.tsx index 11449f7a0e6..54cfa5eb5a8 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/CooldownSummaryTable.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/CooldownSummaryTable.tsx @@ -1,7 +1,7 @@ import React from 'react' import type { ChallengeRewardID } from '@audius/common' -import { useAudioMatchingChallengeCooldownSchedule } from '@audius/common' +import { useAudioMatchingChallengeCooldownSchedule } from '@audius/common/hooks' import { SummaryTable } from '../summary-table' diff --git a/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx b/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx index 90a42b60620..c7c989daac6 100644 --- a/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx +++ b/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx @@ -1,10 +1,7 @@ import { useCallback, useEffect, useState } from 'react' -import { - useCoinflowAdapter, - useCoinflowOnrampModal, - coinflowModalUIActions -} from '@audius/common' +import { useCoinflowOnrampModal, coinflowModalUIActions } from '@audius/common' +import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowPurchase } from '@coinflowlabs/react-native' import { Transaction } from '@solana/web3.js' import { TouchableOpacity, View } from 'react-native' diff --git a/packages/mobile/src/components/core/DynamicImage.tsx b/packages/mobile/src/components/core/DynamicImage.tsx index a7b2245bcc4..4394f7bfafd 100644 --- a/packages/mobile/src/components/core/DynamicImage.tsx +++ b/packages/mobile/src/components/core/DynamicImage.tsx @@ -1,8 +1,8 @@ import type { ReactNode } from 'react' import { useEffect, memo, useCallback, useRef, useState } from 'react' -import { useInstanceVar } from '@audius/common' import type { Maybe } from '@audius/common' +import { useInstanceVar } from '@audius/common/hooks' import type { ImageProps, ImageSourcePropType, diff --git a/packages/mobile/src/components/core/UserDisplayName.tsx b/packages/mobile/src/components/core/UserDisplayName.tsx index e74f965dfd5..0e54558f028 100644 --- a/packages/mobile/src/components/core/UserDisplayName.tsx +++ b/packages/mobile/src/components/core/UserDisplayName.tsx @@ -1,4 +1,5 @@ -import { useSelectTierInfo, type ID, cacheUsersSelectors } from '@audius/common' +import { type ID, cacheUsersSelectors } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import { useSelector } from 'react-redux' import type { TextProps } from '@audius/harmony-native' diff --git a/packages/mobile/src/components/details-tile/DetailsTile.tsx b/packages/mobile/src/components/details-tile/DetailsTile.tsx index aa3edd51f83..40f7ec36b3e 100644 --- a/packages/mobile/src/components/details-tile/DetailsTile.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTile.tsx @@ -4,7 +4,6 @@ import type { CommonState, Track } from '@audius/common' import { FeatureFlags, Genre, - useGatedContentAccess, squashNewLines, accountSelectors, playerSelectors, @@ -13,6 +12,7 @@ import { isContentUSDCPurchaseGated, dayjs } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import moment from 'moment' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index d237967ef1f..e1d404bc05b 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -2,10 +2,10 @@ import type { CommonState, ID } from '@audius/common' import { FeatureFlags, cacheCollectionsSelectors, - useFeatureFlag, useGetCurrentUserId, useGetPlaylistById } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx b/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx index 6b5fb598111..ab06decb160 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx @@ -6,9 +6,9 @@ import { isContentCollectibleGated, isContentFollowGated, isContentTipGated, - isContentUSDCPurchaseGated, - useStreamConditionsEntity + isContentUSDCPurchaseGated } from '@audius/common' +import { useStreamConditionsEntity } from '@audius/common/hooks' import type { ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx index f77e38469d6..a8efef93a68 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx @@ -12,11 +12,11 @@ import { isContentUSDCPurchaseGated, gatedContentSelectors, tippingActions, - useStreamConditionsEntity, usePremiumContentPurchaseModal, usersSocialActions, ModalSource } from '@audius/common' +import { useStreamConditionsEntity } from '@audius/common/hooks' import type { ViewStyle } from 'react-native' import { Image, Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx b/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx index c2fcb0a9c8e..0bf60a0a095 100644 --- a/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx +++ b/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx @@ -5,9 +5,9 @@ import { accountSelectors, cacheUsersSelectors, tippingSelectors, - tippingActions, - useProxySelector + tippingActions } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { storeDismissedTipInfo } from 'common/store/tipping/sagas' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/fields/HarmonyTextField.tsx b/packages/mobile/src/components/fields/HarmonyTextField.tsx index e8d1ffe630e..5f7a6e6d126 100644 --- a/packages/mobile/src/components/fields/HarmonyTextField.tsx +++ b/packages/mobile/src/components/fields/HarmonyTextField.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react' -import { useDebouncedCallback } from '@audius/common' +import { useDebouncedCallback } from '@audius/common/hooks' import { useField, useFormikContext } from 'formik' import { TextInput, type TextInputProps } from '@audius/harmony-native' diff --git a/packages/mobile/src/components/fields/TextField.tsx b/packages/mobile/src/components/fields/TextField.tsx index dccf129878a..a54ca1566fa 100644 --- a/packages/mobile/src/components/fields/TextField.tsx +++ b/packages/mobile/src/components/fields/TextField.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect } from 'react' -import { useDebouncedCallback } from '@audius/common' +import { useDebouncedCallback } from '@audius/common/hooks' import { useField, useFormikContext } from 'formik' import { Platform, View } from 'react-native' diff --git a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx index 481b60044fb..db000f91226 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx @@ -10,7 +10,6 @@ import type { import { SquareSizes, removeNullable, - useProxySelector, playerSelectors, FavoriteSource, PlaybackSource, @@ -28,6 +27,7 @@ import { RepostType, FeatureFlags } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { useDispatch, useSelector } from 'react-redux' import { CollectionImage } from 'app/components/image/CollectionImage' diff --git a/packages/mobile/src/components/lineup-tile/LineupTile.tsx b/packages/mobile/src/components/lineup-tile/LineupTile.tsx index 3c479f09bec..5fd53d8c833 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTile.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTile.tsx @@ -4,9 +4,9 @@ import { accountSelectors, Genre, gatedContentActions, - useGatedContentAccess, getDogEarType } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import moment from 'moment' import { View } from 'react-native' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/locked-content-drawer/LockedContentDrawer.tsx b/packages/mobile/src/components/locked-content-drawer/LockedContentDrawer.tsx index acaddf3513a..3d9cf7be8da 100644 --- a/packages/mobile/src/components/locked-content-drawer/LockedContentDrawer.tsx +++ b/packages/mobile/src/components/locked-content-drawer/LockedContentDrawer.tsx @@ -1,10 +1,7 @@ import { useCallback } from 'react' -import { - useLockedContent, - gatedContentActions, - useGatedContentAccess -} from '@audius/common' +import { gatedContentActions } from '@audius/common' +import { useGatedContentAccess, useLockedContent } from '@audius/common/hooks' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx index cac3d17db35..7adb498a0ef 100644 --- a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx @@ -18,11 +18,11 @@ import { OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, - useGatedContentAccess, formatPrice, usePremiumContentPurchaseModal, ModalSource } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { View, Platform } from 'react-native' import { CastButton } from 'react-native-google-cast' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx index 299411ab610..9bc93770f72 100644 --- a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx +++ b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx @@ -3,9 +3,9 @@ import { DogEarType, SquareSizes, averageColorSelectors, - useGatedContentAccess, playerSelectors } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { Dimensions } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx index d10e465d2b7..4d72310c95b 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx @@ -6,9 +6,9 @@ import { FavoriteSource, accountSelectors, tracksSocialActions, - playerSelectors, - useGatedContentAccess + playerSelectors } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { TouchableOpacity, Animated, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx index 384f4e27c95..ec9f590c81f 100644 --- a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx +++ b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx @@ -1,10 +1,10 @@ import { - useGatedContentAccess, type Nullable, type Track, type User, playerSelectors } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx index cf9d40858ed..34a5ec36fb7 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx @@ -1,4 +1,9 @@ -import { AMOUNT_PRESET, CUSTOM_AMOUNT, PayExtraPreset } from '@audius/common' +import { + PayExtraPreset, + CUSTOM_AMOUNT, + AMOUNT_PRESET +} from '@audius/common/hooks' +import {} from '@audius/common' import type { PayExtraAmountPresetValues } from '@audius/common/hooks' import { useField } from 'formik' import { View } from 'react-native' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx index 037a96b8a3b..247485d5c5b 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx @@ -5,26 +5,28 @@ import { PurchaseContentPage, FeatureFlags, Name, - PURCHASE_METHOD, PurchaseContentStage, formatPrice, isContentPurchaseInProgress, - isTrackPurchaseable, purchaseContentActions, purchaseContentSelectors, statusIsNotFinalized, useGetTrackById, - usePayExtraPresets, usePremiumContentPurchaseModal, - usePurchaseContentErrorMessage, - usePurchaseContentFormConfiguration, - usePurchaseMethod, - useUSDCBalance, - PURCHASE_VENDOR, - useRemoteVar, IntKeys, PurchaseVendor } from '@audius/common' +import { + useRemoteVar, + useUSDCBalance, + usePurchaseContentFormConfiguration, + usePurchaseContentErrorMessage, + usePayExtraPresets, + isTrackPurchaseable, + PURCHASE_METHOD, + PURCHASE_VENDOR, + usePurchaseMethod +} from '@audius/common/hooks' import type { PurchaseableTrackMetadata } from '@audius/common/hooks' import { Formik, useField, useFormikContext } from 'formik' import { diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts index 90f2bc1ed40..57212404650 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts +++ b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts @@ -1,8 +1,8 @@ import { isContentPurchaseInProgress, - purchaseContentSelectors, - useUSDCBalance + purchaseContentSelectors } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import { useSelector } from 'react-redux' import { usePurchaseSummaryValues } from './usePurchaseSummaryValues' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts index dd07819131a..18d70f027e3 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts +++ b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts @@ -1,13 +1,13 @@ import type { Nullable, BNUSDC } from '@audius/common' +import { getPurchaseSummaryValues } from '@audius/common' import { - CUSTOM_AMOUNT, - AMOUNT_PRESET, + useUSDCPurchaseConfig, + usePayExtraPresets, getExtraAmount, - getPurchaseSummaryValues, PayExtraPreset, - usePayExtraPresets, - useUSDCPurchaseConfig -} from '@audius/common' + CUSTOM_AMOUNT, + AMOUNT_PRESET +} from '@audius/common/hooks' import { useField } from 'formik' export const usePurchaseSummaryValues = ({ diff --git a/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx b/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx index 882e87e682c..bb968c2f9d7 100644 --- a/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx +++ b/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx @@ -1,6 +1,7 @@ import { useCallback, useMemo } from 'react' -import { FeatureFlags, PurchaseVendor, useFeatureFlag } from '@audius/common' +import { FeatureFlags, PurchaseVendor } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' import { useDispatch } from 'react-redux' import { setPurchaseVendor } from 'app/store/purchase-vendor/slice' diff --git a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx index 943c899c3da..e2c5d16a7b9 100644 --- a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx +++ b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' import type { CommonState, ID, Maybe } from '@audius/common' -import { useProxySelector, removeNullable } from '@audius/common' +import { removeNullable } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { removeFollowArtists, addFollowArtists diff --git a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx index 975fb657f36..5019265e9fc 100644 --- a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx +++ b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx @@ -6,12 +6,12 @@ import { SquareSizes, getDogEarType, isContentCollectibleGated, - useGatedContentAccess, cacheUsersSelectors, cacheTracksSelectors, isContentUSDCPurchaseGated, GatedContentType } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import type { ColorValue } from 'react-native' import { View } from 'react-native' import type { SvgProps } from 'react-native-svg' diff --git a/packages/mobile/src/components/track-list/TrackListItem.tsx b/packages/mobile/src/components/track-list/TrackListItem.tsx index e131f7186f6..aad841a2b9f 100644 --- a/packages/mobile/src/components/track-list/TrackListItem.tsx +++ b/packages/mobile/src/components/track-list/TrackListItem.tsx @@ -4,7 +4,6 @@ import { memo, useCallback, useMemo, useState } from 'react' import type { Collection, ID, Track, UID, User } from '@audius/common' import { cacheCollectionsSelectors, - useGatedContentAccess, FeatureFlags, playbackPositionSelectors, Genre, @@ -17,6 +16,7 @@ import { cacheTracksSelectors, playerSelectors } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import type { NativeSyntheticEvent, NativeTouchEvent, diff --git a/packages/mobile/src/components/twitter-button/TwitterButton.tsx b/packages/mobile/src/components/twitter-button/TwitterButton.tsx index 2c65d3a3036..6028536f255 100644 --- a/packages/mobile/src/components/twitter-button/TwitterButton.tsx +++ b/packages/mobile/src/components/twitter-button/TwitterButton.tsx @@ -3,10 +3,10 @@ import { useCallback } from 'react' import type { Nullable } from '@audius/common' import { makeTwitterShareUrl, - useTwitterButtonStatus, cacheUsersActions, cacheUsersSelectors } from '@audius/common' +import { useTwitterButtonStatus } from '@audius/common/hooks' import { useDispatch, useSelector } from 'react-redux' import IconTwitterBird from 'app/assets/images/iconTwitterBird.svg' diff --git a/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx b/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx index c4b42228d60..b8ae5e70429 100644 --- a/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx +++ b/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx @@ -2,9 +2,9 @@ import type { BNUSDC } from '@audius/common' import { Status, formatCurrencyBalance, - formatUSDCWeiToFloorCentsNumber, - useUSDCBalance + formatUSDCWeiToFloorCentsNumber } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import BN from 'bn.js' import { View } from 'react-native' diff --git a/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx b/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx index efe7cc408b2..6435126872f 100644 --- a/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx +++ b/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx @@ -1,9 +1,9 @@ import type { BNUSDC } from '@audius/common' import { formatCurrencyBalance, - formatUSDCWeiToFloorCentsNumber, - useUSDCBalance + formatUSDCWeiToFloorCentsNumber } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import BN from 'bn.js' import { View } from 'react-native' diff --git a/packages/mobile/src/components/usdc-manual-transfer/USDCManualTransfer.tsx b/packages/mobile/src/components/usdc-manual-transfer/USDCManualTransfer.tsx index 524919d0b49..814d9b232f5 100644 --- a/packages/mobile/src/components/usdc-manual-transfer/USDCManualTransfer.tsx +++ b/packages/mobile/src/components/usdc-manual-transfer/USDCManualTransfer.tsx @@ -1,6 +1,7 @@ import { useCallback, useMemo } from 'react' -import { Name, useCreateUserbankIfNeeded, useUSDCBalance } from '@audius/common' +import { Name } from '@audius/common' +import { useUSDCBalance, useCreateUserbankIfNeeded } from '@audius/common/hooks' import { USDC } from '@audius/fixed-decimal' import Clipboard from '@react-native-clipboard/clipboard' import BN from 'bn.js' diff --git a/packages/mobile/src/components/user-badges/UserBadges.tsx b/packages/mobile/src/components/user-badges/UserBadges.tsx index f3dc3a544cb..e127dc1f996 100644 --- a/packages/mobile/src/components/user-badges/UserBadges.tsx +++ b/packages/mobile/src/components/user-badges/UserBadges.tsx @@ -1,7 +1,7 @@ import type { ComponentType } from 'react' -import { useSelectTierInfo } from '@audius/common' import type { User } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import type { ViewStyle, StyleProp, TextStyle } from 'react-native' import { StyleSheet, View, Text } from 'react-native' diff --git a/packages/mobile/src/hooks/useImageSize.ts b/packages/mobile/src/hooks/useImageSize.ts index b73adeaa9bc..743c8ff3d4d 100644 --- a/packages/mobile/src/hooks/useImageSize.ts +++ b/packages/mobile/src/hooks/useImageSize.ts @@ -1,11 +1,11 @@ -import { useImageSize as useImageSizeCommon } from '@audius/common' import type { - ImageSizesObject, SquareSizes, WidthSizes, Maybe, - Nullable + Nullable, + ImageSizesObject } from '@audius/common' +import { useImageSize as useImageSizeCommon } from '@audius/common/hooks' import type { ImageSourcePropType } from 'react-native' import { Image } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/hooks/useIsUSDCEnabled.ts b/packages/mobile/src/hooks/useIsUSDCEnabled.ts index dbc8c1ad5e8..cfae7b378db 100644 --- a/packages/mobile/src/hooks/useIsUSDCEnabled.ts +++ b/packages/mobile/src/hooks/useIsUSDCEnabled.ts @@ -1,4 +1,5 @@ -import { FeatureFlags, useFeatureFlag } from '@audius/common' +import { FeatureFlags } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' export const useIsUSDCEnabled = () => useFeatureFlag(FeatureFlags.USDC_PURCHASES).isEnabled diff --git a/packages/mobile/src/hooks/useOfflineTrackStatus.ts b/packages/mobile/src/hooks/useOfflineTrackStatus.ts index 5e8822cbb4f..338f7078503 100644 --- a/packages/mobile/src/hooks/useOfflineTrackStatus.ts +++ b/packages/mobile/src/hooks/useOfflineTrackStatus.ts @@ -1,4 +1,5 @@ -import { reachabilitySelectors, useProxySelector } from '@audius/common' +import { reachabilitySelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import type { AppState } from 'app/store' import { diff --git a/packages/mobile/src/hooks/useProxySelector.ts b/packages/mobile/src/hooks/useProxySelector.ts index 34eb4f2ad44..717b9b74988 100644 --- a/packages/mobile/src/hooks/useProxySelector.ts +++ b/packages/mobile/src/hooks/useProxySelector.ts @@ -1,4 +1,4 @@ -import { createProxySelectorHook } from '@audius/common' +import { createProxySelectorHook } from '@audius/common/hooks' import type { AppState } from 'app/store' export const useProxySelector = createProxySelectorHook() diff --git a/packages/mobile/src/hooks/useRemoteConfig.ts b/packages/mobile/src/hooks/useRemoteConfig.ts index 69ef37f2ad6..1b1c3c5836c 100644 --- a/packages/mobile/src/hooks/useRemoteConfig.ts +++ b/packages/mobile/src/hooks/useRemoteConfig.ts @@ -1,9 +1,8 @@ +import { accountSelectors, remoteConfigSelectors } from '@audius/common' import { createUseFeatureFlagHook, - createUseRemoteVarHook, - accountSelectors, - remoteConfigSelectors -} from '@audius/common' + createUseRemoteVarHook +} from '@audius/common/hooks' import AsyncStorage from '@react-native-async-storage/async-storage' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/hooks/useTikTokAuth.ts b/packages/mobile/src/hooks/useTikTokAuth.ts index 54c7e4135a2..b49c413da21 100644 --- a/packages/mobile/src/hooks/useTikTokAuth.ts +++ b/packages/mobile/src/hooks/useTikTokAuth.ts @@ -1,4 +1,4 @@ -import { createUseTikTokAuthHook } from '@audius/common' +import { createUseTikTokAuthHook } from '@audius/common/hooks' import type { UseTikTokAuthArguments, Credentials } from '@audius/common/hooks' import AsyncStorage from '@react-native-async-storage/async-storage' import CookieManager from '@react-native-cookies/cookies' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx index e1db07d2825..c32f17906fe 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx @@ -3,10 +3,10 @@ import { FeatureFlags, StringKeys, accountSelectors, - useAccountHasClaimableRewards, chatSelectors, Name } from '@audius/common' +import { useAccountHasClaimableRewards } from '@audius/common/hooks' import type { DrawerContentComponentProps } from '@react-navigation/drawer' import { DrawerContentScrollView } from '@react-navigation/drawer' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx b/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx index 69f640c66d2..b008c29dc4f 100644 --- a/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx +++ b/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx @@ -1,10 +1,10 @@ import { accountSelectors, chatSelectors, - useAccountHasClaimableRewards, StringKeys, FeatureFlags } from '@audius/common' +import { useAccountHasClaimableRewards } from '@audius/common/hooks' import { useDrawerProgress } from '@react-navigation/drawer' import { View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/chat-screen/ChatListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatListItem.tsx index 33641c9ff95..44bf5e5ed94 100644 --- a/packages/mobile/src/screens/chat-screen/ChatListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatListItem.tsx @@ -1,6 +1,7 @@ import { useCallback, useMemo } from 'react' -import { chatSelectors, useProxySelector } from '@audius/common' +import { chatSelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { View, TouchableHighlight } from 'react-native' import { Text } from 'app/components/core' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx index 03f4cee0782..7ddf5e0b588 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx @@ -11,10 +11,9 @@ import { makeUid, playerSelectors, useGetTracksByIds, - usePlayTrack, - usePauseTrack, useGetPlaylistByPermalink } from '@audius/common' +import { usePlayTrack, usePauseTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx index 8a9ebe546f9..75498ce1e66 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx @@ -9,10 +9,9 @@ import { accountSelectors, getPathFromTrackUrl, makeUid, - useGetTrackByPermalink, - useToggleTrack, - useGatedContentAccess + useGetTrackByPermalink } from '@audius/common' +import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx index c9e34f93ef4..2d0f3dda9ac 100644 --- a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx @@ -11,9 +11,9 @@ import { encodeHashId, encodeUrlName, isEarliestUnread, - playerSelectors, - useCanSendMessage + playerSelectors } from '@audius/common' +import { useCanSendMessage } from '@audius/common/hooks' import { Portal } from '@gorhom/portal' import { useKeyboard } from '@react-native-community/hooks' import { useFocusEffect } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx b/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx index 69d3cfd852b..35f791823fb 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx @@ -1,10 +1,7 @@ import { useCallback, useMemo } from 'react' -import { - ChatPermissionAction, - useCanSendMessage, - CHAT_BLOG_POST_URL -} from '@audius/common' +import { ChatPermissionAction, CHAT_BLOG_POST_URL } from '@audius/common' +import { useCanSendMessage } from '@audius/common/hooks' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx index 26fe90fa2a7..0f3e8bddd73 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx @@ -13,9 +13,9 @@ import { searchUsersModalSelectors, statusIsNotFinalized, chatSelectors, - useProxySelector, userListActions } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { View, Image } from 'react-native' import { KeyboardAwareFlatList } from 'react-native-keyboard-aware-scroll-view' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/LinkPreview.tsx b/packages/mobile/src/screens/chat-screen/LinkPreview.tsx index fb211ea82a5..8cc538db48d 100644 --- a/packages/mobile/src/screens/chat-screen/LinkPreview.tsx +++ b/packages/mobile/src/screens/chat-screen/LinkPreview.tsx @@ -3,9 +3,9 @@ import { useCallback, useEffect } from 'react' import { isAllowedExternalLink, isAudiusUrl, - useLeavingAudiusModal, - useLinkUnfurlMetadata + useLeavingAudiusModal } from '@audius/common' +import { useLinkUnfurlMetadata } from '@audius/common/hooks' import type { GestureResponderEvent, ViewStyle } from 'react-native' import { View, Image, Pressable } from 'react-native' diff --git a/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx b/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx index ee05b96a3f0..55058f40c47 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx @@ -2,12 +2,12 @@ import { useLayoutEffect, useState } from 'react' import type { Collection, SmartCollectionVariant } from '@audius/common' import { - useThrottledCallback, accountSelectors, reachabilitySelectors, collectionPageSelectors, Variant } from '@audius/common' +import { useThrottledCallback } from '@audius/common/hooks' import { View } from 'react-native' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx index 41abacc60dc..508605a0780 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx @@ -21,7 +21,6 @@ import { RepostType, repostsUserListActions, favoritesUserListActions, - useFeatureFlag, FeatureFlags } from '@audius/common' import type { @@ -31,6 +30,7 @@ import type { SearchPlaylist, SearchUser } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' import { useDispatch, useSelector } from 'react-redux' import { diff --git a/packages/mobile/src/screens/edit-playlist-screen/PlaylistArtworkField.tsx b/packages/mobile/src/screens/edit-playlist-screen/PlaylistArtworkField.tsx index dacb0dd6fb1..6e7629642f3 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/PlaylistArtworkField.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/PlaylistArtworkField.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { useGeneratePlaylistArtwork } from '@audius/common' +import { useGeneratePlaylistArtwork } from '@audius/common/hooks' import { useField, useFormikContext } from 'formik' import { PickArtworkField } from 'app/components/fields' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx index 74457769038..df0744b09ab 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx @@ -4,9 +4,9 @@ import type { UploadTrack } from '@audius/common' import { creativeCommons, formatPrice, - isContentUSDCPurchaseGated, - useUSDCPurchaseConfig + isContentUSDCPurchaseGated } from '@audius/common' +import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { Formik } from 'formik' import { z } from 'zod' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx index 3b4a32195c6..556f80edea6 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx @@ -1,11 +1,7 @@ import { useCallback, useEffect, useMemo, useRef } from 'react' -import { - FeatureFlags, - Name, - isContentUSDCPurchaseGated, - useFeatureFlag -} from '@audius/common' +import { FeatureFlags, Name, isContentUSDCPurchaseGated } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' import { useField } from 'formik' import { Dimensions, View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx index 838bd7e9328..e88b9f3850e 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx @@ -8,10 +8,9 @@ import { isContentCollectibleGated, FeatureFlags, removeNullable, - isContentUSDCPurchaseGated, - useAccessAndRemixSettings, - useFeatureFlag + isContentUSDCPurchaseGated } from '@audius/common' +import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' import { useField, useFormikContext } from 'formik' import IconCaretLeft from 'app/assets/images/iconCaretLeft.svg' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx index 61b6b0da2ae..83c5c9e71c7 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx @@ -7,9 +7,9 @@ import { isContentUSDCPurchaseGated, remixSettingsActions, remixSettingsSelectors, - Status, - useGatedContentAccess + Status } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import { useFocusEffect } from '@react-navigation/native' import { useField } from 'formik' import { debounce } from 'lodash' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx index ea9c7e0d68d..71ffe7195f6 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx @@ -3,9 +3,9 @@ import { useEffect } from 'react' import { explorePageActions, explorePageSelectors, - Status, - useProxySelector + Status } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { useDispatch, useSelector } from 'react-redux' import { ProfileList } from 'app/components/profile-list' diff --git a/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx index 041f6022878..b97c3e135f6 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx @@ -3,9 +3,9 @@ import { useEffect } from 'react' import { Status, explorePageSelectors, - useProxySelector, explorePageActions } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { useSelector, useDispatch } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx b/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx index a8cf71d3821..e8c65710baf 100644 --- a/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx +++ b/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx @@ -1,6 +1,7 @@ import { useEffect, useLayoutEffect, useState } from 'react' -import { reachabilitySelectors, useThrottledCallback } from '@audius/common' +import { reachabilitySelectors } from '@audius/common' +import { useThrottledCallback } from '@audius/common/hooks' import type { SwitchProps } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts index 2baca9771b1..94ae667ff96 100644 --- a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts +++ b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts @@ -10,10 +10,10 @@ import { useAllPaginatedQuery, useGetLibraryAlbums, useGetLibraryPlaylists, - useProxySelector, savedPageSelectors, filterCollections } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import uniq from 'lodash/uniq' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx b/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx index 90b1462c7ae..5d6b54eb772 100644 --- a/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx +++ b/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx @@ -1,6 +1,7 @@ import { useCallback, useMemo, useState } from 'react' -import { FEATURE_FLAG_OVERRIDE_KEY, FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common' +import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' import type { OverrideSetting } from '@audius/common/hooks' import AsyncStorage from '@react-native-async-storage/async-storage' import { createNativeStackNavigator } from '@react-navigation/native-stack' diff --git a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx index 3932727071a..5cd153638fb 100644 --- a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx +++ b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx @@ -5,9 +5,9 @@ import { lineupSelectors, feedPageLineupActions as feedActions, feedPageSelectors, - FeatureFlags, - useFeatureFlag + FeatureFlags } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' import { useDispatch } from 'react-redux' import IconFeed from 'app/assets/images/iconFeed.svg' diff --git a/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx b/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx index a08f79de694..9a3f67d3bf7 100644 --- a/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx +++ b/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx @@ -4,9 +4,9 @@ import { Status, explorePageCollectionsSelectors, ExploreCollectionsVariant, - explorePageCollectionsActions, - useProxySelector + explorePageCollectionsActions } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { useDispatch, useSelector } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx index f6a0497927a..bdaa056eb73 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' import type { AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType } from '@audius/common' -import { useProxySelector, notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { View } from 'react-native' import IconPlaylists from 'app/assets/images/iconPlaylists.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx index 3e5619d095e..37e71ca0fbb 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx @@ -1,12 +1,8 @@ import { useCallback } from 'react' import type { FavoriteNotification as FavoriteNotificationType } from '@audius/common' -import { - formatCount, - notificationsSelectors, - useProxySelector, - Entity -} from '@audius/common' +import { formatCount, notificationsSelectors, Entity } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import IconHeart from 'app/assets/images/iconHeart.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx index 76818ad4f65..c4216f42bd6 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx @@ -1,12 +1,8 @@ import { useCallback } from 'react' import type { FavoriteOfRepostNotification as FavoriteOfRepostNotificationType } from '@audius/common' -import { - formatCount, - notificationsSelectors, - useProxySelector, - Entity -} from '@audius/common' +import { formatCount, notificationsSelectors, Entity } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import IconHeart from 'app/assets/images/iconHeart.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx index f3c427f086f..39a78ea420e 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' import type { FollowNotification as FollowNotificationType } from '@audius/common' -import { - useProxySelector, - formatCount, - notificationsSelectors -} from '@audius/common' +import { formatCount, notificationsSelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import IconUser from 'app/assets/images/iconUser.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx index 948bde3d183..e5132d9ef83 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx @@ -6,11 +6,8 @@ import type { EntityType, MilestoneNotification as MilestoneNotificationType } from '@audius/common' -import { - notificationsSelectors, - Achievement, - useProxySelector -} from '@audius/common' +import { notificationsSelectors, Achievement } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { fullProfilePage } from 'audius-client/src/utils/route' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx index 70ab53c90f2..547cdcd358a 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx @@ -5,7 +5,8 @@ import type { RemixCosignNotification as RemixCosignNotificationType, TrackEntity } from '@audius/common' -import { useProxySelector, notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx index f3c78473d36..994ca14e94a 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx @@ -1,12 +1,8 @@ import { useCallback } from 'react' import type { RepostNotification as RepostNotificationType } from '@audius/common' -import { - useProxySelector, - formatCount, - notificationsSelectors, - Entity -} from '@audius/common' +import { formatCount, notificationsSelectors, Entity } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import IconRepost from 'app/assets/images/iconRepost.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx index 28deadbb4fc..12f7eb1d78c 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx @@ -1,12 +1,8 @@ import { useCallback } from 'react' import type { RepostOfRepostNotification as RepostOfRepostNotificationType } from '@audius/common' -import { - useProxySelector, - formatCount, - notificationsSelectors, - Entity -} from '@audius/common' +import { formatCount, notificationsSelectors, Entity } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import IconRepost from 'app/assets/images/iconRepost.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx index e231dd017ad..d1e05108e45 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' import type { ReactionNotification } from '@audius/common' -import { - useUIAudio, - notificationsSelectors, - getReactionFromRawValue -} from '@audius/common' +import { notificationsSelectors, getReactionFromRawValue } from '@audius/common' +import { useUIAudio } from '@audius/common/hooks' import { Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx index 4f3ee22d978..5324092a13a 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { - useUIAudio, formatNumberCommas, notificationsSelectors, reactionsUIActions, @@ -12,6 +11,7 @@ import type { TipReceiveNotification, ReactionTypes } from '@audius/common' +import { useUIAudio } from '@audius/common/hooks' import { Image, Platform, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx index e5827dda8da..45763f12cac 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' import type { TipSendNotification } from '@audius/common' -import { useUIAudio, notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import { useUIAudio } from '@audius/common/hooks' import { Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx index c1e4080277b..665f75d2b45 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' import type { UserSubscriptionNotification as UserSubscriptionNotificationType } from '@audius/common' -import { useProxySelector, notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx index d1ec08120b3..804b805c1de 100644 --- a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx +++ b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx @@ -4,9 +4,9 @@ import type { BNUSDC } from '@audius/common' import { formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber, - useAddFundsModal, - useUSDCBalance + useAddFundsModal } from '@audius/common' +import { useUSDCBalance } from '@audius/common/hooks' import BN from 'bn.js' import { TouchableOpacity, View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx index 1a857d5e666..eeaeee5a8bd 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx @@ -1,6 +1,7 @@ import { memo, useCallback, useEffect, useState } from 'react' -import { accountSelectors, useSelectTierInfo } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import type { Animated } from 'react-native' import { LayoutAnimation, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx index 1e6c003541c..09929611465 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx @@ -1,6 +1,7 @@ import { Fragment, useEffect, useLayoutEffect, useMemo, useRef } from 'react' -import { cacheUsersActions, useSelectTierInfo } from '@audius/common' +import { cacheUsersActions } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import { View, Animated } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx index 7317c45310d..1e47722b8b9 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { modalsActions, useSelectTierInfo } from '@audius/common' +import { modalsActions } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import type { ViewStyle, StyleProp } from 'react-native' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx index 0fad801d7e4..a159bba4825 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx @@ -1,11 +1,8 @@ import { useEffect, useMemo } from 'react' import type { Supporting } from '@audius/common' -import { - useRankedSupportingForUser, - tippingActions, - MAX_PROFILE_SUPPORTING_TILES -} from '@audius/common' +import { tippingActions, MAX_PROFILE_SUPPORTING_TILES } from '@audius/common' +import { useRankedSupportingForUser } from '@audius/common/hooks' import { FlatList } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx index d973f25210b..aa5fa716b56 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx @@ -3,10 +3,10 @@ import { useCallback, useEffect } from 'react' import { cacheUsersSelectors, tippingSelectors, - useProxySelector, removeNullable, tippingActions } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { Text, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx index 702e24717b3..e12ec45a413 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx @@ -3,10 +3,12 @@ import { useCallback } from 'react' import { formatCount, cacheUsersSelectors, - MAX_PROFILE_SUPPORTING_TILES, + MAX_PROFILE_SUPPORTING_TILES +} from '@audius/common' +import { useRankedSupportingForUser, useProxySelector -} from '@audius/common' +} from '@audius/common/hooks' import IconArrow from 'app/assets/images/iconArrow.svg' import { Tile, TextButton } from 'app/components/core' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx index b86f7b737a3..a5c48baf3ef 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx @@ -1,7 +1,8 @@ import { useCallback, useMemo, useRef } from 'react' import type { Collectible } from '@audius/common' -import { accountSelectors, useProxySelector } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import Clipboard from '@react-native-clipboard/clipboard' import type { FlatList as RNFlatList } from 'react-native' import { View, Text } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx index b4d0f423663..d235715785c 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx @@ -3,9 +3,9 @@ import { useMemo } from 'react' import { profilePageSelectors, profilePageFeedLineupActions as feedActions, - useProxySelector, Status } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { useRoute } from '@react-navigation/native' import { Lineup } from 'app/components/lineup' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx index d68e788285b..438b7b2856f 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx @@ -2,9 +2,9 @@ import { useMemo } from 'react' import { profilePageSelectors, - profilePageTracksLineupActions as tracksActions, - useProxySelector + profilePageTracksLineupActions as tracksActions } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { Lineup } from 'app/components/lineup' diff --git a/packages/mobile/src/screens/profile-screen/selectors.ts b/packages/mobile/src/screens/profile-screen/selectors.ts index 437984b4ca5..aca783147e0 100644 --- a/packages/mobile/src/screens/profile-screen/selectors.ts +++ b/packages/mobile/src/screens/profile-screen/selectors.ts @@ -1,12 +1,8 @@ import { useContext } from 'react' import type { Nullable, User, CommonState } from '@audius/common' -import { - Status, - useProxySelector, - accountSelectors, - profilePageSelectors -} from '@audius/common' +import { Status, accountSelectors, profilePageSelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { useSelector } from 'react-redux' import { createSelector } from 'reselect' diff --git a/packages/mobile/src/screens/profile-screen/utils.ts b/packages/mobile/src/screens/profile-screen/utils.ts index 9626a0e8277..fde2f83c4a4 100644 --- a/packages/mobile/src/screens/profile-screen/utils.ts +++ b/packages/mobile/src/screens/profile-screen/utils.ts @@ -1,5 +1,6 @@ import type { CommonState } from '@audius/common' -import { badgeTiers, useSelectTierInfo } from '@audius/common' +import { badgeTiers } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import { useSelector } from 'react-redux' import { MIN_COLLECTIBLES_TIER } from './constants' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx index 6aa6c02ea7a..7b24ed16148 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx @@ -1,10 +1,6 @@ import type { CommonState } from '@audius/common' -import { - Status, - searchResultsPageSelectors, - useProxySelector, - SearchKind -} from '@audius/common' +import { Status, searchResultsPageSelectors, SearchKind } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { CollectionList } from 'app/components/collection-list/CollectionList' import { spacing } from 'app/styles/spacing' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx index a8c3c8db731..374db8bb8e9 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx @@ -1,10 +1,6 @@ import type { CommonState } from '@audius/common' -import { - searchResultsPageSelectors, - Status, - useProxySelector, - SearchKind -} from '@audius/common' +import { searchResultsPageSelectors, Status, SearchKind } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { CollectionList } from 'app/components/collection-list/CollectionList' import { spacing } from 'app/styles/spacing' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx index 726b33e1887..bf23b6230bd 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx @@ -1,10 +1,6 @@ import type { CommonState } from '@audius/common' -import { - Status, - searchResultsPageSelectors, - SearchKind, - useProxySelector -} from '@audius/common' +import { Status, searchResultsPageSelectors, SearchKind } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { ProfileList } from 'app/components/profile-list' import { spacing } from 'app/styles/spacing' diff --git a/packages/mobile/src/screens/search-screen/SearchBar.tsx b/packages/mobile/src/screens/search-screen/SearchBar.tsx index 30ed8775e9e..d05ec56c9a8 100644 --- a/packages/mobile/src/screens/search-screen/SearchBar.tsx +++ b/packages/mobile/src/screens/search-screen/SearchBar.tsx @@ -1,6 +1,7 @@ import { useCallback, useEffect, useRef, useState } from 'react' -import { Status, useDebouncedCallback } from '@audius/common' +import { Status } from '@audius/common' +import { useDebouncedCallback } from '@audius/common/hooks' import { fetchSearch, clearSearch diff --git a/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx b/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx index 5f56856b8a1..6363d5a8f48 100644 --- a/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx +++ b/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx @@ -4,9 +4,9 @@ import { accountSelectors, Name, themeActions, - themeSelectors, - useSelectTierInfo + themeSelectors } from '@audius/common' +import { useSelectTierInfo } from '@audius/common/hooks' import { useDispatch, useSelector } from 'react-redux' import IconAppearance from 'app/assets/images/iconAppearance.svg' diff --git a/packages/mobile/src/screens/settings-screen/InboxSettingsScreen.tsx b/packages/mobile/src/screens/settings-screen/InboxSettingsScreen.tsx index aa6a25a0ed4..a07baa8e4c1 100644 --- a/packages/mobile/src/screens/settings-screen/InboxSettingsScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/InboxSettingsScreen.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react' -import { useSetInboxPermissions } from '@audius/common' +import { useSetInboxPermissions } from '@audius/common/hooks' import { ChatPermission } from '@audius/sdk' import { TouchableOpacity, View } from 'react-native' import { ScrollView } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx b/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx index 1354684cdd1..06fa3238e32 100644 --- a/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx @@ -5,9 +5,9 @@ import { Status, PlaybackSource, historyPageTracksLineupActions as tracksActions, - historyPageSelectors, - useProxySelector + historyPageSelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { useFocusEffect } from '@react-navigation/native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx b/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx index 3f533aeab74..95b39c0e0a0 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx @@ -1,4 +1,5 @@ -import { BooleanKeys, useRemoteVar } from '@audius/common' +import { BooleanKeys } from '@audius/common' +import { useRemoteVar } from '@audius/common/hooks' import { socialMediaMessages } from '@audius/common/messages' import { Flex } from '@audius/harmony-native' diff --git a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx index a016ebfffd9..f9a8258dc9f 100644 --- a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx @@ -7,9 +7,9 @@ import { tippingSelectors, tippingActions, walletSelectors, - walletActions, - useGetFirstOrTopSupporter + walletActions } from '@audius/common' +import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import { useFocusEffect } from '@react-navigation/native' import BN from 'bn.js' import { Platform } from 'react-native' diff --git a/packages/mobile/src/screens/track-screen/DownloadRow.tsx b/packages/mobile/src/screens/track-screen/DownloadRow.tsx index b316fe36248..9d63853b7ba 100644 --- a/packages/mobile/src/screens/track-screen/DownloadRow.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadRow.tsx @@ -5,9 +5,9 @@ import { Name, cacheTracksSelectors, tracksSocialActions, - useDownloadableContentAccess, DownloadQuality } from '@audius/common' +import { useDownloadableContentAccess } from '@audius/common/hooks' import { css } from '@emotion/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/DownloadSection.tsx b/packages/mobile/src/screens/track-screen/DownloadSection.tsx index aa2c415da0f..54aaa9ef3d0 100644 --- a/packages/mobile/src/screens/track-screen/DownloadSection.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadSection.tsx @@ -4,11 +4,13 @@ import { DownloadQuality, ModalSource, cacheTracksSelectors, - useCurrentStems, - useDownloadableContentAccess, usePremiumContentPurchaseModal } from '@audius/common' import type { ID, CommonState } from '@audius/common' +import { + useCurrentStems, + useDownloadableContentAccess +} from '@audius/common/hooks' import { USDC } from '@audius/fixed-decimal' import { css } from '@emotion/native' import { LayoutAnimation } from 'react-native' diff --git a/packages/mobile/src/screens/track-screen/TrackScreen.tsx b/packages/mobile/src/screens/track-screen/TrackScreen.tsx index 8bafabbdc10..71fbdba8ced 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreen.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreen.tsx @@ -4,9 +4,9 @@ import { trackPageLineupActions, trackPageActions, trackPageSelectors, - useProxySelector, reachabilitySelectors } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' import { useFocusEffect } from '@react-navigation/native' import { Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx index fab9dce16f4..cbe780b0e30 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx @@ -25,7 +25,6 @@ import { repostsUserListActions, favoritesUserListActions, reachabilitySelectors, - useGatedContentAccess, playbackPositionSelectors, FeatureFlags, isContentUSDCPurchaseGated, @@ -33,6 +32,7 @@ import { queueSelectors } from '@audius/common' import type { UID, User, SearchTrack, SearchUser, Track } from '@audius/common' +import { useGatedContentAccess } from '@audius/common/hooks' import moment from 'moment' import { Image, View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx index a66c07bddf9..a7acc534b6e 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx @@ -1,12 +1,9 @@ import { useCallback } from 'react' -import { - Name, - ButtonState, - useDownloadTrackButtons, - tracksSocialActions -} from '@audius/common' -import type { ID, ButtonType as DownloadButtonType } from '@audius/common' +import { Name, tracksSocialActions } from '@audius/common' +import type { ID } from '@audius/common' +import type { ButtonType as DownloadButtonType } from '@audius/common/hooks' +import { ButtonState, useDownloadTrackButtons } from '@audius/common/hooks' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/services/remote-config/getFeatureEnabled.ts b/packages/mobile/src/services/remote-config/getFeatureEnabled.ts index 9a5e93d3d77..813aea36965 100644 --- a/packages/mobile/src/services/remote-config/getFeatureEnabled.ts +++ b/packages/mobile/src/services/remote-config/getFeatureEnabled.ts @@ -1,5 +1,5 @@ import type { FeatureFlags } from '@audius/common' -import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common' +import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' import type { OverrideSetting } from '@audius/common/hooks' import AsyncStorage from '@react-native-async-storage/async-storage' diff --git a/packages/mobile/tsconfig.json b/packages/mobile/tsconfig.json index 5cb8db4993c..90ae861c07c 100644 --- a/packages/mobile/tsconfig.json +++ b/packages/mobile/tsconfig.json @@ -6,6 +6,9 @@ "paths": { "@audius/harmony-native": ["./src/harmony-native/index.ts"], "@audius/common/messages": ["../../node_modules/common/src/messages/index.ts"], + "@audius/common/hooks": ["../../node_modules/common/src/hooks/index.ts"], + "@audius/common/context": ["../../node_modules/common/src/context/index.ts"], + "~/*": ["../common/src/*"], "app/*": ["./src/*"], // Remove these when no longer dependent on audius-client "audio/*": ["../../node_modules/audius-client/src/audio/*"], From 3c1f17197bcffb1d23cdc593f8889d7b55382997 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 14:45:43 -0800 Subject: [PATCH 21/64] Fix types in web --- packages/common/src/hooks/index.ts | 1 + packages/common/src/hooks/useInterval.ts | 2 +- packages/common/src/services/audius-backend/AudiusBackend.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/common/src/hooks/index.ts b/packages/common/src/hooks/index.ts index 55ce293e403..e3f2b26d5d6 100644 --- a/packages/common/src/hooks/index.ts +++ b/packages/common/src/hooks/index.ts @@ -1,3 +1,4 @@ +import '../types/fxa-common-password-list' export * from './useBooleanOnce' export * from './useFeatureFlag' export * from './useRemoteVar' diff --git a/packages/common/src/hooks/useInterval.ts b/packages/common/src/hooks/useInterval.ts index 1f655a27e6e..99dd48bb463 100644 --- a/packages/common/src/hooks/useInterval.ts +++ b/packages/common/src/hooks/useInterval.ts @@ -4,7 +4,7 @@ import { useIsomorphicLayoutEffect } from 'react-use' export function useInterval(callback: () => void, delay: number | null) { const savedCallback = useRef(callback) - const intervalId = useRef() + const intervalId = useRef() // Remember the latest callback if it changes. useIsomorphicLayoutEffect(() => { diff --git a/packages/common/src/services/audius-backend/AudiusBackend.ts b/packages/common/src/services/audius-backend/AudiusBackend.ts index 4ae361ac6e5..b5bd9c2dfa3 100644 --- a/packages/common/src/services/audius-backend/AudiusBackend.ts +++ b/packages/common/src/services/audius-backend/AudiusBackend.ts @@ -389,7 +389,7 @@ export const audiusBackend = ({ const start = preloadImageTimer.start() const timeoutMs = getRemoteVar(IntKeys.IMAGE_QUICK_FETCH_TIMEOUT_MS) ?? undefined - let timeoutId: Nullable = null + let timeoutId: any = null try { const response = await Promise.race([ From dc08949665c83ea4b8f733f122601b21fe7d0220 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 14:41:00 -0800 Subject: [PATCH 22/64] Fix some mobile typescript issues --- .../opensea-client/ethCollectibleHelpers.ts | 11 +++++----- .../src/components/audio/AudioPlayer.tsx | 2 +- .../mobile/src/hooks/useContentNodeImage.ts | 3 ++- packages/mobile/tsconfig.json | 20 +++++++++++++++++-- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts b/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts index 9eff5685c4e..e488b9aef37 100644 --- a/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts +++ b/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts @@ -1,3 +1,4 @@ +import { Nullable } from '~/utils' import { Chain, Collectible, @@ -155,11 +156,11 @@ export const assetToCollectible = async ( asset: OpenSeaAssetExtended ): Promise => { let mediaType: CollectibleMediaType - let frameUrl = null - let imageUrl = null - let videoUrl = null - let threeDUrl = null - let gifUrl = null + let frameUrl: Nullable = null + let imageUrl: Nullable = null + let videoUrl: Nullable = null + let threeDUrl: Nullable = null + let gifUrl: Nullable = null let hasAudio = false let animationUrlOverride = null diff --git a/packages/mobile/src/components/audio/AudioPlayer.tsx b/packages/mobile/src/components/audio/AudioPlayer.tsx index e9f3ccb8228..8993f1c7ca9 100644 --- a/packages/mobile/src/components/audio/AudioPlayer.tsx +++ b/packages/mobile/src/components/audio/AudioPlayer.tsx @@ -31,9 +31,9 @@ import { SquareSizes, shallowCompare, savedPageTracksLineupActions, - useAppContext, getTrackPreviewDuration } from '@audius/common' +import { useAppContext } from '@audius/common/context' import { isEqual } from 'lodash' import TrackPlayer, { AppKilledPlaybackBehavior, diff --git a/packages/mobile/src/hooks/useContentNodeImage.ts b/packages/mobile/src/hooks/useContentNodeImage.ts index f05ad854d47..26115c0b660 100644 --- a/packages/mobile/src/hooks/useContentNodeImage.ts +++ b/packages/mobile/src/hooks/useContentNodeImage.ts @@ -1,7 +1,8 @@ import { useState, useMemo, useCallback } from 'react' import type { Nullable, CID, WidthSizes, SquareSizes } from '@audius/common' -import { interleave, useAppContext } from '@audius/common' +import { interleave } from '@audius/common' +import { useAppContext } from '@audius/common/context' import type { ImageSourcePropType, ImageURISource } from 'react-native' export type ContentNodeImageSource = { diff --git a/packages/mobile/tsconfig.json b/packages/mobile/tsconfig.json index 90ae861c07c..372976d8c93 100644 --- a/packages/mobile/tsconfig.json +++ b/packages/mobile/tsconfig.json @@ -1,8 +1,24 @@ { "extends": "@react-native/typescript-config/tsconfig.json", "compilerOptions": { - // Remove "dom" when no longer dependent on audius-client - "lib": ["dom", "es2019"], + // Use react-native's builtin lib when no longer dependent on audius-client + "lib": [ + "dom", + "es2019", + "es2020.bigint", + "es2020.date", + "es2020.number", + "es2020.promise", + "es2020.string", + "es2020.symbol.wellknown", + "es2021.promise", + "es2021.string", + "es2021.weakref", + "es2022.array", + "es2022.object", + "es2022.string" + ], + "module": "esnext", "paths": { "@audius/harmony-native": ["./src/harmony-native/index.ts"], "@audius/common/messages": ["../../node_modules/common/src/messages/index.ts"], From d66359d9c7f8f5f1f25bf11c90f34b4d99000f48 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 14:59:11 -0800 Subject: [PATCH 23/64] Fix rest of mobile types --- packages/common/src/audius-query/createApi.ts | 13 ++++++++++--- packages/common/src/hooks/useProxySelector.ts | 1 + .../opensea-client/ethCollectibleHelpers.ts | 2 +- packages/common/src/store/buy-crypto/sagas.ts | 2 +- packages/mobile/types/react-redux.d.ts | 2 ++ 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/common/src/audius-query/createApi.ts b/packages/common/src/audius-query/createApi.ts index 1c59bd2014d..a271abd923c 100644 --- a/packages/common/src/audius-query/createApi.ts +++ b/packages/common/src/audius-query/createApi.ts @@ -10,11 +10,15 @@ import { useDispatch, useSelector } from 'react-redux' import { Dispatch } from 'redux' import { useBooleanOnce } from '~/hooks/useBooleanOnce' -import { CollectionMetadata, UserCollectionMetadata } from '~/models/Collection' +import { + Collection, + CollectionMetadata, + UserCollectionMetadata +} from '~/models/Collection' import { ErrorLevel } from '~/models/ErrorReporting' import { Kind } from '~/models/Kind' import { Status, statusIsNotFinalized } from '~/models/Status' -import { UserMetadata } from '~/models/User' +import { User, UserMetadata } from '~/models/User' import { getCollection } from '~/store/cache/collections/selectors' import { reformatCollection } from '~/store/cache/collections/utils/reformatCollection' import { getTrack } from '~/store/cache/tracks/selectors' @@ -49,6 +53,9 @@ import { MutationHookResults } from './types' import { capitalize, getKeyFromFetchArgs, selectCommonEntityMap } from './utils' +import { Track } from '../models/Track' + +type Entity = Collection | Track | User const { addEntries } = cacheActions @@ -203,7 +210,7 @@ const useQueryState = ( const { kind, idArgKey, idListArgKey, permalinkArgKey, schemaKey } = endpoint.options - let cachedData = null + let cachedData: Nullable = null if (idArgKey && fetchArgs[idArgKey]) { const idAsNumber = typeof fetchArgs[idArgKey] === 'number' diff --git a/packages/common/src/hooks/useProxySelector.ts b/packages/common/src/hooks/useProxySelector.ts index 8866ef739df..7aacaac0796 100644 --- a/packages/common/src/hooks/useProxySelector.ts +++ b/packages/common/src/hooks/useProxySelector.ts @@ -13,6 +13,7 @@ export const createProxySelectorHook = () => { equalityFn?: Parameters[1] ): TReturnType => { // eslint-disable-next-line react-hooks/exhaustive-deps + // @ts-ignore return useSelector(useCallback(memoize(fn), deps), equalityFn) } return useProxySelector diff --git a/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts b/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts index e488b9aef37..662aa2b42d9 100644 --- a/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts +++ b/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts @@ -163,7 +163,7 @@ export const assetToCollectible = async ( let gifUrl: Nullable = null let hasAudio = false - let animationUrlOverride = null + let animationUrlOverride: Nullable = null const { animation_url, diff --git a/packages/common/src/store/buy-crypto/sagas.ts b/packages/common/src/store/buy-crypto/sagas.ts index 0943a88d5f5..124dd6555ac 100644 --- a/packages/common/src/store/buy-crypto/sagas.ts +++ b/packages/common/src/store/buy-crypto/sagas.ts @@ -513,7 +513,7 @@ function* doBuyCryptoViaSol({ const preSwapTokenBalance = account?.amount ?? BigInt(0) // Try the swap a few times in hopes the price comes back if it slipped - let swapError = null + let swapError: string | null = null let swapTransactionSignature: string | null = null let retryCount = 0 // TODO: Put these into optimizely? diff --git a/packages/mobile/types/react-redux.d.ts b/packages/mobile/types/react-redux.d.ts index 8e419bcf4b7..720a8534466 100644 --- a/packages/mobile/types/react-redux.d.ts +++ b/packages/mobile/types/react-redux.d.ts @@ -45,4 +45,6 @@ declare module 'react-redux' { State = unknown, Action extends BasicAction = AnyAction >() => Store + + export declare function shallowEqual(objA: any, objB: any): boolean } From e91d1fe117461a81e1395575d7797b83b8eba4d7 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 15:00:58 -0800 Subject: [PATCH 24/64] Convert api exports in web --- packages/common/package.json | 3 +- packages/common/src/hooks/index.ts | 2 +- packages/common/src/index.ts | 4 +- packages/convert-exports.js | 68 +++++++++++++++---- packages/get-type-exports.js | 2 +- packages/web/src/app/AppContextProvider.tsx | 2 +- .../PremiumContentPurchaseModal.tsx | 2 +- .../related-artists/RelatedArtists.tsx | 4 +- .../SuggestedCollectionTracks.tsx | 9 ++- .../components/SuggestedTracks.tsx | 3 +- .../components/track/DynamicTrackArtwork.tsx | 8 +-- .../components/PurchaseModalContent.tsx | 3 +- .../components/TrackLink.tsx | 3 +- .../UserNameAndBadges.tsx | 3 +- .../components/ChatMessagePlaylist.tsx | 8 ++- .../chat-page/components/ChatMessageTrack.tsx | 2 +- .../components/PurchasesTab.tsx | 4 +- .../pay-and-earn-page/components/SalesTab.tsx | 4 +- .../components/TrackNameWithArtwork.tsx | 7 +- .../components/WithdrawalsTab.tsx | 8 ++- .../saved-page/hooks/useCollectionsData.tsx | 5 +- .../DeveloperApps/CreateNewAppPage.tsx | 12 ++-- .../DeleteAppConfirmationPage.tsx | 8 +-- .../DeveloperApps/DeveloperAppListItem.tsx | 2 +- .../DeveloperAppsSettingsModal.tsx | 2 +- .../desktop/DeveloperApps/YourAppsPage.tsx | 3 +- .../components/desktop/DeveloperApps/types.ts | 3 +- .../components/SignUpWithMetaMaskButton.tsx | 3 +- .../sign-up-page/pages/SelectArtistsPage.tsx | 6 +- .../utils/selectArtistsPreviewContext.tsx | 9 +-- .../RemixSettingsField/RemixSettingsField.tsx | 2 +- .../RemixSettingsMenuFields.tsx | 2 +- .../fields/RemixSettingsField/TrackInfo.tsx | 3 +- .../components/FeaturedContent.tsx | 4 +- 34 files changed, 123 insertions(+), 90 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 4c78effe360..727e5ac86dd 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -11,7 +11,8 @@ ".": "./dist/index.js", "./messages": "./src/messages/index.ts", "./hooks": "./src/hooks/index.ts", - "./context": "./src/context/index.ts" + "./context": "./src/context/index.ts", + "./api": "./src/api/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/src/hooks/index.ts b/packages/common/src/hooks/index.ts index e3f2b26d5d6..a3e1a7380e0 100644 --- a/packages/common/src/hooks/index.ts +++ b/packages/common/src/hooks/index.ts @@ -1,4 +1,4 @@ -import '../types/fxa-common-password-list' +import '../types/fxa-common-password-list/index.d.ts' export * from './useBooleanOnce' export * from './useFeatureFlag' export * from './useRemoteVar' diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 7fb96ac3729..2de18085a4a 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,5 +1,5 @@ -// import * as hooks from './hooks' -// console.log('hook exports', hooks) +import * as e from './api' +console.log('exports', e) export * from './api' export * from './audius-query' diff --git a/packages/convert-exports.js b/packages/convert-exports.js index 869e113029e..4db477d7bee 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -5,20 +5,62 @@ var getDirectories = function (callback) { glob('./web/src/**/*', callback) } -const DIRECTORY = 'hooks' +const DIRECTORY = 'api' const EXPORTS = [ - 'TrackPlayback', - 'PayExtraAmountPresetValues', - 'PurchaseableTrackMetadata', - 'USDCPurchaseConfig', - 'PurchasePage', - 'PurchaseContentValues', - 'DownloadButtonConfig', - 'OverrideSetting', - 'BaseUserImageSizeProps Date: Tue, 30 Jan 2024 15:11:41 -0800 Subject: [PATCH 25/64] Add api to mobile --- packages/mobile/babel.config.js | 3 ++- .../components/details-tile/DetailsTileActionButtons.tsx | 8 ++------ .../components/drawers/ReleaseNowConfirmationDrawer.tsx | 3 ++- .../PremiumTrackPurchaseDrawer.tsx | 2 +- .../suggested-tracks/SuggestedCollectionTracks.tsx | 7 ++++--- .../suggested-tracks/components/SuggestedTracks.tsx | 3 ++- .../src/screens/chat-screen/ChatMessagePlaylist.tsx | 6 ++++-- .../mobile/src/screens/chat-screen/ChatMessageTrack.tsx | 4 ++-- .../src/screens/edit-playlist-screen/EditPlaylistForm.tsx | 7 ++----- .../screens/favorites-screen/useCollectionsScreenData.ts | 3 +-- .../screens/reset-password-screen/ResetPasswordScreen.tsx | 3 ++- .../screens/SelectArtistScreen/TopArtistsCardList.tsx | 6 +++++- .../SelectArtistScreen/selectArtistPreviewContext.tsx | 7 ++----- packages/mobile/tsconfig.json | 3 --- 14 files changed, 31 insertions(+), 34 deletions(-) diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js index f8234b28e6d..fc9c4cf448e 100644 --- a/packages/mobile/babel.config.js +++ b/packages/mobile/babel.config.js @@ -11,7 +11,8 @@ module.exports = (api) => { alias: { '@audius/common/messages': '../common/src/messages', '@audius/common/hooks': '../common/src/hooks', - '@audius/common/context': '../common/src/context' + '@audius/common/context': '../common/src/context', + '@audius/common/api': '../common/src/api' } } ] diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index e1d404bc05b..c611fcd9b9f 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -1,10 +1,6 @@ import type { CommonState, ID } from '@audius/common' -import { - FeatureFlags, - cacheCollectionsSelectors, - useGetCurrentUserId, - useGetPlaylistById -} from '@audius/common' +import { FeatureFlags, cacheCollectionsSelectors } from '@audius/common' +import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import { useFeatureFlag } from '@audius/common/hooks' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx b/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx index 15f9657b606..35abcbcbf33 100644 --- a/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx +++ b/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { cacheTracksActions, useGetTrackById } from '@audius/common' +import { cacheTracksActions } from '@audius/common' +import { useGetTrackById } from '@audius/common/api' import moment from 'moment' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx index 247485d5c5b..0537135760d 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx @@ -11,11 +11,11 @@ import { purchaseContentActions, purchaseContentSelectors, statusIsNotFinalized, - useGetTrackById, usePremiumContentPurchaseModal, IntKeys, PurchaseVendor } from '@audius/common' +import { useGetTrackById } from '@audius/common/api' import { useRemoteVar, useUSDCBalance, diff --git a/packages/mobile/src/components/suggested-tracks/SuggestedCollectionTracks.tsx b/packages/mobile/src/components/suggested-tracks/SuggestedCollectionTracks.tsx index 99c9f88babd..67b4f07300a 100644 --- a/packages/mobile/src/components/suggested-tracks/SuggestedCollectionTracks.tsx +++ b/packages/mobile/src/components/suggested-tracks/SuggestedCollectionTracks.tsx @@ -1,10 +1,11 @@ import type { ID } from '@audius/common' import { - useGetCurrentUserId, useGetPlaylistById, useGetSuggestedAlbumTracks, - useGetSuggestedPlaylistTracks -} from '@audius/common' + useGetSuggestedPlaylistTracks, + useGetCurrentUserId +} from '@audius/common/api' +import {} from '@audius/common' import { SuggestedTracks } from './components/SuggestedTracks' diff --git a/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx b/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx index 91e3d3160ff..427a53ad782 100644 --- a/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx +++ b/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx @@ -1,7 +1,8 @@ import { Fragment, useCallback, useEffect, useRef } from 'react' -import type { ID, Track, SuggestedTrack } from '@audius/common' +import type { ID, Track } from '@audius/common' import { SquareSizes, cacheUsersSelectors } from '@audius/common' +import type { SuggestedTrack } from '@audius/common/api' import { Animated, LayoutAnimation, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx index 7ddf5e0b588..8cf3f3ed4cc 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx @@ -9,10 +9,12 @@ import { accountSelectors, getPathFromPlaylistUrl, makeUid, - playerSelectors, + playerSelectors +} from '@audius/common' +import { useGetTracksByIds, useGetPlaylistByPermalink -} from '@audius/common' +} from '@audius/common/api' import { usePlayTrack, usePauseTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx index 75498ce1e66..2bd241261fd 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx @@ -8,9 +8,9 @@ import { QueueSource, accountSelectors, getPathFromTrackUrl, - makeUid, - useGetTrackByPermalink + makeUid } from '@audius/common' +import { useGetTrackByPermalink } from '@audius/common/api' import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx index 93a35622881..904a5f5f13f 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' -import { - deletePlaylistConfirmationModalUIActions, - useGetCurrentUserId, - useGetPlaylistById -} from '@audius/common' +import { deletePlaylistConfirmationModalUIActions } from '@audius/common' import type { EditPlaylistValues } from '@audius/common' +import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import type { FormikProps } from 'formik' import { capitalize } from 'lodash' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts index 94ae667ff96..47fe77e6ca5 100644 --- a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts +++ b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts @@ -8,11 +8,10 @@ import { shallowCompare, Status, useAllPaginatedQuery, - useGetLibraryAlbums, - useGetLibraryPlaylists, savedPageSelectors, filterCollections } from '@audius/common' +import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' import { useProxySelector } from '@audius/common/hooks' import uniq from 'lodash/uniq' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx b/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx index 40fae5bb69f..75c60c009a2 100644 --- a/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx +++ b/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx @@ -1,6 +1,7 @@ import { useCallback, useEffect, useState } from 'react' -import { Status, accountSelectors, useResetPassword } from '@audius/common' +import { Status, accountSelectors } from '@audius/common' +import { useResetPassword } from '@audius/common/api' import AsyncStorage from '@react-native-async-storage/async-storage' import type { NavigationProp, RouteProp } from '@react-navigation/native' import { useNavigation, useRoute } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx index 37d5d88e8c9..b65b49a5370 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx @@ -1,5 +1,9 @@ import type { QueryHookOptions } from '@audius/common' -import { useGetFeaturedArtists, useGetTopArtistsInGenre } from '@audius/common' +import { + useGetTopArtistsInGenre, + useGetFeaturedArtists +} from '@audius/common/api' +import {} from '@audius/common' import { css } from '@emotion/native' import { useIsFocused, type RouteProp } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx index 985d6380540..e58bdc37970 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx @@ -1,11 +1,8 @@ import { createContext, useCallback, useEffect, useMemo, useState } from 'react' import type { ID } from '@audius/common' -import { - encodeHashId, - useGetUserById, - useGetUserTracksByHandle -} from '@audius/common' +import { encodeHashId } from '@audius/common' +import { useGetUserTracksByHandle, useGetUserById } from '@audius/common/api' import { Formik } from 'formik' import TrackPlayer, { RepeatMode, State } from 'react-native-track-player' import { useAsync, useEffectOnce } from 'react-use' diff --git a/packages/mobile/tsconfig.json b/packages/mobile/tsconfig.json index 372976d8c93..361e6a9e0c0 100644 --- a/packages/mobile/tsconfig.json +++ b/packages/mobile/tsconfig.json @@ -21,9 +21,6 @@ "module": "esnext", "paths": { "@audius/harmony-native": ["./src/harmony-native/index.ts"], - "@audius/common/messages": ["../../node_modules/common/src/messages/index.ts"], - "@audius/common/hooks": ["../../node_modules/common/src/hooks/index.ts"], - "@audius/common/context": ["../../node_modules/common/src/context/index.ts"], "~/*": ["../common/src/*"], "app/*": ["./src/*"], // Remove these when no longer dependent on audius-client From 885a17f3c54e8b0ec05f73e28d1eae5f0b3fb0c7 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 15:12:39 -0800 Subject: [PATCH 26/64] Update models in web --- packages/common/package.json | 3 +- packages/common/src/index.ts | 3 +- packages/convert-exports.js | 246 ++++++++++++++---- packages/get-type-exports.js | 4 +- packages/web/src/app/AppErrorBoundary.tsx | 4 +- packages/web/src/app/ThemeProvider.tsx | 3 +- packages/web/src/app/web-player/WebPlayer.jsx | 12 +- .../web/src/common/store/account/sagas.js | 5 +- .../web/src/common/store/analytics/actions.ts | 4 +- .../collections/addTrackToPlaylistSaga.ts | 5 +- .../store/cache/collections/commonSagas.js | 4 +- .../cache/collections/confirmOrderPlaylist.js | 2 +- .../cache/collections/createPlaylistSaga.ts | 16 +- .../utils/addTracksFromCollections.ts | 3 +- .../utils/addUsersFromCollections.ts | 3 +- .../utils/optimisticUpdateCollection.ts | 3 +- .../utils/processAndCacheCollections.ts | 10 +- .../collections/utils/retrieveCollections.ts | 12 +- packages/web/src/common/store/cache/sagas.js | 2 +- .../web/src/common/store/cache/store.test.js | 5 +- .../common/store/cache/tracks/sagaHelpers.ts | 8 +- .../src/common/store/cache/tracks/sagas.js | 5 +- .../tracks/utils/fetchAndProcessRemixes.ts | 4 +- .../tracks/utils/fetchAndProcessStems.ts | 12 +- .../store/cache/tracks/utils/helpers.ts | 4 +- .../tracks/utils/processAndCacheTracks.ts | 10 +- .../store/cache/tracks/utils/reformat.ts | 3 +- .../cache/tracks/utils/retrieveTracks.ts | 12 +- .../src/common/store/cache/users/sagas.d.ts | 3 +- .../web/src/common/store/cache/users/sagas.js | 3 +- .../cache/users/utils/pruneBlobValues.ts | 3 +- .../src/common/store/change-password/sagas.ts | 3 +- .../web/src/common/store/lineup/sagas.d.ts | 8 +- packages/web/src/common/store/lineup/sagas.js | 4 +- .../common/store/notifications/errorSagas.ts | 2 +- .../parseAndProcessNotifications.ts | 4 +- .../web/src/common/store/pages/ai/sagas.ts | 3 +- .../common/store/pages/audio-rewards/sagas.ts | 8 +- .../store/pages/audio-rewards/store.test.ts | 10 +- .../store/pages/audio-transactions/sagas.ts | 2 +- .../store/pages/collection/lineups/sagas.js | 2 +- .../common/store/pages/collection/sagas.js | 2 +- .../store/pages/deactivate-account/sagas.ts | 2 +- .../pages/explore/exploreCollections/sagas.ts | 5 +- .../src/common/store/pages/explore/sagas.ts | 2 +- .../common/store/pages/feed/lineup/sagas.ts | 18 +- .../web/src/common/store/pages/feed/sagas.ts | 3 +- .../store/pages/history/lineups/sagas.js | 2 +- .../lineups/feed/retrieveUserReposts.ts | 8 +- .../store/pages/profile/lineups/feed/sagas.js | 2 +- .../lineups/tracks/retrieveUserTracks.ts | 3 +- .../pages/profile/lineups/tracks/sagas.js | 2 +- .../lineups/tracks/watchUploadTracksSaga.ts | 2 +- .../common/store/pages/remixes-page/sagas.ts | 3 +- .../common/store/pages/saved/lineups/sagas.js | 2 +- .../web/src/common/store/pages/saved/sagas.ts | 10 +- .../src/common/store/pages/settings/sagas.ts | 4 +- .../src/common/store/pages/signon/actions.ts | 3 +- .../src/common/store/pages/signon/sagas.js | 3 +- .../src/common/store/pages/signon/types.ts | 3 +- .../pages/token-dashboard/addWalletToUser.ts | 3 +- .../token-dashboard/associateNewWallet.ts | 3 +- .../pages/token-dashboard/checkIsNewWallet.ts | 3 +- .../pages/token-dashboard/getWalletInfo.ts | 3 +- .../pages/token-dashboard/removeWalletSaga.ts | 3 +- .../store/pages/token-dashboard/sagas.ts | 5 +- .../web/src/common/store/pages/track/sagas.js | 2 +- .../pages/trending-playlists/lineups/sagas.ts | 2 +- .../lineups/trending/retrieveTrending.ts | 5 +- .../pages/trending/lineups/trending/sagas.js | 2 +- packages/web/src/common/store/player/sagas.ts | 2 +- .../common/store/playlist-library/sagas.ts | 10 +- .../playlist-library/watchAddToFolderSaga.ts | 5 +- .../watchReorderLibrarySaga.ts | 3 +- .../profile/fetchProfileCollectionsSaga.ts | 2 +- .../web/src/common/store/profile/sagas.js | 3 +- packages/web/src/common/store/queue/sagas.ts | 16 +- .../web/src/common/store/queue/store.test.js | 2 +- .../src/common/store/recommendation/sagas.ts | 3 +- .../src/common/store/recovery-email/sagas.ts | 3 +- .../src/common/store/remix-settings/sagas.ts | 8 +- .../common/store/saved-collections/sagas.ts | 2 +- .../src/common/store/search-ai-bar/reducer.ts | 3 +- .../src/common/store/search-ai-bar/sagas.ts | 2 +- .../src/common/store/search-ai-bar/types.ts | 3 +- .../src/common/store/search-bar/reducer.ts | 3 +- .../web/src/common/store/search-bar/sagas.ts | 2 +- .../web/src/common/store/search-bar/types.ts | 8 +- .../common/store/smart-collection/sagas.ts | 10 +- .../smart-collection/smartCollections.ts | 7 +- .../common/store/social/collections/sagas.ts | 14 +- .../store/social/collections/store.test.js | 2 +- .../store/social/tracks/recordListen.ts | 2 +- .../src/common/store/social/tracks/sagas.ts | 6 +- .../common/store/social/tracks/store.test.js | 7 +- .../src/common/store/social/users/sagas.ts | 4 +- .../common/store/social/users/store.test.js | 7 +- .../web/src/common/store/tipping/sagas.ts | 22 +- .../src/common/store/upload/sagaHelpers.ts | 10 +- packages/web/src/common/store/upload/sagas.js | 3 +- .../common/store/user-list/favorites/sagas.ts | 5 +- .../common/store/user-list/followers/sagas.ts | 3 +- .../common/store/user-list/following/sagas.ts | 3 +- .../common/store/user-list/mutuals/sagas.ts | 3 +- .../store/user-list/related-artists/sagas.ts | 2 +- .../common/store/user-list/reposts/sagas.ts | 4 +- .../store/user-list/supporting/sagas.ts | 4 +- .../store/user-list/top-supporters/sagas.ts | 3 +- .../web/src/common/store/user-list/utils.ts | 4 +- packages/web/src/common/store/wallet/sagas.ts | 12 +- .../web/src/common/utils/ensureLoggedIn.ts | 3 +- packages/web/src/common/utils/isPreview.ts | 3 +- .../src/components/actions-tab/ActionsTab.jsx | 3 +- .../add-funds-modal/AddFundsModal.tsx | 3 +- .../web/src/components/add-funds/AddFunds.tsx | 4 +- .../desktop/AddToCollectionModal.tsx | 8 +- .../mobile/AddToCollection.tsx | 4 +- .../AiAttributionDropdown.tsx | 8 +- .../AiAttributionModal.tsx | 3 +- .../ai-attribution-modal/SearchBarResult.jsx | 7 +- .../components/app-cta-modal/AppCTAModal.tsx | 4 +- .../AppRedirectListener.tsx | 4 +- .../ArtistRecommendations.tsx | 14 +- .../ArtistRecommendationsPopup.tsx | 3 +- .../web/src/components/artist/ArtistCard.tsx | 8 +- .../src/components/artist/ArtistCardCover.tsx | 4 +- .../web/src/components/artist/ArtistChip.tsx | 4 +- .../components/artist/ArtistChipFollowers.tsx | 3 +- .../artist/ArtistChipSupportFor.tsx | 3 +- .../artist/ArtistChipSupportFrom.tsx | 3 +- .../web/src/components/artist/ArtistCover.tsx | 9 +- .../src/components/artist/ArtistPopover.tsx | 3 +- .../components/artist/ArtistSupporting.tsx | 3 +- .../AudioTransactionsTable.tsx | 2 +- packages/web/src/components/avatar/Avatar.tsx | 3 +- .../src/components/avatar/AvatarLegacy.tsx | 3 +- .../background-animations/MusicConfetti.tsx | 4 +- .../components/banner/CallToActionBanner.tsx | 4 +- .../banner/DirectMessagesBanner.tsx | 3 +- .../components/banner/DownloadAppBanner.tsx | 3 +- .../banner/TermsOfServiceUpdateBanner.tsx | 4 +- .../components/CoinbaseBuyAudioButton.tsx | 4 +- .../components/PurchaseQuote.tsx | 2 +- .../components/SuccessPage.tsx | 2 +- packages/web/src/components/card/UserCard.jsx | 3 +- .../web/src/components/card/desktop/Card.tsx | 11 +- .../card/desktop/CollectionArtCard.tsx | 3 +- .../components/card/desktop/UserArtCard.tsx | 3 +- .../web/src/components/card/mobile/Card.tsx | 9 +- .../change-password/ChangePassword.tsx | 2 +- .../change-password/ChangePasswordModal.tsx | 2 +- .../change-password/ConfirmCredentials.tsx | 7 +- .../components/chat-listener/ChatListener.tsx | 3 +- .../web/src/components/co-sign/CoSign.tsx | 4 +- .../web/src/components/co-sign/HoverInfo.tsx | 3 +- .../CollectiblesPlaylistTable.tsx | 3 +- .../components/CollectibleDetails.tsx | 4 +- .../components/CollectibleDetailsModal.tsx | 4 +- .../components/CollectibleRow.tsx | 7 +- .../components/CollectiblesPage.tsx | 3 +- .../components/collection/desktop/Artwork.tsx | 3 +- .../desktop/CollectionActionButtons.tsx | 3 +- .../collection/desktop/FavoriteButton.tsx | 12 +- .../collection/desktop/OverflowMenuButton.tsx | 4 +- .../collection/desktop/OwnerActionButtons.tsx | 7 +- .../collection/desktop/PublishButton.tsx | 2 +- .../desktop/PublishConfirmationModal.tsx | 2 +- .../collection/desktop/RepostButton.tsx | 6 +- .../collection/desktop/ShareButton.tsx | 8 +- .../desktop/SmartCollectionActionButtons.tsx | 3 +- .../desktop/ViewerActionButtons.tsx | 8 +- .../collection/mobile/CollectionHeader.jsx | 3 +- .../src/components/cover-photo/CoverPhoto.tsx | 3 +- .../create-playlist/PlaylistForm.tsx | 8 +- .../data-entry/AccessAndSaleTriggerLegacy.tsx | 21 +- .../data-entry/ReleaseDateTriggerLegacy.tsx | 3 +- .../web/src/components/dog-ear/DogEar.tsx | 3 +- .../download-buttons/DownloadButtons.tsx | 3 +- .../DownloadMobileAppDrawer.tsx | 4 +- .../src/components/dragndrop/Draggable.tsx | 4 +- .../src/components/dragndrop/Droppable.tsx | 4 +- .../edit-folder-modal/EditFolderModal.tsx | 3 +- .../edit-playlist/mobile/EditPlaylistPage.tsx | 4 +- .../components/edit-track/EditTrackModal.tsx | 10 +- .../src/components/embed-modal/EmbedModal.tsx | 3 +- .../components/embed-modal/store/actions.ts | 3 +- .../components/embed-modal/store/selectors.ts | 7 +- .../src/components/embed-modal/store/types.ts | 3 +- .../first-upload-modal/FirstUploadModal.tsx | 8 +- .../InboxSettingsModal.tsx | 4 +- .../InboxUnavailableModal.tsx | 2 +- packages/web/src/components/lineup/Lineup.tsx | 3 +- .../src/components/lineup/LineupProvider.tsx | 16 +- packages/web/src/components/lineup/hooks.ts | 2 +- .../web/src/components/link/ExternalLink.tsx | 7 +- packages/web/src/components/link/UserLink.tsx | 3 +- .../src/components/menu/CollectionMenu.tsx | 12 +- .../web/src/components/menu/TrackMenu.tsx | 12 +- packages/web/src/components/menu/UserMenu.tsx | 4 +- .../music-confetti/ConnectedMusicConfetti.tsx | 4 +- packages/web/src/components/nav/Navigator.tsx | 3 +- .../src/components/nav/desktop/LeftNav.tsx | 12 +- .../src/components/nav/desktop/NavButton.tsx | 3 +- .../src/components/nav/desktop/NavHeader.tsx | 3 +- .../components/nav/desktop/NavPopupMenu.tsx | 2 +- .../nav/desktop/NowPlayingArtworkTile.tsx | 5 +- .../AudioNftPlaylistNavItem.tsx | 3 +- .../PlaylistLibrary/CollectionNavItem.tsx | 12 +- .../CreatePlaylistLibraryItemButton.tsx | 2 +- .../DeleteCollectionConfirmationModal.tsx | 2 +- .../DeleteFolderConfirmationModal.tsx | 2 +- .../PlaylistLibrary/EmptyLibraryNavLink.tsx | 3 +- .../ExplorePlaylistNavItem.tsx | 3 +- .../PlaylistLibrary/PlaylistFolderNavItem.tsx | 10 +- .../PlaylistLibrary/PlaylistLibrary.tsx | 7 +- .../PlaylistLibraryNavItem.tsx | 6 +- .../useAddAudioNftPlaylistToLibrary.ts | 3 +- .../useSanitizePlaylistLibrary.ts | 7 +- .../components/nav/mobile/ConnectedNavBar.tsx | 3 +- .../web/src/components/nav/mobile/NavBar.tsx | 3 +- .../web/src/components/nav/mobile/SignOut.tsx | 3 +- .../AddTrackToPlaylistNotification.tsx | 3 +- .../Notification/AnnouncementNotification.tsx | 6 +- .../ChallengeRewardNotification.tsx | 2 +- .../Notification/MilestoneNotification.tsx | 3 +- .../Notification/RemixCosignNotification.tsx | 2 +- .../Notification/RemixCreateNotification.tsx | 2 +- .../SupporterDethronedNotification.tsx | 2 +- .../Notification/TastemakerNotification.tsx | 2 +- .../Notification/TipReactionNotification.tsx | 2 +- .../Notification/TipReceivedNotification.tsx | 2 +- .../Notification/TipSentNotification.tsx | 7 +- .../Notification/TopSupporterNotification.tsx | 2 +- .../TopSupportingNotification.tsx | 2 +- .../TrendingPlaylistNotification.tsx | 2 +- .../TrendingTrackNotification.tsx | 2 +- .../TrendingUndergroundNotification.tsx | 2 +- .../USDCPurchaseBuyerNotification.tsx | 2 +- .../USDCPurchaseSellerNotification.tsx | 2 +- .../UserSubscriptionNotification.tsx | 2 +- .../Notification/components/EntityLink.tsx | 3 +- .../components/ProfilePicture.tsx | 4 +- .../Notification/components/TrackContent.tsx | 3 +- .../Notification/components/UserNameLink.tsx | 3 +- .../components/UserProfilePictureList.tsx | 3 +- .../Notification/useGoToProfile.ts | 3 +- .../notification/NotificationPage.tsx | 2 +- .../notification/NotificationPanel.tsx | 2 +- .../src/components/now-playing/NowPlaying.tsx | 20 +- .../password-reset/PasswordResetModal.tsx | 3 +- .../password-reset/store/reducer.ts | 3 +- .../components/password-reset/store/types.ts | 3 +- .../payment-method/PaymentMethod.tsx | 4 +- .../PinTrackConfirmation.tsx | 3 +- .../components/play-bar/desktop/PlayBar.jsx | 14 +- .../desktop/components/PlayingTrackInfo.tsx | 10 +- .../desktop/components/SocialActions.tsx | 7 +- .../components/play-bar/mobile/PlayBar.tsx | 12 +- .../PremiumContentPurchaseModal.tsx | 5 +- .../components/PayToUnlockInfo.tsx | 4 +- .../components/PurchaseContentFormFields.tsx | 9 +- .../components/PurchaseContentFormFooter.tsx | 2 +- .../hooks/usePurchaseSummaryValues.ts | 3 +- .../components/profile-info/ProfileInfo.tsx | 3 +- .../profile-picture/ProfilePicture.jsx | 4 +- .../profile-progress/hooks/index.js | 4 +- .../related-artists/RelatedArtists.tsx | 4 +- .../remix-card/ConnectedRemixCard.tsx | 8 +- .../src/components/remix-card/RemixCard.tsx | 3 +- .../ConnectedRemixSettingsModal.tsx | 6 +- .../RemixSettingsModal.tsx | 12 +- .../search-bar/ConnectedSearchBar.jsx | 3 +- .../src/components/search-bar/SearchBar.tsx | 4 +- .../search-users-modal/SearchUsersModal.tsx | 6 +- .../web/src/components/search/SearchBar.jsx | 4 +- .../src/components/search/SearchBarResult.jsx | 3 +- .../web/src/components/search/SearchTag.tsx | 4 +- .../src/components/share-modal/ShareModal.tsx | 3 +- .../web/src/components/share-modal/utils.ts | 3 +- .../store/sagas.ts | 2 +- .../components/social-proof/SocialProof.tsx | 3 +- .../source-files-modal/SourceFilesModal.tsx | 4 +- .../src/components/stat-banner/StatBanner.tsx | 3 +- packages/web/src/components/stats/Stats.tsx | 3 +- .../SuggestedCollectionTracks.tsx | 3 +- .../components/SuggestedTracks.tsx | 3 +- packages/web/src/components/table/Table.tsx | 4 +- packages/web/src/components/tile/Tile.tsx | 4 +- .../tipping/feed-tip-tile/FeedTipTile.tsx | 3 +- .../tipping/support/SupportingList.tsx | 2 +- .../tipping/support/SupportingTile.tsx | 10 +- .../tipping/support/TopSupporters.tsx | 3 +- .../components/tipping/tip-audio/SendTip.tsx | 5 +- .../components/tipping/tip-audio/TipSent.tsx | 2 +- .../ConnectedMobileOverflowModal.tsx | 12 +- .../src/components/track/AiTrackSection.tsx | 8 +- packages/web/src/components/track/Artwork.tsx | 4 +- .../web/src/components/track/CardTitle.tsx | 9 +- .../web/src/components/track/DownloadRow.tsx | 9 +- .../src/components/track/DownloadSection.tsx | 6 +- .../components/track/DynamicTrackArtwork.tsx | 3 +- .../src/components/track/EditTrackModal.jsx | 3 +- .../components/track/GatedConditionsPill.tsx | 4 +- .../components/track/GatedContentLabel.tsx | 8 +- .../components/track/GatedTrackSection.tsx | 24 +- .../web/src/components/track/GiantArtwork.tsx | 3 +- .../src/components/track/GiantTrackTile.tsx | 14 +- .../track/GiantTrackTileProgressInfo.tsx | 2 +- .../track/LockedTrackDetailsTile.tsx | 8 +- .../src/components/track/PlayPauseButton.tsx | 2 +- .../components/track/desktop/BottomRow.tsx | 9 +- .../track/desktop/ConnectedPlaylistTile.tsx | 18 +- .../track/desktop/ConnectedTrackTile.tsx | 12 +- .../track/desktop/TrackListItem.tsx | 9 +- .../components/track/desktop/TrackTile.tsx | 5 +- .../track/desktop/stats/ProfileImage.tsx | 3 +- .../components/track/desktop/stats/Stats.tsx | 4 +- .../track/desktop/stats/StatsText.tsx | 3 +- packages/web/src/components/track/helpers.ts | 3 +- .../components/track/mobile/BottomButtons.tsx | 8 +- .../track/mobile/ConnectedPlaylistTile.tsx | 18 +- .../track/mobile/ConnectedTrackListItem.tsx | 4 +- .../track/mobile/ConnectedTrackTile.tsx | 12 +- .../components/track/mobile/PlaylistTile.tsx | 9 +- .../src/components/track/mobile/TrackList.tsx | 4 +- .../components/track/mobile/TrackListItem.tsx | 4 +- .../src/components/track/mobile/TrackTile.tsx | 12 +- .../components/track/mobile/TrackTileArt.tsx | 4 +- packages/web/src/components/track/types.ts | 13 +- .../components/tracks-table/TracksTable.tsx | 3 +- .../TransactionDetailsModal.tsx | 2 +- .../components/TransactionDetailsContent.tsx | 3 +- .../TrendingGenreSelectionPage.tsx | 2 +- .../UnfollowConfirmationModal.tsx | 3 +- .../components/UnfollowConfirmationModal.tsx | 3 +- .../store/actions.ts | 3 +- .../store/types.ts | 3 +- .../src/components/upload/TrackPreviewNew.tsx | 7 +- .../web/src/components/upload/UploadChip.tsx | 8 +- .../usdc-balance-pill/USDCBalancePill.tsx | 3 +- .../USDCManualTransfer.tsx | 2 +- .../components/TransactionSummary.tsx | 3 +- .../components/types.ts | 3 +- .../user-badges/FollowsYouBadge.tsx | 3 +- .../user-badges/ProfilePageBadge.tsx | 3 +- .../src/components/user-badges/UserBadges.tsx | 3 +- .../components/UserListModal.tsx | 4 +- .../web/src/components/user-list/UserList.tsx | 4 +- .../user-list/components/UserList.tsx | 5 +- .../UserNameAndBadges.tsx | 3 +- .../components/welcome-modal/WelcomeModal.tsx | 3 +- .../withdraw-usdc-modal/WithdrawUSDCModal.tsx | 10 +- .../components/ConfirmTransferDetails.tsx | 2 +- .../components/EnterTransferDetails.tsx | 3 +- .../components/ErrorPage.tsx | 2 +- .../components/TransferInProgress.tsx | 2 +- .../components/TransferSuccessful.tsx | 4 +- .../web/src/hooks/useCollectionCoverArt.ts | 3 +- packages/web/src/hooks/useCoverPhoto.ts | 4 +- .../src/hooks/useErrorPageOnFailedStatus.ts | 4 +- packages/web/src/hooks/useImageSize.test.tsx | 7 +- packages/web/src/hooks/useRequiresAccount.ts | 3 +- packages/web/src/hooks/useTikTokAuth.ts | 3 +- packages/web/src/hooks/useTrackCoverArt.ts | 6 +- .../web/src/hooks/useUserProfilePicture.ts | 3 +- .../AiPageProvider.tsx | 2 +- .../components/desktop/AiPage.tsx | 3 +- .../components/mobile/AiPage.tsx | 4 +- .../ChallengeRewardsTile.tsx | 12 +- .../src/pages/audio-rewards-page/Tiers.tsx | 2 +- .../TrendingRewardsTile.tsx | 5 +- .../pages/audio-rewards-page/WalletModal.tsx | 5 +- .../components/DashboardTokenValueSlider.tsx | 3 +- .../components/DisplayAudio.tsx | 3 +- .../components/ExplainerTile.tsx | 4 +- .../components/ReceiveBody.tsx | 7 +- .../components/SendInputBody.tsx | 16 +- .../components/SendInputConfirmation.tsx | 4 +- .../components/SendInputSuccess.tsx | 3 +- .../components/SendingModalBody.tsx | 3 +- .../components/TokenHoverTooltip.tsx | 3 +- .../components/WalletActionsTile.tsx | 2 +- .../components/WalletManagementTile.tsx | 3 +- .../components/WalletsTable.tsx | 3 +- .../components/modals/AudioBreakdownModal.tsx | 7 +- .../AudioMatchingRewardsModalContent.tsx | 3 +- .../components/modals/TrendingRewards.tsx | 2 +- .../src/pages/audio-rewards-page/config.tsx | 8 +- .../AudioTransactionsPage.tsx | 4 +- .../components/BlockUserConfirmationModal.tsx | 3 +- .../pages/chat-page/components/ChatHeader.tsx | 3 +- .../pages/chat-page/components/ChatList.tsx | 3 +- .../chat-page/components/ChatMessageList.tsx | 2 +- .../components/ChatMessageListItem.tsx | 5 +- .../components/ChatMessagePlaylist.tsx | 8 +- .../chat-page/components/ChatMessageTrack.tsx | 16 +- .../pages/chat-page/components/ChatUser.tsx | 4 +- .../chat-page/components/CreateChatModal.tsx | 2 +- .../components/CreateChatUserResult.tsx | 4 +- .../components/InboxUnavailableMessage.tsx | 3 +- .../UnblockUserConfirmationModal.tsx | 3 +- .../web/src/pages/check-page/CheckPage.tsx | 3 +- .../CollectiblesPlaylistPageProvider.tsx | 18 +- .../pages/collection-page/CollectionPage.tsx | 3 +- .../CollectionPageProvider.tsx | 30 ++- .../components/desktop/CollectionPage.tsx | 16 +- .../components/mobile/CollectionPage.tsx | 16 +- .../src/pages/collection-page/store/utils.ts | 3 +- .../pages/dashboard-page/DashboardPage.tsx | 3 +- .../dashboard-page/components/ArtistCard.tsx | 3 +- .../components/TotalPlaysChart.jsx | 3 +- .../components/TracksTableContainer.tsx | 9 +- .../src/pages/dashboard-page/store/sagas.ts | 6 +- .../src/pages/dashboard-page/store/slice.ts | 3 +- .../src/pages/dashboard-page/store/types.ts | 3 +- .../DeactivateAccountPage.tsx | 5 +- .../src/pages/deleted-page/DeletedPage.tsx | 3 +- .../deleted-page/DeletedPageProvider.tsx | 3 +- .../components/desktop/DeletedPage.tsx | 10 +- .../components/mobile/DeletedPage.tsx | 10 +- .../store/lineups/more-by/reducer.ts | 8 +- .../ExploreCollectionsPageProvider.tsx | 3 +- .../components/desktop/CollectionsPage.tsx | 4 +- .../components/desktop/ExplorePage.tsx | 9 +- .../components/mobile/CollectionsPage.tsx | 4 +- .../components/mobile/ExplorePage.tsx | 12 +- .../src/pages/feed-page/FeedPageProvider.jsx | 2 +- .../components/desktop/FeedFilters.tsx | 3 +- .../components/desktop/FeedPageContent.tsx | 3 +- .../components/mobile/FeedFilterButton.tsx | 3 +- .../components/mobile/FeedFilterDrawer.tsx | 4 +- .../components/mobile/FeedPageContent.tsx | 7 +- packages/web/src/pages/feed-page/types.ts | 3 +- .../history-page/HistoryPageProvider.tsx | 20 +- .../components/desktop/HistoryPage.tsx | 4 +- .../components/mobile/HistoryPage.tsx | 4 +- .../src/pages/not-found-page/NotFoundPage.tsx | 3 +- .../pages/oauth-login-page/OAuthLoginPage.tsx | 8 +- .../web/src/pages/oauth-login-page/hooks.ts | 8 +- .../web/src/pages/oauth-login-page/utils.ts | 9 +- .../components/PurchasesTab.tsx | 10 +- .../components/PurchasesTable.tsx | 4 +- .../pay-and-earn-page/components/SalesTab.tsx | 10 +- .../components/SalesTable.tsx | 4 +- .../components/TrackNameWithArtwork.tsx | 3 +- .../pay-and-earn-page/components/USDCCard.tsx | 6 +- .../components/WithdrawalsTab.tsx | 14 +- .../components/WithdrawalsTable.tsx | 6 +- .../web/src/pages/pay-and-earn-page/types.ts | 6 +- .../profile-page/ProfilePageProvider.tsx | 20 +- .../components/desktop/ProfileBio.tsx | 4 +- .../components/desktop/ProfileLeftNav.tsx | 3 +- .../components/desktop/ProfilePage.tsx | 20 +- .../components/desktop/ProfileTopTags.tsx | 7 +- .../components/desktop/ProfileWrapping.tsx | 3 +- .../components/mobile/ProfileHeader.tsx | 14 +- .../components/mobile/ProfilePage.tsx | 18 +- .../components/mobile/ShareUserButton.tsx | 3 +- .../remixes-page/RemixesPageProvider.tsx | 2 +- .../components/desktop/RemixesPage.tsx | 3 +- .../components/mobile/RemixesPage.tsx | 3 +- .../pages/requires-update/RequiresUpdate.tsx | 3 +- .../pages/saved-page/SavedPageProvider.tsx | 16 +- .../components/desktop/AlbumsTabPage.tsx | 2 +- .../components/desktop/CollectionCard.tsx | 2 +- .../components/desktop/PlaylistsTabPage.tsx | 8 +- .../components/desktop/SavedPage.tsx | 9 +- .../components/mobile/NewPlaylistButton.tsx | 7 +- .../components/mobile/SavedPage.tsx | 14 +- .../saved-page/hooks/useCollectionsData.tsx | 2 +- .../pages/search-page/SearchPageProvider.jsx | 2 +- .../components/desktop/SearchPageContent.jsx | 2 +- .../components/mobile/SearchPageContent.tsx | 14 +- .../settings-page/SettingsPageProvider.tsx | 3 +- .../DeveloperApps/CreateNewAppPage.tsx | 3 +- .../DeleteAppConfirmationPage.tsx | 3 +- .../desktop/DeveloperApps/YourAppsPage.tsx | 3 +- .../components/desktop/SettingsPage.tsx | 5 +- .../components/desktop/VerificationModal.tsx | 12 +- .../components/mobile/AccountSettingsPage.tsx | 4 +- .../components/mobile/ChangePasswordPage.tsx | 2 +- .../components/mobile/SettingsPage.tsx | 10 +- .../components/mobile/VerificationPage.tsx | 12 +- .../src/pages/settings-page/store/sagas.ts | 2 +- .../web/src/pages/sign-on/SignOnProvider.tsx | 4 +- .../sign-on/components/desktop/FollowPage.tsx | 4 +- .../sign-on/components/desktop/SignOnPage.tsx | 4 +- .../sign-on/components/mobile/FollowPage.tsx | 4 +- .../sign-on/components/mobile/SignOnPage.tsx | 3 +- .../sign-up-page/components/AccountHeader.tsx | 3 +- .../components/CoverPhotoBanner.tsx | 3 +- .../components/FollowArtistCard.tsx | 3 +- .../sign-up-page/hooks/socialMediaLogin.ts | 2 +- .../hooks/useSocialMediaLoader.ts | 4 +- .../sign-up-page/pages/FinishProfilePage.tsx | 7 +- .../sign-up-page/pages/SelectArtistsPage.tsx | 2 +- .../sign-up-page/pages/SelectGenresPage.tsx | 8 +- .../utils/selectArtistsPreviewContext.tsx | 3 +- .../smart-collection/SmartCollectionPage.tsx | 2 +- .../pages/track-page/TrackPageProvider.tsx | 24 +- .../track-page/components/desktop/Remixes.tsx | 3 +- .../components/desktop/TrackPage.tsx | 10 +- .../track-page/components/mobile/Remixes.tsx | 3 +- .../components/mobile/TrackHeader.tsx | 20 +- .../components/mobile/TrackPage.tsx | 5 +- packages/web/src/pages/track-page/utils.ts | 3 +- .../trending-page/TrendingPageProvider.jsx | 3 +- .../desktop/TrendingPageContent.tsx | 4 +- .../components/mobile/TrendingPageContent.tsx | 3 +- packages/web/src/pages/trending-page/types.ts | 3 +- .../upload-page/components/ShareBanner.tsx | 12 +- .../upload-page/fields/AccessAndSaleField.tsx | 24 +- .../RemixSettingsField/RemixSettingsField.tsx | 10 +- .../RemixSettingsMenuFields.tsx | 11 +- .../fields/RemixSettingsField/TrackInfo.tsx | 3 +- .../upload-page/fields/SourceFilesField.tsx | 8 +- .../upload-page/fields/SourceFilesView.tsx | 4 +- .../CollectibleGatedFields.tsx | 4 +- .../CollectibleGatedRadioField.tsx | 7 +- .../UsdcPurchaseGatedRadioField.tsx | 10 +- .../pages/upload-page/pages/FinishPage.tsx | 2 +- .../pages/upload-page/store/utils/stems.ts | 9 +- packages/web/src/pages/upload-page/types.ts | 3 +- .../pages/visualizer/VisualizerProvider.tsx | 9 +- .../pages/download-page/DownloadPage.tsx | 4 +- .../components/FeaturedContent.tsx | 8 +- .../web/src/services/analytics/amplitude.ts | 3 +- packages/web/src/services/analytics/index.ts | 3 +- .../services/download-app/DownloadApp.test.ts | 3 +- .../src/services/download-app/DownloadApp.ts | 3 +- .../remote-config/remote-config-instance.ts | 3 +- .../web/src/services/serviceMonitoring.ts | 8 +- packages/web/src/services/solana/solana.ts | 3 +- packages/web/src/services/webVitals.ts | 3 +- packages/web/src/ssr/+onRenderHtml.tsx | 3 +- packages/web/src/ssr/SsrContext.tsx | 3 +- packages/web/src/store/analytics/sagas.ts | 3 +- .../store/application/ui/buy-audio/sagas.ts | 6 +- .../ui/setAsArtistPickConfirmation/actions.ts | 3 +- .../ui/setAsArtistPickConfirmation/types.ts | 3 +- .../store/application/ui/stemsUpload/sagas.ts | 4 +- .../src/store/application/ui/theme/sagas.ts | 3 +- .../application/ui/userListModal/sagas.ts | 2 +- .../application/ui/userListModal/slice.ts | 3 +- .../application/ui/withdraw-usdc/sagas.ts | 16 +- packages/web/src/store/configureStore.ts | 3 +- packages/web/src/store/dragndrop/slice.ts | 3 +- packages/web/src/store/errors/actions.ts | 7 +- packages/web/src/store/errors/reducers.ts | 3 +- .../web/src/store/errors/reportToSentry.ts | 3 +- packages/web/src/store/lineup/store.test.js | 2 +- packages/web/src/store/reducers.ts | 4 +- packages/web/src/store/sign-out/sagas.ts | 2 +- .../token-dashboard/connectNewWalletSaga.ts | 3 +- .../store/token-dashboard/disconnectWallet.ts | 3 +- .../establishWalletConnection.ts | 2 +- .../store/token-dashboard/getWalletAddress.ts | 3 +- .../src/store/token-dashboard/signMessage.ts | 2 +- .../web/src/store/token-dashboard/types.ts | 3 +- packages/web/src/utils/appLinks.ts | 3 +- packages/web/src/utils/clientUtil.ts | 3 +- packages/web/src/utils/errorSagas.ts | 3 +- packages/web/src/utils/route.ts | 3 +- .../src/utils/route/collectionRouteParser.ts | 3 +- .../web/src/utils/route/trackRouteParser.ts | 3 +- .../web/src/utils/route/userRouteParser.ts | 3 +- packages/web/src/utils/theme/theme.ts | 3 +- 567 files changed, 1694 insertions(+), 1490 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 727e5ac86dd..2181a83ebd6 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -12,7 +12,8 @@ "./messages": "./src/messages/index.ts", "./hooks": "./src/hooks/index.ts", "./context": "./src/context/index.ts", - "./api": "./src/api/index.ts" + "./api": "./src/api/index.ts", + "./models": "./src/models/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 2de18085a4a..3720c31a78e 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,7 +1,6 @@ -import * as e from './api' +import * as e from './models' console.log('exports', e) -export * from './api' export * from './audius-query' export * from './models' export * from './utils' diff --git a/packages/convert-exports.js b/packages/convert-exports.js index 4db477d7bee..19ec029543f 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -5,62 +5,198 @@ var getDirectories = function (callback) { glob('./web/src/**/*', callback) } -const DIRECTORY = 'api' +const DIRECTORY = 'models' const EXPORTS = [ - 'useGetRelatedArtists', - 'relatedArtistsApiReducer', - 'useGetTrackById', - 'useGetTrackByPermalink', - 'useGetTracksByIds', - 'useGetUserTracksByHandle', - 'trackApiFetch', - 'trackApiReducer', - 'useGetPlaylistByPermalink', - 'useGetPlaylistById', - 'collectionApiReducer', - 'useGetUserById', - 'useGetUsersByIds', - 'useGetUserByHandle', - 'useGetTracksByUser', - 'useGetUSDCTransactions', - 'useGetUSDCTransactionsCount', - 'userApiReducer', - 'userApiFetch', - 'userApiActions', - 'DEVELOPER_APP_DESCRIPTION_MAX_LENGTH', - 'DEVELOPER_APP_NAME_MAX_LENGTH', - 'developerAppSchema', - 'useGetDeveloperApps', - 'useAddDeveloperApp', - 'useDeleteDeveloperApp', - 'developerAppsApiReducer', - 'useGetSuggestedAlbumTracks', - 'useGetSuggestedPlaylistTracks', - 'useGetTrending', - 'trendingApiReducer', - 'libraryApi', - 'useGetLibraryAlbums', - 'useGetLibraryPlaylists', - 'libraryApiReducer', - 'useGetPurchases', - 'useGetPurchasesCount', - 'useGetSales', - 'useGetSalesCount', - 'purchasesApiReducer', - 'purchasesApiActions', - 'HashId', - 'Id', - 'useGetTopArtistsInGenre', - 'useGetFeaturedArtists', - 'topArtistsApiReducer', - 'useGetCurrentUserId', - 'useResetPassword', - 'accountApiReducer', - 'useIsEmailInUse', - 'signUpReducer', - 'signUpFetch', - 'DeveloperApp', - 'SuggestedTrack' + 'Name', + 'ShareSource', + 'RepostSource', + 'FavoriteSource', + 'FollowSource', + 'CreatePlaylistSource', + 'PlaybackSource', + 'ModalSource', + 'ChallengeName', + 'FailureReason', + 'Chain', + 'Client', + 'CollectibleMediaType', + 'Variant', + 'DogEarType', + 'DownloadQuality', + 'ErrorLevel', + 'FavoriteType', + 'FeedFilter', + 'PlayableType', + 'DefaultSizes', + 'SquareSizes', + 'WidthSizes', + 'Kind', + 'OS', + 'MobileOS', + 'PurchaseMethod', + 'PurchaseVendor', + 'SmartCollectionVariant', + 'Status', + 'statusIsNotFinalized', + 'combineStatuses', + 'StemCategory', + 'stemCategoryFriendlyNames', + 'Theme', + 'SystemAppearance', + 'TimeRange', + 'GatedContentType', + 'TrackAccessType', + 'isContentCollectibleGated', + 'isContentFollowGated', + 'isContentTipGated', + 'isContentUSDCPurchaseGated', + 'TrackAvailabilityType', + 'USDCTransactionType', + 'USDCTransactionMethod', + 'USDCContentPurchaseType', + 'AnalyticsEvent', + 'CreateAccountOpen', + 'ShareToTwitter', + 'TipSource', + 'WithdrawUSDCEventFields', + 'WithdrawUSDCTransferEventFields', + 'WithdrawUSDCModalOpened', + 'WithdrawUSDCAddressPasted', + 'WithdrawUSDCFormError', + 'WithdrawUSDCRequested', + 'WithdrawUSDCSuccess', + 'WithdrawUSDCFailure', + 'WithdrawUSDCHelpLinkClicked', + 'WithdrawUSDCTxLinkClicked', + 'StripeEventFields', + 'BaseAnalyticsEvent', + 'AllTrackingEvents', + 'UserChallenge', + 'Specifier', + 'ChallengeRewardID', + 'FlowUIOpenEvent', + 'FlowUICloseEvent', + 'FlowErrorEvent', + 'FlowSessionID', + 'FlowSessionCreateEvent', + 'FlowSessionResumeEvent', + 'FlowSessionPassEvent', + 'FlowSessionFailEvent', + 'FlowSessionEvent', + 'UserChallengeState', + 'SpecifierWithAmount', + 'OptimisticUserChallenge', + 'BadgeTier', + 'Cacheable', + 'Cache', + 'ChatMessageWithExtras', + 'CollectiblesMetadata', + 'Collectible', + 'CollectibleState', + 'PlaylistTrackId', + 'CollectionMetadata', + 'CollectionDownloadReason', + 'OfflineCollectionMetadata', + 'ComputedCollectionProperties', + 'Collection', + 'UserCollectionMetadata', + 'UserCollection', + 'SmartCollection', + 'CollectionImage', + 'Color', + 'AdditionalErrorReportInfo', + 'ReportToSentryArgs', + 'Favorite', + 'ID', + 'UID', + 'CID', + 'URL', + 'ImageSizesObject', + 'CoverArtSizes', + 'ProfilePictureSizes', + 'CoverPhotoSizes', + 'Lineup', + 'LineupStateTrack', + 'Order', + 'LineupState', + 'OnChain', + 'OpenSeaAsset', + 'OpenSeaAssetExtended', + 'OpenSeaEvent', + 'OpenSeaEventExtended', + 'Playable', + 'PlaylistLibraryID', + 'PlaylistLibraryKind', + 'PlaylistIdentifier', + 'ExplorePlaylistIdentifier', + 'AudioNftPlaylistIdentifier', + 'PlaylistLibraryIdentifier', + 'PlaylistLibraryFolder', + 'PlaylistLibraryItem', + 'PlaylistLibrary', + 'Repost', + 'SearchUser', + 'SearchTrack', + 'SearchPlaylist', + 'ServiceMonitorType', + 'MonitorPayload', + 'SsrPageProps', + 'StemUpload', + 'StemUploadWithFile', + 'Timestamped', + 'Supporter', + 'Supporting', + 'UserTip', + 'LastDismissedTip', + 'TrackSegment', + 'Followee', + 'Download', + 'FieldVisibility', + 'Remix', + 'RemixOf', + 'TokenStandard', + 'AccessConditionsEthNFTCollection', + 'AccessConditionsSolNFTCollection', + 'CollectibleGatedConditions', + 'FollowGatedConditions', + 'TipGatedConditions', + 'USDCPurchaseConditions', + 'AccessConditions', + 'AccessPermissions', + 'AccessSignature', + 'EthCollectionMap', + 'SolCollectionMap', + 'GatedTrackStatus', + 'TrackMetadata', + 'DownloadReason', + 'OfflineTrackMetadata', + 'Stem', + 'ComputedTrackProperties', + 'Track', + 'UserTrackMetadata', + 'UserTrack', + 'LineupTrack', + 'StemTrackMetadata', + 'StemTrack', + 'StemUserTrack', + 'RemixTrack', + 'RemixUserTrack', + 'TrackImage', + 'USDCPurchaseDetails', + 'USDCTransactionDetails', + 'UserMetadata', + 'ComputedUserProperties', + 'User', + 'UserImage', + 'UserMultihash', + 'StringWei', + 'StringAudio', + 'StringUSDC', + 'BNWei', + 'BNAudio', + 'BNUSDC', + 'WalletAddress', + 'SolanaWalletAddress' ] getDirectories(async function (err, res) { diff --git a/packages/get-type-exports.js b/packages/get-type-exports.js index eee0f63a0c0..f7063dc6316 100644 --- a/packages/get-type-exports.js +++ b/packages/get-type-exports.js @@ -2,7 +2,7 @@ const glob = require('glob') const fs = require('fs') var getDirectories = function (callback) { - glob('./common/dist/api/**/*', callback) + glob('./common/dist/models/**/*', callback) } getDirectories(async function (err, res) { @@ -21,5 +21,5 @@ getDirectories(async function (err, res) { } }) - console.log(exports) + console.dir(exports, { maxArrayLength: null }) }) diff --git a/packages/web/src/app/AppErrorBoundary.tsx b/packages/web/src/app/AppErrorBoundary.tsx index ad4dca3b9a2..3a21eded45c 100644 --- a/packages/web/src/app/AppErrorBoundary.tsx +++ b/packages/web/src/app/AppErrorBoundary.tsx @@ -1,6 +1,8 @@ import { ReactNode, useCallback } from 'react' -import { ErrorLevel } from '@audius/common' +import { ErrorLevel } from '@audius/common/models' + +import {} from '@audius/common' import { ErrorBoundary, ErrorBoundaryProps } from 'react-error-boundary' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/app/ThemeProvider.tsx b/packages/web/src/app/ThemeProvider.tsx index a9883689325..85432ab6d1b 100644 --- a/packages/web/src/app/ThemeProvider.tsx +++ b/packages/web/src/app/ThemeProvider.tsx @@ -1,6 +1,7 @@ import { ReactNode } from 'react' -import { SystemAppearance, Theme, themeSelectors } from '@audius/common' +import { themeSelectors } from '@audius/common' +import { Theme, SystemAppearance } from '@audius/common/models' import { ThemeProvider as HarmonyThemeProvider } from '@audius/harmony' import { AppState } from 'store/types' diff --git a/packages/web/src/app/web-player/WebPlayer.jsx b/packages/web/src/app/web-player/WebPlayer.jsx index 4689ae60eec..cafcfaa9104 100644 --- a/packages/web/src/app/web-player/WebPlayer.jsx +++ b/packages/web/src/app/web-player/WebPlayer.jsx @@ -1,11 +1,6 @@ import { lazy, Component, Suspense } from 'react' import { - Client, - Name, - SmartCollectionVariant, - Status, - Theme, StringKeys, accountSelectors, ExploreCollectionsVariant, @@ -14,6 +9,13 @@ import { UploadType, FeatureFlags } from '@audius/common' +import { + Name, + Client, + SmartCollectionVariant, + Status, + Theme +} from '@audius/common/models' import cn from 'classnames' import { connect } from 'react-redux' import { matchPath } from 'react-router' diff --git a/packages/web/src/common/store/account/sagas.js b/packages/web/src/common/store/account/sagas.js index fe49f92affb..5c9351522fa 100644 --- a/packages/web/src/common/store/account/sagas.js +++ b/packages/web/src/common/store/account/sagas.js @@ -1,5 +1,4 @@ import { - Kind, accountSelectors, cacheActions, profilePageActions, @@ -9,9 +8,9 @@ import { createUserBankIfNeeded, getContext, FeatureFlags, - chatActions, - ErrorLevel + chatActions } from '@audius/common' +import { ErrorLevel, Kind } from '@audius/common/models' import { call, put, fork, select, takeEvery } from 'redux-saga/effects' import { identify } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/analytics/actions.ts b/packages/web/src/common/store/analytics/actions.ts index c005392865a..b114b486d16 100644 --- a/packages/web/src/common/store/analytics/actions.ts +++ b/packages/web/src/common/store/analytics/actions.ts @@ -1,6 +1,8 @@ import { useCallback } from 'react' -import { Name, AllTrackingEvents } from '@audius/common' +import { Name, AllTrackingEvents } from '@audius/common/models' + +import {} from '@audius/common' import { useDispatch as useDispatchRedux } from 'react-redux' /** UI EVENTS */ diff --git a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts index f60e4c91644..d8892eeef72 100644 --- a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts @@ -1,6 +1,4 @@ import { - Name, - Kind, makeKindId, makeUid, cacheCollectionsSelectors, @@ -9,9 +7,7 @@ import { cacheActions, getContext, audioRewardsPageActions, - Collection, Nullable, - ID, cacheTracksSelectors, updatePlaylistArtwork, confirmerActions, @@ -19,6 +15,7 @@ import { reformatCollection, toastActions } from '@audius/common' +import { Name, Kind, Collection, ID } from '@audius/common/models' import { call, put, select, takeEvery } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/cache/collections/commonSagas.js b/packages/web/src/common/store/cache/collections/commonSagas.js index 3d229504759..db8747b8b60 100644 --- a/packages/web/src/common/store/cache/collections/commonSagas.js +++ b/packages/web/src/common/store/cache/collections/commonSagas.js @@ -1,7 +1,4 @@ import { - Name, - DefaultSizes, - Kind, makeKindId, squashNewLines, accountSelectors, @@ -22,6 +19,7 @@ import { reformatCollection, savedPageActions } from '@audius/common' +import { Name, DefaultSizes, Kind } from '@audius/common/models' import { all, call, diff --git a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js index fa2864d3952..efa6ccd4cea 100644 --- a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js +++ b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js @@ -1,5 +1,4 @@ import { - Kind, makeKindId, cacheCollectionsActions as collectionActions, PlaylistOperations, @@ -8,6 +7,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common' +import { Kind } from '@audius/common/models' import { call, put } from 'redux-saga/effects' import { fixInvalidTracksInPlaylist } from './fixInvalidTracksInPlaylist' diff --git a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts index b3c0b754d17..073143ac9b9 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts @@ -1,13 +1,6 @@ import { - Collection, - CollectionMetadata, - DefaultSizes, EditPlaylistValues, - ID, - Kind, - Name, Nullable, - Track, accountActions, accountSelectors, cacheUsersSelectors, @@ -25,6 +18,15 @@ import { savedPageActions, LibraryCategory } from '@audius/common' +import { + Name, + DefaultSizes, + Kind, + CollectionMetadata, + Collection, + ID, + Track +} from '@audius/common/models' import { call, put, select, takeLatest } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/cache/collections/utils/addTracksFromCollections.ts b/packages/web/src/common/store/cache/collections/utils/addTracksFromCollections.ts index 710e15a91b8..67be956b809 100644 --- a/packages/web/src/common/store/cache/collections/utils/addTracksFromCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/addTracksFromCollections.ts @@ -1,5 +1,6 @@ +import { CollectionMetadata, UserTrackMetadata } from '@audius/common/models' // Move all to web -import { CollectionMetadata, UserTrackMetadata } from '@audius/common' +import {} from '@audius/common' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts index 4397c965f1e..8a851e95a90 100644 --- a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts @@ -1,12 +1,11 @@ import { - UserCollectionMetadata, - Kind, makeUid, accountSelectors, cacheActions, getContext, reformatUser } from '@audius/common' +import { Kind, UserCollectionMetadata } from '@audius/common/models' import { uniqBy } from 'lodash' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts b/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts index 6f22c536bc9..6caea7a06cd 100644 --- a/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts +++ b/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts @@ -1,4 +1,5 @@ -import { Collection, Kind, cacheActions } from '@audius/common' +import { cacheActions } from '@audius/common' +import { Kind, Collection } from '@audius/common/models' import { put } from 'typed-redux-saga' export function* optimisticUpdateCollection(collection: Collection) { diff --git a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts index 08f6277b466..c8e84b18733 100644 --- a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts @@ -1,13 +1,15 @@ import { - ID, - Kind, makeUid, - UserCollectionMetadata, cacheActions, getContext, - CollectionMetadata, reformatCollection } from '@audius/common' +import { + Kind, + CollectionMetadata, + UserCollectionMetadata, + ID +} from '@audius/common/models' import { put, call } from 'redux-saga/effects' import { addTracksFromCollections } from './addTracksFromCollections' diff --git a/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts b/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts index a2734ad3069..95431aeed49 100644 --- a/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts @@ -1,9 +1,4 @@ import { - ID, - Collection, - CollectionMetadata, - UserCollectionMetadata, - Kind, Nullable, makeUid, accountSelectors, @@ -14,6 +9,13 @@ import { cacheCollectionsActions, reformatCollection } from '@audius/common' +import { + Kind, + CollectionMetadata, + Collection, + UserCollectionMetadata, + ID +} from '@audius/common/models' import { chunk } from 'lodash' import { all, call, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/sagas.js b/packages/web/src/common/store/cache/sagas.js index dbfe3e42e7a..6258b6897ef 100644 --- a/packages/web/src/common/store/cache/sagas.js +++ b/packages/web/src/common/store/cache/sagas.js @@ -1,5 +1,4 @@ import { - Status, makeUids, getIdFromKindId, cacheActions, @@ -9,6 +8,7 @@ import { confirmerSelectors, IntKeys } from '@audius/common' +import { Status } from '@audius/common/models' import { pick } from 'lodash' import { all, diff --git a/packages/web/src/common/store/cache/store.test.js b/packages/web/src/common/store/cache/store.test.js index ae9cb39b728..049882f92e1 100644 --- a/packages/web/src/common/store/cache/store.test.js +++ b/packages/web/src/common/store/cache/store.test.js @@ -1,12 +1,11 @@ -/* eslint-disable no-import-assign */ import { cacheActions as actions, cacheReducer, - Kind, makeKindId, - Status, cacheConfig as config } from '@audius/common' +import { Kind, Status } from '@audius/common/models' +/* eslint-disable no-import-assign */ import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import { describe, it, expect, vitest } from 'vitest' diff --git a/packages/web/src/common/store/cache/tracks/sagaHelpers.ts b/packages/web/src/common/store/cache/tracks/sagaHelpers.ts index 29ad476ed31..9c229201502 100644 --- a/packages/web/src/common/store/cache/tracks/sagaHelpers.ts +++ b/packages/web/src/common/store/cache/tracks/sagaHelpers.ts @@ -1,13 +1,13 @@ +import { accountSelectors } from '@audius/common' import { Name, - Track, TrackAccessType, - accountSelectors, isContentCollectibleGated, isContentFollowGated, isContentTipGated, - isContentUSDCPurchaseGated -} from '@audius/common' + isContentUSDCPurchaseGated, + Track +} from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/cache/tracks/sagas.js b/packages/web/src/common/store/cache/tracks/sagas.js index 043467b85f9..d30b9d26509 100644 --- a/packages/web/src/common/store/cache/tracks/sagas.js +++ b/packages/web/src/common/store/cache/tracks/sagas.js @@ -1,8 +1,4 @@ import { - Name, - DefaultSizes, - SquareSizes, - Kind, makeKindId, squashNewLines, formatUrlName, @@ -17,6 +13,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common' +import { Name, DefaultSizes, SquareSizes, Kind } from '@audius/common/models' import { call, fork, diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts index af73a21980b..9763b80e062 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts @@ -1,7 +1,4 @@ import { - ID, - Kind, - UserTrackMetadata, removeNullable, accountSelectors, cacheTracksSelectors, @@ -9,6 +6,7 @@ import { getContext, waitForValue } from '@audius/common' +import { Kind, ID, UserTrackMetadata } from '@audius/common/models' import { select, call, put } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts index eef151909ae..7c56460ae97 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts @@ -1,14 +1,16 @@ import { - ID, - Kind, - StemCategory, - Stem, - StemTrackMetadata, cacheTracksSelectors, cacheActions, getContext, waitForValue } from '@audius/common' +import { + Kind, + StemCategory, + ID, + Stem, + StemTrackMetadata +} from '@audius/common/models' import { call, put } from 'redux-saga/effects' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/cache/tracks/utils/helpers.ts b/packages/web/src/common/store/cache/tracks/utils/helpers.ts index 440f595d93f..69bedb058f7 100644 --- a/packages/web/src/common/store/cache/tracks/utils/helpers.ts +++ b/packages/web/src/common/store/cache/tracks/utils/helpers.ts @@ -1,13 +1,11 @@ import { - Kind, - TrackMetadata, - User, makeUid, accountSelectors, cacheActions, getContext, reformatUser } from '@audius/common' +import { Kind, TrackMetadata, User } from '@audius/common/models' import { uniqBy } from 'lodash' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts index c4520e1fd7f..ed4baaf6055 100644 --- a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts +++ b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts @@ -1,11 +1,5 @@ -import { - Kind, - Track, - TrackMetadata, - makeUid, - cacheActions, - getContext -} from '@audius/common' +import { makeUid, cacheActions, getContext } from '@audius/common' +import { Kind, TrackMetadata, Track } from '@audius/common/models' import { put, call } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/cache/tracks/utils/reformat.ts b/packages/web/src/common/store/cache/tracks/utils/reformat.ts index 0444fb222f4..3cb0a646637 100644 --- a/packages/web/src/common/store/cache/tracks/utils/reformat.ts +++ b/packages/web/src/common/store/cache/tracks/utils/reformat.ts @@ -1,4 +1,5 @@ -import { Track, TrackMetadata, AudiusBackend } from '@audius/common' +import { AudiusBackend } from '@audius/common' +import { TrackMetadata, Track } from '@audius/common/models' import { omit } from 'lodash' /** diff --git a/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts b/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts index 80eb74a7841..149f8e4604a 100644 --- a/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts +++ b/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts @@ -1,9 +1,4 @@ import { - ID, - Kind, - Track, - TrackMetadata, - UserTrackMetadata, accountSelectors, CommonState, getContext, @@ -13,6 +8,13 @@ import { trackPageSelectors, trackPageActions } from '@audius/common' +import { + Kind, + ID, + TrackMetadata, + Track, + UserTrackMetadata +} from '@audius/common/models' import { call, put, select, spawn } from 'typed-redux-saga' import { retrieve } from 'common/store/cache/sagas' diff --git a/packages/web/src/common/store/cache/users/sagas.d.ts b/packages/web/src/common/store/cache/users/sagas.d.ts index fae23db3f4e..78d25bf78c6 100644 --- a/packages/web/src/common/store/cache/users/sagas.d.ts +++ b/packages/web/src/common/store/cache/users/sagas.d.ts @@ -1,4 +1,5 @@ -import type { User } from '@audius/common' +import { User } from '@audius/common/models' +import type {} from '@audius/common' export declare function* adjustUserField(config: { user: User fieldName: string diff --git a/packages/web/src/common/store/cache/users/sagas.js b/packages/web/src/common/store/cache/users/sagas.js index ca226726e58..599cdbf47df 100644 --- a/packages/web/src/common/store/cache/users/sagas.js +++ b/packages/web/src/common/store/cache/users/sagas.js @@ -1,6 +1,4 @@ import { - DefaultSizes, - Kind, accountSelectors, cacheActions, cacheUsersSelectors, @@ -10,6 +8,7 @@ import { waitForAccount, reformatUser } from '@audius/common' +import { DefaultSizes, Kind } from '@audius/common/models' import { mergeWith } from 'lodash' import { call, put, select, takeEvery, getContext } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/cache/users/utils/pruneBlobValues.ts b/packages/web/src/common/store/cache/users/utils/pruneBlobValues.ts index de257d04e94..a6279aa0b76 100644 --- a/packages/web/src/common/store/cache/users/utils/pruneBlobValues.ts +++ b/packages/web/src/common/store/cache/users/utils/pruneBlobValues.ts @@ -1,4 +1,5 @@ -import { SquareSizes, WidthSizes, User } from '@audius/common' +import { SquareSizes, WidthSizes, User } from '@audius/common/models' +import {} from '@audius/common' /** * Prunes blob url values off of a user. diff --git a/packages/web/src/common/store/change-password/sagas.ts b/packages/web/src/common/store/change-password/sagas.ts index bf0e428645b..32ca60b8636 100644 --- a/packages/web/src/common/store/change-password/sagas.ts +++ b/packages/web/src/common/store/change-password/sagas.ts @@ -1,4 +1,5 @@ -import { Name, changePasswordActions, getContext } from '@audius/common' +import { changePasswordActions, getContext } from '@audius/common' +import { Name } from '@audius/common/models' import { call, put, takeEvery } from 'typed-redux-saga' import { make, TrackEvent } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/lineup/sagas.d.ts b/packages/web/src/common/store/lineup/sagas.d.ts index 8cd56cf708b..16d7ab9fad0 100644 --- a/packages/web/src/common/store/lineup/sagas.d.ts +++ b/packages/web/src/common/store/lineup/sagas.d.ts @@ -1,9 +1,5 @@ -import { - Collection, - LineupBaseActions, - LineupState, - LineupTrack -} from '@audius/common' +import { LineupBaseActions } from '@audius/common' +import { Collection, LineupState, LineupTrack } from '@audius/common/models' export class LineupSagas { constructor( diff --git a/packages/web/src/common/store/lineup/sagas.js b/packages/web/src/common/store/lineup/sagas.js index 512b672744e..0fddd90535f 100644 --- a/packages/web/src/common/store/lineup/sagas.js +++ b/packages/web/src/common/store/lineup/sagas.js @@ -1,6 +1,4 @@ import { - Kind, - Name, makeUid, makeUids, Uid, @@ -14,11 +12,11 @@ import { queueSelectors, getContext, FeatureFlags, - isContentUSDCPurchaseGated, StringKeys, premiumTracksPageLineupActions, accountSelectors } from '@audius/common' +import { Name, Kind, isContentUSDCPurchaseGated } from '@audius/common/models' import { all, call, diff --git a/packages/web/src/common/store/notifications/errorSagas.ts b/packages/web/src/common/store/notifications/errorSagas.ts index 08043e26c8b..8b709cfa2ba 100644 --- a/packages/web/src/common/store/notifications/errorSagas.ts +++ b/packages/web/src/common/store/notifications/errorSagas.ts @@ -1,8 +1,8 @@ import { notificationsActions, - ErrorLevel, FetchNotificationsFailedAction } from '@audius/common' +import { ErrorLevel } from '@audius/common/models' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts index 3a9979d7149..ee4f246852c 100644 --- a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts +++ b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts @@ -1,16 +1,14 @@ import { - ID, waitForRead, Notification, NotificationType, Entity, reactionsUIActions, waitForAccount, - Track, Achievement, - Remix, accountSelectors } from '@audius/common' +import { ID, Remix, Track } from '@audius/common/models' import moment from 'moment' import { all, call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/ai/sagas.ts b/packages/web/src/common/store/pages/ai/sagas.ts index bfc9608fea4..80437ed1135 100644 --- a/packages/web/src/common/store/pages/ai/sagas.ts +++ b/packages/web/src/common/store/pages/ai/sagas.ts @@ -1,4 +1,5 @@ -import { aiPageActions, FetchAiUserAction, Maybe, User } from '@audius/common' +import { aiPageActions, FetchAiUserAction, Maybe } from '@audius/common' +import { User } from '@audius/common/models' import { takeEvery, call, put } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/audio-rewards/sagas.ts b/packages/web/src/common/store/pages/audio-rewards/sagas.ts index 9564e1968ae..d547b3256e1 100644 --- a/packages/web/src/common/store/pages/audio-rewards/sagas.ts +++ b/packages/web/src/common/store/pages/audio-rewards/sagas.ts @@ -1,7 +1,4 @@ import { - FailureReason, - UserChallenge, - StringAudio, IntKeys, StringKeys, RemoteConfigInstance, @@ -22,6 +19,11 @@ import { musicConfettiActions, createUserBankIfNeeded } from '@audius/common' +import { + FailureReason, + UserChallenge, + StringAudio +} from '@audius/common/models' import { call, fork, diff --git a/packages/web/src/common/store/pages/audio-rewards/store.test.ts b/packages/web/src/common/store/pages/audio-rewards/store.test.ts index 023f9e0eb50..feef868b960 100644 --- a/packages/web/src/common/store/pages/audio-rewards/store.test.ts +++ b/packages/web/src/common/store/pages/audio-rewards/store.test.ts @@ -1,8 +1,4 @@ import { - ChallengeRewardID, - FailureReason, - UserChallenge, - StringAudio, IntKeys, StringKeys, accountSelectors, @@ -16,6 +12,12 @@ import { modalsActions, stringAudioToStringWei } from '@audius/common' +import { + FailureReason, + UserChallenge, + ChallengeRewardID, + StringAudio +} from '@audius/common/models' import delayP from '@redux-saga/delay-p' import { all, fork } from 'redux-saga/effects' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/pages/audio-transactions/sagas.ts b/packages/web/src/common/store/pages/audio-transactions/sagas.ts index 4df69be38f1..41d7b9c3070 100644 --- a/packages/web/src/common/store/pages/audio-transactions/sagas.ts +++ b/packages/web/src/common/store/pages/audio-transactions/sagas.ts @@ -4,12 +4,12 @@ import { TransactionMethod, TransactionType, formatDate, - StringAudio, transactionDetailsActions, getContext, Nullable } from '@audius/common' import type { InAppAudioPurchaseMetadata } from '@audius/common' +import { StringAudio } from '@audius/common/models' import { AudiusLibs, full } from '@audius/sdk' import { call, takeLatest, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/collection/lineups/sagas.js b/packages/web/src/common/store/pages/collection/lineups/sagas.js index 201c4d24c3a..2d4bdfa69ec 100644 --- a/packages/web/src/common/store/pages/collection/lineups/sagas.js +++ b/packages/web/src/common/store/pages/collection/lineups/sagas.js @@ -1,5 +1,4 @@ import { - Kind, removeNullable, Uid, smartCollectionPageSelectors, @@ -8,6 +7,7 @@ import { waitForValue, queueSelectors } from '@audius/common' +import { Kind } from '@audius/common/models' import { keyBy } from 'lodash' import moment from 'moment' import { select, call } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/collection/sagas.js b/packages/web/src/common/store/pages/collection/sagas.js index d6fe2d4c412..9afb5ee20ca 100644 --- a/packages/web/src/common/store/pages/collection/sagas.js +++ b/packages/web/src/common/store/pages/collection/sagas.js @@ -1,5 +1,4 @@ import { - Kind, makeUid, cacheActions, collectionPageActions as collectionActions, @@ -7,6 +6,7 @@ import { collectionPageSelectors, reachabilitySelectors } from '@audius/common' +import { Kind } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { call, put, select, takeLatest, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/deactivate-account/sagas.ts b/packages/web/src/common/store/pages/deactivate-account/sagas.ts index 0ab123c22ea..e79bcc1161f 100644 --- a/packages/web/src/common/store/pages/deactivate-account/sagas.ts +++ b/packages/web/src/common/store/pages/deactivate-account/sagas.ts @@ -1,5 +1,4 @@ import { - Name, accountSelectors, getContext, waitForValue, @@ -9,6 +8,7 @@ import { confirmTransaction, confirmerSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { call, delay, put, select, takeEvery } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts b/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts index 5d7fd197f08..01c9e9160d4 100644 --- a/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts +++ b/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts @@ -1,11 +1,10 @@ import { accountSelectors, - Collection, explorePageCollectionsActions, ExploreCollectionsVariant, - getContext, - UserCollectionMetadata + getContext } from '@audius/common' +import { Collection, UserCollectionMetadata } from '@audius/common/models' import { uniq } from 'lodash' import { takeEvery, call, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/explore/sagas.ts b/packages/web/src/common/store/pages/explore/sagas.ts index 52aafe23901..a18ab3dc756 100644 --- a/packages/web/src/common/store/pages/explore/sagas.ts +++ b/packages/web/src/common/store/pages/explore/sagas.ts @@ -1,9 +1,9 @@ import { - ID, explorePageActions, getContext, explorePageSelectors } from '@audius/common' +import { ID } from '@audius/common/models' import { call, put, takeEvery, select } from 'typed-redux-saga' import { retrieveCollections } from 'common/store/cache/collections/utils' diff --git a/packages/web/src/common/store/pages/feed/lineup/sagas.ts b/packages/web/src/common/store/pages/feed/lineup/sagas.ts index aab1e0ebd5f..13e500b282b 100644 --- a/packages/web/src/common/store/pages/feed/lineup/sagas.ts +++ b/packages/web/src/common/store/pages/feed/lineup/sagas.ts @@ -1,12 +1,4 @@ import { - ID, - Collection, - UserCollectionMetadata, - FeedFilter, - Kind, - LineupTrack, - TrackMetadata, - UserTrackMetadata, getContext, accountSelectors, feedPageLineupActions as feedActions, @@ -14,6 +6,16 @@ import { GetSocialFeedArgs, CommonState } from '@audius/common' +import { + FeedFilter, + Kind, + Collection, + UserCollectionMetadata, + ID, + TrackMetadata, + UserTrackMetadata, + LineupTrack +} from '@audius/common/models' import { select, all } from 'redux-saga/effects' import { processAndCacheCollections } from 'common/store/cache/collections/utils' diff --git a/packages/web/src/common/store/pages/feed/sagas.ts b/packages/web/src/common/store/pages/feed/sagas.ts index ff82607dbcd..46cfa0cfcdb 100644 --- a/packages/web/src/common/store/pages/feed/sagas.ts +++ b/packages/web/src/common/store/pages/feed/sagas.ts @@ -1,11 +1,10 @@ import { - ID, - FollowSource, getErrorMessage, feedPageLineupActions as feedActions, feedPageActions as discoverActions, usersSocialActions as socialActions } from '@audius/common' +import { FollowSource, ID } from '@audius/common/models' import { call, put, take, fork, takeEvery } from 'redux-saga/effects' import { fetchUsers } from 'common/store/cache/users/sagas' diff --git a/packages/web/src/common/store/pages/history/lineups/sagas.js b/packages/web/src/common/store/pages/history/lineups/sagas.js index 6a7ed76cc66..de412b1cef8 100644 --- a/packages/web/src/common/store/pages/history/lineups/sagas.js +++ b/packages/web/src/common/store/pages/history/lineups/sagas.js @@ -1,8 +1,8 @@ import { - Kind, accountSelectors, historyPageTracksLineupActions as tracksActions } from '@audius/common' +import { Kind } from '@audius/common/models' import { keyBy } from 'lodash' import { call, getContext, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts index 1bf1afe4118..c630ac4d859 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts +++ b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts @@ -1,10 +1,10 @@ +import { getContext } from '@audius/common' import { - ID, UserCollection, + ID, Track, - UserTrackMetadata, - getContext -} from '@audius/common' + UserTrackMetadata +} from '@audius/common/models' import { all } from 'redux-saga/effects' import { processAndCacheCollections } from 'common/store/cache/collections/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js index c07484d13c0..2f169b543c3 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js +++ b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js @@ -1,5 +1,4 @@ import { - Kind, getIdFromKindId, getKindFromKindId, accountSelectors, @@ -12,6 +11,7 @@ import { makeUid, confirmerSelectors } from '@audius/common' +import { Kind } from '@audius/common/models' import { select, call, takeEvery, put } from 'redux-saga/effects' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts index 85cf9bdaa36..ae225568be7 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts @@ -1,4 +1,5 @@ -import { ID, Track, getContext } from '@audius/common' +import { getContext } from '@audius/common' +import { ID, Track } from '@audius/common/models' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js b/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js index 5f08714e573..d0e3133bd34 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js @@ -1,5 +1,4 @@ import { - Kind, accountSelectors, cacheTracksActions, cacheTracksSelectors, @@ -9,6 +8,7 @@ import { profilePageTracksLineupActions as lineupActions, tracksSocialActions } from '@audius/common' +import { Kind } from '@audius/common/models' import { call, select, takeEvery, put } from 'redux-saga/effects' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts index 6cf47de5879..38d368a27b9 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts @@ -1,11 +1,11 @@ import { accountSelectors, - Kind, makeUid, profilePageTracksLineupActions, profilePageSelectors, uploadActions } from '@audius/common' +import { Kind } from '@audius/common/models' import { put, select, takeEvery } from 'typed-redux-saga' const { UPLOAD_TRACKS_SUCCEEDED, uploadTracksSucceeded } = uploadActions diff --git a/packages/web/src/common/store/pages/remixes-page/sagas.ts b/packages/web/src/common/store/pages/remixes-page/sagas.ts index 244d4613b60..93ef5e50e0f 100644 --- a/packages/web/src/common/store/pages/remixes-page/sagas.ts +++ b/packages/web/src/common/store/pages/remixes-page/sagas.ts @@ -1,4 +1,5 @@ -import { TrackMetadata, remixesPageActions, Track } from '@audius/common' +import { remixesPageActions } from '@audius/common' +import { TrackMetadata, Track } from '@audius/common/models' import { takeEvery, call, put } from 'redux-saga/effects' import { diff --git a/packages/web/src/common/store/pages/saved/lineups/sagas.js b/packages/web/src/common/store/pages/saved/lineups/sagas.js index 482a38e596a..390eb46d7c0 100644 --- a/packages/web/src/common/store/pages/saved/lineups/sagas.js +++ b/packages/web/src/common/store/pages/saved/lineups/sagas.js @@ -1,5 +1,4 @@ import { - Kind, makeUid, cacheTracksSelectors, savedPageTracksLineupActions as savedTracksActions, @@ -16,6 +15,7 @@ import { purchaseContentActions, ContentType } from '@audius/common' +import { Kind } from '@audius/common/models' import { uniq } from 'lodash' import moment from 'moment' import { call, select, put, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/saved/sagas.ts b/packages/web/src/common/store/pages/saved/sagas.ts index cd24cee7d27..1cc84dad69d 100644 --- a/packages/web/src/common/store/pages/saved/sagas.ts +++ b/packages/web/src/common/store/pages/saved/sagas.ts @@ -1,11 +1,7 @@ import { APIActivityV2, - Favorite, - FavoriteType, LibraryCategoryType, Nullable, - User, - UserTrackMetadata, accountSelectors, savedPageActions as actions, decodeHashId, @@ -17,6 +13,12 @@ import { savedPageTracksLineupActions as tracksActions, waitForValue } from '@audius/common' +import { + FavoriteType, + Favorite, + UserTrackMetadata, + User +} from '@audius/common/models' import { call, fork, put, select, takeLatest } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/settings/sagas.ts b/packages/web/src/common/store/pages/settings/sagas.ts index 551ce7334c7..bc41af0a390 100644 --- a/packages/web/src/common/store/pages/settings/sagas.ts +++ b/packages/web/src/common/store/pages/settings/sagas.ts @@ -3,9 +3,9 @@ import { settingsPageActions as actions, getContext, accountSelectors, - cacheActions, - Kind + cacheActions } from '@audius/common' +import { Kind } from '@audius/common/models' import { call, put, takeEvery, select } from 'typed-redux-saga' import { waitForWrite } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/signon/actions.ts b/packages/web/src/common/store/pages/signon/actions.ts index bfec6ffe998..a99c5df0ba1 100644 --- a/packages/web/src/common/store/pages/signon/actions.ts +++ b/packages/web/src/common/store/pages/signon/actions.ts @@ -1,11 +1,10 @@ import { - ID, - User, InstagramProfile, TwitterProfile, TikTokProfile, Image } from '@audius/common' +import { ID, User } from '@audius/common/models' import { createCustomAction } from 'typesafe-actions' import { UiErrorCode } from 'store/errors/actions' diff --git a/packages/web/src/common/store/pages/signon/sagas.js b/packages/web/src/common/store/pages/signon/sagas.js index b752fc060e3..4b24cfd0eda 100644 --- a/packages/web/src/common/store/pages/signon/sagas.js +++ b/packages/web/src/common/store/pages/signon/sagas.js @@ -1,10 +1,8 @@ import { ELECTRONIC_SUBGENRES, - FavoriteSource, FeatureFlags, Genre, MAX_HANDLE_LENGTH, - Name, accountActions, accountSelectors, cacheUsersSelectors, @@ -23,6 +21,7 @@ import { isValidEmailString, waitForAccount } from '@audius/common' +import { Name, FavoriteSource } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { isEmpty } from 'lodash' import { diff --git a/packages/web/src/common/store/pages/signon/types.ts b/packages/web/src/common/store/pages/signon/types.ts index 708e9bd227b..21e712daa4b 100644 --- a/packages/web/src/common/store/pages/signon/types.ts +++ b/packages/web/src/common/store/pages/signon/types.ts @@ -1,4 +1,5 @@ -import { ID, User } from '@audius/common' +import { ID, User } from '@audius/common/models' +import {} from '@audius/common' import { ImageFieldValue } from 'pages/sign-up-page/components/ImageField' diff --git a/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts b/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts index 17ea433c0ac..9ef9c9327c4 100644 --- a/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts +++ b/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts @@ -3,12 +3,11 @@ import { cacheActions, confirmerActions, getContext, - Kind, tokenDashboardPageActions, - User, walletActions, confirmTransaction } from '@audius/common' +import { Kind, User } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' import { getAccountMetadataCID } from './getAccountMetadataCID' diff --git a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts index 174a45acad9..1b065a0d413 100644 --- a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts @@ -1,12 +1,11 @@ import { accountSelectors, - Chain, getContext, - Name, newUserMetadata, tokenDashboardPageActions, tokenDashboardPageSelectors } from '@audius/common' +import { Name, Chain } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' const { getAccountUser } = accountSelectors diff --git a/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts index 585de99f488..a773a6c0f6a 100644 --- a/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts @@ -1,10 +1,9 @@ import { - Chain, getContext, - Name, tokenDashboardPageActions, tokenDashboardPageSelectors } from '@audius/common' +import { Name, Chain } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' const { getAssociatedWallets } = tokenDashboardPageSelectors diff --git a/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts b/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts index 709254ddb2c..2a912bc6943 100644 --- a/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts +++ b/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts @@ -1,4 +1,5 @@ -import { Chain, getContext } from '@audius/common' +import { getContext } from '@audius/common' +import { Chain } from '@audius/common/models' import { call } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts index 22cd957d159..ce5d812d76d 100644 --- a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts +++ b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts @@ -1,16 +1,15 @@ import { accountSelectors, cacheActions, - Chain, confirmerActions, ConfirmRemoveWalletAction, getContext, - Kind, newUserMetadata, tokenDashboardPageActions, walletActions, confirmTransaction } from '@audius/common' +import { Chain, Kind } from '@audius/common/models' import { call, fork, put, select, takeLatest } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/pages/token-dashboard/sagas.ts b/packages/web/src/common/store/pages/token-dashboard/sagas.ts index a8bca4b78d3..1be603fa0db 100644 --- a/packages/web/src/common/store/pages/token-dashboard/sagas.ts +++ b/packages/web/src/common/store/pages/token-dashboard/sagas.ts @@ -1,10 +1,9 @@ import { - Chain, accountSelectors, tokenDashboardPageActions, - getContext, - CollectibleState + getContext } from '@audius/common' +import { Chain, CollectibleState } from '@audius/common/models' import { call, put, select, takeLatest } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/pages/track/sagas.js b/packages/web/src/common/store/pages/track/sagas.js index 049360ed972..a7f44d145d4 100644 --- a/packages/web/src/common/store/pages/track/sagas.js +++ b/packages/web/src/common/store/pages/track/sagas.js @@ -1,5 +1,4 @@ import { - Kind, StringKeys, makeUid, cacheTracksActions as trackCacheActions, @@ -10,6 +9,7 @@ import { trackPageLineupActions, reachabilitySelectors } from '@audius/common' +import { Kind } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { keccak_256 } from 'js-sha3' import moment from 'moment' diff --git a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts index 0ab9b972618..3f8b1e95f45 100644 --- a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts @@ -1,11 +1,11 @@ import { - UserCollectionMetadata, StringKeys, accountSelectors, trendingPlaylistsPageLineupSelectors, trendingPlaylistsPageLineupActions, getContext } from '@audius/common' +import { UserCollectionMetadata } from '@audius/common/models' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts index d2e3019df46..3b414901f10 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts +++ b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts @@ -1,8 +1,4 @@ import { - ID, - TimeRange, - Track, - UserTrackMetadata, Nullable, StringKeys, Genre, @@ -12,6 +8,7 @@ import { trendingPageSelectors, getContext } from '@audius/common' +import { TimeRange, ID, Track, UserTrackMetadata } from '@audius/common/models' import { keccak_256 } from 'js-sha3' import { call, put, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js b/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js index a9f5b5f483f..ff8a2af0601 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js +++ b/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js @@ -1,9 +1,9 @@ import { - TimeRange, accountSelectors, trendingPageLineupActions, trendingPageSelectors } from '@audius/common' +import { TimeRange } from '@audius/common/models' import { select } from 'redux-saga/effects' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/common/store/player/sagas.ts b/packages/web/src/common/store/player/sagas.ts index 914504af7a0..4a60eab04fc 100644 --- a/packages/web/src/common/store/player/sagas.ts +++ b/packages/web/src/common/store/player/sagas.ts @@ -1,5 +1,4 @@ import { - Kind, encodeHashId, accountSelectors, cacheTracksSelectors, @@ -21,6 +20,7 @@ import { getQueryParams, getTrackPreviewDuration } from '@audius/common' +import { Kind } from '@audius/common/models' import { eventChannel } from 'redux-saga' import { select, diff --git a/packages/web/src/common/store/playlist-library/sagas.ts b/packages/web/src/common/store/playlist-library/sagas.ts index 75045d0617b..d1705535e58 100644 --- a/packages/web/src/common/store/playlist-library/sagas.ts +++ b/packages/web/src/common/store/playlist-library/sagas.ts @@ -1,13 +1,15 @@ import { - Kind, - PlaylistIdentifier, accountSelectors, AccountCollection, cacheActions, playlistLibraryHelpers, - playlistLibraryActions, - PlaylistLibraryID + playlistLibraryActions } from '@audius/common' +import { + Kind, + PlaylistLibraryID, + PlaylistIdentifier +} from '@audius/common/models' import { fork, put, select, takeEvery } from 'typed-redux-saga' import { updateProfileAsync } from 'common/store/profile/sagas' diff --git a/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts b/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts index a45b9197d9a..de233fa2ad5 100644 --- a/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts +++ b/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts @@ -1,14 +1,13 @@ import { - Name, accountSelectors, playlistLibraryActions, playlistLibraryHelpers, AddToFolderAction, toastActions, CommonState, - collectionsSocialActions, - FavoriteSource + collectionsSocialActions } from '@audius/common' +import { Name, FavoriteSource } from '@audius/common/models' import { takeEvery, select, put } from 'typed-redux-saga' import { make } from '../analytics/actions' diff --git a/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts b/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts index dfa82b05f80..038fe7b4797 100644 --- a/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts +++ b/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts @@ -1,13 +1,12 @@ import { CommonState, - FavoriteSource, - Name, ReorderAction, accountSelectors, collectionsSocialActions, playlistLibraryActions, playlistLibraryHelpers } from '@audius/common' +import { Name, FavoriteSource } from '@audius/common/models' import { takeEvery, select, put } from 'typed-redux-saga' import { make } from '../analytics/actions' diff --git a/packages/web/src/common/store/profile/fetchProfileCollectionsSaga.ts b/packages/web/src/common/store/profile/fetchProfileCollectionsSaga.ts index 4452237752c..6483096d707 100644 --- a/packages/web/src/common/store/profile/fetchProfileCollectionsSaga.ts +++ b/packages/web/src/common/store/profile/fetchProfileCollectionsSaga.ts @@ -1,10 +1,10 @@ import { cacheActions, getContext, - Kind, profilePageActions, profilePageSelectors } from '@audius/common' +import { Kind } from '@audius/common/models' import { isEqual } from 'lodash' import { put, select, takeLatest, call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/profile/sagas.js b/packages/web/src/common/store/profile/sagas.js index a973d5a9034..67b69324dff 100644 --- a/packages/web/src/common/store/profile/sagas.js +++ b/packages/web/src/common/store/profile/sagas.js @@ -1,6 +1,4 @@ import { - DefaultSizes, - Kind, DoubleKeys, makeUid, makeKindId, @@ -25,6 +23,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common' +import { DefaultSizes, Kind } from '@audius/common/models' import { merge } from 'lodash' import { all, diff --git a/packages/web/src/common/store/queue/sagas.ts b/packages/web/src/common/store/queue/sagas.ts index d7d26a81956..402e3898b6a 100644 --- a/packages/web/src/common/store/queue/sagas.ts +++ b/packages/web/src/common/store/queue/sagas.ts @@ -1,11 +1,4 @@ import { - Kind, - ID, - UID, - Name, - PlaybackSource, - LineupState, - User, Nullable, makeUid, Uid, @@ -25,6 +18,15 @@ import { getContext, lineupRegistry } from '@audius/common' +import { + Name, + PlaybackSource, + Kind, + ID, + UID, + LineupState, + User +} from '@audius/common/models' import { all, call, put, select, takeEvery, takeLatest } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/queue/store.test.js b/packages/web/src/common/store/queue/store.test.js index 193006664a4..2f3cd986a61 100644 --- a/packages/web/src/common/store/queue/store.test.js +++ b/packages/web/src/common/store/queue/store.test.js @@ -1,5 +1,4 @@ import { - Kind, accountReducer, cacheActions, queueReducer as reducer, @@ -9,6 +8,7 @@ import { playerReducer, playerActions } from '@audius/common' +import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { take } from 'redux-saga/effects' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/recommendation/sagas.ts b/packages/web/src/common/store/recommendation/sagas.ts index 7e0992d6941..ee9a803bde7 100644 --- a/packages/web/src/common/store/recommendation/sagas.ts +++ b/packages/web/src/common/store/recommendation/sagas.ts @@ -1,4 +1,5 @@ -import { ID, Nullable, getContext } from '@audius/common' +import { Nullable, getContext } from '@audius/common' +import { ID } from '@audius/common/models' import { call } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/recovery-email/sagas.ts b/packages/web/src/common/store/recovery-email/sagas.ts index d4101dd7a75..58b2a229aa9 100644 --- a/packages/web/src/common/store/recovery-email/sagas.ts +++ b/packages/web/src/common/store/recovery-email/sagas.ts @@ -1,4 +1,5 @@ -import { Name, getContext, recoveryEmailActions } from '@audius/common' +import { getContext, recoveryEmailActions } from '@audius/common' +import { Name } from '@audius/common/models' import { takeLatest, put, call } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/remix-settings/sagas.ts b/packages/web/src/common/store/remix-settings/sagas.ts index 2ca8c9d4dc5..9702917a9a0 100644 --- a/packages/web/src/common/store/remix-settings/sagas.ts +++ b/packages/web/src/common/store/remix-settings/sagas.ts @@ -1,9 +1,5 @@ -import { - TrackMetadata, - remixSettingsActions, - getContext, - Track -} from '@audius/common' +import { remixSettingsActions, getContext } from '@audius/common' +import { TrackMetadata, Track } from '@audius/common/models' import { takeLatest, call, put } from 'typed-redux-saga' import { parseTrackRoute } from 'utils/route/trackRouteParser' diff --git a/packages/web/src/common/store/saved-collections/sagas.ts b/packages/web/src/common/store/saved-collections/sagas.ts index 5f2e964c2dc..618fe606003 100644 --- a/packages/web/src/common/store/saved-collections/sagas.ts +++ b/packages/web/src/common/store/saved-collections/sagas.ts @@ -1,10 +1,10 @@ import { CollectionType, - ID, savedCollectionsActions, savedCollectionsSelectors, waitForRead } from '@audius/common' +import { ID } from '@audius/common/models' import { all, call, select, put, takeEvery } from 'typed-redux-saga' import { retrieveCollections } from '../cache/collections/utils' diff --git a/packages/web/src/common/store/search-ai-bar/reducer.ts b/packages/web/src/common/store/search-ai-bar/reducer.ts index f8915efa241..cdd116eb2d1 100644 --- a/packages/web/src/common/store/search-ai-bar/reducer.ts +++ b/packages/web/src/common/store/search-ai-bar/reducer.ts @@ -1,4 +1,5 @@ -import { Status } from '@audius/common' +import { Status } from '@audius/common/models' +import {} from '@audius/common' import { ActionsMap } from 'utils/reducer' diff --git a/packages/web/src/common/store/search-ai-bar/sagas.ts b/packages/web/src/common/store/search-ai-bar/sagas.ts index 013934fcb99..90ed8d313b4 100644 --- a/packages/web/src/common/store/search-ai-bar/sagas.ts +++ b/packages/web/src/common/store/search-ai-bar/sagas.ts @@ -1,10 +1,10 @@ import { - Name, SearchKind, accountSelectors, getContext, removeNullable } from '@audius/common' +import { Name } from '@audius/common/models' import { flatMap, zip } from 'lodash' import { call, diff --git a/packages/web/src/common/store/search-ai-bar/types.ts b/packages/web/src/common/store/search-ai-bar/types.ts index 60ee7790914..9e271c2ce32 100644 --- a/packages/web/src/common/store/search-ai-bar/types.ts +++ b/packages/web/src/common/store/search-ai-bar/types.ts @@ -1,4 +1,5 @@ -import { SearchUser, Status } from '@audius/common' +import { Status, SearchUser } from '@audius/common/models' +import {} from '@audius/common' export type SearchResults = { users: SearchUser[] diff --git a/packages/web/src/common/store/search-bar/reducer.ts b/packages/web/src/common/store/search-bar/reducer.ts index 2ba3fd60daa..20a820bf25f 100644 --- a/packages/web/src/common/store/search-bar/reducer.ts +++ b/packages/web/src/common/store/search-bar/reducer.ts @@ -1,4 +1,5 @@ -import { Status } from '@audius/common' +import { Status } from '@audius/common/models' +import {} from '@audius/common' import { ActionsMap } from 'utils/reducer' diff --git a/packages/web/src/common/store/search-bar/sagas.ts b/packages/web/src/common/store/search-bar/sagas.ts index 4dc594bbbd0..f2c2f3717f3 100644 --- a/packages/web/src/common/store/search-bar/sagas.ts +++ b/packages/web/src/common/store/search-bar/sagas.ts @@ -1,10 +1,10 @@ import { - Name, accountSelectors, getContext, removeNullable, FeatureFlags } from '@audius/common' +import { Name } from '@audius/common/models' import { flatMap, zip } from 'lodash' import { all, diff --git a/packages/web/src/common/store/search-bar/types.ts b/packages/web/src/common/store/search-bar/types.ts index 170e1302a97..fc5ace203cc 100644 --- a/packages/web/src/common/store/search-bar/types.ts +++ b/packages/web/src/common/store/search-bar/types.ts @@ -1,4 +1,10 @@ -import { SearchPlaylist, SearchTrack, SearchUser, Status } from '@audius/common' +import { + Status, + SearchUser, + SearchTrack, + SearchPlaylist +} from '@audius/common/models' +import {} from '@audius/common' type NewType = SearchPlaylist diff --git a/packages/web/src/common/store/smart-collection/sagas.ts b/packages/web/src/common/store/smart-collection/sagas.ts index 57749b20e5f..2515422e939 100644 --- a/packages/web/src/common/store/smart-collection/sagas.ts +++ b/packages/web/src/common/store/smart-collection/sagas.ts @@ -1,8 +1,4 @@ import { - SmartCollectionVariant, - Track, - UserTrack, - UserTrackMetadata, accountSelectors, smartCollectionPageActions, collectionPageActions, @@ -10,6 +6,12 @@ import { removeNullable, collectionPageLineupActions } from '@audius/common' +import { + SmartCollectionVariant, + Track, + UserTrackMetadata, + UserTrack +} from '@audius/common/models' import { takeEvery, put, call, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/smart-collection/smartCollections.ts b/packages/web/src/common/store/smart-collection/smartCollections.ts index 280509ea1aa..cc05d1a392f 100644 --- a/packages/web/src/common/store/smart-collection/smartCollections.ts +++ b/packages/web/src/common/store/smart-collection/smartCollections.ts @@ -1,8 +1,9 @@ import { - SmartCollection, Variant, - SmartCollectionVariant -} from '@audius/common' + SmartCollectionVariant, + SmartCollection +} from '@audius/common/models' +import {} from '@audius/common' import IconExploreFeelingLucky from 'assets/img/iconExploreFeelingLucky.svg' import IconExploreMostLoved from 'assets/img/iconExploreMostLoved.svg' diff --git a/packages/web/src/common/store/social/collections/sagas.ts b/packages/web/src/common/store/social/collections/sagas.ts index 36a88455b3f..cff5c8853cd 100644 --- a/packages/web/src/common/store/social/collections/sagas.ts +++ b/packages/web/src/common/store/social/collections/sagas.ts @@ -1,10 +1,4 @@ import { - Kind, - ID, - Name, - PlaylistLibrary, - SmartCollectionVariant, - User, makeUid, makeKindId, formatShareText, @@ -23,6 +17,14 @@ import { savedPageActions, LibraryCategory } from '@audius/common' +import { + Name, + Kind, + SmartCollectionVariant, + ID, + PlaylistLibrary, + User +} from '@audius/common/models' import { call, select, takeEvery, put } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/social/collections/store.test.js b/packages/web/src/common/store/social/collections/store.test.js index c3297326e74..aebcacf61f9 100644 --- a/packages/web/src/common/store/social/collections/store.test.js +++ b/packages/web/src/common/store/social/collections/store.test.js @@ -1,8 +1,8 @@ import { - Kind, cacheActions, collectionsSocialActions as actions } from '@audius/common' +import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import * as matchers from 'redux-saga-test-plan/matchers' diff --git a/packages/web/src/common/store/social/tracks/recordListen.ts b/packages/web/src/common/store/social/tracks/recordListen.ts index e042b1e36c3..2aca8fcb206 100644 --- a/packages/web/src/common/store/social/tracks/recordListen.ts +++ b/packages/web/src/common/store/social/tracks/recordListen.ts @@ -3,9 +3,9 @@ import { audioRewardsPageActions, cacheTracksSelectors, getContext, - Name, tracksSocialActions } from '@audius/common' +import { Name } from '@audius/common/models' import { call, put, select, takeEvery } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/social/tracks/sagas.ts b/packages/web/src/common/store/social/tracks/sagas.ts index d8a46c36bcd..e6056a37188 100644 --- a/packages/web/src/common/store/social/tracks/sagas.ts +++ b/packages/web/src/common/store/social/tracks/sagas.ts @@ -1,9 +1,4 @@ import { - Kind, - ID, - Name, - Track, - User, makeKindId, formatShareText, accountSelectors, @@ -21,6 +16,7 @@ import { confirmTransaction, FeatureFlags } from '@audius/common' +import { Name, Kind, ID, Track, User } from '@audius/common/models' import { fork } from 'redux-saga/effects' import { call, select, takeEvery, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/social/tracks/store.test.js b/packages/web/src/common/store/social/tracks/store.test.js index 8d90fd991b6..0a50aa0a57b 100644 --- a/packages/web/src/common/store/social/tracks/store.test.js +++ b/packages/web/src/common/store/social/tracks/store.test.js @@ -1,8 +1,5 @@ -import { - Kind, - cacheActions, - tracksSocialActions as actions -} from '@audius/common' +import { cacheActions, tracksSocialActions as actions } from '@audius/common' +import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import * as matchers from 'redux-saga-test-plan/matchers' diff --git a/packages/web/src/common/store/social/users/sagas.ts b/packages/web/src/common/store/social/users/sagas.ts index a05e86d6176..dfe3417e7b9 100644 --- a/packages/web/src/common/store/social/users/sagas.ts +++ b/packages/web/src/common/store/social/users/sagas.ts @@ -1,7 +1,4 @@ import { - Kind, - ID, - Name, makeKindId, accountSelectors, cacheActions, @@ -12,6 +9,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common' +import { Name, Kind, ID } from '@audius/common/models' import { call, select, takeEvery, put } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/social/users/store.test.js b/packages/web/src/common/store/social/users/store.test.js index 16361ad682a..01da1da0e5a 100644 --- a/packages/web/src/common/store/social/users/store.test.js +++ b/packages/web/src/common/store/social/users/store.test.js @@ -1,8 +1,5 @@ -import { - Kind, - cacheActions, - usersSocialActions as actions -} from '@audius/common' +import { cacheActions, usersSocialActions as actions } from '@audius/common' +import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import * as matchers from 'redux-saga-test-plan/matchers' diff --git a/packages/web/src/common/store/tipping/sagas.ts b/packages/web/src/common/store/tipping/sagas.ts index 93acdb3cde4..58d0f201baa 100644 --- a/packages/web/src/common/store/tipping/sagas.ts +++ b/packages/web/src/common/store/tipping/sagas.ts @@ -1,12 +1,4 @@ import { - Kind, - ID, - Name, - Supporter, - Supporting, - User, - BNWei, - StringWei, parseAudioInputToWei, stringWeiToBN, weiToAudioString, @@ -26,15 +18,25 @@ import { GetSupportersArgs, MAX_PROFILE_TOP_SUPPORTERS, SUPPORTING_PAGINATION_SIZE, - LastDismissedTip, LocalStorage, processAndCacheUsers, solanaSelectors, createUserBankIfNeeded, - SolanaWalletAddress, chatActions, isNullOrUndefined } from '@audius/common' +import { + Name, + Kind, + ID, + Supporter, + Supporting, + LastDismissedTip, + User, + StringWei, + BNWei, + SolanaWalletAddress +} from '@audius/common/models' import { PayloadAction } from '@reduxjs/toolkit' import BN from 'bn.js' import { diff --git a/packages/web/src/common/store/upload/sagaHelpers.ts b/packages/web/src/common/store/upload/sagaHelpers.ts index 36730080561..cd8d7a1fe0d 100644 --- a/packages/web/src/common/store/upload/sagaHelpers.ts +++ b/packages/web/src/common/store/upload/sagaHelpers.ts @@ -1,16 +1,18 @@ import { BN_USDC_CENT_WEI, FeatureFlags, - Name, accountSelectors, getContext, - getUSDCUserBank, + getUSDCUserBank +} from '@audius/common' +import { + Name, isContentCollectibleGated, isContentFollowGated, - isContentUSDCPurchaseGated, isContentTipGated, + isContentUSDCPurchaseGated, TrackMetadata -} from '@audius/common' +} from '@audius/common/models' import { PublicKey } from '@solana/web3.js' import BN from 'bn.js' import { range } from 'lodash' diff --git a/packages/web/src/common/store/upload/sagas.js b/packages/web/src/common/store/upload/sagas.js index 607d5401308..c95f2470583 100644 --- a/packages/web/src/common/store/upload/sagas.js +++ b/packages/web/src/common/store/upload/sagas.js @@ -1,6 +1,4 @@ import { - Kind, - Name, makeUid, formatUrlName, accountSelectors, @@ -19,6 +17,7 @@ import { reformatCollection, savedPageActions } from '@audius/common' +import { Name, Kind } from '@audius/common/models' import { range } from 'lodash' import { channel, buffers } from 'redux-saga' import { diff --git a/packages/web/src/common/store/user-list/favorites/sagas.ts b/packages/web/src/common/store/user-list/favorites/sagas.ts index 03759a8841e..4cd6a9d40ca 100644 --- a/packages/web/src/common/store/user-list/favorites/sagas.ts +++ b/packages/web/src/common/store/user-list/favorites/sagas.ts @@ -1,8 +1,4 @@ import { - ID, - Collection, - FavoriteType, - Track, cacheCollectionsSelectors, cacheTracksSelectors, UserListSagaFactory, @@ -10,6 +6,7 @@ import { favoritesUserListSelectors, FAVORITES_USER_LIST_TAG } from '@audius/common' +import { FavoriteType, Collection, ID, Track } from '@audius/common/models' import { select, put } from 'typed-redux-saga' import { watchFavoriteError } from 'common/store/user-list/favorites/errorSagas' diff --git a/packages/web/src/common/store/user-list/followers/sagas.ts b/packages/web/src/common/store/user-list/followers/sagas.ts index c8a1a1b3eba..23c3d2bfe60 100644 --- a/packages/web/src/common/store/user-list/followers/sagas.ts +++ b/packages/web/src/common/store/user-list/followers/sagas.ts @@ -1,12 +1,11 @@ import { - ID, - User, cacheUsersSelectors, followersUserListSelectors, UserListSagaFactory, followersUserListActions, FOLLOWERS_USER_LIST_TAG as USER_LIST_TAG } from '@audius/common' +import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { watchFollowersError } from 'common/store/user-list/followers/errorSagas' diff --git a/packages/web/src/common/store/user-list/following/sagas.ts b/packages/web/src/common/store/user-list/following/sagas.ts index fd38b85dc6d..f8c0e74c270 100644 --- a/packages/web/src/common/store/user-list/following/sagas.ts +++ b/packages/web/src/common/store/user-list/following/sagas.ts @@ -1,12 +1,11 @@ import { - ID, - User, cacheUsersSelectors, UserListSagaFactory, followingUserListActions, followingUserListSelectors, FOLLOWING_USER_LIST_TAG } from '@audius/common' +import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { watchFollowingError } from 'common/store/user-list/following/errorSagas' diff --git a/packages/web/src/common/store/user-list/mutuals/sagas.ts b/packages/web/src/common/store/user-list/mutuals/sagas.ts index 25f5133bc18..2558320b931 100644 --- a/packages/web/src/common/store/user-list/mutuals/sagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/sagas.ts @@ -1,6 +1,4 @@ import { - ID, - User, cacheUsersSelectors, UserListSagaFactory, mutualsUserListActions, @@ -8,6 +6,7 @@ import { MUTUALS_USER_LIST_TAG, AudiusBackend } from '@audius/common' +import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { watchMutualsError } from 'common/store/user-list/mutuals/errorSagas' diff --git a/packages/web/src/common/store/user-list/related-artists/sagas.ts b/packages/web/src/common/store/user-list/related-artists/sagas.ts index 2606df859fc..9e311cdb8dc 100644 --- a/packages/web/src/common/store/user-list/related-artists/sagas.ts +++ b/packages/web/src/common/store/user-list/related-artists/sagas.ts @@ -1,11 +1,11 @@ import { - ID, UserListSagaFactory, relatedArtistsUserListSelectors, relatedArtistsUserListActions, RELATED_ARTISTS_USER_LIST_TAG, getContext } from '@audius/common' +import { ID } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' import { watchRelatedArtistsError } from './errorSagas' diff --git a/packages/web/src/common/store/user-list/reposts/sagas.ts b/packages/web/src/common/store/user-list/reposts/sagas.ts index 185dd390f71..c702c162a2c 100644 --- a/packages/web/src/common/store/user-list/reposts/sagas.ts +++ b/packages/web/src/common/store/user-list/reposts/sagas.ts @@ -1,7 +1,4 @@ import { - ID, - Collection, - Track, cacheCollectionsSelectors, cacheTracksSelectors, RepostType, @@ -10,6 +7,7 @@ import { repostsUserListSelectors, REPOSTS_USER_LIST_TAG } from '@audius/common' +import { Collection, ID, Track } from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { watchRepostsError } from 'common/store/user-list/reposts/errorSagas' diff --git a/packages/web/src/common/store/user-list/supporting/sagas.ts b/packages/web/src/common/store/user-list/supporting/sagas.ts index 85e74a9eabc..2eb11434511 100644 --- a/packages/web/src/common/store/user-list/supporting/sagas.ts +++ b/packages/web/src/common/store/user-list/supporting/sagas.ts @@ -1,7 +1,4 @@ import { - ID, - User, - UserMetadata, stringWeiToBN, decodeHashId, cacheUsersSelectors, @@ -14,6 +11,7 @@ import { responseAdapter as adapter, SupportingResponse } from '@audius/common' +import { ID, UserMetadata, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { watchSupportingError } from 'common/store/user-list/supporting/errorSagas' diff --git a/packages/web/src/common/store/user-list/top-supporters/sagas.ts b/packages/web/src/common/store/user-list/top-supporters/sagas.ts index 12aa468c72b..b292eb48839 100644 --- a/packages/web/src/common/store/user-list/top-supporters/sagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/sagas.ts @@ -1,6 +1,4 @@ import { - ID, - User, removeNullable, decodeHashId, cacheUsersSelectors, @@ -13,6 +11,7 @@ import { TOP_SUPPORTERS_USER_LIST_TAG, responseAdapter as adapter } from '@audius/common' +import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { watchTopSupportersError } from 'common/store/user-list/top-supporters/errorSagas' diff --git a/packages/web/src/common/store/user-list/utils.ts b/packages/web/src/common/store/user-list/utils.ts index fd1c92a23f7..075b0b3be32 100644 --- a/packages/web/src/common/store/user-list/utils.ts +++ b/packages/web/src/common/store/user-list/utils.ts @@ -1,13 +1,11 @@ import { - ID, - User, - UserMetadata, accountSelectors, getContext, AudiusAPIClient, AudiusBackend, processAndCacheUsers } from '@audius/common' +import { ID, UserMetadata, User } from '@audius/common/models' import { call, select } from 'typed-redux-saga' import { AppState } from 'store/types' diff --git a/packages/web/src/common/store/wallet/sagas.ts b/packages/web/src/common/store/wallet/sagas.ts index 54fb6cb56d8..4024b240249 100644 --- a/packages/web/src/common/store/wallet/sagas.ts +++ b/packages/web/src/common/store/wallet/sagas.ts @@ -1,7 +1,4 @@ import { - Name, - Chain, - BNWei, FeatureFlags, stringWeiToBN, weiToString, @@ -13,12 +10,17 @@ import { InputSendDataAction, walletActions, getContext, - ErrorLevel, createUserBankIfNeeded, solanaSelectors, - SolanaWalletAddress, isNullOrUndefined } from '@audius/common' +import { + Name, + Chain, + ErrorLevel, + BNWei, + SolanaWalletAddress +} from '@audius/common/models' import type { AudiusLibs } from '@audius/sdk' import BN from 'bn.js' import { all, call, put, take, takeEvery, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/utils/ensureLoggedIn.ts b/packages/web/src/common/utils/ensureLoggedIn.ts index 347a4cb1462..8bc1a73353d 100644 --- a/packages/web/src/common/utils/ensureLoggedIn.ts +++ b/packages/web/src/common/utils/ensureLoggedIn.ts @@ -1,4 +1,5 @@ -import { CreateAccountOpen, Name, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { Name, CreateAccountOpen } from '@audius/common/models' import { put, select, cancel } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/utils/isPreview.ts b/packages/web/src/common/utils/isPreview.ts index 64be4372c4d..9d084fb399e 100644 --- a/packages/web/src/common/utils/isPreview.ts +++ b/packages/web/src/common/utils/isPreview.ts @@ -1,4 +1,5 @@ -import { ID, Track } from '@audius/common' +import { ID, Track } from '@audius/common/models' +import {} from '@audius/common' export const isPreview = (track: Track, currentUserId: ID | null) => { return !!track.preview_cid && track.owner_id !== currentUserId diff --git a/packages/web/src/components/actions-tab/ActionsTab.jsx b/packages/web/src/components/actions-tab/ActionsTab.jsx index 385f4c3139a..df475b9329d 100644 --- a/packages/web/src/components/actions-tab/ActionsTab.jsx +++ b/packages/web/src/components/actions-tab/ActionsTab.jsx @@ -1,13 +1,12 @@ import { PureComponent } from 'react' import { - ShareSource, - RepostSource, accountSelectors, collectionsSocialActions, tracksSocialActions, shareModalUIActions } from '@audius/common' +import { ShareSource, RepostSource } from '@audius/common/models' import cn from 'classnames' import PropTypes from 'prop-types' import { connect } from 'react-redux' diff --git a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx index 2dd5e10991e..441178d6661 100644 --- a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx +++ b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx @@ -3,12 +3,11 @@ import { useCallback, useEffect, useState } from 'react' import { useAddFundsModal, buyUSDCActions, - PurchaseMethod, - PurchaseVendor, buyUSDCSelectors, BuyUSDCStage } from '@audius/common' import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' +import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { ModalContent, ModalHeader } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/add-funds/AddFunds.tsx b/packages/web/src/components/add-funds/AddFunds.tsx index 69d5f7ec0ec..ecf68727fd1 100644 --- a/packages/web/src/components/add-funds/AddFunds.tsx +++ b/packages/web/src/components/add-funds/AddFunds.tsx @@ -1,6 +1,8 @@ +import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' + import { useState } from 'react' -import { PurchaseMethod, PurchaseVendor } from '@audius/common' +import {} from '@audius/common' import { useUSDCBalance, useCreateUserbankIfNeeded } from '@audius/common/hooks' import { USDC } from '@audius/fixed-decimal' import { Box, Button, Flex, Text, IconLogoCircleUSDC } from '@audius/harmony' diff --git a/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx b/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx index c2c17215ca6..9f8ae6eead8 100644 --- a/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx +++ b/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx @@ -1,9 +1,6 @@ import { useMemo, useState } from 'react' import { - CreatePlaylistSource, - Collection, - SquareSizes, accountSelectors, cacheCollectionsActions, collectionPageSelectors, @@ -11,6 +8,11 @@ import { duplicateAddConfirmationModalUIActions, toastActions } from '@audius/common' +import { + CreatePlaylistSource, + SquareSizes, + Collection +} from '@audius/common/models' import { Modal, Scrollbar } from '@audius/stems' import cn from 'classnames' import { capitalize } from 'lodash' diff --git a/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx b/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx index a40231bfc30..bd406a8d804 100644 --- a/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx +++ b/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx @@ -1,14 +1,12 @@ import { useCallback, useContext } from 'react' import { - ID, - CreatePlaylistSource, - Collection, accountSelectors, cacheCollectionsActions, addToCollectionUIActions, addToCollectionUISelectors } from '@audius/common' +import { CreatePlaylistSource, Collection, ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { capitalize } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx index 8675dbba7d2..6a5e9ad1490 100644 --- a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx +++ b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx @@ -1,11 +1,7 @@ import { useCallback, useState } from 'react' -import { - Kind, - SquareSizes, - getTierForUser, - imageProfilePicEmpty -} from '@audius/common' +import { getTierForUser, imageProfilePicEmpty } from '@audius/common' +import { SquareSizes, Kind } from '@audius/common/models' import { SelectProps } from 'antd' import { useDispatch } from 'react-redux' import { createSelector } from 'reselect' diff --git a/packages/web/src/components/ai-attribution-modal/AiAttributionModal.tsx b/packages/web/src/components/ai-attribution-modal/AiAttributionModal.tsx index 711c7028448..667f1e71cd3 100644 --- a/packages/web/src/components/ai-attribution-modal/AiAttributionModal.tsx +++ b/packages/web/src/components/ai-attribution-modal/AiAttributionModal.tsx @@ -1,6 +1,7 @@ import { useCallback, useState } from 'react' -import { ID, Nullable } from '@audius/common' +import { Nullable } from '@audius/common' +import { ID } from '@audius/common/models' import { Button, ButtonSize, diff --git a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx index 0753139b2dc..edd5a3a3fb5 100644 --- a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx +++ b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx @@ -1,10 +1,7 @@ import { useState, useEffect, memo, useCallback } from 'react' -import { - Kind, - imageBlank as placeholderArt, - cacheUsersActions -} from '@audius/common' +import { imageBlank as placeholderArt, cacheUsersActions } from '@audius/common' +import { Kind } from '@audius/common/models' import { Tag } from '@audius/stems' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/app-cta-modal/AppCTAModal.tsx b/packages/web/src/components/app-cta-modal/AppCTAModal.tsx index a28289712b7..3b3aaf6332f 100644 --- a/packages/web/src/components/app-cta-modal/AppCTAModal.tsx +++ b/packages/web/src/components/app-cta-modal/AppCTAModal.tsx @@ -1,6 +1,8 @@ import { useCallback } from 'react' -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' + +import {} from '@audius/common' import { Modal, Button, IconDownload, ButtonType } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/app-redirect-popover/AppRedirectListener.tsx b/packages/web/src/components/app-redirect-popover/AppRedirectListener.tsx index 7ee75790c06..40e666ca26a 100644 --- a/packages/web/src/components/app-redirect-popover/AppRedirectListener.tsx +++ b/packages/web/src/components/app-redirect-popover/AppRedirectListener.tsx @@ -1,6 +1,8 @@ import { useEffect } from 'react' -import { MobileOS } from '@audius/common' +import { MobileOS } from '@audius/common/models' + +import {} from '@audius/common' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { useHistory } from 'react-router-dom' diff --git a/packages/web/src/components/artist-recommendations/ArtistRecommendations.tsx b/packages/web/src/components/artist-recommendations/ArtistRecommendations.tsx index b4c69a3fcf4..0140aa4c2fb 100644 --- a/packages/web/src/components/artist-recommendations/ArtistRecommendations.tsx +++ b/packages/web/src/components/artist-recommendations/ArtistRecommendations.tsx @@ -1,18 +1,20 @@ import { forwardRef, ReactNode, useCallback, useEffect, useState } from 'react' import { - ID, - FollowSource, - Name, - ProfilePictureSizes, - SquareSizes, - User, relatedArtistsUISelectors, relatedArtistsUIActions, usersSocialActions as socialActions, cacheUsersSelectors, CommonState } from '@audius/common' +import { + Name, + FollowSource, + SquareSizes, + ID, + ProfilePictureSizes, + User +} from '@audius/common/models' import cn from 'classnames' import { push } from 'connected-react-router' import { isEmpty } from 'lodash' diff --git a/packages/web/src/components/artist-recommendations/ArtistRecommendationsPopup.tsx b/packages/web/src/components/artist-recommendations/ArtistRecommendationsPopup.tsx index 442827e8a34..1c7e0d37582 100644 --- a/packages/web/src/components/artist-recommendations/ArtistRecommendationsPopup.tsx +++ b/packages/web/src/components/artist-recommendations/ArtistRecommendationsPopup.tsx @@ -1,6 +1,7 @@ import { RefObject, useContext } from 'react' -import { ID, User, cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' +import { ID, User } from '@audius/common/models' import { Popup, PopupPosition } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/artist/ArtistCard.tsx b/packages/web/src/components/artist/ArtistCard.tsx index 1187ce754fb..4832f826290 100644 --- a/packages/web/src/components/artist/ArtistCard.tsx +++ b/packages/web/src/components/artist/ArtistCard.tsx @@ -1,11 +1,7 @@ import { MouseEventHandler, useCallback, useMemo } from 'react' -import { - FollowSource, - User, - profilePageActions, - usersSocialActions -} from '@audius/common' +import { profilePageActions, usersSocialActions } from '@audius/common' +import { FollowSource, User } from '@audius/common/models' import { useDispatch } from 'react-redux' import { FollowButton } from 'components/follow-button/FollowButton' diff --git a/packages/web/src/components/artist/ArtistCardCover.tsx b/packages/web/src/components/artist/ArtistCardCover.tsx index d16948cdef7..215bf26fcf0 100644 --- a/packages/web/src/components/artist/ArtistCardCover.tsx +++ b/packages/web/src/components/artist/ArtistCardCover.tsx @@ -1,6 +1,8 @@ import { useCallback } from 'react' -import { SquareSizes, WidthSizes, User } from '@audius/common' +import { SquareSizes, WidthSizes, User } from '@audius/common/models' + +import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/artist/ArtistChip.tsx b/packages/web/src/components/artist/ArtistChip.tsx index 05c2f7a010a..1559430aa1e 100644 --- a/packages/web/src/components/artist/ArtistChip.tsx +++ b/packages/web/src/components/artist/ArtistChip.tsx @@ -1,6 +1,8 @@ import { ComponentPropsWithoutRef } from 'react' -import { ID, SquareSizes, User } from '@audius/common' +import { SquareSizes, ID, User } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/components/artist/ArtistChipFollowers.tsx b/packages/web/src/components/artist/ArtistChipFollowers.tsx index 5f24fa7ea72..071d08c7d12 100644 --- a/packages/web/src/components/artist/ArtistChipFollowers.tsx +++ b/packages/web/src/components/artist/ArtistChipFollowers.tsx @@ -1,4 +1,5 @@ -import { ID, formatCount } from '@audius/common' +import { formatCount } from '@audius/common' +import { ID } from '@audius/common/models' import cn from 'classnames' import IconUser from 'assets/img/iconUser.svg' diff --git a/packages/web/src/components/artist/ArtistChipSupportFor.tsx b/packages/web/src/components/artist/ArtistChipSupportFor.tsx index 0d6a1a6d7cf..f22aab7fdc5 100644 --- a/packages/web/src/components/artist/ArtistChipSupportFor.tsx +++ b/packages/web/src/components/artist/ArtistChipSupportFor.tsx @@ -1,13 +1,12 @@ import { useEffect, useState } from 'react' import { - ID, - StringWei, Nullable, formatWei, stringWeiToBN, tippingSelectors } from '@audius/common' +import { ID, StringWei } from '@audius/common/models' import { IconTrophy, IconTrending } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/artist/ArtistChipSupportFrom.tsx b/packages/web/src/components/artist/ArtistChipSupportFrom.tsx index 635fa6d2f04..6b49c9deead 100644 --- a/packages/web/src/components/artist/ArtistChipSupportFrom.tsx +++ b/packages/web/src/components/artist/ArtistChipSupportFrom.tsx @@ -1,13 +1,12 @@ import { useEffect, useState } from 'react' import { - ID, - StringWei, Nullable, formatWei, stringWeiToBN, tippingSelectors } from '@audius/common' +import { ID, StringWei } from '@audius/common/models' import cn from 'classnames' import IconTip from 'assets/img/iconTip.svg' diff --git a/packages/web/src/components/artist/ArtistCover.tsx b/packages/web/src/components/artist/ArtistCover.tsx index 26bf9faff8d..14b2c06235c 100644 --- a/packages/web/src/components/artist/ArtistCover.tsx +++ b/packages/web/src/components/artist/ArtistCover.tsx @@ -1,10 +1,11 @@ import { + SquareSizes, + WidthSizes, ID, - CoverPhotoSizes, ProfilePictureSizes, - SquareSizes, - WidthSizes -} from '@audius/common' + CoverPhotoSizes +} from '@audius/common/models' +import {} from '@audius/common' import BadgeArtist from 'assets/img/badgeArtist.svg' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/components/artist/ArtistPopover.tsx b/packages/web/src/components/artist/ArtistPopover.tsx index 23614740a9f..b968d4af935 100644 --- a/packages/web/src/components/artist/ArtistPopover.tsx +++ b/packages/web/src/components/artist/ArtistPopover.tsx @@ -1,12 +1,11 @@ import { useCallback, ReactNode, useState } from 'react' import { - WidthSizes, - SquareSizes, accountSelectors, CommonState, cacheUsersSelectors } from '@audius/common' +import { SquareSizes, WidthSizes } from '@audius/common/models' import Popover from 'antd/lib/popover' import cn from 'classnames' diff --git a/packages/web/src/components/artist/ArtistSupporting.tsx b/packages/web/src/components/artist/ArtistSupporting.tsx index 6d87fc3e404..3f8db6a7e65 100644 --- a/packages/web/src/components/artist/ArtistSupporting.tsx +++ b/packages/web/src/components/artist/ArtistSupporting.tsx @@ -1,8 +1,6 @@ import { useCallback, useEffect } from 'react' import { - ID, - User, stringWeiToBN, cacheUsersSelectors, tippingSelectors, @@ -11,6 +9,7 @@ import { SUPPORTING_USER_LIST_TAG as SUPPORTING_TAG, MAX_ARTIST_HOVER_TOP_SUPPORTING } from '@audius/common' +import { ID, User } from '@audius/common/models' import { useDispatch } from 'react-redux' import IconTip from 'assets/img/iconTip.svg' diff --git a/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx b/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx index 1508ae98d08..bd3500624b6 100644 --- a/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx +++ b/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx @@ -4,9 +4,9 @@ import { formatAudio, TransactionMethod, TransactionType, - Kind, TransactionDetails } from '@audius/common' +import { Kind } from '@audius/common/models' import cn from 'classnames' import moment from 'moment' import { Cell, Row } from 'react-table' diff --git a/packages/web/src/components/avatar/Avatar.tsx b/packages/web/src/components/avatar/Avatar.tsx index cbf40598e42..599c6e3d4bf 100644 --- a/packages/web/src/components/avatar/Avatar.tsx +++ b/packages/web/src/components/avatar/Avatar.tsx @@ -1,11 +1,10 @@ import { - ID, Maybe, - SquareSizes, accountSelectors, cacheUsersSelectors, imageProfilePicEmpty } from '@audius/common' +import { SquareSizes, ID } from '@audius/common/models' import { Box, Avatar as HarmonyAvatar, diff --git a/packages/web/src/components/avatar/AvatarLegacy.tsx b/packages/web/src/components/avatar/AvatarLegacy.tsx index 41dbf5b724d..bd238d59c03 100644 --- a/packages/web/src/components/avatar/AvatarLegacy.tsx +++ b/packages/web/src/components/avatar/AvatarLegacy.tsx @@ -1,11 +1,10 @@ import { - ID, Maybe, - SquareSizes, accountSelectors, cacheUsersSelectors, imageProfilePicEmpty } from '@audius/common' +import { SquareSizes, ID } from '@audius/common/models' import { Link } from 'react-router-dom' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/components/background-animations/MusicConfetti.tsx b/packages/web/src/components/background-animations/MusicConfetti.tsx index 99ee36b5ac8..090d0e3acca 100644 --- a/packages/web/src/components/background-animations/MusicConfetti.tsx +++ b/packages/web/src/components/background-animations/MusicConfetti.tsx @@ -1,6 +1,8 @@ import { useRef, useCallback, useEffect, useState, useMemo } from 'react' -import { Theme } from '@audius/common' +import { Theme } from '@audius/common/models' + +import {} from '@audius/common' import Confetti from 'utils/animations/music-confetti' import { getCurrentThemeColors } from 'utils/theme/theme' diff --git a/packages/web/src/components/banner/CallToActionBanner.tsx b/packages/web/src/components/banner/CallToActionBanner.tsx index 4b3efcaf329..596a5c52b33 100644 --- a/packages/web/src/components/banner/CallToActionBanner.tsx +++ b/packages/web/src/components/banner/CallToActionBanner.tsx @@ -1,6 +1,8 @@ import { ReactNode } from 'react' -import { Client } from '@audius/common' +import { Client } from '@audius/common/models' + +import {} from '@audius/common' import { IconArrowWhite } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/banner/DirectMessagesBanner.tsx b/packages/web/src/components/banner/DirectMessagesBanner.tsx index efda0bb5d9b..47f9b0c9a3e 100644 --- a/packages/web/src/components/banner/DirectMessagesBanner.tsx +++ b/packages/web/src/components/banner/DirectMessagesBanner.tsx @@ -1,6 +1,7 @@ import { useCallback, useState } from 'react' -import { Name, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/banner/DownloadAppBanner.tsx b/packages/web/src/components/banner/DownloadAppBanner.tsx index 425165ece68..4e6d773bc4d 100644 --- a/packages/web/src/components/banner/DownloadAppBanner.tsx +++ b/packages/web/src/components/banner/DownloadAppBanner.tsx @@ -1,6 +1,7 @@ import { useCallback, useState } from 'react' -import { Client, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { Client } from '@audius/common/models' import { useDispatch } from 'react-redux' import { useSelector } from 'common/hooks/useSelector' diff --git a/packages/web/src/components/banner/TermsOfServiceUpdateBanner.tsx b/packages/web/src/components/banner/TermsOfServiceUpdateBanner.tsx index 1708440a58b..cfa601aa734 100644 --- a/packages/web/src/components/banner/TermsOfServiceUpdateBanner.tsx +++ b/packages/web/src/components/banner/TermsOfServiceUpdateBanner.tsx @@ -1,6 +1,8 @@ import { useCallback, useState } from 'react' -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' + +import {} from '@audius/common' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/buy-audio-modal/components/CoinbaseBuyAudioButton.tsx b/packages/web/src/components/buy-audio-modal/components/CoinbaseBuyAudioButton.tsx index b388f2b0628..04d2a2047ee 100644 --- a/packages/web/src/components/buy-audio-modal/components/CoinbaseBuyAudioButton.tsx +++ b/packages/web/src/components/buy-audio-modal/components/CoinbaseBuyAudioButton.tsx @@ -3,9 +3,9 @@ import { useCallback, useContext } from 'react' import { buyAudioActions, buyAudioSelectors, - OnRampProvider, - Status + OnRampProvider } from '@audius/common' +import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { useAsync } from 'react-use' diff --git a/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx b/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx index a4bd5732590..fab5971d0c3 100644 --- a/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx +++ b/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx @@ -1,9 +1,9 @@ import { - Status, PurchaseInfoErrorType, buyAudioSelectors, formatNumberString } from '@audius/common' +import { Status } from '@audius/common/models' import { IconCaretDown } from '@audius/stems' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx b/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx index 47762a82947..daae1a61b59 100644 --- a/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx +++ b/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { - Status, transactionDetailsSelectors, transactionDetailsActions, modalsActions, @@ -9,6 +8,7 @@ import { formatAudio, isNullOrUndefined } from '@audius/common' +import { Status } from '@audius/common/models' import { Button, ButtonSize, ButtonType, IconInfo } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/card/UserCard.jsx b/packages/web/src/components/card/UserCard.jsx index 44fd842d70f..5361bfc6c1a 100644 --- a/packages/web/src/components/card/UserCard.jsx +++ b/packages/web/src/components/card/UserCard.jsx @@ -1,4 +1,5 @@ -import { SquareSizes, formatCount } from '@audius/common' +import { formatCount } from '@audius/common' +import { SquareSizes } from '@audius/common/models' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/card/desktop/Card.tsx b/packages/web/src/components/card/desktop/Card.tsx index 950a03d5c38..d56133873d7 100644 --- a/packages/web/src/components/card/desktop/Card.tsx +++ b/packages/web/src/components/card/desktop/Card.tsx @@ -8,15 +8,14 @@ import { MouseEventHandler } from 'react' +import { pluralize, imageBlank as placeholderArt } from '@audius/common' import { - ID, - ProfilePictureSizes, + DogEarType, SquareSizes, + ID, CoverArtSizes, - pluralize, - imageBlank as placeholderArt, - DogEarType -} from '@audius/common' + ProfilePictureSizes +} from '@audius/common/models' import cn from 'classnames' import IconKebabHorizontal from 'assets/img/iconKebabHorizontal.svg' diff --git a/packages/web/src/components/card/desktop/CollectionArtCard.tsx b/packages/web/src/components/card/desktop/CollectionArtCard.tsx index dcdc175e4ae..2bad7caa190 100644 --- a/packages/web/src/components/card/desktop/CollectionArtCard.tsx +++ b/packages/web/src/components/card/desktop/CollectionArtCard.tsx @@ -1,13 +1,12 @@ import { useCallback, useEffect, useState } from 'react' import { - ID, - SquareSizes, accountSelectors, cacheCollectionsSelectors, cacheUsersSelectors, imageBlank as placeholderArt } from '@audius/common' +import { SquareSizes, ID } from '@audius/common/models' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/card/desktop/UserArtCard.tsx b/packages/web/src/components/card/desktop/UserArtCard.tsx index d9232b579da..167e2c9a78b 100644 --- a/packages/web/src/components/card/desktop/UserArtCard.tsx +++ b/packages/web/src/components/card/desktop/UserArtCard.tsx @@ -1,12 +1,11 @@ import { useCallback, useEffect } from 'react' import { - ID, - SquareSizes, formatCount, cacheUsersSelectors, imageBlank as placeholderArt } from '@audius/common' +import { SquareSizes, ID } from '@audius/common/models' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/card/mobile/Card.tsx b/packages/web/src/components/card/mobile/Card.tsx index ec9436d4c04..e5896786e05 100644 --- a/packages/web/src/components/card/mobile/Card.tsx +++ b/packages/web/src/components/card/mobile/Card.tsx @@ -1,13 +1,12 @@ import React, { MouseEvent, ReactNode } from 'react' +import { pluralize, imageBlank as placeholderArt } from '@audius/common' import { - ID, - ProfilePictureSizes, SquareSizes, + ID, CoverArtSizes, - pluralize, - imageBlank as placeholderArt -} from '@audius/common' + ProfilePictureSizes +} from '@audius/common/models' import cn from 'classnames' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/components/change-password/ChangePassword.tsx b/packages/web/src/components/change-password/ChangePassword.tsx index a8ebea3996f..1adac9f7980 100644 --- a/packages/web/src/components/change-password/ChangePassword.tsx +++ b/packages/web/src/components/change-password/ChangePassword.tsx @@ -1,11 +1,11 @@ import { useCallback, useEffect, useState } from 'react' import { - Status, ChangePasswordPageStep, changePasswordSelectors, changePasswordActions } from '@audius/common' +import { Status } from '@audius/common/models' import { Button, ButtonType, IconLock } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/change-password/ChangePasswordModal.tsx b/packages/web/src/components/change-password/ChangePasswordModal.tsx index 2a99391cb79..6533da95dca 100644 --- a/packages/web/src/components/change-password/ChangePasswordModal.tsx +++ b/packages/web/src/components/change-password/ChangePasswordModal.tsx @@ -1,11 +1,11 @@ import { useEffect } from 'react' import { - Name, ChangePasswordPageStep, changePasswordSelectors, changePasswordActions } from '@audius/common' +import { Name } from '@audius/common/models' import { Modal } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/change-password/ConfirmCredentials.tsx b/packages/web/src/components/change-password/ConfirmCredentials.tsx index 057d47bfaeb..f076e153dff 100644 --- a/packages/web/src/components/change-password/ConfirmCredentials.tsx +++ b/packages/web/src/components/change-password/ConfirmCredentials.tsx @@ -1,10 +1,7 @@ import { FormEvent, useEffect, useState } from 'react' -import { - Status, - changePasswordSelectors, - changePasswordActions -} from '@audius/common' +import { changePasswordSelectors, changePasswordActions } from '@audius/common' +import { Status } from '@audius/common/models' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/chat-listener/ChatListener.tsx b/packages/web/src/components/chat-listener/ChatListener.tsx index 153e009e7af..e3008304055 100644 --- a/packages/web/src/components/chat-listener/ChatListener.tsx +++ b/packages/web/src/components/chat-listener/ChatListener.tsx @@ -1,6 +1,7 @@ import { useEffect } from 'react' -import { Status, accountSelectors, chatActions } from '@audius/common' +import { accountSelectors, chatActions } from '@audius/common' +import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' const { connect, disconnect, fetchMoreChats, fetchUnreadMessagesCount } = diff --git a/packages/web/src/components/co-sign/CoSign.tsx b/packages/web/src/components/co-sign/CoSign.tsx index 5cb6866e5ee..8686877a985 100644 --- a/packages/web/src/components/co-sign/CoSign.tsx +++ b/packages/web/src/components/co-sign/CoSign.tsx @@ -1,6 +1,8 @@ import { useMemo, ReactNode, RefObject } from 'react' -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import Tooltip from 'components/tooltip/Tooltip' diff --git a/packages/web/src/components/co-sign/HoverInfo.tsx b/packages/web/src/components/co-sign/HoverInfo.tsx index 02fe11a9b50..023cf320757 100644 --- a/packages/web/src/components/co-sign/HoverInfo.tsx +++ b/packages/web/src/components/co-sign/HoverInfo.tsx @@ -1,4 +1,5 @@ -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' +import {} from '@audius/common' import IconHeart from 'assets/img/iconHeart.svg' import IconRepost from 'assets/img/iconRepost.svg' diff --git a/packages/web/src/components/collectibles-playlist-table/CollectiblesPlaylistTable.tsx b/packages/web/src/components/collectibles-playlist-table/CollectiblesPlaylistTable.tsx index dff534c510d..9d88e303505 100644 --- a/packages/web/src/components/collectibles-playlist-table/CollectiblesPlaylistTable.tsx +++ b/packages/web/src/components/collectibles-playlist-table/CollectiblesPlaylistTable.tsx @@ -1,6 +1,7 @@ import { useCallback, useMemo, MouseEvent } from 'react' -import { Chain, formatSeconds } from '@audius/common' +import { formatSeconds } from '@audius/common' +import { Chain } from '@audius/common/models' import cn from 'classnames' import { Cell, Row } from 'react-table' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx index 18dc9f8c302..af941187dc3 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx @@ -1,13 +1,11 @@ import { useCallback, useEffect, useState } from 'react' import { - Chain, - Collectible, - CollectibleMediaType, profilePageSelectors, collectibleDetailsUIActions, getHash } from '@audius/common' +import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' import { LogoEth, LogoSol } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx index 07c77975d1f..c646dabd3b7 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx @@ -8,9 +8,6 @@ import { } from 'react' import { - Chain, - Collectible, - CollectibleMediaType, formatDateWithTimezoneOffset, accountSelectors, badgeTiers, @@ -18,6 +15,7 @@ import { collectibleDetailsUIActions } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' import { Button, ButtonSize, diff --git a/packages/web/src/components/collectibles/components/CollectibleRow.tsx b/packages/web/src/components/collectibles/components/CollectibleRow.tsx index e01b6535f45..50622cb1ead 100644 --- a/packages/web/src/components/collectibles/components/CollectibleRow.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleRow.tsx @@ -1,10 +1,7 @@ import { useEffect, useRef, useState } from 'react' -import { - Collectible, - CollectibleMediaType, - formatDateWithTimezoneOffset -} from '@audius/common' +import { formatDateWithTimezoneOffset } from '@audius/common' +import { CollectibleMediaType, Collectible } from '@audius/common/models' import cn from 'classnames' import IconDrag from 'assets/img/iconDrag.svg' diff --git a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx index 1d7f615052b..3432c60f8d2 100644 --- a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx +++ b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx @@ -8,14 +8,13 @@ import { } from 'react' import { - Collectible, - CollectiblesMetadata, ProfileUser, collectibleDetailsUISelectors, collectibleDetailsUIActions, getHash } from '@audius/common' import { useInstanceVar } from '@audius/common/hooks' +import { CollectiblesMetadata, Collectible } from '@audius/common/models' import { Button, ButtonSize, diff --git a/packages/web/src/components/collection/desktop/Artwork.tsx b/packages/web/src/components/collection/desktop/Artwork.tsx index b84747e9a68..4b4949a4512 100644 --- a/packages/web/src/components/collection/desktop/Artwork.tsx +++ b/packages/web/src/components/collection/desktop/Artwork.tsx @@ -1,12 +1,11 @@ import { ComponentType, SVGProps, useCallback, useEffect } from 'react' import { - CoverArtSizes, - SquareSizes, cacheCollectionsSelectors, imageBlank, useEditPlaylistModal } from '@audius/common' +import { SquareSizes, CoverArtSizes } from '@audius/common/models' import { Button, ButtonType, IconPencil } from '@audius/stems' import { useSelector } from 'common/hooks/useSelector' diff --git a/packages/web/src/components/collection/desktop/CollectionActionButtons.tsx b/packages/web/src/components/collection/desktop/CollectionActionButtons.tsx index 63a011035d6..c7eb9054db7 100644 --- a/packages/web/src/components/collection/desktop/CollectionActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/CollectionActionButtons.tsx @@ -1,4 +1,5 @@ -import { ID, Nullable, SmartCollectionVariant, Variant } from '@audius/common' +import { Nullable } from '@audius/common' +import { Variant, SmartCollectionVariant, ID } from '@audius/common/models' import cn from 'classnames' import styles from './CollectionHeader.module.css' diff --git a/packages/web/src/components/collection/desktop/FavoriteButton.tsx b/packages/web/src/components/collection/desktop/FavoriteButton.tsx index fd3be2428fe..0d7be8b50d5 100644 --- a/packages/web/src/components/collection/desktop/FavoriteButton.tsx +++ b/packages/web/src/components/collection/desktop/FavoriteButton.tsx @@ -2,14 +2,16 @@ import { useCallback } from 'react' import { accountSelectors, - Collection, collectionPageSelectors, CommonState, - ID, - SmartCollection, - collectionsSocialActions, - FavoriteSource + collectionsSocialActions } from '@audius/common' +import { + FavoriteSource, + Collection, + SmartCollection, + ID +} from '@audius/common/models' import { ButtonProps, ButtonType, IconHeart } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx b/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx index 7055f069d4a..c8c983d749f 100644 --- a/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx +++ b/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx @@ -1,13 +1,11 @@ import { useCallback } from 'react' import { - Collection, collectionPageSelectors, CommonState, - FollowSource, - User, usersSocialActions } from '@audius/common' +import { FollowSource, Collection, User } from '@audius/common/models' import { Button, ButtonType, IconKebabHorizontal } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx index cfa3bd3c895..b2e1280d396 100644 --- a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx @@ -1,8 +1,5 @@ -import { - Collection, - collectionPageSelectors, - CommonState -} from '@audius/common' +import { collectionPageSelectors, CommonState } from '@audius/common' +import { Collection } from '@audius/common/models' import { useSelector } from 'react-redux' import { EditButton } from './EditButton' diff --git a/packages/web/src/components/collection/desktop/PublishButton.tsx b/packages/web/src/components/collection/desktop/PublishButton.tsx index 324d5d73444..b44a5676820 100644 --- a/packages/web/src/components/collection/desktop/PublishButton.tsx +++ b/packages/web/src/components/collection/desktop/PublishButton.tsx @@ -1,9 +1,9 @@ import { cacheCollectionsSelectors, - Collection, collectionPageSelectors, CommonState } from '@audius/common' +import { Collection } from '@audius/common/models' import { ButtonProps, ButtonType, IconRocket } from '@audius/stems' import { useSelector } from 'react-redux' import { useToggle } from 'react-use' diff --git a/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx b/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx index 73f2dcd9eb1..a00a98f808e 100644 --- a/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx +++ b/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' import { - Collection, CommonState, cacheCollectionsActions, collectionPageSelectors } from '@audius/common' +import { Collection } from '@audius/common/models' import { Button, ButtonType, diff --git a/packages/web/src/components/collection/desktop/RepostButton.tsx b/packages/web/src/components/collection/desktop/RepostButton.tsx index 87331a73338..b4b2cfb03b8 100644 --- a/packages/web/src/components/collection/desktop/RepostButton.tsx +++ b/packages/web/src/components/collection/desktop/RepostButton.tsx @@ -1,13 +1,11 @@ import { useCallback } from 'react' import { - Collection, collectionPageSelectors, CommonState, - ID, - collectionsSocialActions, - RepostSource + collectionsSocialActions } from '@audius/common' +import { RepostSource, Collection, ID } from '@audius/common/models' import { ButtonProps, ButtonType, IconRepost } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/ShareButton.tsx b/packages/web/src/components/collection/desktop/ShareButton.tsx index aada3e2b171..b45cfcd30c9 100644 --- a/packages/web/src/components/collection/desktop/ShareButton.tsx +++ b/packages/web/src/components/collection/desktop/ShareButton.tsx @@ -1,11 +1,7 @@ import { useCallback } from 'react' -import { - ID, - shareModalUIActions, - ShareSource, - SmartCollectionVariant -} from '@audius/common' +import { shareModalUIActions } from '@audius/common' +import { ShareSource, SmartCollectionVariant, ID } from '@audius/common/models' import { ButtonProps, ButtonType, IconShare } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/SmartCollectionActionButtons.tsx b/packages/web/src/components/collection/desktop/SmartCollectionActionButtons.tsx index f809756ba77..f4fd8098756 100644 --- a/packages/web/src/components/collection/desktop/SmartCollectionActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/SmartCollectionActionButtons.tsx @@ -1,4 +1,5 @@ -import { ID, SmartCollectionVariant } from '@audius/common' +import { SmartCollectionVariant, ID } from '@audius/common/models' +import {} from '@audius/common' import { FavoriteButton } from './FavoriteButton' import { ShareButton } from './ShareButton' diff --git a/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx b/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx index 609d2281d78..e62fa732944 100644 --- a/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx @@ -1,9 +1,5 @@ -import { - Collection, - collectionPageSelectors, - CommonState, - ID -} from '@audius/common' +import { collectionPageSelectors, CommonState } from '@audius/common' +import { Collection, ID } from '@audius/common/models' import { useSelector } from 'react-redux' import { FavoriteButton } from './FavoriteButton' diff --git a/packages/web/src/components/collection/mobile/CollectionHeader.jsx b/packages/web/src/components/collection/mobile/CollectionHeader.jsx index c88ccf9dbee..d1961204a7c 100644 --- a/packages/web/src/components/collection/mobile/CollectionHeader.jsx +++ b/packages/web/src/components/collection/mobile/CollectionHeader.jsx @@ -1,14 +1,13 @@ import { memo } from 'react' import { - Variant, - SquareSizes, formatCount, formatSecondsAsText, formatDate, OverflowAction, FeatureFlags } from '@audius/common' +import { Variant, SquareSizes } from '@audius/common/models' import { Button, ButtonType, IconPause, IconPlay } from '@audius/stems' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/cover-photo/CoverPhoto.tsx b/packages/web/src/components/cover-photo/CoverPhoto.tsx index 7676f8a7c34..7fc30faa4d5 100644 --- a/packages/web/src/components/cover-photo/CoverPhoto.tsx +++ b/packages/web/src/components/cover-photo/CoverPhoto.tsx @@ -1,6 +1,7 @@ import { memo, useState } from 'react' -import { WidthSizes, Nullable, imageCoverPhotoBlank } from '@audius/common' +import { Nullable, imageCoverPhotoBlank } from '@audius/common' +import { WidthSizes } from '@audius/common/models' import cn from 'classnames' import { FileWithPreview } from 'react-dropzone' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/create-playlist/PlaylistForm.tsx b/packages/web/src/components/create-playlist/PlaylistForm.tsx index 69ec1a42d96..142bb5ae409 100644 --- a/packages/web/src/components/create-playlist/PlaylistForm.tsx +++ b/packages/web/src/components/create-playlist/PlaylistForm.tsx @@ -1,9 +1,9 @@ +import { Nullable } from '@audius/common' import { - Collection, + SquareSizes, CollectionMetadata, - Nullable, - SquareSizes -} from '@audius/common' + Collection +} from '@audius/common/models' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx index 87dda0a98af..abc24875b65 100644 --- a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx +++ b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx @@ -1,21 +1,20 @@ import { useMemo } from 'react' +import { accountSelectors, Nullable } from '@audius/common' +import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { - CollectibleGatedConditions, - FollowGatedConditions, - TipGatedConditions, - USDCPurchaseConditions, - Track, - TrackAvailabilityType, - accountSelectors, isContentCollectibleGated, isContentFollowGated, isContentTipGated, isContentUSDCPurchaseGated, - Nullable, - AccessConditions -} from '@audius/common' -import { useUSDCPurchaseConfig } from '@audius/common/hooks' + TrackAvailabilityType, + CollectibleGatedConditions, + FollowGatedConditions, + TipGatedConditions, + USDCPurchaseConditions, + AccessConditions, + Track +} from '@audius/common/models' import { Button, ButtonSize, diff --git a/packages/web/src/components/data-entry/ReleaseDateTriggerLegacy.tsx b/packages/web/src/components/data-entry/ReleaseDateTriggerLegacy.tsx index 26db0dfa968..0b58608132f 100644 --- a/packages/web/src/components/data-entry/ReleaseDateTriggerLegacy.tsx +++ b/packages/web/src/components/data-entry/ReleaseDateTriggerLegacy.tsx @@ -1,6 +1,7 @@ import { useMemo, useState } from 'react' -import { Track, dayjs } from '@audius/common' +import { dayjs } from '@audius/common' +import { Track } from '@audius/common/models' import { Flex } from '@audius/harmony' import { Button, ButtonSize, ButtonType, IconCalendar } from '@audius/stems' import moment from 'moment' diff --git a/packages/web/src/components/dog-ear/DogEar.tsx b/packages/web/src/components/dog-ear/DogEar.tsx index 9b5fa5d011e..3ac8dff91b8 100644 --- a/packages/web/src/components/dog-ear/DogEar.tsx +++ b/packages/web/src/components/dog-ear/DogEar.tsx @@ -1,4 +1,5 @@ -import { DogEarType } from '@audius/common' +import { DogEarType } from '@audius/common/models' +import {} from '@audius/common' import { IconCart, IconCollectible, diff --git a/packages/web/src/components/download-buttons/DownloadButtons.tsx b/packages/web/src/components/download-buttons/DownloadButtons.tsx index 6a7aa1bc7e1..ebc7f8d79d5 100644 --- a/packages/web/src/components/download-buttons/DownloadButtons.tsx +++ b/packages/web/src/components/download-buttons/DownloadButtons.tsx @@ -1,11 +1,12 @@ import { memo, useCallback } from 'react' -import { ID, toastActions } from '@audius/common' +import { toastActions } from '@audius/common' import { ButtonState, ButtonType, useDownloadTrackButtons } from '@audius/common/hooks' +import { ID } from '@audius/common/models' import { IconDownload, IconButton } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/download-mobile-app-drawer/DownloadMobileAppDrawer.tsx b/packages/web/src/components/download-mobile-app-drawer/DownloadMobileAppDrawer.tsx index a9fd1be9d51..69642d08e74 100644 --- a/packages/web/src/components/download-mobile-app-drawer/DownloadMobileAppDrawer.tsx +++ b/packages/web/src/components/download-mobile-app-drawer/DownloadMobileAppDrawer.tsx @@ -1,6 +1,8 @@ import { useCallback } from 'react' -import { MobileOS } from '@audius/common' +import { MobileOS } from '@audius/common/models' + +import {} from '@audius/common' import { AudiusLogoGlyph, Button, diff --git a/packages/web/src/components/dragndrop/Draggable.tsx b/packages/web/src/components/dragndrop/Draggable.tsx index 1169a4798b4..94accb2b40e 100644 --- a/packages/web/src/components/dragndrop/Draggable.tsx +++ b/packages/web/src/components/dragndrop/Draggable.tsx @@ -1,6 +1,8 @@ import { DragEvent, ReactNode, useCallback } from 'react' -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' + +import {} from '@audius/common' import { Slot } from '@radix-ui/react-slot' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/dragndrop/Droppable.tsx b/packages/web/src/components/dragndrop/Droppable.tsx index 78c00e6fe4d..6a2bf95da17 100644 --- a/packages/web/src/components/dragndrop/Droppable.tsx +++ b/packages/web/src/components/dragndrop/Droppable.tsx @@ -1,3 +1,5 @@ +import { ID } from '@audius/common/models' + import { useState, useCallback, @@ -6,7 +8,7 @@ import { ReactNode } from 'react' -import { ID } from '@audius/common' +import {} from '@audius/common' import { useDebouncedCallback } from '@audius/common/hooks' import { Slot } from '@radix-ui/react-slot' import cn from 'classnames' diff --git a/packages/web/src/components/edit-folder-modal/EditFolderModal.tsx b/packages/web/src/components/edit-folder-modal/EditFolderModal.tsx index 164bac75d8a..9c482e80268 100644 --- a/packages/web/src/components/edit-folder-modal/EditFolderModal.tsx +++ b/packages/web/src/components/edit-folder-modal/EditFolderModal.tsx @@ -1,12 +1,11 @@ import { useCallback, useState } from 'react' import { - Name, - PlaylistLibraryFolder, accountSelectors, playlistLibraryActions, playlistLibraryHelpers } from '@audius/common' +import { Name, PlaylistLibraryFolder } from '@audius/common/models' import { IconFolder, Modal, diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index 2e4ef9204ec..615e102abd7 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -1,9 +1,6 @@ import { useEffect, useState, useCallback } from 'react' import { - ID, - Collection, - SquareSizes, Nullable, RandomImage, accountSelectors, @@ -16,6 +13,7 @@ import { useEditPlaylistModal } from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' +import { SquareSizes, Collection, ID } from '@audius/common/models' import { capitalize } from 'lodash' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/edit-track/EditTrackModal.tsx b/packages/web/src/components/edit-track/EditTrackModal.tsx index ff946ac159a..5142fd6eab3 100644 --- a/packages/web/src/components/edit-track/EditTrackModal.tsx +++ b/packages/web/src/components/edit-track/EditTrackModal.tsx @@ -1,10 +1,6 @@ import { useEffect, useState } from 'react' import { - ID, - StemCategory, - StemUploadWithFile, - Track, removeNullable, uuid, cacheTracksActions as cacheTrackActions, @@ -14,6 +10,12 @@ import { useEditTrackModal, publishTrackConfirmationModalUIActions } from '@audius/common' +import { + StemCategory, + ID, + StemUploadWithFile, + Track +} from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect, useDispatch } from 'react-redux' import { matchPath } from 'react-router' diff --git a/packages/web/src/components/embed-modal/EmbedModal.tsx b/packages/web/src/components/embed-modal/EmbedModal.tsx index 1b5c8da260f..8b6418d0c96 100644 --- a/packages/web/src/components/embed-modal/EmbedModal.tsx +++ b/packages/web/src/components/embed-modal/EmbedModal.tsx @@ -1,6 +1,7 @@ import { useState, useMemo, useEffect, useCallback } from 'react' -import { PlayableType, ID, Name, Track, encodeHashId } from '@audius/common' +import { encodeHashId } from '@audius/common' +import { Name, PlayableType, ID, Track } from '@audius/common/models' import { Modal, Button, ButtonType, SegmentedControl } from '@audius/stems' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/embed-modal/store/actions.ts b/packages/web/src/components/embed-modal/store/actions.ts index 9bbd81be327..a1b13cb58c2 100644 --- a/packages/web/src/components/embed-modal/store/actions.ts +++ b/packages/web/src/components/embed-modal/store/actions.ts @@ -1,4 +1,5 @@ -import { ID, PlayableType } from '@audius/common' +import { PlayableType, ID } from '@audius/common/models' +import {} from '@audius/common' import { createCustomAction } from 'typesafe-actions' export const OPEN = 'EMBED_MODAL/OPEN' diff --git a/packages/web/src/components/embed-modal/store/selectors.ts b/packages/web/src/components/embed-modal/store/selectors.ts index 27ebbfdb393..2d2b8efae05 100644 --- a/packages/web/src/components/embed-modal/store/selectors.ts +++ b/packages/web/src/components/embed-modal/store/selectors.ts @@ -1,8 +1,5 @@ -import { - PlayableType, - cacheCollectionsSelectors, - cacheTracksSelectors -} from '@audius/common' +import { cacheCollectionsSelectors, cacheTracksSelectors } from '@audius/common' +import { PlayableType } from '@audius/common/models' import { AppState } from 'store/types' const { getTrack } = cacheTracksSelectors diff --git a/packages/web/src/components/embed-modal/store/types.ts b/packages/web/src/components/embed-modal/store/types.ts index 8ccb9730157..37fa330c8f1 100644 --- a/packages/web/src/components/embed-modal/store/types.ts +++ b/packages/web/src/components/embed-modal/store/types.ts @@ -1,4 +1,5 @@ -import { ID, PlayableType } from '@audius/common' +import { PlayableType, ID } from '@audius/common/models' +import {} from '@audius/common' export type EmbedModalState = { isOpen: boolean diff --git a/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx b/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx index 527be372af6..501df9cc24c 100644 --- a/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx +++ b/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx @@ -1,11 +1,7 @@ import { useCallback, useEffect } from 'react' -import { - Name, - SquareSizes, - accountSelectors, - musicConfettiActions -} from '@audius/common' +import { accountSelectors, musicConfettiActions } from '@audius/common' +import { Name, SquareSizes } from '@audius/common/models' import { Modal } from '@audius/stems' import { connect, useDispatch } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx b/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx index ec43298b12c..01390588b0e 100644 --- a/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx +++ b/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx @@ -1,6 +1,8 @@ +import { Status } from '@audius/common/models' + import { ChangeEvent, useCallback, useEffect } from 'react' -import { Status } from '@audius/common' +import {} from '@audius/common' import { useSetInboxPermissions } from '@audius/common/hooks' import { ChatPermission } from '@audius/sdk' import { diff --git a/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx b/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx index 74683569771..ecf6e5734c6 100644 --- a/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx +++ b/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx @@ -3,7 +3,6 @@ import { ReactNode, useCallback } from 'react' import { CHAT_BLOG_POST_URL, ChatPermissionAction, - User, accountSelectors, cacheUsersSelectors, chatActions, @@ -12,6 +11,7 @@ import { tippingActions, useInboxUnavailableModal } from '@audius/common' +import { User } from '@audius/common/models' import { IconMessageLocked, IconTipping, diff --git a/packages/web/src/components/lineup/Lineup.tsx b/packages/web/src/components/lineup/Lineup.tsx index 7483742b9d7..f585d5f8590 100644 --- a/packages/web/src/components/lineup/Lineup.tsx +++ b/packages/web/src/components/lineup/Lineup.tsx @@ -1,4 +1,5 @@ -import { Status } from '@audius/common' +import { Status } from '@audius/common/models' +import {} from '@audius/common' import DesktopPlaylistTile from 'components/track/desktop/ConnectedPlaylistTile' import DesktopTrackTile from 'components/track/desktop/ConnectedTrackTile' diff --git a/packages/web/src/components/lineup/LineupProvider.tsx b/packages/web/src/components/lineup/LineupProvider.tsx index 9a9fd647615..b79e8ee308d 100644 --- a/packages/web/src/components/lineup/LineupProvider.tsx +++ b/packages/web/src/components/lineup/LineupProvider.tsx @@ -1,17 +1,19 @@ import { ComponentType, createRef, PureComponent } from 'react' import { - Kind, - ID, - UID, - Name, - PlaybackSource, - Lineup, - Status, LineupBaseActions, tippingSelectors, playerSelectors } from '@audius/common' +import { + Name, + PlaybackSource, + Kind, + Status, + ID, + UID, + Lineup +} from '@audius/common/models' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import InfiniteScroll from 'react-infinite-scroller' diff --git a/packages/web/src/components/lineup/hooks.ts b/packages/web/src/components/lineup/hooks.ts index 66e48fe0f1b..eb2a9deacfa 100644 --- a/packages/web/src/components/lineup/hooks.ts +++ b/packages/web/src/components/lineup/hooks.ts @@ -1,11 +1,11 @@ import { useMemo } from 'react' import { - LineupState, lineupSelectors, playerSelectors, queueSelectors } from '@audius/common' +import { LineupState } from '@audius/common/models' import { useDispatch } from 'react-redux' import { LineupVariant } from 'components/lineup/types' diff --git a/packages/web/src/components/link/ExternalLink.tsx b/packages/web/src/components/link/ExternalLink.tsx index 6a0eaadcb7b..2767dc1a086 100644 --- a/packages/web/src/components/link/ExternalLink.tsx +++ b/packages/web/src/components/link/ExternalLink.tsx @@ -1,10 +1,7 @@ import { MouseEvent, useCallback } from 'react' -import { - Name, - isAllowedExternalLink, - useLeavingAudiusModal -} from '@audius/common' +import { isAllowedExternalLink, useLeavingAudiusModal } from '@audius/common' +import { Name } from '@audius/common/models' import { make, useRecord } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/link/UserLink.tsx b/packages/web/src/components/link/UserLink.tsx index 7ed2528826d..764b91cc1c6 100644 --- a/packages/web/src/components/link/UserLink.tsx +++ b/packages/web/src/components/link/UserLink.tsx @@ -1,4 +1,5 @@ -import { ID, cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' +import { ID } from '@audius/common/models' import cn from 'classnames' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/components/menu/CollectionMenu.tsx b/packages/web/src/components/menu/CollectionMenu.tsx index 2dec906e9ac..1d23ad42a8a 100644 --- a/packages/web/src/components/menu/CollectionMenu.tsx +++ b/packages/web/src/components/menu/CollectionMenu.tsx @@ -1,13 +1,15 @@ import { - PlayableType, - ID, - ShareSource, - FavoriteSource, - RepostSource, cacheUsersSelectors, collectionsSocialActions as socialActions, useEditPlaylistModal } from '@audius/common' +import { + ShareSource, + RepostSource, + FavoriteSource, + PlayableType, + ID +} from '@audius/common/models' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/menu/TrackMenu.tsx b/packages/web/src/components/menu/TrackMenu.tsx index 9101f27c08a..b7f18d67825 100644 --- a/packages/web/src/components/menu/TrackMenu.tsx +++ b/packages/web/src/components/menu/TrackMenu.tsx @@ -1,11 +1,6 @@ import { useContext } from 'react' import { - ID, - PlayableType, - FavoriteSource, - RepostSource, - ShareSource, accountSelectors, cacheCollectionsActions, collectionPageSelectors, @@ -18,6 +13,13 @@ import { CommonState, useEditTrackModal } from '@audius/common' +import { + ShareSource, + RepostSource, + FavoriteSource, + PlayableType, + ID +} from '@audius/common/models' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' import { connect, useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/menu/UserMenu.tsx b/packages/web/src/components/menu/UserMenu.tsx index 3c80ecd5704..2e62e54a741 100644 --- a/packages/web/src/components/menu/UserMenu.tsx +++ b/packages/web/src/components/menu/UserMenu.tsx @@ -1,10 +1,8 @@ import { - ID, - FollowSource, - ShareSource, usersSocialActions as socialActions, shareModalUIActions } from '@audius/common' +import { ShareSource, FollowSource, ID } from '@audius/common/models' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/music-confetti/ConnectedMusicConfetti.tsx b/packages/web/src/components/music-confetti/ConnectedMusicConfetti.tsx index 151fa93fae6..9a04ffdf842 100644 --- a/packages/web/src/components/music-confetti/ConnectedMusicConfetti.tsx +++ b/packages/web/src/components/music-confetti/ConnectedMusicConfetti.tsx @@ -3,9 +3,9 @@ import { useCallback } from 'react' import { musicConfettiActions, musicConfettiSelectors, - themeSelectors, - Theme + themeSelectors } from '@audius/common' +import { Theme } from '@audius/common/models' import { useDispatch } from 'react-redux' import { MusicConfetti } from 'components/background-animations/MusicConfetti' diff --git a/packages/web/src/components/nav/Navigator.tsx b/packages/web/src/components/nav/Navigator.tsx index 1c6bfd6e607..1b813b418e4 100644 --- a/packages/web/src/components/nav/Navigator.tsx +++ b/packages/web/src/components/nav/Navigator.tsx @@ -1,4 +1,5 @@ -import { Client } from '@audius/common' +import { Client } from '@audius/common/models' +import {} from '@audius/common' import cn from 'classnames' import { RouteComponentProps, withRouter } from 'react-router-dom' diff --git a/packages/web/src/components/nav/desktop/LeftNav.tsx b/packages/web/src/components/nav/desktop/LeftNav.tsx index 85c3105df5f..8ce7b93e18e 100644 --- a/packages/web/src/components/nav/desktop/LeftNav.tsx +++ b/packages/web/src/components/nav/desktop/LeftNav.tsx @@ -1,14 +1,16 @@ import { MouseEvent, useCallback, useRef, useState } from 'react' import { - FavoriteSource, - Name, - Status, accountSelectors, collectionsSocialActions, - tracksSocialActions, - CreateAccountOpen + tracksSocialActions } from '@audius/common' +import { + Name, + FavoriteSource, + Status, + CreateAccountOpen +} from '@audius/common/models' import { Scrollbar } from '@audius/stems' import { ResizeObserver } from '@juggle/resize-observer' import cn from 'classnames' diff --git a/packages/web/src/components/nav/desktop/NavButton.tsx b/packages/web/src/components/nav/desktop/NavButton.tsx index 34c33169a07..7113a1f598d 100644 --- a/packages/web/src/components/nav/desktop/NavButton.tsx +++ b/packages/web/src/components/nav/desktop/NavButton.tsx @@ -1,12 +1,11 @@ import { useCallback } from 'react' import { - Name, - Status, accountSelectors, uploadActions, uploadSelectors } from '@audius/common' +import { Name, Status } from '@audius/common/models' import { Button, ButtonType, diff --git a/packages/web/src/components/nav/desktop/NavHeader.tsx b/packages/web/src/components/nav/desktop/NavHeader.tsx index cce7fee6277..f28442d5776 100644 --- a/packages/web/src/components/nav/desktop/NavHeader.tsx +++ b/packages/web/src/components/nav/desktop/NavHeader.tsx @@ -1,14 +1,13 @@ import { useCallback, useRef } from 'react' import { - Theme, FeatureFlags, formatCount, accountSelectors, notificationsSelectors, - Name, themeSelectors } from '@audius/common' +import { Name, Theme } from '@audius/common/models' import cn from 'classnames' import { useDispatch } from 'react-redux' import { Link } from 'react-router-dom' diff --git a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx index b1ac918c770..a17c06ecc07 100644 --- a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx +++ b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx @@ -2,10 +2,10 @@ import { removeNullable, FeatureFlags, chatSelectors, - Name, StringKeys } from '@audius/common' import { useAccountHasClaimableRewards } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { IconCrown, IconDashboard, diff --git a/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx b/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx index ed150757cb8..4b18a5b9bc7 100644 --- a/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx +++ b/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx @@ -1,15 +1,14 @@ import { CSSProperties, MouseEvent, ReactNode, useCallback } from 'react' import { - SquareSizes, playerSelectors, cacheTracksSelectors, CommonState, accountSelectors, - averageColorSelectors, - DogEarType + averageColorSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { DogEarType, SquareSizes } from '@audius/common/models' import { IconButton } from '@audius/stems' import { animated, useSpring } from '@react-spring/web' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/AudioNftPlaylistNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/AudioNftPlaylistNavItem.tsx index ccd2834225b..fe11d2eeb9b 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/AudioNftPlaylistNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/AudioNftPlaylistNavItem.tsx @@ -1,4 +1,5 @@ -import { SmartCollectionVariant, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { SmartCollectionVariant } from '@audius/common/models' import { useSelector } from 'react-redux' import { SMART_COLLECTION_MAP } from 'common/store/smart-collection/smartCollections' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/CollectionNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/CollectionNavItem.tsx index 6f52329e9cb..b4f5e8d6f02 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/CollectionNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/CollectionNavItem.tsx @@ -1,18 +1,20 @@ import { useCallback, useState } from 'react' import { - Name, - ID, cacheCollectionsActions, cacheTracksSelectors, cacheCollectionsSelectors, playlistLibraryActions, - PlaylistLibraryKind, - PlaylistLibraryID, shareModalUIActions, - ShareSource, useEditPlaylistModal } from '@audius/common' +import { + Name, + ShareSource, + ID, + PlaylistLibraryID, + PlaylistLibraryKind +} from '@audius/common/models' import { PopupMenuItem } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/CreatePlaylistLibraryItemButton.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/CreatePlaylistLibraryItemButton.tsx index 2b3d6a8de30..68fc6443cb4 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/CreatePlaylistLibraryItemButton.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/CreatePlaylistLibraryItemButton.tsx @@ -1,12 +1,12 @@ import { MutableRefObject, useCallback, useMemo } from 'react' import { - CreatePlaylistSource, accountSelectors, cacheCollectionsActions, playlistLibraryActions, playlistLibraryHelpers } from '@audius/common' +import { CreatePlaylistSource } from '@audius/common/models' import { PopupMenu, IconFolder, diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteCollectionConfirmationModal.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteCollectionConfirmationModal.tsx index b6cade30510..bbd32478eb9 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteCollectionConfirmationModal.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteCollectionConfirmationModal.tsx @@ -1,10 +1,10 @@ import { useCallback } from 'react' import { - ID, cacheCollectionsActions, cacheCollectionsSelectors } from '@audius/common' +import { ID } from '@audius/common/models' import { useDispatch } from 'react-redux' import { SetRequired } from 'type-fest' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteFolderConfirmationModal.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteFolderConfirmationModal.tsx index 17fe9419545..f27c360ad08 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteFolderConfirmationModal.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteFolderConfirmationModal.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Name, accountSelectors, playlistLibraryActions, playlistLibraryHelpers, playlistLibrarySelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { useDispatch } from 'react-redux' import { SetRequired } from 'type-fest' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/EmptyLibraryNavLink.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/EmptyLibraryNavLink.tsx index cb0cf034bc4..9a1cccf8efb 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/EmptyLibraryNavLink.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/EmptyLibraryNavLink.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { CreatePlaylistSource, cacheCollectionsActions } from '@audius/common' +import { cacheCollectionsActions } from '@audius/common' +import { CreatePlaylistSource } from '@audius/common/models' import { useDispatch } from 'react-redux' import { LeftNavLink } from '../LeftNavLink' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/ExplorePlaylistNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/ExplorePlaylistNavItem.tsx index 71c2a7c222a..6038f33dcaf 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/ExplorePlaylistNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/ExplorePlaylistNavItem.tsx @@ -1,4 +1,5 @@ -import { SmartCollectionVariant } from '@audius/common' +import { SmartCollectionVariant } from '@audius/common/models' +import {} from '@audius/common' import { SMART_COLLECTION_MAP } from 'common/store/smart-collection/smartCollections' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistFolderNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistFolderNavItem.tsx index 942bb91491a..cb79338abc3 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistFolderNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistFolderNavItem.tsx @@ -1,14 +1,16 @@ import { useCallback, useState, MouseEvent, useEffect, useMemo } from 'react' import { - PlaylistLibraryFolder, - Name, modalsActions, - PlaylistLibraryID, playlistLibraryActions, - PlaylistLibraryKind, playlistUpdatesSelectors } from '@audius/common' +import { + Name, + PlaylistLibraryID, + PlaylistLibraryKind, + PlaylistLibraryFolder +} from '@audius/common/models' import { IconFolder, IconFolderOutline, diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibrary.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibrary.tsx index 906b6091046..f82656ba686 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibrary.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibrary.tsx @@ -1,10 +1,7 @@ import { MutableRefObject, useCallback } from 'react' -import { - FavoriteSource, - accountSelectors, - collectionsSocialActions -} from '@audius/common' +import { accountSelectors, collectionsSocialActions } from '@audius/common' +import { FavoriteSource } from '@audius/common/models' import cn from 'classnames' import { isEmpty } from 'lodash' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibraryNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibraryNavItem.tsx index 57e637f8861..f2dd2c76bce 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibraryNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibraryNavItem.tsx @@ -1,4 +1,8 @@ -import { PlaylistLibraryItem, SmartCollectionVariant } from '@audius/common' +import { + SmartCollectionVariant, + PlaylistLibraryItem +} from '@audius/common/models' +import {} from '@audius/common' import { AudioNftPlaylistNavItem } from './AudioNftPlaylistNavItem' import { ExplorePlaylistNavItem } from './ExplorePlaylistNavItem' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/useAddAudioNftPlaylistToLibrary.ts b/packages/web/src/components/nav/desktop/PlaylistLibrary/useAddAudioNftPlaylistToLibrary.ts index 8af3f702145..00d76b277c1 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/useAddAudioNftPlaylistToLibrary.ts +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/useAddAudioNftPlaylistToLibrary.ts @@ -1,12 +1,11 @@ import { useEffect } from 'react' import { - FavoriteSource, - SmartCollectionVariant, accountSelectors, collectionsSocialActions, playlistLibraryHelpers } from '@audius/common' +import { FavoriteSource, SmartCollectionVariant } from '@audius/common/models' import { useDispatch } from 'react-redux' import { AUDIO_NFT_PLAYLIST } from 'common/store/smart-collection/smartCollections' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/useSanitizePlaylistLibrary.ts b/packages/web/src/components/nav/desktop/PlaylistLibrary/useSanitizePlaylistLibrary.ts index bd1ef5d1714..da289b78e7f 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/useSanitizePlaylistLibrary.ts +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/useSanitizePlaylistLibrary.ts @@ -1,10 +1,7 @@ import { useEffect } from 'react' -import { - PlaylistLibraryFolder, - accountSelectors, - playlistLibraryActions -} from '@audius/common' +import { accountSelectors, playlistLibraryActions } from '@audius/common' +import { PlaylistLibraryFolder } from '@audius/common/models' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/nav/mobile/ConnectedNavBar.tsx b/packages/web/src/components/nav/mobile/ConnectedNavBar.tsx index aeb92f42743..f53e8549e42 100644 --- a/packages/web/src/components/nav/mobile/ConnectedNavBar.tsx +++ b/packages/web/src/components/nav/mobile/ConnectedNavBar.tsx @@ -1,12 +1,11 @@ import { useCallback, useContext } from 'react' import { - Name, - Status, accountSelectors, notificationsSelectors, searchResultsPageSelectors } from '@audius/common' +import { Name, Status } from '@audius/common/models' import { push as pushRoute, goBack } from 'connected-react-router' import { connect } from 'react-redux' import { withRouter, RouteComponentProps } from 'react-router-dom' diff --git a/packages/web/src/components/nav/mobile/NavBar.tsx b/packages/web/src/components/nav/mobile/NavBar.tsx index 24b1dcbf253..34089a77111 100644 --- a/packages/web/src/components/nav/mobile/NavBar.tsx +++ b/packages/web/src/components/nav/mobile/NavBar.tsx @@ -1,6 +1,7 @@ import { useState, useContext, useCallback, useEffect } from 'react' -import { Status, FeatureFlags, formatCount } from '@audius/common' +import { FeatureFlags, formatCount } from '@audius/common' +import { Status } from '@audius/common/models' import { IconCaretRight, IconRemove, diff --git a/packages/web/src/components/nav/mobile/SignOut.tsx b/packages/web/src/components/nav/mobile/SignOut.tsx index 55287827b87..a4c3423681b 100644 --- a/packages/web/src/components/nav/mobile/SignOut.tsx +++ b/packages/web/src/components/nav/mobile/SignOut.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { Name, signOutActions } from '@audius/common' +import { signOutActions } from '@audius/common' +import { Name } from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx b/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx index d8ccc629d15..683623bcc67 100644 --- a/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx +++ b/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx @@ -1,13 +1,12 @@ import { useCallback } from 'react' import { - Name, - Track, notificationsSelectors, AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType, CollectionEntity, Entity } from '@audius/common' +import { Name, Track } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx b/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx index ca6749d32d2..cf2679bf944 100644 --- a/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx +++ b/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx @@ -1,9 +1,7 @@ import { useCallback } from 'react' -import { - Name, - AnnouncementNotification as AnnouncementNotificationType -} from '@audius/common' +import { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common' +import { Name } from '@audius/common/models' import { MarkdownViewer } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx b/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx index fb13af93f33..c519e7334ce 100644 --- a/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx +++ b/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx @@ -1,10 +1,10 @@ import { useCallback } from 'react' import { - Name, ChallengeRewardNotification as ChallengeRewardNotificationType, audioRewardsPageSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx index 9dbdb5e1750..b3a1b7761b2 100644 --- a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx +++ b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx @@ -1,8 +1,6 @@ import { useCallback } from 'react' import { - Name, - User, Nullable, formatCount, notificationsSelectors, @@ -10,6 +8,7 @@ import { EntityType, MilestoneNotification as MilestoneNotificationType } from '@audius/common' +import { Name, User } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx index 0f660e92ee1..098f0f6a0da 100644 --- a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx +++ b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx @@ -2,11 +2,11 @@ import { useCallback } from 'react' import { Nullable, - Name, notificationsSelectors, RemixCosignNotification as RemixCosignNotificationType, TrackEntity } from '@audius/common' +import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx b/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx index 8f6a571fb88..a510b277854 100644 --- a/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx +++ b/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' import { - Name, notificationsSelectors, RemixCreateNotification as RemixCreateNotificationType, TrackEntity } from '@audius/common' +import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx index 7161594de06..d9343a48419 100644 --- a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx +++ b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Name, Nullable, cacheUsersSelectors, notificationsSelectors, SupporterDethronedNotification as SupporterDethroned } from '@audius/common' +import { Name } from '@audius/common/models' import crown from 'assets/img/crown2x.png' import { useSelector } from 'common/hooks/useSelector' diff --git a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx index 9a41fdd908a..17e298ca931 100644 --- a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx +++ b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Name, Nullable, notificationsSelectors, TrackEntity, TastemakerNotification as TastemakerNotificationType } from '@audius/common' +import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx index f36557ec9e2..ae86737093a 100644 --- a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Name, notificationsSelectors, ReactionNotification, getReactionFromRawValue } from '@audius/common' import { useUIAudio } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { make } from 'common/store/analytics/actions' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx index fce57e93539..297e6cbed10 100644 --- a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx @@ -1,7 +1,6 @@ import { ComponentType, useCallback, useState } from 'react' import { - Name, Nullable, notificationsSelectors, TipReceiveNotification, @@ -11,6 +10,7 @@ import { reactionsUISelectors } from '@audius/common' import { useUIAudio } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/notification/Notification/TipSentNotification.tsx b/packages/web/src/components/notification/Notification/TipSentNotification.tsx index 8c0cf74502d..16b5c1d1dc8 100644 --- a/packages/web/src/components/notification/Notification/TipSentNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipSentNotification.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' -import { - Name, - notificationsSelectors, - TipSendNotification -} from '@audius/common' +import { notificationsSelectors, TipSendNotification } from '@audius/common' import { useUIAudio } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { make } from 'common/store/analytics/actions' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx b/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx index cd55f38f6fc..412a11e14dc 100644 --- a/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx +++ b/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx @@ -1,10 +1,10 @@ import { useCallback } from 'react' import { - Name, notificationsSelectors, SupporterRankUpNotification } from '@audius/common' +import { Name } from '@audius/common/models' import IconTrending from 'assets/img/iconTrending.svg' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx b/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx index 05b001785ed..95c7e260b07 100644 --- a/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx +++ b/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx @@ -1,10 +1,10 @@ import { useCallback } from 'react' import { - Name, notificationsSelectors, SupportingRankUpNotification } from '@audius/common' +import { Name } from '@audius/common/models' import IconTrending from 'assets/img/iconTrending.svg' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx index 586aaaea6d0..4bb934d7fd8 100644 --- a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Name, Nullable, notificationsSelectors, TrendingPlaylistNotification as TrendingPlaylistNotificationType, CollectionEntity } from '@audius/common' +import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx index a94bdbe7585..a14b0b34b4f 100644 --- a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Name, Nullable, notificationsSelectors, TrackEntity, TrendingTrackNotification as TrendingTrackNotificationType } from '@audius/common' +import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx index 9a908fb8933..7f9d42a0675 100644 --- a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Name, Nullable, notificationsSelectors, TrackEntity, TrendingUndergroundNotification as TrendingUndergroundNotificationType } from '@audius/common' +import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx index 14da73675a5..377167a4e1e 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx @@ -2,12 +2,12 @@ import { useCallback } from 'react' import { Nullable, - Name, USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType, TrackEntity, Entity, notificationsSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx index bb181a6985c..2332b8a1eae 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx @@ -5,11 +5,11 @@ import { formatUSDCWeiToUSDString, notificationsSelectors, Nullable, - StringUSDC, stringUSDCToBN, TrackEntity, USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType } from '@audius/common' +import { StringUSDC } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx b/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx index 29a36f31014..1a022cc1b8e 100644 --- a/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx +++ b/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' import { - Name, notificationsSelectors, Entity, UserSubscriptionNotification as UserSubscriptionNotificationType } from '@audius/common' +import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/EntityLink.tsx b/packages/web/src/components/notification/Notification/components/EntityLink.tsx index 8b3490f71c7..ee4d120e8a0 100644 --- a/packages/web/src/components/notification/Notification/components/EntityLink.tsx +++ b/packages/web/src/components/notification/Notification/components/EntityLink.tsx @@ -1,6 +1,7 @@ import { MouseEventHandler, useCallback } from 'react' -import { Name, Collection, Track, User, Nullable, Entity } from '@audius/common' +import { Nullable, Entity } from '@audius/common' +import { Name, Collection, Track, User } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/ProfilePicture.tsx b/packages/web/src/components/notification/Notification/components/ProfilePicture.tsx index c226fce5e4d..7aaf19d2a0d 100644 --- a/packages/web/src/components/notification/Notification/components/ProfilePicture.tsx +++ b/packages/web/src/components/notification/Notification/components/ProfilePicture.tsx @@ -1,6 +1,8 @@ import { MouseEventHandler, useCallback, useEffect, useState } from 'react' -import { SquareSizes, User } from '@audius/common' +import { SquareSizes, User } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/TrackContent.tsx b/packages/web/src/components/notification/Notification/components/TrackContent.tsx index 7eb1edb1f12..93737c39c35 100644 --- a/packages/web/src/components/notification/Notification/components/TrackContent.tsx +++ b/packages/web/src/components/notification/Notification/components/TrackContent.tsx @@ -1,4 +1,5 @@ -import { SquareSizes, TrackEntity } from '@audius/common' +import { TrackEntity } from '@audius/common' +import { SquareSizes } from '@audius/common/models' import CoSign, { Size } from 'components/co-sign/CoSign' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/components/notification/Notification/components/UserNameLink.tsx b/packages/web/src/components/notification/Notification/components/UserNameLink.tsx index f76ce3dd009..b40d6dc11c9 100644 --- a/packages/web/src/components/notification/Notification/components/UserNameLink.tsx +++ b/packages/web/src/components/notification/Notification/components/UserNameLink.tsx @@ -1,6 +1,7 @@ import { MouseEventHandler, useCallback } from 'react' -import { Name, User, Notification } from '@audius/common' +import { Notification } from '@audius/common' +import { Name, User } from '@audius/common/models' import cn from 'classnames' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/UserProfilePictureList.tsx b/packages/web/src/components/notification/Notification/components/UserProfilePictureList.tsx index 2c2eab79c82..66cc2daa20b 100644 --- a/packages/web/src/components/notification/Notification/components/UserProfilePictureList.tsx +++ b/packages/web/src/components/notification/Notification/components/UserProfilePictureList.tsx @@ -1,4 +1,5 @@ -import { User, formatCount } from '@audius/common' +import { formatCount } from '@audius/common' +import { User } from '@audius/common/models' import cn from 'classnames' import Tooltip from 'components/tooltip/Tooltip' diff --git a/packages/web/src/components/notification/Notification/useGoToProfile.ts b/packages/web/src/components/notification/Notification/useGoToProfile.ts index eec196f1bd0..c6c60652d18 100644 --- a/packages/web/src/components/notification/Notification/useGoToProfile.ts +++ b/packages/web/src/components/notification/Notification/useGoToProfile.ts @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { User, Nullable } from '@audius/common' +import { Nullable } from '@audius/common' +import { User } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/NotificationPage.tsx b/packages/web/src/components/notification/NotificationPage.tsx index 314b5ef43ed..87fb57d8c36 100644 --- a/packages/web/src/components/notification/NotificationPage.tsx +++ b/packages/web/src/components/notification/NotificationPage.tsx @@ -1,11 +1,11 @@ import { useEffect, useCallback, useContext } from 'react' import { - Status, notificationsSelectors, Notification as Notifications, notificationsActions } from '@audius/common' +import { Status } from '@audius/common/models' import InfiniteScroll from 'react-infinite-scroller' import Lottie from 'react-lottie' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/notification/NotificationPanel.tsx b/packages/web/src/components/notification/NotificationPanel.tsx index 437990669d4..fa54aacf9de 100644 --- a/packages/web/src/components/notification/NotificationPanel.tsx +++ b/packages/web/src/components/notification/NotificationPanel.tsx @@ -1,12 +1,12 @@ import { useRef, useCallback, useEffect, RefObject } from 'react' import { - Status, Nullable, notificationsSelectors, Notification as Notifications, notificationsActions } from '@audius/common' +import { Status } from '@audius/common/models' import { Popup, PopupPosition, Scrollbar } from '@audius/stems' import InfiniteScroll from 'react-infinite-scroller' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/now-playing/NowPlaying.tsx b/packages/web/src/components/now-playing/NowPlaying.tsx index 0392b31898d..ecd9e975d8b 100644 --- a/packages/web/src/components/now-playing/NowPlaying.tsx +++ b/packages/web/src/components/now-playing/NowPlaying.tsx @@ -1,13 +1,6 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { - ID, - FavoriteSource, - RepostSource, - PlaybackSource, - Name, - ShareSource, - SquareSizes, Genre, accountSelectors, averageColorSelectors, @@ -23,13 +16,22 @@ import { playerSelectors, queueSelectors, playbackRateValueMap, - DogEarType, gatedContentSelectors, usePremiumContentPurchaseModal, - ModalSource, FeatureFlags } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { + Name, + ShareSource, + RepostSource, + FavoriteSource, + PlaybackSource, + ModalSource, + DogEarType, + SquareSizes, + ID +} from '@audius/common/models' import { Scrubber } from '@audius/stems' import { Location } from 'history' import { connect, useSelector } from 'react-redux' diff --git a/packages/web/src/components/password-reset/PasswordResetModal.tsx b/packages/web/src/components/password-reset/PasswordResetModal.tsx index dde07421f16..a0b41fb56b6 100644 --- a/packages/web/src/components/password-reset/PasswordResetModal.tsx +++ b/packages/web/src/components/password-reset/PasswordResetModal.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react' -import { Status, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { Flex, Text } from '@audius/harmony' import { Modal } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/password-reset/store/reducer.ts b/packages/web/src/components/password-reset/store/reducer.ts index dc6c75fbc82..3ac7cb9186c 100644 --- a/packages/web/src/components/password-reset/store/reducer.ts +++ b/packages/web/src/components/password-reset/store/reducer.ts @@ -1,4 +1,5 @@ -import { Status } from '@audius/common' +import { Status } from '@audius/common/models' +import {} from '@audius/common' import { ActionsMap } from 'utils/reducer' diff --git a/packages/web/src/components/password-reset/store/types.ts b/packages/web/src/components/password-reset/store/types.ts index c21ccd67998..ed3880acb24 100644 --- a/packages/web/src/components/password-reset/store/types.ts +++ b/packages/web/src/components/password-reset/store/types.ts @@ -1,4 +1,5 @@ -import { Status } from '@audius/common' +import { Status } from '@audius/common/models' +import {} from '@audius/common' export type PasswordResetState = { status: Status diff --git a/packages/web/src/components/payment-method/PaymentMethod.tsx b/packages/web/src/components/payment-method/PaymentMethod.tsx index 62073bc4ee9..50e2bdbe120 100644 --- a/packages/web/src/components/payment-method/PaymentMethod.tsx +++ b/packages/web/src/components/payment-method/PaymentMethod.tsx @@ -1,13 +1,11 @@ import { CSSProperties, ChangeEvent, useCallback } from 'react' import { - BNUSDC, Nullable, - PurchaseMethod, - PurchaseVendor, formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber } from '@audius/common' +import { PurchaseMethod, PurchaseVendor, BNUSDC } from '@audius/common/models' import { FilterButton, Flex, diff --git a/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx b/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx index 05220cf0fb7..f35a19ace33 100644 --- a/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx +++ b/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx @@ -1,6 +1,7 @@ import { memo } from 'react' -import { ID, accountSelectors, tracksSocialActions } from '@audius/common' +import { accountSelectors, tracksSocialActions } from '@audius/common' +import { ID } from '@audius/common/models' import { Modal, Button, ButtonSize, ButtonType } from '@audius/stems' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/play-bar/desktop/PlayBar.jsx b/packages/web/src/components/play-bar/desktop/PlayBar.jsx index d2e663d0d5b..aaa13c4042b 100644 --- a/packages/web/src/components/play-bar/desktop/PlayBar.jsx +++ b/packages/web/src/components/play-bar/desktop/PlayBar.jsx @@ -1,10 +1,6 @@ import { Component } from 'react' import { - RepostSource, - FavoriteSource, - Name, - PlaybackSource, Genre, accountSelectors, lineupSelectors, @@ -17,9 +13,15 @@ import { queueSelectors, FeatureFlags, playbackRateValueMap, - cacheTracksSelectors, - Kind + cacheTracksSelectors } from '@audius/common' +import { + Name, + RepostSource, + FavoriteSource, + PlaybackSource, + Kind +} from '@audius/common/models' import { Scrubber } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx b/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx index abfd18904d0..4cb2cc77b25 100644 --- a/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx +++ b/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx @@ -1,15 +1,17 @@ import { memo, useEffect } from 'react' import { - ID, - Color, - ProfilePictureSizes, - SquareSizes, CommonState, cacheTracksSelectors, playerSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { + SquareSizes, + Color, + ID, + ProfilePictureSizes +} from '@audius/common/models' import cn from 'classnames' import { useSelector } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx b/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx index 596319278ad..8cc80901ecf 100644 --- a/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx +++ b/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx @@ -1,15 +1,12 @@ import { - ID, - UID, usePremiumContentPurchaseModal, gatedContentSelectors, themeSelectors, - Theme, cacheTracksSelectors, - CommonState, - ModalSource + CommonState } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { ModalSource, Theme, ID, UID } from '@audius/common/models' import { useSelector } from 'react-redux' import FavoriteButton from 'components/alt-button/FavoriteButton' diff --git a/packages/web/src/components/play-bar/mobile/PlayBar.tsx b/packages/web/src/components/play-bar/mobile/PlayBar.tsx index 8c42d78bc20..a0e4f67fb2f 100644 --- a/packages/web/src/components/play-bar/mobile/PlayBar.tsx +++ b/packages/web/src/components/play-bar/mobile/PlayBar.tsx @@ -1,17 +1,19 @@ import { useEffect, useState } from 'react' import { - ID, - FavoriteSource, - Name, - PlaybackSource, - SquareSizes, queueActions, tracksSocialActions, playerSelectors, queueSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { + Name, + FavoriteSource, + PlaybackSource, + SquareSizes, + ID +} from '@audius/common/models' import { IconLock } from '@audius/stems' import cn from 'classnames' import { connect, useSelector } from 'react-redux' diff --git a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx index 7c0c1c07cd8..3f3d9db72f5 100644 --- a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx @@ -2,15 +2,13 @@ import { useCallback, useEffect } from 'react' import { PurchaseContentStage, - Track, usePremiumContentPurchaseModal, buyUSDCActions, purchaseContentActions, purchaseContentSelectors, isContentPurchaseInProgress, PurchaseContentPage, - FeatureFlags, - PurchaseVendor + FeatureFlags } from '@audius/common' import { useGetTrackById } from '@audius/common/api' import { @@ -20,6 +18,7 @@ import { usePayExtraPresets, isTrackPurchaseable } from '@audius/common/hooks' +import { PurchaseVendor, Track } from '@audius/common/models' import { USDC } from '@audius/fixed-decimal' import { Flex } from '@audius/harmony' import { diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PayToUnlockInfo.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PayToUnlockInfo.tsx index 4847d60cb61..3974e618663 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PayToUnlockInfo.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PayToUnlockInfo.tsx @@ -1,6 +1,8 @@ import { useCallback } from 'react' -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' + +import {} from '@audius/common' import { Link } from 'react-router-dom' import { LockedStatusBadge } from 'components/track/LockedStatusBadge' diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx index c7058cf20d9..87ca3347cad 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx @@ -1,12 +1,6 @@ import { useCallback, useEffect } from 'react' -import { - PurchaseContentStage, - PurchaseVendor, - PurchaseMethod, - FeatureFlags, - IntKeys -} from '@audius/common' +import { PurchaseContentStage, FeatureFlags, IntKeys } from '@audius/common' import { useFeatureFlag, useRemoteVar, @@ -16,6 +10,7 @@ import { PURCHASE_VENDOR, usePurchaseMethod } from '@audius/common/hooks' +import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { Flex } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx index 4a0907cb59e..f55d241b9e4 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { - Name, PurchaseContentError, PurchaseContentStage, formatPrice @@ -10,6 +9,7 @@ import { PurchaseableTrackMetadata, usePurchaseContentErrorMessage } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { Button } from '@audius/harmony' import { HarmonyPlainButton, diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts index 4a040dc3f00..8a6f8af305a 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts @@ -1,4 +1,4 @@ -import { Nullable, BNUSDC, getPurchaseSummaryValues } from '@audius/common' +import { Nullable, getPurchaseSummaryValues } from '@audius/common' import { useUSDCPurchaseConfig, usePayExtraPresets, @@ -7,6 +7,7 @@ import { CUSTOM_AMOUNT, AMOUNT_PRESET } from '@audius/common/hooks' +import { BNUSDC } from '@audius/common/models' import { useField } from 'formik' export const usePurchaseSummaryValues = ({ diff --git a/packages/web/src/components/profile-info/ProfileInfo.tsx b/packages/web/src/components/profile-info/ProfileInfo.tsx index 30b0fc21c19..7fe52168f69 100644 --- a/packages/web/src/components/profile-info/ProfileInfo.tsx +++ b/packages/web/src/components/profile-info/ProfileInfo.tsx @@ -1,4 +1,5 @@ -import { SquareSizes, User, Nullable } from '@audius/common' +import { Nullable } from '@audius/common' +import { SquareSizes, User } from '@audius/common/models' import cn from 'classnames' import UserBadges from 'components/user-badges/UserBadges' diff --git a/packages/web/src/components/profile-picture/ProfilePicture.jsx b/packages/web/src/components/profile-picture/ProfilePicture.jsx index eccf9d3b839..9e1ad22820b 100644 --- a/packages/web/src/components/profile-picture/ProfilePicture.jsx +++ b/packages/web/src/components/profile-picture/ProfilePicture.jsx @@ -1,6 +1,8 @@ import { memo, useState, useEffect } from 'react' -import { SquareSizes } from '@audius/common' +import { SquareSizes } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import PropTypes from 'prop-types' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/profile-progress/hooks/index.js b/packages/web/src/components/profile-progress/hooks/index.js index 5b5df204a2f..35da53cbfd5 100644 --- a/packages/web/src/components/profile-progress/hooks/index.js +++ b/packages/web/src/components/profile-progress/hooks/index.js @@ -1,6 +1,8 @@ import { useState, useEffect } from 'react' -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' + +import {} from '@audius/common' import { useDispatch } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useTransition } from 'react-spring' diff --git a/packages/web/src/components/related-artists/RelatedArtists.tsx b/packages/web/src/components/related-artists/RelatedArtists.tsx index 78162669411..dca453da922 100644 --- a/packages/web/src/components/related-artists/RelatedArtists.tsx +++ b/packages/web/src/components/related-artists/RelatedArtists.tsx @@ -1,6 +1,8 @@ +import { User } from '@audius/common/models' + import { useCallback } from 'react' -import type { User } from '@audius/common' +import type {} from '@audius/common' import { profilePageSelectors, MAX_PROFILE_RELATED_ARTISTS, diff --git a/packages/web/src/components/remix-card/ConnectedRemixCard.tsx b/packages/web/src/components/remix-card/ConnectedRemixCard.tsx index 146277db25c..562d503587c 100644 --- a/packages/web/src/components/remix-card/ConnectedRemixCard.tsx +++ b/packages/web/src/components/remix-card/ConnectedRemixCard.tsx @@ -1,11 +1,7 @@ import { useCallback } from 'react' -import { - ID, - SquareSizes, - cacheTracksSelectors, - cacheUsersSelectors -} from '@audius/common' +import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common' +import { SquareSizes, ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/remix-card/RemixCard.tsx b/packages/web/src/components/remix-card/RemixCard.tsx index 7bfd2ada998..af6eafa4adc 100644 --- a/packages/web/src/components/remix-card/RemixCard.tsx +++ b/packages/web/src/components/remix-card/RemixCard.tsx @@ -1,4 +1,5 @@ -import { ID, Remix } from '@audius/common' +import { ID, Remix } from '@audius/common/models' +import {} from '@audius/common' import { ArtistPopover } from 'components/artist/ArtistPopover' import CoSign from 'components/co-sign/CoSign' diff --git a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx index aea17192aa7..f6951437f71 100644 --- a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx +++ b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx @@ -1,13 +1,11 @@ import { useEffect } from 'react' import { - ID, - Status, remixSettingsSelectors, remixSettingsActions, - Nullable, - AccessConditions + Nullable } from '@audius/common' +import { Status, ID, AccessConditions } from '@audius/common/models' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/remix-settings-modal/RemixSettingsModal.tsx b/packages/web/src/components/remix-settings-modal/RemixSettingsModal.tsx index fbd5566aed5..7e98ab2a6c4 100644 --- a/packages/web/src/components/remix-settings-modal/RemixSettingsModal.tsx +++ b/packages/web/src/components/remix-settings-modal/RemixSettingsModal.tsx @@ -1,15 +1,15 @@ import { useCallback, useState, useEffect, useRef } from 'react' +import { Nullable } from '@audius/common' import { + SquareSizes, + isContentCollectibleGated, + isContentUSDCPurchaseGated, ID, - Nullable, AccessConditions, - SquareSizes, Track, - User, - isContentCollectibleGated, - isContentUSDCPurchaseGated -} from '@audius/common' + User +} from '@audius/common/models' import { Modal, Button, diff --git a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx index 690bac79e5f..ee379c670d5 100644 --- a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx +++ b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx @@ -1,12 +1,11 @@ import { Component } from 'react' import { - Name, - SquareSizes, getTierForUser, imageBlank as placeholderArt, imageProfilePicEmpty as profilePicEmpty } from '@audius/common' +import { Name, SquareSizes } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { has } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/components/search-bar/SearchBar.tsx b/packages/web/src/components/search-bar/SearchBar.tsx index 9b55a3510d8..0be9c9509d3 100644 --- a/packages/web/src/components/search-bar/SearchBar.tsx +++ b/packages/web/src/components/search-bar/SearchBar.tsx @@ -1,6 +1,8 @@ import { ChangeEvent, KeyboardEvent } from 'react' -import { Status } from '@audius/common' +import { Status } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx index e2a4fd21d9f..9e6d2adcaca 100644 --- a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx +++ b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx @@ -10,12 +10,10 @@ import { import { cacheUsersSelectors, searchUsersModalSelectors, - searchUsersModalActions, - User, - ID, - Status + searchUsersModalActions } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status, ID, User } from '@audius/common/models' import { IconButton, IconRemove, diff --git a/packages/web/src/components/search/SearchBar.jsx b/packages/web/src/components/search/SearchBar.jsx index 5735b022dfa..8486e475212 100644 --- a/packages/web/src/components/search/SearchBar.jsx +++ b/packages/web/src/components/search/SearchBar.jsx @@ -1,6 +1,8 @@ import { createRef, Component } from 'react' -import { Kind, Status } from '@audius/common' +import { Kind, Status } from '@audius/common/models' + +import {} from '@audius/common' import AutoComplete from 'antd/lib/auto-complete' import Input from 'antd/lib/input' import cn from 'classnames' diff --git a/packages/web/src/components/search/SearchBarResult.jsx b/packages/web/src/components/search/SearchBarResult.jsx index 9b323653630..db079ec5118 100644 --- a/packages/web/src/components/search/SearchBarResult.jsx +++ b/packages/web/src/components/search/SearchBarResult.jsx @@ -1,6 +1,7 @@ import { useState, useEffect, memo } from 'react' -import { Kind, imageBlank as placeholderArt } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common' +import { Kind } from '@audius/common/models' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/search/SearchTag.tsx b/packages/web/src/components/search/SearchTag.tsx index ae732507e38..d37498da274 100644 --- a/packages/web/src/components/search/SearchTag.tsx +++ b/packages/web/src/components/search/SearchTag.tsx @@ -1,6 +1,8 @@ import { useCallback, MouseEvent } from 'react' -import { AllTrackingEvents, Name } from '@audius/common' +import { Name, AllTrackingEvents } from '@audius/common/models' + +import {} from '@audius/common' import { Tag } from '@audius/stems' import type { TagProps } from '@audius/stems' import { Link } from 'react-router-dom' diff --git a/packages/web/src/components/share-modal/ShareModal.tsx b/packages/web/src/components/share-modal/ShareModal.tsx index 841175c6f2f..7a38de30e53 100644 --- a/packages/web/src/components/share-modal/ShareModal.tsx +++ b/packages/web/src/components/share-modal/ShareModal.tsx @@ -1,7 +1,6 @@ import { useCallback, useContext } from 'react' import { - Name, FeatureFlags, accountSelectors, collectionsSocialActions, @@ -10,9 +9,9 @@ import { shareModalUISelectors, shareSoundToTiktokModalActions, modalsActions, - PlayableType, useCreateChatModal } from '@audius/common' +import { Name, PlayableType } from '@audius/common/models' import { useDispatch } from 'react-redux' import { make, useRecord } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/share-modal/utils.ts b/packages/web/src/components/share-modal/utils.ts index 94b9fcc1bb9..2afae7b1de9 100644 --- a/packages/web/src/components/share-modal/utils.ts +++ b/packages/web/src/components/share-modal/utils.ts @@ -1,4 +1,5 @@ -import { ShareToTwitter, ShareContent } from '@audius/common' +import { ShareContent } from '@audius/common' +import { ShareToTwitter } from '@audius/common/models' import { getTwitterHandleByUserHandle } from 'components/notification/Notification/utils' import { diff --git a/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts b/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts index 725cdd76986..18b6c536ad2 100644 --- a/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts +++ b/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts @@ -1,5 +1,4 @@ import { - Name, getContext, getErrorMessage, encodeHashId, @@ -10,6 +9,7 @@ import { shareSoundToTiktokModalSelectors, musicConfettiActions } from '@audius/common' +import { Name } from '@audius/common/models' import { takeEvery, put, call, select } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/social-proof/SocialProof.tsx b/packages/web/src/components/social-proof/SocialProof.tsx index 92224dab112..f62fcd3643b 100644 --- a/packages/web/src/components/social-proof/SocialProof.tsx +++ b/packages/web/src/components/social-proof/SocialProof.tsx @@ -1,8 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { - Name, - Status, BooleanKeys, accountSelectors, TwitterProfile, @@ -10,6 +8,7 @@ import { accountActions, TikTokProfile } from '@audius/common' +import { Name, Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import IconValidationX from 'assets/img/iconValidationX.svg' diff --git a/packages/web/src/components/source-files-modal/SourceFilesModal.tsx b/packages/web/src/components/source-files-modal/SourceFilesModal.tsx index 42033fe2bed..52fbd19815d 100644 --- a/packages/web/src/components/source-files-modal/SourceFilesModal.tsx +++ b/packages/web/src/components/source-files-modal/SourceFilesModal.tsx @@ -5,7 +5,9 @@ import { stemCategoryFriendlyNames, StemUpload, Download -} from '@audius/common' +} from '@audius/common/models' + +import {} from '@audius/common' import { Button, ButtonSize, diff --git a/packages/web/src/components/stat-banner/StatBanner.tsx b/packages/web/src/components/stat-banner/StatBanner.tsx index 3c121e0de2c..c05bf2d6f11 100644 --- a/packages/web/src/components/stat-banner/StatBanner.tsx +++ b/packages/web/src/components/stat-banner/StatBanner.tsx @@ -1,6 +1,7 @@ import { useRef } from 'react' -import { FeatureFlags, ID } from '@audius/common' +import { FeatureFlags } from '@audius/common' +import { ID } from '@audius/common/models' import { Button, ButtonSize, diff --git a/packages/web/src/components/stats/Stats.tsx b/packages/web/src/components/stats/Stats.tsx index 87709b65fd7..96b48574c59 100644 --- a/packages/web/src/components/stats/Stats.tsx +++ b/packages/web/src/components/stats/Stats.tsx @@ -1,4 +1,5 @@ -import { ID, formatCount } from '@audius/common' +import { formatCount } from '@audius/common' +import { ID } from '@audius/common/models' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/suggested-tracks/SuggestedCollectionTracks.tsx b/packages/web/src/components/suggested-tracks/SuggestedCollectionTracks.tsx index e5f6e24b903..4c2a86ee99d 100644 --- a/packages/web/src/components/suggested-tracks/SuggestedCollectionTracks.tsx +++ b/packages/web/src/components/suggested-tracks/SuggestedCollectionTracks.tsx @@ -1,4 +1,5 @@ -import { ID, Status } from '@audius/common' +import { Status, ID } from '@audius/common/models' +import {} from '@audius/common' import { useGetPlaylistById, useGetSuggestedAlbumTracks, diff --git a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx index 9306a493419..c1fa89fe091 100644 --- a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx +++ b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' -import { ID, SquareSizes, Track, cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' import { SuggestedTrack } from '@audius/common/api' +import { SquareSizes, ID, Track } from '@audius/common/models' import type {} from '@audius/common' import { Button, diff --git a/packages/web/src/components/table/Table.tsx b/packages/web/src/components/table/Table.tsx index 2df2a073f90..440664e68a3 100644 --- a/packages/web/src/components/table/Table.tsx +++ b/packages/web/src/components/table/Table.tsx @@ -7,7 +7,9 @@ import { useState } from 'react' -import { ID, Kind, TrackMetadata } from '@audius/common' +import { Kind, ID, TrackMetadata } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import { debounce, range } from 'lodash' import moment from 'moment' diff --git a/packages/web/src/components/tile/Tile.tsx b/packages/web/src/components/tile/Tile.tsx index ecb3db4710a..f823a4566d6 100644 --- a/packages/web/src/components/tile/Tile.tsx +++ b/packages/web/src/components/tile/Tile.tsx @@ -7,7 +7,9 @@ import { Ref } from 'react' -import { DogEarType } from '@audius/common' +import { DogEarType } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import { DogEar } from 'components/dog-ear' diff --git a/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx b/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx index 21ffb08619a..0c27ea0bd3f 100644 --- a/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx +++ b/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx @@ -1,13 +1,12 @@ import { useCallback, useEffect, useRef } from 'react' import { - Name, - User, accountSelectors, cacheUsersSelectors, tippingSelectors, tippingActions } from '@audius/common' +import { Name, User } from '@audius/common/models' import { IconButton, PillButton } from '@audius/stems' import { ResizeObserver } from '@juggle/resize-observer' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/tipping/support/SupportingList.tsx b/packages/web/src/components/tipping/support/SupportingList.tsx index c99914a2ceb..58536ddc652 100644 --- a/packages/web/src/components/tipping/support/SupportingList.tsx +++ b/packages/web/src/components/tipping/support/SupportingList.tsx @@ -3,10 +3,10 @@ import { useCallback } from 'react' import { profilePageSelectors, MAX_PROFILE_SUPPORTING_TILES, - User, formatCount } from '@audius/common' import { useRankedSupportingForUser } from '@audius/common/hooks' +import { User } from '@audius/common/models' import { IconArrow } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/tipping/support/SupportingTile.tsx b/packages/web/src/components/tipping/support/SupportingTile.tsx index 92ac5b2a4da..52ffab8d984 100644 --- a/packages/web/src/components/tipping/support/SupportingTile.tsx +++ b/packages/web/src/components/tipping/support/SupportingTile.tsx @@ -1,15 +1,17 @@ import { useCallback } from 'react' import { - SquareSizes, - WidthSizes, - Supporting, - User, Nullable, cacheUsersSelectors, imageCoverPhotoBlank, imageProfilePicEmpty as profilePicEmpty } from '@audius/common' +import { + SquareSizes, + WidthSizes, + Supporting, + User +} from '@audius/common/models' import { IconTrophy } from '@audius/stems' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/tipping/support/TopSupporters.tsx b/packages/web/src/components/tipping/support/TopSupporters.tsx index bf109a29743..02d01a7300e 100644 --- a/packages/web/src/components/tipping/support/TopSupporters.tsx +++ b/packages/web/src/components/tipping/support/TopSupporters.tsx @@ -1,13 +1,12 @@ import { useCallback } from 'react' import { - ID, - User, cacheUsersSelectors, profilePageSelectors, tippingSelectors, MAX_PROFILE_TOP_SUPPORTERS } from '@audius/common' +import { ID, User } from '@audius/common/models' import { IconTrophy } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/SendTip.tsx b/packages/web/src/components/tipping/tip-audio/SendTip.tsx index e6e0bea1b0c..06831aba82d 100644 --- a/packages/web/src/components/tipping/tip-audio/SendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/SendTip.tsx @@ -7,10 +7,6 @@ import { } from 'react' import { - BadgeTier, - BNWei, - StringAudio, - StringWei, formatWei, stringWeiToBN, weiToString, @@ -26,6 +22,7 @@ import { isNullOrUndefined } from '@audius/common' import { useGetFirstOrTopSupporter } from '@audius/common/hooks' +import { BadgeTier, StringWei, StringAudio, BNWei } from '@audius/common/models' import { IconTrophy, TokenAmountInput, diff --git a/packages/web/src/components/tipping/tip-audio/TipSent.tsx b/packages/web/src/components/tipping/tip-audio/TipSent.tsx index b69ab965f72..bab8a19253d 100644 --- a/packages/web/src/components/tipping/tip-audio/TipSent.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipSent.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Name, formatNumberCommas, accountSelectors, tippingSelectors, deriveUserBankAddress } from '@audius/common' +import { Name } from '@audius/common/models' import { Button, ButtonType, IconTwitterBird, IconCheck } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx index 8bb07bb6b64..e09f193579a 100644 --- a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx +++ b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx @@ -1,9 +1,4 @@ import { - FavoriteSource, - FollowSource, - ID, - RepostSource, - ShareSource, cacheCollectionsActions, cacheCollectionsSelectors, cacheTracksSelectors, @@ -23,6 +18,13 @@ import { useEditPlaylistModal, FeatureFlags } from '@audius/common' +import { + ShareSource, + RepostSource, + FavoriteSource, + FollowSource, + ID +} from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/AiTrackSection.tsx b/packages/web/src/components/track/AiTrackSection.tsx index d3f9b163bea..429ec681ee9 100644 --- a/packages/web/src/components/track/AiTrackSection.tsx +++ b/packages/web/src/components/track/AiTrackSection.tsx @@ -1,11 +1,7 @@ import { useCallback, useEffect } from 'react' -import { - ID, - User, - cacheUsersSelectors, - cacheUsersActions -} from '@audius/common' +import { cacheUsersSelectors, cacheUsersActions } from '@audius/common' +import { ID, User } from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/track/Artwork.tsx b/packages/web/src/components/track/Artwork.tsx index 869469e074d..0496dca12b5 100644 --- a/packages/web/src/components/track/Artwork.tsx +++ b/packages/web/src/components/track/Artwork.tsx @@ -1,6 +1,8 @@ +import { SquareSizes, ID, CoverArtSizes } from '@audius/common/models' + import { memo } from 'react' -import { ID, SquareSizes, CoverArtSizes } from '@audius/common' +import {} from '@audius/common' import { useLoadImageWithTimeout } from '@audius/common/hooks' import { PbIconPlay as IconPlay, diff --git a/packages/web/src/components/track/CardTitle.tsx b/packages/web/src/components/track/CardTitle.tsx index b55c37e1026..d96f08e6576 100644 --- a/packages/web/src/components/track/CardTitle.tsx +++ b/packages/web/src/components/track/CardTitle.tsx @@ -1,10 +1,9 @@ +import { FeatureFlags, Nullable } from '@audius/common' import { - FeatureFlags, - Nullable, - AccessConditions, isContentCollectibleGated, - isContentUSDCPurchaseGated -} from '@audius/common' + isContentUSDCPurchaseGated, + AccessConditions +} from '@audius/common/models' import { IconCart, IconCollectible, IconSpecialAccess } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/DownloadRow.tsx b/packages/web/src/components/track/DownloadRow.tsx index ef25c6cb4f8..c48a65cddce 100644 --- a/packages/web/src/components/track/DownloadRow.tsx +++ b/packages/web/src/components/track/DownloadRow.tsx @@ -1,13 +1,8 @@ import { useCallback } from 'react' -import { - CommonState, - ID, - cacheTracksSelectors, - DownloadQuality, - toastActions -} from '@audius/common' +import { CommonState, cacheTracksSelectors, toastActions } from '@audius/common' import { useDownloadableContentAccess } from '@audius/common/hooks' +import { DownloadQuality, ID } from '@audius/common/models' import { Flex, IconReceive, PlainButton, Text } from '@audius/harmony' import { useDispatch, shallowEqual, useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/DownloadSection.tsx b/packages/web/src/components/track/DownloadSection.tsx index 718514ad5c8..c9c30350579 100644 --- a/packages/web/src/components/track/DownloadSection.tsx +++ b/packages/web/src/components/track/DownloadSection.tsx @@ -1,17 +1,15 @@ import { useCallback, useState } from 'react' import { - ID, CommonState, cacheTracksSelectors, - DownloadQuality, - usePremiumContentPurchaseModal, - ModalSource + usePremiumContentPurchaseModal } from '@audius/common' import { useCurrentStems, useDownloadableContentAccess } from '@audius/common/hooks' +import { ModalSource, DownloadQuality, ID } from '@audius/common/models' import { USDC } from '@audius/fixed-decimal' import { Flex, diff --git a/packages/web/src/components/track/DynamicTrackArtwork.tsx b/packages/web/src/components/track/DynamicTrackArtwork.tsx index 0349657325b..b8134bd6a79 100644 --- a/packages/web/src/components/track/DynamicTrackArtwork.tsx +++ b/packages/web/src/components/track/DynamicTrackArtwork.tsx @@ -1,4 +1,5 @@ -import { SquareSizes, statusIsNotFinalized, ID } from '@audius/common' +import { SquareSizes, statusIsNotFinalized, ID } from '@audius/common/models' +import {} from '@audius/common' import { useGetTrackById } from '@audius/common/api' import cn from 'classnames' diff --git a/packages/web/src/components/track/EditTrackModal.jsx b/packages/web/src/components/track/EditTrackModal.jsx index aa2efe50930..8ee5f4d90d5 100644 --- a/packages/web/src/components/track/EditTrackModal.jsx +++ b/packages/web/src/components/track/EditTrackModal.jsx @@ -1,6 +1,7 @@ import { useState, useEffect, useCallback } from 'react' -import { SquareSizes, newTrackMetadata } from '@audius/common' +import { newTrackMetadata } from '@audius/common' +import { SquareSizes } from '@audius/common/models' import { Modal, Button, ButtonSize, ButtonType } from '@audius/stems' import { mapValues } from 'lodash' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/track/GatedConditionsPill.tsx b/packages/web/src/components/track/GatedConditionsPill.tsx index a76fce01d8e..bb751ae4aed 100644 --- a/packages/web/src/components/track/GatedConditionsPill.tsx +++ b/packages/web/src/components/track/GatedConditionsPill.tsx @@ -1,10 +1,10 @@ import type { MouseEvent } from 'react' +import { formatPrice } from '@audius/common' import { - formatPrice, isContentUSDCPurchaseGated, AccessConditions -} from '@audius/common' +} from '@audius/common/models' import { Button, ButtonSize, IconLock } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/components/track/GatedContentLabel.tsx b/packages/web/src/components/track/GatedContentLabel.tsx index cebffe51ac1..06870632dfd 100644 --- a/packages/web/src/components/track/GatedContentLabel.tsx +++ b/packages/web/src/components/track/GatedContentLabel.tsx @@ -1,9 +1,9 @@ +import { Nullable } from '@audius/common' import { - AccessConditions, - Nullable, isContentCollectibleGated, - isContentUSDCPurchaseGated -} from '@audius/common' + isContentUSDCPurchaseGated, + AccessConditions +} from '@audius/common/models' import { IconCart, IconCollectible, IconSpecialAccess } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/GatedTrackSection.tsx b/packages/web/src/components/track/GatedTrackSection.tsx index 44270975703..ae327e3ee83 100644 --- a/packages/web/src/components/track/GatedTrackSection.tsx +++ b/packages/web/src/components/track/GatedTrackSection.tsx @@ -2,24 +2,26 @@ import { useCallback } from 'react' import { cacheUsersSelectors, - Chain, - FollowSource, formatPrice, - ID, - isContentCollectibleGated, - isContentFollowGated, - isContentTipGated, - isContentUSDCPurchaseGated, Nullable, - AccessConditions, gatedContentSelectors, removeNullable, tippingActions, - User, usersSocialActions as socialActions, - usePremiumContentPurchaseModal, - ModalSource + usePremiumContentPurchaseModal } from '@audius/common' +import { + FollowSource, + ModalSource, + Chain, + isContentCollectibleGated, + isContentFollowGated, + isContentTipGated, + isContentUSDCPurchaseGated, + ID, + AccessConditions, + User +} from '@audius/common/models' import { Button, ButtonType, diff --git a/packages/web/src/components/track/GiantArtwork.tsx b/packages/web/src/components/track/GiantArtwork.tsx index 9f3d04640bb..3bd89c2f579 100644 --- a/packages/web/src/components/track/GiantArtwork.tsx +++ b/packages/web/src/components/track/GiantArtwork.tsx @@ -1,6 +1,7 @@ import { memo, useEffect } from 'react' -import { CoverArtSizes, SquareSizes, Remix, Nullable } from '@audius/common' +import { Nullable } from '@audius/common' +import { SquareSizes, CoverArtSizes, Remix } from '@audius/common/models' import CoSign from 'components/co-sign/CoSign' import { Size } from 'components/co-sign/types' diff --git a/packages/web/src/components/track/GiantTrackTile.tsx b/packages/web/src/components/track/GiantTrackTile.tsx index ea6f0ba39f7..7c27447f378 100644 --- a/packages/web/src/components/track/GiantTrackTile.tsx +++ b/packages/web/src/components/track/GiantTrackTile.tsx @@ -7,17 +7,19 @@ import { Genre, FeatureFlags, Nullable, - Remix, - CoverArtSizes, - ID, - AccessConditions, - FieldVisibility, getDogEarType, - isContentUSDCPurchaseGated, publishTrackConfirmationModalUIActions, CommonState, cacheTracksSelectors } from '@audius/common' +import { + isContentUSDCPurchaseGated, + ID, + CoverArtSizes, + FieldVisibility, + Remix, + AccessConditions +} from '@audius/common/models' import { Box, Flex } from '@audius/harmony' import { Mood } from '@audius/sdk' import { diff --git a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx index 118c24138a8..5e5dd6f4926 100644 --- a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx +++ b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx @@ -1,10 +1,10 @@ import { CommonState, formatLineupTileDuration, - ID, accountSelectors, playbackPositionSelectors } from '@audius/common' +import { ID } from '@audius/common/models' import { IconCheck, ProgressBar } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/LockedTrackDetailsTile.tsx b/packages/web/src/components/track/LockedTrackDetailsTile.tsx index 742305a7a6b..06f5f6fd0bc 100644 --- a/packages/web/src/components/track/LockedTrackDetailsTile.tsx +++ b/packages/web/src/components/track/LockedTrackDetailsTile.tsx @@ -1,12 +1,12 @@ +import { getDogEarType } from '@audius/common' import { - getDogEarType, - ID, + SquareSizes, isContentCollectibleGated, isContentUSDCPurchaseGated, - SquareSizes, + ID, Track, UserMetadata -} from '@audius/common' +} from '@audius/common/models' import { IconCart, IconCollectible, IconSpecialAccess } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/PlayPauseButton.tsx b/packages/web/src/components/track/PlayPauseButton.tsx index 7ca16955714..c042ca64774 100644 --- a/packages/web/src/components/track/PlayPauseButton.tsx +++ b/packages/web/src/components/track/PlayPauseButton.tsx @@ -1,11 +1,11 @@ import { FeatureFlags, - ID, accountSelectors, playerSelectors, playbackPositionSelectors, CommonState } from '@audius/common' +import { ID } from '@audius/common/models' import { Button } from '@audius/harmony' import { IconPause, IconPlay } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/BottomRow.tsx b/packages/web/src/components/track/desktop/BottomRow.tsx index 969aedc3ca6..680d25e5db1 100644 --- a/packages/web/src/components/track/desktop/BottomRow.tsx +++ b/packages/web/src/components/track/desktop/BottomRow.tsx @@ -1,12 +1,7 @@ import { MouseEvent, ReactNode, useCallback } from 'react' -import { - FieldVisibility, - gatedContentSelectors, - ID, - AccessConditions, - Nullable -} from '@audius/common' +import { gatedContentSelectors, Nullable } from '@audius/common' +import { ID, FieldVisibility, AccessConditions } from '@audius/common/models' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx index fec00e6c788..b57af476103 100644 --- a/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx @@ -10,14 +10,6 @@ import { } from 'react' import { - UID, - ID, - ShareSource, - RepostSource, - FavoriteSource, - PlaybackSource, - Name, - Track, accountSelectors, cacheCollectionsSelectors, cacheUsersSelectors, @@ -25,6 +17,16 @@ import { shareModalUIActions, playerSelectors } from '@audius/common' +import { + Name, + ShareSource, + RepostSource, + FavoriteSource, + PlaybackSource, + ID, + UID, + Track +} from '@audius/common/models' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import { range } from 'lodash' diff --git a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx index 712d0dd7113..3129f761d89 100644 --- a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx @@ -8,11 +8,6 @@ import { } from 'react' import { - UID, - ID, - ShareSource, - RepostSource, - FavoriteSource, accountSelectors, cacheTracksSelectors, cacheUsersSelectors, @@ -23,6 +18,13 @@ import { Genre } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { + ShareSource, + RepostSource, + FavoriteSource, + ID, + UID +} from '@audius/common/models' import cn from 'classnames' import { connect, useDispatch } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/desktop/TrackListItem.tsx b/packages/web/src/components/track/desktop/TrackListItem.tsx index c97904f100d..b95070efbe9 100644 --- a/packages/web/src/components/track/desktop/TrackListItem.tsx +++ b/packages/web/src/components/track/desktop/TrackListItem.tsx @@ -1,12 +1,7 @@ import { memo, MouseEvent, useRef } from 'react' -import { - UID, - ID, - formatSeconds, - EnhancedCollectionTrack, - Genre -} from '@audius/common' +import { formatSeconds, EnhancedCollectionTrack, Genre } from '@audius/common' +import { ID, UID } from '@audius/common/models' import cn from 'classnames' import IconKebabHorizontal from 'assets/img/iconKebabHorizontal.svg' diff --git a/packages/web/src/components/track/desktop/TrackTile.tsx b/packages/web/src/components/track/desktop/TrackTile.tsx index ce27e8515fa..bf2e5ce1e6f 100644 --- a/packages/web/src/components/track/desktop/TrackTile.tsx +++ b/packages/web/src/components/track/desktop/TrackTile.tsx @@ -9,10 +9,9 @@ import { Genre, CommonState, getDogEarType, - isContentUSDCPurchaseGated, - usePremiumContentPurchaseModal, - ModalSource + usePremiumContentPurchaseModal } from '@audius/common' +import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' import { IconCheck, IconCrown, IconHidden, ProgressBar } from '@audius/stems' import cn from 'classnames' import moment from 'moment' diff --git a/packages/web/src/components/track/desktop/stats/ProfileImage.tsx b/packages/web/src/components/track/desktop/stats/ProfileImage.tsx index 2ed5bf5b93c..1f03f6b7d00 100644 --- a/packages/web/src/components/track/desktop/stats/ProfileImage.tsx +++ b/packages/web/src/components/track/desktop/stats/ProfileImage.tsx @@ -1,6 +1,7 @@ import { memo } from 'react' -import { ID, SquareSizes, cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' +import { SquareSizes, ID } from '@audius/common/models' import cn from 'classnames' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/desktop/stats/Stats.tsx b/packages/web/src/components/track/desktop/stats/Stats.tsx index c7ffa3bc0d4..7549f16ce66 100644 --- a/packages/web/src/components/track/desktop/stats/Stats.tsx +++ b/packages/web/src/components/track/desktop/stats/Stats.tsx @@ -1,13 +1,11 @@ import { memo, useMemo, MouseEvent, useCallback } from 'react' import { - ID, - Favorite, - Repost, createShallowSelector, cacheUsersSelectors, CommonState } from '@audius/common' +import { Favorite, ID, Repost } from '@audius/common/models' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/stats/StatsText.tsx b/packages/web/src/components/track/desktop/stats/StatsText.tsx index bbf31e8c4ef..dceb7816719 100644 --- a/packages/web/src/components/track/desktop/stats/StatsText.tsx +++ b/packages/web/src/components/track/desktop/stats/StatsText.tsx @@ -1,4 +1,5 @@ -import { User, formatCount, pluralize } from '@audius/common' +import { formatCount, pluralize } from '@audius/common' +import { User } from '@audius/common/models' import styles from './StatsText.module.css' diff --git a/packages/web/src/components/track/helpers.ts b/packages/web/src/components/track/helpers.ts index b8583b1dfed..9ccd6fd1762 100644 --- a/packages/web/src/components/track/helpers.ts +++ b/packages/web/src/components/track/helpers.ts @@ -1,4 +1,5 @@ -import { Collection, FieldVisibility, Genre, Track, User } from '@audius/common' +import { Genre } from '@audius/common' +import { Collection, FieldVisibility, Track, User } from '@audius/common/models' const defaultFieldVisibility: FieldVisibility = { genre: true, diff --git a/packages/web/src/components/track/mobile/BottomButtons.tsx b/packages/web/src/components/track/mobile/BottomButtons.tsx index 5ae7fb91fc0..6a76161f4ee 100644 --- a/packages/web/src/components/track/mobile/BottomButtons.tsx +++ b/packages/web/src/components/track/mobile/BottomButtons.tsx @@ -1,11 +1,11 @@ import { MouseEvent, memo } from 'react' +import { Nullable } from '@audius/common' import { - Nullable, + isContentUSDCPurchaseGated, AccessConditions, - GatedTrackStatus, - isContentUSDCPurchaseGated -} from '@audius/common' + GatedTrackStatus +} from '@audius/common/models' import cn from 'classnames' import FavoriteButton from 'components/alt-button/FavoriteButton' diff --git a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx index 870342d295d..9331d694dd4 100644 --- a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx @@ -1,14 +1,6 @@ import { memo, useCallback, useMemo, MouseEvent } from 'react' import { - ID, - FavoriteSource, - RepostSource, - Name, - PlaybackSource, - ShareSource, - FavoriteType, - Track, accountSelectors, cacheCollectionsSelectors, cacheUsersSelectors, @@ -24,6 +16,16 @@ import { playerSelectors, FeatureFlags } from '@audius/common' +import { + Name, + ShareSource, + RepostSource, + FavoriteSource, + PlaybackSource, + FavoriteType, + ID, + Track +} from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx index 888f02714f6..68493055684 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx @@ -1,9 +1,6 @@ import { memo } from 'react' import { - ID, - FavoriteSource, - RepostSource, accountSelectors, cacheUsersSelectors, tracksSocialActions, @@ -12,6 +9,7 @@ import { mobileOverflowMenuUIActions, FeatureFlags } from '@audius/common' +import { RepostSource, FavoriteSource, ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx index 7ab23e5c28e..75452ff7aae 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx @@ -1,11 +1,6 @@ import { memo, MouseEvent } from 'react' import { - ID, - FavoriteSource, - RepostSource, - ShareSource, - FavoriteType, accountSelectors, cacheTracksSelectors, cacheUsersSelectors, @@ -23,6 +18,13 @@ import { Genre } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { + ShareSource, + RepostSource, + FavoriteSource, + FavoriteType, + ID +} from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/PlaylistTile.tsx b/packages/web/src/components/track/mobile/PlaylistTile.tsx index c4b437ce518..9e32576d0a8 100644 --- a/packages/web/src/components/track/mobile/PlaylistTile.tsx +++ b/packages/web/src/components/track/mobile/PlaylistTile.tsx @@ -1,12 +1,7 @@ import { useState, useEffect, MouseEvent } from 'react' -import { - UID, - ID, - LineupTrack, - formatCount, - formatLineupTileDuration -} from '@audius/common' +import { formatCount, formatLineupTileDuration } from '@audius/common' +import { ID, UID, LineupTrack } from '@audius/common/models' import cn from 'classnames' import { range } from 'lodash' diff --git a/packages/web/src/components/track/mobile/TrackList.tsx b/packages/web/src/components/track/mobile/TrackList.tsx index 8832d555c3d..d412ab120ec 100644 --- a/packages/web/src/components/track/mobile/TrackList.tsx +++ b/packages/web/src/components/track/mobile/TrackList.tsx @@ -1,6 +1,8 @@ import { memo, useCallback } from 'react' -import { ID, CoverArtSizes } from '@audius/common' +import { ID, CoverArtSizes } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd' diff --git a/packages/web/src/components/track/mobile/TrackListItem.tsx b/packages/web/src/components/track/mobile/TrackListItem.tsx index 594dd932eca..06ba45ef424 100644 --- a/packages/web/src/components/track/mobile/TrackListItem.tsx +++ b/packages/web/src/components/track/mobile/TrackListItem.tsx @@ -1,6 +1,8 @@ import { memo, MouseEvent } from 'react' -import { ID, CoverArtSizes, SquareSizes } from '@audius/common' +import { SquareSizes, ID, CoverArtSizes } from '@audius/common/models' + +import {} from '@audius/common' import { IconKebabHorizontal, IconButton, IconLock } from '@audius/stems' import cn from 'classnames' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/track/mobile/TrackTile.tsx b/packages/web/src/components/track/mobile/TrackTile.tsx index 386166ae787..b00e2d95c94 100644 --- a/packages/web/src/components/track/mobile/TrackTile.tsx +++ b/packages/web/src/components/track/mobile/TrackTile.tsx @@ -1,19 +1,21 @@ import { useCallback, useState, useEffect, MouseEvent } from 'react' import { - ID, formatCount, - AccessConditions, Nullable, gatedContentSelectors, gatedContentActions, formatLineupTileDuration, Genre, getDogEarType, - isContentUSDCPurchaseGated, - usePremiumContentPurchaseModal, - ModalSource + usePremiumContentPurchaseModal } from '@audius/common' +import { + ModalSource, + isContentUSDCPurchaseGated, + ID, + AccessConditions +} from '@audius/common/models' import { IconCrown, IconHidden, IconTrending } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/mobile/TrackTileArt.tsx b/packages/web/src/components/track/mobile/TrackTileArt.tsx index e218ee273fa..5979f3a04d9 100644 --- a/packages/web/src/components/track/mobile/TrackTileArt.tsx +++ b/packages/web/src/components/track/mobile/TrackTileArt.tsx @@ -1,6 +1,8 @@ +import { SquareSizes, ID, CoverArtSizes, Remix } from '@audius/common/models' + import { memo } from 'react' -import { ID, CoverArtSizes, SquareSizes, Remix } from '@audius/common' +import {} from '@audius/common' import { useLoadImageWithTimeout } from '@audius/common/hooks' import cn from 'classnames' diff --git a/packages/web/src/components/track/types.ts b/packages/web/src/components/track/types.ts index 58cc75ffec5..0e02b630b37 100644 --- a/packages/web/src/components/track/types.ts +++ b/packages/web/src/components/track/types.ts @@ -1,20 +1,19 @@ import { MouseEvent, ReactNode } from 'react' +import { Nullable, Genre } from '@audius/common' import { - ID, - UID, PlaybackSource, + Collection, Favorite, + ID, + UID, CoverArtSizes, Repost, FieldVisibility, - LineupTrack, Remix, AccessConditions, - Nullable, - Genre, - Collection -} from '@audius/common' + LineupTrack +} from '@audius/common/models' export enum TrackTileSize { LARGE = 'LARGE', diff --git a/packages/web/src/components/tracks-table/TracksTable.tsx b/packages/web/src/components/tracks-table/TracksTable.tsx index d020abaa40b..d98e4c67f62 100644 --- a/packages/web/src/components/tracks-table/TracksTable.tsx +++ b/packages/web/src/components/tracks-table/TracksTable.tsx @@ -1,7 +1,8 @@ import { MouseEvent, useCallback, useMemo, useRef } from 'react' -import { formatCount, formatSeconds, UID, UserTrack } from '@audius/common' +import { formatCount, formatSeconds } from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' +import { UID, UserTrack } from '@audius/common/models' import { IconHidden, IconLock } from '@audius/stems' import cn from 'classnames' import moment from 'moment' diff --git a/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx b/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx index bcf286b0475..d9c3ea72f94 100644 --- a/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx +++ b/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx @@ -1,10 +1,10 @@ import { useCallback } from 'react' import { - Status, transactionDetailsActions, transactionDetailsSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { Button, ButtonType, diff --git a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx index 22c67c2fb66..b1c46421db7 100644 --- a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx +++ b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx @@ -1,15 +1,14 @@ import { - User, cacheUsersSelectors, TransactionDetails, TransactionMethod, formatAudio, TransactionType, formatCapitalizeString, - ChallengeRewardID, makeSolanaTransactionLink, isNullOrUndefined } from '@audius/common' +import { ChallengeRewardID, User } from '@audius/common/models' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx index 5a6bfb9cf05..bb024098768 100644 --- a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx +++ b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx @@ -1,5 +1,4 @@ import { - TimeRange, TRENDING_GENRES, ELECTRONIC_PREFIX, Genre, @@ -7,6 +6,7 @@ import { trendingPageActions, trendingPageSelectors } from '@audius/common' +import { TimeRange } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx b/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx index 4e741e7799d..930a095795e 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx +++ b/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx @@ -1,9 +1,8 @@ import { - ID, - FollowSource, profilePageActions, usersSocialActions as socialActions } from '@audius/common' +import { FollowSource, ID } from '@audius/common/models' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/unfollow-confirmation-modal/components/UnfollowConfirmationModal.tsx b/packages/web/src/components/unfollow-confirmation-modal/components/UnfollowConfirmationModal.tsx index 7b014320c07..6e2be69ea90 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/components/UnfollowConfirmationModal.tsx +++ b/packages/web/src/components/unfollow-confirmation-modal/components/UnfollowConfirmationModal.tsx @@ -1,4 +1,5 @@ -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' +import {} from '@audius/common' import ActionSheetModal from 'components/action-drawer/ActionDrawer' diff --git a/packages/web/src/components/unfollow-confirmation-modal/store/actions.ts b/packages/web/src/components/unfollow-confirmation-modal/store/actions.ts index 9c1836ae75c..ed12b94a575 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/store/actions.ts +++ b/packages/web/src/components/unfollow-confirmation-modal/store/actions.ts @@ -1,4 +1,5 @@ -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' +import {} from '@audius/common' import { createCustomAction } from 'typesafe-actions' export const SET_OPEN = 'UNFOLLOW_CONFIRMATION/SET_OPEN' diff --git a/packages/web/src/components/unfollow-confirmation-modal/store/types.ts b/packages/web/src/components/unfollow-confirmation-modal/store/types.ts index 8ed33dd67d2..f3a4ea97fb9 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/store/types.ts +++ b/packages/web/src/components/unfollow-confirmation-modal/store/types.ts @@ -1,4 +1,5 @@ -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' +import {} from '@audius/common' export type UnfollowConfirmationModalState = { isOpen: boolean diff --git a/packages/web/src/components/upload/TrackPreviewNew.tsx b/packages/web/src/components/upload/TrackPreviewNew.tsx index 02b22bdbba3..fd4af17e068 100644 --- a/packages/web/src/components/upload/TrackPreviewNew.tsx +++ b/packages/web/src/components/upload/TrackPreviewNew.tsx @@ -1,11 +1,8 @@ import { useState } from 'react' -import { - FeatureFlags, - StemCategory, - stemCategoryFriendlyNames -} from '@audius/common' +import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { StemCategory, stemCategoryFriendlyNames } from '@audius/common/models' import { Box, FilterButton, Flex, IconPenSquare } from '@audius/harmony' import { HarmonyPlainButton, IconTrash } from '@audius/stems' import numeral from 'numeral' diff --git a/packages/web/src/components/upload/UploadChip.tsx b/packages/web/src/components/upload/UploadChip.tsx index 78763b55120..0219160314f 100644 --- a/packages/web/src/components/upload/UploadChip.tsx +++ b/packages/web/src/components/upload/UploadChip.tsx @@ -1,11 +1,7 @@ import { Ref, useCallback, useMemo } from 'react' -import { - CreatePlaylistSource, - FeatureFlags, - Name, - cacheCollectionsActions -} from '@audius/common' +import { FeatureFlags, cacheCollectionsActions } from '@audius/common' +import { Name, CreatePlaylistSource } from '@audius/common/models' import { Box, HTMLButtonProps, diff --git a/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx b/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx index 81e17ecab81..eda5f00b731 100644 --- a/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx +++ b/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx @@ -1,10 +1,9 @@ import { - BNUSDC, - Status, formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import { Status, BNUSDC } from '@audius/common/models' import { LogoUSDC } from '@audius/stems' import BN from 'bn.js' import cn from 'classnames' diff --git a/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx b/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx index 0e4f59a57f6..545d4823bea 100644 --- a/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx +++ b/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx @@ -1,11 +1,11 @@ import { useCallback, useContext } from 'react' import { - Name, isContentPurchaseInProgress, purchaseContentSelectors } from '@audius/common' import { useUSDCBalance, useCreateUserbankIfNeeded } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { USDC } from '@audius/fixed-decimal' import { Button, Flex, IconLogoCircleUSDC } from '@audius/harmony' import { IconError } from '@audius/stems' diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/TransactionSummary.tsx b/packages/web/src/components/usdc-purchase-details-modal/components/TransactionSummary.tsx index 5ad4cfd6309..690b663e40b 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/TransactionSummary.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/components/TransactionSummary.tsx @@ -1,4 +1,5 @@ -import { USDCPurchaseDetails, formatUSDCWeiToUSDString } from '@audius/common' +import { formatUSDCWeiToUSDString } from '@audius/common' +import { USDCPurchaseDetails } from '@audius/common/models' import BN from 'bn.js' import { SummaryTable, SummaryTableItem } from 'components/summary-table' diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/types.ts b/packages/web/src/components/usdc-purchase-details-modal/components/types.ts index 9b1162735d9..bc7216f78e5 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/types.ts +++ b/packages/web/src/components/usdc-purchase-details-modal/components/types.ts @@ -1,4 +1,5 @@ -import { USDCPurchaseDetails } from '@audius/common' +import { USDCPurchaseDetails } from '@audius/common/models' +import {} from '@audius/common' export type ContentProps = { purchaseDetails: USDCPurchaseDetails diff --git a/packages/web/src/components/user-badges/FollowsYouBadge.tsx b/packages/web/src/components/user-badges/FollowsYouBadge.tsx index 389130b0e1b..2956de37c6e 100644 --- a/packages/web/src/components/user-badges/FollowsYouBadge.tsx +++ b/packages/web/src/components/user-badges/FollowsYouBadge.tsx @@ -1,4 +1,5 @@ -import { ID, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { ID } from '@audius/common/models' import { useSelector } from 'react-redux' import { useWithMobileStyle } from 'hooks/useWithMobileStyle' diff --git a/packages/web/src/components/user-badges/ProfilePageBadge.tsx b/packages/web/src/components/user-badges/ProfilePageBadge.tsx index fbc35dfcda4..f8f84a4f6c1 100644 --- a/packages/web/src/components/user-badges/ProfilePageBadge.tsx +++ b/packages/web/src/components/user-badges/ProfilePageBadge.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' -import { ID, BadgeTier, modalsActions } from '@audius/common' +import { modalsActions } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { BadgeTier, ID } from '@audius/common/models' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/user-badges/UserBadges.tsx b/packages/web/src/components/user-badges/UserBadges.tsx index 727fe404666..7171f584387 100644 --- a/packages/web/src/components/user-badges/UserBadges.tsx +++ b/packages/web/src/components/user-badges/UserBadges.tsx @@ -1,7 +1,8 @@ import { cloneElement, ReactElement } from 'react' -import { ID, BadgeTier, Nullable } from '@audius/common' +import { Nullable } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { BadgeTier, ID } from '@audius/common/models' import cn from 'classnames' import IconBronzeBadgeSVG from 'assets/img/IconBronzeBadge.svg' diff --git a/packages/web/src/components/user-list-modal/components/UserListModal.tsx b/packages/web/src/components/user-list-modal/components/UserListModal.tsx index f00ba69f11c..20eefea06f8 100644 --- a/packages/web/src/components/user-list-modal/components/UserListModal.tsx +++ b/packages/web/src/components/user-list-modal/components/UserListModal.tsx @@ -21,9 +21,9 @@ import { REPOSTS_USER_LIST_TAG as REPOST_TAG, SUPPORTING_USER_LIST_TAG as SUPPORTING_TAG, TOP_SUPPORTERS_USER_LIST_TAG as SUPPORTER_TAG, - RELATED_ARTISTS_USER_LIST_TAG as RELATED_ARTISTS_TAG, - ID + RELATED_ARTISTS_USER_LIST_TAG as RELATED_ARTISTS_TAG } from '@audius/common' +import { ID } from '@audius/common/models' import { Modal, IconTrophy, diff --git a/packages/web/src/components/user-list/UserList.tsx b/packages/web/src/components/user-list/UserList.tsx index fee10ff4be1..9e6cdf104cc 100644 --- a/packages/web/src/components/user-list/UserList.tsx +++ b/packages/web/src/components/user-list/UserList.tsx @@ -1,9 +1,6 @@ import { useEffect, useState } from 'react' import { - ID, - FollowSource, - User, accountSelectors, cacheUsersSelectors, profilePageActions, @@ -12,6 +9,7 @@ import { UserListStoreState, usersSocialActions as socialActions } from '@audius/common' +import { FollowSource, ID, User } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/user-list/components/UserList.tsx b/packages/web/src/components/user-list/components/UserList.tsx index f2f1a97ce95..2b98ffa0033 100644 --- a/packages/web/src/components/user-list/components/UserList.tsx +++ b/packages/web/src/components/user-list/components/UserList.tsx @@ -1,9 +1,8 @@ import { - ID, SUPPORTING_USER_LIST_TAG, - TOP_SUPPORTERS_USER_LIST_TAG, - User + TOP_SUPPORTERS_USER_LIST_TAG } from '@audius/common' +import { ID, User } from '@audius/common/models' import cn from 'classnames' import InfiniteScroll from 'react-infinite-scroller' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx b/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx index f8ac6150a23..fa865d0c550 100644 --- a/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx +++ b/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx @@ -1,7 +1,8 @@ import { MouseEventHandler, useCallback } from 'react' -import { UserMetadata, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' import { useGetUserById } from '@audius/common/api' +import { UserMetadata } from '@audius/common/models' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/welcome-modal/WelcomeModal.tsx b/packages/web/src/components/welcome-modal/WelcomeModal.tsx index b4d403dbf4e..75829719e07 100644 --- a/packages/web/src/components/welcome-modal/WelcomeModal.tsx +++ b/packages/web/src/components/welcome-modal/WelcomeModal.tsx @@ -1,7 +1,8 @@ import { useCallback, useEffect } from 'react' -import { Name, SquareSizes, accountSelectors, fillString } from '@audius/common' +import { accountSelectors, fillString } from '@audius/common' import { welcomeModalMessages } from '@audius/common/messages' +import { Name, SquareSizes } from '@audius/common/models' import { Button, Flex, diff --git a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx index 30d2572286b..f3340e0efb1 100644 --- a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx @@ -1,16 +1,12 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { - SolanaWalletAddress, useWithdrawUSDCModal, WithdrawUSDCModalPages, withdrawUSDCActions, - BNUSDC, formatUSDCWeiToFloorCentsNumber, Nullable, withdrawUSDCSelectors, - Status, - Name, WithdrawMethod, FeatureFlags, IntKeys @@ -20,6 +16,12 @@ import { useRemoteVar, useUSDCBalance } from '@audius/common/hooks' +import { + Name, + Status, + BNUSDC, + SolanaWalletAddress +} from '@audius/common/models' import { Modal, ModalContent, ModalHeader } from '@audius/stems' import BN from 'bn.js' import { Formik, FormikProps, useFormikContext } from 'formik' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx index 980f8434e30..6a9e2f71244 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx @@ -5,10 +5,10 @@ import { decimalIntegerToHumanReadable, useWithdrawUSDCModal, formatUSDCWeiToFloorCentsNumber, - BNUSDC, WithdrawMethod } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import { BNUSDC } from '@audius/common/models' import { Button, IconQuestionCircle } from '@audius/harmony' import { Switch } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx index cc8c1d3a10a..e34a2f8982c 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx @@ -6,18 +6,17 @@ import { } from 'react' import { - BNUSDC, useWithdrawUSDCModal, WithdrawUSDCModalPages, formatUSDCWeiToFloorCentsNumber, filterDecimalString, padDecimalValue, decimalIntegerToHumanReadable, - Name, WithdrawMethod, FeatureFlags } from '@audius/common' import { useFeatureFlag, useUSDCBalance } from '@audius/common/hooks' +import { Name, BNUSDC } from '@audius/common/models' import { Button } from '@audius/harmony' import { SegmentedControl } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx index bed55501097..ae2b9c878ef 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx @@ -2,13 +2,13 @@ import { useCallback } from 'react' import { formatCurrencyBalance, - BNUSDC, formatUSDCWeiToFloorDollarNumber, useWithdrawUSDCModal, WithdrawUSDCModalPages, decimalIntegerToHumanReadable } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import { BNUSDC } from '@audius/common/models' import BN from 'bn.js' import { useField } from 'formik' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx index 5ba7a0fa4fc..68b70437d9a 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx @@ -1,9 +1,9 @@ import { - BNUSDC, formatUSDCWeiToFloorCentsNumber, decimalIntegerToHumanReadable } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import { BNUSDC } from '@audius/common/models' import BN from 'bn.js' import { useField } from 'formik' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx index 1f91c6d08d9..22ed7f2ab7d 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx @@ -1,16 +1,14 @@ import { useCallback } from 'react' import { - BNUSDC, formatUSDCWeiToFloorCentsNumber, makeSolanaTransactionLink, decimalIntegerToHumanReadable, - Status, withdrawUSDCSelectors, - Name, WithdrawMethod } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import { Name, Status, BNUSDC } from '@audius/common/models' import { Button, Flex } from '@audius/harmony' import { HarmonyPlainButton, diff --git a/packages/web/src/hooks/useCollectionCoverArt.ts b/packages/web/src/hooks/useCollectionCoverArt.ts index e809ec543d7..3e3f7562619 100644 --- a/packages/web/src/hooks/useCollectionCoverArt.ts +++ b/packages/web/src/hooks/useCollectionCoverArt.ts @@ -1,10 +1,9 @@ import { - CoverArtSizes, - SquareSizes, cacheCollectionsActions, imageBlank as imageEmpty } from '@audius/common' import { useImageSize } from '@audius/common/hooks' +import { SquareSizes, CoverArtSizes } from '@audius/common/models' import { useDispatch } from 'react-redux' const { fetchCoverArt } = cacheCollectionsActions diff --git a/packages/web/src/hooks/useCoverPhoto.ts b/packages/web/src/hooks/useCoverPhoto.ts index c4f653e8700..02efa59d72d 100644 --- a/packages/web/src/hooks/useCoverPhoto.ts +++ b/packages/web/src/hooks/useCoverPhoto.ts @@ -1,15 +1,13 @@ import { useCallback } from 'react' import { - CoverPhotoSizes, - WidthSizes, cacheUsersActions, imageCoverPhotoBlank, cacheUsersSelectors, - SquareSizes, imageProfilePicEmpty } from '@audius/common' import { useImageSize } from '@audius/common/hooks' +import { SquareSizes, WidthSizes, CoverPhotoSizes } from '@audius/common/models' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/hooks/useErrorPageOnFailedStatus.ts b/packages/web/src/hooks/useErrorPageOnFailedStatus.ts index 03bdf3c2e29..5643967cabd 100644 --- a/packages/web/src/hooks/useErrorPageOnFailedStatus.ts +++ b/packages/web/src/hooks/useErrorPageOnFailedStatus.ts @@ -1,6 +1,8 @@ import { useEffect } from 'react' -import { Status } from '@audius/common' +import { Status } from '@audius/common/models' + +import {} from '@audius/common' import { useDispatch } from 'react-redux' import { HandleErrorArgs, handleError } from 'store/errors/actions' diff --git a/packages/web/src/hooks/useImageSize.test.tsx b/packages/web/src/hooks/useImageSize.test.tsx index 78a8dcc6215..a5cdc571106 100644 --- a/packages/web/src/hooks/useImageSize.test.tsx +++ b/packages/web/src/hooks/useImageSize.test.tsx @@ -1,4 +1,9 @@ -import { DefaultSizes, ImageSizesObject, SquareSizes } from '@audius/common' +import { + DefaultSizes, + SquareSizes, + ImageSizesObject +} from '@audius/common/models' +import {} from '@audius/common' import { useImageSize, BaseUserImageSizeProps } from '@audius/common/hooks' import { render } from '@testing-library/react' import type { Dispatch } from 'redux' diff --git a/packages/web/src/hooks/useRequiresAccount.ts b/packages/web/src/hooks/useRequiresAccount.ts index fc4e62d6c7b..a7eaaa02169 100644 --- a/packages/web/src/hooks/useRequiresAccount.ts +++ b/packages/web/src/hooks/useRequiresAccount.ts @@ -1,6 +1,7 @@ import { useEffect } from 'react' -import { accountSelectors, Status } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/hooks/useTikTokAuth.ts b/packages/web/src/hooks/useTikTokAuth.ts index 7d4ff1a753c..eb7eeb2d579 100644 --- a/packages/web/src/hooks/useTikTokAuth.ts +++ b/packages/web/src/hooks/useTikTokAuth.ts @@ -1,7 +1,8 @@ +import { Name } from '@audius/common/models' // Polyfills import 'whatwg-fetch' import 'url-search-params-polyfill' -import { Name } from '@audius/common' +import {} from '@audius/common' import { createUseTikTokAuthHook, UseTikTokAuthArguments, diff --git a/packages/web/src/hooks/useTrackCoverArt.ts b/packages/web/src/hooks/useTrackCoverArt.ts index 6ce1029761b..140b5137a53 100644 --- a/packages/web/src/hooks/useTrackCoverArt.ts +++ b/packages/web/src/hooks/useTrackCoverArt.ts @@ -1,13 +1,11 @@ import { - CoverArtSizes, - SquareSizes, cacheTracksActions, imageBlank as imageEmpty, Maybe, - cacheTracksSelectors, - ID + cacheTracksSelectors } from '@audius/common' import { useImageSize } from '@audius/common/hooks' +import { SquareSizes, ID, CoverArtSizes } from '@audius/common/models' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/hooks/useUserProfilePicture.ts b/packages/web/src/hooks/useUserProfilePicture.ts index cd6f3c551e1..086d2f33c4f 100644 --- a/packages/web/src/hooks/useUserProfilePicture.ts +++ b/packages/web/src/hooks/useUserProfilePicture.ts @@ -1,11 +1,10 @@ import { - ProfilePictureSizes, - SquareSizes, cacheUsersActions, imageProfilePicEmpty as profilePicEmpty, cacheUsersSelectors } from '@audius/common' import { useImageSize } from '@audius/common/hooks' +import { SquareSizes, ProfilePictureSizes } from '@audius/common/models' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx b/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx index 9ae35f11aad..92e947b5209 100644 --- a/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx +++ b/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx @@ -1,7 +1,6 @@ import { useEffect, useCallback, ComponentType, RefObject } from 'react' import { - ID, lineupSelectors, aiPageLineupActions as tracksActions, aiPageActions, @@ -9,6 +8,7 @@ import { playerSelectors, queueSelectors } from '@audius/common' +import { ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { useParams } from 'react-router' diff --git a/packages/web/src/pages/ai-attributed-tracks-page/components/desktop/AiPage.tsx b/packages/web/src/pages/ai-attributed-tracks-page/components/desktop/AiPage.tsx index 0939a61e7e5..891a370c2a5 100644 --- a/packages/web/src/pages/ai-attributed-tracks-page/components/desktop/AiPage.tsx +++ b/packages/web/src/pages/ai-attributed-tracks-page/components/desktop/AiPage.tsx @@ -1,4 +1,5 @@ -import { User } from '@audius/common' +import { User } from '@audius/common/models' +import {} from '@audius/common' // import { IconRobot, IconRemix } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/ai-attributed-tracks-page/components/mobile/AiPage.tsx b/packages/web/src/pages/ai-attributed-tracks-page/components/mobile/AiPage.tsx index ce03be6b16f..e09f5f754d2 100644 --- a/packages/web/src/pages/ai-attributed-tracks-page/components/mobile/AiPage.tsx +++ b/packages/web/src/pages/ai-attributed-tracks-page/components/mobile/AiPage.tsx @@ -1,6 +1,8 @@ import { useEffect, useContext } from 'react' -import { User } from '@audius/common' +import { User } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import IconRobot from 'assets/img/iconRobot.svg' diff --git a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx index e3c6287f632..24df4633666 100644 --- a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx @@ -1,8 +1,6 @@ import { ReactNode, useEffect, useMemo, useState } from 'react' import { - ChallengeRewardID, - OptimisticUserChallenge, removeNullable, StringKeys, fillString, @@ -10,12 +8,16 @@ import { challengesSelectors, audioRewardsPageActions, ChallengeRewardsModalType, - ChallengeName, audioRewardsPageSelectors, isAudioMatchingChallenge, - makeOptimisticChallengeSortComparator, - Name + makeOptimisticChallengeSortComparator } from '@audius/common' +import { + Name, + ChallengeName, + ChallengeRewardID, + OptimisticUserChallenge +} from '@audius/common/models' import { ProgressBar, ButtonType, diff --git a/packages/web/src/pages/audio-rewards-page/Tiers.tsx b/packages/web/src/pages/audio-rewards-page/Tiers.tsx index 769398fd1ed..7108070ea62 100644 --- a/packages/web/src/pages/audio-rewards-page/Tiers.tsx +++ b/packages/web/src/pages/audio-rewards-page/Tiers.tsx @@ -1,7 +1,6 @@ import { ReactElement, useCallback, useEffect, useMemo } from 'react' import { - BadgeTier, Nullable, accountSelectors, badgeTiers, @@ -10,6 +9,7 @@ import { musicConfettiActions } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { BadgeTier } from '@audius/common/models' import { Button, ButtonType, IconDiscord } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx index 8eddca52925..0196b2e2275 100644 --- a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx @@ -1,11 +1,10 @@ import { ReactNode } from 'react' +import { StringKeys, audioRewardsPageActions } from '@audius/common' import { ChallengeRewardID, - StringKeys, - audioRewardsPageActions, OptimisticUserChallenge -} from '@audius/common' +} from '@audius/common/models' import { ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx index d364ee36593..6f7c354ba1f 100644 --- a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx @@ -1,10 +1,6 @@ import { ReactNode, useCallback } from 'react' import { - Chain, - BNWei, - StringWei, - WalletAddress, Nullable, FeatureFlags, stringWeiToBN, @@ -15,6 +11,7 @@ import { tokenDashboardPageSelectors, walletSelectors } from '@audius/common' +import { Chain, StringWei, BNWei, WalletAddress } from '@audius/common/models' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/DashboardTokenValueSlider.tsx b/packages/web/src/pages/audio-rewards-page/components/DashboardTokenValueSlider.tsx index 8a408ef7f77..fd618db9625 100644 --- a/packages/web/src/pages/audio-rewards-page/components/DashboardTokenValueSlider.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/DashboardTokenValueSlider.tsx @@ -1,4 +1,5 @@ -import { BNAudio, formatNumberCommas } from '@audius/common' +import { formatNumberCommas } from '@audius/common' +import { BNAudio } from '@audius/common/models' import { TokenValueSlider } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/DisplayAudio.tsx b/packages/web/src/pages/audio-rewards-page/components/DisplayAudio.tsx index dfe78b1ba02..68c3804eb56 100644 --- a/packages/web/src/pages/audio-rewards-page/components/DisplayAudio.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/DisplayAudio.tsx @@ -1,4 +1,5 @@ -import { BNWei, formatWei } from '@audius/common' +import { formatWei } from '@audius/common' +import { BNWei } from '@audius/common/models' import cn from 'classnames' import styles from './DisplayAudio.module.css' diff --git a/packages/web/src/pages/audio-rewards-page/components/ExplainerTile.tsx b/packages/web/src/pages/audio-rewards-page/components/ExplainerTile.tsx index 309b839f72e..c83f3b76daa 100644 --- a/packages/web/src/pages/audio-rewards-page/components/ExplainerTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/ExplainerTile.tsx @@ -1,6 +1,8 @@ import { ReactNode, useCallback, useEffect, useRef, useState } from 'react' -import { Theme } from '@audius/common' +import { Theme } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import TokenStill from 'assets/img/tokenSpinStill.png' diff --git a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx index 74a2cd22032..7b184a95a08 100644 --- a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx @@ -1,9 +1,6 @@ -import { - SolanaWalletAddress, - WalletAddress, - FeatureFlags -} from '@audius/common' +import { FeatureFlags } from '@audius/common' import { useCreateUserbankIfNeeded } from '@audius/common/hooks' +import { WalletAddress, SolanaWalletAddress } from '@audius/common/models' import { Button, ButtonType, LogoSol } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx index 8f3dfce4d88..5f42080a84a 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx @@ -1,13 +1,6 @@ import { useCallback, useMemo, useState } from 'react' import { - Chain, - BNAudio, - BNWei, - SolanaWalletAddress, - StringAudio, - StringWei, - WalletAddress, Nullable, FeatureFlags, IntKeys, @@ -17,6 +10,15 @@ import { weiToAudio, MIN_TRANSFERRABLE_WEI } from '@audius/common' +import { + Chain, + StringWei, + StringAudio, + BNWei, + BNAudio, + WalletAddress, + SolanaWalletAddress +} from '@audius/common/models' import { Button, TokenValueInput, diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx index 74e8f717e35..f348bd552eb 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx @@ -1,13 +1,11 @@ import { useEffect, useState } from 'react' import { - BNWei, - StringAudio, - WalletAddress, stringAudioToBN, weiToAudio, tokenDashboardPageSelectors } from '@audius/common' +import { StringAudio, BNWei, WalletAddress } from '@audius/common/models' import { Button, ButtonType, IconArrow } from '@audius/stems' import LoadingSpinner from 'components/loading-spinner/LoadingSpinner' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputSuccess.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputSuccess.tsx index c484ecca8cb..9309957e0d9 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputSuccess.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputSuccess.tsx @@ -1,4 +1,5 @@ -import { WalletAddress, BNWei, formatWei } from '@audius/common' +import { formatWei } from '@audius/common' +import { BNWei, WalletAddress } from '@audius/common/models' import { ModalBodyTitle, ModalBodyWrapper } from '../WalletModal' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendingModalBody.tsx b/packages/web/src/pages/audio-rewards-page/components/SendingModalBody.tsx index 9b7a223f328..e593696fbcd 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendingModalBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendingModalBody.tsx @@ -1,4 +1,5 @@ -import { BNWei, WalletAddress } from '@audius/common' +import { BNWei, WalletAddress } from '@audius/common/models' +import {} from '@audius/common' import cn from 'classnames' import LoadingSpinner from 'components/loading-spinner/LoadingSpinner' diff --git a/packages/web/src/pages/audio-rewards-page/components/TokenHoverTooltip.tsx b/packages/web/src/pages/audio-rewards-page/components/TokenHoverTooltip.tsx index f9961c1606a..a2b429704be 100644 --- a/packages/web/src/pages/audio-rewards-page/components/TokenHoverTooltip.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/TokenHoverTooltip.tsx @@ -1,6 +1,7 @@ import { ReactNode } from 'react' -import { BNWei, formatWei } from '@audius/common' +import { formatWei } from '@audius/common' +import { BNWei } from '@audius/common/models' import Tooltip from 'components/tooltip/Tooltip' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx index 24fac85ec51..a4ec552e3ca 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx @@ -1,9 +1,9 @@ import { - BNWei, isNullOrUndefined, tokenDashboardPageActions, walletSelectors } from '@audius/common' +import { BNWei } from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import BN from 'bn.js' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx index 31a133f9c39..d7a44b70f0d 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx @@ -1,7 +1,6 @@ import { useCallback, useContext, useEffect, useMemo } from 'react' import { - BNWei, tokenDashboardPageActions, walletSelectors, tokenDashboardPageSelectors, @@ -10,10 +9,10 @@ import { OnRampProvider, FeatureFlags, StringKeys, - Client, Location, isNullOrUndefined } from '@audius/common' +import { Client, BNWei } from '@audius/common/models' import { Button, ButtonType, IconInfo } from '@audius/stems' import BN from 'bn.js' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx index b06151c3a9a..5d06dd87f86 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx @@ -1,13 +1,12 @@ import { useCallback, useContext, useEffect, MouseEvent } from 'react' import { - Chain, - BNWei, shortenEthAddress, shortenSPLAddress, tokenDashboardPageActions, tokenDashboardPageSelectors } from '@audius/common' +import { Chain, BNWei } from '@audius/common/models' import { LogoEth, LogoSol } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx index b9d0d239691..9c985b99e89 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx @@ -1,8 +1,5 @@ -import { - BNWei, - tokenDashboardPageSelectors, - walletSelectors -} from '@audius/common' +import { tokenDashboardPageSelectors, walletSelectors } from '@audius/common' +import { BNWei } from '@audius/common/models' import { IconInfo } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx index 62ad2196185..f665f9a7e31 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx @@ -1,13 +1,12 @@ import { ReactNode, useCallback } from 'react' import { - ChallengeName, - OptimisticUserChallenge, challengeRewardsConfig, formatNumberCommas, challengesSelectors } from '@audius/common' import { useAudioMatchingChallengeCooldownSchedule } from '@audius/common/hooks' +import { ChallengeName, OptimisticUserChallenge } from '@audius/common/models' import { IconArrowRight, IconCloudUpload, Text } from '@audius/harmony' import { HarmonyButton, diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx index fc4f2ec70b4..a6acec01522 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx @@ -1,12 +1,12 @@ import { useCallback, useEffect, useState } from 'react' import { - Theme, StringKeys, audioRewardsPageActions, TrendingRewardsModalType, audioRewardsPageSelectors } from '@audius/common' +import { Theme } from '@audius/common/models' import { SegmentedControl, ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/config.tsx b/packages/web/src/pages/audio-rewards-page/config.tsx index 202ad831186..d2eb2fba594 100644 --- a/packages/web/src/pages/audio-rewards-page/config.tsx +++ b/packages/web/src/pages/audio-rewards-page/config.tsx @@ -1,11 +1,7 @@ import { ReactNode } from 'react' -import { - ChallengeName, - ChallengeRewardID, - Nullable, - challengeRewardsConfig -} from '@audius/common' +import { Nullable, challengeRewardsConfig } from '@audius/common' +import { ChallengeName, ChallengeRewardID } from '@audius/common/models' import { IconArrow, IconCheck, IconUpload } from '@audius/stems' import IconGoldBadge from 'assets/img/tokenBadgeGold40@2x.png' diff --git a/packages/web/src/pages/audio-transactions-page/AudioTransactionsPage.tsx b/packages/web/src/pages/audio-transactions-page/AudioTransactionsPage.tsx index b0fe9e300f3..3ac1015e0bc 100644 --- a/packages/web/src/pages/audio-transactions-page/AudioTransactionsPage.tsx +++ b/packages/web/src/pages/audio-transactions-page/AudioTransactionsPage.tsx @@ -11,9 +11,9 @@ import { TransactionType, audioTransactionsPageActions, audioTransactionsPageSelectors, - transactionDetailsActions, - statusIsNotFinalized + transactionDetailsActions } from '@audius/common' +import { statusIsNotFinalized } from '@audius/common/models' import { full } from '@audius/sdk' import { IconCaretRight } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/BlockUserConfirmationModal.tsx b/packages/web/src/pages/chat-page/components/BlockUserConfirmationModal.tsx index c011c51c310..083254293bb 100644 --- a/packages/web/src/pages/chat-page/components/BlockUserConfirmationModal.tsx +++ b/packages/web/src/pages/chat-page/components/BlockUserConfirmationModal.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { User, chatActions, Name } from '@audius/common' +import { chatActions } from '@audius/common' +import { Name, User } from '@audius/common/models' import { Button, ButtonType, diff --git a/packages/web/src/pages/chat-page/components/ChatHeader.tsx b/packages/web/src/pages/chat-page/components/ChatHeader.tsx index 62ffe08a8fa..e9cea2eaf52 100644 --- a/packages/web/src/pages/chat-page/components/ChatHeader.tsx +++ b/packages/web/src/pages/chat-page/components/ChatHeader.tsx @@ -1,7 +1,8 @@ import { forwardRef, useCallback, useState } from 'react' -import { chatSelectors, User, useCreateChatModal } from '@audius/common' +import { chatSelectors, useCreateChatModal } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { User } from '@audius/common/models' import { IconButton, IconCompose, diff --git a/packages/web/src/pages/chat-page/components/ChatList.tsx b/packages/web/src/pages/chat-page/components/ChatList.tsx index c80aed7b550..9e75ab1a9ac 100644 --- a/packages/web/src/pages/chat-page/components/ChatList.tsx +++ b/packages/web/src/pages/chat-page/components/ChatList.tsx @@ -5,7 +5,8 @@ import { useState } from 'react' -import { chatSelectors, chatActions, Status } from '@audius/common' +import { chatSelectors, chatActions } from '@audius/common' +import { Status } from '@audius/common/models' import cn from 'classnames' import InfiniteScroll from 'react-infinite-scroller' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageList.tsx b/packages/web/src/pages/chat-page/components/ChatMessageList.tsx index 1ce87ec1cdf..84c0ca713cf 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageList.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageList.tsx @@ -16,12 +16,12 @@ import { chatActions, chatSelectors, encodeHashId, - Status, hasTail, isEarliestUnread, chatCanFetchMoreMessages } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { ResizeObserver } from '@juggle/resize-observer' import cn from 'classnames' import { throttle } from 'lodash' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx b/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx index d4ee41b294d..382fd3b2c9b 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx @@ -9,11 +9,10 @@ import { ReactionTypes, formatMessageDate, isTrackUrl, - isCollectionUrl, - ChatMessageWithExtras, - Status + isCollectionUrl } from '@audius/common' import { useProxySelector, useCanSendMessage } from '@audius/common/hooks' +import { Status, ChatMessageWithExtras } from '@audius/common/models' import { IconError, IconPlus, PopupPosition } from '@audius/stems' import cn from 'classnames' import { find } from 'linkifyjs' diff --git a/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx b/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx index 40986db7278..1f96a0e46bb 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx @@ -1,26 +1,22 @@ import { useCallback, useMemo, useEffect } from 'react' import { - Kind, - Status, makeUid, - ID, QueueSource, playerSelectors, getPathFromPlaylistUrl, accountSelectors, ChatMessageTileProps, - SquareSizes, cacheCollectionsActions, cacheCollectionsSelectors, - CommonState, - Name + CommonState } from '@audius/common' import { useGetTracksByIds, useGetPlaylistByPermalink } from '@audius/common/api' import { usePlayTrack, usePauseTrack } from '@audius/common/hooks' +import { Name, SquareSizes, Kind, Status, ID } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx index 0c328350f3b..276591b9431 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx @@ -1,18 +1,12 @@ import { useCallback, useEffect, useMemo } from 'react' import { - Kind, - Status, makeUid, - PlaybackSource, QueueSource, accountSelectors, getPathFromTrackUrl, - ID, ChatMessageTileProps, - cacheTracksActions, - SquareSizes, - Name + cacheTracksActions } from '@audius/common' import { useGetTrackByPermalink } from '@audius/common/api' import { @@ -20,6 +14,14 @@ import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' +import { + Name, + PlaybackSource, + SquareSizes, + Kind, + Status, + ID +} from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/chat-page/components/ChatUser.tsx b/packages/web/src/pages/chat-page/components/ChatUser.tsx index 7c30ef4aa67..5702b8414f4 100644 --- a/packages/web/src/pages/chat-page/components/ChatUser.tsx +++ b/packages/web/src/pages/chat-page/components/ChatUser.tsx @@ -1,6 +1,8 @@ import { ReactNode, useCallback } from 'react' -import { User } from '@audius/common' +import { User } from '@audius/common/models' + +import {} from '@audius/common' import cn from 'classnames' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/pages/chat-page/components/CreateChatModal.tsx b/packages/web/src/pages/chat-page/components/CreateChatModal.tsx index e5f48ed9075..9a3b464417e 100644 --- a/packages/web/src/pages/chat-page/components/CreateChatModal.tsx +++ b/packages/web/src/pages/chat-page/components/CreateChatModal.tsx @@ -7,13 +7,13 @@ import { FOLLOWERS_USER_LIST_TAG, followersUserListActions, followersUserListSelectors, - User, useCreateChatModal, useInboxUnavailableModal, createChatModalActions, searchUsersModalActions, chatSelectors } from '@audius/common' +import { User } from '@audius/common/models' import { IconCompose } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx b/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx index bd2142c9861..b6569062517 100644 --- a/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx +++ b/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx @@ -7,9 +7,9 @@ import { chatSelectors, removeNullable, tippingActions, - tippingSelectors, - User + tippingSelectors } from '@audius/common' +import { User } from '@audius/common/models' import { IconBlockMessages, IconButton, diff --git a/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx b/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx index 63e98184e1b..f70caab4905 100644 --- a/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx +++ b/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx @@ -1,6 +1,7 @@ import { useState, useCallback, MouseEventHandler } from 'react' -import { User, ChatPermissionAction, CHAT_BLOG_POST_URL } from '@audius/common' +import { ChatPermissionAction, CHAT_BLOG_POST_URL } from '@audius/common' +import { User } from '@audius/common/models' import { UserNameAndBadges } from 'components/user-name-and-badges/UserNameAndBadges' diff --git a/packages/web/src/pages/chat-page/components/UnblockUserConfirmationModal.tsx b/packages/web/src/pages/chat-page/components/UnblockUserConfirmationModal.tsx index 5e46aa9de3d..65c9d9d944d 100644 --- a/packages/web/src/pages/chat-page/components/UnblockUserConfirmationModal.tsx +++ b/packages/web/src/pages/chat-page/components/UnblockUserConfirmationModal.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { User, chatActions } from '@audius/common' +import { chatActions } from '@audius/common' +import { User } from '@audius/common/models' import { Button, ButtonType, diff --git a/packages/web/src/pages/check-page/CheckPage.tsx b/packages/web/src/pages/check-page/CheckPage.tsx index b7d8adac9d8..8200d258081 100644 --- a/packages/web/src/pages/check-page/CheckPage.tsx +++ b/packages/web/src/pages/check-page/CheckPage.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react' -import { accountSelectors, Status } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx index 9de9fa78b0d..bb78992cdc5 100644 --- a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx +++ b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx @@ -8,14 +8,6 @@ import { } from 'react' import { - ShareSource, - Chain, - Collectible, - Collection, - SmartCollection, - SmartCollectionVariant, - Status, - User, formatSeconds, cacheUsersSelectors, profilePageActions, @@ -28,6 +20,16 @@ import { playerSelectors, getHash } from '@audius/common' +import { + ShareSource, + Chain, + SmartCollectionVariant, + Status, + Collectible, + Collection, + SmartCollection, + User +} from '@audius/common/models' import cn from 'classnames' import { push } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/collection-page/CollectionPage.tsx b/packages/web/src/pages/collection-page/CollectionPage.tsx index 99921fa2065..87170500a0f 100644 --- a/packages/web/src/pages/collection-page/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/CollectionPage.tsx @@ -1,4 +1,5 @@ -import { SmartCollection, CollectionsPageType } from '@audius/common' +import { CollectionsPageType } from '@audius/common' +import { SmartCollection } from '@audius/common/models' import { useIsMobile } from 'hooks/useIsMobile' diff --git a/packages/web/src/pages/collection-page/CollectionPageProvider.tsx b/packages/web/src/pages/collection-page/CollectionPageProvider.tsx index 0bb3b4c4a59..18ce9c42a81 100644 --- a/packages/web/src/pages/collection-page/CollectionPageProvider.tsx +++ b/packages/web/src/pages/collection-page/CollectionPageProvider.tsx @@ -1,20 +1,6 @@ import { ChangeEvent, Component, ComponentType } from 'react' import { - ID, - UID, - PlayableType, - RepostSource, - FavoriteSource, - Name, - PlaybackSource, - ShareSource, - FollowSource, - Collection, - SmartCollection, - FavoriteType, - Kind, - Status, Nullable, Uid, formatUrlName, @@ -43,6 +29,22 @@ import { playlistUpdatesSelectors, editPlaylistModalActions } from '@audius/common' +import { + Name, + ShareSource, + RepostSource, + FavoriteSource, + FollowSource, + PlaybackSource, + FavoriteType, + PlayableType, + Kind, + Status, + Collection, + SmartCollection, + ID, + UID +} from '@audius/common/models' import { push as pushRoute, replace } from 'connected-react-router' import { UnregisterCallback } from 'history' import { connect } from 'react-redux' diff --git a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx index 434ccd0efa7..14bd6a36e88 100644 --- a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx @@ -1,18 +1,20 @@ import { ChangeEvent, useMemo } from 'react' import { - ID, - Collection, - SmartCollection, - Variant, - Status, - User, CollectionTrack, CollectionPageTrackRecord, CollectionsPageType, - DogEarType, FeatureFlags } from '@audius/common' +import { + Variant, + DogEarType, + Status, + Collection, + SmartCollection, + ID, + User +} from '@audius/common/models' import { CollectiblesPlaylistTableColumn, diff --git a/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx b/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx index bfa5776e30b..d03920ffa38 100644 --- a/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx @@ -1,18 +1,20 @@ import { memo, useEffect, useContext } from 'react' import { - ID, - Collection, - SmartCollection, - Variant, - SmartCollectionVariant, - Status, - User, CollectionsPageType, CollectionTrack, OverflowAction } from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' +import { + Variant, + SmartCollectionVariant, + Status, + Collection, + SmartCollection, + ID, + User +} from '@audius/common/models' import CollectionHeader from 'components/collection/mobile/CollectionHeader' import { HeaderContext } from 'components/header/mobile/HeaderContextProvider' diff --git a/packages/web/src/pages/collection-page/store/utils.ts b/packages/web/src/pages/collection-page/store/utils.ts index a71b979f756..d6ffa055872 100644 --- a/packages/web/src/pages/collection-page/store/utils.ts +++ b/packages/web/src/pages/collection-page/store/utils.ts @@ -1,4 +1,5 @@ -import { Collection, SmartCollection, Variant } from '@audius/common' +import { Variant, Collection, SmartCollection } from '@audius/common/models' +import {} from '@audius/common' export const computeCollectionMetadataProps = ( metadata: Collection | SmartCollection | null diff --git a/packages/web/src/pages/dashboard-page/DashboardPage.tsx b/packages/web/src/pages/dashboard-page/DashboardPage.tsx index 7bad31e0941..4dc22d30f72 100644 --- a/packages/web/src/pages/dashboard-page/DashboardPage.tsx +++ b/packages/web/src/pages/dashboard-page/DashboardPage.tsx @@ -1,6 +1,7 @@ import { useState, Suspense, ReactNode, useEffect, useCallback } from 'react' -import { Status, Track, formatCount, themeSelectors } from '@audius/common' +import { formatCount, themeSelectors } from '@audius/common' +import { Status, Track } from '@audius/common/models' import cn from 'classnames' import { each } from 'lodash' import moment, { Moment } from 'moment' diff --git a/packages/web/src/pages/dashboard-page/components/ArtistCard.tsx b/packages/web/src/pages/dashboard-page/components/ArtistCard.tsx index e0e709385cc..cdd45b286f0 100644 --- a/packages/web/src/pages/dashboard-page/components/ArtistCard.tsx +++ b/packages/web/src/pages/dashboard-page/components/ArtistCard.tsx @@ -1,4 +1,5 @@ -import { ID, SquareSizes, WidthSizes } from '@audius/common' +import { SquareSizes, WidthSizes, ID } from '@audius/common/models' +import {} from '@audius/common' import DynamicImage from 'components/dynamic-image/DynamicImage' import { Text } from 'components/typography' diff --git a/packages/web/src/pages/dashboard-page/components/TotalPlaysChart.jsx b/packages/web/src/pages/dashboard-page/components/TotalPlaysChart.jsx index b9ee8fff4a5..16e03f9891c 100644 --- a/packages/web/src/pages/dashboard-page/components/TotalPlaysChart.jsx +++ b/packages/web/src/pages/dashboard-page/components/TotalPlaysChart.jsx @@ -1,6 +1,7 @@ import { createRef, Component } from 'react' -import { Theme, formatCount } from '@audius/common' +import { formatCount } from '@audius/common' +import { Theme } from '@audius/common/models' import moment from 'moment' import numeral from 'numeral' import PropTypes from 'prop-types' diff --git a/packages/web/src/pages/dashboard-page/components/TracksTableContainer.tsx b/packages/web/src/pages/dashboard-page/components/TracksTableContainer.tsx index 230eb6e0aa5..55c9c77d2a5 100644 --- a/packages/web/src/pages/dashboard-page/components/TracksTableContainer.tsx +++ b/packages/web/src/pages/dashboard-page/components/TracksTableContainer.tsx @@ -1,6 +1,13 @@ import { useState, useCallback, useMemo } from 'react' -import { Status, User, Track, isContentUSDCPurchaseGated } from '@audius/common' +import { + Status, + isContentUSDCPurchaseGated, + Track, + User +} from '@audius/common/models' + +import {} from '@audius/common' import { SelectablePill } from '@audius/harmony' import { IconHidden, diff --git a/packages/web/src/pages/dashboard-page/store/sagas.ts b/packages/web/src/pages/dashboard-page/store/sagas.ts index c832614ede3..67d62aa2205 100644 --- a/packages/web/src/pages/dashboard-page/store/sagas.ts +++ b/packages/web/src/pages/dashboard-page/store/sagas.ts @@ -4,11 +4,9 @@ import { walletActions, doEvery, waitForValue, - ID, - getContext, - Collection, - Track + getContext } from '@audius/common' +import { Collection, ID, Track } from '@audius/common/models' import { each } from 'lodash' import moment from 'moment' import { EventChannel } from 'redux-saga' diff --git a/packages/web/src/pages/dashboard-page/store/slice.ts b/packages/web/src/pages/dashboard-page/store/slice.ts index 520b767a393..ced5e90bd6a 100644 --- a/packages/web/src/pages/dashboard-page/store/slice.ts +++ b/packages/web/src/pages/dashboard-page/store/slice.ts @@ -1,4 +1,5 @@ -import { Collection, ID, Status, Track } from '@audius/common' +import { Status, Collection, ID, Track } from '@audius/common/models' +import {} from '@audius/common' import { createSlice, PayloadAction } from '@reduxjs/toolkit' import ArtistDashboardState from './types' diff --git a/packages/web/src/pages/dashboard-page/store/types.ts b/packages/web/src/pages/dashboard-page/store/types.ts index 3cb2c54c6f2..9fae0c69f3a 100644 --- a/packages/web/src/pages/dashboard-page/store/types.ts +++ b/packages/web/src/pages/dashboard-page/store/types.ts @@ -1,4 +1,5 @@ -import { Status, Collection, Track, Nullable } from '@audius/common' +import { Nullable } from '@audius/common' +import { Status, Collection, Track } from '@audius/common/models' export default interface ArtistDashboardState { status: Status diff --git a/packages/web/src/pages/deactivate-account-page/DeactivateAccountPage.tsx b/packages/web/src/pages/deactivate-account-page/DeactivateAccountPage.tsx index fb4e6f9f417..3fa6bb3037a 100644 --- a/packages/web/src/pages/deactivate-account-page/DeactivateAccountPage.tsx +++ b/packages/web/src/pages/deactivate-account-page/DeactivateAccountPage.tsx @@ -2,10 +2,9 @@ import { ReactNode, useCallback, useEffect } from 'react' import { deactivateAccountActions, - deactivateAccountSelectors, - Name, - Status + deactivateAccountSelectors } from '@audius/common' +import { Name, Status } from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/pages/deleted-page/DeletedPage.tsx b/packages/web/src/pages/deleted-page/DeletedPage.tsx index 36deef2c375..dfbc2aceb30 100644 --- a/packages/web/src/pages/deleted-page/DeletedPage.tsx +++ b/packages/web/src/pages/deleted-page/DeletedPage.tsx @@ -1,4 +1,5 @@ -import { Playable, User } from '@audius/common' +import { Playable, User } from '@audius/common/models' +import {} from '@audius/common' import { useIsMobile } from 'hooks/useIsMobile' diff --git a/packages/web/src/pages/deleted-page/DeletedPageProvider.tsx b/packages/web/src/pages/deleted-page/DeletedPageProvider.tsx index 3fb59145c96..6b0f073117c 100644 --- a/packages/web/src/pages/deleted-page/DeletedPageProvider.tsx +++ b/packages/web/src/pages/deleted-page/DeletedPageProvider.tsx @@ -1,12 +1,11 @@ import { useEffect, useCallback, ComponentType } from 'react' import { - Playable, - User, lineupSelectors, playerSelectors, queueSelectors } from '@audius/common' +import { Playable, User } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/deleted-page/components/desktop/DeletedPage.tsx b/packages/web/src/pages/deleted-page/components/desktop/DeletedPage.tsx index 87d5f3f9426..a3e25a25aad 100644 --- a/packages/web/src/pages/deleted-page/components/desktop/DeletedPage.tsx +++ b/packages/web/src/pages/deleted-page/components/desktop/DeletedPage.tsx @@ -1,12 +1,12 @@ +import { NestedNonNullable } from '@audius/common' import { - ID, PlayableType, - CoverArtSizes, SquareSizes, + ID, + CoverArtSizes, Playable, - User, - NestedNonNullable -} from '@audius/common' + User +} from '@audius/common/models' import { Button, ButtonType, IconUser } from '@audius/stems' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/pages/deleted-page/components/mobile/DeletedPage.tsx b/packages/web/src/pages/deleted-page/components/mobile/DeletedPage.tsx index a1a901e4c3b..61b2b92dba8 100644 --- a/packages/web/src/pages/deleted-page/components/mobile/DeletedPage.tsx +++ b/packages/web/src/pages/deleted-page/components/mobile/DeletedPage.tsx @@ -1,12 +1,12 @@ +import { NestedNonNullable } from '@audius/common' import { - ID, PlayableType, - CoverArtSizes, SquareSizes, + ID, + CoverArtSizes, Playable, - User, - NestedNonNullable -} from '@audius/common' + User +} from '@audius/common/models' import { Button, ButtonType, IconUser } from '@audius/stems' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts b/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts index b18b57b38e4..1ce2f975be6 100644 --- a/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts +++ b/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts @@ -1,9 +1,5 @@ -import { - LineupState, - Track, - lineupActions, - lineupReducer -} from '@audius/common' +import { lineupActions, lineupReducer } from '@audius/common' +import { LineupState, Track } from '@audius/common/models' import { PREFIX } from 'pages/deleted-page/store/lineups/more-by/actions' const { initialLineupState } = lineupReducer diff --git a/packages/web/src/pages/explore-page/ExploreCollectionsPageProvider.tsx b/packages/web/src/pages/explore-page/ExploreCollectionsPageProvider.tsx index 5daeb7c6dbc..e1e328c7ee1 100644 --- a/packages/web/src/pages/explore-page/ExploreCollectionsPageProvider.tsx +++ b/packages/web/src/pages/explore-page/ExploreCollectionsPageProvider.tsx @@ -1,8 +1,6 @@ import { useEffect, useState, useCallback, ComponentType } from 'react' import { - ID, - FavoriteType, ExploreCollectionsVariant, explorePageCollectionsSelectors, explorePageCollectionsActions, @@ -10,6 +8,7 @@ import { repostsUserListActions, favoritesUserListActions } from '@audius/common' +import { FavoriteType, ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { matchPath } from 'react-router' diff --git a/packages/web/src/pages/explore-page/components/desktop/CollectionsPage.tsx b/packages/web/src/pages/explore-page/components/desktop/CollectionsPage.tsx index 44b07ca0d92..f811a1ac614 100644 --- a/packages/web/src/pages/explore-page/components/desktop/CollectionsPage.tsx +++ b/packages/web/src/pages/explore-page/components/desktop/CollectionsPage.tsx @@ -1,6 +1,8 @@ import { useCallback, MouseEvent } from 'react' -import { ID, UserCollection, Status } from '@audius/common' +import { Status, UserCollection, ID } from '@audius/common/models' + +import {} from '@audius/common' import { ArtistPopover } from 'components/artist/ArtistPopover' import Card from 'components/card/desktop/Card' diff --git a/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx b/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx index 27f4138dca4..4c58fc4b95b 100644 --- a/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx @@ -1,12 +1,7 @@ import { Fragment, useCallback } from 'react' -import { - UserCollection, - Variant as CollectionVariant, - Status, - User, - ExploreCollectionsVariant -} from '@audius/common' +import { ExploreCollectionsVariant } from '@audius/common' +import { Variant, Status, UserCollection, User } from '@audius/common/models' import Lottie from 'react-lottie' import loadingSpinner from 'assets/animations/loadingSpinner.json' diff --git a/packages/web/src/pages/explore-page/components/mobile/CollectionsPage.tsx b/packages/web/src/pages/explore-page/components/mobile/CollectionsPage.tsx index 3c437d44cf2..ab5d4e1fbf5 100644 --- a/packages/web/src/pages/explore-page/components/mobile/CollectionsPage.tsx +++ b/packages/web/src/pages/explore-page/components/mobile/CollectionsPage.tsx @@ -1,6 +1,8 @@ import { useContext, useEffect } from 'react' -import { ID, UserCollection, Status } from '@audius/common' +import { Status, UserCollection, ID } from '@audius/common/models' + +import {} from '@audius/common' import Card from 'components/card/mobile/Card' import Header from 'components/header/mobile/Header' diff --git a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx index 05d1c6aa8bc..ffb4da1fba5 100644 --- a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx @@ -8,17 +8,19 @@ import React, { } from 'react' import { - UserCollection, - SmartCollection, - Variant as CollectionVariant, - Status, - User, explorePageActions, ExplorePageTabs as ExploreTabs, ExploreCollectionsVariant, explorePageSelectors, removeNullable } from '@audius/common' +import { + Variant, + Status, + UserCollection, + SmartCollection, + User +} from '@audius/common/models' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/feed-page/FeedPageProvider.jsx b/packages/web/src/pages/feed-page/FeedPageProvider.jsx index 4fcc6a22cea..b15f1c9edf1 100644 --- a/packages/web/src/pages/feed-page/FeedPageProvider.jsx +++ b/packages/web/src/pages/feed-page/FeedPageProvider.jsx @@ -1,7 +1,6 @@ import { PureComponent } from 'react' import { - Name, accountSelectors, lineupSelectors, feedPageLineupActions as feedActions, @@ -10,6 +9,7 @@ import { playerSelectors, queueSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { push as pushRoute, replace as replaceRoute diff --git a/packages/web/src/pages/feed-page/components/desktop/FeedFilters.tsx b/packages/web/src/pages/feed-page/components/desktop/FeedFilters.tsx index 78c9c6097d9..656b045ab25 100644 --- a/packages/web/src/pages/feed-page/components/desktop/FeedFilters.tsx +++ b/packages/web/src/pages/feed-page/components/desktop/FeedFilters.tsx @@ -1,4 +1,5 @@ -import { FeedFilter } from '@audius/common' +import { FeedFilter } from '@audius/common/models' +import {} from '@audius/common' import SelectablePills from 'components/selectable-pill/SelectablePills' diff --git a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx index 98a32d5db25..22e054894a2 100644 --- a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx +++ b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx @@ -1,10 +1,9 @@ import { - Name, - FeedFilter, feedPageLineupActions as feedActions, FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { Name, FeedFilter } from '@audius/common/models' import { make, useRecord } from 'common/store/analytics/actions' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/feed-page/components/mobile/FeedFilterButton.tsx b/packages/web/src/pages/feed-page/components/mobile/FeedFilterButton.tsx index e42af0ef882..171ae6b7eae 100644 --- a/packages/web/src/pages/feed-page/components/mobile/FeedFilterButton.tsx +++ b/packages/web/src/pages/feed-page/components/mobile/FeedFilterButton.tsx @@ -1,4 +1,5 @@ -import { FeedFilter } from '@audius/common' +import { FeedFilter } from '@audius/common/models' +import {} from '@audius/common' import HeaderButton from 'components/header-button/HeaderButton' diff --git a/packages/web/src/pages/feed-page/components/mobile/FeedFilterDrawer.tsx b/packages/web/src/pages/feed-page/components/mobile/FeedFilterDrawer.tsx index 039dbc5a9c6..7e1f50cb045 100644 --- a/packages/web/src/pages/feed-page/components/mobile/FeedFilterDrawer.tsx +++ b/packages/web/src/pages/feed-page/components/mobile/FeedFilterDrawer.tsx @@ -1,6 +1,8 @@ import { useCallback, useMemo } from 'react' -import { FeedFilter } from '@audius/common' +import { FeedFilter } from '@audius/common/models' + +import {} from '@audius/common' import ActionDrawer from 'components/action-drawer/ActionDrawer' diff --git a/packages/web/src/pages/feed-page/components/mobile/FeedPageContent.tsx b/packages/web/src/pages/feed-page/components/mobile/FeedPageContent.tsx index 8535ed9ddcf..9ca980cce53 100644 --- a/packages/web/src/pages/feed-page/components/mobile/FeedPageContent.tsx +++ b/packages/web/src/pages/feed-page/components/mobile/FeedPageContent.tsx @@ -1,10 +1,7 @@ import { useContext, useEffect } from 'react' -import { - FeedFilter, - Name, - feedPageLineupActions as feedActions -} from '@audius/common' +import { feedPageLineupActions as feedActions } from '@audius/common' +import { Name, FeedFilter } from '@audius/common/models' import cn from 'classnames' import { useModalState } from 'common/hooks/useModalState' diff --git a/packages/web/src/pages/feed-page/types.ts b/packages/web/src/pages/feed-page/types.ts index 8dda4cbe3c4..3cc6ce39889 100644 --- a/packages/web/src/pages/feed-page/types.ts +++ b/packages/web/src/pages/feed-page/types.ts @@ -1,4 +1,5 @@ -import { ID, UID, FeedFilter, Lineup, User } from '@audius/common' +import { FeedFilter, ID, UID, Lineup, User } from '@audius/common/models' +import {} from '@audius/common' export interface FeedPageContentProps { feedTitle: string diff --git a/packages/web/src/pages/history-page/HistoryPageProvider.tsx b/packages/web/src/pages/history-page/HistoryPageProvider.tsx index f2b02076908..57b6d98ce3f 100644 --- a/packages/web/src/pages/history-page/HistoryPageProvider.tsx +++ b/packages/web/src/pages/history-page/HistoryPageProvider.tsx @@ -8,22 +8,24 @@ import { } from 'react' import { - ID, - UID, - RepostSource, - FavoriteSource, - Name, - PlaybackSource, - Status, accountSelectors, lineupSelectors, historyPageTracksLineupActions as tracksActions, historyPageSelectors, tracksSocialActions as socialActions, playerSelectors, - queueSelectors, - LineupTrack + queueSelectors } from '@audius/common' +import { + Name, + RepostSource, + FavoriteSource, + PlaybackSource, + Status, + ID, + UID, + LineupTrack +} from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { isEqual } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx b/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx index 4798d06d6a7..1d5d57c879b 100644 --- a/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx +++ b/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx @@ -1,6 +1,8 @@ import { ChangeEvent, memo, useMemo } from 'react' -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' + +import {} from '@audius/common' import { Button, ButtonType, IconPause, IconPlay } from '@audius/stems' import FilterInput from 'components/filter-input/FilterInput' diff --git a/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx b/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx index a101a43909c..90bb8387c32 100644 --- a/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx +++ b/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx @@ -1,6 +1,8 @@ +import { ID, UID, LineupTrack } from '@audius/common/models' + import { memo, useEffect, useCallback, useContext } from 'react' -import { ID, UID, LineupTrack } from '@audius/common' +import {} from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' import { Button, ButtonType } from '@audius/stems' diff --git a/packages/web/src/pages/not-found-page/NotFoundPage.tsx b/packages/web/src/pages/not-found-page/NotFoundPage.tsx index 0223d314fef..20d0789d6ef 100644 --- a/packages/web/src/pages/not-found-page/NotFoundPage.tsx +++ b/packages/web/src/pages/not-found-page/NotFoundPage.tsx @@ -1,6 +1,7 @@ import { useEffect, useContext } from 'react' -import { Name, themeSelectors } from '@audius/common' +import { themeSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx b/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx index d745e984f1a..a42ade83dd4 100644 --- a/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx +++ b/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx @@ -1,11 +1,7 @@ import { FormEvent, useLayoutEffect, useState } from 'react' -import { - accountSelectors, - ErrorLevel, - Name, - signOutActions -} from '@audius/common' +import { accountSelectors, signOutActions } from '@audius/common' +import { Name, ErrorLevel } from '@audius/common/models' import { IconValidationX } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/oauth-login-page/hooks.ts b/packages/web/src/pages/oauth-login-page/hooks.ts index 4ce2e20fdb7..42b63f5a15c 100644 --- a/packages/web/src/pages/oauth-login-page/hooks.ts +++ b/packages/web/src/pages/oauth-login-page/hooks.ts @@ -1,14 +1,12 @@ import { useCallback, useEffect, useMemo, useState } from 'react' +import { accountSelectors, CommonState, encodeHashId } from '@audius/common' import { - accountSelectors, - CommonState, - encodeHashId, - ErrorLevel, Name, + ErrorLevel, statusIsNotFinalized, User -} from '@audius/common' +} from '@audius/common/models' import * as queryString from 'query-string' import { useDispatch, useSelector } from 'react-redux' import { useHistory, useLocation } from 'react-router-dom' diff --git a/packages/web/src/pages/oauth-login-page/utils.ts b/packages/web/src/pages/oauth-login-page/utils.ts index d9d65eebddd..f4670b72789 100644 --- a/packages/web/src/pages/oauth-login-page/utils.ts +++ b/packages/web/src/pages/oauth-login-page/utils.ts @@ -1,10 +1,5 @@ -import { - SquareSizes, - User, - decodeHashId, - encodeHashId, - getErrorMessage -} from '@audius/common' +import { decodeHashId, encodeHashId, getErrorMessage } from '@audius/common' +import { SquareSizes, User } from '@audius/common/models' import { CreateGrantRequest } from '@audius/sdk' import base64url from 'base64url' diff --git a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx index ca2541a52a9..b4e8f17f4cb 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx @@ -1,15 +1,17 @@ import { useCallback, useContext, useState } from 'react' import { - Status, - USDCPurchaseDetails, accountSelectors, - combineStatuses, - statusIsNotFinalized, useAllPaginatedQuery, useUSDCPurchaseDetailsModal } from '@audius/common' import { useGetPurchases, useGetPurchasesCount, Id } from '@audius/common/api' +import { + Status, + statusIsNotFinalized, + combineStatuses, + USDCPurchaseDetails +} from '@audius/common/models' import { full } from '@audius/sdk' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTable.tsx b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTable.tsx index 18ae8e7ef85..83fd0ff5ae2 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTable.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTable.tsx @@ -1,10 +1,10 @@ import { MouseEvent, useCallback, useMemo } from 'react' +import { formatUSDCWeiToUSDString } from '@audius/common' import { - formatUSDCWeiToUSDString, USDCContentPurchaseType, USDCPurchaseDetails -} from '@audius/common' +} from '@audius/common/models' import BN from 'bn.js' import moment from 'moment' diff --git a/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx index 887329ec412..5af05818ffd 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx @@ -1,15 +1,17 @@ import { useCallback, useContext, useState } from 'react' import { - Status, - USDCPurchaseDetails, accountSelectors, - combineStatuses, - statusIsNotFinalized, useAllPaginatedQuery, useUSDCPurchaseDetailsModal } from '@audius/common' import { useGetSales, useGetSalesCount, Id } from '@audius/common/api' +import { + Status, + statusIsNotFinalized, + combineStatuses, + USDCPurchaseDetails +} from '@audius/common/models' import { full } from '@audius/sdk' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/pay-and-earn-page/components/SalesTable.tsx b/packages/web/src/pages/pay-and-earn-page/components/SalesTable.tsx index b6b41db6b70..afae33ed92f 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/SalesTable.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/SalesTable.tsx @@ -1,10 +1,10 @@ import { MouseEvent, useCallback, useMemo } from 'react' +import { formatUSDCWeiToUSDString } from '@audius/common' import { - formatUSDCWeiToUSDString, USDCContentPurchaseType, USDCPurchaseDetails -} from '@audius/common' +} from '@audius/common/models' import { BN } from 'bn.js' import moment from 'moment' diff --git a/packages/web/src/pages/pay-and-earn-page/components/TrackNameWithArtwork.tsx b/packages/web/src/pages/pay-and-earn-page/components/TrackNameWithArtwork.tsx index b13e63e9cff..dd7d17f0dc3 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/TrackNameWithArtwork.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/TrackNameWithArtwork.tsx @@ -1,4 +1,5 @@ -import { SquareSizes, statusIsNotFinalized } from '@audius/common' +import { SquareSizes, statusIsNotFinalized } from '@audius/common/models' +import {} from '@audius/common' import { useGetTrackById } from '@audius/common/api' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx b/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx index 04985f0b54c..fc7d6e80f30 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx @@ -1,16 +1,14 @@ import { useCallback } from 'react' import { - BNUSDC, - Name, WithdrawUSDCModalPages, formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber, useWithdrawUSDCModal, - useAddFundsModal, - Status + useAddFundsModal } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import { Name, Status, BNUSDC } from '@audius/common/models' import { Button, PlainButton, IconQuestionCircle, Flex } from '@audius/harmony' import { LogoUSDC } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx index 119d5e20fa7..3b78352e6f5 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx @@ -1,15 +1,9 @@ import { useCallback, useContext, useState } from 'react' import { - BNUSDC, - Name, - Status, - USDCTransactionDetails, WithdrawUSDCModalPages, accountSelectors, - combineStatuses, formatUSDCWeiToFloorCentsNumber, - statusIsNotFinalized, useAllPaginatedQuery, useUSDCTransactionDetailsModal, useWithdrawUSDCModal @@ -20,6 +14,14 @@ import { Id } from '@audius/common/api' import { useUSDCBalance } from '@audius/common/hooks' +import { + Name, + Status, + statusIsNotFinalized, + combineStatuses, + USDCTransactionDetails, + BNUSDC +} from '@audius/common/models' import { full } from '@audius/sdk' import BN from 'bn.js' diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTable.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTable.tsx index ec270dc626e..5da5263ad46 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTable.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTable.tsx @@ -1,9 +1,7 @@ import { MouseEvent, useCallback, useMemo } from 'react' -import { - USDCTransactionDetails, - formatUSDCWeiToUSDString -} from '@audius/common' +import { formatUSDCWeiToUSDString } from '@audius/common' +import { USDCTransactionDetails } from '@audius/common/models' import moment from 'moment' import { Table } from 'components/table' diff --git a/packages/web/src/pages/pay-and-earn-page/types.ts b/packages/web/src/pages/pay-and-earn-page/types.ts index 683e6245f25..652d176f2f4 100644 --- a/packages/web/src/pages/pay-and-earn-page/types.ts +++ b/packages/web/src/pages/pay-and-earn-page/types.ts @@ -1,4 +1,8 @@ -import { USDCPurchaseDetails, USDCTransactionDetails } from '@audius/common' +import { + USDCPurchaseDetails, + USDCTransactionDetails +} from '@audius/common/models' +import {} from '@audius/common' import { Cell, Row } from 'react-table' export enum TableType { diff --git a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx index 5ea21c5cc8f..5efaab45fd3 100644 --- a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx +++ b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx @@ -1,13 +1,6 @@ import { ComponentType, PureComponent, RefObject } from 'react' import { - ID, - UID, - Name, - FollowSource, - ShareSource, - BadgeTier, - Status, formatCount, getErrorMessage, accountActions, @@ -37,9 +30,18 @@ import { chatSelectors, ChatPermissionAction, inboxUnavailableModalActions, - cacheCollectionsActions, - CreatePlaylistSource + cacheCollectionsActions } from '@audius/common' +import { + Name, + ShareSource, + FollowSource, + CreatePlaylistSource, + Status, + BadgeTier, + ID, + UID +} from '@audius/common/models' import { push as pushRoute, replace } from 'connected-react-router' import { UnregisterCallback } from 'history' import { uniq } from 'lodash' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileBio.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileBio.tsx index ada730f57e9..69eb4ac2eac 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileBio.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileBio.tsx @@ -1,6 +1,8 @@ import { useCallback, useEffect, useState } from 'react' -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' + +import {} from '@audius/common' import { ResizeObserver } from '@juggle/resize-observer' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileLeftNav.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileLeftNav.tsx index 87d9b331b53..1b023ae9027 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileLeftNav.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileLeftNav.tsx @@ -1,4 +1,5 @@ -import { ID, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { ID } from '@audius/common/models' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx index 5dc77a1f608..f7c2cbf3bdf 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx @@ -1,21 +1,23 @@ import { useCallback, memo, MouseEvent } from 'react' import { - ID, - UID, - Collection, - CoverPhotoSizes, - ProfilePictureSizes, - LineupState, - Status, profilePageTracksLineupActions as tracksActions, ProfileUser, ProfilePageTabs, profilePageFeedLineupActions as feedActions, - badgeTiers, - CreatePlaylistSource + badgeTiers } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { + CreatePlaylistSource, + Status, + Collection, + ID, + UID, + ProfilePictureSizes, + CoverPhotoSizes, + LineupState +} from '@audius/common/models' import IconAlbum from 'assets/img/iconAlbum.svg' import IconCollectibles from 'assets/img/iconCollectibles.svg' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileTopTags.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileTopTags.tsx index 5b62f155bf7..1013ae46754 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileTopTags.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileTopTags.tsx @@ -1,10 +1,7 @@ import { useEffect } from 'react' -import { - Status, - profilePageActions, - profilePageSelectors -} from '@audius/common' +import { profilePageActions, profilePageSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { IconTrending } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileWrapping.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileWrapping.tsx index 2fc4e39ee9c..6601f184ba6 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileWrapping.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileWrapping.tsx @@ -1,4 +1,5 @@ -import { ID, ProfilePictureSizes, Nullable } from '@audius/common' +import { Nullable } from '@audius/common' +import { ID, ProfilePictureSizes } from '@audius/common/models' import cn from 'classnames' import BadgeArtist from 'assets/img/badgeArtist.svg' diff --git a/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx b/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx index 3e9f977b9af..e2bbebef9be 100644 --- a/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx @@ -1,16 +1,18 @@ import { useState, useRef, useCallback, useEffect, MouseEvent } from 'react' import { - ID, - Name, - CoverPhotoSizes, - ProfilePictureSizes, - WidthSizes, - SquareSizes, formatCount, imageCoverPhotoBlank, imageProfilePicEmpty } from '@audius/common' +import { + Name, + SquareSizes, + WidthSizes, + ID, + ProfilePictureSizes, + CoverPhotoSizes +} from '@audius/common/models' import { Button, ButtonType, diff --git a/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx b/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx index 8d6556d97ce..9414589c59c 100644 --- a/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx @@ -1,14 +1,6 @@ import { useEffect, useContext, MouseEvent, ReactNode } from 'react' import { - ID, - UID, - Collection, - CoverPhotoSizes, - ProfilePictureSizes, - LineupState, - Status, - User, ProfilePageTabs, ProfileUser, profilePageTracksLineupActions as tracksActions, @@ -16,6 +8,16 @@ import { badgeTiers } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { + Status, + Collection, + ID, + UID, + ProfilePictureSizes, + CoverPhotoSizes, + LineupState, + User +} from '@audius/common/models' import cn from 'classnames' import IconAlbum from 'assets/img/iconAlbum.svg' diff --git a/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx b/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx index 0a30f572bf0..0ea44835f0e 100644 --- a/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { ID, ShareSource, Nullable, shareModalUIActions } from '@audius/common' +import { Nullable, shareModalUIActions } from '@audius/common' +import { ShareSource, ID } from '@audius/common/models' import { IconShare, IconButton } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx b/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx index ba7b03a1b7f..790df89ffb3 100644 --- a/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx +++ b/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx @@ -1,7 +1,6 @@ import { useEffect, useCallback, ComponentType, RefObject } from 'react' import { - ID, lineupSelectors, remixesPageLineupActions as tracksActions, remixesPageActions, @@ -9,6 +8,7 @@ import { playerSelectors, queueSelectors } from '@audius/common' +import { ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { useParams } from 'react-router' diff --git a/packages/web/src/pages/remixes-page/components/desktop/RemixesPage.tsx b/packages/web/src/pages/remixes-page/components/desktop/RemixesPage.tsx index 313d200d559..aa89c8c129f 100644 --- a/packages/web/src/pages/remixes-page/components/desktop/RemixesPage.tsx +++ b/packages/web/src/pages/remixes-page/components/desktop/RemixesPage.tsx @@ -1,4 +1,5 @@ -import { Track, User, pluralize } from '@audius/common' +import { pluralize } from '@audius/common' +import { Track, User } from '@audius/common/models' import cn from 'classnames' import IconRemixes from 'assets/img/iconRemix.svg' diff --git a/packages/web/src/pages/remixes-page/components/mobile/RemixesPage.tsx b/packages/web/src/pages/remixes-page/components/mobile/RemixesPage.tsx index 7c7c6a1adc0..2c34abb8083 100644 --- a/packages/web/src/pages/remixes-page/components/mobile/RemixesPage.tsx +++ b/packages/web/src/pages/remixes-page/components/mobile/RemixesPage.tsx @@ -1,6 +1,7 @@ import { useEffect, useContext } from 'react' -import { Track, User, pluralize } from '@audius/common' +import { pluralize } from '@audius/common' +import { Track, User } from '@audius/common/models' import cn from 'classnames' import IconRemixes from 'assets/img/iconRemix.svg' diff --git a/packages/web/src/pages/requires-update/RequiresUpdate.tsx b/packages/web/src/pages/requires-update/RequiresUpdate.tsx index bc77f9a0ada..5c1a98687fb 100644 --- a/packages/web/src/pages/requires-update/RequiresUpdate.tsx +++ b/packages/web/src/pages/requires-update/RequiresUpdate.tsx @@ -1,4 +1,5 @@ -import { Theme } from '@audius/common' +import { Theme } from '@audius/common/models' +import {} from '@audius/common' import { Button, ButtonType, ButtonSize } from '@audius/stems' import tileBackground from 'assets/img/notFoundTiledBackround.png' diff --git a/packages/web/src/pages/saved-page/SavedPageProvider.tsx b/packages/web/src/pages/saved-page/SavedPageProvider.tsx index a4461b9e6a6..05e55dfacd2 100644 --- a/packages/web/src/pages/saved-page/SavedPageProvider.tsx +++ b/packages/web/src/pages/saved-page/SavedPageProvider.tsx @@ -1,18 +1,11 @@ import { ComponentType, PureComponent } from 'react' import { - FavoriteSource, - ID, LibraryCategoryType, - LineupTrack, - Name, - PlaybackSource, SavedPageTabs as ProfileTabs, - RepostSource, SavedPageTabs, SavedPageTrack, TrackRecord, - UID, accountActions, accountSelectors, lineupSelectors, @@ -25,6 +18,15 @@ import { tracksSocialActions as socialActions, savedPageTracksLineupActions as tracksActions } from '@audius/common' +import { + Name, + RepostSource, + FavoriteSource, + PlaybackSource, + ID, + UID, + LineupTrack +} from '@audius/common/models' import { full } from '@audius/sdk' import { push as pushRoute } from 'connected-react-router' import { debounce, isEqual } from 'lodash' diff --git a/packages/web/src/pages/saved-page/components/desktop/AlbumsTabPage.tsx b/packages/web/src/pages/saved-page/components/desktop/AlbumsTabPage.tsx index 05ead665fd1..873ecf7b51d 100644 --- a/packages/web/src/pages/saved-page/components/desktop/AlbumsTabPage.tsx +++ b/packages/web/src/pages/saved-page/components/desktop/AlbumsTabPage.tsx @@ -2,11 +2,11 @@ import { useMemo } from 'react' import { LibraryCategory, - statusIsNotFinalized, savedPageSelectors, CommonState, SavedPageTabs } from '@audius/common' +import { statusIsNotFinalized } from '@audius/common/models' import { useSelector } from 'react-redux' import { InfiniteCardLineup } from 'components/lineup/InfiniteCardLineup' diff --git a/packages/web/src/pages/saved-page/components/desktop/CollectionCard.tsx b/packages/web/src/pages/saved-page/components/desktop/CollectionCard.tsx index bc922b565d2..33a764e3d49 100644 --- a/packages/web/src/pages/saved-page/components/desktop/CollectionCard.tsx +++ b/packages/web/src/pages/saved-page/components/desktop/CollectionCard.tsx @@ -3,9 +3,9 @@ import { useCallback } from 'react' import { cacheCollectionsSelectors, cacheUsersSelectors, - ID, CommonState } from '@audius/common' +import { ID } from '@audius/common/models' import { useSelector } from 'react-redux' import Card, { CardProps } from 'components/card/desktop/Card' diff --git a/packages/web/src/pages/saved-page/components/desktop/PlaylistsTabPage.tsx b/packages/web/src/pages/saved-page/components/desktop/PlaylistsTabPage.tsx index 753059b2a2e..6ac0cca0533 100644 --- a/packages/web/src/pages/saved-page/components/desktop/PlaylistsTabPage.tsx +++ b/packages/web/src/pages/saved-page/components/desktop/PlaylistsTabPage.tsx @@ -3,12 +3,14 @@ import { useCallback, useMemo } from 'react' import { cacheCollectionsActions, CommonState, - CreatePlaylistSource, LibraryCategory, savedPageSelectors, - SavedPageTabs, - statusIsNotFinalized + SavedPageTabs } from '@audius/common' +import { + CreatePlaylistSource, + statusIsNotFinalized +} from '@audius/common/models' import { IconPlus } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx b/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx index c9e4662e819..54bd1590071 100644 --- a/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx +++ b/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx @@ -2,20 +2,15 @@ import { useContext } from 'react' import { CommonState, - ID, - Kind, LibraryCategory, - Lineup, QueueItem, SavedPageCollection, savedPageSelectors, SavedPageTabs, SavedPageTrack, - Status, - TrackRecord, - UID, - User + TrackRecord } from '@audius/common' +import { Kind, Status, ID, UID, Lineup, User } from '@audius/common/models' import { Button, ButtonType, IconPause, IconPlay } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/saved-page/components/mobile/NewPlaylistButton.tsx b/packages/web/src/pages/saved-page/components/mobile/NewPlaylistButton.tsx index df9401e6a86..62f6ee8584c 100644 --- a/packages/web/src/pages/saved-page/components/mobile/NewPlaylistButton.tsx +++ b/packages/web/src/pages/saved-page/components/mobile/NewPlaylistButton.tsx @@ -1,10 +1,7 @@ import { useCallback } from 'react' -import { - Name, - CreatePlaylistSource, - cacheCollectionsActions -} from '@audius/common' +import { cacheCollectionsActions } from '@audius/common' +import { Name, CreatePlaylistSource } from '@audius/common/models' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx b/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx index 69d70552c92..ee5840c1cf8 100644 --- a/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx +++ b/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx @@ -9,23 +9,25 @@ import { import { CommonState, - ID, LibraryCategory, - Lineup, - Name, QueueItem, SavedPageTabs, SavedPageTrack, - UID, cacheCollectionsSelectors, cacheUsersSelectors, - savedPageSelectors, - statusIsNotFinalized + savedPageSelectors } from '@audius/common' import { useGatedContentAccessMap, useDebouncedCallback } from '@audius/common/hooks' +import { + Name, + statusIsNotFinalized, + ID, + UID, + Lineup +} from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx b/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx index 4758c99091d..5c37dfe9f37 100644 --- a/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx +++ b/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx @@ -5,10 +5,10 @@ import { cacheCollectionsSelectors, CommonState, savedPageSelectors, - Status, useAllPaginatedQuery } from '@audius/common' import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' +import { Status } from '@audius/common/models' import { uniqBy } from 'lodash' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/search-page/SearchPageProvider.jsx b/packages/web/src/pages/search-page/SearchPageProvider.jsx index 5aae6686dcc..e598f8afab8 100644 --- a/packages/web/src/pages/search-page/SearchPageProvider.jsx +++ b/packages/web/src/pages/search-page/SearchPageProvider.jsx @@ -1,7 +1,6 @@ import { Component } from 'react' import { - Name, accountSelectors, lineupSelectors, searchResultsPageActions as searchPageActions, @@ -11,6 +10,7 @@ import { playerSelectors, queueSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Redirect } from 'react-router' diff --git a/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx b/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx index 6a56064e220..6bfa8b03079 100644 --- a/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx +++ b/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx @@ -1,11 +1,11 @@ import { Component } from 'react' import { - Status, formatCount, searchResultsPageTracksLineupActions as tracksActions, SearchKind } from '@audius/common' +import { Status } from '@audius/common/models' import { Redirect } from 'react-router' import IconBigSearch from 'assets/img/iconBigSearch.svg' diff --git a/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx b/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx index 4495cf80c63..e5917dec3bd 100644 --- a/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx +++ b/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx @@ -1,15 +1,17 @@ import { memo, useCallback, useContext, useEffect, useMemo } from 'react' import { - UID, - Name, - UserCollection, - LineupState, - Status, - User, searchResultsPageTracksLineupActions as tracksActions, trimToAlphaNumeric } from '@audius/common' +import { + Name, + Status, + UserCollection, + UID, + LineupState, + User +} from '@audius/common/models' import { matchPath } from 'react-router' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/settings-page/SettingsPageProvider.tsx b/packages/web/src/pages/settings-page/SettingsPageProvider.tsx index c15fddc04a0..f69961a2a9f 100644 --- a/packages/web/src/pages/settings-page/SettingsPageProvider.tsx +++ b/packages/web/src/pages/settings-page/SettingsPageProvider.tsx @@ -1,8 +1,6 @@ import { ComponentType, PureComponent } from 'react' import { - Name, - Theme, accountSelectors, InstagramProfile, settingsPageSelectors, @@ -20,6 +18,7 @@ import { musicConfettiActions, TikTokProfile } from '@audius/common' +import { Name, Theme } from '@audius/common/models' import { push as pushRoute, goBack } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/CreateNewAppPage.tsx b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/CreateNewAppPage.tsx index f07315aa96d..b882dc89261 100644 --- a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/CreateNewAppPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/CreateNewAppPage.tsx @@ -1,12 +1,13 @@ import { useCallback, useEffect, useState } from 'react' -import { Status, accountSelectors, Name } from '@audius/common' +import { accountSelectors } from '@audius/common' import { DEVELOPER_APP_DESCRIPTION_MAX_LENGTH, DEVELOPER_APP_NAME_MAX_LENGTH, developerAppSchema, useAddDeveloperApp } from '@audius/common/api' +import { Name, Status } from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import { Form, Formik } from 'formik' import { z } from 'zod' diff --git a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/DeleteAppConfirmationPage.tsx b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/DeleteAppConfirmationPage.tsx index dc1dfe84c33..751648e2a02 100644 --- a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/DeleteAppConfirmationPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/DeleteAppConfirmationPage.tsx @@ -1,7 +1,8 @@ import { useCallback, useEffect } from 'react' -import { Status, accountSelectors, Name } from '@audius/common' +import { accountSelectors } from '@audius/common' import { useDeleteDeveloperApp } from '@audius/common/api' +import { Name, Status } from '@audius/common/models' import { Button, ButtonType, ModalFooter } from '@audius/stems' import { useSelector } from 'common/hooks/useSelector' diff --git a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/YourAppsPage.tsx b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/YourAppsPage.tsx index f1910c249ab..5a1e4df7761 100644 --- a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/YourAppsPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/YourAppsPage.tsx @@ -1,5 +1,6 @@ -import { Status, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' import { useGetDeveloperApps } from '@audius/common/api' +import { Status } from '@audius/common/models' import { Button, ButtonSize, diff --git a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx index eeacfd09c8c..165a7f7ad09 100644 --- a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx @@ -1,10 +1,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react' import { - ID, - ProfilePictureSizes, - OS, - Theme, InstagramProfile, TwitterProfile, Notifications, @@ -15,6 +11,7 @@ import { removeNullable, settingsPageSelectors } from '@audius/common' +import { OS, Theme, ID, ProfilePictureSizes } from '@audius/common/models' import { IconAppearance } from '@audius/harmony' import { Modal, diff --git a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx index c47d786dc91..2eb874c830c 100644 --- a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx @@ -1,17 +1,19 @@ import { useCallback, useState } from 'react' import { - ID, - Name, - ProfilePictureSizes, - SquareSizes, - Status, BooleanKeys, TwitterProfile, InstagramProfile, musicConfettiActions, TikTokProfile } from '@audius/common' +import { + Name, + SquareSizes, + Status, + ID, + ProfilePictureSizes +} from '@audius/common/models' import { Modal, Button, ButtonType, IconNote, ButtonSize } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/settings-page/components/mobile/AccountSettingsPage.tsx b/packages/web/src/pages/settings-page/components/mobile/AccountSettingsPage.tsx index af0fc81b2f6..5f43088168e 100644 --- a/packages/web/src/pages/settings-page/components/mobile/AccountSettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/AccountSettingsPage.tsx @@ -1,6 +1,8 @@ import { useState, useContext, useCallback } from 'react' -import { Name, SquareSizes } from '@audius/common' +import { Name, SquareSizes } from '@audius/common/models' + +import {} from '@audius/common' import { Modal, Button, ButtonType, IconMail, IconSignOut } from '@audius/stems' import cn from 'classnames' import { debounce } from 'lodash' diff --git a/packages/web/src/pages/settings-page/components/mobile/ChangePasswordPage.tsx b/packages/web/src/pages/settings-page/components/mobile/ChangePasswordPage.tsx index 0b986d6cdae..2c2831f4381 100644 --- a/packages/web/src/pages/settings-page/components/mobile/ChangePasswordPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/ChangePasswordPage.tsx @@ -1,11 +1,11 @@ import { useCallback, useContext, useEffect } from 'react' import { - Name, ChangePasswordPageStep, changePasswordSelectors, changePasswordActions } from '@audius/common' +import { Name } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { make, TrackEvent } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/settings-page/components/mobile/SettingsPage.tsx b/packages/web/src/pages/settings-page/components/mobile/SettingsPage.tsx index a916591eb94..bd5ba1b604b 100644 --- a/packages/web/src/pages/settings-page/components/mobile/SettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/SettingsPage.tsx @@ -1,10 +1,6 @@ import { useContext, useEffect, FC } from 'react' import { - ID, - SquareSizes, - ProfilePictureSizes, - Theme, InstagramProfile, TwitterProfile, Notifications, @@ -14,6 +10,12 @@ import { PushNotifications, TikTokProfile } from '@audius/common' +import { + SquareSizes, + Theme, + ID, + ProfilePictureSizes +} from '@audius/common/models' import { SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx index 8a6e3bad240..23d3f8adf13 100644 --- a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx @@ -1,16 +1,18 @@ import { useCallback, useState } from 'react' import { - ID, - Name, - ProfilePictureSizes, - SquareSizes, - Status, BooleanKeys, InstagramProfile, TwitterProfile, TikTokProfile } from '@audius/common' +import { + Name, + SquareSizes, + Status, + ID, + ProfilePictureSizes +} from '@audius/common/models' import { Button, ButtonSize, diff --git a/packages/web/src/pages/settings-page/store/sagas.ts b/packages/web/src/pages/settings-page/store/sagas.ts index 4b861388de9..c2d9220fcde 100644 --- a/packages/web/src/pages/settings-page/store/sagas.ts +++ b/packages/web/src/pages/settings-page/store/sagas.ts @@ -1,11 +1,11 @@ import { - Name, getErrorMessage, settingsPageActions as actions, settingsPageSelectors, BrowserNotificationSetting, getContext } from '@audius/common' +import { Name } from '@audius/common/models' import { select, call, put, takeEvery } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/sign-on/SignOnProvider.tsx b/packages/web/src/pages/sign-on/SignOnProvider.tsx index 95980ddc26f..d19e43debca 100644 --- a/packages/web/src/pages/sign-on/SignOnProvider.tsx +++ b/packages/web/src/pages/sign-on/SignOnProvider.tsx @@ -1,9 +1,6 @@ import { Component, ComponentType } from 'react' import { - ID, - Name, - User, accountSelectors, InstagramProfile, Image, @@ -11,6 +8,7 @@ import { accountActions, TikTokProfile } from '@audius/common' +import { Name, ID, User } from '@audius/common/models' import { push as pushRoute, replace as replaceRoute, diff --git a/packages/web/src/pages/sign-on/components/desktop/FollowPage.tsx b/packages/web/src/pages/sign-on/components/desktop/FollowPage.tsx index ae68c640113..f1d4999561f 100644 --- a/packages/web/src/pages/sign-on/components/desktop/FollowPage.tsx +++ b/packages/web/src/pages/sign-on/components/desktop/FollowPage.tsx @@ -1,6 +1,8 @@ import { useState, useCallback, useEffect } from 'react' -import { ID, User } from '@audius/common' +import { ID, User } from '@audius/common/models' + +import {} from '@audius/common' import { Button, ButtonType, IconArrow, Scrollbar } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx b/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx index 856d6ea35be..6594e623121 100644 --- a/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx +++ b/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx @@ -1,15 +1,13 @@ import { Suspense, useEffect } from 'react' import { - ID, - Status, - User, accountSelectors, Image, InstagramProfile, TwitterProfile, TikTokProfile } from '@audius/common' +import { Status, ID, User } from '@audius/common/models' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/pages/sign-on/components/mobile/FollowPage.tsx b/packages/web/src/pages/sign-on/components/mobile/FollowPage.tsx index f69e85b59a4..fb7f133443b 100644 --- a/packages/web/src/pages/sign-on/components/mobile/FollowPage.tsx +++ b/packages/web/src/pages/sign-on/components/mobile/FollowPage.tsx @@ -1,6 +1,8 @@ import { useState, useEffect, useCallback } from 'react' -import { ID, User } from '@audius/common' +import { ID, User } from '@audius/common/models' + +import {} from '@audius/common' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx b/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx index 2ff9514ce21..45a9c68b329 100644 --- a/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx +++ b/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx @@ -1,13 +1,12 @@ import { useEffect } from 'react' import { - ID, - User, Image, InstagramProfile, TwitterProfile, TikTokProfile } from '@audius/common' +import { ID, User } from '@audius/common/models' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx index 7823b4fb1b4..03c224af9b0 100644 --- a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx +++ b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx @@ -1,4 +1,5 @@ -import { Name, SquareSizes, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { Name, SquareSizes } from '@audius/common/models' import { Avatar, Box, diff --git a/packages/web/src/pages/sign-up-page/components/CoverPhotoBanner.tsx b/packages/web/src/pages/sign-up-page/components/CoverPhotoBanner.tsx index 99659ef3d1b..33ede4c5ae7 100644 --- a/packages/web/src/pages/sign-up-page/components/CoverPhotoBanner.tsx +++ b/packages/web/src/pages/sign-up-page/components/CoverPhotoBanner.tsx @@ -1,4 +1,5 @@ -import { SquareSizes, WidthSizes, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { SquareSizes, WidthSizes } from '@audius/common/models' import { Box, useTheme, IconImage, IconButton } from '@audius/harmony' import { diff --git a/packages/web/src/pages/sign-up-page/components/FollowArtistCard.tsx b/packages/web/src/pages/sign-up-page/components/FollowArtistCard.tsx index 710faf5106f..10cc2567f03 100644 --- a/packages/web/src/pages/sign-up-page/components/FollowArtistCard.tsx +++ b/packages/web/src/pages/sign-up-page/components/FollowArtistCard.tsx @@ -1,6 +1,7 @@ import { HTMLProps, useContext } from 'react' -import { Name, UserMetadata, WidthSizes, formatCount } from '@audius/common' +import { formatCount } from '@audius/common' +import { Name, WidthSizes, UserMetadata } from '@audius/common/models' import { Box, Divider, diff --git a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts index 46208e05419..2af05945b89 100644 --- a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts +++ b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts @@ -6,11 +6,11 @@ import { formatTikTokProfile, formatTwitterProfile, InstagramProfile, - Name, pickHandleSchema, TikTokProfile, TwitterProfile } from '@audius/common' +import { Name } from '@audius/common/models' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/sign-up-page/hooks/useSocialMediaLoader.ts b/packages/web/src/pages/sign-up-page/hooks/useSocialMediaLoader.ts index 441c3818595..ea5be738bca 100644 --- a/packages/web/src/pages/sign-up-page/hooks/useSocialMediaLoader.ts +++ b/packages/web/src/pages/sign-up-page/hooks/useSocialMediaLoader.ts @@ -1,6 +1,8 @@ import { useCallback, useEffect, useState } from 'react' -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' + +import {} from '@audius/common' import { useDispatch } from 'react-redux' import { AnyAction } from 'redux' diff --git a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx index 2da67111917..4d03e6e18e5 100644 --- a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx @@ -1,11 +1,8 @@ import { useCallback, useRef } from 'react' -import { - MAX_DISPLAY_NAME_LENGTH, - Name, - finishProfileSchema -} from '@audius/common' +import { MAX_DISPLAY_NAME_LENGTH, finishProfileSchema } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' +import { Name } from '@audius/common/models' import { Flex, Paper, PlainButton, Text, useTheme } from '@audius/harmony' import { Formik, Form, useField, useFormikContext } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx index 37b571bb05b..eca6f866d7f 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx @@ -3,7 +3,6 @@ import type { ChangeEvent } from 'react' import { Genre, - Status, convertGenreLabelToValue, selectArtistsSchema } from '@audius/common' @@ -12,6 +11,7 @@ import { useGetFeaturedArtists } from '@audius/common/api' import { selectArtistsPageMessages } from '@audius/common/messages' +import { Status } from '@audius/common/models' import { Flex, Text, SelectablePill, Paper, useTheme } from '@audius/harmony' import { useSpring, animated } from '@react-spring/web' import { Form, Formik } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx index 52a98fa740c..d880734f92e 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx @@ -1,12 +1,8 @@ import { MouseEventHandler, useCallback, useState } from 'react' -import { - Genre, - Name, - selectGenresSchema, - selectableGenres -} from '@audius/common' +import { Genre, selectGenresSchema, selectableGenres } from '@audius/common' import { selectGenresPageMessages } from '@audius/common/messages' +import { Name } from '@audius/common/models' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/utils/selectArtistsPreviewContext.tsx b/packages/web/src/pages/sign-up-page/utils/selectArtistsPreviewContext.tsx index e09d940331f..6bfcd94d9a9 100644 --- a/packages/web/src/pages/sign-up-page/utils/selectArtistsPreviewContext.tsx +++ b/packages/web/src/pages/sign-up-page/utils/selectArtistsPreviewContext.tsx @@ -1,7 +1,8 @@ import { createContext, useCallback, useEffect, useState } from 'react' -import { ID, UserTrackMetadata, playerActions } from '@audius/common' +import { playerActions } from '@audius/common' import { useGetUserTracksByHandle, useGetUserById } from '@audius/common/api' +import { ID, UserTrackMetadata } from '@audius/common/models' import { useDispatch } from 'react-redux' import { useUnmount } from 'react-use' diff --git a/packages/web/src/pages/smart-collection/SmartCollectionPage.tsx b/packages/web/src/pages/smart-collection/SmartCollectionPage.tsx index c92758295e5..7852b84fd79 100644 --- a/packages/web/src/pages/smart-collection/SmartCollectionPage.tsx +++ b/packages/web/src/pages/smart-collection/SmartCollectionPage.tsx @@ -1,12 +1,12 @@ import { useEffect } from 'react' import { - SmartCollectionVariant, accountSelectors, smartCollectionPageSelectors, smartCollectionPageActions, playlistLibraryHelpers } from '@audius/common' +import { SmartCollectionVariant } from '@audius/common/models' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/track-page/TrackPageProvider.tsx b/packages/web/src/pages/track-page/TrackPageProvider.tsx index 1dfedfae9b3..76dad485441 100644 --- a/packages/web/src/pages/track-page/TrackPageProvider.tsx +++ b/packages/web/src/pages/track-page/TrackPageProvider.tsx @@ -1,17 +1,6 @@ import { Component, ComponentType } from 'react' import { - ID, - PlayableType, - FollowSource, - FavoriteSource, - RepostSource, - ShareSource, - Name, - PlaybackSource, - FavoriteType, - Status, - Track, Uid, formatDate, accountSelectors, @@ -32,6 +21,19 @@ import { playerSelectors, queueSelectors } from '@audius/common' +import { + Name, + ShareSource, + RepostSource, + FavoriteSource, + FollowSource, + PlaybackSource, + FavoriteType, + PlayableType, + Status, + ID, + Track +} from '@audius/common/models' import { push as pushRoute, replace } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/track-page/components/desktop/Remixes.tsx b/packages/web/src/pages/track-page/components/desktop/Remixes.tsx index 4f946d3ca2b..ab41cfe8150 100644 --- a/packages/web/src/pages/track-page/components/desktop/Remixes.tsx +++ b/packages/web/src/pages/track-page/components/desktop/Remixes.tsx @@ -1,4 +1,5 @@ -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' +import {} from '@audius/common' import cn from 'classnames' import IconRemix from 'assets/img/iconRemix.svg' diff --git a/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx b/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx index 1f7c1122877..2e643852a0a 100644 --- a/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx +++ b/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx @@ -1,12 +1,6 @@ -import { - ID, - LineupState, - Track, - User, - trackPageLineupActions, - QueueItem -} from '@audius/common' +import { trackPageLineupActions, QueueItem } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { ID, LineupState, Track, User } from '@audius/common/models' import cn from 'classnames' import CoverPhoto from 'components/cover-photo/CoverPhoto' diff --git a/packages/web/src/pages/track-page/components/mobile/Remixes.tsx b/packages/web/src/pages/track-page/components/mobile/Remixes.tsx index 49713a96ea3..dfd6d4ea1c9 100644 --- a/packages/web/src/pages/track-page/components/mobile/Remixes.tsx +++ b/packages/web/src/pages/track-page/components/mobile/Remixes.tsx @@ -1,4 +1,5 @@ -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' +import {} from '@audius/common' import cn from 'classnames' import IconRemix from 'assets/img/iconRemix.svg' diff --git a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx index 61a772bfdbe..26297e30074 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx @@ -1,23 +1,25 @@ import { useCallback } from 'react' import { - ID, - SquareSizes, - CoverArtSizes, - FieldVisibility, - Remix, getCanonicalName, formatSeconds, formatDate, OverflowAction, imageBlank as placeholderArt, - AccessConditions, Nullable, getDogEarType, - FeatureFlags, - isContentCollectibleGated, - isContentUSDCPurchaseGated + FeatureFlags } from '@audius/common' +import { + SquareSizes, + isContentCollectibleGated, + isContentUSDCPurchaseGated, + ID, + CoverArtSizes, + FieldVisibility, + Remix, + AccessConditions +} from '@audius/common/models' import { Button, ButtonSize, diff --git a/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx b/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx index 5def735c51c..5845f7764f2 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx @@ -1,15 +1,12 @@ import { useEffect, useContext } from 'react' import { - ID, - LineupState, - Track, - User, trackPageLineupActions, QueueItem, OverflowAction } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { ID, LineupState, Track, User } from '@audius/common/models' import { HeaderContext } from 'components/header/mobile/HeaderContextProvider' import Lineup from 'components/lineup/Lineup' diff --git a/packages/web/src/pages/track-page/utils.ts b/packages/web/src/pages/track-page/utils.ts index 643c6e1522c..62dbb4aeee3 100644 --- a/packages/web/src/pages/track-page/utils.ts +++ b/packages/web/src/pages/track-page/utils.ts @@ -1,4 +1,5 @@ -import { Track } from '@audius/common' +import { Track } from '@audius/common/models' +import {} from '@audius/common' // return the original string if it exists, or '' export const emptyStringGuard = (str: string | null | undefined) => str ?? '' diff --git a/packages/web/src/pages/trending-page/TrendingPageProvider.jsx b/packages/web/src/pages/trending-page/TrendingPageProvider.jsx index ddfb13b2586..be397b4ade1 100644 --- a/packages/web/src/pages/trending-page/TrendingPageProvider.jsx +++ b/packages/web/src/pages/trending-page/TrendingPageProvider.jsx @@ -1,8 +1,6 @@ import { PureComponent } from 'react' import { - Name, - TimeRange, GENRES, accountSelectors, lineupSelectors, @@ -12,6 +10,7 @@ import { playerSelectors, queueSelectors } from '@audius/common' +import { Name, TimeRange } from '@audius/common/models' import { push as pushRoute, replace as replaceRoute diff --git a/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx b/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx index a3ce338f23e..8abff465504 100644 --- a/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx +++ b/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx @@ -1,13 +1,11 @@ import { useCallback, useRef, useState } from 'react' import { - Name, - Status, - TimeRange, ELECTRONIC_PREFIX, TRENDING_GENRES, trendingPageLineupActions } from '@audius/common' +import { Name, Status, TimeRange } from '@audius/common/models' import { make, useRecord } from 'common/store/analytics/actions' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx b/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx index bb93049e6a9..ed58c7a7344 100644 --- a/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx +++ b/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx @@ -1,6 +1,7 @@ import { useCallback, useContext, useEffect, useMemo } from 'react' -import { Name, TimeRange, trendingPageLineupActions } from '@audius/common' +import { trendingPageLineupActions } from '@audius/common' +import { Name, TimeRange } from '@audius/common/models' import cn from 'classnames' import IconAllTime from 'assets/img/iconAllTime.svg' diff --git a/packages/web/src/pages/trending-page/types.ts b/packages/web/src/pages/trending-page/types.ts index f40c2c92054..9f17697e784 100644 --- a/packages/web/src/pages/trending-page/types.ts +++ b/packages/web/src/pages/trending-page/types.ts @@ -1,4 +1,5 @@ -import { ID, Lineup, TimeRange, Track, UID, User } from '@audius/common' +import { TimeRange, ID, UID, Lineup, Track, User } from '@audius/common/models' +import {} from '@audius/common' type ExtraTrendingLineupProps = {} diff --git a/packages/web/src/pages/upload-page/components/ShareBanner.tsx b/packages/web/src/pages/upload-page/components/ShareBanner.tsx index 6ceda015da8..4257f76a5d3 100644 --- a/packages/web/src/pages/upload-page/components/ShareBanner.tsx +++ b/packages/web/src/pages/upload-page/components/ShareBanner.tsx @@ -1,17 +1,19 @@ import { useCallback, useContext } from 'react' import { - Collection, - Name, ShareContent, - ShareSource, - Track, UploadType, - User, accountSelectors, tracksSocialActions, usersSocialActions } from '@audius/common' +import { + Name, + ShareSource, + Collection, + Track, + User +} from '@audius/common/models' import { Button, ButtonType, IconLink, IconTwitterBird } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx index 88ca9b805fb..98756311942 100644 --- a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx +++ b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx @@ -3,27 +3,29 @@ import { useCallback, useMemo } from 'react' import { accountSelectors, FeatureFlags, - FieldVisibility, formatPrice, + Nullable +} from '@audius/common' +import { + USDCPurchaseConfig, + useFeatureFlag, + useUSDCPurchaseConfig, + useAccessAndRemixSettings +} from '@audius/common/hooks' +import { isContentCollectibleGated, isContentFollowGated, isContentTipGated, isContentUSDCPurchaseGated, - Nullable, TrackAvailabilityType, + ID, + FieldVisibility, CollectibleGatedConditions, - USDCPurchaseConditions, FollowGatedConditions, TipGatedConditions, - ID, + USDCPurchaseConditions, AccessConditions -} from '@audius/common' -import { - USDCPurchaseConfig, - useFeatureFlag, - useUSDCPurchaseConfig, - useAccessAndRemixSettings -} from '@audius/common/hooks' +} from '@audius/common/models' import { IconCart, IconCollectible, diff --git a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsField.tsx b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsField.tsx index 52d51fdb70a..f4535d41ee7 100644 --- a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsField.tsx +++ b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsField.tsx @@ -1,13 +1,13 @@ import { useCallback, useEffect, useMemo } from 'react' +import { Nullable } from '@audius/common' +import { useGetTrackById } from '@audius/common/api' import { - Nullable, + isContentUSDCPurchaseGated, ID, FieldVisibility, - Remix, - isContentUSDCPurchaseGated -} from '@audius/common' -import { useGetTrackById } from '@audius/common/api' + Remix +} from '@audius/common/models' import { get, set } from 'lodash' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx index 0b11d358d8d..84ffd0d634d 100644 --- a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx +++ b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx @@ -1,13 +1,12 @@ import { useEffect } from 'react' -import { - getPathFromTrackUrl, - accountSelectors, - isContentUSDCPurchaseGated, - isContentCollectibleGated -} from '@audius/common' +import { getPathFromTrackUrl, accountSelectors } from '@audius/common' import { useGetTrackByPermalink } from '@audius/common/api' import { useGatedContentAccess } from '@audius/common/hooks' +import { + isContentCollectibleGated, + isContentUSDCPurchaseGated +} from '@audius/common/models' import { useField } from 'formik' import { useSelector } from 'react-redux' import { useThrottle } from 'react-use' diff --git a/packages/web/src/pages/upload-page/fields/RemixSettingsField/TrackInfo.tsx b/packages/web/src/pages/upload-page/fields/RemixSettingsField/TrackInfo.tsx index 92e116796ff..eefdb9e9e37 100644 --- a/packages/web/src/pages/upload-page/fields/RemixSettingsField/TrackInfo.tsx +++ b/packages/web/src/pages/upload-page/fields/RemixSettingsField/TrackInfo.tsx @@ -1,4 +1,5 @@ -import { ID, SquareSizes } from '@audius/common' +import { SquareSizes, ID } from '@audius/common/models' +import {} from '@audius/common' import { useGetTrackById } from '@audius/common/api' import { SelectedValue } from 'components/data-entry/ContextualMenu' diff --git a/packages/web/src/pages/upload-page/fields/SourceFilesField.tsx b/packages/web/src/pages/upload-page/fields/SourceFilesField.tsx index 2b69e979b33..243b52d0183 100644 --- a/packages/web/src/pages/upload-page/fields/SourceFilesField.tsx +++ b/packages/web/src/pages/upload-page/fields/SourceFilesField.tsx @@ -1,12 +1,12 @@ import { useCallback, useMemo } from 'react' +import { removeNullable } from '@audius/common' import { - Download, StemCategory, + stemCategoryFriendlyNames, StemUpload, - removeNullable, - stemCategoryFriendlyNames -} from '@audius/common' + Download +} from '@audius/common/models' import { useField } from 'formik' import { get, set } from 'lodash' diff --git a/packages/web/src/pages/upload-page/fields/SourceFilesView.tsx b/packages/web/src/pages/upload-page/fields/SourceFilesView.tsx index 6610a85061d..76929ae91cf 100644 --- a/packages/web/src/pages/upload-page/fields/SourceFilesView.tsx +++ b/packages/web/src/pages/upload-page/fields/SourceFilesView.tsx @@ -4,7 +4,9 @@ import { StemCategory, stemCategoryFriendlyNames, StemUpload -} from '@audius/common' +} from '@audius/common/models' + +import {} from '@audius/common' import { IconRemove, IconButton } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedFields.tsx b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedFields.tsx index cf5842b5d46..737602eca30 100644 --- a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedFields.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedFields.tsx @@ -1,11 +1,11 @@ import { useMemo } from 'react' +import { collectiblesSelectors } from '@audius/common' import { Chain, - collectiblesSelectors, isContentCollectibleGated, TrackAvailabilityType -} from '@audius/common' +} from '@audius/common/models' import { useField } from 'formik' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx index be4023d2e84..21c9549c410 100644 --- a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx @@ -1,9 +1,6 @@ -import { - AccessConditions, - TrackAvailabilityType, - collectiblesSelectors -} from '@audius/common' +import { collectiblesSelectors } from '@audius/common' import { useAccessAndRemixSettings } from '@audius/common/hooks' +import { TrackAvailabilityType, AccessConditions } from '@audius/common/models' import { IconCollectible } from '@audius/stems' import { ModalRadioItem } from 'components/modal-radio/ModalRadioItem' diff --git a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx index 3ad59981ca0..c172db5806c 100644 --- a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' +import { FeatureFlags } from '@audius/common' +import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' import { - FeatureFlags, Name, - AccessConditions, - TrackAvailabilityType -} from '@audius/common' -import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' + TrackAvailabilityType, + AccessConditions +} from '@audius/common/models' import { IconCart, IconStars } from '@audius/stems' import { ExternalLink } from 'components/link' diff --git a/packages/web/src/pages/upload-page/pages/FinishPage.tsx b/packages/web/src/pages/upload-page/pages/FinishPage.tsx index 17b85e279ab..c266ccbd5f9 100644 --- a/packages/web/src/pages/upload-page/pages/FinishPage.tsx +++ b/packages/web/src/pages/upload-page/pages/FinishPage.tsx @@ -4,12 +4,12 @@ import { accountSelectors, CommonState, imageBlank as placeholderArt, - Name, ProgressState, ProgressStatus, uploadSelectors, UploadType } from '@audius/common' +import { Name } from '@audius/common/models' import { HarmonyPlainButton, IconArrow, diff --git a/packages/web/src/pages/upload-page/store/utils/stems.ts b/packages/web/src/pages/upload-page/store/utils/stems.ts index 4bfbf41e0b9..d3bc8f9ca84 100644 --- a/packages/web/src/pages/upload-page/store/utils/stems.ts +++ b/packages/web/src/pages/upload-page/store/utils/stems.ts @@ -1,4 +1,11 @@ -import { ID, StemCategory, StemUpload, Track, StemTrack } from '@audius/common' +import { + StemCategory, + ID, + StemUpload, + Track, + StemTrack +} from '@audius/common/models' +import {} from '@audius/common' export const updateAndFlattenStems = ( stems: StemUpload[][], diff --git a/packages/web/src/pages/upload-page/types.ts b/packages/web/src/pages/upload-page/types.ts index 5d3a8e04441..5fbc1ba8057 100644 --- a/packages/web/src/pages/upload-page/types.ts +++ b/packages/web/src/pages/upload-page/types.ts @@ -1,4 +1,5 @@ -import { Nullable, TrackMetadata, UploadType } from '@audius/common' +import { Nullable, UploadType } from '@audius/common' +import { TrackMetadata } from '@audius/common/models' import { CollectionValues } from './validation' diff --git a/packages/web/src/pages/visualizer/VisualizerProvider.tsx b/packages/web/src/pages/visualizer/VisualizerProvider.tsx index 4f21ee9a4f7..dc9cfe8cc05 100644 --- a/packages/web/src/pages/visualizer/VisualizerProvider.tsx +++ b/packages/web/src/pages/visualizer/VisualizerProvider.tsx @@ -1,4 +1,5 @@ -import { useEffect, useState, useCallback } from 'react' +import { Name, SquareSizes, Track } from '@audius/common/models' + import { useEffect, useState, useCallback } from 'react' import { push as pushRoute } from 'connected-react-router' import { AppState } from 'store/types' import { Dispatch } from 'redux' @@ -20,9 +21,9 @@ import { import { shouldShowDark } from 'utils/theme/theme' import { profilePage } from 'utils/route' import { make, TrackEvent } from 'common/store/analytics/actions' -import { Name } from '@audius/common' -import { Track } from '@audius/common' -import { SquareSizes } from '@audius/common' +import { } from '@audius/common' +import { } from '@audius/common' +import { } from '@audius/common' import DynamicImage from 'components/dynamic-image/DynamicImage' import PlayingTrackInfo from 'components/play-bar/desktop/components/PlayingTrackInfo' import { webglSupported } from './utils' diff --git a/packages/web/src/public-site/pages/download-page/DownloadPage.tsx b/packages/web/src/public-site/pages/download-page/DownloadPage.tsx index a32e5c3426c..b07cc45e6c5 100644 --- a/packages/web/src/public-site/pages/download-page/DownloadPage.tsx +++ b/packages/web/src/public-site/pages/download-page/DownloadPage.tsx @@ -1,6 +1,8 @@ import { useCallback, useEffect, useState } from 'react' -import { MobileOS, OS } from '@audius/common' +import { OS, MobileOS } from '@audius/common/models' + +import {} from '@audius/common' import { IconDownload } from '@audius/stems' import cn from 'classnames' import queryString from 'query-string' diff --git a/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx b/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx index bdd299a37d4..e811fb3e8d9 100644 --- a/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx +++ b/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx @@ -1,12 +1,8 @@ import { useEffect, useState } from 'react' -import { - Maybe, - Nullable, - SquareSizes, - UserCollectionMetadata -} from '@audius/common' +import { Maybe, Nullable } from '@audius/common' import { useAppContext } from '@audius/common/context' +import { SquareSizes, UserCollectionMetadata } from '@audius/common/models' import { StorageNodeSelectorService } from '@audius/sdk' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useSpring, animated } from 'react-spring' diff --git a/packages/web/src/services/analytics/amplitude.ts b/packages/web/src/services/analytics/amplitude.ts index 929479a3bf6..4798a4d0ecb 100644 --- a/packages/web/src/services/analytics/amplitude.ts +++ b/packages/web/src/services/analytics/amplitude.ts @@ -1,5 +1,6 @@ +import { Nullable } from '@audius/common' +import { Name, MobileOS } from '@audius/common/models' // Amplitude Analytics -import { Name, Nullable, MobileOS } from '@audius/common' import amplitude from 'amplitude-js' import { env } from 'services/env' diff --git a/packages/web/src/services/analytics/index.ts b/packages/web/src/services/analytics/index.ts index 21b59d3f451..3969f45374d 100644 --- a/packages/web/src/services/analytics/index.ts +++ b/packages/web/src/services/analytics/index.ts @@ -1,4 +1,5 @@ -import { AnalyticsEvent, Nullable, AllTrackingEvents } from '@audius/common' +import { Nullable } from '@audius/common' +import { AnalyticsEvent, AllTrackingEvents } from '@audius/common/models' import { env } from 'services/env' import { remoteConfigInstance } from 'services/remote-config/remote-config-instance' diff --git a/packages/web/src/services/download-app/DownloadApp.test.ts b/packages/web/src/services/download-app/DownloadApp.test.ts index f32c06b1468..f7804507933 100644 --- a/packages/web/src/services/download-app/DownloadApp.test.ts +++ b/packages/web/src/services/download-app/DownloadApp.test.ts @@ -1,4 +1,5 @@ -import { OS } from '@audius/common' +import { OS } from '@audius/common/models' +import {} from '@audius/common' import fetchMock from 'fetch-mock' import { describe, it, beforeAll, expect } from 'vitest' diff --git a/packages/web/src/services/download-app/DownloadApp.ts b/packages/web/src/services/download-app/DownloadApp.ts index 96525aab111..fe5686a4f34 100644 --- a/packages/web/src/services/download-app/DownloadApp.ts +++ b/packages/web/src/services/download-app/DownloadApp.ts @@ -1,4 +1,5 @@ -import { OS } from '@audius/common' +import { OS } from '@audius/common/models' +import {} from '@audius/common' import { env } from 'services/env' diff --git a/packages/web/src/services/remote-config/remote-config-instance.ts b/packages/web/src/services/remote-config/remote-config-instance.ts index 5beff3cdadb..55353517323 100644 --- a/packages/web/src/services/remote-config/remote-config-instance.ts +++ b/packages/web/src/services/remote-config/remote-config-instance.ts @@ -1,4 +1,5 @@ -import { ErrorLevel, remoteConfig } from '@audius/common' +import { remoteConfig } from '@audius/common' +import { ErrorLevel } from '@audius/common/models' import optimizely, { Config } from '@optimizely/optimizely-sdk' import { isEmpty } from 'lodash' diff --git a/packages/web/src/services/serviceMonitoring.ts b/packages/web/src/services/serviceMonitoring.ts index 7ccfadc20d9..dc93b8f434f 100644 --- a/packages/web/src/services/serviceMonitoring.ts +++ b/packages/web/src/services/serviceMonitoring.ts @@ -1,9 +1,5 @@ -import { - Name, - MonitorPayload, - ServiceMonitorType, - IntKeys -} from '@audius/common' +import { IntKeys } from '@audius/common' +import { Name, ServiceMonitorType, MonitorPayload } from '@audius/common/models' import { track } from 'services/analytics' import { remoteConfigInstance } from 'services/remote-config/remote-config-instance' diff --git a/packages/web/src/services/solana/solana.ts b/packages/web/src/services/solana/solana.ts index 7a02ee07324..ad09c020928 100644 --- a/packages/web/src/services/solana/solana.ts +++ b/packages/web/src/services/solana/solana.ts @@ -1,4 +1,5 @@ -import { SolanaWalletAddress, MintName, DEFAULT_MINT } from '@audius/common' +import { MintName, DEFAULT_MINT } from '@audius/common' +import { SolanaWalletAddress } from '@audius/common/models' import { Account, getMinimumBalanceForRentExemptAccount, diff --git a/packages/web/src/services/webVitals.ts b/packages/web/src/services/webVitals.ts index 018d4fc2bfc..3e63d968912 100644 --- a/packages/web/src/services/webVitals.ts +++ b/packages/web/src/services/webVitals.ts @@ -1,4 +1,5 @@ -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' +import {} from '@audius/common' import { Location } from 'history' import { getCLS, getFID, getLCP, getFCP, getTTFB } from 'web-vitals' diff --git a/packages/web/src/ssr/+onRenderHtml.tsx b/packages/web/src/ssr/+onRenderHtml.tsx index 4cb18f29a04..81f40e903e0 100644 --- a/packages/web/src/ssr/+onRenderHtml.tsx +++ b/packages/web/src/ssr/+onRenderHtml.tsx @@ -1,4 +1,5 @@ -import { SsrPageProps } from '@audius/common' +import { SsrPageProps } from '@audius/common/models' +import {} from '@audius/common' import { createMemoryHistory } from 'history' import ReactDOMServer from 'react-dom/server' import { Helmet } from 'react-helmet' diff --git a/packages/web/src/ssr/SsrContext.tsx b/packages/web/src/ssr/SsrContext.tsx index f41bd04b154..c8f72a96c0b 100644 --- a/packages/web/src/ssr/SsrContext.tsx +++ b/packages/web/src/ssr/SsrContext.tsx @@ -1,6 +1,7 @@ import { createContext, memo, useContext } from 'react' -import { Nullable, SsrPageProps } from '@audius/common' +import { Nullable } from '@audius/common' +import { SsrPageProps } from '@audius/common/models' import { History } from 'history' import { isMobile as isMobileClient } from 'utils/clientUtil' diff --git a/packages/web/src/store/analytics/sagas.ts b/packages/web/src/store/analytics/sagas.ts index 3462d12dc76..43b4817791e 100644 --- a/packages/web/src/store/analytics/sagas.ts +++ b/packages/web/src/store/analytics/sagas.ts @@ -1,4 +1,5 @@ -import { Name, getContext } from '@audius/common' +import { getContext } from '@audius/common' +import { Name } from '@audius/common/models' import { LOCATION_CHANGE } from 'connected-react-router' import { take } from 'redux-saga/effects' diff --git a/packages/web/src/store/application/ui/buy-audio/sagas.ts b/packages/web/src/store/application/ui/buy-audio/sagas.ts index 7e867525230..e74cf6dc508 100644 --- a/packages/web/src/store/application/ui/buy-audio/sagas.ts +++ b/packages/web/src/store/application/ui/buy-audio/sagas.ts @@ -1,7 +1,5 @@ -/* eslint-disable new-cap */ import { IntKeys, - Name, getContext, walletActions, convertBigIntToAmountObject, @@ -19,12 +17,10 @@ import { TransactionMethod, TransactionDetails, walletSelectors, - BNWei, createUserBankIfNeeded, modalsActions, AmountObject, FeatureFlags, - ErrorLevel, LocalStorage, solanaSelectors, deriveUserBankPubkey, @@ -32,6 +28,8 @@ import { isNullOrUndefined, dayjs } from '@audius/common' +import { Name, ErrorLevel, BNWei } from '@audius/common/models' +/* eslint-disable new-cap */ import { TransactionHandler } from '@audius/sdk/dist/core' import { QuoteResponse } from '@jup-ag/api' import { diff --git a/packages/web/src/store/application/ui/setAsArtistPickConfirmation/actions.ts b/packages/web/src/store/application/ui/setAsArtistPickConfirmation/actions.ts index 985e0e443ba..f86c315df74 100644 --- a/packages/web/src/store/application/ui/setAsArtistPickConfirmation/actions.ts +++ b/packages/web/src/store/application/ui/setAsArtistPickConfirmation/actions.ts @@ -1,4 +1,5 @@ -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' +import {} from '@audius/common' // actions export const SHOW_SET_AS_ARTIST_PICK_CONFIRMATION = 'SET_AS_ARTIST_PICK/SHOW' diff --git a/packages/web/src/store/application/ui/setAsArtistPickConfirmation/types.ts b/packages/web/src/store/application/ui/setAsArtistPickConfirmation/types.ts index d070ffac18b..60edcc8e626 100644 --- a/packages/web/src/store/application/ui/setAsArtistPickConfirmation/types.ts +++ b/packages/web/src/store/application/ui/setAsArtistPickConfirmation/types.ts @@ -1,4 +1,5 @@ -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' +import {} from '@audius/common' export enum PinTrackAction { ADD = 'ADD', diff --git a/packages/web/src/store/application/ui/stemsUpload/sagas.ts b/packages/web/src/store/application/ui/stemsUpload/sagas.ts index 31af44f1c35..766b1403917 100644 --- a/packages/web/src/store/application/ui/stemsUpload/sagas.ts +++ b/packages/web/src/store/application/ui/stemsUpload/sagas.ts @@ -1,11 +1,9 @@ import { - Name, - Track, - User, cacheTracksSelectors, cacheUsersSelectors, stemsUploadActions } from '@audius/common' +import { Name, Track, User } from '@audius/common/models' import { takeEvery, put, call, select } from 'redux-saga/effects' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/store/application/ui/theme/sagas.ts b/packages/web/src/store/application/ui/theme/sagas.ts index 7990b94960b..814c92c3bdc 100644 --- a/packages/web/src/store/application/ui/theme/sagas.ts +++ b/packages/web/src/store/application/ui/theme/sagas.ts @@ -1,4 +1,5 @@ -import { Theme, themeActions, actionChannelDispatcher } from '@audius/common' +import { themeActions, actionChannelDispatcher } from '@audius/common' +import { Theme } from '@audius/common/models' import { PayloadAction } from '@reduxjs/toolkit' import { eventChannel } from 'redux-saga' import { spawn, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/store/application/ui/userListModal/sagas.ts b/packages/web/src/store/application/ui/userListModal/sagas.ts index a7574bdc5d0..0e97be0d20e 100644 --- a/packages/web/src/store/application/ui/userListModal/sagas.ts +++ b/packages/web/src/store/application/ui/userListModal/sagas.ts @@ -1,5 +1,4 @@ import { - FavoriteType, topSupportersUserListActions as topSupporterActions, supportingUserListActions as supportingActions, RepostType, @@ -11,6 +10,7 @@ import { favoritesUserListActions as favoritesActions, relatedArtistsUserListActions } from '@audius/common' +import { FavoriteType } from '@audius/common/models' import { takeEvery, put } from 'redux-saga/effects' import { setUsers } from './slice' diff --git a/packages/web/src/store/application/ui/userListModal/slice.ts b/packages/web/src/store/application/ui/userListModal/slice.ts index 309dff4a4e1..33c53ad74ad 100644 --- a/packages/web/src/store/application/ui/userListModal/slice.ts +++ b/packages/web/src/store/application/ui/userListModal/slice.ts @@ -1,4 +1,5 @@ -import { ID } from '@audius/common' +import { ID } from '@audius/common/models' +import {} from '@audius/common' import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { UserListModalState, UserListType, UserListEntityType } from './types' diff --git a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts index 026f213e8f1..25df9c4faf0 100644 --- a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts +++ b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts @@ -1,24 +1,26 @@ import { withdrawUSDCActions, solanaSelectors, - ErrorLevel, - SolanaWalletAddress, getUSDCUserBank, getContext, TOKEN_LISTING_MAP, getUserbankAccountInfo, - BNUSDC, relayVersionedTransaction, relayTransaction, formatUSDCWeiToFloorCentsNumber, - Name, - WithdrawUSDCTransferEventFields, withdrawUSDCModalActions, WithdrawUSDCModalPages, WithdrawMethod, - buyUSDCActions, - Status + buyUSDCActions } from '@audius/common' +import { + Name, + ErrorLevel, + Status, + WithdrawUSDCTransferEventFields, + BNUSDC, + SolanaWalletAddress +} from '@audius/common/models' import { createAssociatedTokenAccountInstruction, getAssociatedTokenAddressSync diff --git a/packages/web/src/store/configureStore.ts b/packages/web/src/store/configureStore.ts index 9e5ee403941..638ffc008c2 100644 --- a/packages/web/src/store/configureStore.ts +++ b/packages/web/src/store/configureStore.ts @@ -1,4 +1,5 @@ -import { SsrPageProps, chatMiddleware, ErrorLevel, Name } from '@audius/common' +import { chatMiddleware } from '@audius/common' +import { Name, ErrorLevel, SsrPageProps } from '@audius/common/models' import { composeWithDevToolsLogOnlyInProduction } from '@redux-devtools/extension' import { configureScope, addBreadcrumb } from '@sentry/browser' import { routerMiddleware } from 'connected-react-router' diff --git a/packages/web/src/store/dragndrop/slice.ts b/packages/web/src/store/dragndrop/slice.ts index d9db2927001..58f7a06f8bb 100644 --- a/packages/web/src/store/dragndrop/slice.ts +++ b/packages/web/src/store/dragndrop/slice.ts @@ -1,4 +1,5 @@ -import { ID, PlaylistLibraryKind } from '@audius/common' +import { ID, PlaylistLibraryKind } from '@audius/common/models' +import {} from '@audius/common' import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { AppState } from 'store/types' diff --git a/packages/web/src/store/errors/actions.ts b/packages/web/src/store/errors/actions.ts index 1519ba865a8..f5597cd264d 100644 --- a/packages/web/src/store/errors/actions.ts +++ b/packages/web/src/store/errors/actions.ts @@ -1,8 +1,9 @@ import { + ErrorLevel, AdditionalErrorReportInfo, - ReportToSentryArgs, - ErrorLevel -} from '@audius/common' + ReportToSentryArgs +} from '@audius/common/models' +import {} from '@audius/common' export const HANDLE_ERROR = 'ERROR/HANDLE_ERROR' export const OPEN_ERROR_PAGE = 'ERROR/OPEN_ERROR_PAGE' diff --git a/packages/web/src/store/errors/reducers.ts b/packages/web/src/store/errors/reducers.ts index 742dc9ba58b..100554edb6b 100644 --- a/packages/web/src/store/errors/reducers.ts +++ b/packages/web/src/store/errors/reducers.ts @@ -1,4 +1,5 @@ -import { SsrPageProps } from '@audius/common' +import { SsrPageProps } from '@audius/common/models' +import {} from '@audius/common' import { createReducer } from 'typesafe-actions' import { diff --git a/packages/web/src/store/errors/reportToSentry.ts b/packages/web/src/store/errors/reportToSentry.ts index f2af13b9512..286ba36cf42 100644 --- a/packages/web/src/store/errors/reportToSentry.ts +++ b/packages/web/src/store/errors/reportToSentry.ts @@ -1,4 +1,5 @@ -import { getErrorMessage, ReportToSentryArgs, ErrorLevel } from '@audius/common' +import { getErrorMessage } from '@audius/common' +import { ErrorLevel, ReportToSentryArgs } from '@audius/common/models' import { withScope, captureException } from '@sentry/browser' import type { SeverityLevel } from '@sentry/types' diff --git a/packages/web/src/store/lineup/store.test.js b/packages/web/src/store/lineup/store.test.js index 135320738ff..c68d29a7bd6 100644 --- a/packages/web/src/store/lineup/store.test.js +++ b/packages/web/src/store/lineup/store.test.js @@ -1,5 +1,4 @@ import { - Kind, cacheReducer, LineupBaseActions, lineupReducer, @@ -8,6 +7,7 @@ import { playerReducer, initialPlayerState } from '@audius/common' +import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { all } from 'redux-saga/effects' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/store/reducers.ts b/packages/web/src/store/reducers.ts index 51ac9d9e6f0..ac220d92d56 100644 --- a/packages/web/src/store/reducers.ts +++ b/packages/web/src/store/reducers.ts @@ -1,9 +1,9 @@ import { queueReducer as queue, remoteConfigReducer as remoteConfig, - reducers as clientStoreReducers, - SsrPageProps + reducers as clientStoreReducers } from '@audius/common' +import { SsrPageProps } from '@audius/common/models' import { connectRouter } from 'connected-react-router' import { History } from 'history' import localForage from 'localforage' diff --git a/packages/web/src/store/sign-out/sagas.ts b/packages/web/src/store/sign-out/sagas.ts index d009adedd86..19938e47d39 100644 --- a/packages/web/src/store/sign-out/sagas.ts +++ b/packages/web/src/store/sign-out/sagas.ts @@ -1,10 +1,10 @@ import { - Name, signOutActions, getContext, accountActions, tokenDashboardPageActions } from '@audius/common' +import { Name } from '@audius/common/models' import { takeLatest, put } from 'redux-saga/effects' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/store/token-dashboard/connectNewWalletSaga.ts b/packages/web/src/store/token-dashboard/connectNewWalletSaga.ts index bb8630e4456..5944f4000ff 100644 --- a/packages/web/src/store/token-dashboard/connectNewWalletSaga.ts +++ b/packages/web/src/store/token-dashboard/connectNewWalletSaga.ts @@ -1,4 +1,5 @@ -import { getContext, Name, tokenDashboardPageActions } from '@audius/common' +import { getContext, tokenDashboardPageActions } from '@audius/common' +import { Name } from '@audius/common/models' import { captureException } from '@sentry/browser' import { fork, put, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/store/token-dashboard/disconnectWallet.ts b/packages/web/src/store/token-dashboard/disconnectWallet.ts index 5d53818180d..3e193d7d7d0 100644 --- a/packages/web/src/store/token-dashboard/disconnectWallet.ts +++ b/packages/web/src/store/token-dashboard/disconnectWallet.ts @@ -1,4 +1,5 @@ -import { Chain } from '@audius/common' +import { Chain } from '@audius/common/models' +import {} from '@audius/common' import { call } from 'typed-redux-saga' import { diff --git a/packages/web/src/store/token-dashboard/establishWalletConnection.ts b/packages/web/src/store/token-dashboard/establishWalletConnection.ts index f44c4e4dc61..37a81cc09fb 100644 --- a/packages/web/src/store/token-dashboard/establishWalletConnection.ts +++ b/packages/web/src/store/token-dashboard/establishWalletConnection.ts @@ -1,10 +1,10 @@ import { BooleanKeys, - Chain, getContext, getErrorMessage, tokenDashboardPageActions } from '@audius/common' +import { Chain } from '@audius/common/models' import { call, put } from 'typed-redux-saga' import { createSession } from 'services/web3-modal' diff --git a/packages/web/src/store/token-dashboard/getWalletAddress.ts b/packages/web/src/store/token-dashboard/getWalletAddress.ts index e7073d30f29..616f41c70c1 100644 --- a/packages/web/src/store/token-dashboard/getWalletAddress.ts +++ b/packages/web/src/store/token-dashboard/getWalletAddress.ts @@ -1,4 +1,5 @@ -import { Chain } from '@audius/common' +import { Chain } from '@audius/common/models' +import {} from '@audius/common' import { call } from 'typed-redux-saga' import { WalletConnection } from './types' diff --git a/packages/web/src/store/token-dashboard/signMessage.ts b/packages/web/src/store/token-dashboard/signMessage.ts index 4c393b942a9..e8b255067e6 100644 --- a/packages/web/src/store/token-dashboard/signMessage.ts +++ b/packages/web/src/store/token-dashboard/signMessage.ts @@ -1,10 +1,10 @@ import { accountSelectors, - Chain, tokenDashboardPageActions, tokenDashboardPageSelectors, PhantomProvider } from '@audius/common' +import { Chain } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' import { WalletConnection } from './types' diff --git a/packages/web/src/store/token-dashboard/types.ts b/packages/web/src/store/token-dashboard/types.ts index d4177432ab4..007ced31e44 100644 --- a/packages/web/src/store/token-dashboard/types.ts +++ b/packages/web/src/store/token-dashboard/types.ts @@ -1,4 +1,5 @@ -import { Chain, PhantomProvider } from '@audius/common' +import { PhantomProvider } from '@audius/common' +import { Chain } from '@audius/common/models' export type PhantomWalletConnection = { chain: Chain.Sol diff --git a/packages/web/src/utils/appLinks.ts b/packages/web/src/utils/appLinks.ts index 0c9ad5d2ddb..59fbdb4c9c3 100644 --- a/packages/web/src/utils/appLinks.ts +++ b/packages/web/src/utils/appLinks.ts @@ -1,4 +1,5 @@ -import { MobileOS } from '@audius/common' +import { MobileOS } from '@audius/common/models' +import {} from '@audius/common' import { getMobileOS } from './clientUtil' import { IOS_APP_STORE_LINK, IOS_WEBSITE_STORE_LINK } from './route' diff --git a/packages/web/src/utils/clientUtil.ts b/packages/web/src/utils/clientUtil.ts index 005b16cb9a1..c299a709c44 100644 --- a/packages/web/src/utils/clientUtil.ts +++ b/packages/web/src/utils/clientUtil.ts @@ -1,4 +1,5 @@ -import { Client, OS, MobileOS } from '@audius/common' +import { Client, OS, MobileOS } from '@audius/common/models' +import {} from '@audius/common' declare global { interface Window { diff --git a/packages/web/src/utils/errorSagas.ts b/packages/web/src/utils/errorSagas.ts index 6a5b04d4736..bb8648a6daa 100644 --- a/packages/web/src/utils/errorSagas.ts +++ b/packages/web/src/utils/errorSagas.ts @@ -1,4 +1,5 @@ -import { AdditionalErrorReportInfo } from '@audius/common' +import { AdditionalErrorReportInfo } from '@audius/common/models' +import {} from '@audius/common' import { takeEvery, put } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/utils/route.ts b/packages/web/src/utils/route.ts index 69c9c50cde6..b567cfa1230 100644 --- a/packages/web/src/utils/route.ts +++ b/packages/web/src/utils/route.ts @@ -1,4 +1,5 @@ -import { Env, ID, encodeUrlName, getHash } from '@audius/common' +import { Env, encodeUrlName, getHash } from '@audius/common' +import { ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { Location } from 'history' import { matchPath } from 'react-router' diff --git a/packages/web/src/utils/route/collectionRouteParser.ts b/packages/web/src/utils/route/collectionRouteParser.ts index da3ca098c04..039135b5928 100644 --- a/packages/web/src/utils/route/collectionRouteParser.ts +++ b/packages/web/src/utils/route/collectionRouteParser.ts @@ -1,4 +1,5 @@ -import { ID, decodeHashId } from '@audius/common' +import { decodeHashId } from '@audius/common' +import { ID } from '@audius/common/models' import { matchPath } from 'react-router-dom' import { diff --git a/packages/web/src/utils/route/trackRouteParser.ts b/packages/web/src/utils/route/trackRouteParser.ts index a409426e4bb..e0508f19c30 100644 --- a/packages/web/src/utils/route/trackRouteParser.ts +++ b/packages/web/src/utils/route/trackRouteParser.ts @@ -1,4 +1,5 @@ -import { ID, decodeHashId } from '@audius/common' +import { decodeHashId } from '@audius/common' +import { ID } from '@audius/common/models' import { matchPath } from 'react-router-dom' import { TRACK_ID_PAGE, TRACK_PAGE } from 'utils/route' diff --git a/packages/web/src/utils/route/userRouteParser.ts b/packages/web/src/utils/route/userRouteParser.ts index 43a26fb7059..7937ce0401b 100644 --- a/packages/web/src/utils/route/userRouteParser.ts +++ b/packages/web/src/utils/route/userRouteParser.ts @@ -1,4 +1,5 @@ -import { ID, decodeHashId, ProfilePageTabRoute } from '@audius/common' +import { decodeHashId, ProfilePageTabRoute } from '@audius/common' +import { ID } from '@audius/common/models' import { matchPath } from 'react-router-dom' import { USER_ID_PAGE, PROFILE_PAGE, staticRoutes } from 'utils/route' diff --git a/packages/web/src/utils/theme/theme.ts b/packages/web/src/utils/theme/theme.ts index aabb83317a4..64dd979f238 100644 --- a/packages/web/src/utils/theme/theme.ts +++ b/packages/web/src/utils/theme/theme.ts @@ -1,4 +1,5 @@ -import { Theme } from '@audius/common' +import { Theme } from '@audius/common/models' +import {} from '@audius/common' import DarkTheme from './dark' import DefaultTheme from './default' From 198d2c03bba28d559f678cf80d52edd0118a34b0 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 15:20:48 -0800 Subject: [PATCH 27/64] Web models lint fix --- packages/common/src/index.ts | 1 - packages/web/src/app/AppErrorBoundary.tsx | 2 -- packages/web/src/common/store/analytics/actions.ts | 2 -- .../cache/collections/utils/addTracksFromCollections.ts | 1 - .../src/common/store/cache/users/utils/pruneBlobValues.ts | 1 - packages/web/src/common/store/pages/signon/types.ts | 1 - packages/web/src/common/store/search-ai-bar/reducer.ts | 1 - packages/web/src/common/store/search-ai-bar/types.ts | 1 - packages/web/src/common/store/search-bar/reducer.ts | 1 - packages/web/src/common/store/search-bar/types.ts | 1 - .../src/common/store/smart-collection/smartCollections.ts | 1 - packages/web/src/common/utils/isPreview.ts | 1 - packages/web/src/components/add-funds/AddFunds.tsx | 4 +--- packages/web/src/components/app-cta-modal/AppCTAModal.tsx | 2 -- .../app-redirect-popover/AppRedirectListener.tsx | 2 -- packages/web/src/components/artist/ArtistCardCover.tsx | 2 -- packages/web/src/components/artist/ArtistChip.tsx | 2 -- packages/web/src/components/artist/ArtistCover.tsx | 1 - .../src/components/background-animations/MusicConfetti.tsx | 2 -- packages/web/src/components/banner/CallToActionBanner.tsx | 2 -- .../src/components/banner/TermsOfServiceUpdateBanner.tsx | 2 -- packages/web/src/components/co-sign/CoSign.tsx | 2 -- packages/web/src/components/co-sign/HoverInfo.tsx | 1 - .../collection/desktop/SmartCollectionActionButtons.tsx | 1 - packages/web/src/components/dog-ear/DogEar.tsx | 1 - .../download-mobile-app-drawer/DownloadMobileAppDrawer.tsx | 2 -- packages/web/src/components/dragndrop/Draggable.tsx | 2 -- packages/web/src/components/dragndrop/Droppable.tsx | 4 +--- packages/web/src/components/embed-modal/store/actions.ts | 1 - packages/web/src/components/embed-modal/store/types.ts | 1 - .../components/inbox-settings-modal/InboxSettingsModal.tsx | 4 +--- packages/web/src/components/lineup/Lineup.tsx | 1 - packages/web/src/components/nav/Navigator.tsx | 1 - .../nav/desktop/PlaylistLibrary/ExplorePlaylistNavItem.tsx | 1 - .../nav/desktop/PlaylistLibrary/PlaylistLibraryNavItem.tsx | 1 - .../Notification/components/ProfilePicture.tsx | 2 -- .../web/src/components/password-reset/store/reducer.ts | 1 - packages/web/src/components/password-reset/store/types.ts | 1 - .../components/PayExtraFormSection.tsx | 1 - .../components/PayToUnlockInfo.tsx | 2 -- .../web/src/components/profile-picture/ProfilePicture.jsx | 2 -- .../web/src/components/profile-progress/hooks/index.js | 2 -- .../web/src/components/related-artists/RelatedArtists.tsx | 4 +--- packages/web/src/components/remix-card/RemixCard.tsx | 1 - packages/web/src/components/search-bar/SearchBar.tsx | 2 -- packages/web/src/components/search/SearchBar.jsx | 2 -- packages/web/src/components/search/SearchTag.tsx | 2 -- .../src/components/source-files-modal/SourceFilesModal.tsx | 2 -- .../suggested-tracks/SuggestedCollectionTracks.tsx | 3 +-- packages/web/src/components/table/Table.tsx | 2 -- packages/web/src/components/tile/Tile.tsx | 2 -- packages/web/src/components/track/Artwork.tsx | 4 +--- packages/web/src/components/track/DynamicTrackArtwork.tsx | 3 +-- packages/web/src/components/track/mobile/TrackList.tsx | 2 -- packages/web/src/components/track/mobile/TrackListItem.tsx | 2 -- packages/web/src/components/track/mobile/TrackTileArt.tsx | 4 +--- .../components/UnfollowConfirmationModal.tsx | 1 - .../unfollow-confirmation-modal/store/actions.ts | 1 - .../components/unfollow-confirmation-modal/store/types.ts | 1 - .../components/usdc-balance-fetcher/USDCBalanceFetcher.tsx | 1 - .../usdc-purchase-details-modal/components/TrackLink.tsx | 1 - .../usdc-purchase-details-modal/components/types.ts | 1 - packages/web/src/hooks/useAsyncPoll.ts | 2 -- packages/web/src/hooks/useDelayedEffect.ts | 2 -- packages/web/src/hooks/useErrorPageOnFailedStatus.ts | 2 -- packages/web/src/hooks/useImageSize.test.tsx | 3 +-- packages/web/src/hooks/useLocalStorage.ts | 1 - packages/web/src/hooks/useTikTokAuth.ts | 3 +-- .../components/desktop/AiPage.tsx | 3 +-- .../ai-attributed-tracks-page/components/mobile/AiPage.tsx | 2 -- .../pages/audio-rewards-page/components/ExplainerTile.tsx | 2 -- .../audio-rewards-page/components/SendingModalBody.tsx | 1 - packages/web/src/pages/chat-page/components/ChatUser.tsx | 2 -- packages/web/src/pages/collection-page/store/utils.ts | 1 - .../web/src/pages/dashboard-page/components/ArtistCard.tsx | 1 - .../dashboard-page/components/TracksTableContainer.tsx | 2 -- packages/web/src/pages/dashboard-page/store/slice.ts | 1 - packages/web/src/pages/deleted-page/DeletedPage.tsx | 1 - .../explore-page/components/desktop/CollectionsPage.tsx | 2 -- .../pages/explore-page/components/desktop/ExplorePage.tsx | 7 ++++++- .../explore-page/components/mobile/CollectionsPage.tsx | 2 -- .../pages/explore-page/components/mobile/ExplorePage.tsx | 2 +- .../src/pages/feed-page/components/desktop/FeedFilters.tsx | 1 - .../pages/feed-page/components/mobile/FeedFilterButton.tsx | 1 - .../pages/feed-page/components/mobile/FeedFilterDrawer.tsx | 2 -- packages/web/src/pages/feed-page/types.ts | 1 - .../pages/history-page/components/desktop/HistoryPage.tsx | 2 -- .../pages/history-page/components/mobile/HistoryPage.tsx | 4 +--- .../pay-and-earn-page/components/TrackNameWithArtwork.tsx | 3 +-- packages/web/src/pages/pay-and-earn-page/types.ts | 1 - .../pages/profile-page/components/desktop/ProfileBio.tsx | 2 -- packages/web/src/pages/requires-update/RequiresUpdate.tsx | 1 - .../components/desktop/DeveloperApps/types.ts | 1 - .../components/mobile/AccountSettingsPage.tsx | 2 -- .../src/pages/sign-on/components/desktop/FollowPage.tsx | 2 -- .../web/src/pages/sign-on/components/mobile/FollowPage.tsx | 2 -- .../src/pages/sign-up-page/hooks/useSocialMediaLoader.ts | 2 -- .../src/pages/track-page/components/desktop/Remixes.tsx | 1 - .../web/src/pages/track-page/components/mobile/Remixes.tsx | 1 - packages/web/src/pages/track-page/utils.ts | 1 - packages/web/src/pages/trending-page/types.ts | 1 - .../upload-page/fields/RemixSettingsField/TrackInfo.tsx | 3 +-- .../web/src/pages/upload-page/fields/SourceFilesView.tsx | 2 -- packages/web/src/pages/upload-page/store/utils/stems.ts | 1 - packages/web/src/pages/visualizer/VisualizerProvider.tsx | 5 +---- .../src/public-site/pages/download-page/DownloadPage.tsx | 2 -- packages/web/src/services/download-app/DownloadApp.test.ts | 1 - packages/web/src/services/download-app/DownloadApp.ts | 1 - packages/web/src/services/webVitals.ts | 1 - packages/web/src/ssr/+onRenderHtml.tsx | 1 - .../application/ui/setAsArtistPickConfirmation/actions.ts | 1 - .../application/ui/setAsArtistPickConfirmation/types.ts | 1 - .../web/src/store/application/ui/userListModal/slice.ts | 1 - packages/web/src/store/dragndrop/slice.ts | 1 - packages/web/src/store/errors/actions.ts | 1 - packages/web/src/store/errors/reducers.ts | 1 - packages/web/src/store/token-dashboard/disconnectWallet.ts | 1 - packages/web/src/store/token-dashboard/getWalletAddress.ts | 1 - packages/web/src/utils/appLinks.ts | 1 - packages/web/src/utils/clientUtil.ts | 1 - packages/web/src/utils/errorSagas.ts | 1 - packages/web/src/utils/theme/theme.ts | 1 - 122 files changed, 22 insertions(+), 188 deletions(-) diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 3720c31a78e..1fb425eb7ad 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -2,7 +2,6 @@ import * as e from './models' console.log('exports', e) export * from './audius-query' -export * from './models' export * from './utils' export * from './services' export * from './store' diff --git a/packages/web/src/app/AppErrorBoundary.tsx b/packages/web/src/app/AppErrorBoundary.tsx index 3a21eded45c..404f1425556 100644 --- a/packages/web/src/app/AppErrorBoundary.tsx +++ b/packages/web/src/app/AppErrorBoundary.tsx @@ -1,8 +1,6 @@ import { ReactNode, useCallback } from 'react' import { ErrorLevel } from '@audius/common/models' - -import {} from '@audius/common' import { ErrorBoundary, ErrorBoundaryProps } from 'react-error-boundary' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/common/store/analytics/actions.ts b/packages/web/src/common/store/analytics/actions.ts index b114b486d16..bbae4e14224 100644 --- a/packages/web/src/common/store/analytics/actions.ts +++ b/packages/web/src/common/store/analytics/actions.ts @@ -1,8 +1,6 @@ import { useCallback } from 'react' import { Name, AllTrackingEvents } from '@audius/common/models' - -import {} from '@audius/common' import { useDispatch as useDispatchRedux } from 'react-redux' /** UI EVENTS */ diff --git a/packages/web/src/common/store/cache/collections/utils/addTracksFromCollections.ts b/packages/web/src/common/store/cache/collections/utils/addTracksFromCollections.ts index 67be956b809..ddc4b4ceb8d 100644 --- a/packages/web/src/common/store/cache/collections/utils/addTracksFromCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/addTracksFromCollections.ts @@ -1,6 +1,5 @@ import { CollectionMetadata, UserTrackMetadata } from '@audius/common/models' // Move all to web -import {} from '@audius/common' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/cache/users/utils/pruneBlobValues.ts b/packages/web/src/common/store/cache/users/utils/pruneBlobValues.ts index a6279aa0b76..8bc4d56c441 100644 --- a/packages/web/src/common/store/cache/users/utils/pruneBlobValues.ts +++ b/packages/web/src/common/store/cache/users/utils/pruneBlobValues.ts @@ -1,5 +1,4 @@ import { SquareSizes, WidthSizes, User } from '@audius/common/models' -import {} from '@audius/common' /** * Prunes blob url values off of a user. diff --git a/packages/web/src/common/store/pages/signon/types.ts b/packages/web/src/common/store/pages/signon/types.ts index 21e712daa4b..369f098224a 100644 --- a/packages/web/src/common/store/pages/signon/types.ts +++ b/packages/web/src/common/store/pages/signon/types.ts @@ -1,5 +1,4 @@ import { ID, User } from '@audius/common/models' -import {} from '@audius/common' import { ImageFieldValue } from 'pages/sign-up-page/components/ImageField' diff --git a/packages/web/src/common/store/search-ai-bar/reducer.ts b/packages/web/src/common/store/search-ai-bar/reducer.ts index cdd116eb2d1..4062247c6b7 100644 --- a/packages/web/src/common/store/search-ai-bar/reducer.ts +++ b/packages/web/src/common/store/search-ai-bar/reducer.ts @@ -1,5 +1,4 @@ import { Status } from '@audius/common/models' -import {} from '@audius/common' import { ActionsMap } from 'utils/reducer' diff --git a/packages/web/src/common/store/search-ai-bar/types.ts b/packages/web/src/common/store/search-ai-bar/types.ts index 9e271c2ce32..c0fc78fba8e 100644 --- a/packages/web/src/common/store/search-ai-bar/types.ts +++ b/packages/web/src/common/store/search-ai-bar/types.ts @@ -1,5 +1,4 @@ import { Status, SearchUser } from '@audius/common/models' -import {} from '@audius/common' export type SearchResults = { users: SearchUser[] diff --git a/packages/web/src/common/store/search-bar/reducer.ts b/packages/web/src/common/store/search-bar/reducer.ts index 20a820bf25f..a467ab06897 100644 --- a/packages/web/src/common/store/search-bar/reducer.ts +++ b/packages/web/src/common/store/search-bar/reducer.ts @@ -1,5 +1,4 @@ import { Status } from '@audius/common/models' -import {} from '@audius/common' import { ActionsMap } from 'utils/reducer' diff --git a/packages/web/src/common/store/search-bar/types.ts b/packages/web/src/common/store/search-bar/types.ts index fc5ace203cc..612f24447b1 100644 --- a/packages/web/src/common/store/search-bar/types.ts +++ b/packages/web/src/common/store/search-bar/types.ts @@ -4,7 +4,6 @@ import { SearchTrack, SearchPlaylist } from '@audius/common/models' -import {} from '@audius/common' type NewType = SearchPlaylist diff --git a/packages/web/src/common/store/smart-collection/smartCollections.ts b/packages/web/src/common/store/smart-collection/smartCollections.ts index cc05d1a392f..4344ead4aed 100644 --- a/packages/web/src/common/store/smart-collection/smartCollections.ts +++ b/packages/web/src/common/store/smart-collection/smartCollections.ts @@ -3,7 +3,6 @@ import { SmartCollectionVariant, SmartCollection } from '@audius/common/models' -import {} from '@audius/common' import IconExploreFeelingLucky from 'assets/img/iconExploreFeelingLucky.svg' import IconExploreMostLoved from 'assets/img/iconExploreMostLoved.svg' diff --git a/packages/web/src/common/utils/isPreview.ts b/packages/web/src/common/utils/isPreview.ts index 9d084fb399e..0efbfeb4032 100644 --- a/packages/web/src/common/utils/isPreview.ts +++ b/packages/web/src/common/utils/isPreview.ts @@ -1,5 +1,4 @@ import { ID, Track } from '@audius/common/models' -import {} from '@audius/common' export const isPreview = (track: Track, currentUserId: ID | null) => { return !!track.preview_cid && track.owner_id !== currentUserId diff --git a/packages/web/src/components/add-funds/AddFunds.tsx b/packages/web/src/components/add-funds/AddFunds.tsx index ecf68727fd1..5b3617a5d16 100644 --- a/packages/web/src/components/add-funds/AddFunds.tsx +++ b/packages/web/src/components/add-funds/AddFunds.tsx @@ -1,9 +1,7 @@ -import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' - import { useState } from 'react' -import {} from '@audius/common' import { useUSDCBalance, useCreateUserbankIfNeeded } from '@audius/common/hooks' +import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { USDC } from '@audius/fixed-decimal' import { Box, Button, Flex, Text, IconLogoCircleUSDC } from '@audius/harmony' import { BN } from 'bn.js' diff --git a/packages/web/src/components/app-cta-modal/AppCTAModal.tsx b/packages/web/src/components/app-cta-modal/AppCTAModal.tsx index 3b3aaf6332f..6256f392e87 100644 --- a/packages/web/src/components/app-cta-modal/AppCTAModal.tsx +++ b/packages/web/src/components/app-cta-modal/AppCTAModal.tsx @@ -1,8 +1,6 @@ import { useCallback } from 'react' import { Name } from '@audius/common/models' - -import {} from '@audius/common' import { Modal, Button, IconDownload, ButtonType } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/app-redirect-popover/AppRedirectListener.tsx b/packages/web/src/components/app-redirect-popover/AppRedirectListener.tsx index 40e666ca26a..463eb7ccc45 100644 --- a/packages/web/src/components/app-redirect-popover/AppRedirectListener.tsx +++ b/packages/web/src/components/app-redirect-popover/AppRedirectListener.tsx @@ -1,8 +1,6 @@ import { useEffect } from 'react' import { MobileOS } from '@audius/common/models' - -import {} from '@audius/common' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { useHistory } from 'react-router-dom' diff --git a/packages/web/src/components/artist/ArtistCardCover.tsx b/packages/web/src/components/artist/ArtistCardCover.tsx index 215bf26fcf0..3fba2307e36 100644 --- a/packages/web/src/components/artist/ArtistCardCover.tsx +++ b/packages/web/src/components/artist/ArtistCardCover.tsx @@ -1,8 +1,6 @@ import { useCallback } from 'react' import { SquareSizes, WidthSizes, User } from '@audius/common/models' - -import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/artist/ArtistChip.tsx b/packages/web/src/components/artist/ArtistChip.tsx index 1559430aa1e..b118a1e77ff 100644 --- a/packages/web/src/components/artist/ArtistChip.tsx +++ b/packages/web/src/components/artist/ArtistChip.tsx @@ -1,8 +1,6 @@ import { ComponentPropsWithoutRef } from 'react' import { SquareSizes, ID, User } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/components/artist/ArtistCover.tsx b/packages/web/src/components/artist/ArtistCover.tsx index 14b2c06235c..98f4a67a49f 100644 --- a/packages/web/src/components/artist/ArtistCover.tsx +++ b/packages/web/src/components/artist/ArtistCover.tsx @@ -5,7 +5,6 @@ import { ProfilePictureSizes, CoverPhotoSizes } from '@audius/common/models' -import {} from '@audius/common' import BadgeArtist from 'assets/img/badgeArtist.svg' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/components/background-animations/MusicConfetti.tsx b/packages/web/src/components/background-animations/MusicConfetti.tsx index 090d0e3acca..e8b6aab8268 100644 --- a/packages/web/src/components/background-animations/MusicConfetti.tsx +++ b/packages/web/src/components/background-animations/MusicConfetti.tsx @@ -2,8 +2,6 @@ import { useRef, useCallback, useEffect, useState, useMemo } from 'react' import { Theme } from '@audius/common/models' -import {} from '@audius/common' - import Confetti from 'utils/animations/music-confetti' import { getCurrentThemeColors } from 'utils/theme/theme' diff --git a/packages/web/src/components/banner/CallToActionBanner.tsx b/packages/web/src/components/banner/CallToActionBanner.tsx index 596a5c52b33..02f14793632 100644 --- a/packages/web/src/components/banner/CallToActionBanner.tsx +++ b/packages/web/src/components/banner/CallToActionBanner.tsx @@ -1,8 +1,6 @@ import { ReactNode } from 'react' import { Client } from '@audius/common/models' - -import {} from '@audius/common' import { IconArrowWhite } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/banner/TermsOfServiceUpdateBanner.tsx b/packages/web/src/components/banner/TermsOfServiceUpdateBanner.tsx index cfa601aa734..8790ab2f10a 100644 --- a/packages/web/src/components/banner/TermsOfServiceUpdateBanner.tsx +++ b/packages/web/src/components/banner/TermsOfServiceUpdateBanner.tsx @@ -1,8 +1,6 @@ import { useCallback, useState } from 'react' import { Name } from '@audius/common/models' - -import {} from '@audius/common' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/co-sign/CoSign.tsx b/packages/web/src/components/co-sign/CoSign.tsx index 8686877a985..18032087e81 100644 --- a/packages/web/src/components/co-sign/CoSign.tsx +++ b/packages/web/src/components/co-sign/CoSign.tsx @@ -1,8 +1,6 @@ import { useMemo, ReactNode, RefObject } from 'react' import { ID } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import Tooltip from 'components/tooltip/Tooltip' diff --git a/packages/web/src/components/co-sign/HoverInfo.tsx b/packages/web/src/components/co-sign/HoverInfo.tsx index 023cf320757..35e5d5db153 100644 --- a/packages/web/src/components/co-sign/HoverInfo.tsx +++ b/packages/web/src/components/co-sign/HoverInfo.tsx @@ -1,5 +1,4 @@ import { ID } from '@audius/common/models' -import {} from '@audius/common' import IconHeart from 'assets/img/iconHeart.svg' import IconRepost from 'assets/img/iconRepost.svg' diff --git a/packages/web/src/components/collection/desktop/SmartCollectionActionButtons.tsx b/packages/web/src/components/collection/desktop/SmartCollectionActionButtons.tsx index f4fd8098756..4a44e1ffe3a 100644 --- a/packages/web/src/components/collection/desktop/SmartCollectionActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/SmartCollectionActionButtons.tsx @@ -1,5 +1,4 @@ import { SmartCollectionVariant, ID } from '@audius/common/models' -import {} from '@audius/common' import { FavoriteButton } from './FavoriteButton' import { ShareButton } from './ShareButton' diff --git a/packages/web/src/components/dog-ear/DogEar.tsx b/packages/web/src/components/dog-ear/DogEar.tsx index 3ac8dff91b8..d09d7afda96 100644 --- a/packages/web/src/components/dog-ear/DogEar.tsx +++ b/packages/web/src/components/dog-ear/DogEar.tsx @@ -1,5 +1,4 @@ import { DogEarType } from '@audius/common/models' -import {} from '@audius/common' import { IconCart, IconCollectible, diff --git a/packages/web/src/components/download-mobile-app-drawer/DownloadMobileAppDrawer.tsx b/packages/web/src/components/download-mobile-app-drawer/DownloadMobileAppDrawer.tsx index 69642d08e74..45e6e46addf 100644 --- a/packages/web/src/components/download-mobile-app-drawer/DownloadMobileAppDrawer.tsx +++ b/packages/web/src/components/download-mobile-app-drawer/DownloadMobileAppDrawer.tsx @@ -1,8 +1,6 @@ import { useCallback } from 'react' import { MobileOS } from '@audius/common/models' - -import {} from '@audius/common' import { AudiusLogoGlyph, Button, diff --git a/packages/web/src/components/dragndrop/Draggable.tsx b/packages/web/src/components/dragndrop/Draggable.tsx index 94accb2b40e..f9ece80dcb1 100644 --- a/packages/web/src/components/dragndrop/Draggable.tsx +++ b/packages/web/src/components/dragndrop/Draggable.tsx @@ -1,8 +1,6 @@ import { DragEvent, ReactNode, useCallback } from 'react' import { ID } from '@audius/common/models' - -import {} from '@audius/common' import { Slot } from '@radix-ui/react-slot' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/dragndrop/Droppable.tsx b/packages/web/src/components/dragndrop/Droppable.tsx index 6a2bf95da17..2c124dec362 100644 --- a/packages/web/src/components/dragndrop/Droppable.tsx +++ b/packages/web/src/components/dragndrop/Droppable.tsx @@ -1,5 +1,3 @@ -import { ID } from '@audius/common/models' - import { useState, useCallback, @@ -8,8 +6,8 @@ import { ReactNode } from 'react' -import {} from '@audius/common' import { useDebouncedCallback } from '@audius/common/hooks' +import { ID } from '@audius/common/models' import { Slot } from '@radix-ui/react-slot' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/embed-modal/store/actions.ts b/packages/web/src/components/embed-modal/store/actions.ts index a1b13cb58c2..8a975de834e 100644 --- a/packages/web/src/components/embed-modal/store/actions.ts +++ b/packages/web/src/components/embed-modal/store/actions.ts @@ -1,5 +1,4 @@ import { PlayableType, ID } from '@audius/common/models' -import {} from '@audius/common' import { createCustomAction } from 'typesafe-actions' export const OPEN = 'EMBED_MODAL/OPEN' diff --git a/packages/web/src/components/embed-modal/store/types.ts b/packages/web/src/components/embed-modal/store/types.ts index 37fa330c8f1..d16b293ef08 100644 --- a/packages/web/src/components/embed-modal/store/types.ts +++ b/packages/web/src/components/embed-modal/store/types.ts @@ -1,5 +1,4 @@ import { PlayableType, ID } from '@audius/common/models' -import {} from '@audius/common' export type EmbedModalState = { isOpen: boolean diff --git a/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx b/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx index 01390588b0e..7a3afc50ca6 100644 --- a/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx +++ b/packages/web/src/components/inbox-settings-modal/InboxSettingsModal.tsx @@ -1,9 +1,7 @@ -import { Status } from '@audius/common/models' - import { ChangeEvent, useCallback, useEffect } from 'react' -import {} from '@audius/common' import { useSetInboxPermissions } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { ChatPermission } from '@audius/sdk' import { Button, diff --git a/packages/web/src/components/lineup/Lineup.tsx b/packages/web/src/components/lineup/Lineup.tsx index f585d5f8590..ec8c7c0e7d4 100644 --- a/packages/web/src/components/lineup/Lineup.tsx +++ b/packages/web/src/components/lineup/Lineup.tsx @@ -1,5 +1,4 @@ import { Status } from '@audius/common/models' -import {} from '@audius/common' import DesktopPlaylistTile from 'components/track/desktop/ConnectedPlaylistTile' import DesktopTrackTile from 'components/track/desktop/ConnectedTrackTile' diff --git a/packages/web/src/components/nav/Navigator.tsx b/packages/web/src/components/nav/Navigator.tsx index 1b813b418e4..49bdf1bff27 100644 --- a/packages/web/src/components/nav/Navigator.tsx +++ b/packages/web/src/components/nav/Navigator.tsx @@ -1,5 +1,4 @@ import { Client } from '@audius/common/models' -import {} from '@audius/common' import cn from 'classnames' import { RouteComponentProps, withRouter } from 'react-router-dom' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/ExplorePlaylistNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/ExplorePlaylistNavItem.tsx index 6038f33dcaf..4b018970016 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/ExplorePlaylistNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/ExplorePlaylistNavItem.tsx @@ -1,5 +1,4 @@ import { SmartCollectionVariant } from '@audius/common/models' -import {} from '@audius/common' import { SMART_COLLECTION_MAP } from 'common/store/smart-collection/smartCollections' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibraryNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibraryNavItem.tsx index f2dd2c76bce..f7c5fd82bc4 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibraryNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibraryNavItem.tsx @@ -2,7 +2,6 @@ import { SmartCollectionVariant, PlaylistLibraryItem } from '@audius/common/models' -import {} from '@audius/common' import { AudioNftPlaylistNavItem } from './AudioNftPlaylistNavItem' import { ExplorePlaylistNavItem } from './ExplorePlaylistNavItem' diff --git a/packages/web/src/components/notification/Notification/components/ProfilePicture.tsx b/packages/web/src/components/notification/Notification/components/ProfilePicture.tsx index 7aaf19d2a0d..80220f16846 100644 --- a/packages/web/src/components/notification/Notification/components/ProfilePicture.tsx +++ b/packages/web/src/components/notification/Notification/components/ProfilePicture.tsx @@ -1,8 +1,6 @@ import { MouseEventHandler, useCallback, useEffect, useState } from 'react' import { SquareSizes, User } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/password-reset/store/reducer.ts b/packages/web/src/components/password-reset/store/reducer.ts index 3ac7cb9186c..744a33418ed 100644 --- a/packages/web/src/components/password-reset/store/reducer.ts +++ b/packages/web/src/components/password-reset/store/reducer.ts @@ -1,5 +1,4 @@ import { Status } from '@audius/common/models' -import {} from '@audius/common' import { ActionsMap } from 'utils/reducer' diff --git a/packages/web/src/components/password-reset/store/types.ts b/packages/web/src/components/password-reset/store/types.ts index ed3880acb24..ed0c11e1c83 100644 --- a/packages/web/src/components/password-reset/store/types.ts +++ b/packages/web/src/components/password-reset/store/types.ts @@ -1,5 +1,4 @@ import { Status } from '@audius/common/models' -import {} from '@audius/common' export type PasswordResetState = { status: Status diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx index 5a1ccb70bb5..d3b481d79d1 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PayExtraFormSection.tsx @@ -4,7 +4,6 @@ import { CUSTOM_AMOUNT, AMOUNT_PRESET } from '@audius/common/hooks' -import {} from '@audius/common' import { Text, Flex, SelectablePill } from '@audius/harmony' import { useField } from 'formik' diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PayToUnlockInfo.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PayToUnlockInfo.tsx index 3974e618663..3e064397d54 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PayToUnlockInfo.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PayToUnlockInfo.tsx @@ -1,8 +1,6 @@ import { useCallback } from 'react' import { Name } from '@audius/common/models' - -import {} from '@audius/common' import { Link } from 'react-router-dom' import { LockedStatusBadge } from 'components/track/LockedStatusBadge' diff --git a/packages/web/src/components/profile-picture/ProfilePicture.jsx b/packages/web/src/components/profile-picture/ProfilePicture.jsx index 9e1ad22820b..e4ad4c92ccb 100644 --- a/packages/web/src/components/profile-picture/ProfilePicture.jsx +++ b/packages/web/src/components/profile-picture/ProfilePicture.jsx @@ -1,8 +1,6 @@ import { memo, useState, useEffect } from 'react' import { SquareSizes } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import PropTypes from 'prop-types' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/profile-progress/hooks/index.js b/packages/web/src/components/profile-progress/hooks/index.js index 35da53cbfd5..fd668f49703 100644 --- a/packages/web/src/components/profile-progress/hooks/index.js +++ b/packages/web/src/components/profile-progress/hooks/index.js @@ -1,8 +1,6 @@ import { useState, useEffect } from 'react' import { Name } from '@audius/common/models' - -import {} from '@audius/common' import { useDispatch } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useTransition } from 'react-spring' diff --git a/packages/web/src/components/related-artists/RelatedArtists.tsx b/packages/web/src/components/related-artists/RelatedArtists.tsx index dca453da922..e532e57dadf 100644 --- a/packages/web/src/components/related-artists/RelatedArtists.tsx +++ b/packages/web/src/components/related-artists/RelatedArtists.tsx @@ -1,14 +1,12 @@ -import { User } from '@audius/common/models' - import { useCallback } from 'react' -import type {} from '@audius/common' import { profilePageSelectors, MAX_PROFILE_RELATED_ARTISTS, FeatureFlags } from '@audius/common' import { useGetRelatedArtists } from '@audius/common/api' +import { User } from '@audius/common/models' import { IconUserGroup } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/remix-card/RemixCard.tsx b/packages/web/src/components/remix-card/RemixCard.tsx index af6eafa4adc..7938a91d6a3 100644 --- a/packages/web/src/components/remix-card/RemixCard.tsx +++ b/packages/web/src/components/remix-card/RemixCard.tsx @@ -1,5 +1,4 @@ import { ID, Remix } from '@audius/common/models' -import {} from '@audius/common' import { ArtistPopover } from 'components/artist/ArtistPopover' import CoSign from 'components/co-sign/CoSign' diff --git a/packages/web/src/components/search-bar/SearchBar.tsx b/packages/web/src/components/search-bar/SearchBar.tsx index 0be9c9509d3..5a7d9aff3ac 100644 --- a/packages/web/src/components/search-bar/SearchBar.tsx +++ b/packages/web/src/components/search-bar/SearchBar.tsx @@ -1,8 +1,6 @@ import { ChangeEvent, KeyboardEvent } from 'react' import { Status } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/search/SearchBar.jsx b/packages/web/src/components/search/SearchBar.jsx index 8486e475212..ad18d5aeb02 100644 --- a/packages/web/src/components/search/SearchBar.jsx +++ b/packages/web/src/components/search/SearchBar.jsx @@ -1,8 +1,6 @@ import { createRef, Component } from 'react' import { Kind, Status } from '@audius/common/models' - -import {} from '@audius/common' import AutoComplete from 'antd/lib/auto-complete' import Input from 'antd/lib/input' import cn from 'classnames' diff --git a/packages/web/src/components/search/SearchTag.tsx b/packages/web/src/components/search/SearchTag.tsx index d37498da274..fca15f824ee 100644 --- a/packages/web/src/components/search/SearchTag.tsx +++ b/packages/web/src/components/search/SearchTag.tsx @@ -1,8 +1,6 @@ import { useCallback, MouseEvent } from 'react' import { Name, AllTrackingEvents } from '@audius/common/models' - -import {} from '@audius/common' import { Tag } from '@audius/stems' import type { TagProps } from '@audius/stems' import { Link } from 'react-router-dom' diff --git a/packages/web/src/components/source-files-modal/SourceFilesModal.tsx b/packages/web/src/components/source-files-modal/SourceFilesModal.tsx index 52fbd19815d..aac4e7b9185 100644 --- a/packages/web/src/components/source-files-modal/SourceFilesModal.tsx +++ b/packages/web/src/components/source-files-modal/SourceFilesModal.tsx @@ -6,8 +6,6 @@ import { StemUpload, Download } from '@audius/common/models' - -import {} from '@audius/common' import { Button, ButtonSize, diff --git a/packages/web/src/components/suggested-tracks/SuggestedCollectionTracks.tsx b/packages/web/src/components/suggested-tracks/SuggestedCollectionTracks.tsx index 4c2a86ee99d..73f97b987af 100644 --- a/packages/web/src/components/suggested-tracks/SuggestedCollectionTracks.tsx +++ b/packages/web/src/components/suggested-tracks/SuggestedCollectionTracks.tsx @@ -1,11 +1,10 @@ -import { Status, ID } from '@audius/common/models' -import {} from '@audius/common' import { useGetPlaylistById, useGetSuggestedAlbumTracks, useGetSuggestedPlaylistTracks, useGetCurrentUserId } from '@audius/common/api' +import { Status, ID } from '@audius/common/models' import { SuggestedTracks } from './components/SuggestedTracks' diff --git a/packages/web/src/components/table/Table.tsx b/packages/web/src/components/table/Table.tsx index 440664e68a3..eb9bca56c91 100644 --- a/packages/web/src/components/table/Table.tsx +++ b/packages/web/src/components/table/Table.tsx @@ -8,8 +8,6 @@ import { } from 'react' import { Kind, ID, TrackMetadata } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import { debounce, range } from 'lodash' import moment from 'moment' diff --git a/packages/web/src/components/tile/Tile.tsx b/packages/web/src/components/tile/Tile.tsx index f823a4566d6..d71a9b00534 100644 --- a/packages/web/src/components/tile/Tile.tsx +++ b/packages/web/src/components/tile/Tile.tsx @@ -8,8 +8,6 @@ import { } from 'react' import { DogEarType } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import { DogEar } from 'components/dog-ear' diff --git a/packages/web/src/components/track/Artwork.tsx b/packages/web/src/components/track/Artwork.tsx index 0496dca12b5..d698dbfbf31 100644 --- a/packages/web/src/components/track/Artwork.tsx +++ b/packages/web/src/components/track/Artwork.tsx @@ -1,9 +1,7 @@ -import { SquareSizes, ID, CoverArtSizes } from '@audius/common/models' - import { memo } from 'react' -import {} from '@audius/common' import { useLoadImageWithTimeout } from '@audius/common/hooks' +import { SquareSizes, ID, CoverArtSizes } from '@audius/common/models' import { PbIconPlay as IconPlay, PbIconPause as IconPause, diff --git a/packages/web/src/components/track/DynamicTrackArtwork.tsx b/packages/web/src/components/track/DynamicTrackArtwork.tsx index b8134bd6a79..38b80cb8770 100644 --- a/packages/web/src/components/track/DynamicTrackArtwork.tsx +++ b/packages/web/src/components/track/DynamicTrackArtwork.tsx @@ -1,6 +1,5 @@ -import { SquareSizes, statusIsNotFinalized, ID } from '@audius/common/models' -import {} from '@audius/common' import { useGetTrackById } from '@audius/common/api' +import { SquareSizes, statusIsNotFinalized, ID } from '@audius/common/models' import cn from 'classnames' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/components/track/mobile/TrackList.tsx b/packages/web/src/components/track/mobile/TrackList.tsx index d412ab120ec..edeaedc559e 100644 --- a/packages/web/src/components/track/mobile/TrackList.tsx +++ b/packages/web/src/components/track/mobile/TrackList.tsx @@ -1,8 +1,6 @@ import { memo, useCallback } from 'react' import { ID, CoverArtSizes } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd' diff --git a/packages/web/src/components/track/mobile/TrackListItem.tsx b/packages/web/src/components/track/mobile/TrackListItem.tsx index 06ba45ef424..8c089993588 100644 --- a/packages/web/src/components/track/mobile/TrackListItem.tsx +++ b/packages/web/src/components/track/mobile/TrackListItem.tsx @@ -1,8 +1,6 @@ import { memo, MouseEvent } from 'react' import { SquareSizes, ID, CoverArtSizes } from '@audius/common/models' - -import {} from '@audius/common' import { IconKebabHorizontal, IconButton, IconLock } from '@audius/stems' import cn from 'classnames' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/track/mobile/TrackTileArt.tsx b/packages/web/src/components/track/mobile/TrackTileArt.tsx index 5979f3a04d9..369e45e8c54 100644 --- a/packages/web/src/components/track/mobile/TrackTileArt.tsx +++ b/packages/web/src/components/track/mobile/TrackTileArt.tsx @@ -1,9 +1,7 @@ -import { SquareSizes, ID, CoverArtSizes, Remix } from '@audius/common/models' - import { memo } from 'react' -import {} from '@audius/common' import { useLoadImageWithTimeout } from '@audius/common/hooks' +import { SquareSizes, ID, CoverArtSizes, Remix } from '@audius/common/models' import cn from 'classnames' import CoSign from 'components/co-sign/CoSign' diff --git a/packages/web/src/components/unfollow-confirmation-modal/components/UnfollowConfirmationModal.tsx b/packages/web/src/components/unfollow-confirmation-modal/components/UnfollowConfirmationModal.tsx index 6e2be69ea90..4684874e94d 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/components/UnfollowConfirmationModal.tsx +++ b/packages/web/src/components/unfollow-confirmation-modal/components/UnfollowConfirmationModal.tsx @@ -1,5 +1,4 @@ import { ID } from '@audius/common/models' -import {} from '@audius/common' import ActionSheetModal from 'components/action-drawer/ActionDrawer' diff --git a/packages/web/src/components/unfollow-confirmation-modal/store/actions.ts b/packages/web/src/components/unfollow-confirmation-modal/store/actions.ts index ed12b94a575..b3b76c0cf49 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/store/actions.ts +++ b/packages/web/src/components/unfollow-confirmation-modal/store/actions.ts @@ -1,5 +1,4 @@ import { ID } from '@audius/common/models' -import {} from '@audius/common' import { createCustomAction } from 'typesafe-actions' export const SET_OPEN = 'UNFOLLOW_CONFIRMATION/SET_OPEN' diff --git a/packages/web/src/components/unfollow-confirmation-modal/store/types.ts b/packages/web/src/components/unfollow-confirmation-modal/store/types.ts index f3a4ea97fb9..62ae4422dc6 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/store/types.ts +++ b/packages/web/src/components/unfollow-confirmation-modal/store/types.ts @@ -1,5 +1,4 @@ import { ID } from '@audius/common/models' -import {} from '@audius/common' export type UnfollowConfirmationModalState = { isOpen: boolean diff --git a/packages/web/src/components/usdc-balance-fetcher/USDCBalanceFetcher.tsx b/packages/web/src/components/usdc-balance-fetcher/USDCBalanceFetcher.tsx index 6653c45883d..f9f67d6b8e3 100644 --- a/packages/web/src/components/usdc-balance-fetcher/USDCBalanceFetcher.tsx +++ b/packages/web/src/components/usdc-balance-fetcher/USDCBalanceFetcher.tsx @@ -1,5 +1,4 @@ import { useUSDCBalance } from '@audius/common/hooks' -import {} from '@audius/common' export const USDCBalanceFetcher = () => { useUSDCBalance() diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/TrackLink.tsx b/packages/web/src/components/usdc-purchase-details-modal/components/TrackLink.tsx index 676d857628b..af0c4254d65 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/TrackLink.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/components/TrackLink.tsx @@ -1,5 +1,4 @@ import { useGetTrackById } from '@audius/common/api' -import {} from '@audius/common' import { Link } from 'react-router-dom' import { Text } from 'components/typography' diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/types.ts b/packages/web/src/components/usdc-purchase-details-modal/components/types.ts index bc7216f78e5..8e605af9b3b 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/types.ts +++ b/packages/web/src/components/usdc-purchase-details-modal/components/types.ts @@ -1,5 +1,4 @@ import { USDCPurchaseDetails } from '@audius/common/models' -import {} from '@audius/common' export type ContentProps = { purchaseDetails: USDCPurchaseDetails diff --git a/packages/web/src/hooks/useAsyncPoll.ts b/packages/web/src/hooks/useAsyncPoll.ts index 41cdce94661..a0ca04b54dc 100644 --- a/packages/web/src/hooks/useAsyncPoll.ts +++ b/packages/web/src/hooks/useAsyncPoll.ts @@ -2,8 +2,6 @@ import { useEffect, useCallback } from 'react' import { useInstanceVar } from '@audius/common/hooks' -import {} from '@audius/common' - type UseAsyncPoll = { // Call to make (usually an action), doesn't have to be async call: () => void diff --git a/packages/web/src/hooks/useDelayedEffect.ts b/packages/web/src/hooks/useDelayedEffect.ts index 03a0e9d7f2a..fd431559fca 100644 --- a/packages/web/src/hooks/useDelayedEffect.ts +++ b/packages/web/src/hooks/useDelayedEffect.ts @@ -2,8 +2,6 @@ import { useEffect } from 'react' import { useInstanceVar } from '@audius/common/hooks' -import {} from '@audius/common' - /** * useDelayedEffect invokes a callback after a given delay on the satisfaction * of some condition diff --git a/packages/web/src/hooks/useErrorPageOnFailedStatus.ts b/packages/web/src/hooks/useErrorPageOnFailedStatus.ts index 5643967cabd..66b8d08e355 100644 --- a/packages/web/src/hooks/useErrorPageOnFailedStatus.ts +++ b/packages/web/src/hooks/useErrorPageOnFailedStatus.ts @@ -1,8 +1,6 @@ import { useEffect } from 'react' import { Status } from '@audius/common/models' - -import {} from '@audius/common' import { useDispatch } from 'react-redux' import { HandleErrorArgs, handleError } from 'store/errors/actions' diff --git a/packages/web/src/hooks/useImageSize.test.tsx b/packages/web/src/hooks/useImageSize.test.tsx index a5cdc571106..1061d7d8e22 100644 --- a/packages/web/src/hooks/useImageSize.test.tsx +++ b/packages/web/src/hooks/useImageSize.test.tsx @@ -1,10 +1,9 @@ +import { useImageSize, BaseUserImageSizeProps } from '@audius/common/hooks' import { DefaultSizes, SquareSizes, ImageSizesObject } from '@audius/common/models' -import {} from '@audius/common' -import { useImageSize, BaseUserImageSizeProps } from '@audius/common/hooks' import { render } from '@testing-library/react' import type { Dispatch } from 'redux' import { expect, describe, it, vitest } from 'vitest' diff --git a/packages/web/src/hooks/useLocalStorage.ts b/packages/web/src/hooks/useLocalStorage.ts index 1ab49472579..157546352be 100644 --- a/packages/web/src/hooks/useLocalStorage.ts +++ b/packages/web/src/hooks/useLocalStorage.ts @@ -1,5 +1,4 @@ import { createUseLocalStorageHook } from '@audius/common/hooks' -import {} from '@audius/common' const getJSONValue = (key: string) => { const val = window.localStorage.getItem(key) diff --git a/packages/web/src/hooks/useTikTokAuth.ts b/packages/web/src/hooks/useTikTokAuth.ts index eb7eeb2d579..4b51990f892 100644 --- a/packages/web/src/hooks/useTikTokAuth.ts +++ b/packages/web/src/hooks/useTikTokAuth.ts @@ -1,13 +1,12 @@ -import { Name } from '@audius/common/models' // Polyfills import 'whatwg-fetch' import 'url-search-params-polyfill' -import {} from '@audius/common' import { createUseTikTokAuthHook, UseTikTokAuthArguments, Credentials } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { useRecord, make } from 'common/store/analytics/actions' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' diff --git a/packages/web/src/pages/ai-attributed-tracks-page/components/desktop/AiPage.tsx b/packages/web/src/pages/ai-attributed-tracks-page/components/desktop/AiPage.tsx index 891a370c2a5..7483ab5af7d 100644 --- a/packages/web/src/pages/ai-attributed-tracks-page/components/desktop/AiPage.tsx +++ b/packages/web/src/pages/ai-attributed-tracks-page/components/desktop/AiPage.tsx @@ -1,6 +1,5 @@ -import { User } from '@audius/common/models' -import {} from '@audius/common' // import { IconRobot, IconRemix } from '@audius/stems' +import { User } from '@audius/common/models' import cn from 'classnames' import IconRobot from 'assets/img/iconRobot.svg' diff --git a/packages/web/src/pages/ai-attributed-tracks-page/components/mobile/AiPage.tsx b/packages/web/src/pages/ai-attributed-tracks-page/components/mobile/AiPage.tsx index e09f5f754d2..57d5232c338 100644 --- a/packages/web/src/pages/ai-attributed-tracks-page/components/mobile/AiPage.tsx +++ b/packages/web/src/pages/ai-attributed-tracks-page/components/mobile/AiPage.tsx @@ -1,8 +1,6 @@ import { useEffect, useContext } from 'react' import { User } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import IconRobot from 'assets/img/iconRobot.svg' diff --git a/packages/web/src/pages/audio-rewards-page/components/ExplainerTile.tsx b/packages/web/src/pages/audio-rewards-page/components/ExplainerTile.tsx index c83f3b76daa..c480707fae0 100644 --- a/packages/web/src/pages/audio-rewards-page/components/ExplainerTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/ExplainerTile.tsx @@ -1,8 +1,6 @@ import { ReactNode, useCallback, useEffect, useRef, useState } from 'react' import { Theme } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import TokenStill from 'assets/img/tokenSpinStill.png' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendingModalBody.tsx b/packages/web/src/pages/audio-rewards-page/components/SendingModalBody.tsx index e593696fbcd..7d67771fee1 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendingModalBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendingModalBody.tsx @@ -1,5 +1,4 @@ import { BNWei, WalletAddress } from '@audius/common/models' -import {} from '@audius/common' import cn from 'classnames' import LoadingSpinner from 'components/loading-spinner/LoadingSpinner' diff --git a/packages/web/src/pages/chat-page/components/ChatUser.tsx b/packages/web/src/pages/chat-page/components/ChatUser.tsx index 5702b8414f4..f83bdbd806e 100644 --- a/packages/web/src/pages/chat-page/components/ChatUser.tsx +++ b/packages/web/src/pages/chat-page/components/ChatUser.tsx @@ -1,8 +1,6 @@ import { ReactNode, useCallback } from 'react' import { User } from '@audius/common/models' - -import {} from '@audius/common' import cn from 'classnames' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/pages/collection-page/store/utils.ts b/packages/web/src/pages/collection-page/store/utils.ts index d6ffa055872..ee7670a9f9f 100644 --- a/packages/web/src/pages/collection-page/store/utils.ts +++ b/packages/web/src/pages/collection-page/store/utils.ts @@ -1,5 +1,4 @@ import { Variant, Collection, SmartCollection } from '@audius/common/models' -import {} from '@audius/common' export const computeCollectionMetadataProps = ( metadata: Collection | SmartCollection | null diff --git a/packages/web/src/pages/dashboard-page/components/ArtistCard.tsx b/packages/web/src/pages/dashboard-page/components/ArtistCard.tsx index cdd45b286f0..e6d2f4c8cdb 100644 --- a/packages/web/src/pages/dashboard-page/components/ArtistCard.tsx +++ b/packages/web/src/pages/dashboard-page/components/ArtistCard.tsx @@ -1,5 +1,4 @@ import { SquareSizes, WidthSizes, ID } from '@audius/common/models' -import {} from '@audius/common' import DynamicImage from 'components/dynamic-image/DynamicImage' import { Text } from 'components/typography' diff --git a/packages/web/src/pages/dashboard-page/components/TracksTableContainer.tsx b/packages/web/src/pages/dashboard-page/components/TracksTableContainer.tsx index 55c9c77d2a5..ece2a7ad817 100644 --- a/packages/web/src/pages/dashboard-page/components/TracksTableContainer.tsx +++ b/packages/web/src/pages/dashboard-page/components/TracksTableContainer.tsx @@ -6,8 +6,6 @@ import { Track, User } from '@audius/common/models' - -import {} from '@audius/common' import { SelectablePill } from '@audius/harmony' import { IconHidden, diff --git a/packages/web/src/pages/dashboard-page/store/slice.ts b/packages/web/src/pages/dashboard-page/store/slice.ts index ced5e90bd6a..35c1b2eff01 100644 --- a/packages/web/src/pages/dashboard-page/store/slice.ts +++ b/packages/web/src/pages/dashboard-page/store/slice.ts @@ -1,5 +1,4 @@ import { Status, Collection, ID, Track } from '@audius/common/models' -import {} from '@audius/common' import { createSlice, PayloadAction } from '@reduxjs/toolkit' import ArtistDashboardState from './types' diff --git a/packages/web/src/pages/deleted-page/DeletedPage.tsx b/packages/web/src/pages/deleted-page/DeletedPage.tsx index dfbc2aceb30..28ecdd9a401 100644 --- a/packages/web/src/pages/deleted-page/DeletedPage.tsx +++ b/packages/web/src/pages/deleted-page/DeletedPage.tsx @@ -1,5 +1,4 @@ import { Playable, User } from '@audius/common/models' -import {} from '@audius/common' import { useIsMobile } from 'hooks/useIsMobile' diff --git a/packages/web/src/pages/explore-page/components/desktop/CollectionsPage.tsx b/packages/web/src/pages/explore-page/components/desktop/CollectionsPage.tsx index f811a1ac614..8c8be0713c5 100644 --- a/packages/web/src/pages/explore-page/components/desktop/CollectionsPage.tsx +++ b/packages/web/src/pages/explore-page/components/desktop/CollectionsPage.tsx @@ -2,8 +2,6 @@ import { useCallback, MouseEvent } from 'react' import { Status, UserCollection, ID } from '@audius/common/models' -import {} from '@audius/common' - import { ArtistPopover } from 'components/artist/ArtistPopover' import Card from 'components/card/desktop/Card' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx b/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx index 4c58fc4b95b..0b854e07988 100644 --- a/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx @@ -1,7 +1,12 @@ import { Fragment, useCallback } from 'react' import { ExploreCollectionsVariant } from '@audius/common' -import { Variant, Status, UserCollection, User } from '@audius/common/models' +import { + CollectionVariant, + Status, + UserCollection, + User +} from '@audius/common/models' import Lottie from 'react-lottie' import loadingSpinner from 'assets/animations/loadingSpinner.json' diff --git a/packages/web/src/pages/explore-page/components/mobile/CollectionsPage.tsx b/packages/web/src/pages/explore-page/components/mobile/CollectionsPage.tsx index ab5d4e1fbf5..9ee5c3c7cbc 100644 --- a/packages/web/src/pages/explore-page/components/mobile/CollectionsPage.tsx +++ b/packages/web/src/pages/explore-page/components/mobile/CollectionsPage.tsx @@ -2,8 +2,6 @@ import { useContext, useEffect } from 'react' import { Status, UserCollection, ID } from '@audius/common/models' -import {} from '@audius/common' - import Card from 'components/card/mobile/Card' import Header from 'components/header/mobile/Header' import { HeaderContext } from 'components/header/mobile/HeaderContextProvider' diff --git a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx index ffb4da1fba5..34f22aed28e 100644 --- a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx @@ -15,7 +15,7 @@ import { removeNullable } from '@audius/common' import { - Variant, + CollectionVariant, Status, UserCollection, SmartCollection, diff --git a/packages/web/src/pages/feed-page/components/desktop/FeedFilters.tsx b/packages/web/src/pages/feed-page/components/desktop/FeedFilters.tsx index 656b045ab25..09017b87185 100644 --- a/packages/web/src/pages/feed-page/components/desktop/FeedFilters.tsx +++ b/packages/web/src/pages/feed-page/components/desktop/FeedFilters.tsx @@ -1,5 +1,4 @@ import { FeedFilter } from '@audius/common/models' -import {} from '@audius/common' import SelectablePills from 'components/selectable-pill/SelectablePills' diff --git a/packages/web/src/pages/feed-page/components/mobile/FeedFilterButton.tsx b/packages/web/src/pages/feed-page/components/mobile/FeedFilterButton.tsx index 171ae6b7eae..da53060dd95 100644 --- a/packages/web/src/pages/feed-page/components/mobile/FeedFilterButton.tsx +++ b/packages/web/src/pages/feed-page/components/mobile/FeedFilterButton.tsx @@ -1,5 +1,4 @@ import { FeedFilter } from '@audius/common/models' -import {} from '@audius/common' import HeaderButton from 'components/header-button/HeaderButton' diff --git a/packages/web/src/pages/feed-page/components/mobile/FeedFilterDrawer.tsx b/packages/web/src/pages/feed-page/components/mobile/FeedFilterDrawer.tsx index 7e1f50cb045..790c8159483 100644 --- a/packages/web/src/pages/feed-page/components/mobile/FeedFilterDrawer.tsx +++ b/packages/web/src/pages/feed-page/components/mobile/FeedFilterDrawer.tsx @@ -2,8 +2,6 @@ import { useCallback, useMemo } from 'react' import { FeedFilter } from '@audius/common/models' -import {} from '@audius/common' - import ActionDrawer from 'components/action-drawer/ActionDrawer' import styles from './FeedFilterModal.module.css' diff --git a/packages/web/src/pages/feed-page/types.ts b/packages/web/src/pages/feed-page/types.ts index 3cc6ce39889..6d34054cacd 100644 --- a/packages/web/src/pages/feed-page/types.ts +++ b/packages/web/src/pages/feed-page/types.ts @@ -1,5 +1,4 @@ import { FeedFilter, ID, UID, Lineup, User } from '@audius/common/models' -import {} from '@audius/common' export interface FeedPageContentProps { feedTitle: string diff --git a/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx b/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx index 1d5d57c879b..e782295a61a 100644 --- a/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx +++ b/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx @@ -1,8 +1,6 @@ import { ChangeEvent, memo, useMemo } from 'react' import { ID } from '@audius/common/models' - -import {} from '@audius/common' import { Button, ButtonType, IconPause, IconPlay } from '@audius/stems' import FilterInput from 'components/filter-input/FilterInput' diff --git a/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx b/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx index 90bb8387c32..358fafc5e36 100644 --- a/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx +++ b/packages/web/src/pages/history-page/components/mobile/HistoryPage.tsx @@ -1,9 +1,7 @@ -import { ID, UID, LineupTrack } from '@audius/common/models' - import { memo, useEffect, useCallback, useContext } from 'react' -import {} from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' +import { ID, UID, LineupTrack } from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import LoadingSpinner from 'components/loading-spinner/LoadingSpinner' diff --git a/packages/web/src/pages/pay-and-earn-page/components/TrackNameWithArtwork.tsx b/packages/web/src/pages/pay-and-earn-page/components/TrackNameWithArtwork.tsx index dd7d17f0dc3..7fba4f6a678 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/TrackNameWithArtwork.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/TrackNameWithArtwork.tsx @@ -1,6 +1,5 @@ -import { SquareSizes, statusIsNotFinalized } from '@audius/common/models' -import {} from '@audius/common' import { useGetTrackById } from '@audius/common/api' +import { SquareSizes, statusIsNotFinalized } from '@audius/common/models' import DynamicImage from 'components/dynamic-image/DynamicImage' import { Text } from 'components/typography' diff --git a/packages/web/src/pages/pay-and-earn-page/types.ts b/packages/web/src/pages/pay-and-earn-page/types.ts index 652d176f2f4..83ee6643420 100644 --- a/packages/web/src/pages/pay-and-earn-page/types.ts +++ b/packages/web/src/pages/pay-and-earn-page/types.ts @@ -2,7 +2,6 @@ import { USDCPurchaseDetails, USDCTransactionDetails } from '@audius/common/models' -import {} from '@audius/common' import { Cell, Row } from 'react-table' export enum TableType { diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileBio.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileBio.tsx index 69eb4ac2eac..c60c93370a6 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileBio.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileBio.tsx @@ -1,8 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { Name } from '@audius/common/models' - -import {} from '@audius/common' import { ResizeObserver } from '@juggle/resize-observer' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/requires-update/RequiresUpdate.tsx b/packages/web/src/pages/requires-update/RequiresUpdate.tsx index 5c1a98687fb..5b5ec3f4407 100644 --- a/packages/web/src/pages/requires-update/RequiresUpdate.tsx +++ b/packages/web/src/pages/requires-update/RequiresUpdate.tsx @@ -1,5 +1,4 @@ import { Theme } from '@audius/common/models' -import {} from '@audius/common' import { Button, ButtonType, ButtonSize } from '@audius/stems' import tileBackground from 'assets/img/notFoundTiledBackround.png' diff --git a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/types.ts b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/types.ts index 6793b2dd510..f819f99d75a 100644 --- a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/types.ts +++ b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/types.ts @@ -1,5 +1,4 @@ import { DeveloperApp } from '@audius/common/api' -import {} from '@audius/common' export enum CreateAppsPages { YOUR_APPS = 'your_apps', diff --git a/packages/web/src/pages/settings-page/components/mobile/AccountSettingsPage.tsx b/packages/web/src/pages/settings-page/components/mobile/AccountSettingsPage.tsx index 5f43088168e..b5b0078cc6a 100644 --- a/packages/web/src/pages/settings-page/components/mobile/AccountSettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/AccountSettingsPage.tsx @@ -1,8 +1,6 @@ import { useState, useContext, useCallback } from 'react' import { Name, SquareSizes } from '@audius/common/models' - -import {} from '@audius/common' import { Modal, Button, ButtonType, IconMail, IconSignOut } from '@audius/stems' import cn from 'classnames' import { debounce } from 'lodash' diff --git a/packages/web/src/pages/sign-on/components/desktop/FollowPage.tsx b/packages/web/src/pages/sign-on/components/desktop/FollowPage.tsx index f1d4999561f..407c6583cae 100644 --- a/packages/web/src/pages/sign-on/components/desktop/FollowPage.tsx +++ b/packages/web/src/pages/sign-on/components/desktop/FollowPage.tsx @@ -1,8 +1,6 @@ import { useState, useCallback, useEffect } from 'react' import { ID, User } from '@audius/common/models' - -import {} from '@audius/common' import { Button, ButtonType, IconArrow, Scrollbar } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-on/components/mobile/FollowPage.tsx b/packages/web/src/pages/sign-on/components/mobile/FollowPage.tsx index fb7f133443b..e21d96a110e 100644 --- a/packages/web/src/pages/sign-on/components/mobile/FollowPage.tsx +++ b/packages/web/src/pages/sign-on/components/mobile/FollowPage.tsx @@ -1,8 +1,6 @@ import { useState, useEffect, useCallback } from 'react' import { ID, User } from '@audius/common/models' - -import {} from '@audius/common' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-up-page/hooks/useSocialMediaLoader.ts b/packages/web/src/pages/sign-up-page/hooks/useSocialMediaLoader.ts index ea5be738bca..618181e21f2 100644 --- a/packages/web/src/pages/sign-up-page/hooks/useSocialMediaLoader.ts +++ b/packages/web/src/pages/sign-up-page/hooks/useSocialMediaLoader.ts @@ -1,8 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { Name } from '@audius/common/models' - -import {} from '@audius/common' import { useDispatch } from 'react-redux' import { AnyAction } from 'redux' diff --git a/packages/web/src/pages/track-page/components/desktop/Remixes.tsx b/packages/web/src/pages/track-page/components/desktop/Remixes.tsx index ab41cfe8150..2eb66bf98f7 100644 --- a/packages/web/src/pages/track-page/components/desktop/Remixes.tsx +++ b/packages/web/src/pages/track-page/components/desktop/Remixes.tsx @@ -1,5 +1,4 @@ import { ID } from '@audius/common/models' -import {} from '@audius/common' import cn from 'classnames' import IconRemix from 'assets/img/iconRemix.svg' diff --git a/packages/web/src/pages/track-page/components/mobile/Remixes.tsx b/packages/web/src/pages/track-page/components/mobile/Remixes.tsx index dfd6d4ea1c9..6552acb504c 100644 --- a/packages/web/src/pages/track-page/components/mobile/Remixes.tsx +++ b/packages/web/src/pages/track-page/components/mobile/Remixes.tsx @@ -1,5 +1,4 @@ import { ID } from '@audius/common/models' -import {} from '@audius/common' import cn from 'classnames' import IconRemix from 'assets/img/iconRemix.svg' diff --git a/packages/web/src/pages/track-page/utils.ts b/packages/web/src/pages/track-page/utils.ts index 62dbb4aeee3..a5c05f33d83 100644 --- a/packages/web/src/pages/track-page/utils.ts +++ b/packages/web/src/pages/track-page/utils.ts @@ -1,5 +1,4 @@ import { Track } from '@audius/common/models' -import {} from '@audius/common' // return the original string if it exists, or '' export const emptyStringGuard = (str: string | null | undefined) => str ?? '' diff --git a/packages/web/src/pages/trending-page/types.ts b/packages/web/src/pages/trending-page/types.ts index 9f17697e784..278d9510b50 100644 --- a/packages/web/src/pages/trending-page/types.ts +++ b/packages/web/src/pages/trending-page/types.ts @@ -1,5 +1,4 @@ import { TimeRange, ID, UID, Lineup, Track, User } from '@audius/common/models' -import {} from '@audius/common' type ExtraTrendingLineupProps = {} diff --git a/packages/web/src/pages/upload-page/fields/RemixSettingsField/TrackInfo.tsx b/packages/web/src/pages/upload-page/fields/RemixSettingsField/TrackInfo.tsx index eefdb9e9e37..20e591a38ca 100644 --- a/packages/web/src/pages/upload-page/fields/RemixSettingsField/TrackInfo.tsx +++ b/packages/web/src/pages/upload-page/fields/RemixSettingsField/TrackInfo.tsx @@ -1,6 +1,5 @@ -import { SquareSizes, ID } from '@audius/common/models' -import {} from '@audius/common' import { useGetTrackById } from '@audius/common/api' +import { SquareSizes, ID } from '@audius/common/models' import { SelectedValue } from 'components/data-entry/ContextualMenu' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/pages/upload-page/fields/SourceFilesView.tsx b/packages/web/src/pages/upload-page/fields/SourceFilesView.tsx index 76929ae91cf..5b96dcd6d93 100644 --- a/packages/web/src/pages/upload-page/fields/SourceFilesView.tsx +++ b/packages/web/src/pages/upload-page/fields/SourceFilesView.tsx @@ -5,8 +5,6 @@ import { stemCategoryFriendlyNames, StemUpload } from '@audius/common/models' - -import {} from '@audius/common' import { IconRemove, IconButton } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/upload-page/store/utils/stems.ts b/packages/web/src/pages/upload-page/store/utils/stems.ts index d3bc8f9ca84..43cc5dd4b54 100644 --- a/packages/web/src/pages/upload-page/store/utils/stems.ts +++ b/packages/web/src/pages/upload-page/store/utils/stems.ts @@ -5,7 +5,6 @@ import { Track, StemTrack } from '@audius/common/models' -import {} from '@audius/common' export const updateAndFlattenStems = ( stems: StemUpload[][], diff --git a/packages/web/src/pages/visualizer/VisualizerProvider.tsx b/packages/web/src/pages/visualizer/VisualizerProvider.tsx index dc9cfe8cc05..a2ffefa634c 100644 --- a/packages/web/src/pages/visualizer/VisualizerProvider.tsx +++ b/packages/web/src/pages/visualizer/VisualizerProvider.tsx @@ -1,5 +1,5 @@ import { Name, SquareSizes, Track } from '@audius/common/models' - import { useEffect, useState, useCallback } from 'react' +import { useEffect, useState, useCallback } from 'react' import { push as pushRoute } from 'connected-react-router' import { AppState } from 'store/types' import { Dispatch } from 'redux' @@ -21,9 +21,6 @@ import { import { shouldShowDark } from 'utils/theme/theme' import { profilePage } from 'utils/route' import { make, TrackEvent } from 'common/store/analytics/actions' -import { } from '@audius/common' -import { } from '@audius/common' -import { } from '@audius/common' import DynamicImage from 'components/dynamic-image/DynamicImage' import PlayingTrackInfo from 'components/play-bar/desktop/components/PlayingTrackInfo' import { webglSupported } from './utils' diff --git a/packages/web/src/public-site/pages/download-page/DownloadPage.tsx b/packages/web/src/public-site/pages/download-page/DownloadPage.tsx index b07cc45e6c5..e138b23a5a8 100644 --- a/packages/web/src/public-site/pages/download-page/DownloadPage.tsx +++ b/packages/web/src/public-site/pages/download-page/DownloadPage.tsx @@ -1,8 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { OS, MobileOS } from '@audius/common/models' - -import {} from '@audius/common' import { IconDownload } from '@audius/stems' import cn from 'classnames' import queryString from 'query-string' diff --git a/packages/web/src/services/download-app/DownloadApp.test.ts b/packages/web/src/services/download-app/DownloadApp.test.ts index f7804507933..5faa4aca6ed 100644 --- a/packages/web/src/services/download-app/DownloadApp.test.ts +++ b/packages/web/src/services/download-app/DownloadApp.test.ts @@ -1,5 +1,4 @@ import { OS } from '@audius/common/models' -import {} from '@audius/common' import fetchMock from 'fetch-mock' import { describe, it, beforeAll, expect } from 'vitest' diff --git a/packages/web/src/services/download-app/DownloadApp.ts b/packages/web/src/services/download-app/DownloadApp.ts index fe5686a4f34..f337580dcc4 100644 --- a/packages/web/src/services/download-app/DownloadApp.ts +++ b/packages/web/src/services/download-app/DownloadApp.ts @@ -1,5 +1,4 @@ import { OS } from '@audius/common/models' -import {} from '@audius/common' import { env } from 'services/env' diff --git a/packages/web/src/services/webVitals.ts b/packages/web/src/services/webVitals.ts index 3e63d968912..ef48496e77b 100644 --- a/packages/web/src/services/webVitals.ts +++ b/packages/web/src/services/webVitals.ts @@ -1,5 +1,4 @@ import { Name } from '@audius/common/models' -import {} from '@audius/common' import { Location } from 'history' import { getCLS, getFID, getLCP, getFCP, getTTFB } from 'web-vitals' diff --git a/packages/web/src/ssr/+onRenderHtml.tsx b/packages/web/src/ssr/+onRenderHtml.tsx index 81f40e903e0..b0c494f0b12 100644 --- a/packages/web/src/ssr/+onRenderHtml.tsx +++ b/packages/web/src/ssr/+onRenderHtml.tsx @@ -1,5 +1,4 @@ import { SsrPageProps } from '@audius/common/models' -import {} from '@audius/common' import { createMemoryHistory } from 'history' import ReactDOMServer from 'react-dom/server' import { Helmet } from 'react-helmet' diff --git a/packages/web/src/store/application/ui/setAsArtistPickConfirmation/actions.ts b/packages/web/src/store/application/ui/setAsArtistPickConfirmation/actions.ts index f86c315df74..3ed0253dffc 100644 --- a/packages/web/src/store/application/ui/setAsArtistPickConfirmation/actions.ts +++ b/packages/web/src/store/application/ui/setAsArtistPickConfirmation/actions.ts @@ -1,5 +1,4 @@ import { ID } from '@audius/common/models' -import {} from '@audius/common' // actions export const SHOW_SET_AS_ARTIST_PICK_CONFIRMATION = 'SET_AS_ARTIST_PICK/SHOW' diff --git a/packages/web/src/store/application/ui/setAsArtistPickConfirmation/types.ts b/packages/web/src/store/application/ui/setAsArtistPickConfirmation/types.ts index 60edcc8e626..403f7b564b9 100644 --- a/packages/web/src/store/application/ui/setAsArtistPickConfirmation/types.ts +++ b/packages/web/src/store/application/ui/setAsArtistPickConfirmation/types.ts @@ -1,5 +1,4 @@ import { ID } from '@audius/common/models' -import {} from '@audius/common' export enum PinTrackAction { ADD = 'ADD', diff --git a/packages/web/src/store/application/ui/userListModal/slice.ts b/packages/web/src/store/application/ui/userListModal/slice.ts index 33c53ad74ad..addc936869a 100644 --- a/packages/web/src/store/application/ui/userListModal/slice.ts +++ b/packages/web/src/store/application/ui/userListModal/slice.ts @@ -1,5 +1,4 @@ import { ID } from '@audius/common/models' -import {} from '@audius/common' import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { UserListModalState, UserListType, UserListEntityType } from './types' diff --git a/packages/web/src/store/dragndrop/slice.ts b/packages/web/src/store/dragndrop/slice.ts index 58f7a06f8bb..9e13387f5ed 100644 --- a/packages/web/src/store/dragndrop/slice.ts +++ b/packages/web/src/store/dragndrop/slice.ts @@ -1,5 +1,4 @@ import { ID, PlaylistLibraryKind } from '@audius/common/models' -import {} from '@audius/common' import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { AppState } from 'store/types' diff --git a/packages/web/src/store/errors/actions.ts b/packages/web/src/store/errors/actions.ts index f5597cd264d..d0abee55bb5 100644 --- a/packages/web/src/store/errors/actions.ts +++ b/packages/web/src/store/errors/actions.ts @@ -3,7 +3,6 @@ import { AdditionalErrorReportInfo, ReportToSentryArgs } from '@audius/common/models' -import {} from '@audius/common' export const HANDLE_ERROR = 'ERROR/HANDLE_ERROR' export const OPEN_ERROR_PAGE = 'ERROR/OPEN_ERROR_PAGE' diff --git a/packages/web/src/store/errors/reducers.ts b/packages/web/src/store/errors/reducers.ts index 100554edb6b..b90fad58c1b 100644 --- a/packages/web/src/store/errors/reducers.ts +++ b/packages/web/src/store/errors/reducers.ts @@ -1,5 +1,4 @@ import { SsrPageProps } from '@audius/common/models' -import {} from '@audius/common' import { createReducer } from 'typesafe-actions' import { diff --git a/packages/web/src/store/token-dashboard/disconnectWallet.ts b/packages/web/src/store/token-dashboard/disconnectWallet.ts index 3e193d7d7d0..5596b9ef008 100644 --- a/packages/web/src/store/token-dashboard/disconnectWallet.ts +++ b/packages/web/src/store/token-dashboard/disconnectWallet.ts @@ -1,5 +1,4 @@ import { Chain } from '@audius/common/models' -import {} from '@audius/common' import { call } from 'typed-redux-saga' import { diff --git a/packages/web/src/store/token-dashboard/getWalletAddress.ts b/packages/web/src/store/token-dashboard/getWalletAddress.ts index 616f41c70c1..aaa06d71dde 100644 --- a/packages/web/src/store/token-dashboard/getWalletAddress.ts +++ b/packages/web/src/store/token-dashboard/getWalletAddress.ts @@ -1,5 +1,4 @@ import { Chain } from '@audius/common/models' -import {} from '@audius/common' import { call } from 'typed-redux-saga' import { WalletConnection } from './types' diff --git a/packages/web/src/utils/appLinks.ts b/packages/web/src/utils/appLinks.ts index 59fbdb4c9c3..a94ea8edc4e 100644 --- a/packages/web/src/utils/appLinks.ts +++ b/packages/web/src/utils/appLinks.ts @@ -1,5 +1,4 @@ import { MobileOS } from '@audius/common/models' -import {} from '@audius/common' import { getMobileOS } from './clientUtil' import { IOS_APP_STORE_LINK, IOS_WEBSITE_STORE_LINK } from './route' diff --git a/packages/web/src/utils/clientUtil.ts b/packages/web/src/utils/clientUtil.ts index c299a709c44..7fe301126f7 100644 --- a/packages/web/src/utils/clientUtil.ts +++ b/packages/web/src/utils/clientUtil.ts @@ -1,5 +1,4 @@ import { Client, OS, MobileOS } from '@audius/common/models' -import {} from '@audius/common' declare global { interface Window { diff --git a/packages/web/src/utils/errorSagas.ts b/packages/web/src/utils/errorSagas.ts index bb8648a6daa..199cf281a24 100644 --- a/packages/web/src/utils/errorSagas.ts +++ b/packages/web/src/utils/errorSagas.ts @@ -1,5 +1,4 @@ import { AdditionalErrorReportInfo } from '@audius/common/models' -import {} from '@audius/common' import { takeEvery, put } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/utils/theme/theme.ts b/packages/web/src/utils/theme/theme.ts index 64dd979f238..51b9b1df6f0 100644 --- a/packages/web/src/utils/theme/theme.ts +++ b/packages/web/src/utils/theme/theme.ts @@ -1,5 +1,4 @@ import { Theme } from '@audius/common/models' -import {} from '@audius/common' import DarkTheme from './dark' import DefaultTheme from './default' From 49494ac42520091c39de3e9f8ffc897190dc081a Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 15:25:01 -0800 Subject: [PATCH 28/64] Update mobile models --- packages/convert-exports.js | 2 +- packages/mobile/babel.config.js | 3 +- packages/mobile/src/app/ThemeProvider.tsx | 8 ++---- .../add-funds-drawer/AddFundsDrawer.tsx | 5 ++-- .../AddToCollectionDrawer.tsx | 5 ++-- .../audio-balance-pill/AUDIOBalancePill.tsx | 2 +- .../AudioBreakdownDrawer.tsx | 5 ++-- .../audio-breakdown-drawer/Wallet.tsx | 10 ++----- .../src/components/audio-rewards/TierText.tsx | 2 +- .../src/components/audio/AudioPlayer.tsx | 7 ++--- .../src/components/audio/GoogleCast.tsx | 4 +-- .../BottomTabBarButton.tsx | 2 +- packages/mobile/src/components/card/Card.tsx | 2 +- .../src/components/card/CollectionDogEar.tsx | 5 ++-- .../AudioMatchingChallengeDrawerContent.tsx | 5 ++-- .../ChallengeRewardsDrawerContent.tsx | 2 +- .../CooldownSummaryTable.tsx | 2 +- .../CollectibleMedia.tsx | 4 +-- .../collection-list/AddCollectionCard.tsx | 5 ++-- .../collection-list/CollectionCard.tsx | 5 ++-- .../collection-list/CollectionList.tsx | 4 +-- .../mobile/src/components/core/ChainLogo.tsx | 2 +- .../mobile/src/components/core/DogEar.tsx | 2 +- .../src/components/core/IconAudioBadge.tsx | 2 +- .../src/components/core/ProfilePicture.tsx | 4 ++- .../src/components/core/UserCoverPhoto.tsx | 2 +- .../src/components/core/UserDisplayName.tsx | 3 +- .../DeactivateAccountConfirmationDrawer.tsx | 4 +-- .../details-tile/DetailsProgressInfo.tsx | 2 +- .../components/details-tile/DetailsTile.tsx | 5 ++-- .../details-tile/DetailsTileActionButtons.tsx | 3 +- .../details-tile/DetailsTileAiAttribution.tsx | 2 +- .../details-tile/DetailsTileHasAccess.tsx | 8 +++--- .../details-tile/DetailsTileNoAccess.tsx | 20 +++++++------ .../details-tile/DetailsTilePremiumAccess.tsx | 4 +-- .../src/components/details-tile/types.ts | 8 +++++- .../UnfavoriteDownloadedCollectionDrawer.tsx | 3 +- .../feed-filter-drawer/FeedFilterDrawer.tsx | 3 +- .../components/feed-tip-tile/FeedTipTile.tsx | 2 +- .../feed-tip-tile/ReceiverDetails.tsx | 2 +- .../feed-tip-tile/SendTipButton.tsx | 2 +- .../feed-tip-tile/SenderDetails.tsx | 2 +- .../src/components/image/CollectionImage.tsx | 11 ++++---- .../src/components/image/CoverPhoto.tsx | 6 ++-- .../src/components/image/TrackImage.tsx | 10 ++----- .../mobile/src/components/image/UserImage.tsx | 3 +- .../components/lineup-tile/CollectionTile.tsx | 23 +++++++-------- .../lineup-tile/CollectionTileTrackList.tsx | 3 +- .../lineup-tile/LineupTileAccessStatus.tsx | 5 ++-- .../lineup-tile/LineupTileActionButtons.tsx | 9 ++---- .../components/lineup-tile/LineupTileArt.tsx | 2 +- .../lineup-tile/LineupTileCoSign.tsx | 2 +- .../lineup-tile/LineupTileMetadata.tsx | 2 +- .../LineupTilePremiumContentTypeTag.tsx | 8 +++--- .../lineup-tile/LineupTileStats.tsx | 11 ++------ .../src/components/lineup-tile/TrackTile.tsx | 21 ++++++++------ .../src/components/lineup-tile/types.ts | 13 ++++----- .../mobile/src/components/lineup/Lineup.tsx | 4 +-- .../mobile/src/components/lineup/types.ts | 11 ++------ .../now-playing-drawer/ActionsBar.tsx | 15 ++++++---- .../components/now-playing-drawer/Artwork.tsx | 11 +++----- .../components/now-playing-drawer/PlayBar.tsx | 6 ++-- .../now-playing-drawer/TrackInfo.tsx | 8 ++---- .../CollectionDownloadStatusIndicator.tsx | 2 +- .../CollectionOverflowMenuDrawer.tsx | 11 +++++--- .../ProfileOverflowMenuDrawer.tsx | 6 ++-- .../TrackOverflowMenuDrawer.tsx | 13 +++++---- .../payment-method/CardSelectionButton.tsx | 2 +- .../payment-method/PaymentMethod.tsx | 6 ++-- .../PayExtraFormSection.tsx | 1 - .../PremiumTrackPurchaseDrawer.tsx | 10 ++++--- .../PurchaseSuccess.tsx | 2 +- .../hooks/usePurchaseSummaryValues.ts | 3 +- .../ProfileActionsDrawer.tsx | 2 +- .../components/profile-list/ProfileCard.tsx | 4 +-- .../components/profile-list/ProfileList.tsx | 2 +- .../PurchaseVendorDrawer.tsx | 3 +- .../rate-cta-drawer/RateCtaDrawer.tsx | 2 +- .../components/share-drawer/ShareDrawer.tsx | 3 +- .../share-drawer/ShareToStorySticker.tsx | 4 +-- .../share-drawer/useShareToStory.tsx | 12 +++----- .../PickArtistsForMeButton.tsx | 2 +- .../SuggestedArtistsList.tsx | 3 +- .../SuggestedCollectionTracks.tsx | 3 +- .../components/SuggestedTracks.tsx | 5 ++-- .../track-details-tile/TrackDetailsTile.tsx | 14 ++++++---- .../components/track-list/TrackArtwork.tsx | 4 +-- .../src/components/track-list/TrackList.tsx | 2 +- .../components/track-list/TrackListItem.tsx | 2 +- .../mobile/src/components/track-list/types.ts | 3 +- .../TrendingRewardsDrawer.tsx | 2 +- .../usdc-balance-pill/USDCBalancePill.tsx | 4 +-- .../usdc-balance-row/USDCBalanceRow.tsx | 2 +- .../USDCManualTransfer.tsx | 2 +- .../src/components/user-badges/UserBadges.tsx | 2 +- .../src/components/user/FollowButton.tsx | 2 +- .../src/components/user/FollowsYouChip.tsx | 2 +- .../src/components/user/ProfilePicture.tsx | 4 +-- .../foundations/color/Color.stories.tsx | 3 +- .../mobile/src/hooks/useContentNodeImage.ts | 3 +- packages/mobile/src/hooks/useImageSize.ts | 7 ++--- .../hooks/useSetTrackAvailabilityFields.ts | 3 +- packages/mobile/src/models/Collection.ts | 3 +- packages/mobile/src/models/Track.ts | 2 +- packages/mobile/src/models/User.ts | 2 +- .../left-nav-drawer/AccountDetails.tsx | 2 +- .../left-nav-drawer/LeftNavDrawer.tsx | 6 ++-- .../left-nav-drawer/VanityMetrics.tsx | 2 +- .../src/screens/app-screen/AppTabScreen.tsx | 12 ++++---- .../src/screens/audio-screen/AudioScreen.tsx | 3 +- .../screens/audio-screen/ChallengeRewards.tsx | 12 +++----- .../mobile/src/screens/audio-screen/Panel.tsx | 6 ++-- .../screens/audio-screen/TrendingRewards.tsx | 7 ++--- .../ChangePasswordScreen.tsx | 2 +- .../ConfirmCredentials.tsx | 7 ++--- .../screens/chat-screen/ChatListScreen.tsx | 3 +- .../chat-screen/ChatMessageListItem.tsx | 2 +- .../chat-screen/ChatMessagePlaylist.tsx | 7 ++--- .../screens/chat-screen/ChatMessageTrack.tsx | 7 ++--- .../src/screens/chat-screen/ChatScreen.tsx | 4 +-- .../chat-screen/ChatUserListScreen.tsx | 6 ++-- .../src/screens/chat-screen/ReactionPopup.tsx | 7 ++--- .../collection-screen/CollectionHeader.tsx | 6 ++-- .../collection-screen/CollectionScreen.tsx | 22 ++++++++------- .../CollectionScreenDetailsTile.tsx | 7 ++--- .../useFetchCollectionLineup.ts | 4 +-- .../EditPlaylistModalScreen.tsx | 2 +- .../TrackListFieldArray.tsx | 2 +- .../edit-profile-screen/EditProfileScreen.tsx | 9 ++---- .../EditTrackModalScreen.tsx | 7 ++--- .../edit-track-screen/EditTrackScreen.tsx | 7 ++--- .../CollectibleGatedAvailability.tsx | 9 +++--- .../components/RemixTrackPill.tsx | 4 +-- .../components/SpecialAccessAvailability.tsx | 10 +++---- .../edit-track-screen/components/types.ts | 3 +- .../AccessAndSaleField/AccessAndSaleField.tsx | 9 +++--- .../PremiumRadioField/PremiumRadioField.tsx | 3 +- .../fields/ReleaseDateFieldLegacy.tsx | 2 +- .../edit-track-screen/fields/TagField.tsx | 2 +- .../screens/AccessAndSaleScreen.tsx | 16 +++++------ .../screens/NFTCollectionsScreen.tsx | 10 +++---- .../screens/ReleaseDateScreen.tsx | 8 ++---- .../screens/RemixSettingsScreen.tsx | 13 +++++---- .../explore-screen/smartCollections.ts | 2 +- .../explore-screen/tabs/ArtistsTab.tsx | 7 ++--- .../tabs/ForYouTab/LetThemDJScreen.tsx | 2 +- .../tabs/ForYouTab/TopAlbumsScreen.tsx | 2 +- .../explore-screen/tabs/PlaylistsTab.tsx | 7 ++--- .../screens/favorites-screen/AlbumsTab.tsx | 2 +- .../screens/favorites-screen/PlaylistsTab.tsx | 6 ++-- .../screens/favorites-screen/TracksTab.tsx | 6 ++-- .../src/screens/favorites-screen/selectors.ts | 9 ++---- .../useCollectionsScreenData.ts | 2 +- .../favorites-screen/useFavoritesLineup.ts | 2 +- .../screens/feed-screen/FeedFilterButton.tsx | 3 +- .../src/screens/feed-screen/FeedScreen.tsx | 2 +- .../MoodCollectionScreen.tsx | 2 +- .../Notification/EntityLink.tsx | 2 +- .../Notification/ProfilePicture.tsx | 2 +- .../Notification/ProfilePictureList.tsx | 2 +- .../Notification/UserNameLink.tsx | 2 +- .../notifications-screen/NotificationList.tsx | 7 ++--- .../ChallengeRewardNotification.tsx | 6 ++-- .../Notifications/MilestoneNotification.tsx | 2 +- ...porterAndSupportingNotificationContent.tsx | 2 +- .../Notifications/TastemakerNotification.tsx | 3 +- .../TrendingPlaylistNotification.tsx | 3 +- .../TrendingTrackNotification.tsx | 3 +- .../TrendingUndergroundNotification.tsx | 3 +- .../USDCPurchaseBuyerNotification.tsx | 3 +- .../USDCPurchaseSellerNotification.tsx | 2 +- .../Notifications/useGoToProfile.ts | 3 +- .../Notifications/useSocialActionHandler.ts | 2 +- .../screens/pay-and-earn-screen/USDCCard.tsx | 2 +- .../ArtistRecommendations/ArtistLink.tsx | 2 +- .../ArtistRecommendations.tsx | 5 ++-- .../profile-screen/CollectiblesCard.tsx | 2 +- .../screens/profile-screen/MessageButton.tsx | 5 ++-- .../profile-screen/MessageLockedButton.tsx | 2 +- .../ProfileHeader/SupportingList.tsx | 2 +- .../ProfileHeader/SupportingTile.tsx | 2 +- .../screens/profile-screen/ProfileInfo.tsx | 2 +- .../screens/profile-screen/ProfileScreen.tsx | 3 +- .../profile-screen/ProfileTabs/AlbumsTab.tsx | 7 ++--- .../ProfileTabs/CollectiblesTab.tsx | 2 +- .../ProfileTabs/PlaylistsTab.tsx | 8 ++---- .../profile-screen/ProfileTabs/RepostsTab.tsx | 4 +-- .../profile-screen/SubscribeButton.tsx | 2 +- .../src/screens/profile-screen/constants.ts | 2 +- .../src/screens/profile-screen/selectors.ts | 6 ++-- .../ResetPasswordScreen.tsx | 3 +- .../src/screens/root-screen/RootScreen.tsx | 4 +-- .../src/screens/root-screen/StatusBar.tsx | 3 +- .../search-results-screen/tabs/AlbumsTab.tsx | 3 +- .../tabs/PlaylistsTab.tsx | 3 +- .../tabs/ProfilesTab.tsx | 3 +- .../tabs/SearchResultsTab.tsx | 3 +- .../src/screens/search-screen/SearchBar.tsx | 2 +- .../SearchResults/SearchItem.tsx | 8 ++++-- .../settings-screen/AccountSettingsScreen.tsx | 4 +-- .../AccountVerificationScreen.tsx | 3 +- .../settings-screen/AppearanceSettingsRow.tsx | 8 ++---- .../ListeningHistoryScreen.tsx | 5 ++-- .../components/SignUpFlowInstagramAuth.tsx | 3 +- .../components/SignUpFlowTikTokAuth.tsx | 2 +- .../SelectArtistScreen/FollowArtistCard.tsx | 2 +- .../SelectArtistScreen/TopArtistsCardList.tsx | 1 - .../selectArtistPreviewContext.tsx | 2 +- .../mobile/src/screens/signon/ProfileAuto.tsx | 2 +- .../SmartCollectionScreen.tsx | 2 +- .../tip-artist-screen/AvailableAudio.tsx | 2 +- .../tip-artist-screen/BecomeTopSupporter.tsx | 2 +- .../tip-artist-screen/SendTipScreen.tsx | 2 +- .../tip-artist-screen/TipSentScreen.tsx | 2 +- .../src/screens/track-screen/DownloadRow.tsx | 11 +++----- .../screens/track-screen/DownloadSection.tsx | 6 ++-- .../track-screen/TrackScreenDetailsTile.tsx | 28 ++++++++++++------- .../TrackScreenDownloadButtons.tsx | 5 ++-- .../track-screen/TrackScreenMainContent.tsx | 10 +++---- .../screens/track-screen/TrackScreenRemix.tsx | 9 ++---- .../track-screen/TrackScreenRemixes.tsx | 2 +- .../trending-screen/TrendingLineup.tsx | 3 +- .../trending-screen/TrendingScreen.tsx | 3 +- .../screens/SelectTrackScreen.tsx | 2 +- .../user-list-screen/SupporterInfo.tsx | 2 +- .../user-list-screen/SupportingInfo.tsx | 2 +- .../src/screens/user-list-screen/Tip.tsx | 2 +- .../src/screens/user-list-screen/UserList.tsx | 3 +- .../screens/user-list-screen/UserListItem.tsx | 5 ++-- .../components/LinkedWallet.tsx | 2 +- .../components/LinkedWallets.tsx | 3 +- .../components/SolanaPhoneOption.tsx | 7 ++--- .../src/services/monitoringCallbacks.ts | 2 +- .../offline-downloader/offline-storage.ts | 12 ++++---- .../remote-config/remote-config-instance.ts | 3 +- packages/mobile/src/store/account/sagas.ts | 5 ++-- packages/mobile/src/store/drawers/slice.ts | 3 +- .../offline-downloads/sagas/getStaleTracks.ts | 2 +- .../workers/downloadCollectionWorker.ts | 13 ++++----- .../workers/downloadTrackWorker.ts | 16 +++++------ .../workers/playCounterWorker.ts | 2 +- .../workers/staleTrackWorker.ts | 2 +- .../workers/syncCollectionWorker.ts | 2 +- .../sagas/rehydrateOfflineDataSaga.ts | 7 +++-- .../sagas/requestDownloadCollectionSaga.ts | 2 +- .../sagas/utils/isCollectionDownloadable.ts | 2 +- .../sagas/utils/isTrackDownloadable.ts | 2 +- .../sagas/watchSaveCollectionSaga.ts | 3 +- .../src/store/offline-downloads/selectors.ts | 2 +- .../src/store/offline-downloads/slice.ts | 2 +- .../src/store/offline-downloads/utils.ts | 4 +-- .../mobile/src/store/purchase-vendor/slice.ts | 2 +- packages/mobile/src/store/rate-cta/sagas.ts | 2 +- packages/mobile/src/store/sign-out/sagas.ts | 3 +- packages/mobile/src/store/store.ts | 2 +- .../sagas/connectNewWalletSaga.ts | 6 ++-- .../wallet-connect/sagas/signMessageSaga.ts | 2 +- packages/mobile/src/styles/makeAnimations.ts | 2 +- packages/mobile/src/styles/makeStyles.ts | 2 +- packages/mobile/src/types/analytics.ts | 10 +++---- packages/mobile/src/utils/challenges.tsx | 8 ++++-- packages/mobile/src/utils/convertRGBtoHex.ts | 2 +- packages/mobile/src/utils/dominantColors.ts | 2 +- packages/mobile/src/utils/reportToSentry.ts | 2 +- packages/mobile/src/utils/routes.tsx | 2 +- 265 files changed, 610 insertions(+), 638 deletions(-) diff --git a/packages/convert-exports.js b/packages/convert-exports.js index 19ec029543f..b854877a767 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -2,7 +2,7 @@ const glob = require('glob') const fs = require('fs') var getDirectories = function (callback) { - glob('./web/src/**/*', callback) + glob('./mobile/src/**/*', callback) } const DIRECTORY = 'models' diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js index fc9c4cf448e..15542bf57a3 100644 --- a/packages/mobile/babel.config.js +++ b/packages/mobile/babel.config.js @@ -12,7 +12,8 @@ module.exports = (api) => { '@audius/common/messages': '../common/src/messages', '@audius/common/hooks': '../common/src/hooks', '@audius/common/context': '../common/src/context', - '@audius/common/api': '../common/src/api' + '@audius/common/api': '../common/src/api', + '@audius/common/models': '../common/src/models' } } ] diff --git a/packages/mobile/src/app/ThemeProvider.tsx b/packages/mobile/src/app/ThemeProvider.tsx index 4bb87b4d17b..0fda0ed71af 100644 --- a/packages/mobile/src/app/ThemeProvider.tsx +++ b/packages/mobile/src/app/ThemeProvider.tsx @@ -2,12 +2,8 @@ import type { ReactNode } from 'react' import { useEffect } from 'react' import type { Nullable } from '@audius/common' -import { - SystemAppearance, - Theme, - themeActions, - themeSelectors -} from '@audius/common' +import { themeActions, themeSelectors } from '@audius/common' +import { Theme, SystemAppearance } from '@audius/common/models' import AsyncStorage from '@react-native-async-storage/async-storage' import { useAppState } from '@react-native-community/hooks' import { useDarkMode } from 'react-native-dynamic' diff --git a/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx b/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx index 84e5b43a023..6e3049e9f08 100644 --- a/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx +++ b/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx @@ -1,13 +1,12 @@ import { useCallback, useState } from 'react' import { - PurchaseVendor, useAddFundsModal, useUSDCManualTransferModal, - buyUSDCActions, - PurchaseMethod + buyUSDCActions } from '@audius/common' import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' +import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx b/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx index aa89a6518c7..f887aefb6ca 100644 --- a/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx +++ b/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx @@ -1,15 +1,14 @@ import { useCallback, useMemo } from 'react' -import type { Collection } from '@audius/common' import { duplicateAddConfirmationModalUIActions, - SquareSizes, - CreatePlaylistSource, accountSelectors, cacheCollectionsActions, addToCollectionUISelectors, collectionPageSelectors } from '@audius/common' +import type { Collection } from '@audius/common/models' +import { CreatePlaylistSource, SquareSizes } from '@audius/common/models' import { fetchAccountCollections } from 'common/store/saved-collections/actions' import { capitalize } from 'lodash' import { View } from 'react-native' diff --git a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx index 72b15c95233..902ec28e5ad 100644 --- a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx +++ b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx @@ -1,9 +1,9 @@ -import type { User } from '@audius/common' import { accountSelectors, formatWei, isNullOrUndefined } from '@audius/common' import { useSelectTierInfo, useTotalBalanceWithFallback } from '@audius/common/hooks' +import type { User } from '@audius/common/models' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx b/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx index a0430f8e6f0..edd4fb54bf2 100644 --- a/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx +++ b/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx @@ -1,10 +1,11 @@ -import type { BNWei, AssociatedWallet } from '@audius/common' +import type { AssociatedWallet } from '@audius/common' import { - Chain, formatWei, tokenDashboardPageSelectors, walletSelectors } from '@audius/common' +import type { BNWei } from '@audius/common/models' +import { Chain } from '@audius/common/models' import BN from 'bn.js' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/audio-breakdown-drawer/Wallet.tsx b/packages/mobile/src/components/audio-breakdown-drawer/Wallet.tsx index 99ebadedafa..f26bd86f35b 100644 --- a/packages/mobile/src/components/audio-breakdown-drawer/Wallet.tsx +++ b/packages/mobile/src/components/audio-breakdown-drawer/Wallet.tsx @@ -1,12 +1,8 @@ import { useCallback } from 'react' -import type { BNWei } from '@audius/common' -import { - formatWei, - shortenEthAddress, - shortenSPLAddress, - Chain -} from '@audius/common' +import { formatWei, shortenEthAddress, shortenSPLAddress } from '@audius/common' +import type { BNWei } from '@audius/common/models' +import { Chain } from '@audius/common/models' import Clipboard from '@react-native-clipboard/clipboard' import { Animated, TouchableWithoutFeedback, View } from 'react-native' diff --git a/packages/mobile/src/components/audio-rewards/TierText.tsx b/packages/mobile/src/components/audio-rewards/TierText.tsx index 774ca9bfa60..987c48de360 100644 --- a/packages/mobile/src/components/audio-rewards/TierText.tsx +++ b/packages/mobile/src/components/audio-rewards/TierText.tsx @@ -1,4 +1,4 @@ -import type { BadgeTier } from '@audius/common' +import type { BadgeTier } from '@audius/common/models' import type { GradientTextProps } from 'app/components/core' import { GradientText } from 'app/components/core' diff --git a/packages/mobile/src/components/audio/AudioPlayer.tsx b/packages/mobile/src/components/audio/AudioPlayer.tsx index 8993f1c7ca9..9acd0b2ebc3 100644 --- a/packages/mobile/src/components/audio/AudioPlayer.tsx +++ b/packages/mobile/src/components/audio/AudioPlayer.tsx @@ -2,11 +2,9 @@ import { useRef, useEffect, useCallback, useState } from 'react' import type { CommonState, - ID, Nullable, QueryParams, - Queueable, - Track + Queueable } from '@audius/common' import { getQueryParams, @@ -28,12 +26,13 @@ import { encodeHashId, Genre, tracksSocialActions, - SquareSizes, shallowCompare, savedPageTracksLineupActions, getTrackPreviewDuration } from '@audius/common' import { useAppContext } from '@audius/common/context' +import { SquareSizes } from '@audius/common/models' +import type { ID, Track } from '@audius/common/models' import { isEqual } from 'lodash' import TrackPlayer, { AppKilledPlaybackBehavior, diff --git a/packages/mobile/src/components/audio/GoogleCast.tsx b/packages/mobile/src/components/audio/GoogleCast.tsx index 15daad4aa0a..fcaeb7516db 100644 --- a/packages/mobile/src/components/audio/GoogleCast.tsx +++ b/packages/mobile/src/components/audio/GoogleCast.tsx @@ -4,9 +4,9 @@ import { castActions, encodeHashId, playerSelectors, - cacheUsersSelectors, - SquareSizes + cacheUsersSelectors } from '@audius/common' +import { SquareSizes } from '@audius/common/models' import { CastState, useCastState, diff --git a/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/BottomTabBarButton.tsx b/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/BottomTabBarButton.tsx index 5b49e41df0a..bb91208a464 100644 --- a/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/BottomTabBarButton.tsx +++ b/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/BottomTabBarButton.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react' import { useEffect, useRef, useCallback } from 'react' -import type { Theme } from '@audius/common' +import type { Theme } from '@audius/common/models' import { Pressable, View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' import { usePrevious } from 'react-use' diff --git a/packages/mobile/src/components/card/Card.tsx b/packages/mobile/src/components/card/Card.tsx index ab1e278ab9c..8ee5d8ed6fa 100644 --- a/packages/mobile/src/components/card/Card.tsx +++ b/packages/mobile/src/components/card/Card.tsx @@ -1,6 +1,6 @@ import type { ComponentType, ReactNode } from 'react' -import type { User } from '@audius/common' +import type { User } from '@audius/common/models' import type { StyleProp, TextStyle, ViewStyle } from 'react-native' import { Text, View } from 'react-native' import type { LinearGradientProps } from 'react-native-linear-gradient' diff --git a/packages/mobile/src/components/card/CollectionDogEar.tsx b/packages/mobile/src/components/card/CollectionDogEar.tsx index 13604af9f2d..619462b231c 100644 --- a/packages/mobile/src/components/card/CollectionDogEar.tsx +++ b/packages/mobile/src/components/card/CollectionDogEar.tsx @@ -1,5 +1,6 @@ -import type { ID } from '@audius/common' -import { cacheCollectionsSelectors, DogEarType } from '@audius/common' +import { cacheCollectionsSelectors } from '@audius/common' +import type { ID } from '@audius/common/models' +import { DogEarType } from '@audius/common/models' import { useSelector } from 'react-redux' import { DogEar } from '../core' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx b/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx index bc643401126..ef098fe15f3 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx @@ -1,7 +1,8 @@ import React from 'react' -import type { OptimisticUserChallenge } from '@audius/common' -import { ChallengeName, ClaimStatus, formatNumberCommas } from '@audius/common' +import { ClaimStatus, formatNumberCommas } from '@audius/common' +import type { OptimisticUserChallenge } from '@audius/common/models' +import { ChallengeName } from '@audius/common/models' import { ScrollView, View } from 'react-native' import IconArrow from 'app/assets/images/iconArrow.svg' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx index 40e3243e66f..a661d22402d 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx @@ -1,7 +1,7 @@ import React from 'react' -import type { UserChallengeState } from '@audius/common' import { fillString, formatNumberCommas, ClaimStatus } from '@audius/common' +import type { UserChallengeState } from '@audius/common/models' import { View } from 'react-native' import IconCheck from 'app/assets/images/iconCheck.svg' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/CooldownSummaryTable.tsx b/packages/mobile/src/components/challenge-rewards-drawer/CooldownSummaryTable.tsx index 54cfa5eb5a8..a54d81479b1 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/CooldownSummaryTable.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/CooldownSummaryTable.tsx @@ -1,7 +1,7 @@ import React from 'react' -import type { ChallengeRewardID } from '@audius/common' import { useAudioMatchingChallengeCooldownSchedule } from '@audius/common/hooks' +import type { ChallengeRewardID } from '@audius/common/models' import { SummaryTable } from '../summary-table' diff --git a/packages/mobile/src/components/collectible-details-drawer/CollectibleMedia.tsx b/packages/mobile/src/components/collectible-details-drawer/CollectibleMedia.tsx index 3914e9f7ec7..67fa5dc0f76 100644 --- a/packages/mobile/src/components/collectible-details-drawer/CollectibleMedia.tsx +++ b/packages/mobile/src/components/collectible-details-drawer/CollectibleMedia.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import type { Collectible } from '@audius/common' -import { CollectibleMediaType } from '@audius/common' +import type { Collectible } from '@audius/common/models' +import { CollectibleMediaType } from '@audius/common/models' import type { ImageStyle } from 'react-native' import { TouchableWithoutFeedback, View } from 'react-native' diff --git a/packages/mobile/src/components/collection-list/AddCollectionCard.tsx b/packages/mobile/src/components/collection-list/AddCollectionCard.tsx index bb7f5afcb82..bcc1c702ff4 100644 --- a/packages/mobile/src/components/collection-list/AddCollectionCard.tsx +++ b/packages/mobile/src/components/collection-list/AddCollectionCard.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' -import type { ID } from '@audius/common' -import { cacheCollectionsActions, CreatePlaylistSource } from '@audius/common' +import { cacheCollectionsActions } from '@audius/common' +import type { ID } from '@audius/common/models' +import { CreatePlaylistSource } from '@audius/common/models' import { capitalize } from 'lodash' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/collection-list/CollectionCard.tsx b/packages/mobile/src/components/collection-list/CollectionCard.tsx index a8151d87dd0..efd8f2f4cde 100644 --- a/packages/mobile/src/components/collection-list/CollectionCard.tsx +++ b/packages/mobile/src/components/collection-list/CollectionCard.tsx @@ -1,11 +1,12 @@ import { createElement, useCallback, useMemo } from 'react' -import type { Collection, CommonState, ID } from '@audius/common' +import type { CommonState } from '@audius/common' import { - SquareSizes, cacheCollectionsSelectors, reachabilitySelectors } from '@audius/common' +import { SquareSizes } from '@audius/common/models' +import type { Collection, ID } from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/collection-list/CollectionList.tsx b/packages/mobile/src/components/collection-list/CollectionList.tsx index 6174ba11983..79af4c5bf20 100644 --- a/packages/mobile/src/components/collection-list/CollectionList.tsx +++ b/packages/mobile/src/components/collection-list/CollectionList.tsx @@ -1,7 +1,7 @@ import { createElement, useCallback, useMemo } from 'react' -import type { Collection, ID, UserCollection } from '@audius/common' -import { CreatePlaylistSource } from '@audius/common' +import type { Collection, UserCollection, ID } from '@audius/common/models' +import { CreatePlaylistSource } from '@audius/common/models' import type { ListRenderItem } from 'react-native' import type { CardListProps } from 'app/components/core' diff --git a/packages/mobile/src/components/core/ChainLogo.tsx b/packages/mobile/src/components/core/ChainLogo.tsx index 7de79215e86..6464a271e9c 100644 --- a/packages/mobile/src/components/core/ChainLogo.tsx +++ b/packages/mobile/src/components/core/ChainLogo.tsx @@ -1,4 +1,4 @@ -import type { Chain } from '@audius/common' +import type { Chain } from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/core/DogEar.tsx b/packages/mobile/src/components/core/DogEar.tsx index 4175ad556e2..a2994757704 100644 --- a/packages/mobile/src/components/core/DogEar.tsx +++ b/packages/mobile/src/components/core/DogEar.tsx @@ -1,4 +1,4 @@ -import { DogEarType } from '@audius/common' +import { DogEarType } from '@audius/common/models' import type { ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/core/IconAudioBadge.tsx b/packages/mobile/src/components/core/IconAudioBadge.tsx index 6c1e68afc30..4d206d8125e 100644 --- a/packages/mobile/src/components/core/IconAudioBadge.tsx +++ b/packages/mobile/src/components/core/IconAudioBadge.tsx @@ -1,4 +1,4 @@ -import type { BadgeTier } from '@audius/common' +import type { BadgeTier } from '@audius/common/models' import type { ImageStyle } from 'react-native' import { Image } from 'react-native' diff --git a/packages/mobile/src/components/core/ProfilePicture.tsx b/packages/mobile/src/components/core/ProfilePicture.tsx index bdfcb0f705b..3f1fd503724 100644 --- a/packages/mobile/src/components/core/ProfilePicture.tsx +++ b/packages/mobile/src/components/core/ProfilePicture.tsx @@ -1,4 +1,6 @@ -import { SquareSizes, type ID, cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' +import type { ID } from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import { useSelector } from 'react-redux' import type { AvatarProps } from '@audius/harmony-native' diff --git a/packages/mobile/src/components/core/UserCoverPhoto.tsx b/packages/mobile/src/components/core/UserCoverPhoto.tsx index 426b8a95ba7..8b9ee032bac 100644 --- a/packages/mobile/src/components/core/UserCoverPhoto.tsx +++ b/packages/mobile/src/components/core/UserCoverPhoto.tsx @@ -1,4 +1,4 @@ -import type { ID } from '@audius/common' +import type { ID } from '@audius/common/models' import type { CoverPhotoProps } from '@audius/harmony-native' import { CoverPhoto } from '@audius/harmony-native' diff --git a/packages/mobile/src/components/core/UserDisplayName.tsx b/packages/mobile/src/components/core/UserDisplayName.tsx index 0e54558f028..8e815b09d89 100644 --- a/packages/mobile/src/components/core/UserDisplayName.tsx +++ b/packages/mobile/src/components/core/UserDisplayName.tsx @@ -1,5 +1,6 @@ -import { type ID, cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import type { ID } from '@audius/common/models' import { useSelector } from 'react-redux' import type { TextProps } from '@audius/harmony-native' diff --git a/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx b/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx index 62fc271c9a1..c203719ee3d 100644 --- a/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx +++ b/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx @@ -2,9 +2,9 @@ import { useCallback, useEffect } from 'react' import { deactivateAccountActions, - deactivateAccountSelectors, - Status + deactivateAccountSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx b/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx index 6b899abb989..8c7b17681b7 100644 --- a/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx +++ b/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx @@ -1,9 +1,9 @@ -import type { SearchTrack, Track } from '@audius/common' import { accountSelectors, formatLineupTileDuration, playbackPositionSelectors } from '@audius/common' +import type { SearchTrack, Track } from '@audius/common/models' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTile.tsx b/packages/mobile/src/components/details-tile/DetailsTile.tsx index 40f7ec36b3e..5eed328e9a8 100644 --- a/packages/mobile/src/components/details-tile/DetailsTile.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTile.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import type { CommonState, Track } from '@audius/common' +import type { CommonState } from '@audius/common' import { FeatureFlags, Genre, @@ -9,10 +9,11 @@ import { playerSelectors, playbackPositionSelectors, getDogEarType, - isContentUSDCPurchaseGated, dayjs } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { isContentUSDCPurchaseGated } from '@audius/common/models' +import type { Track } from '@audius/common/models' import moment from 'moment' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index c611fcd9b9f..81c7cfe7eb3 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -1,7 +1,8 @@ -import type { CommonState, ID } from '@audius/common' +import type { CommonState } from '@audius/common' import { FeatureFlags, cacheCollectionsSelectors } from '@audius/common' import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import { useFeatureFlag } from '@audius/common/hooks' +import type { ID } from '@audius/common/models' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx b/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx index e4a2d2efaa2..52f8bd58627 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react' -import type { ID } from '@audius/common' import { aiPageActions, aiPageSelectors } from '@audius/common' +import type { ID } from '@audius/common/models' import { View } from 'react-native' import { TouchableWithoutFeedback } from 'react-native-gesture-handler' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx b/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx index ab06decb160..a7f74cd7600 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx @@ -1,14 +1,14 @@ import { useCallback } from 'react' -import type { AccessConditions, User } from '@audius/common' +import { formatPrice } from '@audius/common' +import { useStreamConditionsEntity } from '@audius/common/hooks' import { - formatPrice, isContentCollectibleGated, isContentFollowGated, isContentTipGated, isContentUSDCPurchaseGated -} from '@audius/common' -import { useStreamConditionsEntity } from '@audius/common/hooks' +} from '@audius/common/models' +import type { AccessConditions, User } from '@audius/common/models' import type { ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx index a8efef93a68..b84f5735413 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx @@ -1,22 +1,24 @@ import type { ReactNode } from 'react' import { useCallback } from 'react' -import type { ID, AccessConditions, User } from '@audius/common' import { - Chain, - FollowSource, formatPrice, - isContentCollectibleGated, - isContentFollowGated, - isContentTipGated, - isContentUSDCPurchaseGated, gatedContentSelectors, tippingActions, usePremiumContentPurchaseModal, - usersSocialActions, - ModalSource + usersSocialActions } from '@audius/common' import { useStreamConditionsEntity } from '@audius/common/hooks' +import { + FollowSource, + ModalSource, + Chain, + isContentCollectibleGated, + isContentFollowGated, + isContentTipGated, + isContentUSDCPurchaseGated +} from '@audius/common/models' +import type { ID, AccessConditions, User } from '@audius/common/models' import type { ViewStyle } from 'react-native' import { Image, Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTilePremiumAccess.tsx b/packages/mobile/src/components/details-tile/DetailsTilePremiumAccess.tsx index 5810d8b2374..542174201fb 100644 --- a/packages/mobile/src/components/details-tile/DetailsTilePremiumAccess.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTilePremiumAccess.tsx @@ -1,9 +1,9 @@ -import type { ID, AccessConditions } from '@audius/common' +import type { ID, AccessConditions } from '@audius/common/models' import { isContentCollectibleGated, isContentFollowGated, isContentTipGated -} from '@audius/common' +} from '@audius/common/models' import type { ViewStyle } from 'react-native' import { DetailsTileHasAccess } from './DetailsTileHasAccess' diff --git a/packages/mobile/src/components/details-tile/types.ts b/packages/mobile/src/components/details-tile/types.ts index 08bf86ef274..c3d4ad61632 100644 --- a/packages/mobile/src/components/details-tile/types.ts +++ b/packages/mobile/src/components/details-tile/types.ts @@ -1,6 +1,12 @@ import type { ReactNode } from 'react' -import type { Track, User, SearchTrack, SearchUser, ID } from '@audius/common' +import type { + ID, + SearchUser, + SearchTrack, + Track, + User +} from '@audius/common/models' import type { TextStyle } from 'react-native' import type { GestureResponderHandler } from 'app/types/gesture' diff --git a/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx b/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx index aa529e43da1..039489e1f15 100644 --- a/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx +++ b/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' import type { CommonState } from '@audius/common' -import { FavoriteSource, collectionsSocialActions } from '@audius/common' +import { collectionsSocialActions } from '@audius/common' +import { FavoriteSource } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { useDrawer } from 'app/hooks/useDrawer' diff --git a/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx b/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx index 1485b29bb23..e4d8ddbd259 100644 --- a/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx +++ b/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx @@ -1,11 +1,10 @@ import { useCallback, useMemo } from 'react' import { - FeedFilter, - Name, feedPageLineupActions as feedActions, feedPageActions } from '@audius/common' +import { Name, FeedFilter } from '@audius/common/models' import { useDispatch } from 'react-redux' import ActionDrawer from 'app/components/action-drawer' diff --git a/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx b/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx index 0bf60a0a095..3d4f96c0cda 100644 --- a/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx +++ b/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx @@ -1,6 +1,5 @@ import { useCallback, useEffect } from 'react' -import type { User } from '@audius/common' import { accountSelectors, cacheUsersSelectors, @@ -8,6 +7,7 @@ import { tippingActions } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import type { User } from '@audius/common/models' import { storeDismissedTipInfo } from 'common/store/tipping/sagas' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/feed-tip-tile/ReceiverDetails.tsx b/packages/mobile/src/components/feed-tip-tile/ReceiverDetails.tsx index 825c5061ebe..6dfb3d53818 100644 --- a/packages/mobile/src/components/feed-tip-tile/ReceiverDetails.tsx +++ b/packages/mobile/src/components/feed-tip-tile/ReceiverDetails.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import type { User } from '@audius/common' +import type { User } from '@audius/common/models' import { View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/components/feed-tip-tile/SendTipButton.tsx b/packages/mobile/src/components/feed-tip-tile/SendTipButton.tsx index f0d796d7c4f..e7267f88aca 100644 --- a/packages/mobile/src/components/feed-tip-tile/SendTipButton.tsx +++ b/packages/mobile/src/components/feed-tip-tile/SendTipButton.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import type { User } from '@audius/common' import { tippingActions } from '@audius/common' +import type { User } from '@audius/common/models' import { View, Platform } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/feed-tip-tile/SenderDetails.tsx b/packages/mobile/src/components/feed-tip-tile/SenderDetails.tsx index 976fe4f087e..1db524cbcb7 100644 --- a/packages/mobile/src/components/feed-tip-tile/SenderDetails.tsx +++ b/packages/mobile/src/components/feed-tip-tile/SenderDetails.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import type { User } from '@audius/common' +import type { User } from '@audius/common/models' import { Platform, TouchableOpacity, View } from 'react-native' import IconTip from 'app/assets/images/iconTip.svg' diff --git a/packages/mobile/src/components/image/CollectionImage.tsx b/packages/mobile/src/components/image/CollectionImage.tsx index a4fd0a9ba93..08a425d09df 100644 --- a/packages/mobile/src/components/image/CollectionImage.tsx +++ b/packages/mobile/src/components/image/CollectionImage.tsx @@ -1,12 +1,11 @@ +import type { Maybe, Nullable } from '@audius/common' +import { reachabilitySelectors } from '@audius/common' import type { + SquareSizes, Collection, ID, - Maybe, - Nullable, - SearchPlaylist, - SquareSizes -} from '@audius/common' -import { reachabilitySelectors } from '@audius/common' + SearchPlaylist +} from '@audius/common/models' import { useSelector } from 'react-redux' import imageEmpty from 'app/assets/images/imageBlank2x.png' diff --git a/packages/mobile/src/components/image/CoverPhoto.tsx b/packages/mobile/src/components/image/CoverPhoto.tsx index 8277965330b..20470d8860b 100644 --- a/packages/mobile/src/components/image/CoverPhoto.tsx +++ b/packages/mobile/src/components/image/CoverPhoto.tsx @@ -1,5 +1,7 @@ -import type { ID, Nullable } from '@audius/common' -import { SquareSizes, WidthSizes, cacheUsersSelectors } from '@audius/common' +import type { Nullable } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' +import type { ID } from '@audius/common/models' +import { SquareSizes, WidthSizes } from '@audius/common/models' import { BlurView } from '@react-native-community/blur' import { Animated, StyleSheet } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/image/TrackImage.tsx b/packages/mobile/src/components/image/TrackImage.tsx index a81a35efcd6..dd47b237015 100644 --- a/packages/mobile/src/components/image/TrackImage.tsx +++ b/packages/mobile/src/components/image/TrackImage.tsx @@ -1,12 +1,6 @@ -import type { - Track, - Nullable, - SquareSizes, - ID, - Maybe, - SearchTrack -} from '@audius/common' +import type { Nullable, Maybe } from '@audius/common' import { reachabilitySelectors } from '@audius/common' +import type { SquareSizes, ID, SearchTrack, Track } from '@audius/common/models' import { useSelector } from 'react-redux' import imageEmpty from 'app/assets/images/imageBlank2x.png' diff --git a/packages/mobile/src/components/image/UserImage.tsx b/packages/mobile/src/components/image/UserImage.tsx index 968cb3e7da3..f1311b231aa 100644 --- a/packages/mobile/src/components/image/UserImage.tsx +++ b/packages/mobile/src/components/image/UserImage.tsx @@ -1,5 +1,6 @@ import { cacheUsersSelectors } from '@audius/common' -import type { ID, Nullable, SquareSizes } from '@audius/common' +import type { Nullable } from '@audius/common' +import type { SquareSizes, ID } from '@audius/common/models' import { useSelector } from 'react-redux' import profilePicEmpty from 'app/assets/images/imageProfilePicEmpty2X.png' diff --git a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx index db000f91226..9f5a2320244 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx @@ -1,21 +1,9 @@ import { useCallback, useMemo } from 'react' -import type { - Collection, - Track, - User, - EnhancedCollectionTrack, - CommonState -} from '@audius/common' +import type { EnhancedCollectionTrack, CommonState } from '@audius/common' import { - SquareSizes, removeNullable, playerSelectors, - FavoriteSource, - PlaybackSource, - RepostSource, - ShareSource, - FavoriteType, accountSelectors, cacheCollectionsSelectors, cacheUsersSelectors, @@ -28,6 +16,15 @@ import { FeatureFlags } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { + ShareSource, + RepostSource, + FavoriteSource, + PlaybackSource, + FavoriteType, + SquareSizes +} from '@audius/common/models' +import type { Collection, Track, User } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { CollectionImage } from 'app/components/image/CollectionImage' diff --git a/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx b/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx index ebb9286c754..18fccf77a3b 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx @@ -1,5 +1,6 @@ -import type { CommonState, LineupTrack, UID } from '@audius/common' +import type { CommonState } from '@audius/common' import { playerSelectors } from '@audius/common' +import type { UID, LineupTrack } from '@audius/common/models' import { range } from 'lodash' import { Pressable, Text, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx b/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx index a8501d2814f..fe3e11e2ea2 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx @@ -1,14 +1,13 @@ import { useCallback } from 'react' -import type { ID, AccessConditions } from '@audius/common' import { - ModalSource, formatPrice, - isContentUSDCPurchaseGated, gatedContentActions, gatedContentSelectors, usePremiumContentPurchaseModal } from '@audius/common' +import type { ID, AccessConditions } from '@audius/common/models' +import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' import { TouchableOpacity, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileActionButtons.tsx b/packages/mobile/src/components/lineup-tile/LineupTileActionButtons.tsx index d0872b7ad56..8b73e03770f 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileActionButtons.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileActionButtons.tsx @@ -1,11 +1,8 @@ import type { ReactElement } from 'react' -import { - isContentUSDCPurchaseGated, - type ID, - type Nullable, - type AccessConditions -} from '@audius/common' +import { type Nullable } from '@audius/common' +import type { ID, AccessConditions } from '@audius/common/models' +import { isContentUSDCPurchaseGated } from '@audius/common/models' import { View } from 'react-native' import IconKebabHorizontal from 'app/assets/images/iconKebabHorizontal.svg' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileArt.tsx b/packages/mobile/src/components/lineup-tile/LineupTileArt.tsx index 6e35e69cfbb..b63b8294931 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileArt.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileArt.tsx @@ -1,4 +1,4 @@ -import type { Remix } from '@audius/common' +import type { Remix } from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx b/packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx index 3cca6d00d37..8ad8390c73d 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileCoSign.tsx @@ -1,4 +1,4 @@ -import type { Remix } from '@audius/common' +import type { Remix } from '@audius/common/models' import { StyleSheet, View } from 'react-native' import Text from 'app/components/text' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx b/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx index d8b8a7308d7..28b7200af56 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' import { playerSelectors } from '@audius/common' -import type { Remix, User } from '@audius/common' +import type { Remix, User } from '@audius/common/models' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTilePremiumContentTypeTag.tsx b/packages/mobile/src/components/lineup-tile/LineupTilePremiumContentTypeTag.tsx index da95ee7e7d0..58b8ae570a1 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTilePremiumContentTypeTag.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTilePremiumContentTypeTag.tsx @@ -1,11 +1,11 @@ import { useMemo } from 'react' +import type { AccessConditions } from '@audius/common/models' import { + GatedContentType, isContentCollectibleGated, - isContentUSDCPurchaseGated, - type AccessConditions, - GatedContentType -} from '@audius/common' + isContentUSDCPurchaseGated +} from '@audius/common/models' import { View } from 'react-native' import IconCart from 'app/assets/images/iconCart.svg' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx index 0097fa4bcbc..dbb9869c8d0 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx @@ -1,19 +1,14 @@ import { useCallback } from 'react' -import type { - ID, - FavoriteType, - RepostType, - AccessConditions, - Nullable -} from '@audius/common' +import type { RepostType, Nullable } from '@audius/common' import { formatCount, repostsUserListActions, favoritesUserListActions, - isContentUSDCPurchaseGated, dayjs } from '@audius/common' +import { isContentUSDCPurchaseGated } from '@audius/common/models' +import type { FavoriteType, ID, AccessConditions } from '@audius/common/models' import moment from 'moment' import { View, TouchableOpacity } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/TrackTile.tsx b/packages/mobile/src/components/lineup-tile/TrackTile.tsx index b30f13f9e2b..1a67d8a3d4e 100644 --- a/packages/mobile/src/components/lineup-tile/TrackTile.tsx +++ b/packages/mobile/src/components/lineup-tile/TrackTile.tsx @@ -1,18 +1,12 @@ import { useCallback } from 'react' -import type { Track, User, CommonState } from '@audius/common' +import type { CommonState } from '@audius/common' import { playbackPositionSelectors, FeatureFlags, Genre, - SquareSizes, accountSelectors, removeNullable, - PlaybackSource, - FavoriteSource, - RepostSource, - ShareSource, - FavoriteType, cacheTracksSelectors, cacheUsersSelectors, tracksSocialActions, @@ -21,9 +15,18 @@ import { mobileOverflowMenuUIActions, shareModalUIActions, RepostType, - playerSelectors, - isContentUSDCPurchaseGated + playerSelectors } from '@audius/common' +import { + ShareSource, + RepostSource, + FavoriteSource, + PlaybackSource, + FavoriteType, + SquareSizes, + isContentUSDCPurchaseGated +} from '@audius/common/models' +import type { Track, User } from '@audius/common/models' import { useNavigationState } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' import { trpc } from 'utils/trpcClientWeb' diff --git a/packages/mobile/src/components/lineup-tile/types.ts b/packages/mobile/src/components/lineup-tile/types.ts index 61b7684f01c..5e40c83d8c0 100644 --- a/packages/mobile/src/components/lineup-tile/types.ts +++ b/packages/mobile/src/components/lineup-tile/types.ts @@ -1,16 +1,15 @@ import type { ReactNode } from 'react' +import type { RepostType, EnhancedCollectionTrack } from '@audius/common' import type { - ID, - UID, PlaybackSource, - Collection, FavoriteType, + Collection, + ID, + UID, Track, - User, - RepostType, - EnhancedCollectionTrack -} from '@audius/common' + User +} from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' import type { GestureResponderHandler } from 'app/types/gesture' diff --git a/packages/mobile/src/components/lineup/Lineup.tsx b/packages/mobile/src/components/lineup/Lineup.tsx index 093c2763827..1b3f41b8003 100644 --- a/packages/mobile/src/components/lineup/Lineup.tsx +++ b/packages/mobile/src/components/lineup/Lineup.tsx @@ -1,7 +1,7 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' -import type { ID, UID, PlaybackSource } from '@audius/common' -import { Kind, Status } from '@audius/common' +import type { PlaybackSource, ID, UID } from '@audius/common/models' +import { Kind, Status } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import { range } from 'lodash' import type { SectionList as RNSectionList } from 'react-native' diff --git a/packages/mobile/src/components/lineup/types.ts b/packages/mobile/src/components/lineup/types.ts index 9035b82d552..b98cc45a6fd 100644 --- a/packages/mobile/src/components/lineup/types.ts +++ b/packages/mobile/src/components/lineup/types.ts @@ -1,14 +1,7 @@ import type { ComponentType, ReactElement } from 'react' -import type { - ID, - UID, - Kind, - Lineup as LineupData, - Maybe, - LineupBaseActions, - CommonState -} from '@audius/common' +import type { Maybe, LineupBaseActions, CommonState } from '@audius/common' +import type { Kind, ID, UID, Lineup as LineupData } from '@audius/common/models' import type { SectionListProps } from 'react-native' import type { PlaybackSource } from 'app/types/analytics' diff --git a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx index 7adb498a0ef..2908e927b3e 100644 --- a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx @@ -1,15 +1,12 @@ import { useCallback, useLayoutEffect } from 'react' -import type { Nullable, Track } from '@audius/common' +import type { Nullable } from '@audius/common' import { FeatureFlags, playbackPositionSelectors, Genre, removeNullable, - FavoriteSource, reachabilitySelectors, - RepostSource, - ShareSource, accountSelectors, castSelectors, castActions, @@ -19,10 +16,16 @@ import { mobileOverflowMenuUIActions, shareModalUIActions, formatPrice, - usePremiumContentPurchaseModal, - ModalSource + usePremiumContentPurchaseModal } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { + ShareSource, + RepostSource, + FavoriteSource, + ModalSource +} from '@audius/common/models' +import type { Track } from '@audius/common/models' import { View, Platform } from 'react-native' import { CastButton } from 'react-native-google-cast' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx index 9bc93770f72..4155f358203 100644 --- a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx +++ b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx @@ -1,11 +1,8 @@ -import type { CommonState, Nullable, Track } from '@audius/common' -import { - DogEarType, - SquareSizes, - averageColorSelectors, - playerSelectors -} from '@audius/common' +import type { CommonState, Nullable } from '@audius/common' +import { averageColorSelectors, playerSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { DogEarType, SquareSizes } from '@audius/common/models' +import type { Track } from '@audius/common/models' import { Dimensions } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx index 4d72310c95b..a6e379599ee 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx @@ -1,14 +1,14 @@ import { useCallback } from 'react' -import type { Nullable, Track, User } from '@audius/common' +import type { Nullable } from '@audius/common' import { - SquareSizes, - FavoriteSource, accountSelectors, tracksSocialActions, playerSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { FavoriteSource, SquareSizes } from '@audius/common/models' +import type { Track, User } from '@audius/common/models' import { TouchableOpacity, Animated, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx index ec9f590c81f..080cc50602d 100644 --- a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx +++ b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx @@ -1,10 +1,6 @@ -import { - type Nullable, - type Track, - type User, - playerSelectors -} from '@audius/common' +import { type Nullable, playerSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import type { Track, User } from '@audius/common/models' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx b/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx index 013d54b8495..474fb805e07 100644 --- a/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx +++ b/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx @@ -1,5 +1,5 @@ -import type { ID } from '@audius/common' import { cacheCollectionsSelectors, removeNullable } from '@audius/common' +import type { ID } from '@audius/common/models' import { useIsOfflineModeEnabled } from 'app/hooks/useIsOfflineModeEnabled' import { useProxySelector } from 'app/hooks/useProxySelector' diff --git a/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx index f4c068c6797..65db3c5caec 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx @@ -1,11 +1,8 @@ import { useContext } from 'react' -import type { ID, OverflowActionCallbacks } from '@audius/common' +import type { OverflowActionCallbacks } from '@audius/common' import { publishPlaylistConfirmationModalUIActions, - FavoriteSource, - RepostSource, - ShareSource, cacheCollectionsSelectors, cacheUsersSelectors, collectionsSocialActions, @@ -13,6 +10,12 @@ import { OverflowAction, mobileOverflowMenuUISelectors } from '@audius/common' +import { + ShareSource, + RepostSource, + FavoriteSource +} from '@audius/common/models' +import type { ID } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx index 29d63dcf02d..19d2709148d 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx @@ -1,13 +1,13 @@ -import type { ID, OverflowActionCallbacks, CommonState } from '@audius/common' +import type { OverflowActionCallbacks, CommonState } from '@audius/common' import { shareModalUIActions, - FollowSource, - ShareSource, cacheUsersSelectors, usersSocialActions, OverflowAction, mobileOverflowMenuUISelectors } from '@audius/common' +import type { ID } from '@audius/common/models' +import { ShareSource, FollowSource } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' const { getMobileOverflowModal } = mobileOverflowMenuUISelectors diff --git a/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx index 8840dcde5fa..2401a53b30d 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx @@ -1,16 +1,12 @@ import { useContext } from 'react' -import type { ID, OverflowActionCallbacks, CommonState } from '@audius/common' +import type { OverflowActionCallbacks, CommonState } from '@audius/common' import { cacheCollectionsActions, cacheCollectionsSelectors, collectionPageLineupActions as tracksActions, shareModalUIActions, playbackPositionActions, - FavoriteSource, - FollowSource, - RepostSource, - ShareSource, accountSelectors, cacheTracksSelectors, cacheUsersSelectors, @@ -20,6 +16,13 @@ import { OverflowAction, mobileOverflowMenuUISelectors } from '@audius/common' +import { + ShareSource, + RepostSource, + FavoriteSource, + FollowSource +} from '@audius/common/models' +import type { ID } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { trpc } from 'utils/trpcClientWeb' diff --git a/packages/mobile/src/components/payment-method/CardSelectionButton.tsx b/packages/mobile/src/components/payment-method/CardSelectionButton.tsx index a07ede61048..42b37d2de45 100644 --- a/packages/mobile/src/components/payment-method/CardSelectionButton.tsx +++ b/packages/mobile/src/components/payment-method/CardSelectionButton.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import type { PurchaseVendor } from '@audius/common' import { modalsActions } from '@audius/common' +import type { PurchaseVendor } from '@audius/common/models' import { TouchableOpacity } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/payment-method/PaymentMethod.tsx b/packages/mobile/src/components/payment-method/PaymentMethod.tsx index 8f0bd306c86..7d4d2311332 100644 --- a/packages/mobile/src/components/payment-method/PaymentMethod.tsx +++ b/packages/mobile/src/components/payment-method/PaymentMethod.tsx @@ -1,13 +1,13 @@ import { useEffect } from 'react' -import type { Nullable, BNUSDC } from '@audius/common' +import type { Nullable } from '@audius/common' import { - PurchaseMethod, formatUSDCWeiToFloorCentsNumber, formatCurrencyBalance, - PurchaseVendor, removeNullable } from '@audius/common' +import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' +import type { BNUSDC } from '@audius/common/models' import BN from 'bn.js' import { FlatList, View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx index 34a5ec36fb7..f9936318d1b 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PayExtraFormSection.tsx @@ -3,7 +3,6 @@ import { CUSTOM_AMOUNT, AMOUNT_PRESET } from '@audius/common/hooks' -import {} from '@audius/common' import type { PayExtraAmountPresetValues } from '@audius/common/hooks' import { useField } from 'formik' import { View } from 'react-native' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx index 0537135760d..7efe038894a 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx @@ -4,16 +4,13 @@ import type { PurchaseContentError } from '@audius/common' import { PurchaseContentPage, FeatureFlags, - Name, PurchaseContentStage, formatPrice, isContentPurchaseInProgress, purchaseContentActions, purchaseContentSelectors, - statusIsNotFinalized, usePremiumContentPurchaseModal, - IntKeys, - PurchaseVendor + IntKeys } from '@audius/common' import { useGetTrackById } from '@audius/common/api' import { @@ -28,6 +25,11 @@ import { usePurchaseMethod } from '@audius/common/hooks' import type { PurchaseableTrackMetadata } from '@audius/common/hooks' +import { + Name, + PurchaseVendor, + statusIsNotFinalized +} from '@audius/common/models' import { Formik, useField, useFormikContext } from 'formik' import { Linking, diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PurchaseSuccess.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PurchaseSuccess.tsx index 4b6ddcd406b..c2931bbda9c 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PurchaseSuccess.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PurchaseSuccess.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import type { UserTrackMetadata } from '@audius/common' +import type { UserTrackMetadata } from '@audius/common/models' import { View } from 'react-native' import IconCaretRight from 'app/assets/images/iconCaretRight.svg' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts index 18d70f027e3..59424e4f94f 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts +++ b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts @@ -1,4 +1,4 @@ -import type { Nullable, BNUSDC } from '@audius/common' +import type { Nullable } from '@audius/common' import { getPurchaseSummaryValues } from '@audius/common' import { useUSDCPurchaseConfig, @@ -8,6 +8,7 @@ import { CUSTOM_AMOUNT, AMOUNT_PRESET } from '@audius/common/hooks' +import type { BNUSDC } from '@audius/common/models' import { useField } from 'formik' export const usePurchaseSummaryValues = ({ diff --git a/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx b/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx index 476907fa0fa..24e4db9341a 100644 --- a/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx +++ b/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx @@ -1,12 +1,12 @@ import { useCallback, useEffect, useMemo } from 'react' import { - ShareSource, shareModalUIActions, profilePageSelectors, chatSelectors, chatActions } from '@audius/common' +import { ShareSource } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import ActionDrawer from 'app/components/action-drawer' diff --git a/packages/mobile/src/components/profile-list/ProfileCard.tsx b/packages/mobile/src/components/profile-list/ProfileCard.tsx index 02d076098d6..838e4274f04 100644 --- a/packages/mobile/src/components/profile-list/ProfileCard.tsx +++ b/packages/mobile/src/components/profile-list/ProfileCard.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import type { User } from '@audius/common' -import { SquareSizes } from '@audius/common' +import type { User } from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import { Card } from 'app/components/card' import type { ProfileCardProps as BaseProfileCardProps } from 'app/components/card' diff --git a/packages/mobile/src/components/profile-list/ProfileList.tsx b/packages/mobile/src/components/profile-list/ProfileList.tsx index 0026f116d98..066f90311a5 100644 --- a/packages/mobile/src/components/profile-list/ProfileList.tsx +++ b/packages/mobile/src/components/profile-list/ProfileList.tsx @@ -1,4 +1,4 @@ -import type { User } from '@audius/common' +import type { User } from '@audius/common/models' import type { CardListProps } from 'app/components/core' import { CardList } from 'app/components/core' diff --git a/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx b/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx index bb968c2f9d7..f04e5c17fbe 100644 --- a/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx +++ b/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx @@ -1,7 +1,8 @@ import { useCallback, useMemo } from 'react' -import { FeatureFlags, PurchaseVendor } from '@audius/common' +import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { PurchaseVendor } from '@audius/common/models' import { useDispatch } from 'react-redux' import { setPurchaseVendor } from 'app/store/purchase-vendor/slice' diff --git a/packages/mobile/src/components/rate-cta-drawer/RateCtaDrawer.tsx b/packages/mobile/src/components/rate-cta-drawer/RateCtaDrawer.tsx index 79a61787d18..df2c513db58 100644 --- a/packages/mobile/src/components/rate-cta-drawer/RateCtaDrawer.tsx +++ b/packages/mobile/src/components/rate-cta-drawer/RateCtaDrawer.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' import type { Nullable } from '@audius/common' -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' import AsyncStorage from '@react-native-async-storage/async-storage' import { View } from 'react-native' import InAppReview from 'react-native-in-app-review' diff --git a/packages/mobile/src/components/share-drawer/ShareDrawer.tsx b/packages/mobile/src/components/share-drawer/ShareDrawer.tsx index 26e05dd86c6..4adc625e72c 100644 --- a/packages/mobile/src/components/share-drawer/ShareDrawer.tsx +++ b/packages/mobile/src/components/share-drawer/ShareDrawer.tsx @@ -4,13 +4,12 @@ import { accountSelectors, collectionsSocialActions, FeatureFlags, - Name, shareModalUISelectors, shareSoundToTiktokModalActions, - ShareSource, tracksSocialActions, usersSocialActions } from '@audius/common' +import { Name, ShareSource } from '@audius/common/models' import Clipboard from '@react-native-clipboard/clipboard' import { Linking } from 'react-native' import ViewShot from 'react-native-view-shot' diff --git a/packages/mobile/src/components/share-drawer/ShareToStorySticker.tsx b/packages/mobile/src/components/share-drawer/ShareToStorySticker.tsx index 77d04853023..9b8670ff867 100644 --- a/packages/mobile/src/components/share-drawer/ShareToStorySticker.tsx +++ b/packages/mobile/src/components/share-drawer/ShareToStorySticker.tsx @@ -1,5 +1,5 @@ -import type { Track, User } from '@audius/common' -import { SquareSizes } from '@audius/common' +import type { Track, User } from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/share-drawer/useShareToStory.tsx b/packages/mobile/src/components/share-drawer/useShareToStory.tsx index 3781a4fe397..f151dfd6e8e 100644 --- a/packages/mobile/src/components/share-drawer/useShareToStory.tsx +++ b/packages/mobile/src/components/share-drawer/useShareToStory.tsx @@ -3,14 +3,10 @@ import { useCallback, useMemo, useRef, useState } from 'react' import EventEmitter from 'events' import path from 'path' -import type { Color, Nullable, ShareContent } from '@audius/common' -import { - encodeHashId, - ErrorLevel, - modalsActions, - SquareSizes, - uuid -} from '@audius/common' +import type { Nullable, ShareContent } from '@audius/common' +import { encodeHashId, modalsActions, uuid } from '@audius/common' +import { ErrorLevel, SquareSizes } from '@audius/common/models' +import type { Color } from '@audius/common/models' import { activateKeepAwake, deactivateKeepAwake diff --git a/packages/mobile/src/components/suggested-follows/PickArtistsForMeButton.tsx b/packages/mobile/src/components/suggested-follows/PickArtistsForMeButton.tsx index 6d92b187b7f..bc6d413833c 100644 --- a/packages/mobile/src/components/suggested-follows/PickArtistsForMeButton.tsx +++ b/packages/mobile/src/components/suggested-follows/PickArtistsForMeButton.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import type { ID } from '@audius/common' +import type { ID } from '@audius/common/models' import { addFollowArtists } from 'common/store/pages/signon/actions' import { getFollowIds, diff --git a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx index e2c5d16a7b9..ea23bcc4d38 100644 --- a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx +++ b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx @@ -1,8 +1,9 @@ import { useCallback } from 'react' -import type { CommonState, ID, Maybe } from '@audius/common' +import type { CommonState, Maybe } from '@audius/common' import { removeNullable } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import type { ID } from '@audius/common/models' import { removeFollowArtists, addFollowArtists diff --git a/packages/mobile/src/components/suggested-tracks/SuggestedCollectionTracks.tsx b/packages/mobile/src/components/suggested-tracks/SuggestedCollectionTracks.tsx index 67b4f07300a..40182b291a6 100644 --- a/packages/mobile/src/components/suggested-tracks/SuggestedCollectionTracks.tsx +++ b/packages/mobile/src/components/suggested-tracks/SuggestedCollectionTracks.tsx @@ -1,11 +1,10 @@ -import type { ID } from '@audius/common' import { useGetPlaylistById, useGetSuggestedAlbumTracks, useGetSuggestedPlaylistTracks, useGetCurrentUserId } from '@audius/common/api' -import {} from '@audius/common' +import type { ID } from '@audius/common/models' import { SuggestedTracks } from './components/SuggestedTracks' diff --git a/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx b/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx index 427a53ad782..c0729c5e194 100644 --- a/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx +++ b/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx @@ -1,8 +1,9 @@ import { Fragment, useCallback, useEffect, useRef } from 'react' -import type { ID, Track } from '@audius/common' -import { SquareSizes, cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' import type { SuggestedTrack } from '@audius/common/api' +import { SquareSizes } from '@audius/common/models' +import type { ID, Track } from '@audius/common/models' import { Animated, LayoutAnimation, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx index 5019265e9fc..98bcb15c49e 100644 --- a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx +++ b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx @@ -1,17 +1,19 @@ import type { ComponentType } from 'react' import { useMemo } from 'react' -import type { ID } from '@audius/common' import { - SquareSizes, getDogEarType, - isContentCollectibleGated, cacheUsersSelectors, - cacheTracksSelectors, - isContentUSDCPurchaseGated, - GatedContentType + cacheTracksSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { + SquareSizes, + GatedContentType, + isContentCollectibleGated, + isContentUSDCPurchaseGated +} from '@audius/common/models' +import type { ID } from '@audius/common/models' import type { ColorValue } from 'react-native' import { View } from 'react-native' import type { SvgProps } from 'react-native-svg' diff --git a/packages/mobile/src/components/track-list/TrackArtwork.tsx b/packages/mobile/src/components/track-list/TrackArtwork.tsx index 05626088e63..086464e8428 100644 --- a/packages/mobile/src/components/track-list/TrackArtwork.tsx +++ b/packages/mobile/src/components/track-list/TrackArtwork.tsx @@ -1,5 +1,5 @@ -import type { Track } from '@audius/common' -import { SquareSizes } from '@audius/common' +import type { Track } from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import { View } from 'react-native' import IconHidden from 'app/assets/images/iconHidden.svg' diff --git a/packages/mobile/src/components/track-list/TrackList.tsx b/packages/mobile/src/components/track-list/TrackList.tsx index ebfcdbc7ce5..7f96aee3209 100644 --- a/packages/mobile/src/components/track-list/TrackList.tsx +++ b/packages/mobile/src/components/track-list/TrackList.tsx @@ -1,7 +1,7 @@ import type { ReactElement } from 'react' import { Fragment, useCallback, useMemo, useState } from 'react' -import type { ID, UID } from '@audius/common' +import type { ID, UID } from '@audius/common/models' import type { FlatListProps } from 'react-native' import { FlatList, View } from 'react-native' import type { diff --git a/packages/mobile/src/components/track-list/TrackListItem.tsx b/packages/mobile/src/components/track-list/TrackListItem.tsx index aad841a2b9f..1265b363957 100644 --- a/packages/mobile/src/components/track-list/TrackListItem.tsx +++ b/packages/mobile/src/components/track-list/TrackListItem.tsx @@ -1,7 +1,6 @@ import type { ComponentType } from 'react' import { memo, useCallback, useMemo, useState } from 'react' -import type { Collection, ID, Track, UID, User } from '@audius/common' import { cacheCollectionsSelectors, FeatureFlags, @@ -17,6 +16,7 @@ import { playerSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import type { Collection, ID, UID, Track, User } from '@audius/common/models' import type { NativeSyntheticEvent, NativeTouchEvent, diff --git a/packages/mobile/src/components/track-list/types.ts b/packages/mobile/src/components/track-list/types.ts index 04eba4ae409..cba1c7dc3a1 100644 --- a/packages/mobile/src/components/track-list/types.ts +++ b/packages/mobile/src/components/track-list/types.ts @@ -1,4 +1,5 @@ -import type { CommonState, lineupSelectors, LineupTrack } from '@audius/common' +import type { CommonState, lineupSelectors } from '@audius/common' +import type { LineupTrack } from '@audius/common/models' import type { SetOptional } from 'type-fest' export type TrackMetadata = SetOptional< diff --git a/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx b/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx index 9002574290e..0e7135fdaac 100644 --- a/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx +++ b/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx @@ -2,11 +2,11 @@ import { useCallback } from 'react' import type { TrendingRewardsModalType } from '@audius/common' import { - Theme, StringKeys, audioRewardsPageActions, audioRewardsPageSelectors } from '@audius/common' +import { Theme } from '@audius/common/models' import type { ImageStyle } from 'react-native' import { Image, ScrollView, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx b/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx index b8ae5e70429..40ce563c606 100644 --- a/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx +++ b/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx @@ -1,10 +1,10 @@ -import type { BNUSDC } from '@audius/common' import { - Status, formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import type { BNUSDC } from '@audius/common/models' +import { Status } from '@audius/common/models' import BN from 'bn.js' import { View } from 'react-native' diff --git a/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx b/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx index 6435126872f..a53bfc11c70 100644 --- a/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx +++ b/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx @@ -1,9 +1,9 @@ -import type { BNUSDC } from '@audius/common' import { formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import type { BNUSDC } from '@audius/common/models' import BN from 'bn.js' import { View } from 'react-native' diff --git a/packages/mobile/src/components/usdc-manual-transfer/USDCManualTransfer.tsx b/packages/mobile/src/components/usdc-manual-transfer/USDCManualTransfer.tsx index 814d9b232f5..ddf916abc52 100644 --- a/packages/mobile/src/components/usdc-manual-transfer/USDCManualTransfer.tsx +++ b/packages/mobile/src/components/usdc-manual-transfer/USDCManualTransfer.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo } from 'react' -import { Name } from '@audius/common' import { useUSDCBalance, useCreateUserbankIfNeeded } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { USDC } from '@audius/fixed-decimal' import Clipboard from '@react-native-clipboard/clipboard' import BN from 'bn.js' diff --git a/packages/mobile/src/components/user-badges/UserBadges.tsx b/packages/mobile/src/components/user-badges/UserBadges.tsx index e127dc1f996..ed364089444 100644 --- a/packages/mobile/src/components/user-badges/UserBadges.tsx +++ b/packages/mobile/src/components/user-badges/UserBadges.tsx @@ -1,7 +1,7 @@ import type { ComponentType } from 'react' -import type { User } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import type { User } from '@audius/common/models' import type { ViewStyle, StyleProp, TextStyle } from 'react-native' import { StyleSheet, View, Text } from 'react-native' diff --git a/packages/mobile/src/components/user/FollowButton.tsx b/packages/mobile/src/components/user/FollowButton.tsx index 97b3f1e9968..bcfedf8ebf8 100644 --- a/packages/mobile/src/components/user/FollowButton.tsx +++ b/packages/mobile/src/components/user/FollowButton.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import type { FollowSource, ID } from '@audius/common' import { cacheUsersSelectors, usersSocialActions } from '@audius/common' +import type { FollowSource, ID } from '@audius/common/models' import type { GestureResponderEvent, StyleProp, ViewStyle } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/user/FollowsYouChip.tsx b/packages/mobile/src/components/user/FollowsYouChip.tsx index 4e06cadf106..e22fb6c0c33 100644 --- a/packages/mobile/src/components/user/FollowsYouChip.tsx +++ b/packages/mobile/src/components/user/FollowsYouChip.tsx @@ -1,5 +1,5 @@ -import type { ID } from '@audius/common' import { accountSelectors } from '@audius/common' +import type { ID } from '@audius/common/models' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/user/ProfilePicture.tsx b/packages/mobile/src/components/user/ProfilePicture.tsx index 0c805d50434..594d94c8b6f 100644 --- a/packages/mobile/src/components/user/ProfilePicture.tsx +++ b/packages/mobile/src/components/user/ProfilePicture.tsx @@ -1,5 +1,5 @@ -import type { ID } from '@audius/common' -import { SquareSizes } from '@audius/common' +import type { ID } from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import { UserImage } from 'app/components/image/UserImage' import { makeStyles } from 'app/styles' diff --git a/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx b/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx index 8105da25507..a6dc783fe89 100644 --- a/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx +++ b/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx @@ -1,4 +1,5 @@ -import { Theme, themeActions, themeSelectors } from '@audius/common' +import { themeActions, themeSelectors } from '@audius/common' +import { Theme } from '@audius/common/models' import { SectionList, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/hooks/useContentNodeImage.ts b/packages/mobile/src/hooks/useContentNodeImage.ts index 26115c0b660..e6853595c1f 100644 --- a/packages/mobile/src/hooks/useContentNodeImage.ts +++ b/packages/mobile/src/hooks/useContentNodeImage.ts @@ -1,8 +1,9 @@ import { useState, useMemo, useCallback } from 'react' -import type { Nullable, CID, WidthSizes, SquareSizes } from '@audius/common' +import type { Nullable } from '@audius/common' import { interleave } from '@audius/common' import { useAppContext } from '@audius/common/context' +import type { SquareSizes, WidthSizes, CID } from '@audius/common/models' import type { ImageSourcePropType, ImageURISource } from 'react-native' export type ContentNodeImageSource = { diff --git a/packages/mobile/src/hooks/useImageSize.ts b/packages/mobile/src/hooks/useImageSize.ts index 743c8ff3d4d..db1a2d3f626 100644 --- a/packages/mobile/src/hooks/useImageSize.ts +++ b/packages/mobile/src/hooks/useImageSize.ts @@ -1,11 +1,10 @@ +import type { Maybe, Nullable } from '@audius/common' +import { useImageSize as useImageSizeCommon } from '@audius/common/hooks' import type { SquareSizes, WidthSizes, - Maybe, - Nullable, ImageSizesObject -} from '@audius/common' -import { useImageSize as useImageSizeCommon } from '@audius/common/hooks' +} from '@audius/common/models' import type { ImageSourcePropType } from 'react-native' import { Image } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/hooks/useSetTrackAvailabilityFields.ts b/packages/mobile/src/hooks/useSetTrackAvailabilityFields.ts index 854075d85b2..f8ac496cf81 100644 --- a/packages/mobile/src/hooks/useSetTrackAvailabilityFields.ts +++ b/packages/mobile/src/hooks/useSetTrackAvailabilityFields.ts @@ -1,6 +1,7 @@ import { useCallback, useMemo } from 'react' -import type { Nullable, AccessConditions } from '@audius/common' +import type { Nullable } from '@audius/common' +import type { AccessConditions } from '@audius/common/models' import { useField } from 'formik' // This hook allows us to set track availability fields during upload. diff --git a/packages/mobile/src/models/Collection.ts b/packages/mobile/src/models/Collection.ts index d87c23a544c..7858570756e 100644 --- a/packages/mobile/src/models/Collection.ts +++ b/packages/mobile/src/models/Collection.ts @@ -1,4 +1,5 @@ -import type { CID, CoverArtSizes, Nullable } from '@audius/common' +import type { Nullable } from '@audius/common' +import type { CID, CoverArtSizes } from '@audius/common/models' export type CollectionImage = { cover_art: Nullable diff --git a/packages/mobile/src/models/Track.ts b/packages/mobile/src/models/Track.ts index af7238e4192..3990ad3a0ac 100644 --- a/packages/mobile/src/models/Track.ts +++ b/packages/mobile/src/models/Track.ts @@ -1,4 +1,4 @@ -import type { Track } from '@audius/common' +import type { Track } from '@audius/common/models' export type TrackImage = Pick< Track, diff --git a/packages/mobile/src/models/User.ts b/packages/mobile/src/models/User.ts index 9462409acbb..0f4706112c7 100644 --- a/packages/mobile/src/models/User.ts +++ b/packages/mobile/src/models/User.ts @@ -1,4 +1,4 @@ -import type { User } from '@audius/common' +import type { User } from '@audius/common/models' export type UserImage = Pick< User, diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx index ee54cb8fa41..21b8614ff9b 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx @@ -1,7 +1,7 @@ import { useCallback, useContext } from 'react' -import type { User } from '@audius/common' import { accountSelectors } from '@audius/common' +import type { User } from '@audius/common/models' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx index c32f17906fe..f7b3d5e5e23 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx @@ -1,12 +1,12 @@ -import type { User } from '@audius/common' import { FeatureFlags, StringKeys, accountSelectors, - chatSelectors, - Name + chatSelectors } from '@audius/common' import { useAccountHasClaimableRewards } from '@audius/common/hooks' +import type { User } from '@audius/common/models' +import { Name } from '@audius/common/models' import type { DrawerContentComponentProps } from '@react-navigation/drawer' import { DrawerContentScrollView } from '@react-navigation/drawer' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx index 7826aa3b876..313c7f9506b 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx @@ -1,13 +1,13 @@ import type { ComponentType } from 'react' import { useCallback, useContext } from 'react' -import type { User } from '@audius/common' import { formatCount, accountSelectors, followersUserListActions, followingUserListActions } from '@audius/common' +import type { User } from '@audius/common/models' import { View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import type { SvgProps } from 'react-native-svg' diff --git a/packages/mobile/src/screens/app-screen/AppTabScreen.tsx b/packages/mobile/src/screens/app-screen/AppTabScreen.tsx index 9bb2eb2e777..d530ae9b600 100644 --- a/packages/mobile/src/screens/app-screen/AppTabScreen.tsx +++ b/packages/mobile/src/screens/app-screen/AppTabScreen.tsx @@ -1,15 +1,17 @@ import { useCallback, useContext, useEffect } from 'react' import type { - ID, - FavoriteType, - TipSource, NotificationType, RepostType, - SearchPlaylist, - SearchTrack, CreateChatModalState } from '@audius/common' +import type { + FavoriteType, + TipSource, + ID, + SearchTrack, + SearchPlaylist +} from '@audius/common/models' import type { EventArg, NavigationState } from '@react-navigation/native' import type { createNativeStackNavigator } from '@react-navigation/native-stack' diff --git a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx index 7c4739c4e4a..4f526dfc384 100644 --- a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx +++ b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect } from 'react' -import type { StringWei, CommonState } from '@audius/common' +import type { CommonState } from '@audius/common' import { tokenDashboardPageActions, StringKeys, @@ -13,6 +13,7 @@ import { modalsActions, isNullOrUndefined } from '@audius/common' +import type { StringWei } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import { Image, Linking, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx index 197ab3dc832..8eba2f0a9b5 100644 --- a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx @@ -1,10 +1,6 @@ import { useCallback, useEffect, useState } from 'react' -import type { - ChallengeRewardID, - ChallengeRewardsModalType, - CommonState -} from '@audius/common' +import type { ChallengeRewardsModalType, CommonState } from '@audius/common' import { removeNullable, StringKeys, @@ -13,10 +9,10 @@ import { audioRewardsPageSelectors, modalsActions, makeOptimisticChallengeSortComparator, - FeatureFlags, - ChallengeName, - Name + FeatureFlags } from '@audius/common' +import { Name, ChallengeName } from '@audius/common/models' +import type { ChallengeRewardID } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/audio-screen/Panel.tsx b/packages/mobile/src/screens/audio-screen/Panel.tsx index c340af71363..ee9d9287889 100644 --- a/packages/mobile/src/screens/audio-screen/Panel.tsx +++ b/packages/mobile/src/screens/audio-screen/Panel.tsx @@ -1,12 +1,10 @@ -import type { - ChallengeRewardsInfo, - OptimisticUserChallenge -} from '@audius/common' +import type { ChallengeRewardsInfo } from '@audius/common' import { fillString, formatNumberCommas, isAudioMatchingChallenge } from '@audius/common' +import type { OptimisticUserChallenge } from '@audius/common/models' import { View, Image } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx index 107ed85aa59..a1b86556a90 100644 --- a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx @@ -3,11 +3,8 @@ import { audioRewardsPageActions, modalsActions } from '@audius/common' -import type { - TrendingRewardsModalType, - Modals, - ChallengeRewardID -} from '@audius/common' +import type { TrendingRewardsModalType, Modals } from '@audius/common' +import type { ChallengeRewardID } from '@audius/common/models' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx b/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx index 395ec76623e..a677432a7ac 100644 --- a/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx +++ b/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx @@ -1,11 +1,11 @@ import { useCallback, useEffect, useState } from 'react' import { - Status, ChangePasswordPageStep, changePasswordSelectors, changePasswordActions } from '@audius/common' +import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx b/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx index 131892cbdfe..753be2651ef 100644 --- a/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx +++ b/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx @@ -1,10 +1,7 @@ import { useEffect, useState } from 'react' -import { - Status, - changePasswordSelectors, - changePasswordActions -} from '@audius/common' +import { changePasswordSelectors, changePasswordActions } from '@audius/common' +import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx index 2ca8cf67745..62a3ab658d3 100644 --- a/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx @@ -1,6 +1,7 @@ import { useCallback, useEffect } from 'react' -import { chatActions, chatSelectors, Status } from '@audius/common' +import { chatActions, chatSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx index dad4e9c1d39..bfb99620da6 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx @@ -2,7 +2,6 @@ import { memo, useCallback, useState } from 'react' import type { ReactionTypes } from '@audius/common' import { - Status, accountSelectors, chatSelectors, decodeHashId, @@ -10,6 +9,7 @@ import { isCollectionUrl, isTrackUrl } from '@audius/common' +import { Status } from '@audius/common/models' import type { ChatMessageReaction } from '@audius/sdk' import { find } from 'linkifyjs' import type { ViewStyle, StyleProp } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx index 8cf3f3ed4cc..590f8283c57 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx @@ -1,10 +1,7 @@ import { useCallback, useMemo, useEffect } from 'react' -import type { ChatMessageTileProps, ID } from '@audius/common' +import type { ChatMessageTileProps } from '@audius/common' import { - Name, - Kind, - PlaybackSource, QueueSource, accountSelectors, getPathFromPlaylistUrl, @@ -17,6 +14,8 @@ import { } from '@audius/common/api' import { usePlayTrack, usePauseTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' +import { Name, PlaybackSource, Kind } from '@audius/common/models' +import type { ID } from '@audius/common/models' import { useSelector } from 'react-redux' import { CollectionTile } from 'app/components/lineup-tile' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx index 2bd241261fd..d390e4cc0a4 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx @@ -1,10 +1,7 @@ import { useCallback, useEffect, useMemo } from 'react' -import type { ChatMessageTileProps, ID } from '@audius/common' +import type { ChatMessageTileProps } from '@audius/common' import { - Name, - Kind, - PlaybackSource, QueueSource, accountSelectors, getPathFromTrackUrl, @@ -13,6 +10,8 @@ import { import { useGetTrackByPermalink } from '@audius/common/api' import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' +import { Name, PlaybackSource, Kind } from '@audius/common/models' +import type { ID } from '@audius/common/models' import { useSelector } from 'react-redux' import { TrackTile } from 'app/components/lineup-tile' diff --git a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx index 2d0f3dda9ac..9c4861c5b48 100644 --- a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx @@ -1,8 +1,6 @@ import { useCallback, useEffect, useMemo, useRef } from 'react' -import type { ChatMessageWithExtras } from '@audius/common' import { - Status, accountSelectors, chatActions, chatCanFetchMoreMessages, @@ -14,6 +12,8 @@ import { playerSelectors } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' +import { Status } from '@audius/common/models' +import type { ChatMessageWithExtras } from '@audius/common/models' import { Portal } from '@gorhom/portal' import { useKeyboard } from '@react-native-community/hooks' import { useFocusEffect } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx index 0f3e8bddd73..d9692804637 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx @@ -1,9 +1,8 @@ import { useCallback, useEffect, useState } from 'react' -import type { CreateChatModalState, User } from '@audius/common' +import type { CreateChatModalState } from '@audius/common' import { FOLLOWERS_USER_LIST_TAG, - Status, accountSelectors, cacheUsersSelectors, chatActions, @@ -11,11 +10,12 @@ import { followersUserListSelectors, searchUsersModalActions, searchUsersModalSelectors, - statusIsNotFinalized, chatSelectors, userListActions } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status, statusIsNotFinalized } from '@audius/common/models' +import type { User } from '@audius/common/models' import { View, Image } from 'react-native' import { KeyboardAwareFlatList } from 'react-native-keyboard-aware-scroll-view' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx index 636c1bc7316..7acf9fa6a20 100644 --- a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx +++ b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx @@ -1,11 +1,8 @@ import { useCallback, useRef } from 'react' -import type { - ChatMessageWithExtras, - Nullable, - ReactionTypes -} from '@audius/common' +import type { Nullable, ReactionTypes } from '@audius/common' import { chatActions, encodeHashId, accountSelectors } from '@audius/common' +import type { ChatMessageWithExtras } from '@audius/common/models' import Clipboard from '@react-native-clipboard/clipboard' import { Dimensions, Pressable, Animated } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx b/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx index 55058f40c47..9d891ea5d46 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx @@ -1,13 +1,13 @@ import { useLayoutEffect, useState } from 'react' -import type { Collection, SmartCollectionVariant } from '@audius/common' import { accountSelectors, reachabilitySelectors, - collectionPageSelectors, - Variant + collectionPageSelectors } from '@audius/common' import { useThrottledCallback } from '@audius/common/hooks' +import { Variant } from '@audius/common/models' +import type { SmartCollectionVariant, Collection } from '@audius/common/models' import { View } from 'react-native' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx index 508605a0780..85f3637b5f6 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx @@ -1,13 +1,8 @@ import { useCallback, useMemo } from 'react' import { - SquareSizes, encodeUrlName, removeNullable, - FavoriteSource, - RepostSource, - ShareSource, - FavoriteType, collectionPageActions, formatDate, accountSelectors, @@ -23,14 +18,21 @@ import { favoritesUserListActions, FeatureFlags } from '@audius/common' +import type { Nullable } from '@audius/common' +import { useFeatureFlag } from '@audius/common/hooks' +import { + ShareSource, + RepostSource, + FavoriteSource, + FavoriteType, + SquareSizes +} from '@audius/common/models' import type { Collection, - Nullable, - User, + SearchUser, SearchPlaylist, - SearchUser -} from '@audius/common' -import { useFeatureFlag } from '@audius/common/hooks' + User +} from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx index ae543d73880..68cb3bb8d30 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx @@ -1,18 +1,17 @@ import { useCallback, useEffect, useMemo } from 'react' -import type { ID, Maybe, SmartCollectionVariant, UID } from '@audius/common' +import type { Maybe } from '@audius/common' import { removeNullable, collectionPageSelectors, playerSelectors, - Status, - Name, - PlaybackSource, formatSecondsAsText, collectionPageLineupActions as tracksActions, reachabilitySelectors, cacheCollectionsSelectors } from '@audius/common' +import { Name, PlaybackSource, Status } from '@audius/common/models' +import type { SmartCollectionVariant, ID, UID } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { usePrevious } from 'react-use' import { createSelector } from 'reselect' diff --git a/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts b/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts index 3318d184042..dcf99cd63cf 100644 --- a/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts +++ b/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts @@ -1,10 +1,8 @@ import { useCallback } from 'react' -import type { SmartCollectionVariant } from '@audius/common' import { Uid, areSetsEqual, - Kind, makeUid, cacheActions, cacheCollectionsSelectors, @@ -12,6 +10,8 @@ import { collectionPageSelectors, queueSelectors } from '@audius/common' +import type { SmartCollectionVariant } from '@audius/common/models' +import { Kind } from '@audius/common/models' import moment from 'moment' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx index 893e7711606..b277aa74e06 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx @@ -2,10 +2,10 @@ import { useCallback } from 'react' import type { EditPlaylistValues } from '@audius/common' import { - SquareSizes, cacheCollectionsActions, cacheCollectionsSelectors } from '@audius/common' +import { SquareSizes } from '@audius/common/models' import { Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-playlist-screen/TrackListFieldArray.tsx b/packages/mobile/src/screens/edit-playlist-screen/TrackListFieldArray.tsx index 43d213897ab..d0d0094a614 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/TrackListFieldArray.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/TrackListFieldArray.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import type { PlaylistTrackId } from '@audius/common' +import type { PlaylistTrackId } from '@audius/common/models' import { useField } from 'formik' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx b/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx index 301e7e99842..2376dbb2cb4 100644 --- a/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx +++ b/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' -import type { UserMetadata } from '@audius/common' -import { - accountSelectors, - profilePageActions, - SquareSizes -} from '@audius/common' +import { accountSelectors, profilePageActions } from '@audius/common' +import type { UserMetadata } from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import type { FormikProps } from 'formik' import { Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx index e22eae0d672..d3c29f07dc4 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' import type { ExtendedTrackMetadata } from '@audius/common' -import { - SquareSizes, - cacheTracksActions, - cacheTracksSelectors -} from '@audius/common' +import { cacheTracksActions, cacheTracksSelectors } from '@audius/common' +import { SquareSizes } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { ModalScreen } from 'app/components/core' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx index df0744b09ab..ca2cd415d18 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx @@ -1,12 +1,9 @@ import { useCallback, useMemo } from 'react' import type { UploadTrack } from '@audius/common' -import { - creativeCommons, - formatPrice, - isContentUSDCPurchaseGated -} from '@audius/common' +import { creativeCommons, formatPrice } from '@audius/common' import { useUSDCPurchaseConfig } from '@audius/common/hooks' +import { isContentUSDCPurchaseGated } from '@audius/common/models' import { Formik } from 'formik' import { z } from 'zod' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx b/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx index 50acb20cdff..b085cf4bb8f 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx +++ b/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx @@ -1,10 +1,9 @@ import { useCallback, useEffect, useState } from 'react' -import type { Nullable, AccessConditions } from '@audius/common' -import { - collectiblesSelectors, - isContentCollectibleGated -} from '@audius/common' +import type { Nullable } from '@audius/common' +import { collectiblesSelectors } from '@audius/common' +import { isContentCollectibleGated } from '@audius/common/models' +import type { AccessConditions } from '@audius/common/models' import { useField } from 'formik' import { View, Image, Dimensions } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/edit-track-screen/components/RemixTrackPill.tsx b/packages/mobile/src/screens/edit-track-screen/components/RemixTrackPill.tsx index 6ef0a5c1a4c..dc70090c658 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/RemixTrackPill.tsx +++ b/packages/mobile/src/screens/edit-track-screen/components/RemixTrackPill.tsx @@ -1,5 +1,5 @@ -import type { Track, User } from '@audius/common' -import { SquareSizes } from '@audius/common' +import type { Track, User } from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx b/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx index 3a5148db8bf..c27711cc46a 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx +++ b/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx @@ -1,11 +1,9 @@ import { useCallback, useEffect, useState } from 'react' -import type { AccessConditions, Nullable } from '@audius/common' -import { - accountSelectors, - isContentFollowGated, - isContentTipGated -} from '@audius/common' +import type { Nullable } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { isContentFollowGated, isContentTipGated } from '@audius/common/models' +import type { AccessConditions } from '@audius/common/models' import { useField } from 'formik' import { Dimensions, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/edit-track-screen/components/types.ts b/packages/mobile/src/screens/edit-track-screen/components/types.ts index d2dff685978..9def4164183 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/types.ts +++ b/packages/mobile/src/screens/edit-track-screen/components/types.ts @@ -1,4 +1,5 @@ -import type { Nullable, AccessConditions } from '@audius/common' +import type { Nullable } from '@audius/common' +import type { AccessConditions } from '@audius/common/models' export type TrackAvailabilitySelectionProps = { selected: boolean diff --git a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/AccessAndSaleField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/AccessAndSaleField.tsx index ed9e4699274..1eea829ff00 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/AccessAndSaleField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/AccessAndSaleField.tsx @@ -1,14 +1,13 @@ import { useMemo } from 'react' +import { type Nullable } from '@audius/common' +import type { FieldVisibility, AccessConditions } from '@audius/common/models' import { + isContentCollectibleGated, isContentFollowGated, - type FieldVisibility, - type Nullable, - type AccessConditions, isContentTipGated, - isContentCollectibleGated, isContentUSDCPurchaseGated -} from '@audius/common' +} from '@audius/common/models' import { useField } from 'formik' import type { ContextualMenuProps } from 'app/components/core' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx index 556f80edea6..896a1c0f2fe 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx @@ -1,7 +1,8 @@ import { useCallback, useEffect, useMemo, useRef } from 'react' -import { FeatureFlags, Name, isContentUSDCPurchaseGated } from '@audius/common' +import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { Name, isContentUSDCPurchaseGated } from '@audius/common/models' import { useField } from 'formik' import { Dimensions, View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateFieldLegacy.tsx b/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateFieldLegacy.tsx index 1bfe341da75..076ba601d62 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateFieldLegacy.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateFieldLegacy.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo, useRef, useState } from 'react' import type { Nullable } from '@audius/common' -import { Theme } from '@audius/common' +import { Theme } from '@audius/common/models' import { useField } from 'formik' import moment from 'moment' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/TagField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/TagField.tsx index aa8c3c5cb39..e0baf00f078 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/TagField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/TagField.tsx @@ -1,4 +1,4 @@ -import type { TrackMetadata } from '@audius/common' +import type { TrackMetadata } from '@audius/common/models' import { useField } from 'formik' import { TagInput } from 'app/components/core' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx index e88b9f3850e..af1dd9d9f6f 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx @@ -1,16 +1,16 @@ import { useCallback, useMemo, useState } from 'react' -import type { Nullable, AccessConditions } from '@audius/common' +import type { Nullable } from '@audius/common' +import { FeatureFlags, removeNullable } from '@audius/common' +import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' import { - TrackAvailabilityType, + isContentCollectibleGated, isContentFollowGated, isContentTipGated, - isContentCollectibleGated, - FeatureFlags, - removeNullable, - isContentUSDCPurchaseGated -} from '@audius/common' -import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' + isContentUSDCPurchaseGated, + TrackAvailabilityType +} from '@audius/common/models' +import type { AccessConditions } from '@audius/common/models' import { useField, useFormikContext } from 'formik' import IconCaretLeft from 'app/assets/images/iconCaretLeft.svg' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx index 40627fd60cf..f2acdbeaa0e 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx @@ -1,11 +1,9 @@ import { useCallback, useMemo } from 'react' -import type { Nullable, AccessConditions } from '@audius/common' -import { - Chain, - collectiblesSelectors, - isContentCollectibleGated -} from '@audius/common' +import type { Nullable } from '@audius/common' +import { collectiblesSelectors } from '@audius/common' +import { Chain, isContentCollectibleGated } from '@audius/common/models' +import type { AccessConditions } from '@audius/common/models' import { useField } from 'formik' import { View, Image } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx index 5dd87c96fe6..eaaa84ca18d 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx @@ -1,12 +1,8 @@ import { useCallback, useEffect, useState } from 'react' import type { Nullable } from '@audius/common' -import { - Theme, - dayjs, - remixSettingsActions, - removeNullable -} from '@audius/common' +import { dayjs, remixSettingsActions, removeNullable } from '@audius/common' +import { Theme } from '@audius/common/models' import { useField } from 'formik' import moment from 'moment' import { Dimensions, View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx index 83c5c9e71c7..65a74d4fdd2 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx @@ -1,15 +1,18 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import type { Nullable, AccessConditions } from '@audius/common' +import type { Nullable } from '@audius/common' import { createRemixOfMetadata, - isContentCollectibleGated, - isContentUSDCPurchaseGated, remixSettingsActions, - remixSettingsSelectors, - Status + remixSettingsSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { + Status, + isContentCollectibleGated, + isContentUSDCPurchaseGated +} from '@audius/common/models' +import type { AccessConditions } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import { useField } from 'formik' import { debounce } from 'lodash' diff --git a/packages/mobile/src/screens/explore-screen/smartCollections.ts b/packages/mobile/src/screens/explore-screen/smartCollections.ts index 0774a273f9e..4fb971c68b0 100644 --- a/packages/mobile/src/screens/explore-screen/smartCollections.ts +++ b/packages/mobile/src/screens/explore-screen/smartCollections.ts @@ -1,6 +1,6 @@ import type { ComponentType } from 'react' -import { SmartCollectionVariant } from '@audius/common' +import { SmartCollectionVariant } from '@audius/common/models' import type { SvgProps } from 'react-native-svg' import { EXPLORE_HEAVY_ROTATION_PAGE, diff --git a/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx index 71ffe7195f6..041ecafa559 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx @@ -1,11 +1,8 @@ import { useEffect } from 'react' -import { - explorePageActions, - explorePageSelectors, - Status -} from '@audius/common' +import { explorePageActions, explorePageSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { ProfileList } from 'app/components/profile-list' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx index ebfb23560f8..27a3e8469ee 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx @@ -1,11 +1,11 @@ import { useEffect } from 'react' import { - Status, explorePageCollectionsSelectors, ExploreCollectionsVariant, explorePageCollectionsActions } from '@audius/common' +import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx index d8c8d0e6b82..0fdc6dfe59f 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx @@ -1,11 +1,11 @@ import { useEffect } from 'react' import { - Status, ExploreCollectionsVariant, explorePageCollectionsSelectors, explorePageCollectionsActions } from '@audius/common' +import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx index b97c3e135f6..86fdedf2a1b 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx @@ -1,11 +1,8 @@ import { useEffect } from 'react' -import { - Status, - explorePageSelectors, - explorePageActions -} from '@audius/common' +import { explorePageSelectors, explorePageActions } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { useSelector, useDispatch } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx b/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx index b88224c3b38..0d5854d1494 100644 --- a/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx @@ -4,10 +4,10 @@ import type { CommonState } from '@audius/common' import { SavedPageTabs, reachabilitySelectors, - statusIsNotFinalized, savedPageSelectors, LibraryCategory } from '@audius/common' +import { statusIsNotFinalized } from '@audius/common/models' import { useSelector } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx b/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx index 56612ad7e95..036a1f35340 100644 --- a/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx @@ -3,12 +3,14 @@ import { useCallback, useState } from 'react' import type { CommonState } from '@audius/common' import { SavedPageTabs, - CreatePlaylistSource, LibraryCategory, reachabilitySelectors, - statusIsNotFinalized, savedPageSelectors } from '@audius/common' +import { + CreatePlaylistSource, + statusIsNotFinalized +} from '@audius/common/models' import Animated, { Layout } from 'react-native-reanimated' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/TracksTab.tsx b/packages/mobile/src/screens/favorites-screen/TracksTab.tsx index 1c2b708cd37..541d3a9a576 100644 --- a/packages/mobile/src/screens/favorites-screen/TracksTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/TracksTab.tsx @@ -1,11 +1,9 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import type { ID, Nullable, Track, UID, User } from '@audius/common' +import type { Nullable } from '@audius/common' import { LibraryCategory, - PlaybackSource, SavedPageTabs, - Status, cacheTracksSelectors, cacheUsersSelectors, reachabilitySelectors, @@ -13,6 +11,8 @@ import { savedPageSelectors, savedPageTracksLineupActions as tracksActions } from '@audius/common' +import { PlaybackSource, Status } from '@audius/common/models' +import type { ID, UID, Track, User } from '@audius/common/models' import { debounce, isEqual } from 'lodash' import Animated, { Layout } from 'react-native-reanimated' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/selectors.ts b/packages/mobile/src/screens/favorites-screen/selectors.ts index d928bbe5443..ea547383a0b 100644 --- a/packages/mobile/src/screens/favorites-screen/selectors.ts +++ b/packages/mobile/src/screens/favorites-screen/selectors.ts @@ -1,10 +1,5 @@ -import type { - Cacheable, - Collection, - CommonState, - ID, - User -} from '@audius/common' +import type { CommonState } from '@audius/common' +import type { Cacheable, Collection, ID, User } from '@audius/common/models' const matchesFilter = ( playlist: Collection, diff --git a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts index 47fe77e6ca5..e06a32015f2 100644 --- a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts +++ b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts @@ -6,13 +6,13 @@ import { cacheCollectionsSelectors, reachabilitySelectors, shallowCompare, - Status, useAllPaginatedQuery, savedPageSelectors, filterCollections } from '@audius/common' import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import uniq from 'lodash/uniq' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts b/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts index cade8526561..046c91b9caa 100644 --- a/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts +++ b/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts @@ -2,11 +2,11 @@ import { useCallback } from 'react' import { savedPageTracksLineupActions, - Kind, makeUid, cacheActions, savedPageSelectors } from '@audius/common' +import { Kind } from '@audius/common/models' import { orderBy } from 'lodash' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx b/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx index b18fdc3b713..7652074f9c6 100644 --- a/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx +++ b/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { FeedFilter, feedPageSelectors, modalsActions } from '@audius/common' +import { feedPageSelectors, modalsActions } from '@audius/common' +import { FeedFilter } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { ScreenHeaderButton } from 'app/components/core' diff --git a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx index 5cd153638fb..76632c89a7d 100644 --- a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx +++ b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx @@ -1,13 +1,13 @@ import { useCallback } from 'react' import { - Name, lineupSelectors, feedPageLineupActions as feedActions, feedPageSelectors, FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { useDispatch } from 'react-redux' import IconFeed from 'app/assets/images/iconFeed.svg' diff --git a/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx b/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx index 9a3f67d3bf7..eb8ba99e7b4 100644 --- a/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx +++ b/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx @@ -1,12 +1,12 @@ import { useEffect } from 'react' import { - Status, explorePageCollectionsSelectors, ExploreCollectionsVariant, explorePageCollectionsActions } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/EntityLink.tsx b/packages/mobile/src/screens/notifications-screen/Notification/EntityLink.tsx index 67ef90b00bb..69fec1123d5 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/EntityLink.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notification/EntityLink.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import type { Collection, Track } from '@audius/common' +import type { Collection, Track } from '@audius/common/models' import { Text } from 'app/components/core' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/ProfilePicture.tsx b/packages/mobile/src/screens/notifications-screen/Notification/ProfilePicture.tsx index 3f266dc1098..650840f9657 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/ProfilePicture.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notification/ProfilePicture.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import type { ID } from '@audius/common' +import type { ID } from '@audius/common/models' import { TouchableOpacity } from 'react-native' import type { ProfilePictureProps as ProfilePictureBaseProps } from 'app/components/user' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/ProfilePictureList.tsx b/packages/mobile/src/screens/notifications-screen/Notification/ProfilePictureList.tsx index 825bbbb3807..76185773de5 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/ProfilePictureList.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notification/ProfilePictureList.tsx @@ -1,5 +1,5 @@ -import type { User } from '@audius/common' import { formatCount } from '@audius/common' +import type { User } from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' import { View, Text } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/UserNameLink.tsx b/packages/mobile/src/screens/notifications-screen/Notification/UserNameLink.tsx index 568d7af7e6b..e4210d68cd8 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/UserNameLink.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notification/UserNameLink.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import type { User as UserType } from '@audius/common' +import type { User as UserType } from '@audius/common/models' import type { TextProps } from 'app/components/core' import { Text } from 'app/components/core' diff --git a/packages/mobile/src/screens/notifications-screen/NotificationList.tsx b/packages/mobile/src/screens/notifications-screen/NotificationList.tsx index b7927526ade..86c37470def 100644 --- a/packages/mobile/src/screens/notifications-screen/NotificationList.tsx +++ b/packages/mobile/src/screens/notifications-screen/NotificationList.tsx @@ -1,11 +1,8 @@ import { useCallback, useContext, useEffect, useState } from 'react' import type { Notification } from '@audius/common' -import { - notificationsActions, - Status, - notificationsSelectors -} from '@audius/common' +import { notificationsActions, notificationsSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { useIsFocused } from '@react-navigation/native' import type { ViewToken } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx index 2835c10aee3..c56a22d840b 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx @@ -1,9 +1,7 @@ import { useCallback } from 'react' -import type { - ChallengeRewardID, - ChallengeRewardNotification as ChallengeRewardNotificationType -} from '@audius/common' +import type { ChallengeRewardNotification as ChallengeRewardNotificationType } from '@audius/common' +import type { ChallengeRewardID } from '@audius/common/models' import { Platform } from 'react-native' import IconAudius from 'app/assets/images/iconAudius.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx index e5132d9ef83..6461c763c1c 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx @@ -1,13 +1,13 @@ import { useCallback } from 'react' import type { - User, Nullable, EntityType, MilestoneNotification as MilestoneNotificationType } from '@audius/common' import { notificationsSelectors, Achievement } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import type { User } from '@audius/common/models' import { fullProfilePage } from 'audius-client/src/utils/route' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterAndSupportingNotificationContent.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterAndSupportingNotificationContent.tsx index 808869660aa..61084c6b3c6 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterAndSupportingNotificationContent.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterAndSupportingNotificationContent.tsx @@ -1,4 +1,4 @@ -import type { User } from '@audius/common' +import type { User } from '@audius/common/models' import { View } from 'react-native' import IconTip from 'app/assets/images/iconTip.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx index 9324e8a895c..b3ea9aef6ac 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx @@ -5,7 +5,8 @@ import type { Nullable, TrackEntity } from '@audius/common' -import { Name, notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { make } from 'common/store/analytics/actions' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx index 1dcc5a7f6eb..08c50cd437d 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx @@ -5,7 +5,8 @@ import type { Nullable, TrendingPlaylistNotification as TrendingPlaylistNotificationType } from '@audius/common' -import { Name, notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { useSelector } from 'react-redux' import IconTrending from 'app/assets/images/iconTrending.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx index 8ff2e31457a..12b60a670aa 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx @@ -5,7 +5,8 @@ import type { TrackEntity, TrendingTrackNotification as TrendingTrackNotificationType } from '@audius/common' -import { Name, notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { useSelector } from 'react-redux' import IconTrending from 'app/assets/images/iconTrending.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx index f92214c477f..9bce74e3fb2 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx @@ -5,7 +5,8 @@ import type { TrackEntity, TrendingUndergroundNotification as TrendingUndergroundNotificationType } from '@audius/common' -import { Name, notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { useSelector } from 'react-redux' import IconTrending from 'app/assets/images/iconTrending.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx index 02f54fd9f57..4a4240a2f79 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx @@ -5,7 +5,8 @@ import type { USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType, TrackEntity } from '@audius/common' -import { notificationsSelectors, Name } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import { make } from 'audius-client/src/common/store/analytics/actions' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx index 4b75cb0c5d2..a5f5034aa58 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx @@ -2,7 +2,6 @@ import { useCallback } from 'react' import type { Nullable, - StringUSDC, TrackEntity, USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType } from '@audius/common' @@ -11,6 +10,7 @@ import { notificationsSelectors, stringUSDCToBN } from '@audius/common' +import type { StringUSDC } from '@audius/common/models' import { useSelector } from 'react-redux' import IconCart from 'app/assets/images/iconCart.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/useGoToProfile.ts b/packages/mobile/src/screens/notifications-screen/Notifications/useGoToProfile.ts index b01d7a40cb0..42cfb00026a 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/useGoToProfile.ts +++ b/packages/mobile/src/screens/notifications-screen/Notifications/useGoToProfile.ts @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import type { User, Nullable } from '@audius/common' +import type { Nullable } from '@audius/common' +import type { User } from '@audius/common/models' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts index ae71dc48455..1cb2912b564 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts +++ b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react' import type { - User, Nullable, FavoriteNotification, FollowNotification, RepostNotification } from '@audius/common' import { notificationsUserListActions } from '@audius/common' +import type { User } from '@audius/common/models' import { useDispatch } from 'react-redux' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx index 804b805c1de..684e3abce91 100644 --- a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx +++ b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx @@ -1,12 +1,12 @@ import React, { useCallback } from 'react' -import type { BNUSDC } from '@audius/common' import { formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber, useAddFundsModal } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import type { BNUSDC } from '@audius/common/models' import BN from 'bn.js' import { TouchableOpacity, View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistLink.tsx b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistLink.tsx index faafc85226e..1ddf07bc372 100644 --- a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistLink.tsx +++ b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistLink.tsx @@ -1,4 +1,4 @@ -import type { User } from '@audius/common' +import type { User } from '@audius/common/models' import { TouchableOpacity, View } from 'react-native' import { Text } from 'app/components/core' diff --git a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx index 6716f75e431..9b77b9c6751 100644 --- a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx +++ b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx @@ -1,13 +1,14 @@ import { Fragment, useCallback, useEffect, useState } from 'react' -import type { CommonState, ID, User } from '@audius/common' +import type { CommonState } from '@audius/common' import { - FollowSource, usersSocialActions, relatedArtistsUISelectors, relatedArtistsUIActions, cacheUsersSelectors } from '@audius/common' +import { FollowSource } from '@audius/common/models' +import type { ID, User } from '@audius/common/models' import { isEmpty } from 'lodash' import { TouchableOpacity, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx b/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx index f56015ed57e..025729d3e46 100644 --- a/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx +++ b/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx @@ -1,12 +1,12 @@ import type { ReactNode } from 'react' import { useState, useCallback } from 'react' -import type { ID, Collectible } from '@audius/common' import { accountSelectors, collectibleDetailsUIActions, modalsActions } from '@audius/common' +import type { Collectible, ID } from '@audius/common/models' import type { ImageStyle, StyleProp, ViewStyle } from 'react-native' import { ImageBackground, Text, View } from 'react-native' import { SvgUri } from 'react-native-svg' diff --git a/packages/mobile/src/screens/profile-screen/MessageButton.tsx b/packages/mobile/src/screens/profile-screen/MessageButton.tsx index b7db9889e77..233876b07cc 100644 --- a/packages/mobile/src/screens/profile-screen/MessageButton.tsx +++ b/packages/mobile/src/screens/profile-screen/MessageButton.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' -import type { User } from '@audius/common' -import { Name, chatActions } from '@audius/common' +import { chatActions } from '@audius/common' +import type { User } from '@audius/common/models' +import { Name } from '@audius/common/models' import { useDispatch } from 'react-redux' import IconMessage from 'app/assets/images/iconMessage.svg' diff --git a/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx b/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx index bb90332566f..00b7a8afe94 100644 --- a/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx +++ b/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import type { ID } from '@audius/common' import { useInboxUnavailableModal } from '@audius/common' +import type { ID } from '@audius/common/models' import IconMessageLocked from 'app/assets/images/iconMessageLocked.svg' import { Button } from 'app/components/core' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx index a159bba4825..8a839c7f3c9 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx @@ -1,8 +1,8 @@ import { useEffect, useMemo } from 'react' -import type { Supporting } from '@audius/common' import { tippingActions, MAX_PROFILE_SUPPORTING_TILES } from '@audius/common' import { useRankedSupportingForUser } from '@audius/common/hooks' +import type { Supporting } from '@audius/common/models' import { FlatList } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx index 2e2ed2a2d48..3845ce7196f 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import type { Supporting } from '@audius/common' import { cacheUsersSelectors } from '@audius/common' +import type { Supporting } from '@audius/common/models' import { TIPPING_TOP_RANK_THRESHOLD } from 'audius-client/src/utils/constants' import type { StyleProp, ViewStyle } from 'react-native' import { ImageBackground, View } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx b/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx index 3a3bb6cfa8e..faecd9551ce 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx @@ -5,10 +5,10 @@ import { chatSelectors, chatActions, profilePageSelectors, - FollowSource, reachabilitySelectors, FeatureFlags } from '@audius/common' +import { FollowSource } from '@audius/common/models' import { View, Text } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx index 766ff62927e..de076f2cf84 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx @@ -1,8 +1,6 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { - Status, - ShareSource, profilePageSelectors, profilePageActions, reachabilitySelectors, @@ -12,6 +10,7 @@ import { FeatureFlags, relatedArtistsUIActions } from '@audius/common' +import { ShareSource, Status } from '@audius/common/models' import { PortalHost } from '@gorhom/portal' import { useFocusEffect } from '@react-navigation/native' import { Animated, View } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx index 2d7a8d4be9a..e8e553421b0 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx @@ -1,10 +1,7 @@ import { useEffect } from 'react' -import { - profilePageActions, - profilePageSelectors, - Status -} from '@audius/common' +import { profilePageActions, profilePageSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { useIsFocused } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx index a5c48baf3ef..988712d9e1b 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx @@ -1,8 +1,8 @@ import { useCallback, useMemo, useRef } from 'react' -import type { Collectible } from '@audius/common' import { accountSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import type { Collectible } from '@audius/common/models' import Clipboard from '@react-native-clipboard/clipboard' import type { FlatList as RNFlatList } from 'react-native' import { View, Text } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx index e88aa7ba0d9..34141ee0e5d 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx @@ -1,11 +1,7 @@ import { useEffect } from 'react' -import { - CreatePlaylistSource, - profilePageActions, - profilePageSelectors, - Status -} from '@audius/common' +import { profilePageActions, profilePageSelectors } from '@audius/common' +import { CreatePlaylistSource, Status } from '@audius/common/models' import { useIsFocused } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx index d235715785c..9fa550a766d 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx @@ -2,10 +2,10 @@ import { useMemo } from 'react' import { profilePageSelectors, - profilePageFeedLineupActions as feedActions, - Status + profilePageFeedLineupActions as feedActions } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { useRoute } from '@react-navigation/native' import { Lineup } from 'app/components/lineup' diff --git a/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx b/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx index c0c8b6949ad..e7cf11ff975 100644 --- a/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx +++ b/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import type { User } from '@audius/common' import { profilePageSelectors, profilePageActions } from '@audius/common' +import type { User } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import IconNotification from 'app/assets/images/iconNotification.svg' diff --git a/packages/mobile/src/screens/profile-screen/constants.ts b/packages/mobile/src/screens/profile-screen/constants.ts index 67eca618ec1..a08064bd991 100644 --- a/packages/mobile/src/screens/profile-screen/constants.ts +++ b/packages/mobile/src/screens/profile-screen/constants.ts @@ -1,3 +1,3 @@ -import type { BadgeTier } from '@audius/common' +import type { BadgeTier } from '@audius/common/models' export const MIN_COLLECTIBLES_TIER: BadgeTier = 'silver' diff --git a/packages/mobile/src/screens/profile-screen/selectors.ts b/packages/mobile/src/screens/profile-screen/selectors.ts index aca783147e0..17b0474e57a 100644 --- a/packages/mobile/src/screens/profile-screen/selectors.ts +++ b/packages/mobile/src/screens/profile-screen/selectors.ts @@ -1,8 +1,10 @@ import { useContext } from 'react' -import type { Nullable, User, CommonState } from '@audius/common' -import { Status, accountSelectors, profilePageSelectors } from '@audius/common' +import type { Nullable, CommonState } from '@audius/common' +import { accountSelectors, profilePageSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' +import type { User } from '@audius/common/models' import { useSelector } from 'react-redux' import { createSelector } from 'reselect' diff --git a/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx b/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx index 75c60c009a2..4047250abf1 100644 --- a/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx +++ b/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx @@ -1,7 +1,8 @@ import { useCallback, useEffect, useState } from 'react' -import { Status, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' import { useResetPassword } from '@audius/common/api' +import { Status } from '@audius/common/models' import AsyncStorage from '@react-native-async-storage/async-storage' import type { NavigationProp, RouteProp } from '@react-navigation/native' import { useNavigation, useRoute } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/root-screen/RootScreen.tsx b/packages/mobile/src/screens/root-screen/RootScreen.tsx index 17b8c8e13f3..0a8fdf48f3f 100644 --- a/packages/mobile/src/screens/root-screen/RootScreen.tsx +++ b/packages/mobile/src/screens/root-screen/RootScreen.tsx @@ -4,9 +4,9 @@ import { accountSelectors, chatActions, FeatureFlags, - playerActions, - Status + playerActions } from '@audius/common' +import { Status } from '@audius/common/models' import { createNativeStackNavigator } from '@react-navigation/native-stack' import { getHasCompletedAccount, diff --git a/packages/mobile/src/screens/root-screen/StatusBar.tsx b/packages/mobile/src/screens/root-screen/StatusBar.tsx index 65a7e731c86..63f7bab2cf7 100644 --- a/packages/mobile/src/screens/root-screen/StatusBar.tsx +++ b/packages/mobile/src/screens/root-screen/StatusBar.tsx @@ -1,4 +1,5 @@ -import { accountSelectors, Status } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { NavigationBar, StatusBar as RNStatusBar } from 'react-native-bars' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx index 7b24ed16148..ba3e66acd2b 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx @@ -1,6 +1,7 @@ import type { CommonState } from '@audius/common' -import { Status, searchResultsPageSelectors, SearchKind } from '@audius/common' +import { searchResultsPageSelectors, SearchKind } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { CollectionList } from 'app/components/collection-list/CollectionList' import { spacing } from 'app/styles/spacing' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx index 374db8bb8e9..41289042eb5 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx @@ -1,6 +1,7 @@ import type { CommonState } from '@audius/common' -import { searchResultsPageSelectors, Status, SearchKind } from '@audius/common' +import { searchResultsPageSelectors, SearchKind } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { CollectionList } from 'app/components/collection-list/CollectionList' import { spacing } from 'app/styles/spacing' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx index bf23b6230bd..f109d896863 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx @@ -1,6 +1,7 @@ import type { CommonState } from '@audius/common' -import { Status, searchResultsPageSelectors, SearchKind } from '@audius/common' +import { searchResultsPageSelectors, SearchKind } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { ProfileList } from 'app/components/profile-list' import { spacing } from 'app/styles/spacing' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx index e047599cbd2..1958d531350 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx @@ -1,6 +1,7 @@ import type { ReactNode } from 'react' -import { searchResultsPageSelectors, Status } from '@audius/common' +import { searchResultsPageSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { useSelector } from 'react-redux' import { WithLoader } from 'app/components/with-loader/WithLoader' diff --git a/packages/mobile/src/screens/search-screen/SearchBar.tsx b/packages/mobile/src/screens/search-screen/SearchBar.tsx index d05ec56c9a8..6afed5adbb0 100644 --- a/packages/mobile/src/screens/search-screen/SearchBar.tsx +++ b/packages/mobile/src/screens/search-screen/SearchBar.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect, useRef, useState } from 'react' -import { Status } from '@audius/common' import { useDebouncedCallback } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { fetchSearch, clearSearch diff --git a/packages/mobile/src/screens/search-screen/SearchResults/SearchItem.tsx b/packages/mobile/src/screens/search-screen/SearchResults/SearchItem.tsx index 05fdd8d7698..a1f4ce02c5b 100644 --- a/packages/mobile/src/screens/search-screen/SearchResults/SearchItem.tsx +++ b/packages/mobile/src/screens/search-screen/SearchResults/SearchItem.tsx @@ -1,7 +1,11 @@ import { useCallback } from 'react' -import { SquareSizes } from '@audius/common' -import type { SearchPlaylist, SearchTrack, SearchUser } from '@audius/common' +import type { + SearchUser, + SearchTrack, + SearchPlaylist +} from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx b/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx index d65fd054819..8145a232349 100644 --- a/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx @@ -4,9 +4,9 @@ import { accountSelectors, recoveryEmailActions, recoveryEmailSelectors, - modalsActions, - Status + modalsActions } from '@audius/common' +import { Status } from '@audius/common/models' import { Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx b/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx index f86d483786f..e1250540546 100644 --- a/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx @@ -1,6 +1,7 @@ import { useCallback, useEffect, useState } from 'react' -import { Status, accountSelectors, BooleanKeys } from '@audius/common' +import { accountSelectors, BooleanKeys } from '@audius/common' +import { Status } from '@audius/common/models' import * as signOnActions from 'common/store/pages/signon/actions' import { getHandleField } from 'common/store/pages/signon/selectors' import type { EditableField } from 'common/store/pages/signon/types' diff --git a/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx b/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx index 6363d5a8f48..5e73cbf1838 100644 --- a/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx +++ b/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx @@ -1,12 +1,8 @@ import { useCallback } from 'react' -import { - accountSelectors, - Name, - themeActions, - themeSelectors -} from '@audius/common' +import { accountSelectors, themeActions, themeSelectors } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import IconAppearance from 'app/assets/images/iconAppearance.svg' diff --git a/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx b/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx index 06fa3238e32..c29cf6bc2e1 100644 --- a/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx @@ -1,13 +1,12 @@ import { useCallback, useMemo } from 'react' -import type { ID, UID } from '@audius/common' import { - Status, - PlaybackSource, historyPageTracksLineupActions as tracksActions, historyPageSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { PlaybackSource, Status } from '@audius/common/models' +import type { ID, UID } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx index e4701c40ed7..71f9c137760 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx @@ -1,7 +1,8 @@ import React, { useState } from 'react' -import { Name, pickHandleSchema, useAudiusQueryContext } from '@audius/common' +import { pickHandleSchema, useAudiusQueryContext } from '@audius/common' import { socialMediaMessages } from '@audius/common/messages' +import { Name } from '@audius/common/models' import * as signOnActions from 'common/store/pages/signon/actions' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx index 18005fd2ab1..d0d5a392a86 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx @@ -4,9 +4,9 @@ import { useAudiusQueryContext, type TikTokProfileData, pickHandleSchema, - Name, formatTikTokProfile } from '@audius/common' +import { Name } from '@audius/common/models' import type { GestureResponderEvent } from 'react-native' import { useDispatch, useSelector } from 'react-redux' import { restrictedHandles } from 'utils/restrictedHandles' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/FollowArtistCard.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/FollowArtistCard.tsx index 8dfebd4defd..c2fbb45a59d 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/FollowArtistCard.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/FollowArtistCard.tsx @@ -1,7 +1,7 @@ import type { ChangeEvent } from 'react' import { useCallback, useContext } from 'react' -import type { UserMetadata } from '@audius/common' +import type { UserMetadata } from '@audius/common/models' import { css } from '@emotion/native' import { addFollowArtists, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx index b65b49a5370..6df0b014d13 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx @@ -3,7 +3,6 @@ import { useGetTopArtistsInGenre, useGetFeaturedArtists } from '@audius/common/api' -import {} from '@audius/common' import { css } from '@emotion/native' import { useIsFocused, type RouteProp } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx index e58bdc37970..83a64d69ba5 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx @@ -1,8 +1,8 @@ import { createContext, useCallback, useEffect, useMemo, useState } from 'react' -import type { ID } from '@audius/common' import { encodeHashId } from '@audius/common' import { useGetUserTracksByHandle, useGetUserById } from '@audius/common/api' +import type { ID } from '@audius/common/models' import { Formik } from 'formik' import TrackPlayer, { RepeatMode, State } from 'react-native-track-player' import { useAsync, useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/signon/ProfileAuto.tsx b/packages/mobile/src/screens/signon/ProfileAuto.tsx index bd93bcdabd7..4a94f76cbeb 100644 --- a/packages/mobile/src/screens/signon/ProfileAuto.tsx +++ b/packages/mobile/src/screens/signon/ProfileAuto.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect, useState } from 'react' -import type { Name } from '@audius/common' import { BooleanKeys } from '@audius/common' +import type { Name } from '@audius/common/models' import type { NativeStackScreenProps } from '@react-navigation/native-stack' import * as signOnActions from 'common/store/pages/signon/actions' import { diff --git a/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx b/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx index 6a10d05e433..7e81a54da37 100644 --- a/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx +++ b/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { - FavoriteSource, accountSelectors, smartCollectionPageSelectors, collectionsSocialActions, @@ -9,6 +8,7 @@ import { playlistLibraryHelpers, collectionPageActions } from '@audius/common' +import { FavoriteSource } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import { View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx b/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx index 263031dc38d..42556b7ba4b 100644 --- a/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx @@ -1,5 +1,5 @@ -import type { BNWei } from '@audius/common' import { formatWei, walletSelectors, isNullOrUndefined } from '@audius/common' +import type { BNWei } from '@audius/common/models' import { Image, Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/BecomeTopSupporter.tsx b/packages/mobile/src/screens/tip-artist-screen/BecomeTopSupporter.tsx index 50fc3746677..03fd999200d 100644 --- a/packages/mobile/src/screens/tip-artist-screen/BecomeTopSupporter.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/BecomeTopSupporter.tsx @@ -1,5 +1,5 @@ -import type { BNWei } from '@audius/common' import { formatWei } from '@audius/common' +import type { BNWei } from '@audius/common/models' import { Platform, Text } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx index f9a8258dc9f..b0cadd75eb3 100644 --- a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx @@ -1,6 +1,5 @@ import { useCallback, useEffect, useState } from 'react' -import type { BNWei, StringWei } from '@audius/common' import { stringWeiToBN, accountSelectors, @@ -10,6 +9,7 @@ import { walletActions } from '@audius/common' import { useGetFirstOrTopSupporter } from '@audius/common/hooks' +import type { StringWei, BNWei } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import BN from 'bn.js' import { Platform } from 'react-native' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx index 2d3caf85f87..9dade6ac014 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' -import type { SolanaWalletAddress } from '@audius/common' import { formatNumberCommas, accountSelectors, tippingSelectors } from '@audius/common' +import type { SolanaWalletAddress } from '@audius/common/models' import { useNavigation } from '@react-navigation/native' import { Platform } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/DownloadRow.tsx b/packages/mobile/src/screens/track-screen/DownloadRow.tsx index 9d63853b7ba..42a25c2d8f6 100644 --- a/packages/mobile/src/screens/track-screen/DownloadRow.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadRow.tsx @@ -1,13 +1,10 @@ import { useCallback } from 'react' -import type { CommonState, ID } from '@audius/common' -import { - Name, - cacheTracksSelectors, - tracksSocialActions, - DownloadQuality -} from '@audius/common' +import type { CommonState } from '@audius/common' +import { cacheTracksSelectors, tracksSocialActions } from '@audius/common' import { useDownloadableContentAccess } from '@audius/common/hooks' +import { Name, DownloadQuality } from '@audius/common/models' +import type { ID } from '@audius/common/models' import { css } from '@emotion/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/DownloadSection.tsx b/packages/mobile/src/screens/track-screen/DownloadSection.tsx index 54aaa9ef3d0..ecdf2f6018e 100644 --- a/packages/mobile/src/screens/track-screen/DownloadSection.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadSection.tsx @@ -1,16 +1,16 @@ import { useCallback, useState } from 'react' import { - DownloadQuality, - ModalSource, cacheTracksSelectors, usePremiumContentPurchaseModal } from '@audius/common' -import type { ID, CommonState } from '@audius/common' +import type { CommonState } from '@audius/common' import { useCurrentStems, useDownloadableContentAccess } from '@audius/common/hooks' +import { ModalSource, DownloadQuality } from '@audius/common/models' +import type { ID } from '@audius/common/models' import { USDC } from '@audius/fixed-decimal' import { css } from '@emotion/native' import { LayoutAnimation } from 'react-native' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx index cbe780b0e30..3d6db8c4f48 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx @@ -2,15 +2,8 @@ import { useCallback } from 'react' import { Genre, - SquareSizes, removeNullable, playerSelectors, - FavoriteSource, - RepostSource, - ShareSource, - Name, - PlaybackSource, - FavoriteType, getCanonicalName, formatSeconds, formatDate, @@ -27,12 +20,27 @@ import { reachabilitySelectors, playbackPositionSelectors, FeatureFlags, - isContentUSDCPurchaseGated, - isContentCollectibleGated, queueSelectors } from '@audius/common' -import type { UID, User, SearchTrack, SearchUser, Track } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { + Name, + ShareSource, + RepostSource, + FavoriteSource, + PlaybackSource, + FavoriteType, + SquareSizes, + isContentCollectibleGated, + isContentUSDCPurchaseGated +} from '@audius/common/models' +import type { + UID, + SearchUser, + SearchTrack, + Track, + User +} from '@audius/common/models' import moment from 'moment' import { Image, View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx index a7acc534b6e..3ba899d3116 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx @@ -1,9 +1,10 @@ import { useCallback } from 'react' -import { Name, tracksSocialActions } from '@audius/common' -import type { ID } from '@audius/common' +import { tracksSocialActions } from '@audius/common' import type { ButtonType as DownloadButtonType } from '@audius/common/hooks' import { ButtonState, useDownloadTrackButtons } from '@audius/common/hooks' +import { Name } from '@audius/common/models' +import type { ID } from '@audius/common/models' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenMainContent.tsx b/packages/mobile/src/screens/track-screen/TrackScreenMainContent.tsx index efc46593212..36256e84fd0 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenMainContent.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenMainContent.tsx @@ -1,14 +1,14 @@ import type { ReactNode } from 'react' +import type { Nullable } from '@audius/common' import type { ID, LineupState, - Track, - User, - Nullable, + SearchUser, SearchTrack, - SearchUser -} from '@audius/common' + Track, + User +} from '@audius/common/models' import { View } from 'react-native' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx b/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx index 295e24804fc..de54aa29630 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' -import type { ID, Track, User } from '@audius/common' -import { - SquareSizes, - cacheTracksSelectors, - cacheUsersSelectors -} from '@audius/common' +import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common' +import type { ID, Track, User } from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' import { Pressable, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenRemixes.tsx b/packages/mobile/src/screens/track-screen/TrackScreenRemixes.tsx index 65f6bc65cbf..1af94695dbe 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenRemixes.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenRemixes.tsx @@ -1,4 +1,4 @@ -import type { ID } from '@audius/common' +import type { ID } from '@audius/common/models' import { View } from 'react-native' import IconArrow from 'app/assets/images/iconArrow.svg' diff --git a/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx b/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx index 2286f250f96..72c7cab3247 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx @@ -1,13 +1,12 @@ import { useCallback, useEffect } from 'react' import { - Name, - TimeRange, lineupSelectors, trendingPageLineupActions, trendingPageActions, trendingPageSelectors } from '@audius/common' +import { Name, TimeRange } from '@audius/common/models' import { useNavigation } from '@react-navigation/native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx b/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx index 5ba1b67a1b1..5062c497e14 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx @@ -1,4 +1,5 @@ -import { TimeRange, trendingPageSelectors } from '@audius/common' +import { trendingPageSelectors } from '@audius/common' +import { TimeRange } from '@audius/common/models' import { useSelector } from 'react-redux' import IconAllTime from 'app/assets/images/iconAllTime.svg' diff --git a/packages/mobile/src/screens/upload-screen/screens/SelectTrackScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/SelectTrackScreen.tsx index 53c468b6637..40112843c65 100644 --- a/packages/mobile/src/screens/upload-screen/screens/SelectTrackScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/SelectTrackScreen.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useState } from 'react' -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import DocumentPicker from 'react-native-document-picker' import { useAsyncFn } from 'react-use' diff --git a/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx b/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx index c8e1a5f2d07..1a06d7056dd 100644 --- a/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx +++ b/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx @@ -1,8 +1,8 @@ -import type { User } from '@audius/common' import { tippingSelectors, topSupportersUserListSelectors } from '@audius/common' +import type { User } from '@audius/common/models' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx b/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx index 1bc5ca39f1c..6938a7c69b7 100644 --- a/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx +++ b/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx @@ -1,5 +1,5 @@ -import type { User } from '@audius/common' import { tippingSelectors, supportingUserListSelectors } from '@audius/common' +import type { User } from '@audius/common/models' import { useSelector } from 'react-redux' import { Tip } from './Tip' diff --git a/packages/mobile/src/screens/user-list-screen/Tip.tsx b/packages/mobile/src/screens/user-list-screen/Tip.tsx index e97d2d807ef..22843414ee9 100644 --- a/packages/mobile/src/screens/user-list-screen/Tip.tsx +++ b/packages/mobile/src/screens/user-list-screen/Tip.tsx @@ -1,5 +1,5 @@ -import type { StringWei } from '@audius/common' import { formatWei, stringWeiToBN } from '@audius/common' +import type { StringWei } from '@audius/common/models' import { View } from 'react-native' import IconTip from 'app/assets/images/iconTip.svg' diff --git a/packages/mobile/src/screens/user-list-screen/UserList.tsx b/packages/mobile/src/screens/user-list-screen/UserList.tsx index cd711426f59..013e4c81a1b 100644 --- a/packages/mobile/src/screens/user-list-screen/UserList.tsx +++ b/packages/mobile/src/screens/user-list-screen/UserList.tsx @@ -1,11 +1,12 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' -import type { ID, User, UserListStoreState, CommonState } from '@audius/common' +import type { UserListStoreState, CommonState } from '@audius/common' import { cacheUsersSelectors, userListActions, userListSelectors } from '@audius/common' +import type { ID, User } from '@audius/common/models' import { useFocusEffect, useIsFocused } from '@react-navigation/native' import { range } from 'lodash' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/user-list-screen/UserListItem.tsx b/packages/mobile/src/screens/user-list-screen/UserListItem.tsx index bc87e0d1e0a..d28a116ec7c 100644 --- a/packages/mobile/src/screens/user-list-screen/UserListItem.tsx +++ b/packages/mobile/src/screens/user-list-screen/UserListItem.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' -import type { User } from '@audius/common' -import { FollowSource, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' +import type { User } from '@audius/common/models' +import { FollowSource } from '@audius/common/models' import { Pressable, View, Animated } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx b/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx index d8b38507573..49b6bc994be 100644 --- a/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import type { BNWei, Chain } from '@audius/common' import { formatWei, tokenDashboardPageActions } from '@audius/common' +import type { Chain, BNWei } from '@audius/common/models' import Clipboard from '@react-native-clipboard/clipboard' import { View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx b/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx index 22a23e86ad8..0615ba70af5 100644 --- a/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx @@ -1,5 +1,6 @@ import type { AssociatedWallet } from '@audius/common' -import { Chain, tokenDashboardPageSelectors } from '@audius/common' +import { tokenDashboardPageSelectors } from '@audius/common' +import { Chain } from '@audius/common/models' import { FlatList, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx b/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx index efe4baea2bf..8bb654e52de 100644 --- a/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx @@ -1,10 +1,7 @@ import { useCallback } from 'react' -import { - accountSelectors, - tokenDashboardPageActions, - Theme -} from '@audius/common' +import { accountSelectors, tokenDashboardPageActions } from '@audius/common' +import { Theme } from '@audius/common/models' import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/services/monitoringCallbacks.ts b/packages/mobile/src/services/monitoringCallbacks.ts index c60d4fe8438..88f4cbda3d9 100644 --- a/packages/mobile/src/services/monitoringCallbacks.ts +++ b/packages/mobile/src/services/monitoringCallbacks.ts @@ -1,5 +1,5 @@ -import type { MonitorPayload, ServiceMonitorType } from '@audius/common' import { IntKeys } from '@audius/common' +import type { ServiceMonitorType, MonitorPayload } from '@audius/common/models' import { track } from 'app/services/analytics' import { EventNames } from 'app/types/analytics' diff --git a/packages/mobile/src/services/offline-downloader/offline-storage.ts b/packages/mobile/src/services/offline-downloader/offline-storage.ts index db1dba2e1de..2ee0d9ffafa 100644 --- a/packages/mobile/src/services/offline-downloader/offline-storage.ts +++ b/packages/mobile/src/services/offline-downloader/offline-storage.ts @@ -1,15 +1,15 @@ import path from 'path' +import type { Nullable } from '@audius/common' +import { allSettled } from '@audius/common' import type { - Collection, CollectionMetadata, + Collection, ID, - Nullable, Track, - UserMetadata, - UserTrackMetadata -} from '@audius/common' -import { allSettled } from '@audius/common' + UserTrackMetadata, + UserMetadata +} from '@audius/common/models' import RNFetchBlob from 'rn-fetch-blob' const { diff --git a/packages/mobile/src/services/remote-config/remote-config-instance.ts b/packages/mobile/src/services/remote-config/remote-config-instance.ts index 235d475ab03..71e5314bbf5 100644 --- a/packages/mobile/src/services/remote-config/remote-config-instance.ts +++ b/packages/mobile/src/services/remote-config/remote-config-instance.ts @@ -1,5 +1,6 @@ import type { Environment } from '@audius/common' -import { ErrorLevel, remoteConfig } from '@audius/common' +import { remoteConfig } from '@audius/common' +import { ErrorLevel } from '@audius/common/models' import * as optimizely from '@optimizely/optimizely-sdk' import AsyncStorage from '@react-native-async-storage/async-storage' import { Platform } from 'react-native' diff --git a/packages/mobile/src/store/account/sagas.ts b/packages/mobile/src/store/account/sagas.ts index b75f3db6d65..4943f9138e9 100644 --- a/packages/mobile/src/store/account/sagas.ts +++ b/packages/mobile/src/store/account/sagas.ts @@ -1,12 +1,11 @@ -import type { User } from '@audius/common' import { accountActions, getContext, removeNullable, - SquareSizes, - WidthSizes, accountSagas } from '@audius/common' +import type { User } from '@audius/common/models' +import { SquareSizes, WidthSizes } from '@audius/common/models' import webAccountSagas from 'common/store/account/sagas' import { updateProfileAsync } from 'common/store/profile/sagas' import FastImage from 'react-native-fast-image' diff --git a/packages/mobile/src/store/drawers/slice.ts b/packages/mobile/src/store/drawers/slice.ts index 0a66908d365..62ecb1bc825 100644 --- a/packages/mobile/src/store/drawers/slice.ts +++ b/packages/mobile/src/store/drawers/slice.ts @@ -1,4 +1,5 @@ -import type { ID, Nullable } from '@audius/common' +import type { Nullable } from '@audius/common' +import type { ID } from '@audius/common/models' import type { PayloadAction } from '@reduxjs/toolkit' import { createSlice } from '@reduxjs/toolkit' diff --git a/packages/mobile/src/store/offline-downloads/sagas/getStaleTracks.ts b/packages/mobile/src/store/offline-downloads/sagas/getStaleTracks.ts index ef79b12016b..1909596a849 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/getStaleTracks.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/getStaleTracks.ts @@ -1,4 +1,4 @@ -import type { ID } from '@audius/common' +import type { ID } from '@audius/common/models' import moment from 'moment' import { select } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts index e0f7c2a8be2..80525579ac1 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts @@ -1,10 +1,9 @@ -import type { CollectionMetadata, UserCollectionMetadata } from '@audius/common' -import { - removeNullable, - SquareSizes, - accountSelectors, - getContext -} from '@audius/common' +import { removeNullable, accountSelectors, getContext } from '@audius/common' +import type { + CollectionMetadata, + UserCollectionMetadata +} from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import RNFetchBlob from 'rn-fetch-blob' import { select, call, put, take, race, all } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts index c3cde316a81..256c71f423a 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts @@ -1,19 +1,19 @@ -import type { - ID, - QueryParams, - Track, - TrackMetadata, - UserTrackMetadata -} from '@audius/common' +import type { QueryParams } from '@audius/common' import { getQueryParams, removeNullable, - SquareSizes, encodeHashId, accountSelectors, getContext, gatedContentSelectors } from '@audius/common' +import type { + ID, + TrackMetadata, + Track, + UserTrackMetadata +} from '@audius/common/models' +import { SquareSizes } from '@audius/common/models' import RNFetchBlob from 'rn-fetch-blob' import { select, call, put, all, take, race } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/playCounterWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/playCounterWorker.ts index d716f439f52..156255895e6 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/playCounterWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/playCounterWorker.ts @@ -1,5 +1,5 @@ -import type { ID } from '@audius/common' import { tracksSocialActions } from '@audius/common' +import type { ID } from '@audius/common/models' import { put } from 'typed-redux-saga' import { make, track } from 'app/services/analytics' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts index 6e7adca3e04..49b51c43339 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts @@ -1,9 +1,9 @@ -import type { ID } from '@audius/common' import { getContext, accountSelectors, cacheTracksSelectors } from '@audius/common' +import type { ID } from '@audius/common/models' import moment from 'moment' import { put, select, call, take, race } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/syncCollectionWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/syncCollectionWorker.ts index fe3b22b8c09..8a173278419 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/syncCollectionWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/syncCollectionWorker.ts @@ -1,9 +1,9 @@ -import type { DownloadReason, ID } from '@audius/common' import { cacheCollectionsSelectors, accountSelectors, getContext } from '@audius/common' +import type { ID, DownloadReason } from '@audius/common/models' import { difference } from 'lodash' import moment from 'moment' import { call, put, race, select, take } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts index b37d072dc4b..862c01d58ea 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts @@ -1,11 +1,12 @@ +import { cacheActions, makeUid } from '@audius/common' import type { CollectionMetadata, ID, - TrackMetadata, UID, + TrackMetadata, UserMetadata -} from '@audius/common' -import { cacheActions, Kind, makeUid } from '@audius/common' +} from '@audius/common/models' +import { Kind } from '@audius/common/models' import { call, select, put } from 'typed-redux-saga' import { diff --git a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts index 169dd0717b6..cbe17c64ae4 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts @@ -1,9 +1,9 @@ import { accountSelectors, collectionsSocialActions, - FavoriteSource, getContext } from '@audius/common' +import { FavoriteSource } from '@audius/common/models' import { takeEvery, select, put, call } from 'typed-redux-saga' import { make, track } from 'app/services/analytics' diff --git a/packages/mobile/src/store/offline-downloads/sagas/utils/isCollectionDownloadable.ts b/packages/mobile/src/store/offline-downloads/sagas/utils/isCollectionDownloadable.ts index 2a1fd68e721..17b8311b3cc 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/utils/isCollectionDownloadable.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/utils/isCollectionDownloadable.ts @@ -1,4 +1,4 @@ -import type { ID, UserCollectionMetadata } from '@audius/common' +import type { UserCollectionMetadata, ID } from '@audius/common/models' export const isCollectionDownloadable = ( collection: UserCollectionMetadata, diff --git a/packages/mobile/src/store/offline-downloads/sagas/utils/isTrackDownloadable.ts b/packages/mobile/src/store/offline-downloads/sagas/utils/isTrackDownloadable.ts index 7da5f4a3e2d..af18b2e7c85 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/utils/isTrackDownloadable.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/utils/isTrackDownloadable.ts @@ -1,4 +1,4 @@ -import type { ID, UserTrackMetadata } from '@audius/common' +import type { ID, UserTrackMetadata } from '@audius/common/models' export const isTrackDownloadable = ( track: UserTrackMetadata, diff --git a/packages/mobile/src/store/offline-downloads/sagas/watchSaveCollectionSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/watchSaveCollectionSaga.ts index ba3e241d009..431471aa9a6 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/watchSaveCollectionSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/watchSaveCollectionSaga.ts @@ -1,4 +1,5 @@ -import { collectionsSocialActions, FavoriteSource } from '@audius/common' +import { collectionsSocialActions } from '@audius/common' +import { FavoriteSource } from '@audius/common/models' import { takeEvery, select, put } from 'typed-redux-saga' import { make, track } from 'app/services/analytics' diff --git a/packages/mobile/src/store/offline-downloads/selectors.ts b/packages/mobile/src/store/offline-downloads/selectors.ts index a5b39835e28..01a32af5d96 100644 --- a/packages/mobile/src/store/offline-downloads/selectors.ts +++ b/packages/mobile/src/store/offline-downloads/selectors.ts @@ -1,5 +1,5 @@ -import type { ID, TrackMetadata } from '@audius/common' import { removeNullable, cacheTracksSelectors } from '@audius/common' +import type { ID, TrackMetadata } from '@audius/common/models' import type { AppState } from 'app/store' diff --git a/packages/mobile/src/store/offline-downloads/slice.ts b/packages/mobile/src/store/offline-downloads/slice.ts index 2bff7e76212..16802c20781 100644 --- a/packages/mobile/src/store/offline-downloads/slice.ts +++ b/packages/mobile/src/store/offline-downloads/slice.ts @@ -2,7 +2,7 @@ import type { OfflineCollectionMetadata, ID, OfflineTrackMetadata -} from '@audius/common' +} from '@audius/common/models' import AsyncStorage from '@react-native-async-storage/async-storage' import { NetInfoStateType } from '@react-native-community/netinfo' import type { PayloadAction } from '@reduxjs/toolkit' diff --git a/packages/mobile/src/store/offline-downloads/utils.ts b/packages/mobile/src/store/offline-downloads/utils.ts index cd31215960e..6fd9b03af9d 100644 --- a/packages/mobile/src/store/offline-downloads/utils.ts +++ b/packages/mobile/src/store/offline-downloads/utils.ts @@ -1,8 +1,8 @@ import type { - ID, OfflineCollectionMetadata, + ID, OfflineTrackMetadata -} from '@audius/common' +} from '@audius/common/models' import type { CollectionId } from './slice' diff --git a/packages/mobile/src/store/purchase-vendor/slice.ts b/packages/mobile/src/store/purchase-vendor/slice.ts index 888add127dd..c4b4f73bb07 100644 --- a/packages/mobile/src/store/purchase-vendor/slice.ts +++ b/packages/mobile/src/store/purchase-vendor/slice.ts @@ -1,4 +1,4 @@ -import type { PurchaseVendor } from '@audius/common' +import type { PurchaseVendor } from '@audius/common/models' import type { PayloadAction } from '@reduxjs/toolkit' import { createSlice } from '@reduxjs/toolkit' diff --git a/packages/mobile/src/store/rate-cta/sagas.ts b/packages/mobile/src/store/rate-cta/sagas.ts index 2130c65b018..76c68749a37 100644 --- a/packages/mobile/src/store/rate-cta/sagas.ts +++ b/packages/mobile/src/store/rate-cta/sagas.ts @@ -1,4 +1,4 @@ -import { Name } from '@audius/common' +import { Name } from '@audius/common/models' import { waitForWrite } from 'audius-client/src/utils/sagaHelpers' import { make } from 'common/store/analytics/actions' import { call, put, takeEvery } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/sign-out/sagas.ts b/packages/mobile/src/store/sign-out/sagas.ts index 46677ef9e1f..6ce6853c707 100644 --- a/packages/mobile/src/store/sign-out/sagas.ts +++ b/packages/mobile/src/store/sign-out/sagas.ts @@ -1,13 +1,12 @@ import { - Name, signOutActions, accountActions, feedPageLineupActions, themeActions, - Theme, waitForValue, tokenDashboardPageActions } from '@audius/common' +import { Name, Theme } from '@audius/common/models' import { setupBackend } from 'audius-client/src/common/store/backend/actions' import { getIsSettingUp } from 'audius-client/src/common/store/backend/selectors' import { resetSignOn } from 'audius-client/src/common/store/pages/signon/actions' diff --git a/packages/mobile/src/store/store.ts b/packages/mobile/src/store/store.ts index e68a22df62e..300cb58fc73 100644 --- a/packages/mobile/src/store/store.ts +++ b/packages/mobile/src/store/store.ts @@ -1,11 +1,11 @@ import type { CommonState, RemoteConfigState } from '@audius/common' import { toastActions, - ErrorLevel, remoteConfigReducer as remoteConfig, reducers as commonReducers, chatMiddleware } from '@audius/common' +import { ErrorLevel } from '@audius/common/models' import AsyncStorage from '@react-native-async-storage/async-storage' import backend from 'audius-client/src/common/store/backend/reducer' import type { BackendState } from 'audius-client/src/common/store/backend/types' diff --git a/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts b/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts index 1339d9b6a79..fc103c136b1 100644 --- a/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts +++ b/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts @@ -1,12 +1,12 @@ -import type { WalletAddress, Nullable } from '@audius/common' +import type { Nullable } from '@audius/common' import { accountSelectors, - Chain, getContext, tokenDashboardPageActions, - Name, getErrorMessage } from '@audius/common' +import type { WalletAddress } from '@audius/common/models' +import { Name, Chain } from '@audius/common/models' import bs58 from 'bs58' import { checkIsNewWallet } from 'common/store/pages/token-dashboard/checkIsNewWallet' import { getWalletInfo } from 'common/store/pages/token-dashboard/getWalletInfo' diff --git a/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts b/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts index 3560496dea5..ac346ac95a0 100644 --- a/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts +++ b/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts @@ -3,9 +3,9 @@ import { tokenDashboardPageSelectors, getContext, waitForValue, - Name, getErrorMessage } from '@audius/common' +import { Name } from '@audius/common/models' import bs58 from 'bs58' import { addWalletToUser } from 'common/store/pages/token-dashboard/addWalletToUser' import { associateNewWallet } from 'common/store/pages/token-dashboard/associateNewWallet' diff --git a/packages/mobile/src/styles/makeAnimations.ts b/packages/mobile/src/styles/makeAnimations.ts index 9b6f01e225f..2b0d69f3431 100644 --- a/packages/mobile/src/styles/makeAnimations.ts +++ b/packages/mobile/src/styles/makeAnimations.ts @@ -1,4 +1,4 @@ -import { Theme } from '@audius/common' +import { Theme } from '@audius/common/models' import type { ThemeColors } from 'app/utils/theme' import { diff --git a/packages/mobile/src/styles/makeStyles.ts b/packages/mobile/src/styles/makeStyles.ts index 83adcef8861..496958d2f5a 100644 --- a/packages/mobile/src/styles/makeStyles.ts +++ b/packages/mobile/src/styles/makeStyles.ts @@ -1,4 +1,4 @@ -import { Theme } from '@audius/common' +import { Theme } from '@audius/common/models' import type { ImageStyle, TextStyle, ViewStyle } from 'react-native' import { StyleSheet } from 'react-native' diff --git a/packages/mobile/src/types/analytics.ts b/packages/mobile/src/types/analytics.ts index e6914b1d034..f2defa636d1 100644 --- a/packages/mobile/src/types/analytics.ts +++ b/packages/mobile/src/types/analytics.ts @@ -1,8 +1,8 @@ import type { - AllTrackingEvents as CommonTrackingEvents, - ID -} from '@audius/common' -import { Name as CommonEventNames } from '@audius/common' + ID, + AllTrackingEvents as CommonTrackingEvents +} from '@audius/common/models' +import { Name as CommonEventNames } from '@audius/common/models' import type { OfflineJob } from 'app/store/offline-downloads/slice' @@ -196,4 +196,4 @@ export { FavoriteSource, FollowSource, CreatePlaylistSource -} from '@audius/common' +} from '@audius/common/models' diff --git a/packages/mobile/src/utils/challenges.tsx b/packages/mobile/src/utils/challenges.tsx index f6f4151e4b7..18d1768e2b4 100644 --- a/packages/mobile/src/utils/challenges.tsx +++ b/packages/mobile/src/utils/challenges.tsx @@ -1,5 +1,9 @@ -import { ChallengeName, challengeRewardsConfig } from '@audius/common' -import type { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common' +import { challengeRewardsConfig } from '@audius/common' +import type { + ChallengeRewardID, + OptimisticUserChallenge +} from '@audius/common/models' +import { ChallengeName } from '@audius/common/models' import type { ImageSourcePropType } from 'react-native' import { Platform } from 'react-native' diff --git a/packages/mobile/src/utils/convertRGBtoHex.ts b/packages/mobile/src/utils/convertRGBtoHex.ts index f5fe51e03d9..9d840e7a7d8 100644 --- a/packages/mobile/src/utils/convertRGBtoHex.ts +++ b/packages/mobile/src/utils/convertRGBtoHex.ts @@ -1,4 +1,4 @@ -import type { Color } from '@audius/common' +import type { Color } from '@audius/common/models' const componentToHex = (value: number) => { const hex = value.toString(16) diff --git a/packages/mobile/src/utils/dominantColors.ts b/packages/mobile/src/utils/dominantColors.ts index e1dca73eda9..f7f04bee89f 100644 --- a/packages/mobile/src/utils/dominantColors.ts +++ b/packages/mobile/src/utils/dominantColors.ts @@ -1,4 +1,4 @@ -import type { Color } from '@audius/common' +import type { Color } from '@audius/common/models' import Jimp from 'jimp' const DEFAULT_RGB = '#7e1bcc' diff --git a/packages/mobile/src/utils/reportToSentry.ts b/packages/mobile/src/utils/reportToSentry.ts index 31e4e0e88c6..49ac27cbfa0 100644 --- a/packages/mobile/src/utils/reportToSentry.ts +++ b/packages/mobile/src/utils/reportToSentry.ts @@ -1,5 +1,5 @@ -import type { ReportToSentryArgs, ErrorLevel } from '@audius/common' import { getErrorMessage } from '@audius/common' +import type { ErrorLevel, ReportToSentryArgs } from '@audius/common/models' import { captureException, withScope } from '@sentry/react-native' import type { SeverityLevel } from '@sentry/types' diff --git a/packages/mobile/src/utils/routes.tsx b/packages/mobile/src/utils/routes.tsx index d7839804e59..1acd2680b30 100644 --- a/packages/mobile/src/utils/routes.tsx +++ b/packages/mobile/src/utils/routes.tsx @@ -1,5 +1,5 @@ -import type { UserCollection, User } from '@audius/common' import { getHash, encodeUrlName } from '@audius/common' +import type { UserCollection, User } from '@audius/common/models' import { env } from 'app/env' From 24276aff70dc5d1546dede9abdcf4508b2c3ed4e Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 15:36:09 -0800 Subject: [PATCH 29/64] Update mobile utils --- packages/common/package.json | 3 +- packages/common/src/index.ts | 4 +- packages/convert-exports.js | 364 +++++++++--------- packages/get-type-exports.js | 2 +- packages/mobile/babel.config.js | 3 +- packages/mobile/src/app/ErrorBoundary.tsx | 2 +- packages/mobile/src/app/ThemeProvider.tsx | 2 +- .../audio-balance-pill/AUDIOBalancePill.tsx | 3 +- .../AudioBreakdownDrawer.tsx | 7 +- .../audio-breakdown-drawer/Wallet.tsx | 6 +- .../src/components/audio/AudioPlayer.tsx | 24 +- .../src/components/audio/GoogleCast.tsx | 2 +- .../audio/useSavePodcastProgress.ts | 2 +- .../AudioMatchingChallengeDrawerContent.tsx | 3 +- .../ChallengeReward.tsx | 2 +- .../ChallengeRewardsDrawerContent.tsx | 3 +- .../ChallengeRewardsDrawerProvider.tsx | 9 +- .../challenge-rewards-drawer/ClaimError.tsx | 2 +- .../TwitterShareButton.tsx | 2 +- .../CollectibleDate.tsx | 2 +- .../src/components/core/DynamicImage.tsx | 2 +- .../mobile/src/components/core/Hyperlink.tsx | 8 +- .../src/components/core/Screen/Screen.tsx | 2 +- .../mobile/src/components/core/TagInput.tsx | 2 +- .../DeletePlaylistConfirmationDrawer.tsx | 4 +- .../details-tile/DetailsProgressInfo.tsx | 7 +- .../components/details-tile/DetailsTile.tsx | 12 +- .../details-tile/DetailsTileHasAccess.tsx | 2 +- .../details-tile/DetailsTileNoAccess.tsx | 2 +- .../DuplicateAddConfirmationDrawer.tsx | 4 +- .../src/components/fields/ImageField.tsx | 2 +- .../src/components/fields/PriceField.tsx | 8 +- .../src/components/image/CollectionImage.tsx | 2 +- .../src/components/image/CoverPhoto.tsx | 2 +- .../src/components/image/TrackImage.tsx | 2 +- .../mobile/src/components/image/UserImage.tsx | 2 +- .../InboxUnavailableDrawer.tsx | 2 +- .../components/lineup-tile/CollectionTile.tsx | 2 +- .../src/components/lineup-tile/LineupTile.tsx | 8 +- .../lineup-tile/LineupTileAccessStatus.tsx | 2 +- .../lineup-tile/LineupTileActionButtons.tsx | 2 +- .../lineup-tile/LineupTileStats.tsx | 8 +- .../lineup-tile/LineupTileTopRight.tsx | 4 +- .../src/components/lineup-tile/TrackTile.tsx | 3 +- .../mobile/src/components/lineup/types.ts | 3 +- .../NavigationContainer.tsx | 3 +- .../now-playing-drawer/ActionsBar.tsx | 6 +- .../components/now-playing-drawer/Artwork.tsx | 3 +- .../now-playing-drawer/NowPlayingDrawer.tsx | 2 +- .../components/now-playing-drawer/PlayBar.tsx | 2 +- .../now-playing-drawer/TrackInfo.tsx | 3 +- .../useCurrentTrackDuration.ts | 3 +- .../CollectionDownloadStatusIndicator.tsx | 3 +- .../DownloadStatusIndicator.tsx | 2 +- .../OfflinePlaceholder.tsx | 2 +- .../payment-method/PaymentMethod.tsx | 12 +- .../PremiumTrackPurchaseDrawer.tsx | 2 +- .../PurchaseSummaryTable.tsx | 2 +- .../hooks/usePurchaseSummaryValues.ts | 2 +- .../rate-cta-drawer/RateCtaDrawer.tsx | 2 +- .../src/components/scrubber/Scrubber.tsx | 3 +- .../src/components/scrubber/usePosition.ts | 7 +- .../share-drawer/useShareToStory.tsx | 6 +- .../src/components/share-drawer/utils.ts | 2 +- .../ShareToTikTokDrawer.tsx | 2 +- .../SuggestedArtistsList.tsx | 5 +- .../components/summary-table/SummaryTable.tsx | 2 +- .../track-details-tile/TrackDetailsTile.tsx | 7 +- .../components/track-list/TrackListItem.tsx | 3 +- .../twitter-button/TwitterButton.tsx | 9 +- .../usdc-balance-pill/USDCBalancePill.tsx | 8 +- .../usdc-balance-row/USDCBalanceRow.tsx | 6 +- .../components/TextLink/ExternalLink.tsx | 3 +- .../mobile/src/hooks/useContentNodeImage.ts | 4 +- packages/mobile/src/hooks/useImageSize.ts | 2 +- packages/mobile/src/hooks/useManualToast.ts | 3 +- .../hooks/useSetTrackAvailabilityFields.ts | 2 +- packages/mobile/src/hooks/useToast.ts | 3 +- packages/mobile/src/models/Collection.ts | 2 +- .../left-nav-drawer/VanityMetrics.tsx | 2 +- .../src/screens/audio-screen/AudioScreen.tsx | 5 +- .../screens/audio-screen/ChallengeRewards.tsx | 6 +- .../mobile/src/screens/audio-screen/Panel.tsx | 6 +- .../chat-screen/ChatMessageListItem.tsx | 9 +- .../chat-screen/ChatMessagePlaylist.tsx | 9 +- .../screens/chat-screen/ChatMessageTrack.tsx | 8 +- .../src/screens/chat-screen/ChatScreen.tsx | 12 +- .../screens/chat-screen/ChatUnavailable.tsx | 3 +- .../screens/chat-screen/ChatUserListItem.tsx | 2 +- .../src/screens/chat-screen/LinkPreview.tsx | 7 +- .../src/screens/chat-screen/ReactionPopup.tsx | 6 +- .../collection-screen/CollectionScreen.tsx | 6 +- .../CollectionScreenDetailsTile.tsx | 5 +- .../useFetchCollectionLineup.ts | 4 +- .../src/screens/edit-profile-screen/types.ts | 2 +- .../edit-track-screen/EditTrackScreen.tsx | 2 +- .../CollectibleGatedAvailability.tsx | 2 +- .../components/SpecialAccessAvailability.tsx | 2 +- .../edit-track-screen/components/types.ts | 2 +- .../AccessAndSaleField/AccessAndSaleField.tsx | 2 +- .../fields/IsrcIswcField.tsx | 2 +- .../fields/LicenseTypeField.tsx | 2 +- .../fields/ReleaseDateField.tsx | 3 +- .../fields/ReleaseDateFieldLegacy.tsx | 2 +- .../screens/AccessAndSaleScreen.tsx | 5 +- .../screens/LicenseTypeScreen.tsx | 4 +- .../screens/ListSelectionScreen.tsx | 2 +- .../screens/NFTCollectionsScreen.tsx | 2 +- .../screens/ReleaseDateScreen.tsx | 5 +- .../screens/RemixSettingsScreen.tsx | 2 +- .../screens/SelectGenreScreen.tsx | 2 +- .../src/screens/edit-track-screen/types.ts | 3 +- .../utils/computeLicenseIcons.ts | 2 +- .../screens/favorites-screen/TracksTab.tsx | 2 +- .../useCollectionsScreenData.ts | 10 +- .../favorites-screen/useFavoritesLineup.ts | 2 +- .../Notification/ProfilePictureList.tsx | 2 +- .../Notification/TipText.tsx | 2 +- .../Notifications/FavoriteNotification.tsx | 3 +- .../FavoriteOfRepostNotification.tsx | 3 +- .../Notifications/FollowNotification.tsx | 3 +- .../Notifications/MilestoneNotification.tsx | 2 +- .../Notifications/RemixCosignNotification.tsx | 2 +- .../Notifications/RepostNotification.tsx | 3 +- .../RepostOfRepostNotification.tsx | 3 +- .../SupporterDethronedNotification.tsx | 6 +- .../Notifications/TastemakerNotification.tsx | 2 +- .../Notifications/TipReceivedNotification.tsx | 9 +- .../TrendingPlaylistNotification.tsx | 2 +- .../TrendingTrackNotification.tsx | 2 +- .../TrendingUndergroundNotification.tsx | 2 +- .../USDCPurchaseBuyerNotification.tsx | 2 +- .../USDCPurchaseSellerNotification.tsx | 9 +- .../Notifications/useGoToProfile.ts | 2 +- .../Notifications/useSocialActionHandler.ts | 2 +- .../Reaction/ReactionList.tsx | 3 +- .../screens/pay-and-earn-screen/USDCCard.tsx | 10 +- .../ProfileHeader/SupportingList.tsx | 3 +- .../ProfileHeader/TopSupporters.tsx | 2 +- .../ProfileHeader/ViewAllSupportingTile.tsx | 7 +- .../screens/profile-screen/ProfileScreen.tsx | 2 +- .../src/screens/profile-screen/selectors.ts | 3 +- .../components/WelcomeDrawer.tsx | 3 +- .../SelectedGenresTabBar.tsx | 4 +- .../selectArtistPreviewContext.tsx | 2 +- .../screens/SelectGenresScreen.tsx | 2 +- .../sign-on-screen/utils/restrictedHandles.ts | 2 +- .../tip-artist-screen/AvailableAudio.tsx | 3 +- .../tip-artist-screen/BecomeTopSupporter.tsx | 2 +- .../tip-artist-screen/SendTipScreen.tsx | 2 +- .../screens/tip-artist-screen/TipHeader.tsx | 3 +- .../screens/tip-artist-screen/TipInput.tsx | 2 +- .../tip-artist-screen/TipSentScreen.tsx | 7 +- .../track-screen/TrackRemixesScreen.tsx | 2 +- .../track-screen/TrackScreenDetailsTile.tsx | 12 +- .../track-screen/TrackScreenMainContent.tsx | 2 +- .../trending-screen/TrendingFilterButton.tsx | 3 +- .../trending-screen/TrendingFilterDrawer.tsx | 10 +- .../upload-screen/utils/processTrackFile.ts | 8 +- .../src/screens/user-list-screen/Tip.tsx | 2 +- .../components/LinkedWallet.tsx | 3 +- .../components/useSolanaPhoneAuthorization.ts | 2 +- .../audio-player/NativeMobileAudio.ts | 3 +- packages/mobile/src/services/libs.ts | 2 +- .../offline-downloader/offline-storage.ts | 4 +- .../mobile/src/services/track-download.ts | 2 +- packages/mobile/src/store/account/sagas.ts | 8 +- .../createPlaylistRequestedSaga.ts | 3 +- packages/mobile/src/store/download/slice.ts | 2 +- packages/mobile/src/store/drawers/slice.ts | 2 +- .../workers/downloadCollectionWorker.ts | 3 +- .../workers/downloadTrackWorker.ts | 8 +- .../sagas/rehydrateOfflineDataSaga.ts | 3 +- .../src/store/offline-downloads/selectors.ts | 3 +- .../mobile/src/store/search/searchSlice.ts | 2 +- packages/mobile/src/store/settings/sagas.ts | 8 +- .../store/share-to-story-progress/slice.ts | 2 +- packages/mobile/src/store/sign-out/sagas.ts | 2 +- .../sagas/connectNewWalletSaga.ts | 6 +- .../wallet-connect/sagas/signMessageSaga.ts | 8 +- .../mobile/src/store/wallet-connect/slice.ts | 2 +- packages/mobile/src/utils/challenges.tsx | 2 +- .../src/utils/generatePlaylistArtwork.ts | 2 +- packages/mobile/src/utils/navigation.ts | 2 +- packages/mobile/src/utils/reportToSentry.ts | 2 +- packages/mobile/src/utils/routes.tsx | 2 +- 186 files changed, 527 insertions(+), 547 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 2181a83ebd6..221ba986333 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -13,7 +13,8 @@ "./hooks": "./src/hooks/index.ts", "./context": "./src/context/index.ts", "./api": "./src/api/index.ts", - "./models": "./src/models/index.ts" + "./models": "./src/models/index.ts", + "./utils": "./src/utils/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 1fb425eb7ad..c0c7b05eb8f 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,5 +1,5 @@ -import * as e from './models' -console.log('exports', e) +import * as e from './utils' +console.log('exports', Object.keys(e)) export * from './audius-query' export * from './utils' diff --git a/packages/convert-exports.js b/packages/convert-exports.js index b854877a767..c940607ecd6 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -2,201 +2,181 @@ const glob = require('glob') const fs = require('fs') var getDirectories = function (callback) { - glob('./mobile/src/**/*', callback) + glob('./web/src/**/*', callback) } -const DIRECTORY = 'models' +const DIRECTORY = 'utils' const EXPORTS = [ - 'Name', - 'ShareSource', - 'RepostSource', - 'FavoriteSource', - 'FollowSource', - 'CreatePlaylistSource', - 'PlaybackSource', - 'ModalSource', - 'ChallengeName', - 'FailureReason', - 'Chain', - 'Client', - 'CollectibleMediaType', - 'Variant', - 'DogEarType', - 'DownloadQuality', - 'ErrorLevel', - 'FavoriteType', - 'FeedFilter', - 'PlayableType', - 'DefaultSizes', - 'SquareSizes', - 'WidthSizes', - 'Kind', - 'OS', - 'MobileOS', - 'PurchaseMethod', - 'PurchaseVendor', - 'SmartCollectionVariant', - 'Status', - 'statusIsNotFinalized', - 'combineStatuses', - 'StemCategory', - 'stemCategoryFriendlyNames', - 'Theme', - 'SystemAppearance', - 'TimeRange', - 'GatedContentType', - 'TrackAccessType', - 'isContentCollectibleGated', - 'isContentFollowGated', - 'isContentTipGated', - 'isContentUSDCPurchaseGated', - 'TrackAvailabilityType', - 'USDCTransactionType', - 'USDCTransactionMethod', - 'USDCContentPurchaseType', - 'AnalyticsEvent', - 'CreateAccountOpen', - 'ShareToTwitter', - 'TipSource', - 'WithdrawUSDCEventFields', - 'WithdrawUSDCTransferEventFields', - 'WithdrawUSDCModalOpened', - 'WithdrawUSDCAddressPasted', - 'WithdrawUSDCFormError', - 'WithdrawUSDCRequested', - 'WithdrawUSDCSuccess', - 'WithdrawUSDCFailure', - 'WithdrawUSDCHelpLinkClicked', - 'WithdrawUSDCTxLinkClicked', - 'StripeEventFields', - 'BaseAnalyticsEvent', - 'AllTrackingEvents', - 'UserChallenge', - 'Specifier', - 'ChallengeRewardID', - 'FlowUIOpenEvent', - 'FlowUICloseEvent', - 'FlowErrorEvent', - 'FlowSessionID', - 'FlowSessionCreateEvent', - 'FlowSessionResumeEvent', - 'FlowSessionPassEvent', - 'FlowSessionFailEvent', - 'FlowSessionEvent', - 'UserChallengeState', - 'SpecifierWithAmount', - 'OptimisticUserChallenge', - 'BadgeTier', - 'Cacheable', - 'Cache', - 'ChatMessageWithExtras', - 'CollectiblesMetadata', - 'Collectible', - 'CollectibleState', - 'PlaylistTrackId', - 'CollectionMetadata', - 'CollectionDownloadReason', - 'OfflineCollectionMetadata', - 'ComputedCollectionProperties', - 'Collection', - 'UserCollectionMetadata', - 'UserCollection', - 'SmartCollection', - 'CollectionImage', - 'Color', - 'AdditionalErrorReportInfo', - 'ReportToSentryArgs', - 'Favorite', - 'ID', - 'UID', - 'CID', - 'URL', - 'ImageSizesObject', - 'CoverArtSizes', - 'ProfilePictureSizes', - 'CoverPhotoSizes', - 'Lineup', - 'LineupStateTrack', - 'Order', - 'LineupState', - 'OnChain', - 'OpenSeaAsset', - 'OpenSeaAssetExtended', - 'OpenSeaEvent', - 'OpenSeaEventExtended', - 'Playable', - 'PlaylistLibraryID', - 'PlaylistLibraryKind', - 'PlaylistIdentifier', - 'ExplorePlaylistIdentifier', - 'AudioNftPlaylistIdentifier', - 'PlaylistLibraryIdentifier', - 'PlaylistLibraryFolder', - 'PlaylistLibraryItem', - 'PlaylistLibrary', - 'Repost', - 'SearchUser', - 'SearchTrack', - 'SearchPlaylist', - 'ServiceMonitorType', - 'MonitorPayload', - 'SsrPageProps', - 'StemUpload', - 'StemUploadWithFile', - 'Timestamped', - 'Supporter', - 'Supporting', - 'UserTip', - 'LastDismissedTip', - 'TrackSegment', - 'Followee', - 'Download', - 'FieldVisibility', - 'Remix', - 'RemixOf', - 'TokenStandard', - 'AccessConditionsEthNFTCollection', - 'AccessConditionsSolNFTCollection', - 'CollectibleGatedConditions', - 'FollowGatedConditions', - 'TipGatedConditions', - 'USDCPurchaseConditions', - 'AccessConditions', - 'AccessPermissions', - 'AccessSignature', - 'EthCollectionMap', - 'SolCollectionMap', - 'GatedTrackStatus', - 'TrackMetadata', - 'DownloadReason', - 'OfflineTrackMetadata', - 'Stem', - 'ComputedTrackProperties', - 'Track', - 'UserTrackMetadata', - 'UserTrack', - 'LineupTrack', - 'StemTrackMetadata', - 'StemTrack', - 'StemUserTrack', - 'RemixTrack', - 'RemixUserTrack', - 'TrackImage', - 'USDCPurchaseDetails', - 'USDCTransactionDetails', - 'UserMetadata', - 'ComputedUserProperties', - 'User', - 'UserImage', - 'UserMultihash', - 'StringWei', - 'StringAudio', - 'StringUSDC', - 'BNWei', - 'BNAudio', - 'BNUSDC', - 'WalletAddress', - 'SolanaWalletAddress' + 'creativeCommons', + 'dayjs', + 'Dayjs', + 'allSettled', + 'Permission', + 'isAccountCollection', + 'filterCollections', + 'filterDecimalString', + 'padDecimalValue', + 'decimalIntegerToHumanReadable', + 'decimalIntegerFromHumanReadable', + 'toErrorWithMessage', + 'getErrorMessage', + 'fillString', + 'formatCount', + 'formatCurrencyBalance', + 'formatBytes', + 'formatUrlName', + 'encodeUrlName', + 'formatShareText', + 'squashNewLines', + 'trimToAlphaNumeric', + 'pluralize', + 'formatAudio', + 'formatWeiToAudioString', + 'formatNumberCommas', + 'formatPrice', + 'trimRightZeros', + 'AUDIO_DIVISOR', + 'WEI_DIVISOR', + 'USDC_DIVISOR', + 'checkOnlyNumeric', + 'checkOnlyWeiFloat', + 'convertFloatToWei', + 'checkWeiNumber', + 'parseWeiNumber', + 'formatNumberString', + 'formatCapitalizeString', + 'formatMessageDate', + 'getHash', + 'Genre', + 'ELECTRONIC_PREFIX', + 'ELECTRONIC_SUBGENRES', + 'getCanonicalName', + 'GENRES', + 'convertGenreLabelToValue', + 'TRENDING_GENRES', + 'decodeHashId', + 'encodeHashId', + 'Timer', + 'makeReducer', + 'shallowCompare', + 'areSetsEqual', + 'createShallowSelector', + 'createDeepEqualSelector', + 'formatSeconds', + 'formatSecondsAsText', + 'formatLineupTileDuration', + 'formatDate', + 'formatDateWithTimezoneOffset', + 'utcToLocalTime', + 'getLocalTimezone', + 'wait', + 'removeNullable', + 'isNullOrUndefined', + 'externalAudiusLinks', + 'isAudiusUrl', + 'isInteralAudiusUrl', + 'isExternalAudiusUrl', + 'getPathFromAudiusUrl', + 'isCollectionUrl', + 'getPathFromPlaylistUrl', + 'isTrackUrl', + 'getPathFromTrackUrl', + 'Uid', + 'makeUids', + 'makeUid', + 'makeKindId', + 'getIdFromKindId', + 'getKindFromKindId', + 'uuid', + 'getAAOErrorEmojis', + 'zeroBNWei', + 'weiToAudioString', + 'weiToAudio', + 'audioToWei', + 'stringWeiToBN', + 'stringUSDCToBN', + 'stringAudioToBN', + 'stringWeiToAudioBN', + 'weiToString', + 'stringAudioToStringWei', + 'parseAudioInputToWei', + 'formatWei', + 'convertBigIntToAmountObject', + 'convertWAudioToWei', + 'convertWeiToWAudio', + 'BN_USDC_WEI', + 'BN_USDC_CENT_WEI', + 'ceilingBNUSDCToNearestCent', + 'floorBNUSDCToNearestCent', + 'formatUSDCWeiToUSDString', + 'formatUSDCWeiToCeilingDollarNumber', + 'formatUSDCWeiToCeilingCentsNumber', + 'formatUSDCWeiToFloorDollarNumber', + 'formatUSDCWeiToFloorCentsNumber', + 'shortenSPLAddress', + 'shortenEthAddress', + 'batchYield', + 'actionChannelDispatcher', + 'channelCanceller', + 'waitForValue', + 'doEvery', + 'waitForAccount', + 'waitForRead', + 'dataURLtoFile', + 'MAX_PROFILE_TOP_SUPPORTERS', + 'MAX_PROFILE_RELATED_ARTISTS', + 'MAX_PROFILE_SUPPORTING_TILES', + 'MAX_ARTIST_HOVER_TOP_SUPPORTING', + 'SUPPORTING_PAGINATION_SIZE', + 'MESSAGE_GROUP_THRESHOLD_MINUTES', + 'paramsToQueryString', + 'parseTrackRouteFromPermalink', + 'parsePlaylistIdFromPermalink', + 'parseIntList', + 'challengeRewardsConfig', + 'makeChallengeSortComparator', + 'makeOptimisticChallengeSortComparator', + 'isAudioMatchingChallenge', + 'isCooldownChallengeClaimable', + 'getClaimableChallengeSpecifiers', + 'interleave', + 'CHAT_BLOG_POST_URL', + 'hasTail', + 'isEarliestUnread', + 'chatCanFetchMoreMessages', + 'makeTwitterShareUrl', + 'generateUserSignature', + 'getQueryParams', + 'getTrackPreviewDuration', + 'getDogEarType', + 'ALLOWED_MAX_AUDIO_SIZE_BYTES', + 'ALLOWED_AUDIO_FILE_EXTENSIONS', + 'ALLOWED_AUDIO_FILE_MIME', + 'updatePlaylistArtwork', + 'externalLinkAllowList', + 'isAllowedExternalLink', + 'makeSolanaTransactionLink', + 'promiseWithTimeout', + 'parseHandleReservedStatusFromSocial', + 'EMAIL_REGEX', + 'isValidEmailString', + 'commonPasswordCheck', + 'isNotCommonPassword', + 'restrictedHandles', + 'ChallengeRewardsInfo', + 'License', + 'DecimalUtilOptions', + 'HandleCheckStatus', + 'Recording', + 'ActionsMap', + 'NestedNonNullable', + 'Nullable', + 'DeepNullable', + 'Overwrite', + 'Maybe', + 'Brand', + 'ValueOf', + 'Prettify' ] getDirectories(async function (err, res) { diff --git a/packages/get-type-exports.js b/packages/get-type-exports.js index f7063dc6316..c4b9ba852e3 100644 --- a/packages/get-type-exports.js +++ b/packages/get-type-exports.js @@ -2,7 +2,7 @@ const glob = require('glob') const fs = require('fs') var getDirectories = function (callback) { - glob('./common/dist/models/**/*', callback) + glob('./common/dist/utils/**/*', callback) } getDirectories(async function (err, res) { diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js index 15542bf57a3..5e4c1aae97c 100644 --- a/packages/mobile/babel.config.js +++ b/packages/mobile/babel.config.js @@ -13,7 +13,8 @@ module.exports = (api) => { '@audius/common/hooks': '../common/src/hooks', '@audius/common/context': '../common/src/context', '@audius/common/api': '../common/src/api', - '@audius/common/models': '../common/src/models' + '@audius/common/models': '../common/src/models', + '@audius/common/utils': '../common/src/utils' } } ] diff --git a/packages/mobile/src/app/ErrorBoundary.tsx b/packages/mobile/src/app/ErrorBoundary.tsx index 0b521ce3477..d6194a332b4 100644 --- a/packages/mobile/src/app/ErrorBoundary.tsx +++ b/packages/mobile/src/app/ErrorBoundary.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react' import { PureComponent, useEffect } from 'react' -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import * as Sentry from '@sentry/react-native' import { useToast } from 'app/hooks/useToast' diff --git a/packages/mobile/src/app/ThemeProvider.tsx b/packages/mobile/src/app/ThemeProvider.tsx index 0fda0ed71af..9d603cca61c 100644 --- a/packages/mobile/src/app/ThemeProvider.tsx +++ b/packages/mobile/src/app/ThemeProvider.tsx @@ -1,9 +1,9 @@ import type { ReactNode } from 'react' import { useEffect } from 'react' -import type { Nullable } from '@audius/common' import { themeActions, themeSelectors } from '@audius/common' import { Theme, SystemAppearance } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import AsyncStorage from '@react-native-async-storage/async-storage' import { useAppState } from '@react-native-community/hooks' import { useDarkMode } from 'react-native-dynamic' diff --git a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx index 902ec28e5ad..846c920672f 100644 --- a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx +++ b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx @@ -1,9 +1,10 @@ -import { accountSelectors, formatWei, isNullOrUndefined } from '@audius/common' +import { accountSelectors } from '@audius/common' import { useSelectTierInfo, useTotalBalanceWithFallback } from '@audius/common/hooks' import type { User } from '@audius/common/models' +import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx b/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx index edd4fb54bf2..e06bfb6ea5f 100644 --- a/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx +++ b/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx @@ -1,11 +1,8 @@ import type { AssociatedWallet } from '@audius/common' -import { - formatWei, - tokenDashboardPageSelectors, - walletSelectors -} from '@audius/common' +import { tokenDashboardPageSelectors, walletSelectors } from '@audius/common' import type { BNWei } from '@audius/common/models' import { Chain } from '@audius/common/models' +import { formatWei } from '@audius/common/utils' import BN from 'bn.js' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/audio-breakdown-drawer/Wallet.tsx b/packages/mobile/src/components/audio-breakdown-drawer/Wallet.tsx index f26bd86f35b..f6be4026336 100644 --- a/packages/mobile/src/components/audio-breakdown-drawer/Wallet.tsx +++ b/packages/mobile/src/components/audio-breakdown-drawer/Wallet.tsx @@ -1,8 +1,12 @@ import { useCallback } from 'react' -import { formatWei, shortenEthAddress, shortenSPLAddress } from '@audius/common' import type { BNWei } from '@audius/common/models' import { Chain } from '@audius/common/models' +import { + formatWei, + shortenSPLAddress, + shortenEthAddress +} from '@audius/common/utils' import Clipboard from '@react-native-clipboard/clipboard' import { Animated, TouchableWithoutFeedback, View } from 'react-native' diff --git a/packages/mobile/src/components/audio/AudioPlayer.tsx b/packages/mobile/src/components/audio/AudioPlayer.tsx index 9acd0b2ebc3..5fe476f77a9 100644 --- a/packages/mobile/src/components/audio/AudioPlayer.tsx +++ b/packages/mobile/src/components/audio/AudioPlayer.tsx @@ -1,14 +1,7 @@ import { useRef, useEffect, useCallback, useState } from 'react' -import type { - CommonState, - Nullable, - QueryParams, - Queueable -} from '@audius/common' +import type { CommonState, QueryParams, Queueable } from '@audius/common' import { - getQueryParams, - removeNullable, playbackRateValueMap, accountSelectors, cacheUsersSelectors, @@ -23,16 +16,21 @@ import { gatedContentSelectors, RepeatMode, FeatureFlags, - encodeHashId, - Genre, tracksSocialActions, - shallowCompare, - savedPageTracksLineupActions, - getTrackPreviewDuration + savedPageTracksLineupActions } from '@audius/common' import { useAppContext } from '@audius/common/context' import { SquareSizes } from '@audius/common/models' import type { ID, Track } from '@audius/common/models' +import { + Genre, + encodeHashId, + shallowCompare, + removeNullable, + getQueryParams, + getTrackPreviewDuration +} from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import { isEqual } from 'lodash' import TrackPlayer, { AppKilledPlaybackBehavior, diff --git a/packages/mobile/src/components/audio/GoogleCast.tsx b/packages/mobile/src/components/audio/GoogleCast.tsx index fcaeb7516db..a41df6c6d21 100644 --- a/packages/mobile/src/components/audio/GoogleCast.tsx +++ b/packages/mobile/src/components/audio/GoogleCast.tsx @@ -2,11 +2,11 @@ import { useCallback, useEffect, useMemo, useState } from 'react' import { castActions, - encodeHashId, playerSelectors, cacheUsersSelectors } from '@audius/common' import { SquareSizes } from '@audius/common/models' +import { encodeHashId } from '@audius/common/utils' import { CastState, useCastState, diff --git a/packages/mobile/src/components/audio/useSavePodcastProgress.ts b/packages/mobile/src/components/audio/useSavePodcastProgress.ts index 5f38a8d62e7..e33e513ac4f 100644 --- a/packages/mobile/src/components/audio/useSavePodcastProgress.ts +++ b/packages/mobile/src/components/audio/useSavePodcastProgress.ts @@ -1,12 +1,12 @@ import { useEffect } from 'react' import { - Genre, accountSelectors, cacheTracksSelectors, playbackPositionActions, playerSelectors } from '@audius/common' +import { Genre } from '@audius/common/utils' import { useProgress } from 'react-native-track-player' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx b/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx index ef098fe15f3..e8778d6182a 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx @@ -1,8 +1,9 @@ import React from 'react' -import { ClaimStatus, formatNumberCommas } from '@audius/common' +import { ClaimStatus } from '@audius/common' import type { OptimisticUserChallenge } from '@audius/common/models' import { ChallengeName } from '@audius/common/models' +import { formatNumberCommas } from '@audius/common/utils' import { ScrollView, View } from 'react-native' import IconArrow from 'app/assets/images/iconArrow.svg' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeReward.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeReward.tsx index a58373c2589..a4223f8fe45 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeReward.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeReward.tsx @@ -1,4 +1,4 @@ -import { formatNumberCommas } from '@audius/common' +import { formatNumberCommas } from '@audius/common/utils' import { View } from 'react-native' import { GradientText, Text } from '../core' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx index a661d22402d..8ddf254d334 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx @@ -1,7 +1,8 @@ import React from 'react' -import { fillString, formatNumberCommas, ClaimStatus } from '@audius/common' +import { ClaimStatus } from '@audius/common' import type { UserChallengeState } from '@audius/common/models' +import { fillString, formatNumberCommas } from '@audius/common/utils' import { View } from 'react-native' import IconCheck from 'app/assets/images/iconCheck.svg' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx index 61122e8a7cd..f20ee6ebb59 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx @@ -1,16 +1,19 @@ import { useCallback, useEffect } from 'react' -import type { Maybe, CommonState } from '@audius/common' +import type { CommonState } from '@audius/common' import { IntKeys, StringKeys, challengesSelectors, audioRewardsPageActions, ClaimStatus, - audioRewardsPageSelectors, + audioRewardsPageSelectors +} from '@audius/common' +import { isAudioMatchingChallenge, getClaimableChallengeSpecifiers -} from '@audius/common' +} from '@audius/common/utils' +import type { Maybe } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ClaimError.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ClaimError.tsx index 0e6aee1e5e6..2a5611da203 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ClaimError.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ClaimError.tsx @@ -1,4 +1,4 @@ -import { getAAOErrorEmojis } from '@audius/common' +import { getAAOErrorEmojis } from '@audius/common/utils' import { Text } from 'app/components/core' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/TwitterShareButton.tsx b/packages/mobile/src/components/challenge-rewards-drawer/TwitterShareButton.tsx index 56cf134746e..821a849a4cf 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/TwitterShareButton.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/TwitterShareButton.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from 'react' -import { makeTwitterShareUrl } from '@audius/common' +import { makeTwitterShareUrl } from '@audius/common/utils' import { Linking } from 'react-native' import IconTwitterBird from 'app/assets/images/iconTwitterBird.svg' diff --git a/packages/mobile/src/components/collectible-details-drawer/CollectibleDate.tsx b/packages/mobile/src/components/collectible-details-drawer/CollectibleDate.tsx index 68af9b1e6ea..b4ee5ff19a9 100644 --- a/packages/mobile/src/components/collectible-details-drawer/CollectibleDate.tsx +++ b/packages/mobile/src/components/collectible-details-drawer/CollectibleDate.tsx @@ -1,4 +1,4 @@ -import { formatDateWithTimezoneOffset } from '@audius/common' +import { formatDateWithTimezoneOffset } from '@audius/common/utils' import { View } from 'react-native' import { Text } from 'app/components/core' diff --git a/packages/mobile/src/components/core/DynamicImage.tsx b/packages/mobile/src/components/core/DynamicImage.tsx index 4394f7bfafd..44d80943b21 100644 --- a/packages/mobile/src/components/core/DynamicImage.tsx +++ b/packages/mobile/src/components/core/DynamicImage.tsx @@ -1,8 +1,8 @@ import type { ReactNode } from 'react' import { useEffect, memo, useCallback, useRef, useState } from 'react' -import type { Maybe } from '@audius/common' import { useInstanceVar } from '@audius/common/hooks' +import type { Maybe } from '@audius/common/utils' import type { ImageProps, ImageSourcePropType, diff --git a/packages/mobile/src/components/core/Hyperlink.tsx b/packages/mobile/src/components/core/Hyperlink.tsx index 6c2f00b341a..0d9291d0bc4 100644 --- a/packages/mobile/src/components/core/Hyperlink.tsx +++ b/packages/mobile/src/components/core/Hyperlink.tsx @@ -1,12 +1,12 @@ import type { ComponentProps } from 'react' import { useCallback, useEffect, useRef, useState } from 'react' +import { useLeavingAudiusModal } from '@audius/common' import { - getPathFromAudiusUrl, - isAllowedExternalLink, isInteralAudiusUrl, - useLeavingAudiusModal -} from '@audius/common' + getPathFromAudiusUrl, + isAllowedExternalLink +} from '@audius/common/utils' import { useLinkTo } from '@react-navigation/native' import type { Match } from 'autolinker/dist/es2015' import type { LayoutRectangle, TextStyle } from 'react-native' diff --git a/packages/mobile/src/components/core/Screen/Screen.tsx b/packages/mobile/src/components/core/Screen/Screen.tsx index 2f90dc117a8..7f69dba275f 100644 --- a/packages/mobile/src/components/core/Screen/Screen.tsx +++ b/packages/mobile/src/components/core/Screen/Screen.tsx @@ -1,7 +1,7 @@ import type { ComponentType, ReactElement, ReactNode } from 'react' import { useEffect, useLayoutEffect } from 'react' -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import { useNavigation } from '@react-navigation/native' import { pickBy, negate, isUndefined } from 'lodash' import type { Animated, StyleProp, ViewProps, ViewStyle } from 'react-native' diff --git a/packages/mobile/src/components/core/TagInput.tsx b/packages/mobile/src/components/core/TagInput.tsx index 714aff24c97..6b248f7f684 100644 --- a/packages/mobile/src/components/core/TagInput.tsx +++ b/packages/mobile/src/components/core/TagInput.tsx @@ -1,6 +1,6 @@ import { useCallback, useState } from 'react' -import { trimToAlphaNumeric } from '@audius/common' +import { trimToAlphaNumeric } from '@audius/common/utils' import { uniq } from 'lodash' import type { NativeSyntheticEvent, diff --git a/packages/mobile/src/components/delete-playlist-confirmation-drawer/DeletePlaylistConfirmationDrawer.tsx b/packages/mobile/src/components/delete-playlist-confirmation-drawer/DeletePlaylistConfirmationDrawer.tsx index 30362060e40..86f10a53573 100644 --- a/packages/mobile/src/components/delete-playlist-confirmation-drawer/DeletePlaylistConfirmationDrawer.tsx +++ b/packages/mobile/src/components/delete-playlist-confirmation-drawer/DeletePlaylistConfirmationDrawer.tsx @@ -3,9 +3,9 @@ import { useCallback } from 'react' import { cacheCollectionsActions, cacheCollectionsSelectors, - deletePlaylistConfirmationModalUISelectors, - fillString + deletePlaylistConfirmationModalUISelectors } from '@audius/common' +import { fillString } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx b/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx index 8c7b17681b7..d375438cc0b 100644 --- a/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx +++ b/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx @@ -1,9 +1,6 @@ -import { - accountSelectors, - formatLineupTileDuration, - playbackPositionSelectors -} from '@audius/common' +import { accountSelectors, playbackPositionSelectors } from '@audius/common' import type { SearchTrack, Track } from '@audius/common/models' +import { formatLineupTileDuration } from '@audius/common/utils' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTile.tsx b/packages/mobile/src/components/details-tile/DetailsTile.tsx index 5eed328e9a8..3a8c1d5482c 100644 --- a/packages/mobile/src/components/details-tile/DetailsTile.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTile.tsx @@ -3,17 +3,19 @@ import { useCallback } from 'react' import type { CommonState } from '@audius/common' import { FeatureFlags, - Genre, - squashNewLines, accountSelectors, playerSelectors, - playbackPositionSelectors, - getDogEarType, - dayjs + playbackPositionSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { Track } from '@audius/common/models' +import { + dayjs, + squashNewLines, + Genre, + getDogEarType +} from '@audius/common/utils' import moment from 'moment' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx b/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx index a7f74cd7600..439000ed0c6 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileHasAccess.tsx @@ -1,6 +1,5 @@ import { useCallback } from 'react' -import { formatPrice } from '@audius/common' import { useStreamConditionsEntity } from '@audius/common/hooks' import { isContentCollectibleGated, @@ -9,6 +8,7 @@ import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { AccessConditions, User } from '@audius/common/models' +import { formatPrice } from '@audius/common/utils' import type { ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx index b84f5735413..22d51c8a852 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx @@ -2,7 +2,6 @@ import type { ReactNode } from 'react' import { useCallback } from 'react' import { - formatPrice, gatedContentSelectors, tippingActions, usePremiumContentPurchaseModal, @@ -19,6 +18,7 @@ import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { ID, AccessConditions, User } from '@audius/common/models' +import { formatPrice } from '@audius/common/utils' import type { ViewStyle } from 'react-native' import { Image, Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx b/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx index 9583d0b9cec..3c16fad5572 100644 --- a/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx +++ b/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx @@ -3,9 +3,9 @@ import { useCallback } from 'react' import { cacheCollectionsActions, cacheCollectionsSelectors, - duplicateAddConfirmationModalUISelectors, - fillString + duplicateAddConfirmationModalUISelectors } from '@audius/common' +import { fillString } from '@audius/common/utils' import { capitalize } from 'lodash' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/fields/ImageField.tsx b/packages/mobile/src/components/fields/ImageField.tsx index c12affbed3e..443f6fa5ae9 100644 --- a/packages/mobile/src/components/fields/ImageField.tsx +++ b/packages/mobile/src/components/fields/ImageField.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo, useState } from 'react' -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import type { ImageStyle, ViewStyle } from 'react-native' import { Animated, Pressable, View } from 'react-native' diff --git a/packages/mobile/src/components/fields/PriceField.tsx b/packages/mobile/src/components/fields/PriceField.tsx index a41380b5f51..520880edd58 100644 --- a/packages/mobile/src/components/fields/PriceField.tsx +++ b/packages/mobile/src/components/fields/PriceField.tsx @@ -1,11 +1,11 @@ import { useState, useEffect, useCallback } from 'react' import { - decimalIntegerFromHumanReadable, - decimalIntegerToHumanReadable, filterDecimalString, - padDecimalValue -} from '@audius/common' + padDecimalValue, + decimalIntegerToHumanReadable, + decimalIntegerFromHumanReadable +} from '@audius/common/utils' import { useField } from 'formik' import type { NativeSyntheticEvent, diff --git a/packages/mobile/src/components/image/CollectionImage.tsx b/packages/mobile/src/components/image/CollectionImage.tsx index 08a425d09df..5e419319d0b 100644 --- a/packages/mobile/src/components/image/CollectionImage.tsx +++ b/packages/mobile/src/components/image/CollectionImage.tsx @@ -1,4 +1,3 @@ -import type { Maybe, Nullable } from '@audius/common' import { reachabilitySelectors } from '@audius/common' import type { SquareSizes, @@ -6,6 +5,7 @@ import type { ID, SearchPlaylist } from '@audius/common/models' +import type { Nullable, Maybe } from '@audius/common/utils' import { useSelector } from 'react-redux' import imageEmpty from 'app/assets/images/imageBlank2x.png' diff --git a/packages/mobile/src/components/image/CoverPhoto.tsx b/packages/mobile/src/components/image/CoverPhoto.tsx index 20470d8860b..824c8ae4a91 100644 --- a/packages/mobile/src/components/image/CoverPhoto.tsx +++ b/packages/mobile/src/components/image/CoverPhoto.tsx @@ -1,7 +1,7 @@ -import type { Nullable } from '@audius/common' import { cacheUsersSelectors } from '@audius/common' import type { ID } from '@audius/common/models' import { SquareSizes, WidthSizes } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { BlurView } from '@react-native-community/blur' import { Animated, StyleSheet } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/image/TrackImage.tsx b/packages/mobile/src/components/image/TrackImage.tsx index dd47b237015..79d844b2dab 100644 --- a/packages/mobile/src/components/image/TrackImage.tsx +++ b/packages/mobile/src/components/image/TrackImage.tsx @@ -1,6 +1,6 @@ -import type { Nullable, Maybe } from '@audius/common' import { reachabilitySelectors } from '@audius/common' import type { SquareSizes, ID, SearchTrack, Track } from '@audius/common/models' +import type { Nullable, Maybe } from '@audius/common/utils' import { useSelector } from 'react-redux' import imageEmpty from 'app/assets/images/imageBlank2x.png' diff --git a/packages/mobile/src/components/image/UserImage.tsx b/packages/mobile/src/components/image/UserImage.tsx index f1311b231aa..47b3966cf26 100644 --- a/packages/mobile/src/components/image/UserImage.tsx +++ b/packages/mobile/src/components/image/UserImage.tsx @@ -1,6 +1,6 @@ import { cacheUsersSelectors } from '@audius/common' -import type { Nullable } from '@audius/common' import type { SquareSizes, ID } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' import profilePicEmpty from 'app/assets/images/imageProfilePicEmpty2X.png' diff --git a/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx b/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx index 3c46ac408a1..97703f0127a 100644 --- a/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx +++ b/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx @@ -6,12 +6,12 @@ import { chatActions, tippingActions, ChatPermissionAction, - CHAT_BLOG_POST_URL, accountSelectors, makeChatId, useInboxUnavailableModal, cacheUsersSelectors } from '@audius/common' +import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx index 9f5a2320244..8458063c304 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx @@ -2,7 +2,6 @@ import { useCallback, useMemo } from 'react' import type { EnhancedCollectionTrack, CommonState } from '@audius/common' import { - removeNullable, playerSelectors, accountSelectors, cacheCollectionsSelectors, @@ -25,6 +24,7 @@ import { SquareSizes } from '@audius/common/models' import type { Collection, Track, User } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' import { CollectionImage } from 'app/components/image/CollectionImage' diff --git a/packages/mobile/src/components/lineup-tile/LineupTile.tsx b/packages/mobile/src/components/lineup-tile/LineupTile.tsx index 5fd53d8c833..c2ce7fecaf1 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTile.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTile.tsx @@ -1,12 +1,8 @@ import { useCallback } from 'react' -import { - accountSelectors, - Genre, - gatedContentActions, - getDogEarType -} from '@audius/common' +import { accountSelectors, gatedContentActions } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' +import { Genre, getDogEarType } from '@audius/common/utils' import moment from 'moment' import { View } from 'react-native' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx b/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx index fe3e11e2ea2..987eef07547 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx @@ -1,13 +1,13 @@ import { useCallback } from 'react' import { - formatPrice, gatedContentActions, gatedContentSelectors, usePremiumContentPurchaseModal } from '@audius/common' import type { ID, AccessConditions } from '@audius/common/models' import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' +import { formatPrice } from '@audius/common/utils' import { TouchableOpacity, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileActionButtons.tsx b/packages/mobile/src/components/lineup-tile/LineupTileActionButtons.tsx index 8b73e03770f..4ee8109e544 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileActionButtons.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileActionButtons.tsx @@ -1,8 +1,8 @@ import type { ReactElement } from 'react' -import { type Nullable } from '@audius/common' import type { ID, AccessConditions } from '@audius/common/models' import { isContentUSDCPurchaseGated } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { View } from 'react-native' import IconKebabHorizontal from 'app/assets/images/iconKebabHorizontal.svg' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx index dbb9869c8d0..2cbf590e923 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx @@ -1,14 +1,14 @@ import { useCallback } from 'react' -import type { RepostType, Nullable } from '@audius/common' +import type { RepostType } from '@audius/common' import { - formatCount, repostsUserListActions, - favoritesUserListActions, - dayjs + favoritesUserListActions } from '@audius/common' import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { FavoriteType, ID, AccessConditions } from '@audius/common/models' +import { dayjs, formatCount } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import moment from 'moment' import { View, TouchableOpacity } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx b/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx index 719e0c64332..6d4ba195054 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx @@ -1,9 +1,9 @@ import { FeatureFlags, accountSelectors, - playbackPositionSelectors, - formatLineupTileDuration + playbackPositionSelectors } from '@audius/common' +import { formatLineupTileDuration } from '@audius/common/utils' import type { ViewStyle } from 'react-native' import { StyleSheet, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/TrackTile.tsx b/packages/mobile/src/components/lineup-tile/TrackTile.tsx index 1a67d8a3d4e..5085b7444c6 100644 --- a/packages/mobile/src/components/lineup-tile/TrackTile.tsx +++ b/packages/mobile/src/components/lineup-tile/TrackTile.tsx @@ -4,9 +4,7 @@ import type { CommonState } from '@audius/common' import { playbackPositionSelectors, FeatureFlags, - Genre, accountSelectors, - removeNullable, cacheTracksSelectors, cacheUsersSelectors, tracksSocialActions, @@ -27,6 +25,7 @@ import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { Track, User } from '@audius/common/models' +import { Genre, removeNullable } from '@audius/common/utils' import { useNavigationState } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' import { trpc } from 'utils/trpcClientWeb' diff --git a/packages/mobile/src/components/lineup/types.ts b/packages/mobile/src/components/lineup/types.ts index b98cc45a6fd..191fe3b4707 100644 --- a/packages/mobile/src/components/lineup/types.ts +++ b/packages/mobile/src/components/lineup/types.ts @@ -1,7 +1,8 @@ import type { ComponentType, ReactElement } from 'react' -import type { Maybe, LineupBaseActions, CommonState } from '@audius/common' +import type { LineupBaseActions, CommonState } from '@audius/common' import type { Kind, ID, UID, Lineup as LineupData } from '@audius/common/models' +import type { Maybe } from '@audius/common/utils' import type { SectionListProps } from 'react-native' import type { PlaybackSource } from 'app/types/analytics' diff --git a/packages/mobile/src/components/navigation-container/NavigationContainer.tsx b/packages/mobile/src/components/navigation-container/NavigationContainer.tsx index d693491955f..7665d436ea4 100644 --- a/packages/mobile/src/components/navigation-container/NavigationContainer.tsx +++ b/packages/mobile/src/components/navigation-container/NavigationContainer.tsx @@ -1,7 +1,8 @@ import type { ReactNode } from 'react' import { useRef } from 'react' -import { accountSelectors, decodeHashId } from '@audius/common' +import { accountSelectors } from '@audius/common' +import { decodeHashId } from '@audius/common/utils' import type { LinkingOptions, NavigationState, diff --git a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx index 2908e927b3e..3c8de317217 100644 --- a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx @@ -1,11 +1,8 @@ import { useCallback, useLayoutEffect } from 'react' -import type { Nullable } from '@audius/common' import { FeatureFlags, playbackPositionSelectors, - Genre, - removeNullable, reachabilitySelectors, accountSelectors, castSelectors, @@ -15,7 +12,6 @@ import { OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, - formatPrice, usePremiumContentPurchaseModal } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' @@ -26,6 +22,8 @@ import { ModalSource } from '@audius/common/models' import type { Track } from '@audius/common/models' +import { formatPrice, Genre, removeNullable } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import { View, Platform } from 'react-native' import { CastButton } from 'react-native-google-cast' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx index 4155f358203..c7391ec66e4 100644 --- a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx +++ b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx @@ -1,8 +1,9 @@ -import type { CommonState, Nullable } from '@audius/common' +import type { CommonState } from '@audius/common' import { averageColorSelectors, playerSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { DogEarType, SquareSizes } from '@audius/common/models' import type { Track } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { Dimensions } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx b/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx index b3d2150b7e7..7042a70d17d 100644 --- a/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx +++ b/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx @@ -8,12 +8,12 @@ import { } from 'react' import { - Genre, cacheUsersSelectors, queueActions, playerSelectors, playerActions } from '@audius/common' +import { Genre } from '@audius/common/utils' import { useNavigationState } from '@react-navigation/native' import type { Animated, diff --git a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx index a6e379599ee..afeebb34f00 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx @@ -1,6 +1,5 @@ import { useCallback } from 'react' -import type { Nullable } from '@audius/common' import { accountSelectors, tracksSocialActions, @@ -9,6 +8,7 @@ import { import { useGatedContentAccess } from '@audius/common/hooks' import { FavoriteSource, SquareSizes } from '@audius/common/models' import type { Track, User } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { TouchableOpacity, Animated, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx index 080cc50602d..a4923c3db38 100644 --- a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx +++ b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx @@ -1,6 +1,7 @@ -import { type Nullable, playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import type { Track, User } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts b/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts index 30fcf0b2185..3a8daf6c595 100644 --- a/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts +++ b/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts @@ -1,4 +1,5 @@ -import { getTrackPreviewDuration, playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common' +import { getTrackPreviewDuration } from '@audius/common/utils' import { useSelector } from 'react-redux' const { getCurrentTrack, getPreviewing } = playerSelectors diff --git a/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx b/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx index 474fb805e07..1ceed34f07c 100644 --- a/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx +++ b/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx @@ -1,5 +1,6 @@ -import { cacheCollectionsSelectors, removeNullable } from '@audius/common' +import { cacheCollectionsSelectors } from '@audius/common' import type { ID } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import { useIsOfflineModeEnabled } from 'app/hooks/useIsOfflineModeEnabled' import { useProxySelector } from 'app/hooks/useProxySelector' diff --git a/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx b/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx index b48ec5f0346..87f71fdab91 100644 --- a/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx +++ b/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx @@ -1,5 +1,5 @@ -import type { Nullable } from '@audius/common' import { reachabilitySelectors } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { StyleProp, ViewStyle } from 'react-native' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/offline-placeholder/OfflinePlaceholder.tsx b/packages/mobile/src/components/offline-placeholder/OfflinePlaceholder.tsx index e8ca341cd58..e9865f73c56 100644 --- a/packages/mobile/src/components/offline-placeholder/OfflinePlaceholder.tsx +++ b/packages/mobile/src/components/offline-placeholder/OfflinePlaceholder.tsx @@ -1,4 +1,4 @@ -import { wait } from '@audius/common' +import { wait } from '@audius/common/utils' import NetInfo from '@react-native-community/netinfo' import { View } from 'react-native' import { useAsyncFn } from 'react-use' diff --git a/packages/mobile/src/components/payment-method/PaymentMethod.tsx b/packages/mobile/src/components/payment-method/PaymentMethod.tsx index 7d4d2311332..c951c1d47ef 100644 --- a/packages/mobile/src/components/payment-method/PaymentMethod.tsx +++ b/packages/mobile/src/components/payment-method/PaymentMethod.tsx @@ -1,13 +1,13 @@ import { useEffect } from 'react' -import type { Nullable } from '@audius/common' -import { - formatUSDCWeiToFloorCentsNumber, - formatCurrencyBalance, - removeNullable -} from '@audius/common' import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import type { BNUSDC } from '@audius/common/models' +import { + formatCurrencyBalance, + removeNullable, + formatUSDCWeiToFloorCentsNumber +} from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import BN from 'bn.js' import { FlatList, View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx index 7efe038894a..258a81cb082 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx @@ -5,7 +5,6 @@ import { PurchaseContentPage, FeatureFlags, PurchaseContentStage, - formatPrice, isContentPurchaseInProgress, purchaseContentActions, purchaseContentSelectors, @@ -30,6 +29,7 @@ import { PurchaseVendor, statusIsNotFinalized } from '@audius/common/models' +import { formatPrice } from '@audius/common/utils' import { Formik, useField, useFormikContext } from 'formik' import { Linking, diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PurchaseSummaryTable.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PurchaseSummaryTable.tsx index 1d2a2ea93b7..4ed65260c65 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PurchaseSummaryTable.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PurchaseSummaryTable.tsx @@ -1,4 +1,4 @@ -import { formatPrice } from '@audius/common' +import { formatPrice } from '@audius/common/utils' import { Text } from 'app/components/core' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts index 59424e4f94f..55aaf2f110d 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts +++ b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts @@ -1,4 +1,3 @@ -import type { Nullable } from '@audius/common' import { getPurchaseSummaryValues } from '@audius/common' import { useUSDCPurchaseConfig, @@ -9,6 +8,7 @@ import { AMOUNT_PRESET } from '@audius/common/hooks' import type { BNUSDC } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' export const usePurchaseSummaryValues = ({ diff --git a/packages/mobile/src/components/rate-cta-drawer/RateCtaDrawer.tsx b/packages/mobile/src/components/rate-cta-drawer/RateCtaDrawer.tsx index df2c513db58..1aca27a0bfb 100644 --- a/packages/mobile/src/components/rate-cta-drawer/RateCtaDrawer.tsx +++ b/packages/mobile/src/components/rate-cta-drawer/RateCtaDrawer.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import type { Nullable } from '@audius/common' import { Name } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import AsyncStorage from '@react-native-async-storage/async-storage' import { View } from 'react-native' import InAppReview from 'react-native-in-app-review' diff --git a/packages/mobile/src/components/scrubber/Scrubber.tsx b/packages/mobile/src/components/scrubber/Scrubber.tsx index bbdc6724c82..814b85bcc8f 100644 --- a/packages/mobile/src/components/scrubber/Scrubber.tsx +++ b/packages/mobile/src/components/scrubber/Scrubber.tsx @@ -1,6 +1,7 @@ import { useCallback, useState } from 'react' -import { formatSeconds, playerActions } from '@audius/common' +import { playerActions } from '@audius/common' +import { formatSeconds } from '@audius/common/utils' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/scrubber/usePosition.ts b/packages/mobile/src/components/scrubber/usePosition.ts index f7a6a303870..4d360f7d502 100644 --- a/packages/mobile/src/components/scrubber/usePosition.ts +++ b/packages/mobile/src/components/scrubber/usePosition.ts @@ -1,10 +1,7 @@ import { useCallback, useEffect, useRef } from 'react' -import { - formatSeconds, - playerSelectors, - playbackRateValueMap -} from '@audius/common' +import { playerSelectors, playbackRateValueMap } from '@audius/common' +import { formatSeconds } from '@audius/common/utils' import { useAppState } from '@react-native-community/hooks' import type { TextInput } from 'react-native' import TrackPlayer from 'react-native-track-player' diff --git a/packages/mobile/src/components/share-drawer/useShareToStory.tsx b/packages/mobile/src/components/share-drawer/useShareToStory.tsx index f151dfd6e8e..e90240c0afb 100644 --- a/packages/mobile/src/components/share-drawer/useShareToStory.tsx +++ b/packages/mobile/src/components/share-drawer/useShareToStory.tsx @@ -3,10 +3,12 @@ import { useCallback, useMemo, useRef, useState } from 'react' import EventEmitter from 'events' import path from 'path' -import type { Nullable, ShareContent } from '@audius/common' -import { encodeHashId, modalsActions, uuid } from '@audius/common' +import type { ShareContent } from '@audius/common' +import { modalsActions } from '@audius/common' import { ErrorLevel, SquareSizes } from '@audius/common/models' import type { Color } from '@audius/common/models' +import { encodeHashId, uuid } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import { activateKeepAwake, deactivateKeepAwake diff --git a/packages/mobile/src/components/share-drawer/utils.ts b/packages/mobile/src/components/share-drawer/utils.ts index fd75c7db55b..1f45c2892a6 100644 --- a/packages/mobile/src/components/share-drawer/utils.ts +++ b/packages/mobile/src/components/share-drawer/utils.ts @@ -1,5 +1,5 @@ import type { ShareContent } from '@audius/common' -import { makeTwitterShareUrl } from '@audius/common' +import { makeTwitterShareUrl } from '@audius/common/utils' import { audiusBackendInstance } from 'app/services/audius-backend-instance' import { diff --git a/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx b/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx index b68a7324158..3f0a980b279 100644 --- a/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx +++ b/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx @@ -1,11 +1,11 @@ import { useMemo } from 'react' -import type { Nullable } from '@audius/common' import { shareSoundToTiktokModalActions, ShareSoundToTiktokModalStatus, shareSoundToTiktokModalSelectors } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import { View } from 'react-native' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx index ea23bcc4d38..093d1514492 100644 --- a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx +++ b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx @@ -1,9 +1,10 @@ import { useCallback } from 'react' -import type { CommonState, Maybe } from '@audius/common' -import { removeNullable } from '@audius/common' +import type { CommonState } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import type { ID } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' +import type { Maybe } from '@audius/common/utils' import { removeFollowArtists, addFollowArtists diff --git a/packages/mobile/src/components/summary-table/SummaryTable.tsx b/packages/mobile/src/components/summary-table/SummaryTable.tsx index 58ea044caa1..0248ef6d4ef 100644 --- a/packages/mobile/src/components/summary-table/SummaryTable.tsx +++ b/packages/mobile/src/components/summary-table/SummaryTable.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react' import React, { useCallback, useState } from 'react' -import { removeNullable } from '@audius/common' +import { removeNullable } from '@audius/common/utils' import { LayoutAnimation, View } from 'react-native' import { Text } from 'app/components/core' diff --git a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx index 98bcb15c49e..4243ff72a63 100644 --- a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx +++ b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx @@ -1,11 +1,7 @@ import type { ComponentType } from 'react' import { useMemo } from 'react' -import { - getDogEarType, - cacheUsersSelectors, - cacheTracksSelectors -} from '@audius/common' +import { cacheUsersSelectors, cacheTracksSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { SquareSizes, @@ -14,6 +10,7 @@ import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { ID } from '@audius/common/models' +import { getDogEarType } from '@audius/common/utils' import type { ColorValue } from 'react-native' import { View } from 'react-native' import type { SvgProps } from 'react-native-svg' diff --git a/packages/mobile/src/components/track-list/TrackListItem.tsx b/packages/mobile/src/components/track-list/TrackListItem.tsx index 1265b363957..bee8fc2fe90 100644 --- a/packages/mobile/src/components/track-list/TrackListItem.tsx +++ b/packages/mobile/src/components/track-list/TrackListItem.tsx @@ -5,8 +5,6 @@ import { cacheCollectionsSelectors, FeatureFlags, playbackPositionSelectors, - Genre, - removeNullable, OverflowAction, OverflowSource, mobileOverflowMenuUIActions, @@ -17,6 +15,7 @@ import { } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import type { Collection, ID, UID, Track, User } from '@audius/common/models' +import { Genre, removeNullable } from '@audius/common/utils' import type { NativeSyntheticEvent, NativeTouchEvent, diff --git a/packages/mobile/src/components/twitter-button/TwitterButton.tsx b/packages/mobile/src/components/twitter-button/TwitterButton.tsx index 6028536f255..abfa3dede21 100644 --- a/packages/mobile/src/components/twitter-button/TwitterButton.tsx +++ b/packages/mobile/src/components/twitter-button/TwitterButton.tsx @@ -1,12 +1,9 @@ import { useCallback } from 'react' -import type { Nullable } from '@audius/common' -import { - makeTwitterShareUrl, - cacheUsersActions, - cacheUsersSelectors -} from '@audius/common' +import { cacheUsersActions, cacheUsersSelectors } from '@audius/common' import { useTwitterButtonStatus } from '@audius/common/hooks' +import { makeTwitterShareUrl } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' import IconTwitterBird from 'app/assets/images/iconTwitterBird.svg' diff --git a/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx b/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx index 40ce563c606..d9ef3cd1f9f 100644 --- a/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx +++ b/packages/mobile/src/components/usdc-balance-pill/USDCBalancePill.tsx @@ -1,10 +1,10 @@ -import { - formatCurrencyBalance, - formatUSDCWeiToFloorCentsNumber -} from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import type { BNUSDC } from '@audius/common/models' import { Status } from '@audius/common/models' +import { + formatCurrencyBalance, + formatUSDCWeiToFloorCentsNumber +} from '@audius/common/utils' import BN from 'bn.js' import { View } from 'react-native' diff --git a/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx b/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx index a53bfc11c70..3252b7e5992 100644 --- a/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx +++ b/packages/mobile/src/components/usdc-balance-row/USDCBalanceRow.tsx @@ -1,9 +1,9 @@ +import { useUSDCBalance } from '@audius/common/hooks' +import type { BNUSDC } from '@audius/common/models' import { formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber -} from '@audius/common' -import { useUSDCBalance } from '@audius/common/hooks' -import type { BNUSDC } from '@audius/common/models' +} from '@audius/common/utils' import BN from 'bn.js' import { View } from 'react-native' diff --git a/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx b/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx index f182b60e150..db0ae50e859 100644 --- a/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx +++ b/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { isAllowedExternalLink, useLeavingAudiusModal } from '@audius/common' +import { useLeavingAudiusModal } from '@audius/common' +import { isAllowedExternalLink } from '@audius/common/utils' import type { GestureResponderEvent, TouchableWithoutFeedbackProps diff --git a/packages/mobile/src/hooks/useContentNodeImage.ts b/packages/mobile/src/hooks/useContentNodeImage.ts index e6853595c1f..fa7502c04f0 100644 --- a/packages/mobile/src/hooks/useContentNodeImage.ts +++ b/packages/mobile/src/hooks/useContentNodeImage.ts @@ -1,9 +1,9 @@ import { useState, useMemo, useCallback } from 'react' -import type { Nullable } from '@audius/common' -import { interleave } from '@audius/common' import { useAppContext } from '@audius/common/context' import type { SquareSizes, WidthSizes, CID } from '@audius/common/models' +import { interleave } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import type { ImageSourcePropType, ImageURISource } from 'react-native' export type ContentNodeImageSource = { diff --git a/packages/mobile/src/hooks/useImageSize.ts b/packages/mobile/src/hooks/useImageSize.ts index db1a2d3f626..86ddae39414 100644 --- a/packages/mobile/src/hooks/useImageSize.ts +++ b/packages/mobile/src/hooks/useImageSize.ts @@ -1,10 +1,10 @@ -import type { Maybe, Nullable } from '@audius/common' import { useImageSize as useImageSizeCommon } from '@audius/common/hooks' import type { SquareSizes, WidthSizes, ImageSizesObject } from '@audius/common/models' +import type { Nullable, Maybe } from '@audius/common/utils' import type { ImageSourcePropType } from 'react-native' import { Image } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/hooks/useManualToast.ts b/packages/mobile/src/hooks/useManualToast.ts index 73b3ebd0847..b474e55ccff 100644 --- a/packages/mobile/src/hooks/useManualToast.ts +++ b/packages/mobile/src/hooks/useManualToast.ts @@ -1,7 +1,8 @@ import { useCallback } from 'react' import type { Toast } from '@audius/common' -import { uuid, toastActions } from '@audius/common' +import { toastActions } from '@audius/common' +import { uuid } from '@audius/common/utils' import { useDispatch } from 'react-redux' const { registerToast, manualClearToast } = toastActions diff --git a/packages/mobile/src/hooks/useSetTrackAvailabilityFields.ts b/packages/mobile/src/hooks/useSetTrackAvailabilityFields.ts index f8ac496cf81..f19e39bb5cb 100644 --- a/packages/mobile/src/hooks/useSetTrackAvailabilityFields.ts +++ b/packages/mobile/src/hooks/useSetTrackAvailabilityFields.ts @@ -1,7 +1,7 @@ import { useCallback, useMemo } from 'react' -import type { Nullable } from '@audius/common' import type { AccessConditions } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' // This hook allows us to set track availability fields during upload. diff --git a/packages/mobile/src/hooks/useToast.ts b/packages/mobile/src/hooks/useToast.ts index e9c3e3aee04..5e36a38a123 100644 --- a/packages/mobile/src/hooks/useToast.ts +++ b/packages/mobile/src/hooks/useToast.ts @@ -1,7 +1,8 @@ import { useCallback } from 'react' import type { Toast } from '@audius/common' -import { uuid, toastActions } from '@audius/common' +import { toastActions } from '@audius/common' +import { uuid } from '@audius/common/utils' import { useDispatch } from 'react-redux' const { registerToast } = toastActions diff --git a/packages/mobile/src/models/Collection.ts b/packages/mobile/src/models/Collection.ts index 7858570756e..8b43f27f6bf 100644 --- a/packages/mobile/src/models/Collection.ts +++ b/packages/mobile/src/models/Collection.ts @@ -1,5 +1,5 @@ -import type { Nullable } from '@audius/common' import type { CID, CoverArtSizes } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' export type CollectionImage = { cover_art: Nullable diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx index 313c7f9506b..c4f3bae2bb4 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx @@ -2,12 +2,12 @@ import type { ComponentType } from 'react' import { useCallback, useContext } from 'react' import { - formatCount, accountSelectors, followersUserListActions, followingUserListActions } from '@audius/common' import type { User } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import { View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import type { SvgProps } from 'react-native-svg' diff --git a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx index 4f526dfc384..239de86530e 100644 --- a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx +++ b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx @@ -5,15 +5,14 @@ import { tokenDashboardPageActions, StringKeys, vipDiscordModalActions, - formatWei, tokenDashboardPageSelectors, walletSelectors, walletActions, getTierAndNumberForBalance, - modalsActions, - isNullOrUndefined + modalsActions } from '@audius/common' import type { StringWei } from '@audius/common/models' +import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { useFocusEffect } from '@react-navigation/native' import { Image, Linking, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx index 8eba2f0a9b5..5eba946f2f6 100644 --- a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx @@ -2,17 +2,19 @@ import { useCallback, useEffect, useState } from 'react' import type { ChallengeRewardsModalType, CommonState } from '@audius/common' import { - removeNullable, StringKeys, challengesSelectors, audioRewardsPageActions, audioRewardsPageSelectors, modalsActions, - makeOptimisticChallengeSortComparator, FeatureFlags } from '@audius/common' import { Name, ChallengeName } from '@audius/common/models' import type { ChallengeRewardID } from '@audius/common/models' +import { + removeNullable, + makeOptimisticChallengeSortComparator +} from '@audius/common/utils' import { useFocusEffect } from '@react-navigation/native' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/audio-screen/Panel.tsx b/packages/mobile/src/screens/audio-screen/Panel.tsx index ee9d9287889..12b2c9ea171 100644 --- a/packages/mobile/src/screens/audio-screen/Panel.tsx +++ b/packages/mobile/src/screens/audio-screen/Panel.tsx @@ -1,10 +1,10 @@ -import type { ChallengeRewardsInfo } from '@audius/common' +import type { OptimisticUserChallenge } from '@audius/common/models' +import type { ChallengeRewardsInfo } from '@audius/common/utils' import { fillString, formatNumberCommas, isAudioMatchingChallenge -} from '@audius/common' -import type { OptimisticUserChallenge } from '@audius/common/models' +} from '@audius/common/utils' import { View, Image } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx index bfb99620da6..73d4c52c246 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx @@ -1,15 +1,14 @@ import { memo, useCallback, useState } from 'react' import type { ReactionTypes } from '@audius/common' +import { accountSelectors, chatSelectors } from '@audius/common' +import { Status } from '@audius/common/models' import { - accountSelectors, - chatSelectors, - decodeHashId, formatMessageDate, + decodeHashId, isCollectionUrl, isTrackUrl -} from '@audius/common' -import { Status } from '@audius/common/models' +} from '@audius/common/utils' import type { ChatMessageReaction } from '@audius/sdk' import { find } from 'linkifyjs' import type { ViewStyle, StyleProp } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx index 590f8283c57..ec233538724 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx @@ -1,13 +1,7 @@ import { useCallback, useMemo, useEffect } from 'react' import type { ChatMessageTileProps } from '@audius/common' -import { - QueueSource, - accountSelectors, - getPathFromPlaylistUrl, - makeUid, - playerSelectors -} from '@audius/common' +import { QueueSource, accountSelectors, playerSelectors } from '@audius/common' import { useGetTracksByIds, useGetPlaylistByPermalink @@ -16,6 +10,7 @@ import { usePlayTrack, usePauseTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' import { Name, PlaybackSource, Kind } from '@audius/common/models' import type { ID } from '@audius/common/models' +import { getPathFromPlaylistUrl, makeUid } from '@audius/common/utils' import { useSelector } from 'react-redux' import { CollectionTile } from 'app/components/lineup-tile' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx index d390e4cc0a4..ae8670221c6 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx @@ -1,17 +1,13 @@ import { useCallback, useEffect, useMemo } from 'react' import type { ChatMessageTileProps } from '@audius/common' -import { - QueueSource, - accountSelectors, - getPathFromTrackUrl, - makeUid -} from '@audius/common' +import { QueueSource, accountSelectors } from '@audius/common' import { useGetTrackByPermalink } from '@audius/common/api' import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' import { Name, PlaybackSource, Kind } from '@audius/common/models' import type { ID } from '@audius/common/models' +import { getPathFromTrackUrl, makeUid } from '@audius/common/utils' import { useSelector } from 'react-redux' import { TrackTile } from 'app/components/lineup-tile' diff --git a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx index 9c4861c5b48..d498c1c7554 100644 --- a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx @@ -3,17 +3,19 @@ import { useCallback, useEffect, useMemo, useRef } from 'react' import { accountSelectors, chatActions, - chatCanFetchMoreMessages, chatSelectors, - decodeHashId, - encodeHashId, - encodeUrlName, - isEarliestUnread, playerSelectors } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' import { Status } from '@audius/common/models' import type { ChatMessageWithExtras } from '@audius/common/models' +import { + encodeUrlName, + decodeHashId, + encodeHashId, + isEarliestUnread, + chatCanFetchMoreMessages +} from '@audius/common/utils' import { Portal } from '@gorhom/portal' import { useKeyboard } from '@react-native-community/hooks' import { useFocusEffect } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx b/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx index 35f791823fb..037701b2601 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx @@ -1,7 +1,8 @@ import { useCallback, useMemo } from 'react' -import { ChatPermissionAction, CHAT_BLOG_POST_URL } from '@audius/common' +import { ChatPermissionAction } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' +import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx index dafa7554831..468498e5d5b 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx @@ -6,9 +6,9 @@ import { chatSelectors, ChatPermissionAction, cacheUsersSelectors, - formatCount, useInboxUnavailableModal } from '@audius/common' +import { formatCount } from '@audius/common/utils' import { useSelector } from 'audius-client/src/common/hooks/useSelector' import { View, TouchableOpacity, Keyboard } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/LinkPreview.tsx b/packages/mobile/src/screens/chat-screen/LinkPreview.tsx index 8cc538db48d..4f1511928e8 100644 --- a/packages/mobile/src/screens/chat-screen/LinkPreview.tsx +++ b/packages/mobile/src/screens/chat-screen/LinkPreview.tsx @@ -1,11 +1,8 @@ import { useCallback, useEffect } from 'react' -import { - isAllowedExternalLink, - isAudiusUrl, - useLeavingAudiusModal -} from '@audius/common' +import { useLeavingAudiusModal } from '@audius/common' import { useLinkUnfurlMetadata } from '@audius/common/hooks' +import { isAudiusUrl, isAllowedExternalLink } from '@audius/common/utils' import type { GestureResponderEvent, ViewStyle } from 'react-native' import { View, Image, Pressable } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx index 7acf9fa6a20..44bd58233ab 100644 --- a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx +++ b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx @@ -1,8 +1,10 @@ import { useCallback, useRef } from 'react' -import type { Nullable, ReactionTypes } from '@audius/common' -import { chatActions, encodeHashId, accountSelectors } from '@audius/common' +import type { ReactionTypes } from '@audius/common' +import { chatActions, accountSelectors } from '@audius/common' import type { ChatMessageWithExtras } from '@audius/common/models' +import { encodeHashId } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import Clipboard from '@react-native-clipboard/clipboard' import { Dimensions, Pressable, Animated } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx index 85f3637b5f6..e3418d47fdd 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx @@ -1,10 +1,7 @@ import { useCallback, useMemo } from 'react' import { - encodeUrlName, - removeNullable, collectionPageActions, - formatDate, accountSelectors, collectionPageSelectors, collectionsSocialActions, @@ -18,7 +15,6 @@ import { favoritesUserListActions, FeatureFlags } from '@audius/common' -import type { Nullable } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { ShareSource, @@ -33,6 +29,8 @@ import type { SearchPlaylist, User } from '@audius/common/models' +import { encodeUrlName, formatDate, removeNullable } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' import { diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx index 68cb3bb8d30..4a2cb68f851 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx @@ -1,17 +1,16 @@ import { useCallback, useEffect, useMemo } from 'react' -import type { Maybe } from '@audius/common' import { - removeNullable, collectionPageSelectors, playerSelectors, - formatSecondsAsText, collectionPageLineupActions as tracksActions, reachabilitySelectors, cacheCollectionsSelectors } from '@audius/common' import { Name, PlaybackSource, Status } from '@audius/common/models' import type { SmartCollectionVariant, ID, UID } from '@audius/common/models' +import { formatSecondsAsText, removeNullable } from '@audius/common/utils' +import type { Maybe } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' import { usePrevious } from 'react-use' import { createSelector } from 'reselect' diff --git a/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts b/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts index dcf99cd63cf..31854d6e830 100644 --- a/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts +++ b/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts @@ -1,9 +1,6 @@ import { useCallback } from 'react' import { - Uid, - areSetsEqual, - makeUid, cacheActions, cacheCollectionsSelectors, collectionPageLineupActions, @@ -12,6 +9,7 @@ import { } from '@audius/common' import type { SmartCollectionVariant } from '@audius/common/models' import { Kind } from '@audius/common/models' +import { areSetsEqual, Uid, makeUid } from '@audius/common/utils' import moment from 'moment' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-profile-screen/types.ts b/packages/mobile/src/screens/edit-profile-screen/types.ts index 3999918f6ca..80aaa8794d3 100644 --- a/packages/mobile/src/screens/edit-profile-screen/types.ts +++ b/packages/mobile/src/screens/edit-profile-screen/types.ts @@ -1,4 +1,4 @@ -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { Image } from 'app/types/image' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx index ca2cd415d18..cf70c106fa0 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx @@ -1,9 +1,9 @@ import { useCallback, useMemo } from 'react' import type { UploadTrack } from '@audius/common' -import { creativeCommons, formatPrice } from '@audius/common' import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { isContentUSDCPurchaseGated } from '@audius/common/models' +import { creativeCommons, formatPrice } from '@audius/common/utils' import { Formik } from 'formik' import { z } from 'zod' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx b/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx index b085cf4bb8f..140086e6fe7 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx +++ b/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx @@ -1,9 +1,9 @@ import { useCallback, useEffect, useState } from 'react' -import type { Nullable } from '@audius/common' import { collectiblesSelectors } from '@audius/common' import { isContentCollectibleGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import { View, Image, Dimensions } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx b/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx index c27711cc46a..2aa452595b8 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx +++ b/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx @@ -1,9 +1,9 @@ import { useCallback, useEffect, useState } from 'react' -import type { Nullable } from '@audius/common' import { accountSelectors } from '@audius/common' import { isContentFollowGated, isContentTipGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import { Dimensions, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/edit-track-screen/components/types.ts b/packages/mobile/src/screens/edit-track-screen/components/types.ts index 9def4164183..d5435f2d93b 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/types.ts +++ b/packages/mobile/src/screens/edit-track-screen/components/types.ts @@ -1,5 +1,5 @@ -import type { Nullable } from '@audius/common' import type { AccessConditions } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' export type TrackAvailabilitySelectionProps = { selected: boolean diff --git a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/AccessAndSaleField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/AccessAndSaleField.tsx index 1eea829ff00..d972043fa2f 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/AccessAndSaleField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/AccessAndSaleField.tsx @@ -1,6 +1,5 @@ import { useMemo } from 'react' -import { type Nullable } from '@audius/common' import type { FieldVisibility, AccessConditions } from '@audius/common/models' import { isContentCollectibleGated, @@ -8,6 +7,7 @@ import { isContentTipGated, isContentUSDCPurchaseGated } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import type { ContextualMenuProps } from 'app/components/core' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/IsrcIswcField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/IsrcIswcField.tsx index 903181ed35c..f6800dd4799 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/IsrcIswcField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/IsrcIswcField.tsx @@ -1,4 +1,4 @@ -import { removeNullable } from '@audius/common' +import { removeNullable } from '@audius/common/utils' import { useField } from 'formik' import type { ContextualMenuProps } from 'app/components/core' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/LicenseTypeField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/LicenseTypeField.tsx index a8e6e31ece5..77a894f7f68 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/LicenseTypeField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/LicenseTypeField.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateField.tsx index 438f8ef4406..e3505145c28 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateField.tsx @@ -1,4 +1,5 @@ -import { dayjs, type Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' +import { dayjs } from '@audius/common/utils' import { useField } from 'formik' import moment from 'moment' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateFieldLegacy.tsx b/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateFieldLegacy.tsx index 076ba601d62..8f343c1f871 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateFieldLegacy.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/ReleaseDateFieldLegacy.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo, useRef, useState } from 'react' -import type { Nullable } from '@audius/common' import { Theme } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import moment from 'moment' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx index af1dd9d9f6f..95793a99c19 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx @@ -1,7 +1,6 @@ import { useCallback, useMemo, useState } from 'react' -import type { Nullable } from '@audius/common' -import { FeatureFlags, removeNullable } from '@audius/common' +import { FeatureFlags } from '@audius/common' import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' import { isContentCollectibleGated, @@ -11,6 +10,8 @@ import { TrackAvailabilityType } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import { useField, useFormikContext } from 'formik' import IconCaretLeft from 'app/assets/images/iconCaretLeft.svg' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/LicenseTypeScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/LicenseTypeScreen.tsx index 10f07804ce6..1c0811e89af 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/LicenseTypeScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/LicenseTypeScreen.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react' -import type { Nullable } from '@audius/common' -import { creativeCommons } from '@audius/common' +import type { Nullable } from '@audius/common/utils' +import { creativeCommons } from '@audius/common/utils' import { useField } from 'formik' import { ScrollView, View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/ListSelectionScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/ListSelectionScreen.tsx index 2ddd281809d..157d5424b97 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/ListSelectionScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/ListSelectionScreen.tsx @@ -1,7 +1,7 @@ import type { ComponentType, ReactElement, ReactNode } from 'react' import { useState, useCallback } from 'react' -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { ListRenderItem, ViewStyle } from 'react-native' import { FlatList, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx index f2acdbeaa0e..464fc038af8 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx @@ -1,9 +1,9 @@ import { useCallback, useMemo } from 'react' -import type { Nullable } from '@audius/common' import { collectiblesSelectors } from '@audius/common' import { Chain, isContentCollectibleGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import { View, Image } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx index eaaa84ca18d..06985a51b7d 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx @@ -1,8 +1,9 @@ import { useCallback, useEffect, useState } from 'react' -import type { Nullable } from '@audius/common' -import { dayjs, remixSettingsActions, removeNullable } from '@audius/common' +import { remixSettingsActions } from '@audius/common' import { Theme } from '@audius/common/models' +import { dayjs, removeNullable } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import moment from 'moment' import { Dimensions, View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx index 65a74d4fdd2..ba247d59333 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx @@ -1,6 +1,5 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import type { Nullable } from '@audius/common' import { createRemixOfMetadata, remixSettingsActions, @@ -13,6 +12,7 @@ import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useFocusEffect } from '@react-navigation/native' import { useField } from 'formik' import { debounce } from 'lodash' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/SelectGenreScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/SelectGenreScreen.tsx index cbabaa24027..1772c6b4eb7 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/SelectGenreScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/SelectGenreScreen.tsx @@ -1,4 +1,4 @@ -import { convertGenreLabelToValue, GENRES } from '@audius/common' +import { GENRES, convertGenreLabelToValue } from '@audius/common/utils' import { useField } from 'formik' import IconGenre from 'app/assets/images/iconGenre.svg' diff --git a/packages/mobile/src/screens/edit-track-screen/types.ts b/packages/mobile/src/screens/edit-track-screen/types.ts index 10aaf9b9c13..92ad9670779 100644 --- a/packages/mobile/src/screens/edit-track-screen/types.ts +++ b/packages/mobile/src/screens/edit-track-screen/types.ts @@ -1,4 +1,5 @@ -import type { ExtendedTrackMetadata, Nullable } from '@audius/common' +import type { ExtendedTrackMetadata } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { FormikProps } from 'formik' import type { ScreenProps } from 'app/components/core' diff --git a/packages/mobile/src/screens/edit-track-screen/utils/computeLicenseIcons.ts b/packages/mobile/src/screens/edit-track-screen/utils/computeLicenseIcons.ts index 36b374cf0bd..a8404a02d77 100644 --- a/packages/mobile/src/screens/edit-track-screen/utils/computeLicenseIcons.ts +++ b/packages/mobile/src/screens/edit-track-screen/utils/computeLicenseIcons.ts @@ -1,6 +1,6 @@ import type { ComponentType } from 'react' -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { SvgProps } from 'react-native-svg' import IconAllowAttribution from 'app/assets/images/creativeCommons/by.svg' diff --git a/packages/mobile/src/screens/favorites-screen/TracksTab.tsx b/packages/mobile/src/screens/favorites-screen/TracksTab.tsx index 541d3a9a576..bc6f396dc9e 100644 --- a/packages/mobile/src/screens/favorites-screen/TracksTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/TracksTab.tsx @@ -1,6 +1,5 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import type { Nullable } from '@audius/common' import { LibraryCategory, SavedPageTabs, @@ -13,6 +12,7 @@ import { } from '@audius/common' import { PlaybackSource, Status } from '@audius/common/models' import type { ID, UID, Track, User } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { debounce, isEqual } from 'lodash' import Animated, { Layout } from 'react-native-reanimated' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts index e06a32015f2..cd1244b5bcf 100644 --- a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts +++ b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts @@ -1,18 +1,20 @@ import type { CollectionType, CommonState } from '@audius/common' import { - removeNullable, SavedPageTabs, accountSelectors, cacheCollectionsSelectors, reachabilitySelectors, - shallowCompare, useAllPaginatedQuery, - savedPageSelectors, - filterCollections + savedPageSelectors } from '@audius/common' import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' +import { + filterCollections, + shallowCompare, + removeNullable +} from '@audius/common/utils' import uniq from 'lodash/uniq' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts b/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts index 046c91b9caa..7ad491775d8 100644 --- a/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts +++ b/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts @@ -2,11 +2,11 @@ import { useCallback } from 'react' import { savedPageTracksLineupActions, - makeUid, cacheActions, savedPageSelectors } from '@audius/common' import { Kind } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { orderBy } from 'lodash' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/ProfilePictureList.tsx b/packages/mobile/src/screens/notifications-screen/Notification/ProfilePictureList.tsx index 76185773de5..e17fd02b52d 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/ProfilePictureList.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notification/ProfilePictureList.tsx @@ -1,5 +1,5 @@ -import { formatCount } from '@audius/common' import type { User } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import type { StyleProp, ViewStyle } from 'react-native' import { View, Text } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/TipText.tsx b/packages/mobile/src/screens/notifications-screen/Notification/TipText.tsx index 1af1d345b4a..0fa2ddd45e6 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/TipText.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notification/TipText.tsx @@ -1,4 +1,4 @@ -import { formatNumberCommas } from '@audius/common' +import { formatNumberCommas } from '@audius/common/utils' import { AudioText } from 'app/components/core' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx index 37e71ca0fbb..44d8599b10c 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx @@ -1,8 +1,9 @@ import { useCallback } from 'react' import type { FavoriteNotification as FavoriteNotificationType } from '@audius/common' -import { formatCount, notificationsSelectors, Entity } from '@audius/common' +import { notificationsSelectors, Entity } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { formatCount } from '@audius/common/utils' import IconHeart from 'app/assets/images/iconHeart.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx index c4216f42bd6..2a1fd43cb25 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx @@ -1,8 +1,9 @@ import { useCallback } from 'react' import type { FavoriteOfRepostNotification as FavoriteOfRepostNotificationType } from '@audius/common' -import { formatCount, notificationsSelectors, Entity } from '@audius/common' +import { notificationsSelectors, Entity } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { formatCount } from '@audius/common/utils' import IconHeart from 'app/assets/images/iconHeart.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx index 39a78ea420e..f949e72a202 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx @@ -1,8 +1,9 @@ import { useCallback } from 'react' import type { FollowNotification as FollowNotificationType } from '@audius/common' -import { formatCount, notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { formatCount } from '@audius/common/utils' import IconUser from 'app/assets/images/iconUser.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx index 6461c763c1c..723eb891f82 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx @@ -1,13 +1,13 @@ import { useCallback } from 'react' import type { - Nullable, EntityType, MilestoneNotification as MilestoneNotificationType } from '@audius/common' import { notificationsSelectors, Achievement } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import type { User } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { fullProfilePage } from 'audius-client/src/utils/route' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx index 547cdcd358a..5fa19969742 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import type { - Nullable, RemixCosignNotification as RemixCosignNotificationType, TrackEntity } from '@audius/common' import { notificationsSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import type { Nullable } from '@audius/common/utils' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx index 994ca14e94a..ca3c489bd87 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx @@ -1,8 +1,9 @@ import { useCallback } from 'react' import type { RepostNotification as RepostNotificationType } from '@audius/common' -import { formatCount, notificationsSelectors, Entity } from '@audius/common' +import { notificationsSelectors, Entity } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { formatCount } from '@audius/common/utils' import IconRepost from 'app/assets/images/iconRepost.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx index 12f7eb1d78c..fabeb091eb4 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx @@ -1,8 +1,9 @@ import { useCallback } from 'react' import type { RepostOfRepostNotification as RepostOfRepostNotificationType } from '@audius/common' -import { formatCount, notificationsSelectors, Entity } from '@audius/common' +import { notificationsSelectors, Entity } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { formatCount } from '@audius/common/utils' import IconRepost from 'app/assets/images/iconRepost.svg' import { useNotificationNavigation } from 'app/hooks/useNotificationNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx index e08bbaaab80..96f46a561c7 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx @@ -1,10 +1,8 @@ import { useCallback } from 'react' import { cacheUsersSelectors, notificationsSelectors } from '@audius/common' -import type { - Nullable, - SupporterDethronedNotification as SupporterDethroned -} from '@audius/common' +import type { SupporterDethronedNotification as SupporterDethroned } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx index b3ea9aef6ac..6b31245971a 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx @@ -2,11 +2,11 @@ import { useCallback } from 'react' import type { TastemakerNotification as TastemakerNotificationType, - Nullable, TrackEntity } from '@audius/common' import { notificationsSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { make } from 'common/store/analytics/actions' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx index 5324092a13a..9a2052ad760 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx @@ -1,17 +1,14 @@ import { useCallback } from 'react' import { - formatNumberCommas, notificationsSelectors, reactionsUIActions, reactionsUISelectors } from '@audius/common' -import type { - Nullable, - TipReceiveNotification, - ReactionTypes -} from '@audius/common' +import type { TipReceiveNotification, ReactionTypes } from '@audius/common' import { useUIAudio } from '@audius/common/hooks' +import { formatNumberCommas } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import { Image, Platform, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx index 08c50cd437d..b20f8ef1144 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx @@ -2,11 +2,11 @@ import { useCallback } from 'react' import type { CollectionEntity, - Nullable, TrendingPlaylistNotification as TrendingPlaylistNotificationType } from '@audius/common' import { notificationsSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' import IconTrending from 'app/assets/images/iconTrending.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx index 12b60a670aa..30b98fd79bd 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import type { - Nullable, TrackEntity, TrendingTrackNotification as TrendingTrackNotificationType } from '@audius/common' import { notificationsSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' import IconTrending from 'app/assets/images/iconTrending.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx index 9bce74e3fb2..1053824130a 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import type { - Nullable, TrackEntity, TrendingUndergroundNotification as TrendingUndergroundNotificationType } from '@audius/common' import { notificationsSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' import IconTrending from 'app/assets/images/iconTrending.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx index 4a4240a2f79..61e936df33c 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import type { - Nullable, USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType, TrackEntity } from '@audius/common' import { notificationsSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { make } from 'audius-client/src/common/store/analytics/actions' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx index a5f5034aa58..6dc48c8a4c1 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx @@ -1,16 +1,13 @@ import { useCallback } from 'react' import type { - Nullable, TrackEntity, USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType } from '@audius/common' -import { - formatUSDCWeiToUSDString, - notificationsSelectors, - stringUSDCToBN -} from '@audius/common' +import { notificationsSelectors } from '@audius/common' import type { StringUSDC } from '@audius/common/models' +import { stringUSDCToBN, formatUSDCWeiToUSDString } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' import IconCart from 'app/assets/images/iconCart.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/useGoToProfile.ts b/packages/mobile/src/screens/notifications-screen/Notifications/useGoToProfile.ts index 42cfb00026a..cd57152f4a6 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/useGoToProfile.ts +++ b/packages/mobile/src/screens/notifications-screen/Notifications/useGoToProfile.ts @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import type { Nullable } from '@audius/common' import type { User } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts index 1cb2912b564..528c3c9bfe0 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts +++ b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts @@ -1,13 +1,13 @@ import { useCallback } from 'react' import type { - Nullable, FavoriteNotification, FollowNotification, RepostNotification } from '@audius/common' import { notificationsUserListActions } from '@audius/common' import type { User } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useDispatch } from 'react-redux' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx index 8c0c1862e3d..7c7954e41ca 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx @@ -1,7 +1,8 @@ import { useCallback, useContext, useRef, useState } from 'react' import { reactionOrder } from '@audius/common' -import type { Nullable, ReactionTypes } from '@audius/common' +import type { ReactionTypes } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { ViewStyle, PanResponderGestureState, diff --git a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx index 684e3abce91..732ef426fe0 100644 --- a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx +++ b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx @@ -1,12 +1,12 @@ import React, { useCallback } from 'react' -import { - formatCurrencyBalance, - formatUSDCWeiToFloorCentsNumber, - useAddFundsModal -} from '@audius/common' +import { useAddFundsModal } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import type { BNUSDC } from '@audius/common/models' +import { + formatCurrencyBalance, + formatUSDCWeiToFloorCentsNumber +} from '@audius/common/utils' import BN from 'bn.js' import { TouchableOpacity, View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx index 8a839c7f3c9..37bb97bc96a 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx @@ -1,8 +1,9 @@ import { useEffect, useMemo } from 'react' -import { tippingActions, MAX_PROFILE_SUPPORTING_TILES } from '@audius/common' +import { tippingActions } from '@audius/common' import { useRankedSupportingForUser } from '@audius/common/hooks' import type { Supporting } from '@audius/common/models' +import { MAX_PROFILE_SUPPORTING_TILES } from '@audius/common/utils' import { FlatList } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx index aa5fa716b56..822c7102053 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx @@ -3,10 +3,10 @@ import { useCallback, useEffect } from 'react' import { cacheUsersSelectors, tippingSelectors, - removeNullable, tippingActions } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { removeNullable } from '@audius/common/utils' import { Text, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx index e12ec45a413..a5242c750eb 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx @@ -1,14 +1,11 @@ import { useCallback } from 'react' -import { - formatCount, - cacheUsersSelectors, - MAX_PROFILE_SUPPORTING_TILES -} from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' import { useRankedSupportingForUser, useProxySelector } from '@audius/common/hooks' +import { formatCount, MAX_PROFILE_SUPPORTING_TILES } from '@audius/common/utils' import IconArrow from 'app/assets/images/iconArrow.svg' import { Tile, TextButton } from 'app/components/core' diff --git a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx index de076f2cf84..19afac23e51 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx @@ -5,12 +5,12 @@ import { profilePageActions, reachabilitySelectors, shareModalUIActions, - encodeUrlName, modalsActions, FeatureFlags, relatedArtistsUIActions } from '@audius/common' import { ShareSource, Status } from '@audius/common/models' +import { encodeUrlName } from '@audius/common/utils' import { PortalHost } from '@gorhom/portal' import { useFocusEffect } from '@react-navigation/native' import { Animated, View } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/selectors.ts b/packages/mobile/src/screens/profile-screen/selectors.ts index 17b0474e57a..7af21905c47 100644 --- a/packages/mobile/src/screens/profile-screen/selectors.ts +++ b/packages/mobile/src/screens/profile-screen/selectors.ts @@ -1,10 +1,11 @@ import { useContext } from 'react' -import type { Nullable, CommonState } from '@audius/common' +import type { CommonState } from '@audius/common' import { accountSelectors, profilePageSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' import type { User } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' import { createSelector } from 'reselect' diff --git a/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx b/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx index 1f6b3386792..f7777386d90 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' -import { fillString, settingsPageActions } from '@audius/common' +import { settingsPageActions } from '@audius/common' import { welcomeModalMessages } from '@audius/common/messages' +import { fillString } from '@audius/common/utils' import { css } from '@emotion/native' import { getNameField } from 'audius-client/src/common/store/pages/signon/selectors' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectedGenresTabBar.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectedGenresTabBar.tsx index c92aa99a316..5d178b36381 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectedGenresTabBar.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/SelectedGenresTabBar.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import type { Genre } from '@audius/common' -import { convertGenreLabelToValue } from '@audius/common' +import type { Genre } from '@audius/common/utils' +import { convertGenreLabelToValue } from '@audius/common/utils' import { css } from '@emotion/native' import type { MaterialTopTabBarProps } from '@react-navigation/material-top-tabs' import { ScrollView } from 'react-native' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx index 83a64d69ba5..9e7ff2e0660 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/selectArtistPreviewContext.tsx @@ -1,8 +1,8 @@ import { createContext, useCallback, useEffect, useMemo, useState } from 'react' -import { encodeHashId } from '@audius/common' import { useGetUserTracksByHandle, useGetUserById } from '@audius/common/api' import type { ID } from '@audius/common/models' +import { encodeHashId } from '@audius/common/utils' import { Formik } from 'formik' import TrackPlayer, { RepeatMode, State } from 'react-native-track-player' import { useAsync, useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx index c5fe1d80577..781c10ef4e2 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx @@ -1,8 +1,8 @@ import { memo, useCallback, useEffect, useState } from 'react' -import type { GENRES } from '@audius/common' import { selectGenresSchema, selectableGenres } from '@audius/common' import { selectGenresPageMessages } from '@audius/common/messages' +import type { GENRES } from '@audius/common/utils' import { setField } from 'common/store/pages/signon/actions' import { Formik, useField } from 'formik' import { ScrollView } from 'react-native' diff --git a/packages/mobile/src/screens/sign-on-screen/utils/restrictedHandles.ts b/packages/mobile/src/screens/sign-on-screen/utils/restrictedHandles.ts index 1dd39879f50..e24d38b1ad5 100644 --- a/packages/mobile/src/screens/sign-on-screen/utils/restrictedHandles.ts +++ b/packages/mobile/src/screens/sign-on-screen/utils/restrictedHandles.ts @@ -1,4 +1,4 @@ -import { restrictedHandles as commonRestrictedHandles } from '@audius/common' +import { restrictedHandles as commonRestrictedHandles } from '@audius/common/utils' import { orderedRoutes } from 'audius-client/src/utils/route' const restrictedRoutes = orderedRoutes diff --git a/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx b/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx index 42556b7ba4b..78b025d230a 100644 --- a/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx @@ -1,5 +1,6 @@ -import { formatWei, walletSelectors, isNullOrUndefined } from '@audius/common' +import { walletSelectors } from '@audius/common' import type { BNWei } from '@audius/common/models' +import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Image, Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/BecomeTopSupporter.tsx b/packages/mobile/src/screens/tip-artist-screen/BecomeTopSupporter.tsx index 03fd999200d..66d63102394 100644 --- a/packages/mobile/src/screens/tip-artist-screen/BecomeTopSupporter.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/BecomeTopSupporter.tsx @@ -1,5 +1,5 @@ -import { formatWei } from '@audius/common' import type { BNWei } from '@audius/common/models' +import { formatWei } from '@audius/common/utils' import { Platform, Text } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx index b0cadd75eb3..9bc8e002407 100644 --- a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx @@ -1,7 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { - stringWeiToBN, accountSelectors, tippingSelectors, tippingActions, @@ -10,6 +9,7 @@ import { } from '@audius/common' import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import type { StringWei, BNWei } from '@audius/common/models' +import { stringWeiToBN } from '@audius/common/utils' import { useFocusEffect } from '@react-navigation/native' import BN from 'bn.js' import { Platform } from 'react-native' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx b/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx index 043258b535c..80cc19f88b4 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx @@ -1,4 +1,5 @@ -import { formatNumberCommas, tippingSelectors } from '@audius/common' +import { tippingSelectors } from '@audius/common' +import { formatNumberCommas } from '@audius/common/utils' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipInput.tsx b/packages/mobile/src/screens/tip-artist-screen/TipInput.tsx index 6bd42aacad0..692b2bdad87 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipInput.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipInput.tsx @@ -1,6 +1,6 @@ import { useCallback, useState } from 'react' -import { formatNumberCommas } from '@audius/common' +import { formatNumberCommas } from '@audius/common/utils' import type { TextInputProps } from 'app/components/core' import { AudioText, TextInput } from 'app/components/core' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx index 9dade6ac014..a121c08ed2a 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' -import { - formatNumberCommas, - accountSelectors, - tippingSelectors -} from '@audius/common' +import { accountSelectors, tippingSelectors } from '@audius/common' import type { SolanaWalletAddress } from '@audius/common/models' +import { formatNumberCommas } from '@audius/common/utils' import { useNavigation } from '@react-navigation/native' import { Platform } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx b/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx index ec88b402043..9e0ccd2b0d8 100644 --- a/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx +++ b/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx @@ -1,12 +1,12 @@ import { useCallback, useEffect } from 'react' import { - pluralize, lineupSelectors, remixesPageLineupActions as tracksActions, remixesPageSelectors, remixesPageActions } from '@audius/common' +import { pluralize } from '@audius/common/utils' import { Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx index 3d6db8c4f48..a6b6b74fe85 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx @@ -1,12 +1,7 @@ import { useCallback } from 'react' import { - Genre, - removeNullable, playerSelectors, - getCanonicalName, - formatSeconds, - formatDate, accountSelectors, trackPageLineupActions, tracksSocialActions, @@ -41,6 +36,13 @@ import type { Track, User } from '@audius/common/models' +import { + Genre, + getCanonicalName, + formatSeconds, + formatDate, + removeNullable +} from '@audius/common/utils' import moment from 'moment' import { Image, View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenMainContent.tsx b/packages/mobile/src/screens/track-screen/TrackScreenMainContent.tsx index 36256e84fd0..8d651033c29 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenMainContent.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenMainContent.tsx @@ -1,6 +1,5 @@ import type { ReactNode } from 'react' -import type { Nullable } from '@audius/common' import type { ID, LineupState, @@ -9,6 +8,7 @@ import type { Track, User } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import { View } from 'react-native' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx b/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx index e5abd22cf89..738b3c3fe8b 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { Genre, trendingPageSelectors, modalsActions } from '@audius/common' +import { trendingPageSelectors, modalsActions } from '@audius/common' +import { Genre } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' import { ScreenHeaderButton } from 'app/components/core' diff --git a/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx b/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx index a70da375d99..629e4692ffb 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx @@ -1,14 +1,16 @@ import { useCallback, useMemo, useState } from 'react' import { - ELECTRONIC_PREFIX, - ELECTRONIC_SUBGENRES, - Genre, - GENRES, trendingPageLineupActions, trendingPageSelectors, trendingPageActions } from '@audius/common' +import { + Genre, + ELECTRONIC_PREFIX, + ELECTRONIC_SUBGENRES, + GENRES +} from '@audius/common/utils' import { FlatList, Keyboard, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts index c3cc9419275..de910ced291 100644 --- a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts +++ b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts @@ -1,10 +1,10 @@ import type { UploadTrack } from '@audius/common' +import { newTrackMetadata } from '@audius/common' import { - ALLOWED_AUDIO_FILE_EXTENSIONS, - ALLOWED_AUDIO_FILE_MIME, ALLOWED_MAX_AUDIO_SIZE_BYTES, - newTrackMetadata -} from '@audius/common' + ALLOWED_AUDIO_FILE_EXTENSIONS, + ALLOWED_AUDIO_FILE_MIME +} from '@audius/common/utils' import { FFprobeKit } from 'ffmpeg-kit-react-native' import type { DocumentPickerResponse } from 'react-native-document-picker' diff --git a/packages/mobile/src/screens/user-list-screen/Tip.tsx b/packages/mobile/src/screens/user-list-screen/Tip.tsx index 22843414ee9..703289a1d5a 100644 --- a/packages/mobile/src/screens/user-list-screen/Tip.tsx +++ b/packages/mobile/src/screens/user-list-screen/Tip.tsx @@ -1,5 +1,5 @@ -import { formatWei, stringWeiToBN } from '@audius/common' import type { StringWei } from '@audius/common/models' +import { stringWeiToBN, formatWei } from '@audius/common/utils' import { View } from 'react-native' import IconTip from 'app/assets/images/iconTip.svg' diff --git a/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx b/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx index 49b6bc994be..23a19d118e7 100644 --- a/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' -import { formatWei, tokenDashboardPageActions } from '@audius/common' +import { tokenDashboardPageActions } from '@audius/common' import type { Chain, BNWei } from '@audius/common/models' +import { formatWei } from '@audius/common/utils' import Clipboard from '@react-native-clipboard/clipboard' import { View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/wallet-connect/components/useSolanaPhoneAuthorization.ts b/packages/mobile/src/screens/wallet-connect/components/useSolanaPhoneAuthorization.ts index 4cb9e479a4b..542fd1d0358 100644 --- a/packages/mobile/src/screens/wallet-connect/components/useSolanaPhoneAuthorization.ts +++ b/packages/mobile/src/screens/wallet-connect/components/useSolanaPhoneAuthorization.ts @@ -1,6 +1,6 @@ import { useCallback, useMemo, useState } from 'react' -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import { PublicKey } from '@solana/web3.js' import type { Account as AuthorizedAccount, diff --git a/packages/mobile/src/services/audio-player/NativeMobileAudio.ts b/packages/mobile/src/services/audio-player/NativeMobileAudio.ts index f87708afabb..61b6812a383 100644 --- a/packages/mobile/src/services/audio-player/NativeMobileAudio.ts +++ b/packages/mobile/src/services/audio-player/NativeMobileAudio.ts @@ -1,4 +1,5 @@ -import type { Nullable, PlaybackRate } from '@audius/common' +import type { PlaybackRate } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import TrackPlayer from 'react-native-track-player' // Shim definition for audio-player needed for player sagas to not break. diff --git a/packages/mobile/src/services/libs.ts b/packages/mobile/src/services/libs.ts index e206b0d0c43..4235f30a53c 100644 --- a/packages/mobile/src/services/libs.ts +++ b/packages/mobile/src/services/libs.ts @@ -1,6 +1,6 @@ import EventEmitter from 'events' -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { AudiusLibs } from '@audius/sdk' // TODO: declare this at the root and use actual audiusLibs type diff --git a/packages/mobile/src/services/offline-downloader/offline-storage.ts b/packages/mobile/src/services/offline-downloader/offline-storage.ts index 2ee0d9ffafa..3dc4102e88b 100644 --- a/packages/mobile/src/services/offline-downloader/offline-storage.ts +++ b/packages/mobile/src/services/offline-downloader/offline-storage.ts @@ -1,7 +1,5 @@ import path from 'path' -import type { Nullable } from '@audius/common' -import { allSettled } from '@audius/common' import type { CollectionMetadata, Collection, @@ -10,6 +8,8 @@ import type { UserTrackMetadata, UserMetadata } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' +import { allSettled } from '@audius/common/utils' import RNFetchBlob from 'rn-fetch-blob' const { diff --git a/packages/mobile/src/services/track-download.ts b/packages/mobile/src/services/track-download.ts index 43c86350095..d787a4a339d 100644 --- a/packages/mobile/src/services/track-download.ts +++ b/packages/mobile/src/services/track-download.ts @@ -1,5 +1,5 @@ import { TrackDownload as TrackDownloadBase } from '@audius/common' -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import { Platform, Share } from 'react-native' import type { FetchBlobResponse, diff --git a/packages/mobile/src/store/account/sagas.ts b/packages/mobile/src/store/account/sagas.ts index 4943f9138e9..9336a6a5f11 100644 --- a/packages/mobile/src/store/account/sagas.ts +++ b/packages/mobile/src/store/account/sagas.ts @@ -1,11 +1,7 @@ -import { - accountActions, - getContext, - removeNullable, - accountSagas -} from '@audius/common' +import { accountActions, getContext, accountSagas } from '@audius/common' import type { User } from '@audius/common/models' import { SquareSizes, WidthSizes } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import webAccountSagas from 'common/store/account/sagas' import { updateProfileAsync } from 'common/store/profile/sagas' import FastImage from 'react-native-fast-image' diff --git a/packages/mobile/src/store/cache/collections/createPlaylistRequestedSaga.ts b/packages/mobile/src/store/cache/collections/createPlaylistRequestedSaga.ts index 93a4d0b7b37..2f41c0989f0 100644 --- a/packages/mobile/src/store/cache/collections/createPlaylistRequestedSaga.ts +++ b/packages/mobile/src/store/cache/collections/createPlaylistRequestedSaga.ts @@ -1,4 +1,5 @@ -import { cacheCollectionsActions, toastActions, uuid } from '@audius/common' +import { cacheCollectionsActions, toastActions } from '@audius/common' +import { uuid } from '@audius/common/utils' import { put, takeEvery } from 'typed-redux-saga' import { navigationRef } from 'app/components/navigation-container/NavigationContainer' diff --git a/packages/mobile/src/store/download/slice.ts b/packages/mobile/src/store/download/slice.ts index a2f731a7918..fd6d3ef1c46 100644 --- a/packages/mobile/src/store/download/slice.ts +++ b/packages/mobile/src/store/download/slice.ts @@ -1,4 +1,4 @@ -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { PayloadAction } from '@reduxjs/toolkit' import { createSlice } from '@reduxjs/toolkit' diff --git a/packages/mobile/src/store/drawers/slice.ts b/packages/mobile/src/store/drawers/slice.ts index 62ecb1bc825..a390856d482 100644 --- a/packages/mobile/src/store/drawers/slice.ts +++ b/packages/mobile/src/store/drawers/slice.ts @@ -1,5 +1,5 @@ -import type { Nullable } from '@audius/common' import type { ID } from '@audius/common/models' +import type { Nullable } from '@audius/common/utils' import type { PayloadAction } from '@reduxjs/toolkit' import { createSlice } from '@reduxjs/toolkit' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts index 80525579ac1..2bb99bec890 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts @@ -1,9 +1,10 @@ -import { removeNullable, accountSelectors, getContext } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common' import type { CollectionMetadata, UserCollectionMetadata } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import RNFetchBlob from 'rn-fetch-blob' import { select, call, put, take, race, all } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts index 256c71f423a..bcab8a8efb1 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts @@ -1,8 +1,5 @@ import type { QueryParams } from '@audius/common' import { - getQueryParams, - removeNullable, - encodeHashId, accountSelectors, getContext, gatedContentSelectors @@ -14,6 +11,11 @@ import type { UserTrackMetadata } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' +import { + encodeHashId, + removeNullable, + getQueryParams +} from '@audius/common/utils' import RNFetchBlob from 'rn-fetch-blob' import { select, call, put, all, take, race } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts index 862c01d58ea..61a7bfb5076 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts @@ -1,4 +1,4 @@ -import { cacheActions, makeUid } from '@audius/common' +import { cacheActions } from '@audius/common' import type { CollectionMetadata, ID, @@ -7,6 +7,7 @@ import type { UserMetadata } from '@audius/common/models' import { Kind } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { call, select, put } from 'typed-redux-saga' import { diff --git a/packages/mobile/src/store/offline-downloads/selectors.ts b/packages/mobile/src/store/offline-downloads/selectors.ts index 01a32af5d96..8217b05ce8c 100644 --- a/packages/mobile/src/store/offline-downloads/selectors.ts +++ b/packages/mobile/src/store/offline-downloads/selectors.ts @@ -1,5 +1,6 @@ -import { removeNullable, cacheTracksSelectors } from '@audius/common' +import { cacheTracksSelectors } from '@audius/common' import type { ID, TrackMetadata } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import type { AppState } from 'app/store' diff --git a/packages/mobile/src/store/search/searchSlice.ts b/packages/mobile/src/store/search/searchSlice.ts index 64bdc32f1b0..95612a0056d 100644 --- a/packages/mobile/src/store/search/searchSlice.ts +++ b/packages/mobile/src/store/search/searchSlice.ts @@ -1,4 +1,4 @@ -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import AsyncStorage from '@react-native-async-storage/async-storage' import type { PayloadAction } from '@reduxjs/toolkit' import { createSlice } from '@reduxjs/toolkit' diff --git a/packages/mobile/src/store/settings/sagas.ts b/packages/mobile/src/store/settings/sagas.ts index c239c3cb294..e652805c1d7 100644 --- a/packages/mobile/src/store/settings/sagas.ts +++ b/packages/mobile/src/store/settings/sagas.ts @@ -1,16 +1,18 @@ import type { PushNotifications as TPushNotifications } from '@audius/common' import { - getErrorMessage, accountSelectors, settingsPageInitialState as initialState, settingsPageSelectors, PushNotificationSetting, settingsPageActions as actions, getContext, - waitForValue, - waitForAccount, settingsPageActions } from '@audius/common' +import { + getErrorMessage, + waitForValue, + waitForAccount +} from '@audius/common/utils' import { waitForRead } from 'audius-client/src/utils/sagaHelpers' import commonSettingsSagas from 'common/store/pages/settings/sagas' import { mapValues } from 'lodash' diff --git a/packages/mobile/src/store/share-to-story-progress/slice.ts b/packages/mobile/src/store/share-to-story-progress/slice.ts index 263a743389f..751c784c903 100644 --- a/packages/mobile/src/store/share-to-story-progress/slice.ts +++ b/packages/mobile/src/store/share-to-story-progress/slice.ts @@ -1,4 +1,4 @@ -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { PayloadAction } from '@reduxjs/toolkit' import { createSlice } from '@reduxjs/toolkit' diff --git a/packages/mobile/src/store/sign-out/sagas.ts b/packages/mobile/src/store/sign-out/sagas.ts index 6ce6853c707..9bfa08cb332 100644 --- a/packages/mobile/src/store/sign-out/sagas.ts +++ b/packages/mobile/src/store/sign-out/sagas.ts @@ -3,10 +3,10 @@ import { accountActions, feedPageLineupActions, themeActions, - waitForValue, tokenDashboardPageActions } from '@audius/common' import { Name, Theme } from '@audius/common/models' +import { waitForValue } from '@audius/common/utils' import { setupBackend } from 'audius-client/src/common/store/backend/actions' import { getIsSettingUp } from 'audius-client/src/common/store/backend/selectors' import { resetSignOn } from 'audius-client/src/common/store/pages/signon/actions' diff --git a/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts b/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts index fc103c136b1..629433fa724 100644 --- a/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts +++ b/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts @@ -1,12 +1,12 @@ -import type { Nullable } from '@audius/common' import { accountSelectors, getContext, - tokenDashboardPageActions, - getErrorMessage + tokenDashboardPageActions } from '@audius/common' import type { WalletAddress } from '@audius/common/models' import { Name, Chain } from '@audius/common/models' +import { getErrorMessage } from '@audius/common/utils' +import type { Nullable } from '@audius/common/utils' import bs58 from 'bs58' import { checkIsNewWallet } from 'common/store/pages/token-dashboard/checkIsNewWallet' import { getWalletInfo } from 'common/store/pages/token-dashboard/getWalletInfo' diff --git a/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts b/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts index ac346ac95a0..032cabd502a 100644 --- a/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts +++ b/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts @@ -1,11 +1,7 @@ import type { CommonState } from '@audius/common' -import { - tokenDashboardPageSelectors, - getContext, - waitForValue, - getErrorMessage -} from '@audius/common' +import { tokenDashboardPageSelectors, getContext } from '@audius/common' import { Name } from '@audius/common/models' +import { getErrorMessage, waitForValue } from '@audius/common/utils' import bs58 from 'bs58' import { addWalletToUser } from 'common/store/pages/token-dashboard/addWalletToUser' import { associateNewWallet } from 'common/store/pages/token-dashboard/associateNewWallet' diff --git a/packages/mobile/src/store/wallet-connect/slice.ts b/packages/mobile/src/store/wallet-connect/slice.ts index 03f354f4ce2..876f28e1e1f 100644 --- a/packages/mobile/src/store/wallet-connect/slice.ts +++ b/packages/mobile/src/store/wallet-connect/slice.ts @@ -1,4 +1,4 @@ -import type { Nullable } from '@audius/common' +import type { Nullable } from '@audius/common/utils' import type { PayloadAction } from '@reduxjs/toolkit' import { createSlice } from '@reduxjs/toolkit' diff --git a/packages/mobile/src/utils/challenges.tsx b/packages/mobile/src/utils/challenges.tsx index 18d1768e2b4..9f8d7bc5508 100644 --- a/packages/mobile/src/utils/challenges.tsx +++ b/packages/mobile/src/utils/challenges.tsx @@ -1,9 +1,9 @@ -import { challengeRewardsConfig } from '@audius/common' import type { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common/models' import { ChallengeName } from '@audius/common/models' +import { challengeRewardsConfig } from '@audius/common/utils' import type { ImageSourcePropType } from 'react-native' import { Platform } from 'react-native' diff --git a/packages/mobile/src/utils/generatePlaylistArtwork.ts b/packages/mobile/src/utils/generatePlaylistArtwork.ts index 2ad944e08b9..374e115cc3f 100644 --- a/packages/mobile/src/utils/generatePlaylistArtwork.ts +++ b/packages/mobile/src/utils/generatePlaylistArtwork.ts @@ -1,4 +1,4 @@ -import { uuid } from '@audius/common' +import { uuid } from '@audius/common/utils' import Jimp from 'jimp' import RNFetchBlob from 'rn-fetch-blob' diff --git a/packages/mobile/src/utils/navigation.ts b/packages/mobile/src/utils/navigation.ts index 584eadc358b..909a477e520 100644 --- a/packages/mobile/src/utils/navigation.ts +++ b/packages/mobile/src/utils/navigation.ts @@ -1,4 +1,4 @@ -import type { Maybe } from '@audius/common' +import type { Maybe } from '@audius/common/utils' import type { NavigationProp, NavigationState } from '@react-navigation/native' import type { NativeStackNavigationProp } from '@react-navigation/native-stack' diff --git a/packages/mobile/src/utils/reportToSentry.ts b/packages/mobile/src/utils/reportToSentry.ts index 49ac27cbfa0..3ffe316fd92 100644 --- a/packages/mobile/src/utils/reportToSentry.ts +++ b/packages/mobile/src/utils/reportToSentry.ts @@ -1,5 +1,5 @@ -import { getErrorMessage } from '@audius/common' import type { ErrorLevel, ReportToSentryArgs } from '@audius/common/models' +import { getErrorMessage } from '@audius/common/utils' import { captureException, withScope } from '@sentry/react-native' import type { SeverityLevel } from '@sentry/types' diff --git a/packages/mobile/src/utils/routes.tsx b/packages/mobile/src/utils/routes.tsx index 1acd2680b30..2579844ed61 100644 --- a/packages/mobile/src/utils/routes.tsx +++ b/packages/mobile/src/utils/routes.tsx @@ -1,5 +1,5 @@ -import { getHash, encodeUrlName } from '@audius/common' import type { UserCollection, User } from '@audius/common/models' +import { encodeUrlName, getHash } from '@audius/common/utils' import { env } from 'app/env' From 2776ff2dba8f24fa033cd8675c522961f2b51fc4 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 15:40:21 -0800 Subject: [PATCH 30/64] Drop utils from index --- packages/common/src/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index c0c7b05eb8f..9a1aae2a8aa 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -2,7 +2,6 @@ import * as e from './utils' console.log('exports', Object.keys(e)) export * from './audius-query' -export * from './utils' export * from './services' export * from './store' export * from './schemas' From 7d8c0ad258fc8d1120b5dabf0d542aaa2c67d41c Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 15:47:02 -0800 Subject: [PATCH 31/64] Fix CollectionVariant --- .../src/pages/explore-page/components/desktop/ExplorePage.tsx | 2 +- .../src/pages/explore-page/components/mobile/ExplorePage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx b/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx index 0b854e07988..79b66cd2592 100644 --- a/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx @@ -2,7 +2,7 @@ import { Fragment, useCallback } from 'react' import { ExploreCollectionsVariant } from '@audius/common' import { - CollectionVariant, + Variant as CollectionVariant, Status, UserCollection, User diff --git a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx index 34f22aed28e..18afc579ad9 100644 --- a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx @@ -15,7 +15,7 @@ import { removeNullable } from '@audius/common' import { - CollectionVariant, + Variant as CollectionVariant, Status, UserCollection, SmartCollection, From c98b59a67173fe02bffca658a4d40dee05ef6c35 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 15:52:36 -0800 Subject: [PATCH 32/64] Update web util imports --- .../collections/addTrackToPlaylistSaga.ts | 10 +++++---- .../store/cache/collections/commonSagas.js | 10 +++++---- .../cache/collections/confirmOrderPlaylist.js | 2 +- .../cache/collections/createPlaylistSaga.ts | 3 +-- .../utils/addUsersFromCollections.ts | 2 +- .../utils/getUnclaimedPlaylistId.ts | 3 ++- .../utils/processAndCacheCollections.ts | 8 ++----- .../collections/utils/retrieveCollections.ts | 3 +-- packages/web/src/common/store/cache/sagas.js | 3 +-- .../web/src/common/store/cache/store.test.js | 2 +- .../src/common/store/cache/tracks/sagas.js | 12 +++++----- .../tracks/utils/fetchAndProcessRemixes.ts | 5 ++--- .../tracks/utils/fetchAndProcessStems.ts | 8 ++----- .../store/cache/tracks/utils/helpers.ts | 2 +- .../tracks/utils/processAndCacheTracks.ts | 3 ++- .../web/src/common/store/cache/users/sagas.js | 3 +-- packages/web/src/common/store/lineup/sagas.js | 4 +--- .../store/notifications/fetchNotifications.ts | 8 ++----- .../notifications/fetchNotificationsSaga.ts | 2 +- .../parseAndProcessNotifications.ts | 3 +-- .../notifications/refreshNotificationsSaga.ts | 3 ++- .../web/src/common/store/pages/ai/sagas.ts | 3 ++- .../common/store/pages/audio-rewards/sagas.ts | 3 +-- .../store/pages/audio-rewards/store.test.ts | 4 ++-- .../store/pages/audio-transactions/sagas.ts | 5 ++--- .../store/pages/collection/lineups/sagas.js | 4 +--- .../common/store/pages/collection/sagas.js | 2 +- .../store/pages/deactivate-account/sagas.ts | 2 +- .../web/src/common/store/pages/feed/sagas.ts | 2 +- .../store/pages/profile/lineups/feed/sagas.js | 8 ++++--- .../lineups/tracks/watchUploadTracksSaga.ts | 2 +- .../common/store/pages/saved/lineups/sagas.js | 2 +- .../web/src/common/store/pages/saved/sagas.ts | 14 +++++++----- .../pages/search-page/lineups/tracks/sagas.js | 4 ++-- .../common/store/pages/search-page/sagas.js | 3 +-- .../src/common/store/pages/settings/sagas.ts | 2 +- .../src/common/store/pages/signon/sagas.js | 14 +++++++----- .../store/pages/signon/verifiedChecker.ts | 2 +- .../common/store/pages/track/lineups/sagas.ts | 4 ++-- .../web/src/common/store/pages/track/sagas.js | 2 +- .../lineups/trending/retrieveTrending.ts | 3 +-- packages/web/src/common/store/player/sagas.ts | 16 ++++++++------ .../web/src/common/store/profile/sagas.js | 18 ++++++++------- packages/web/src/common/store/queue/sagas.ts | 5 +---- .../src/common/store/recommendation/sagas.ts | 3 ++- .../common/store/saved-collections/sagas.ts | 4 ++-- .../src/common/store/search-ai-bar/sagas.ts | 8 ++----- .../web/src/common/store/search-bar/sagas.ts | 8 ++----- .../common/store/smart-collection/sagas.ts | 2 +- .../common/store/social/collections/sagas.ts | 4 +--- .../src/common/store/social/tracks/sagas.ts | 12 +++++----- .../src/common/store/social/users/sagas.ts | 2 +- .../web/src/common/store/tipping/sagas.ts | 22 ++++++++++--------- .../src/common/store/ui/reactions/sagas.ts | 5 ++--- .../src/common/store/upload/sagaHelpers.ts | 2 +- packages/web/src/common/store/upload/sagas.js | 10 +++++---- .../store/user-list/supporting/sagas.ts | 3 +-- .../store/user-list/top-supporters/sagas.ts | 3 +-- packages/web/src/common/store/wallet/sagas.ts | 12 +++++----- .../web/src/common/utils/requiresAccount.ts | 3 ++- .../components/address-tile/AddressTile.tsx | 2 +- .../AiAttributionModal.tsx | 2 +- .../animated-button/AnimatedIconButton.tsx | 2 +- .../components/artist/ArtistChipFollowers.tsx | 2 +- .../artist/ArtistChipSupportFor.tsx | 8 ++----- .../artist/ArtistChipSupportFrom.tsx | 8 ++----- .../components/artist/ArtistSupporting.tsx | 8 ++++--- .../audio-balance-pill/AUDIOBalancePill.tsx | 3 ++- .../AudioTransactionsTable.tsx | 2 +- packages/web/src/components/avatar/Avatar.tsx | 2 +- .../src/components/avatar/AvatarLegacy.tsx | 2 +- .../components/InProgressPage.tsx | 2 +- .../components/PurchaseQuote.tsx | 7 ++---- .../components/SuccessPage.tsx | 5 ++--- packages/web/src/components/card/UserCard.jsx | 2 +- .../web/src/components/card/desktop/Card.tsx | 3 ++- .../components/card/desktop/UserArtCard.tsx | 2 +- .../web/src/components/card/mobile/Card.tsx | 3 ++- .../CollectiblesPlaylistTable.tsx | 2 +- .../components/CollectibleDetails.tsx | 4 ++-- .../components/CollectibleDetailsModal.tsx | 2 +- .../components/CollectibleRow.tsx | 2 +- .../components/CollectiblesPage.tsx | 4 ++-- .../desktop/CollectionActionButtons.tsx | 2 +- .../collection/desktop/CollectionHeader.tsx | 7 ++---- .../collection/mobile/CollectionHeader.jsx | 9 ++++---- .../src/components/cover-photo/CoverPhoto.tsx | 3 ++- .../create-playlist/PlaylistForm.tsx | 2 +- .../data-entry/AccessAndSaleTriggerLegacy.tsx | 3 ++- .../src/components/data-entry/FormTile.jsx | 11 +++++----- .../data-entry/ReleaseDateTriggerLegacy.tsx | 2 +- .../src/components/data-entry/TagInput.jsx | 2 +- .../DeleteConfirmationModal.tsx | 2 +- .../DuplicateAddConfirmationModal.tsx | 4 ++-- .../edit-playlist/mobile/EditPlaylistPage.tsx | 2 +- .../components/edit-track/EditTrackModal.tsx | 3 +-- .../src/components/embed-modal/EmbedModal.tsx | 2 +- .../components/form-fields/ArtworkField.tsx | 2 +- .../src/components/form-fields/PriceField.tsx | 8 +++---- .../src/components/form-fields/TagField.tsx | 2 +- .../image-selection/ImageSelectionPopup.jsx | 8 ++----- .../InboxUnavailableModal.tsx | 2 +- .../web/src/components/link/ExternalLink.tsx | 3 ++- .../web/src/components/menu/TrackMenu.tsx | 2 +- .../src/components/nav/desktop/NavHeader.tsx | 2 +- .../components/nav/desktop/NavPopupMenu.tsx | 8 ++----- .../web/src/components/nav/mobile/NavBar.tsx | 3 ++- .../Notification/MilestoneNotification.tsx | 3 +-- .../Notification/RemixCosignNotification.tsx | 2 +- .../SupporterDethronedNotification.tsx | 2 +- .../Notification/TastemakerNotification.tsx | 2 +- .../Notification/TipReceivedNotification.tsx | 2 +- .../TrendingPlaylistNotification.tsx | 2 +- .../TrendingTrackNotification.tsx | 2 +- .../TrendingUndergroundNotification.tsx | 2 +- .../USDCPurchaseBuyerNotification.tsx | 2 +- .../USDCPurchaseSellerNotification.tsx | 8 ++++--- .../Notification/components/EntityLink.tsx | 3 ++- .../Notification/components/OthersLink.tsx | 2 +- .../components/TwitterShareButton.tsx | 2 +- .../components/UserProfilePictureList.tsx | 2 +- .../Notification/useGoToProfile.ts | 2 +- .../notification/NotificationPanel.tsx | 2 +- .../src/components/now-playing/NowPlaying.tsx | 2 +- packages/web/src/components/page/Page.tsx | 2 +- .../payment-method/PaymentMethod.tsx | 8 +++---- .../components/play-bar/desktop/PlayBar.jsx | 2 +- .../next-button/NextButtonProvider.tsx | 3 ++- .../PreviousButtonProvider.tsx | 3 ++- .../components/PurchaseContentFormFooter.tsx | 7 ++---- .../components/PurchaseSummaryTable.tsx | 2 +- .../hooks/usePurchaseSummaryValues.ts | 3 ++- .../components/profile-info/ProfileInfo.tsx | 2 +- .../related-artists/RelatedArtists.tsx | 7 ++---- .../ConnectedRemixSettingsModal.tsx | 7 ++---- .../RemixSettingsModal.tsx | 2 +- .../RepostFavoritesStats.tsx | 2 +- .../ScheduledReleaseLabel.tsx | 2 +- .../ShareSoundToTikTokModal.tsx | 2 +- .../store/sagas.ts | 3 +-- packages/web/src/components/stats/Stats.tsx | 2 +- .../tipping/support/SupportingList.tsx | 7 ++---- .../tipping/support/SupportingTile.tsx | 2 +- .../tipping/support/TopSupporters.tsx | 4 ++-- .../components/tipping/tip-audio/SendTip.tsx | 12 +++++----- .../tipping/tip-audio/TipAudioModal.tsx | 2 +- .../components/tipping/tip-audio/TipSent.tsx | 2 +- packages/web/src/components/tooltip/types.ts | 2 +- .../web/src/components/track/CardTitle.tsx | 3 ++- .../components/track/GatedConditionsPill.tsx | 2 +- .../components/track/GatedContentLabel.tsx | 2 +- .../components/track/GatedTrackSection.tsx | 4 +--- .../web/src/components/track/GiantArtwork.tsx | 2 +- .../src/components/track/GiantTrackTile.tsx | 14 +++++++----- .../track/GiantTrackTileProgressInfo.tsx | 2 +- .../track/LockedTrackDetailsTile.tsx | 2 +- .../components/track/desktop/BottomRow.tsx | 3 ++- .../track/desktop/ConnectedTrackTile.tsx | 4 ++-- .../track/desktop/TrackListItem.tsx | 3 ++- .../components/track/desktop/TrackTile.tsx | 10 +++++---- .../components/track/desktop/stats/Stats.tsx | 7 ++---- .../track/desktop/stats/StatsText.tsx | 2 +- packages/web/src/components/track/helpers.ts | 2 +- .../components/track/mobile/BottomButtons.tsx | 2 +- .../track/mobile/ConnectedTrackTile.tsx | 4 ++-- .../components/track/mobile/PlaylistTile.tsx | 2 +- .../src/components/track/mobile/TrackTile.tsx | 12 +++++----- .../src/components/track/trackTileMessages.ts | 2 +- packages/web/src/components/track/types.ts | 2 +- .../components/tracks-table/TracksTable.tsx | 2 +- .../components/TransactionDetailsContent.tsx | 12 +++++----- .../TransactionPurchaseMetadata.tsx | 8 +++---- .../TrendingGenreSelectionPage.tsx | 4 +--- .../TwitterShareButton.tsx | 2 +- .../usdc-balance-pill/USDCBalancePill.tsx | 6 ++--- .../components/PurchaseModalContent.tsx | 2 +- .../components/SaleModalContent.tsx | 2 +- .../components/TransactionSummary.tsx | 2 +- .../USDCTransactionDetailsModal.tsx | 4 ++-- .../src/components/user-badges/UserBadges.tsx | 2 +- .../user-generated-text/UserGeneratedText.tsx | 6 ++--- .../components/welcome-modal/WelcomeModal.tsx | 3 ++- .../withdraw-usdc-modal/WithdrawUSDCModal.tsx | 3 +-- .../components/ConfirmTransferDetails.tsx | 6 +++-- .../components/EnterTransferDetails.tsx | 10 +++++---- .../components/ErrorPage.tsx | 13 +++++------ .../components/TransferInProgress.tsx | 8 +++---- .../components/TransferSuccessful.tsx | 13 +++++------ packages/web/src/hooks/useTrackCoverArt.ts | 2 +- .../ChallengeRewardsTile.tsx | 14 +++++++----- .../src/pages/audio-rewards-page/Tiers.tsx | 2 +- .../src/pages/audio-rewards-page/Tiles.tsx | 5 ++--- .../pages/audio-rewards-page/WalletModal.tsx | 4 +--- .../components/DashboardTokenValueSlider.tsx | 2 +- .../components/DisplayAudio.tsx | 2 +- .../components/SendInputBody.tsx | 18 +++++++-------- .../components/SendInputConfirmation.tsx | 7 ++---- .../components/SendInputSuccess.tsx | 2 +- .../components/TokenHoverTooltip.tsx | 2 +- .../components/WalletActionsTile.tsx | 7 ++---- .../components/WalletManagementTile.tsx | 5 ++--- .../components/WalletsTable.tsx | 3 +-- .../AudioMatchingRewardsModalContent.tsx | 10 ++++----- .../ChallengeRewardsModal.tsx | 10 +++++---- .../src/pages/audio-rewards-page/config.tsx | 2 +- .../chat-page/components/ChatMessageList.tsx | 10 ++++----- .../components/ChatMessageListItem.tsx | 14 +++++++----- .../components/ChatMessagePlaylist.tsx | 3 +-- .../chat-page/components/ChatMessageTrack.tsx | 3 +-- .../components/CreateChatUserResult.tsx | 2 +- .../components/InboxUnavailableMessage.tsx | 3 ++- .../chat-page/components/LinkPreview.tsx | 3 ++- .../CollectiblesPlaylistPageProvider.tsx | 5 ++--- .../CollectionPageProvider.tsx | 4 +--- .../pages/dashboard-page/DashboardPage.tsx | 3 ++- .../components/TotalPlaysChart.jsx | 2 +- .../src/pages/dashboard-page/store/sagas.ts | 3 +-- .../src/pages/dashboard-page/store/types.ts | 2 +- .../components/desktop/DeletedPage.tsx | 2 +- .../components/mobile/DeletedPage.tsx | 2 +- .../explore-page/ExplorePageProvider.tsx | 2 +- .../components/mobile/ExplorePage.tsx | 4 ++-- .../web/src/pages/oauth-login-page/hooks.ts | 3 ++- .../web/src/pages/oauth-login-page/utils.ts | 6 ++++- .../components/PurchasesTable.tsx | 2 +- .../components/SalesTable.tsx | 2 +- .../pay-and-earn-page/components/USDCCard.tsx | 6 +++-- .../components/WithdrawalsTab.tsx | 2 +- .../components/WithdrawalsTable.tsx | 2 +- .../profile-page/ProfilePageProvider.tsx | 4 +--- .../components/desktop/ProfileMutuals.tsx | 2 +- .../components/desktop/ProfileWrapping.tsx | 2 +- .../components/mobile/ProfileHeader.tsx | 7 ++---- .../components/mobile/ShareUserButton.tsx | 3 ++- .../components/desktop/RemixesPage.tsx | 2 +- .../components/mobile/RemixesPage.tsx | 2 +- .../src/pages/saved-page/components/utils.ts | 2 +- .../components/desktop/SearchPageContent.jsx | 2 +- .../components/mobile/SearchPageContent.tsx | 6 ++--- .../components/desktop/SettingsPage.tsx | 2 +- .../src/pages/settings-page/store/sagas.ts | 2 +- .../pages/sign-on/components/ProfileForm.tsx | 4 ++-- .../components/desktop/PasswordPage.jsx | 2 +- .../components/mobile/PasswordPage.tsx | 2 +- .../components/FollowArtistCard.tsx | 2 +- .../sign-up-page/components/ImageField.tsx | 2 +- .../pages/sign-up-page/components/layout.tsx | 2 +- .../sign-up-page/pages/SelectArtistsPage.tsx | 7 ++---- .../sign-up-page/pages/SelectGenresPage.tsx | 3 ++- .../sign-up-page/utils/loginDetailsSchema.ts | 7 ++---- .../pages/track-page/TrackPageProvider.tsx | 3 +-- .../components/mobile/StatsButtonRow.tsx | 2 +- .../components/mobile/TrackHeader.tsx | 12 +++++----- .../trending-page/TrendingPageProvider.jsx | 2 +- .../desktop/TrendingGenreFilters.tsx | 2 +- .../desktop/TrendingPageContent.tsx | 7 ++---- .../upload-page/fields/AccessAndSaleField.tsx | 8 ++----- .../upload-page/fields/AttributionField.tsx | 2 +- .../upload-page/fields/ReleaseDateField.tsx | 2 +- .../RemixSettingsField/RemixSettingsField.tsx | 2 +- .../RemixSettingsMenuFields.tsx | 3 ++- .../upload-page/fields/SelectGenreField.tsx | 2 +- .../upload-page/fields/SourceFilesField.tsx | 2 +- .../UsdcPurchaseFields.tsx | 6 ++--- packages/web/src/pages/upload-page/hooks.ts | 2 +- .../pages/upload-page/pages/SelectPage.tsx | 9 ++------ .../upload-page/store/utils/processFiles.ts | 4 ++-- packages/web/src/pages/upload-page/types.ts | 3 ++- .../upload-page/utils/computeLicenseIcons.ts | 4 +++- .../utils/uploadPreviewContext.tsx | 3 ++- .../pages/visualizer/VisualizerProvider.tsx | 5 +++-- .../components/FeaturedContent.tsx | 2 +- .../web/src/services/analytics/amplitude.ts | 2 +- packages/web/src/services/analytics/index.ts | 2 +- .../src/services/audius-backend/Jupiter.ts | 7 ++---- packages/web/src/services/web3-modal/index.ts | 2 +- packages/web/src/ssr/SsrContext.tsx | 2 +- .../web/src/ssr/track/+onBeforeRender.tsx | 3 ++- .../store/application/ui/buy-audio/sagas.ts | 18 ++++++++------- .../notifications/notificationsUISelectors.ts | 4 ++-- .../ui/notifications/notificationsUISlice.ts | 2 +- .../src/store/application/ui/theme/sagas.ts | 3 ++- .../application/ui/withdraw-usdc/sagas.ts | 2 +- .../web/src/store/errors/reportToSentry.ts | 2 +- packages/web/src/store/notifications/sagas.ts | 3 ++- .../establishWalletConnection.ts | 2 +- .../web/src/store/token-dashboard/sagas.ts | 2 +- packages/web/src/utils/dateUtils.ts | 2 +- packages/web/src/utils/domUtils.ts | 2 +- packages/web/src/utils/gdpr.ts | 2 +- packages/web/src/utils/restrictedHandles.ts | 2 +- packages/web/src/utils/route.ts | 3 ++- .../src/utils/route/collectionRouteParser.ts | 2 +- .../web/src/utils/route/trackRouteParser.ts | 2 +- .../web/src/utils/route/userRouteParser.ts | 3 ++- packages/web/src/utils/sagaHelpers.ts | 2 +- packages/web/src/utils/tweet.ts | 2 +- 297 files changed, 599 insertions(+), 645 deletions(-) diff --git a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts index d8892eeef72..b6e20725077 100644 --- a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts @@ -1,21 +1,23 @@ import { - makeKindId, - makeUid, cacheCollectionsSelectors, cacheCollectionsActions, PlaylistOperations, cacheActions, getContext, audioRewardsPageActions, - Nullable, cacheTracksSelectors, - updatePlaylistArtwork, confirmerActions, confirmTransaction, reformatCollection, toastActions } from '@audius/common' import { Name, Kind, Collection, ID } from '@audius/common/models' +import { + makeUid, + makeKindId, + updatePlaylistArtwork, + Nullable +} from '@audius/common/utils' import { call, put, select, takeEvery } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/cache/collections/commonSagas.js b/packages/web/src/common/store/cache/collections/commonSagas.js index db8747b8b60..3f060dedd05 100644 --- a/packages/web/src/common/store/cache/collections/commonSagas.js +++ b/packages/web/src/common/store/cache/collections/commonSagas.js @@ -1,6 +1,4 @@ import { - makeKindId, - squashNewLines, accountSelectors, accountActions, cacheCollectionsSelectors, @@ -10,9 +8,7 @@ import { cacheActions, getContext, toastActions, - updatePlaylistArtwork, cacheTracksSelectors, - removeNullable, confirmerActions, LibraryCategory, confirmTransaction, @@ -20,6 +16,12 @@ import { savedPageActions } from '@audius/common' import { Name, DefaultSizes, Kind } from '@audius/common/models' +import { + squashNewLines, + removeNullable, + makeKindId, + updatePlaylistArtwork +} from '@audius/common/utils' import { all, call, diff --git a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js index efa6ccd4cea..42ed35e431b 100644 --- a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js +++ b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js @@ -1,5 +1,4 @@ import { - makeKindId, cacheCollectionsActions as collectionActions, PlaylistOperations, cacheActions, @@ -8,6 +7,7 @@ import { confirmTransaction } from '@audius/common' import { Kind } from '@audius/common/models' +import { makeKindId } from '@audius/common/utils' import { call, put } from 'redux-saga/effects' import { fixInvalidTracksInPlaylist } from './fixInvalidTracksInPlaylist' diff --git a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts index 073143ac9b9..d54de3cdf3b 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts @@ -1,6 +1,5 @@ import { EditPlaylistValues, - Nullable, accountActions, accountSelectors, cacheUsersSelectors, @@ -9,7 +8,6 @@ import { cacheCollectionsSelectors, cacheTracksSelectors, getContext, - makeKindId, newCollectionMetadata, confirmerActions, confirmTransaction, @@ -27,6 +25,7 @@ import { ID, Track } from '@audius/common/models' +import { makeKindId, Nullable } from '@audius/common/utils' import { call, put, select, takeLatest } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts index 8a851e95a90..c9a52c5bdfa 100644 --- a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts @@ -1,11 +1,11 @@ import { - makeUid, accountSelectors, cacheActions, getContext, reformatUser } from '@audius/common' import { Kind, UserCollectionMetadata } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { uniqBy } from 'lodash' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts b/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts index 0d7d07853e9..6c329f1d29f 100644 --- a/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts +++ b/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts @@ -1,4 +1,5 @@ -import { decodeHashId, getContext } from '@audius/common' +import { getContext } from '@audius/common' +import { decodeHashId } from '@audius/common/utils' import { call } from 'typed-redux-saga' export function* getUnclaimedPlaylistId() { diff --git a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts index c8e84b18733..ad74059ce4f 100644 --- a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts @@ -1,15 +1,11 @@ -import { - makeUid, - cacheActions, - getContext, - reformatCollection -} from '@audius/common' +import { cacheActions, getContext, reformatCollection } from '@audius/common' import { Kind, CollectionMetadata, UserCollectionMetadata, ID } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { put, call } from 'redux-saga/effects' import { addTracksFromCollections } from './addTracksFromCollections' diff --git a/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts b/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts index 95431aeed49..0ee87a31e51 100644 --- a/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts @@ -1,6 +1,4 @@ import { - Nullable, - makeUid, accountSelectors, cacheCollectionsSelectors, cacheSelectors, @@ -16,6 +14,7 @@ import { UserCollectionMetadata, ID } from '@audius/common/models' +import { makeUid, Nullable } from '@audius/common/utils' import { chunk } from 'lodash' import { all, call, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/sagas.js b/packages/web/src/common/store/cache/sagas.js index 6258b6897ef..2864e8020c6 100644 --- a/packages/web/src/common/store/cache/sagas.js +++ b/packages/web/src/common/store/cache/sagas.js @@ -1,6 +1,4 @@ import { - makeUids, - getIdFromKindId, cacheActions, cacheSelectors, cacheConfig, @@ -9,6 +7,7 @@ import { IntKeys } from '@audius/common' import { Status } from '@audius/common/models' +import { makeUids, getIdFromKindId } from '@audius/common/utils' import { pick } from 'lodash' import { all, diff --git a/packages/web/src/common/store/cache/store.test.js b/packages/web/src/common/store/cache/store.test.js index 049882f92e1..fcfada9c3b9 100644 --- a/packages/web/src/common/store/cache/store.test.js +++ b/packages/web/src/common/store/cache/store.test.js @@ -1,10 +1,10 @@ import { cacheActions as actions, cacheReducer, - makeKindId, cacheConfig as config } from '@audius/common' import { Kind, Status } from '@audius/common/models' +import { makeKindId } from '@audius/common/utils' /* eslint-disable no-import-assign */ import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/cache/tracks/sagas.js b/packages/web/src/common/store/cache/tracks/sagas.js index d30b9d26509..2d924dfdf61 100644 --- a/packages/web/src/common/store/cache/tracks/sagas.js +++ b/packages/web/src/common/store/cache/tracks/sagas.js @@ -1,19 +1,21 @@ import { - makeKindId, - squashNewLines, - formatUrlName, accountSelectors, averageColorActions, cacheTracksSelectors, cacheTracksActions as trackActions, cacheUsersSelectors, cacheActions, - waitForAccount, - waitForValue, confirmerActions, confirmTransaction } from '@audius/common' import { Name, DefaultSizes, SquareSizes, Kind } from '@audius/common/models' +import { + formatUrlName, + squashNewLines, + makeKindId, + waitForValue, + waitForAccount +} from '@audius/common/utils' import { call, fork, diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts index 9763b80e062..85048a6da69 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts @@ -1,12 +1,11 @@ import { - removeNullable, accountSelectors, cacheTracksSelectors, cacheActions, - getContext, - waitForValue + getContext } from '@audius/common' import { Kind, ID, UserTrackMetadata } from '@audius/common/models' +import { removeNullable, waitForValue } from '@audius/common/utils' import { select, call, put } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts index 7c56460ae97..9887893f152 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts @@ -1,9 +1,4 @@ -import { - cacheTracksSelectors, - cacheActions, - getContext, - waitForValue -} from '@audius/common' +import { cacheTracksSelectors, cacheActions, getContext } from '@audius/common' import { Kind, StemCategory, @@ -11,6 +6,7 @@ import { Stem, StemTrackMetadata } from '@audius/common/models' +import { waitForValue } from '@audius/common/utils' import { call, put } from 'redux-saga/effects' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/cache/tracks/utils/helpers.ts b/packages/web/src/common/store/cache/tracks/utils/helpers.ts index 69bedb058f7..af500914619 100644 --- a/packages/web/src/common/store/cache/tracks/utils/helpers.ts +++ b/packages/web/src/common/store/cache/tracks/utils/helpers.ts @@ -1,11 +1,11 @@ import { - makeUid, accountSelectors, cacheActions, getContext, reformatUser } from '@audius/common' import { Kind, TrackMetadata, User } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { uniqBy } from 'lodash' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts index ed4baaf6055..7ae4f736b25 100644 --- a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts +++ b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts @@ -1,5 +1,6 @@ -import { makeUid, cacheActions, getContext } from '@audius/common' +import { cacheActions, getContext } from '@audius/common' import { Kind, TrackMetadata, Track } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { put, call } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/cache/users/sagas.js b/packages/web/src/common/store/cache/users/sagas.js index 599cdbf47df..c2c2700a8ce 100644 --- a/packages/web/src/common/store/cache/users/sagas.js +++ b/packages/web/src/common/store/cache/users/sagas.js @@ -4,11 +4,10 @@ import { cacheUsersSelectors, cacheReducer, cacheUsersActions as userActions, - waitForValue, - waitForAccount, reformatUser } from '@audius/common' import { DefaultSizes, Kind } from '@audius/common/models' +import { waitForValue, waitForAccount } from '@audius/common/utils' import { mergeWith } from 'lodash' import { call, put, select, takeEvery, getContext } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/lineup/sagas.js b/packages/web/src/common/store/lineup/sagas.js index 0fddd90535f..63df343e0a5 100644 --- a/packages/web/src/common/store/lineup/sagas.js +++ b/packages/web/src/common/store/lineup/sagas.js @@ -1,7 +1,4 @@ import { - makeUid, - makeUids, - Uid, cacheCollectionsSelectors, cacheTracksSelectors, cacheActions, @@ -17,6 +14,7 @@ import { accountSelectors } from '@audius/common' import { Name, Kind, isContentUSDCPurchaseGated } from '@audius/common/models' +import { Uid, makeUids, makeUid } from '@audius/common/utils' import { all, call, diff --git a/packages/web/src/common/store/notifications/fetchNotifications.ts b/packages/web/src/common/store/notifications/fetchNotifications.ts index 90ad5d62bd6..e3eda2c963a 100644 --- a/packages/web/src/common/store/notifications/fetchNotifications.ts +++ b/packages/web/src/common/store/notifications/fetchNotifications.ts @@ -1,9 +1,5 @@ -import { - FeatureFlags, - getContext, - IntKeys, - removeNullable -} from '@audius/common' +import { FeatureFlags, getContext, IntKeys } from '@audius/common' +import { removeNullable } from '@audius/common/utils' import { partition } from 'lodash' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts b/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts index 988e73151bc..26cbf1a21f0 100644 --- a/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts @@ -1,9 +1,9 @@ import { FetchNotificationsAction, - getErrorMessage, notificationsActions, notificationsSelectors } from '@audius/common' +import { getErrorMessage } from '@audius/common/utils' import { call, put, select, takeEvery } from 'typed-redux-saga' import { NOTIFICATION_LIMIT_DEFAULT } from './constants' diff --git a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts index ee4f246852c..91cc9cfd65d 100644 --- a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts +++ b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts @@ -1,14 +1,13 @@ import { - waitForRead, Notification, NotificationType, Entity, reactionsUIActions, - waitForAccount, Achievement, accountSelectors } from '@audius/common' import { ID, Remix, Track } from '@audius/common/models' +import { waitForAccount, waitForRead } from '@audius/common/utils' import moment from 'moment' import { all, call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts b/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts index 43df3b2b147..bae7176af12 100644 --- a/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts @@ -1,4 +1,5 @@ -import { getErrorMessage, notificationsActions } from '@audius/common' +import { notificationsActions } from '@audius/common' +import { getErrorMessage } from '@audius/common/utils' import { call, put, takeLatest } from 'typed-redux-saga' import { NOTIFICATION_LIMIT_DEFAULT } from './constants' diff --git a/packages/web/src/common/store/pages/ai/sagas.ts b/packages/web/src/common/store/pages/ai/sagas.ts index 80437ed1135..bce02747a1d 100644 --- a/packages/web/src/common/store/pages/ai/sagas.ts +++ b/packages/web/src/common/store/pages/ai/sagas.ts @@ -1,5 +1,6 @@ -import { aiPageActions, FetchAiUserAction, Maybe } from '@audius/common' +import { aiPageActions, FetchAiUserAction } from '@audius/common' import { User } from '@audius/common/models' +import { Maybe } from '@audius/common/utils' import { takeEvery, call, put } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/audio-rewards/sagas.ts b/packages/web/src/common/store/pages/audio-rewards/sagas.ts index d547b3256e1..2626f36ca4a 100644 --- a/packages/web/src/common/store/pages/audio-rewards/sagas.ts +++ b/packages/web/src/common/store/pages/audio-rewards/sagas.ts @@ -3,7 +3,6 @@ import { StringKeys, RemoteConfigInstance, getContext, - stringAudioToStringWei, accountSelectors, accountActions, audioRewardsPageActions, @@ -14,7 +13,6 @@ import { solanaSelectors, walletActions, modalsActions, - waitForValue, Env, musicConfettiActions, createUserBankIfNeeded @@ -24,6 +22,7 @@ import { UserChallenge, StringAudio } from '@audius/common/models' +import { stringAudioToStringWei, waitForValue } from '@audius/common/utils' import { call, fork, diff --git a/packages/web/src/common/store/pages/audio-rewards/store.test.ts b/packages/web/src/common/store/pages/audio-rewards/store.test.ts index feef868b960..c79edb05093 100644 --- a/packages/web/src/common/store/pages/audio-rewards/store.test.ts +++ b/packages/web/src/common/store/pages/audio-rewards/store.test.ts @@ -9,8 +9,7 @@ import { audioRewardsPageSelectors, solanaSelectors, walletActions, - modalsActions, - stringAudioToStringWei + modalsActions } from '@audius/common' import { FailureReason, @@ -18,6 +17,7 @@ import { ChallengeRewardID, StringAudio } from '@audius/common/models' +import { stringAudioToStringWei } from '@audius/common/utils' import delayP from '@redux-saga/delay-p' import { all, fork } from 'redux-saga/effects' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/pages/audio-transactions/sagas.ts b/packages/web/src/common/store/pages/audio-transactions/sagas.ts index 41d7b9c3070..076f6f12da5 100644 --- a/packages/web/src/common/store/pages/audio-transactions/sagas.ts +++ b/packages/web/src/common/store/pages/audio-transactions/sagas.ts @@ -3,13 +3,12 @@ import { TransactionDetails, TransactionMethod, TransactionType, - formatDate, transactionDetailsActions, - getContext, - Nullable + getContext } from '@audius/common' import type { InAppAudioPurchaseMetadata } from '@audius/common' import { StringAudio } from '@audius/common/models' +import { formatDate, Nullable } from '@audius/common/utils' import { AudiusLibs, full } from '@audius/sdk' import { call, takeLatest, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/collection/lineups/sagas.js b/packages/web/src/common/store/pages/collection/lineups/sagas.js index 2d4bdfa69ec..8492d9d025c 100644 --- a/packages/web/src/common/store/pages/collection/lineups/sagas.js +++ b/packages/web/src/common/store/pages/collection/lineups/sagas.js @@ -1,13 +1,11 @@ import { - removeNullable, - Uid, smartCollectionPageSelectors, collectionPageLineupActions as tracksActions, collectionPageSelectors, - waitForValue, queueSelectors } from '@audius/common' import { Kind } from '@audius/common/models' +import { removeNullable, Uid, waitForValue } from '@audius/common/utils' import { keyBy } from 'lodash' import moment from 'moment' import { select, call } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/collection/sagas.js b/packages/web/src/common/store/pages/collection/sagas.js index 9afb5ee20ca..8686cd8c319 100644 --- a/packages/web/src/common/store/pages/collection/sagas.js +++ b/packages/web/src/common/store/pages/collection/sagas.js @@ -1,5 +1,4 @@ import { - makeUid, cacheActions, collectionPageActions as collectionActions, collectionPageLineupActions as tracksActions, @@ -7,6 +6,7 @@ import { reachabilitySelectors } from '@audius/common' import { Kind } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { call, put, select, takeLatest, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/deactivate-account/sagas.ts b/packages/web/src/common/store/pages/deactivate-account/sagas.ts index e79bcc1161f..2583d5085fe 100644 --- a/packages/web/src/common/store/pages/deactivate-account/sagas.ts +++ b/packages/web/src/common/store/pages/deactivate-account/sagas.ts @@ -1,7 +1,6 @@ import { accountSelectors, getContext, - waitForValue, signOutActions, deactivateAccountActions, confirmerActions, @@ -9,6 +8,7 @@ import { confirmerSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import { waitForValue } from '@audius/common/utils' import { call, delay, put, select, takeEvery } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/pages/feed/sagas.ts b/packages/web/src/common/store/pages/feed/sagas.ts index 46cfa0cfcdb..0b44eaa9d3a 100644 --- a/packages/web/src/common/store/pages/feed/sagas.ts +++ b/packages/web/src/common/store/pages/feed/sagas.ts @@ -1,10 +1,10 @@ import { - getErrorMessage, feedPageLineupActions as feedActions, feedPageActions as discoverActions, usersSocialActions as socialActions } from '@audius/common' import { FollowSource, ID } from '@audius/common/models' +import { getErrorMessage } from '@audius/common/utils' import { call, put, take, fork, takeEvery } from 'redux-saga/effects' import { fetchUsers } from 'common/store/cache/users/sagas' diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js index 2f169b543c3..eff92dfcc65 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js +++ b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js @@ -1,6 +1,4 @@ import { - getIdFromKindId, - getKindFromKindId, accountSelectors, cacheCollectionsSelectors, cacheTracksSelectors, @@ -8,10 +6,14 @@ import { profilePageFeedLineupActions as feedActions, tracksSocialActions, collectionsSocialActions, - makeUid, confirmerSelectors } from '@audius/common' import { Kind } from '@audius/common/models' +import { + makeUid, + getIdFromKindId, + getKindFromKindId +} from '@audius/common/utils' import { select, call, takeEvery, put } from 'redux-saga/effects' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts index 38d368a27b9..e13116856e3 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts @@ -1,11 +1,11 @@ import { accountSelectors, - makeUid, profilePageTracksLineupActions, profilePageSelectors, uploadActions } from '@audius/common' import { Kind } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { put, select, takeEvery } from 'typed-redux-saga' const { UPLOAD_TRACKS_SUCCEEDED, uploadTracksSucceeded } = uploadActions diff --git a/packages/web/src/common/store/pages/saved/lineups/sagas.js b/packages/web/src/common/store/pages/saved/lineups/sagas.js index 390eb46d7c0..3d7a4450d39 100644 --- a/packages/web/src/common/store/pages/saved/lineups/sagas.js +++ b/packages/web/src/common/store/pages/saved/lineups/sagas.js @@ -1,5 +1,4 @@ import { - makeUid, cacheTracksSelectors, savedPageTracksLineupActions as savedTracksActions, savedPageActions as saveActions, @@ -16,6 +15,7 @@ import { ContentType } from '@audius/common' import { Kind } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { uniq } from 'lodash' import moment from 'moment' import { call, select, put, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/saved/sagas.ts b/packages/web/src/common/store/pages/saved/sagas.ts index 1cc84dad69d..db0108af951 100644 --- a/packages/web/src/common/store/pages/saved/sagas.ts +++ b/packages/web/src/common/store/pages/saved/sagas.ts @@ -1,17 +1,12 @@ import { APIActivityV2, LibraryCategoryType, - Nullable, accountSelectors, savedPageActions as actions, - decodeHashId, - encodeHashId, getContext, - removeNullable, responseAdapter, savedPageSelectors, - savedPageTracksLineupActions as tracksActions, - waitForValue + savedPageTracksLineupActions as tracksActions } from '@audius/common' import { FavoriteType, @@ -19,6 +14,13 @@ import { UserTrackMetadata, User } from '@audius/common/models' +import { + decodeHashId, + encodeHashId, + removeNullable, + waitForValue, + Nullable +} from '@audius/common/utils' import { call, fork, put, select, takeLatest } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js b/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js index 9677efdc4b1..2963b164ef2 100644 --- a/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js +++ b/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js @@ -2,9 +2,9 @@ import { cacheTracksSelectors, searchResultsPageSelectors, SearchKind, - searchResultsPageTracksLineupActions as tracksActions, - trimToAlphaNumeric + searchResultsPageTracksLineupActions as tracksActions } from '@audius/common' +import { trimToAlphaNumeric } from '@audius/common/utils' import { select, all, call, getContext } from 'redux-saga/effects' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/common/store/pages/search-page/sagas.js b/packages/web/src/common/store/pages/search-page/sagas.js index 537e53e68e3..99b7aaa50ad 100644 --- a/packages/web/src/common/store/pages/search-page/sagas.js +++ b/packages/web/src/common/store/pages/search-page/sagas.js @@ -1,13 +1,12 @@ import { - trimToAlphaNumeric, accountSelectors, searchResultsPageActions as searchPageActions, searchResultsPageTracksLineupActions as tracksLineupActions, SearchKind, processAndCacheUsers, - removeNullable, FeatureFlags } from '@audius/common' +import { trimToAlphaNumeric, removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { select, diff --git a/packages/web/src/common/store/pages/settings/sagas.ts b/packages/web/src/common/store/pages/settings/sagas.ts index bc41af0a390..9e78a8d31e0 100644 --- a/packages/web/src/common/store/pages/settings/sagas.ts +++ b/packages/web/src/common/store/pages/settings/sagas.ts @@ -1,11 +1,11 @@ import { - getErrorMessage, settingsPageActions as actions, getContext, accountSelectors, cacheActions } from '@audius/common' import { Kind } from '@audius/common/models' +import { getErrorMessage } from '@audius/common/utils' import { call, put, takeEvery, select } from 'typed-redux-saga' import { waitForWrite } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/signon/sagas.js b/packages/web/src/common/store/pages/signon/sagas.js index 4b24cfd0eda..e398d15d681 100644 --- a/packages/web/src/common/store/pages/signon/sagas.js +++ b/packages/web/src/common/store/pages/signon/sagas.js @@ -1,7 +1,5 @@ import { - ELECTRONIC_SUBGENRES, FeatureFlags, - Genre, MAX_HANDLE_LENGTH, accountActions, accountSelectors, @@ -16,12 +14,16 @@ import { toastActions, confirmerActions, confirmTransaction, - IntKeys, - parseHandleReservedStatusFromSocial, - isValidEmailString, - waitForAccount + IntKeys } from '@audius/common' import { Name, FavoriteSource } from '@audius/common/models' +import { + Genre, + ELECTRONIC_SUBGENRES, + waitForAccount, + parseHandleReservedStatusFromSocial, + isValidEmailString +} from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { isEmpty } from 'lodash' import { diff --git a/packages/web/src/common/store/pages/signon/verifiedChecker.ts b/packages/web/src/common/store/pages/signon/verifiedChecker.ts index 8eb2272798a..f7248c20f39 100644 --- a/packages/web/src/common/store/pages/signon/verifiedChecker.ts +++ b/packages/web/src/common/store/pages/signon/verifiedChecker.ts @@ -1,4 +1,4 @@ -import { Nullable } from '@audius/common' +import { Nullable } from '@audius/common/utils' type TwitterUser = { verified: boolean diff --git a/packages/web/src/common/store/pages/track/lineups/sagas.ts b/packages/web/src/common/store/pages/track/lineups/sagas.ts index ea29cbae01a..09dd114f059 100644 --- a/packages/web/src/common/store/pages/track/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/track/lineups/sagas.ts @@ -2,9 +2,9 @@ import { accountSelectors, cacheTracksSelectors, trackPageLineupActions, - trackPageSelectors, - waitForValue + trackPageSelectors } from '@audius/common' +import { waitForValue } from '@audius/common/utils' import { call, select } from 'typed-redux-saga' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/common/store/pages/track/sagas.js b/packages/web/src/common/store/pages/track/sagas.js index a7f44d145d4..9cc4943ac99 100644 --- a/packages/web/src/common/store/pages/track/sagas.js +++ b/packages/web/src/common/store/pages/track/sagas.js @@ -1,6 +1,5 @@ import { StringKeys, - makeUid, cacheTracksActions as trackCacheActions, cacheTracksSelectors, cacheUsersSelectors, @@ -10,6 +9,7 @@ import { reachabilitySelectors } from '@audius/common' import { Kind } from '@audius/common/models' +import { makeUid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { keccak_256 } from 'js-sha3' import moment from 'moment' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts index 3b414901f10..9be2483a79d 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts +++ b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts @@ -1,7 +1,5 @@ import { - Nullable, StringKeys, - Genre, cacheTracksSelectors, trendingPageLineupSelectors, trendingPageActions, @@ -9,6 +7,7 @@ import { getContext } from '@audius/common' import { TimeRange, ID, Track, UserTrackMetadata } from '@audius/common/models' +import { Genre, Nullable } from '@audius/common/utils' import { keccak_256 } from 'js-sha3' import { call, put, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/player/sagas.ts b/packages/web/src/common/store/player/sagas.ts index 4a60eab04fc..ac9598b666b 100644 --- a/packages/web/src/common/store/player/sagas.ts +++ b/packages/web/src/common/store/player/sagas.ts @@ -1,26 +1,28 @@ import { - encodeHashId, accountSelectors, cacheTracksSelectors, cacheActions, queueActions, tracksSocialActions, getContext, - actionChannelDispatcher, playerActions, playerSelectors, playbackPositionActions, playbackPositionSelectors, reachabilitySelectors, - Nullable, FeatureFlags, gatedContentSelectors, - QueryParams, - Genre, - getQueryParams, - getTrackPreviewDuration + QueryParams } from '@audius/common' import { Kind } from '@audius/common/models' +import { + Genre, + encodeHashId, + actionChannelDispatcher, + getQueryParams, + getTrackPreviewDuration, + Nullable +} from '@audius/common/utils' import { eventChannel } from 'redux-saga' import { select, diff --git a/packages/web/src/common/store/profile/sagas.js b/packages/web/src/common/store/profile/sagas.js index 67b69324dff..8bf0d2c2877 100644 --- a/packages/web/src/common/store/profile/sagas.js +++ b/packages/web/src/common/store/profile/sagas.js @@ -1,8 +1,5 @@ import { DoubleKeys, - makeUid, - makeKindId, - squashNewLines, accountSelectors, cacheActions, profilePageSelectors, @@ -11,11 +8,6 @@ import { reachabilitySelectors, tippingActions, relatedArtistsUIActions as relatedArtistsActions, - waitForAccount, - dataURLtoFile, - SUPPORTING_PAGINATION_SIZE, - MAX_PROFILE_SUPPORTING_TILES, - MAX_PROFILE_TOP_SUPPORTERS, collectiblesActions, processAndCacheUsers, chatActions, @@ -24,6 +16,16 @@ import { confirmTransaction } from '@audius/common' import { DefaultSizes, Kind } from '@audius/common/models' +import { + squashNewLines, + makeUid, + makeKindId, + waitForAccount, + dataURLtoFile, + MAX_PROFILE_TOP_SUPPORTERS, + MAX_PROFILE_SUPPORTING_TILES, + SUPPORTING_PAGINATION_SIZE +} from '@audius/common/utils' import { merge } from 'lodash' import { all, diff --git a/packages/web/src/common/store/queue/sagas.ts b/packages/web/src/common/store/queue/sagas.ts index 402e3898b6a..e5eb08ba89e 100644 --- a/packages/web/src/common/store/queue/sagas.ts +++ b/packages/web/src/common/store/queue/sagas.ts @@ -1,7 +1,4 @@ import { - Nullable, - makeUid, - Uid, accountSelectors, cacheCollectionsSelectors, cacheTracksSelectors, @@ -11,7 +8,6 @@ import { queueActions, RepeatMode, QueueSource, - waitForAccount, playerActions, playerSelectors, queueSelectors, @@ -27,6 +23,7 @@ import { LineupState, User } from '@audius/common/models' +import { Uid, makeUid, waitForAccount, Nullable } from '@audius/common/utils' import { all, call, put, select, takeEvery, takeLatest } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/recommendation/sagas.ts b/packages/web/src/common/store/recommendation/sagas.ts index ee9a803bde7..54fc855a6df 100644 --- a/packages/web/src/common/store/recommendation/sagas.ts +++ b/packages/web/src/common/store/recommendation/sagas.ts @@ -1,5 +1,6 @@ -import { Nullable, getContext } from '@audius/common' +import { getContext } from '@audius/common' import { ID } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { call } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/saved-collections/sagas.ts b/packages/web/src/common/store/saved-collections/sagas.ts index 618fe606003..29ecf60e833 100644 --- a/packages/web/src/common/store/saved-collections/sagas.ts +++ b/packages/web/src/common/store/saved-collections/sagas.ts @@ -1,10 +1,10 @@ import { CollectionType, savedCollectionsActions, - savedCollectionsSelectors, - waitForRead + savedCollectionsSelectors } from '@audius/common' import { ID } from '@audius/common/models' +import { waitForRead } from '@audius/common/utils' import { all, call, select, put, takeEvery } from 'typed-redux-saga' import { retrieveCollections } from '../cache/collections/utils' diff --git a/packages/web/src/common/store/search-ai-bar/sagas.ts b/packages/web/src/common/store/search-ai-bar/sagas.ts index 90ed8d313b4..6a6217f1add 100644 --- a/packages/web/src/common/store/search-ai-bar/sagas.ts +++ b/packages/web/src/common/store/search-ai-bar/sagas.ts @@ -1,10 +1,6 @@ -import { - SearchKind, - accountSelectors, - getContext, - removeNullable -} from '@audius/common' +import { SearchKind, accountSelectors, getContext } from '@audius/common' import { Name } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { call, diff --git a/packages/web/src/common/store/search-bar/sagas.ts b/packages/web/src/common/store/search-bar/sagas.ts index f2c2f3717f3..9145598277f 100644 --- a/packages/web/src/common/store/search-bar/sagas.ts +++ b/packages/web/src/common/store/search-bar/sagas.ts @@ -1,10 +1,6 @@ -import { - accountSelectors, - getContext, - removeNullable, - FeatureFlags -} from '@audius/common' +import { accountSelectors, getContext, FeatureFlags } from '@audius/common' import { Name } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { all, diff --git a/packages/web/src/common/store/smart-collection/sagas.ts b/packages/web/src/common/store/smart-collection/sagas.ts index 2515422e939..3eb624a53e9 100644 --- a/packages/web/src/common/store/smart-collection/sagas.ts +++ b/packages/web/src/common/store/smart-collection/sagas.ts @@ -3,7 +3,6 @@ import { smartCollectionPageActions, collectionPageActions, getContext, - removeNullable, collectionPageLineupActions } from '@audius/common' import { @@ -12,6 +11,7 @@ import { UserTrackMetadata, UserTrack } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import { takeEvery, put, call, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/social/collections/sagas.ts b/packages/web/src/common/store/social/collections/sagas.ts index cff5c8853cd..25c1fc87070 100644 --- a/packages/web/src/common/store/social/collections/sagas.ts +++ b/packages/web/src/common/store/social/collections/sagas.ts @@ -1,7 +1,4 @@ import { - makeUid, - makeKindId, - formatShareText, accountSelectors, accountActions, cacheCollectionsSelectors, @@ -25,6 +22,7 @@ import { PlaylistLibrary, User } from '@audius/common/models' +import { formatShareText, makeUid, makeKindId } from '@audius/common/utils' import { call, select, takeEvery, put } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/social/tracks/sagas.ts b/packages/web/src/common/store/social/tracks/sagas.ts index e6056a37188..746d78c01a9 100644 --- a/packages/web/src/common/store/social/tracks/sagas.ts +++ b/packages/web/src/common/store/social/tracks/sagas.ts @@ -1,6 +1,4 @@ import { - makeKindId, - formatShareText, accountSelectors, cacheTracksSelectors, cacheUsersSelectors, @@ -8,15 +6,19 @@ import { gatedContentSelectors, getContext, tracksSocialActions as socialActions, - waitForValue, QueryParams, - encodeHashId, - getQueryParams, confirmerActions, confirmTransaction, FeatureFlags } from '@audius/common' import { Name, Kind, ID, Track, User } from '@audius/common/models' +import { + formatShareText, + encodeHashId, + makeKindId, + waitForValue, + getQueryParams +} from '@audius/common/utils' import { fork } from 'redux-saga/effects' import { call, select, takeEvery, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/social/users/sagas.ts b/packages/web/src/common/store/social/users/sagas.ts index dfe3417e7b9..623506d1d87 100644 --- a/packages/web/src/common/store/social/users/sagas.ts +++ b/packages/web/src/common/store/social/users/sagas.ts @@ -1,5 +1,4 @@ import { - makeKindId, accountSelectors, cacheActions, cacheUsersSelectors, @@ -10,6 +9,7 @@ import { confirmTransaction } from '@audius/common' import { Name, Kind, ID } from '@audius/common/models' +import { makeKindId } from '@audius/common/utils' import { call, select, takeEvery, put } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/tipping/sagas.ts b/packages/web/src/common/store/tipping/sagas.ts index 58d0f201baa..c1423c37713 100644 --- a/packages/web/src/common/store/tipping/sagas.ts +++ b/packages/web/src/common/store/tipping/sagas.ts @@ -1,9 +1,4 @@ import { - parseAudioInputToWei, - stringWeiToBN, - weiToAudioString, - weiToString, - decodeHashId, accountSelectors, cacheActions, RefreshSupportPayloadAction, @@ -12,18 +7,14 @@ import { walletSelectors, walletActions, getContext, - waitForValue, GetTipsArgs, GetSupportingArgs, GetSupportersArgs, - MAX_PROFILE_TOP_SUPPORTERS, - SUPPORTING_PAGINATION_SIZE, LocalStorage, processAndCacheUsers, solanaSelectors, createUserBankIfNeeded, - chatActions, - isNullOrUndefined + chatActions } from '@audius/common' import { Name, @@ -37,6 +28,17 @@ import { BNWei, SolanaWalletAddress } from '@audius/common/models' +import { + decodeHashId, + isNullOrUndefined, + weiToAudioString, + stringWeiToBN, + weiToString, + parseAudioInputToWei, + waitForValue, + MAX_PROFILE_TOP_SUPPORTERS, + SUPPORTING_PAGINATION_SIZE +} from '@audius/common/utils' import { PayloadAction } from '@reduxjs/toolkit' import BN from 'bn.js' import { diff --git a/packages/web/src/common/store/ui/reactions/sagas.ts b/packages/web/src/common/store/ui/reactions/sagas.ts index 59b19adcc59..1c3f821562e 100644 --- a/packages/web/src/common/store/ui/reactions/sagas.ts +++ b/packages/web/src/common/store/ui/reactions/sagas.ts @@ -1,13 +1,12 @@ import { - removeNullable, getReactionFromRawValue, reactionsMap, reactionsUIActions, reactionsUISelectors, getContext, - AudiusBackend, - getErrorMessage + AudiusBackend } from '@audius/common' +import { getErrorMessage, removeNullable } from '@audius/common/utils' import { call, takeEvery, all, put, select } from 'typed-redux-saga' const { fetchReactionValues, setLocalReactionValues, writeReactionValue } = diff --git a/packages/web/src/common/store/upload/sagaHelpers.ts b/packages/web/src/common/store/upload/sagaHelpers.ts index cd8d7a1fe0d..49fc27ae4cd 100644 --- a/packages/web/src/common/store/upload/sagaHelpers.ts +++ b/packages/web/src/common/store/upload/sagaHelpers.ts @@ -1,5 +1,4 @@ import { - BN_USDC_CENT_WEI, FeatureFlags, accountSelectors, getContext, @@ -13,6 +12,7 @@ import { isContentUSDCPurchaseGated, TrackMetadata } from '@audius/common/models' +import { BN_USDC_CENT_WEI } from '@audius/common/utils' import { PublicKey } from '@solana/web3.js' import BN from 'bn.js' import { range } from 'lodash' diff --git a/packages/web/src/common/store/upload/sagas.js b/packages/web/src/common/store/upload/sagas.js index c95f2470583..34cbc73d829 100644 --- a/packages/web/src/common/store/upload/sagas.js +++ b/packages/web/src/common/store/upload/sagas.js @@ -1,12 +1,8 @@ import { - makeUid, - formatUrlName, accountSelectors, accountActions, cacheUsersSelectors, cacheActions, - waitForAccount, - actionChannelDispatcher, uploadActions, UploadType, ProgressStatus, @@ -18,6 +14,12 @@ import { savedPageActions } from '@audius/common' import { Name, Kind } from '@audius/common/models' +import { + formatUrlName, + makeUid, + actionChannelDispatcher, + waitForAccount +} from '@audius/common/utils' import { range } from 'lodash' import { channel, buffers } from 'redux-saga' import { diff --git a/packages/web/src/common/store/user-list/supporting/sagas.ts b/packages/web/src/common/store/user-list/supporting/sagas.ts index 2eb11434511..c1ce868cf1f 100644 --- a/packages/web/src/common/store/user-list/supporting/sagas.ts +++ b/packages/web/src/common/store/user-list/supporting/sagas.ts @@ -1,6 +1,4 @@ import { - stringWeiToBN, - decodeHashId, cacheUsersSelectors, tippingActions, SupportingMapForUser, @@ -12,6 +10,7 @@ import { SupportingResponse } from '@audius/common' import { ID, UserMetadata, User } from '@audius/common/models' +import { decodeHashId, stringWeiToBN } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' import { watchSupportingError } from 'common/store/user-list/supporting/errorSagas' diff --git a/packages/web/src/common/store/user-list/top-supporters/sagas.ts b/packages/web/src/common/store/user-list/top-supporters/sagas.ts index b292eb48839..5627106ce55 100644 --- a/packages/web/src/common/store/user-list/top-supporters/sagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/sagas.ts @@ -1,6 +1,4 @@ import { - removeNullable, - decodeHashId, cacheUsersSelectors, tippingActions, SupportersMapForUser, @@ -12,6 +10,7 @@ import { responseAdapter as adapter } from '@audius/common' import { ID, User } from '@audius/common/models' +import { decodeHashId, removeNullable } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' import { watchTopSupportersError } from 'common/store/user-list/top-supporters/errorSagas' diff --git a/packages/web/src/common/store/wallet/sagas.ts b/packages/web/src/common/store/wallet/sagas.ts index 4024b240249..e56603dba4c 100644 --- a/packages/web/src/common/store/wallet/sagas.ts +++ b/packages/web/src/common/store/wallet/sagas.ts @@ -1,8 +1,5 @@ import { FeatureFlags, - stringWeiToBN, - weiToString, - getErrorMessage, accountSelectors, accountActions, tokenDashboardPageActions, @@ -11,8 +8,7 @@ import { walletActions, getContext, createUserBankIfNeeded, - solanaSelectors, - isNullOrUndefined + solanaSelectors } from '@audius/common' import { Name, @@ -21,6 +17,12 @@ import { BNWei, SolanaWalletAddress } from '@audius/common/models' +import { + getErrorMessage, + isNullOrUndefined, + stringWeiToBN, + weiToString +} from '@audius/common/utils' import type { AudiusLibs } from '@audius/sdk' import BN from 'bn.js' import { all, call, put, take, takeEvery, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/utils/requiresAccount.ts b/packages/web/src/common/utils/requiresAccount.ts index c6710ef9cfb..a51da2c5bd2 100644 --- a/packages/web/src/common/utils/requiresAccount.ts +++ b/packages/web/src/common/utils/requiresAccount.ts @@ -1,4 +1,5 @@ -import { accountSelectors, getContext, waitForAccount } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common' +import { waitForAccount } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/components/address-tile/AddressTile.tsx b/packages/web/src/components/address-tile/AddressTile.tsx index 736c2483bbe..5334ca15b42 100644 --- a/packages/web/src/components/address-tile/AddressTile.tsx +++ b/packages/web/src/components/address-tile/AddressTile.tsx @@ -1,7 +1,7 @@ import { useCallback, useContext } from 'react' -import { shortenSPLAddress } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' +import { shortenSPLAddress } from '@audius/common/utils' import { USDC } from '@audius/fixed-decimal' import { Text, diff --git a/packages/web/src/components/ai-attribution-modal/AiAttributionModal.tsx b/packages/web/src/components/ai-attribution-modal/AiAttributionModal.tsx index 667f1e71cd3..a21eb491ac1 100644 --- a/packages/web/src/components/ai-attribution-modal/AiAttributionModal.tsx +++ b/packages/web/src/components/ai-attribution-modal/AiAttributionModal.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import { Nullable } from '@audius/common' import { ID } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { Button, ButtonSize, diff --git a/packages/web/src/components/animated-button/AnimatedIconButton.tsx b/packages/web/src/components/animated-button/AnimatedIconButton.tsx index e697711ce5c..275c3710889 100644 --- a/packages/web/src/components/animated-button/AnimatedIconButton.tsx +++ b/packages/web/src/components/animated-button/AnimatedIconButton.tsx @@ -1,6 +1,6 @@ import { useState, MouseEvent } from 'react' -import { uuid } from '@audius/common' +import { uuid } from '@audius/common/utils' import AnimatedButtonProvider from './AnimatedButtonProvider' diff --git a/packages/web/src/components/artist/ArtistChipFollowers.tsx b/packages/web/src/components/artist/ArtistChipFollowers.tsx index 071d08c7d12..aeaaf54db79 100644 --- a/packages/web/src/components/artist/ArtistChipFollowers.tsx +++ b/packages/web/src/components/artist/ArtistChipFollowers.tsx @@ -1,5 +1,5 @@ -import { formatCount } from '@audius/common' import { ID } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import cn from 'classnames' import IconUser from 'assets/img/iconUser.svg' diff --git a/packages/web/src/components/artist/ArtistChipSupportFor.tsx b/packages/web/src/components/artist/ArtistChipSupportFor.tsx index f22aab7fdc5..9ea621ba36e 100644 --- a/packages/web/src/components/artist/ArtistChipSupportFor.tsx +++ b/packages/web/src/components/artist/ArtistChipSupportFor.tsx @@ -1,12 +1,8 @@ import { useEffect, useState } from 'react' -import { - Nullable, - formatWei, - stringWeiToBN, - tippingSelectors -} from '@audius/common' +import { tippingSelectors } from '@audius/common' import { ID, StringWei } from '@audius/common/models' +import { stringWeiToBN, formatWei, Nullable } from '@audius/common/utils' import { IconTrophy, IconTrending } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/artist/ArtistChipSupportFrom.tsx b/packages/web/src/components/artist/ArtistChipSupportFrom.tsx index 6b49c9deead..153216ded06 100644 --- a/packages/web/src/components/artist/ArtistChipSupportFrom.tsx +++ b/packages/web/src/components/artist/ArtistChipSupportFrom.tsx @@ -1,12 +1,8 @@ import { useEffect, useState } from 'react' -import { - Nullable, - formatWei, - stringWeiToBN, - tippingSelectors -} from '@audius/common' +import { tippingSelectors } from '@audius/common' import { ID, StringWei } from '@audius/common/models' +import { stringWeiToBN, formatWei, Nullable } from '@audius/common/utils' import cn from 'classnames' import IconTip from 'assets/img/iconTip.svg' diff --git a/packages/web/src/components/artist/ArtistSupporting.tsx b/packages/web/src/components/artist/ArtistSupporting.tsx index 3f8db6a7e65..0c9595c40a9 100644 --- a/packages/web/src/components/artist/ArtistSupporting.tsx +++ b/packages/web/src/components/artist/ArtistSupporting.tsx @@ -1,15 +1,17 @@ import { useCallback, useEffect } from 'react' import { - stringWeiToBN, cacheUsersSelectors, tippingSelectors, tippingActions, userListActions, - SUPPORTING_USER_LIST_TAG as SUPPORTING_TAG, - MAX_ARTIST_HOVER_TOP_SUPPORTING + SUPPORTING_USER_LIST_TAG as SUPPORTING_TAG } from '@audius/common' import { ID, User } from '@audius/common/models' +import { + stringWeiToBN, + MAX_ARTIST_HOVER_TOP_SUPPORTING +} from '@audius/common/utils' import { useDispatch } from 'react-redux' import IconTip from 'assets/img/iconTip.svg' diff --git a/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx b/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx index a63bb251238..3c043128107 100644 --- a/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx +++ b/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx @@ -1,10 +1,11 @@ import { cloneElement } from 'react' -import { accountSelectors, formatWei, isNullOrUndefined } from '@audius/common' +import { accountSelectors } from '@audius/common' import { useSelectTierInfo, useTotalBalanceWithFallback } from '@audius/common/hooks' +import { isNullOrUndefined, formatWei } from '@audius/common/utils' import BN from 'bn.js' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx b/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx index bd3500624b6..c23e5713585 100644 --- a/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx +++ b/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx @@ -1,12 +1,12 @@ import { MouseEvent, useCallback, useMemo } from 'react' import { - formatAudio, TransactionMethod, TransactionType, TransactionDetails } from '@audius/common' import { Kind } from '@audius/common/models' +import { formatAudio } from '@audius/common/utils' import cn from 'classnames' import moment from 'moment' import { Cell, Row } from 'react-table' diff --git a/packages/web/src/components/avatar/Avatar.tsx b/packages/web/src/components/avatar/Avatar.tsx index 599c6e3d4bf..338d3336478 100644 --- a/packages/web/src/components/avatar/Avatar.tsx +++ b/packages/web/src/components/avatar/Avatar.tsx @@ -1,10 +1,10 @@ import { - Maybe, accountSelectors, cacheUsersSelectors, imageProfilePicEmpty } from '@audius/common' import { SquareSizes, ID } from '@audius/common/models' +import { Maybe } from '@audius/common/utils' import { Box, Avatar as HarmonyAvatar, diff --git a/packages/web/src/components/avatar/AvatarLegacy.tsx b/packages/web/src/components/avatar/AvatarLegacy.tsx index bd238d59c03..7134bbb1d70 100644 --- a/packages/web/src/components/avatar/AvatarLegacy.tsx +++ b/packages/web/src/components/avatar/AvatarLegacy.tsx @@ -1,10 +1,10 @@ import { - Maybe, accountSelectors, cacheUsersSelectors, imageProfilePicEmpty } from '@audius/common' import { SquareSizes, ID } from '@audius/common/models' +import { Maybe } from '@audius/common/utils' import { Link } from 'react-router-dom' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/components/buy-audio-modal/components/InProgressPage.tsx b/packages/web/src/components/buy-audio-modal/components/InProgressPage.tsx index 3fcdaa79095..3ac23ce71e9 100644 --- a/packages/web/src/components/buy-audio-modal/components/InProgressPage.tsx +++ b/packages/web/src/components/buy-audio-modal/components/InProgressPage.tsx @@ -3,9 +3,9 @@ import { ReactNode } from 'react' import { buyAudioSelectors, BuyAudioStage, - formatNumberString, OnRampProvider } from '@audius/common' +import { formatNumberString } from '@audius/common/utils' import { IconCaretDown, IconMultiselectRemove } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx b/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx index fab5971d0c3..91612f4e325 100644 --- a/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx +++ b/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx @@ -1,9 +1,6 @@ -import { - PurchaseInfoErrorType, - buyAudioSelectors, - formatNumberString -} from '@audius/common' +import { PurchaseInfoErrorType, buyAudioSelectors } from '@audius/common' import { Status } from '@audius/common/models' +import { formatNumberString } from '@audius/common/utils' import { IconCaretDown } from '@audius/stems' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx b/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx index daae1a61b59..83f7e967176 100644 --- a/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx +++ b/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx @@ -4,11 +4,10 @@ import { transactionDetailsSelectors, transactionDetailsActions, modalsActions, - buyAudioSelectors, - formatAudio, - isNullOrUndefined + buyAudioSelectors } from '@audius/common' import { Status } from '@audius/common/models' +import { formatAudio, isNullOrUndefined } from '@audius/common/utils' import { Button, ButtonSize, ButtonType, IconInfo } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/card/UserCard.jsx b/packages/web/src/components/card/UserCard.jsx index 5361bfc6c1a..658a26f89ec 100644 --- a/packages/web/src/components/card/UserCard.jsx +++ b/packages/web/src/components/card/UserCard.jsx @@ -1,5 +1,5 @@ -import { formatCount } from '@audius/common' import { SquareSizes } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/card/desktop/Card.tsx b/packages/web/src/components/card/desktop/Card.tsx index d56133873d7..65d6081d79a 100644 --- a/packages/web/src/components/card/desktop/Card.tsx +++ b/packages/web/src/components/card/desktop/Card.tsx @@ -8,7 +8,7 @@ import { MouseEventHandler } from 'react' -import { pluralize, imageBlank as placeholderArt } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common' import { DogEarType, SquareSizes, @@ -16,6 +16,7 @@ import { CoverArtSizes, ProfilePictureSizes } from '@audius/common/models' +import { pluralize } from '@audius/common/utils' import cn from 'classnames' import IconKebabHorizontal from 'assets/img/iconKebabHorizontal.svg' diff --git a/packages/web/src/components/card/desktop/UserArtCard.tsx b/packages/web/src/components/card/desktop/UserArtCard.tsx index 167e2c9a78b..55375d580e5 100644 --- a/packages/web/src/components/card/desktop/UserArtCard.tsx +++ b/packages/web/src/components/card/desktop/UserArtCard.tsx @@ -1,11 +1,11 @@ import { useCallback, useEffect } from 'react' import { - formatCount, cacheUsersSelectors, imageBlank as placeholderArt } from '@audius/common' import { SquareSizes, ID } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/card/mobile/Card.tsx b/packages/web/src/components/card/mobile/Card.tsx index e5896786e05..af40a91a7a4 100644 --- a/packages/web/src/components/card/mobile/Card.tsx +++ b/packages/web/src/components/card/mobile/Card.tsx @@ -1,12 +1,13 @@ import React, { MouseEvent, ReactNode } from 'react' -import { pluralize, imageBlank as placeholderArt } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common' import { SquareSizes, ID, CoverArtSizes, ProfilePictureSizes } from '@audius/common/models' +import { pluralize } from '@audius/common/utils' import cn from 'classnames' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/components/collectibles-playlist-table/CollectiblesPlaylistTable.tsx b/packages/web/src/components/collectibles-playlist-table/CollectiblesPlaylistTable.tsx index 9d88e303505..eaa6d5eb367 100644 --- a/packages/web/src/components/collectibles-playlist-table/CollectiblesPlaylistTable.tsx +++ b/packages/web/src/components/collectibles-playlist-table/CollectiblesPlaylistTable.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo, MouseEvent } from 'react' -import { formatSeconds } from '@audius/common' import { Chain } from '@audius/common/models' +import { formatSeconds } from '@audius/common/utils' import cn from 'classnames' import { Cell, Row } from 'react-table' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx index af941187dc3..ccca5c2b22b 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx @@ -2,10 +2,10 @@ import { useCallback, useEffect, useState } from 'react' import { profilePageSelectors, - collectibleDetailsUIActions, - getHash + collectibleDetailsUIActions } from '@audius/common' import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' +import { getHash } from '@audius/common/utils' import { LogoEth, LogoSol } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx index c646dabd3b7..a235851b92a 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx @@ -8,7 +8,6 @@ import { } from 'react' import { - formatDateWithTimezoneOffset, accountSelectors, badgeTiers, collectibleDetailsUISelectors, @@ -16,6 +15,7 @@ import { } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' +import { formatDateWithTimezoneOffset } from '@audius/common/utils' import { Button, ButtonSize, diff --git a/packages/web/src/components/collectibles/components/CollectibleRow.tsx b/packages/web/src/components/collectibles/components/CollectibleRow.tsx index 50622cb1ead..3226fd4984b 100644 --- a/packages/web/src/components/collectibles/components/CollectibleRow.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleRow.tsx @@ -1,7 +1,7 @@ import { useEffect, useRef, useState } from 'react' -import { formatDateWithTimezoneOffset } from '@audius/common' import { CollectibleMediaType, Collectible } from '@audius/common/models' +import { formatDateWithTimezoneOffset } from '@audius/common/utils' import cn from 'classnames' import IconDrag from 'assets/img/iconDrag.svg' diff --git a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx index 3432c60f8d2..a399a341484 100644 --- a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx +++ b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx @@ -10,11 +10,11 @@ import { import { ProfileUser, collectibleDetailsUISelectors, - collectibleDetailsUIActions, - getHash + collectibleDetailsUIActions } from '@audius/common' import { useInstanceVar } from '@audius/common/hooks' import { CollectiblesMetadata, Collectible } from '@audius/common/models' +import { getHash } from '@audius/common/utils' import { Button, ButtonSize, diff --git a/packages/web/src/components/collection/desktop/CollectionActionButtons.tsx b/packages/web/src/components/collection/desktop/CollectionActionButtons.tsx index c7eb9054db7..d077dcdff8a 100644 --- a/packages/web/src/components/collection/desktop/CollectionActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/CollectionActionButtons.tsx @@ -1,5 +1,5 @@ -import { Nullable } from '@audius/common' import { Variant, SmartCollectionVariant, ID } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' import styles from './CollectionHeader.module.css' diff --git a/packages/web/src/components/collection/desktop/CollectionHeader.tsx b/packages/web/src/components/collection/desktop/CollectionHeader.tsx index 15eb95028bd..abb7f4a7f6f 100644 --- a/packages/web/src/components/collection/desktop/CollectionHeader.tsx +++ b/packages/web/src/components/collection/desktop/CollectionHeader.tsx @@ -1,10 +1,7 @@ import { ChangeEvent, useCallback, useState } from 'react' -import { - formatSecondsAsText, - formatDate, - useEditPlaylistModal -} from '@audius/common' +import { useEditPlaylistModal } from '@audius/common' +import { formatSecondsAsText, formatDate } from '@audius/common/utils' import { IconHidden, IconPencil } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/collection/mobile/CollectionHeader.jsx b/packages/web/src/components/collection/mobile/CollectionHeader.jsx index d1961204a7c..3097da7081b 100644 --- a/packages/web/src/components/collection/mobile/CollectionHeader.jsx +++ b/packages/web/src/components/collection/mobile/CollectionHeader.jsx @@ -1,13 +1,12 @@ import { memo } from 'react' +import { OverflowAction, FeatureFlags } from '@audius/common' +import { Variant, SquareSizes } from '@audius/common/models' import { formatCount, formatSecondsAsText, - formatDate, - OverflowAction, - FeatureFlags -} from '@audius/common' -import { Variant, SquareSizes } from '@audius/common/models' + formatDate +} from '@audius/common/utils' import { Button, ButtonType, IconPause, IconPlay } from '@audius/stems' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/cover-photo/CoverPhoto.tsx b/packages/web/src/components/cover-photo/CoverPhoto.tsx index 7fc30faa4d5..6c94adf1514 100644 --- a/packages/web/src/components/cover-photo/CoverPhoto.tsx +++ b/packages/web/src/components/cover-photo/CoverPhoto.tsx @@ -1,7 +1,8 @@ import { memo, useState } from 'react' -import { Nullable, imageCoverPhotoBlank } from '@audius/common' +import { imageCoverPhotoBlank } from '@audius/common' import { WidthSizes } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' import { FileWithPreview } from 'react-dropzone' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/create-playlist/PlaylistForm.tsx b/packages/web/src/components/create-playlist/PlaylistForm.tsx index 142bb5ae409..da610142867 100644 --- a/packages/web/src/components/create-playlist/PlaylistForm.tsx +++ b/packages/web/src/components/create-playlist/PlaylistForm.tsx @@ -1,9 +1,9 @@ -import { Nullable } from '@audius/common' import { SquareSizes, CollectionMetadata, Collection } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx index abc24875b65..12eb1dd2812 100644 --- a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx +++ b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx @@ -1,6 +1,6 @@ import { useMemo } from 'react' -import { accountSelectors, Nullable } from '@audius/common' +import { accountSelectors } from '@audius/common' import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { isContentCollectibleGated, @@ -15,6 +15,7 @@ import { AccessConditions, Track } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { Button, ButtonSize, diff --git a/packages/web/src/components/data-entry/FormTile.jsx b/packages/web/src/components/data-entry/FormTile.jsx index a561e1270d6..ff674a8cef8 100644 --- a/packages/web/src/components/data-entry/FormTile.jsx +++ b/packages/web/src/components/data-entry/FormTile.jsx @@ -1,13 +1,12 @@ import { Component, useState, useCallback } from 'react' +import { createRemixOfMetadata, FeatureFlags } from '@audius/common' import { - GENRES, - convertGenreLabelToValue, - getCanonicalName, - createRemixOfMetadata, creativeCommons, - FeatureFlags -} from '@audius/common' + getCanonicalName, + GENRES, + convertGenreLabelToValue +} from '@audius/common/utils' import { Button, ButtonType, IconDownload, IconIndent } from '@audius/stems' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/data-entry/ReleaseDateTriggerLegacy.tsx b/packages/web/src/components/data-entry/ReleaseDateTriggerLegacy.tsx index 0b58608132f..49dc67717dd 100644 --- a/packages/web/src/components/data-entry/ReleaseDateTriggerLegacy.tsx +++ b/packages/web/src/components/data-entry/ReleaseDateTriggerLegacy.tsx @@ -1,7 +1,7 @@ import { useMemo, useState } from 'react' -import { dayjs } from '@audius/common' import { Track } from '@audius/common/models' +import { dayjs } from '@audius/common/utils' import { Flex } from '@audius/harmony' import { Button, ButtonSize, ButtonType, IconCalendar } from '@audius/stems' import moment from 'moment' diff --git a/packages/web/src/components/data-entry/TagInput.jsx b/packages/web/src/components/data-entry/TagInput.jsx index 5df9cbb4c9d..f3150eb6c59 100644 --- a/packages/web/src/components/data-entry/TagInput.jsx +++ b/packages/web/src/components/data-entry/TagInput.jsx @@ -1,6 +1,6 @@ import { createRef, Component } from 'react' -import { trimToAlphaNumeric } from '@audius/common' +import { trimToAlphaNumeric } from '@audius/common/utils' import Tag from 'antd/lib/tag' import cn from 'classnames' diff --git a/packages/web/src/components/delete-confirmation/DeleteConfirmationModal.tsx b/packages/web/src/components/delete-confirmation/DeleteConfirmationModal.tsx index 764a54dfb8b..9ea6d2b47f1 100644 --- a/packages/web/src/components/delete-confirmation/DeleteConfirmationModal.tsx +++ b/packages/web/src/components/delete-confirmation/DeleteConfirmationModal.tsx @@ -1,4 +1,4 @@ -import { Nullable } from '@audius/common' +import { Nullable } from '@audius/common/utils' import { Button } from '@audius/harmony' import { Modal, ModalHeader, ModalTitle, ModalContent } from '@audius/stems' diff --git a/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx b/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx index 10b7fa51a39..25e3e21a393 100644 --- a/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx +++ b/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx @@ -4,9 +4,9 @@ import { accountSelectors, cacheCollectionsActions, cacheCollectionsSelectors, - duplicateAddConfirmationModalUISelectors, - fillString + duplicateAddConfirmationModalUISelectors } from '@audius/common' +import { fillString } from '@audius/common/utils' import { Button, ButtonType, diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index 615e102abd7..b9b58c42f59 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -1,7 +1,6 @@ import { useEffect, useState, useCallback } from 'react' import { - Nullable, RandomImage, accountSelectors, cacheCollectionsActions, @@ -14,6 +13,7 @@ import { } from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' import { SquareSizes, Collection, ID } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { capitalize } from 'lodash' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/edit-track/EditTrackModal.tsx b/packages/web/src/components/edit-track/EditTrackModal.tsx index 5142fd6eab3..a7ecfb6045b 100644 --- a/packages/web/src/components/edit-track/EditTrackModal.tsx +++ b/packages/web/src/components/edit-track/EditTrackModal.tsx @@ -1,8 +1,6 @@ import { useEffect, useState } from 'react' import { - removeNullable, - uuid, cacheTracksActions as cacheTrackActions, stemsUploadSelectors, stemsUploadActions, @@ -16,6 +14,7 @@ import { StemUploadWithFile, Track } from '@audius/common/models' +import { removeNullable, uuid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect, useDispatch } from 'react-redux' import { matchPath } from 'react-router' diff --git a/packages/web/src/components/embed-modal/EmbedModal.tsx b/packages/web/src/components/embed-modal/EmbedModal.tsx index 8b6418d0c96..e2dd4ecd35c 100644 --- a/packages/web/src/components/embed-modal/EmbedModal.tsx +++ b/packages/web/src/components/embed-modal/EmbedModal.tsx @@ -1,7 +1,7 @@ import { useState, useMemo, useEffect, useCallback } from 'react' -import { encodeHashId } from '@audius/common' import { Name, PlayableType, ID, Track } from '@audius/common/models' +import { encodeHashId } from '@audius/common/utils' import { Modal, Button, ButtonType, SegmentedControl } from '@audius/stems' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/form-fields/ArtworkField.tsx b/packages/web/src/components/form-fields/ArtworkField.tsx index ad43f825bd9..1fdcecc6806 100644 --- a/packages/web/src/components/form-fields/ArtworkField.tsx +++ b/packages/web/src/components/form-fields/ArtworkField.tsx @@ -1,6 +1,6 @@ import { useState } from 'react' -import { getErrorMessage } from '@audius/common' +import { getErrorMessage } from '@audius/common/utils' import { useField, useFormikContext } from 'formik' import { HelperText } from 'components/data-entry/HelperText' diff --git a/packages/web/src/components/form-fields/PriceField.tsx b/packages/web/src/components/form-fields/PriceField.tsx index a69b85db8c7..8bea29ef8b8 100644 --- a/packages/web/src/components/form-fields/PriceField.tsx +++ b/packages/web/src/components/form-fields/PriceField.tsx @@ -7,11 +7,11 @@ import { } from 'react' import { - decimalIntegerFromHumanReadable, - decimalIntegerToHumanReadable, filterDecimalString, - padDecimalValue -} from '@audius/common' + padDecimalValue, + decimalIntegerToHumanReadable, + decimalIntegerFromHumanReadable +} from '@audius/common/utils' import { useField } from 'formik' import { TextField, TextFieldProps } from './TextField' diff --git a/packages/web/src/components/form-fields/TagField.tsx b/packages/web/src/components/form-fields/TagField.tsx index b0913492431..8fec72e6eba 100644 --- a/packages/web/src/components/form-fields/TagField.tsx +++ b/packages/web/src/components/form-fields/TagField.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { removeNullable } from '@audius/common' +import { removeNullable } from '@audius/common/utils' import { useField } from 'formik' import TagInput, { TagInputProps } from 'components/data-entry/TagInput' diff --git a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx index 1dacd030907..0c51a884410 100644 --- a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx +++ b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx @@ -1,12 +1,8 @@ import { useState, useCallback, useRef, useContext } from 'react' -import { - RandomImage, - accountSelectors, - badgeTiers, - removeNullable -} from '@audius/common' +import { RandomImage, accountSelectors, badgeTiers } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { removeNullable } from '@audius/common/utils' import { Button, ButtonType, Popup, SegmentedControl } from '@audius/stems' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx b/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx index ecf6e5734c6..d5e696f1cf8 100644 --- a/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx +++ b/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx @@ -1,7 +1,6 @@ import { ReactNode, useCallback } from 'react' import { - CHAT_BLOG_POST_URL, ChatPermissionAction, accountSelectors, cacheUsersSelectors, @@ -12,6 +11,7 @@ import { useInboxUnavailableModal } from '@audius/common' import { User } from '@audius/common/models' +import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { IconMessageLocked, IconTipping, diff --git a/packages/web/src/components/link/ExternalLink.tsx b/packages/web/src/components/link/ExternalLink.tsx index 2767dc1a086..9df54d1faaa 100644 --- a/packages/web/src/components/link/ExternalLink.tsx +++ b/packages/web/src/components/link/ExternalLink.tsx @@ -1,7 +1,8 @@ import { MouseEvent, useCallback } from 'react' -import { isAllowedExternalLink, useLeavingAudiusModal } from '@audius/common' +import { useLeavingAudiusModal } from '@audius/common' import { Name } from '@audius/common/models' +import { isAllowedExternalLink } from '@audius/common/utils' import { make, useRecord } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/menu/TrackMenu.tsx b/packages/web/src/components/menu/TrackMenu.tsx index b7f18d67825..8d71778c507 100644 --- a/packages/web/src/components/menu/TrackMenu.tsx +++ b/packages/web/src/components/menu/TrackMenu.tsx @@ -8,7 +8,6 @@ import { playbackPositionSelectors, tracksSocialActions, addToCollectionUIActions, - Genre, FeatureFlags, CommonState, useEditTrackModal @@ -20,6 +19,7 @@ import { PlayableType, ID } from '@audius/common/models' +import { Genre } from '@audius/common/utils' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' import { connect, useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/NavHeader.tsx b/packages/web/src/components/nav/desktop/NavHeader.tsx index f28442d5776..b669becacd7 100644 --- a/packages/web/src/components/nav/desktop/NavHeader.tsx +++ b/packages/web/src/components/nav/desktop/NavHeader.tsx @@ -2,12 +2,12 @@ import { useCallback, useRef } from 'react' import { FeatureFlags, - formatCount, accountSelectors, notificationsSelectors, themeSelectors } from '@audius/common' import { Name, Theme } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' import { Link } from 'react-router-dom' diff --git a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx index a17c06ecc07..8bffb1a2893 100644 --- a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx +++ b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx @@ -1,11 +1,7 @@ -import { - removeNullable, - FeatureFlags, - chatSelectors, - StringKeys -} from '@audius/common' +import { FeatureFlags, chatSelectors, StringKeys } from '@audius/common' import { useAccountHasClaimableRewards } from '@audius/common/hooks' import { Name } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import { IconCrown, IconDashboard, diff --git a/packages/web/src/components/nav/mobile/NavBar.tsx b/packages/web/src/components/nav/mobile/NavBar.tsx index 34089a77111..5becf51428b 100644 --- a/packages/web/src/components/nav/mobile/NavBar.tsx +++ b/packages/web/src/components/nav/mobile/NavBar.tsx @@ -1,7 +1,8 @@ import { useState, useContext, useCallback, useEffect } from 'react' -import { FeatureFlags, formatCount } from '@audius/common' +import { FeatureFlags } from '@audius/common' import { Status } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import { IconCaretRight, IconRemove, diff --git a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx index b3a1b7761b2..d141196b8c0 100644 --- a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx +++ b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx @@ -1,14 +1,13 @@ import { useCallback } from 'react' import { - Nullable, - formatCount, notificationsSelectors, Achievement, EntityType, MilestoneNotification as MilestoneNotificationType } from '@audius/common' import { Name, User } from '@audius/common/models' +import { formatCount, Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx index 098f0f6a0da..15cd056f7cc 100644 --- a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx +++ b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Nullable, notificationsSelectors, RemixCosignNotification as RemixCosignNotificationType, TrackEntity } from '@audius/common' import { Name } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx index d9343a48419..bdb79e5b544 100644 --- a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx +++ b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Nullable, cacheUsersSelectors, notificationsSelectors, SupporterDethronedNotification as SupporterDethroned } from '@audius/common' import { Name } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import crown from 'assets/img/crown2x.png' import { useSelector } from 'common/hooks/useSelector' diff --git a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx index 17e298ca931..e408ac86c59 100644 --- a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx +++ b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Nullable, notificationsSelectors, TrackEntity, TastemakerNotification as TastemakerNotificationType } from '@audius/common' import { Name } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx index 297e6cbed10..f8a2077b020 100644 --- a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx @@ -1,7 +1,6 @@ import { ComponentType, useCallback, useState } from 'react' import { - Nullable, notificationsSelectors, TipReceiveNotification, reactionOrder, @@ -11,6 +10,7 @@ import { } from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { Name } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx index 4bb934d7fd8..ffcb1d965fd 100644 --- a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Nullable, notificationsSelectors, TrendingPlaylistNotification as TrendingPlaylistNotificationType, CollectionEntity } from '@audius/common' import { Name } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx index a14b0b34b4f..cdd02ea55db 100644 --- a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Nullable, notificationsSelectors, TrackEntity, TrendingTrackNotification as TrendingTrackNotificationType } from '@audius/common' import { Name } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx index 7f9d42a0675..b2b0e33ee4a 100644 --- a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - Nullable, notificationsSelectors, TrackEntity, TrendingUndergroundNotification as TrendingUndergroundNotificationType } from '@audius/common' import { Name } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx index 377167a4e1e..38628991278 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx @@ -1,13 +1,13 @@ import { useCallback } from 'react' import { - Nullable, USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType, TrackEntity, Entity, notificationsSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx index 2332b8a1eae..f01399c7465 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx @@ -2,14 +2,16 @@ import { useCallback } from 'react' import { Entity, - formatUSDCWeiToUSDString, notificationsSelectors, - Nullable, - stringUSDCToBN, TrackEntity, USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType } from '@audius/common' import { StringUSDC } from '@audius/common/models' +import { + stringUSDCToBN, + formatUSDCWeiToUSDString, + Nullable +} from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/EntityLink.tsx b/packages/web/src/components/notification/Notification/components/EntityLink.tsx index ee4d120e8a0..5fcad2d0010 100644 --- a/packages/web/src/components/notification/Notification/components/EntityLink.tsx +++ b/packages/web/src/components/notification/Notification/components/EntityLink.tsx @@ -1,7 +1,8 @@ import { MouseEventHandler, useCallback } from 'react' -import { Nullable, Entity } from '@audius/common' +import { Entity } from '@audius/common' import { Name, Collection, Track, User } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/OthersLink.tsx b/packages/web/src/components/notification/Notification/components/OthersLink.tsx index 443f33c66d7..cb580209446 100644 --- a/packages/web/src/components/notification/Notification/components/OthersLink.tsx +++ b/packages/web/src/components/notification/Notification/components/OthersLink.tsx @@ -1,6 +1,6 @@ import { MouseEventHandler } from 'react' -import { formatCount } from '@audius/common' +import { formatCount } from '@audius/common/utils' import styles from './OthersLink.module.css' diff --git a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx index 8574ea022de..31ae9dd081f 100644 --- a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx +++ b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx @@ -1,12 +1,12 @@ import { MouseEventHandler, useCallback } from 'react' import { - Nullable, CommonState, cacheUsersActions, cacheUsersSelectors } from '@audius/common' import { useTwitterButtonStatus } from '@audius/common/hooks' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/UserProfilePictureList.tsx b/packages/web/src/components/notification/Notification/components/UserProfilePictureList.tsx index 66cc2daa20b..175914e9e3b 100644 --- a/packages/web/src/components/notification/Notification/components/UserProfilePictureList.tsx +++ b/packages/web/src/components/notification/Notification/components/UserProfilePictureList.tsx @@ -1,5 +1,5 @@ -import { formatCount } from '@audius/common' import { User } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import cn from 'classnames' import Tooltip from 'components/tooltip/Tooltip' diff --git a/packages/web/src/components/notification/Notification/useGoToProfile.ts b/packages/web/src/components/notification/Notification/useGoToProfile.ts index c6c60652d18..b765e910cb7 100644 --- a/packages/web/src/components/notification/Notification/useGoToProfile.ts +++ b/packages/web/src/components/notification/Notification/useGoToProfile.ts @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { Nullable } from '@audius/common' import { User } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/NotificationPanel.tsx b/packages/web/src/components/notification/NotificationPanel.tsx index fa54aacf9de..e2a1c94ea01 100644 --- a/packages/web/src/components/notification/NotificationPanel.tsx +++ b/packages/web/src/components/notification/NotificationPanel.tsx @@ -1,12 +1,12 @@ import { useRef, useCallback, useEffect, RefObject } from 'react' import { - Nullable, notificationsSelectors, Notification as Notifications, notificationsActions } from '@audius/common' import { Status } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { Popup, PopupPosition, Scrollbar } from '@audius/stems' import InfiniteScroll from 'react-infinite-scroller' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/now-playing/NowPlaying.tsx b/packages/web/src/components/now-playing/NowPlaying.tsx index ecd9e975d8b..3890a9f2f0e 100644 --- a/packages/web/src/components/now-playing/NowPlaying.tsx +++ b/packages/web/src/components/now-playing/NowPlaying.tsx @@ -1,7 +1,6 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { - Genre, accountSelectors, averageColorSelectors, queueActions, @@ -32,6 +31,7 @@ import { SquareSizes, ID } from '@audius/common/models' +import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { Location } from 'history' import { connect, useSelector } from 'react-redux' diff --git a/packages/web/src/components/page/Page.tsx b/packages/web/src/components/page/Page.tsx index 37b205d7850..b78da048123 100644 --- a/packages/web/src/components/page/Page.tsx +++ b/packages/web/src/components/page/Page.tsx @@ -8,7 +8,7 @@ import { MutableRefObject } from 'react' -import { Nullable } from '@audius/common' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { Spring } from 'react-spring/renderprops.cjs' diff --git a/packages/web/src/components/payment-method/PaymentMethod.tsx b/packages/web/src/components/payment-method/PaymentMethod.tsx index 50e2bdbe120..aed33313636 100644 --- a/packages/web/src/components/payment-method/PaymentMethod.tsx +++ b/packages/web/src/components/payment-method/PaymentMethod.tsx @@ -1,11 +1,11 @@ import { CSSProperties, ChangeEvent, useCallback } from 'react' +import { PurchaseMethod, PurchaseVendor, BNUSDC } from '@audius/common/models' import { - Nullable, formatCurrencyBalance, - formatUSDCWeiToFloorCentsNumber -} from '@audius/common' -import { PurchaseMethod, PurchaseVendor, BNUSDC } from '@audius/common/models' + formatUSDCWeiToFloorCentsNumber, + Nullable +} from '@audius/common/utils' import { FilterButton, Flex, diff --git a/packages/web/src/components/play-bar/desktop/PlayBar.jsx b/packages/web/src/components/play-bar/desktop/PlayBar.jsx index aaa13c4042b..9d5d6900573 100644 --- a/packages/web/src/components/play-bar/desktop/PlayBar.jsx +++ b/packages/web/src/components/play-bar/desktop/PlayBar.jsx @@ -1,7 +1,6 @@ import { Component } from 'react' import { - Genre, accountSelectors, lineupSelectors, queueActions, @@ -22,6 +21,7 @@ import { PlaybackSource, Kind } from '@audius/common/models' +import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/play-bar/next-button/NextButtonProvider.tsx b/packages/web/src/components/play-bar/next-button/NextButtonProvider.tsx index 12893c646f1..11737998253 100644 --- a/packages/web/src/components/play-bar/next-button/NextButtonProvider.tsx +++ b/packages/web/src/components/play-bar/next-button/NextButtonProvider.tsx @@ -1,4 +1,5 @@ -import { Genre, playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common' +import { Genre } from '@audius/common/utils' import { useSelector } from 'react-redux' import ForwardSkipButton, { ForwardSkipButtonProps } from './ForwardSkipButton' diff --git a/packages/web/src/components/play-bar/previous-button/PreviousButtonProvider.tsx b/packages/web/src/components/play-bar/previous-button/PreviousButtonProvider.tsx index 74ee53ec518..40ccdaa8f3f 100644 --- a/packages/web/src/components/play-bar/previous-button/PreviousButtonProvider.tsx +++ b/packages/web/src/components/play-bar/previous-button/PreviousButtonProvider.tsx @@ -1,4 +1,5 @@ -import { Genre, playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common' +import { Genre } from '@audius/common/utils' import { useSelector } from 'react-redux' import BackwardSkipButton, { diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx index f55d241b9e4..73220cf6497 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx @@ -1,15 +1,12 @@ import { useCallback } from 'react' -import { - PurchaseContentError, - PurchaseContentStage, - formatPrice -} from '@audius/common' +import { PurchaseContentError, PurchaseContentStage } from '@audius/common' import { PurchaseableTrackMetadata, usePurchaseContentErrorMessage } from '@audius/common/hooks' import { Name } from '@audius/common/models' +import { formatPrice } from '@audius/common/utils' import { Button } from '@audius/harmony' import { HarmonyPlainButton, diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseSummaryTable.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseSummaryTable.tsx index 585ce007f80..65d9911a6f6 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseSummaryTable.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseSummaryTable.tsx @@ -1,4 +1,4 @@ -import { formatPrice } from '@audius/common' +import { formatPrice } from '@audius/common/utils' import { SummaryTable, SummaryTableItem } from 'components/summary-table' import { Text } from 'components/typography' diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts index 8a6f8af305a..d953d7a74a1 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts @@ -1,4 +1,4 @@ -import { Nullable, getPurchaseSummaryValues } from '@audius/common' +import { getPurchaseSummaryValues } from '@audius/common' import { useUSDCPurchaseConfig, usePayExtraPresets, @@ -8,6 +8,7 @@ import { AMOUNT_PRESET } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { useField } from 'formik' export const usePurchaseSummaryValues = ({ diff --git a/packages/web/src/components/profile-info/ProfileInfo.tsx b/packages/web/src/components/profile-info/ProfileInfo.tsx index 7fe52168f69..29bf0685cc0 100644 --- a/packages/web/src/components/profile-info/ProfileInfo.tsx +++ b/packages/web/src/components/profile-info/ProfileInfo.tsx @@ -1,5 +1,5 @@ -import { Nullable } from '@audius/common' import { SquareSizes, User } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' import UserBadges from 'components/user-badges/UserBadges' diff --git a/packages/web/src/components/related-artists/RelatedArtists.tsx b/packages/web/src/components/related-artists/RelatedArtists.tsx index e532e57dadf..661c71a3811 100644 --- a/packages/web/src/components/related-artists/RelatedArtists.tsx +++ b/packages/web/src/components/related-artists/RelatedArtists.tsx @@ -1,12 +1,9 @@ import { useCallback } from 'react' -import { - profilePageSelectors, - MAX_PROFILE_RELATED_ARTISTS, - FeatureFlags -} from '@audius/common' +import { profilePageSelectors, FeatureFlags } from '@audius/common' import { useGetRelatedArtists } from '@audius/common/api' import { User } from '@audius/common/models' +import { MAX_PROFILE_RELATED_ARTISTS } from '@audius/common/utils' import { IconUserGroup } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx index f6951437f71..ed2f951bc50 100644 --- a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx +++ b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx @@ -1,11 +1,8 @@ import { useEffect } from 'react' -import { - remixSettingsSelectors, - remixSettingsActions, - Nullable -} from '@audius/common' +import { remixSettingsSelectors, remixSettingsActions } from '@audius/common' import { Status, ID, AccessConditions } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/remix-settings-modal/RemixSettingsModal.tsx b/packages/web/src/components/remix-settings-modal/RemixSettingsModal.tsx index 7e98ab2a6c4..7eb150b2ac1 100644 --- a/packages/web/src/components/remix-settings-modal/RemixSettingsModal.tsx +++ b/packages/web/src/components/remix-settings-modal/RemixSettingsModal.tsx @@ -1,6 +1,5 @@ import { useCallback, useState, useEffect, useRef } from 'react' -import { Nullable } from '@audius/common' import { SquareSizes, isContentCollectibleGated, @@ -10,6 +9,7 @@ import { Track, User } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { Modal, Button, diff --git a/packages/web/src/components/repost-favorites-stats/RepostFavoritesStats.tsx b/packages/web/src/components/repost-favorites-stats/RepostFavoritesStats.tsx index c1d6b76be8e..c022e7b85a9 100644 --- a/packages/web/src/components/repost-favorites-stats/RepostFavoritesStats.tsx +++ b/packages/web/src/components/repost-favorites-stats/RepostFavoritesStats.tsx @@ -1,6 +1,6 @@ import { useCallback, MouseEvent } from 'react' -import { pluralize, formatCount } from '@audius/common' +import { formatCount, pluralize } from '@audius/common/utils' import cn from 'classnames' import IconFavorite from 'assets/img/iconHeart.svg' diff --git a/packages/web/src/components/scheduled-release-label/ScheduledReleaseLabel.tsx b/packages/web/src/components/scheduled-release-label/ScheduledReleaseLabel.tsx index f7f25476560..c63e4437ca2 100644 --- a/packages/web/src/components/scheduled-release-label/ScheduledReleaseLabel.tsx +++ b/packages/web/src/components/scheduled-release-label/ScheduledReleaseLabel.tsx @@ -1,4 +1,4 @@ -import { getLocalTimezone } from '@audius/common' +import { getLocalTimezone } from '@audius/common/utils' import { Text, IconCalendarMonth } from '@audius/harmony' import cn from 'classnames' import moment from 'moment' diff --git a/packages/web/src/components/share-sound-to-tiktok-modal/ShareSoundToTikTokModal.tsx b/packages/web/src/components/share-sound-to-tiktok-modal/ShareSoundToTikTokModal.tsx index 19674670596..6e2fc6d4d34 100644 --- a/packages/web/src/components/share-sound-to-tiktok-modal/ShareSoundToTikTokModal.tsx +++ b/packages/web/src/components/share-sound-to-tiktok-modal/ShareSoundToTikTokModal.tsx @@ -1,11 +1,11 @@ import { useCallback, useMemo } from 'react' import { - Nullable, ShareSoundToTiktokModalStatus, shareSoundToTiktokModalActions, shareSoundToTiktokModalSelectors } from '@audius/common' +import { Nullable } from '@audius/common/utils' import { Button, Modal, diff --git a/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts b/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts index 18b6c536ad2..b57ca7451c9 100644 --- a/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts +++ b/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts @@ -1,7 +1,5 @@ import { getContext, - getErrorMessage, - encodeHashId, cacheTracksSelectors, modalsActions, ShareSoundToTiktokModalStatus, @@ -10,6 +8,7 @@ import { musicConfettiActions } from '@audius/common' import { Name } from '@audius/common/models' +import { getErrorMessage, encodeHashId } from '@audius/common/utils' import { takeEvery, put, call, select } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/stats/Stats.tsx b/packages/web/src/components/stats/Stats.tsx index 96b48574c59..9103e3ac010 100644 --- a/packages/web/src/components/stats/Stats.tsx +++ b/packages/web/src/components/stats/Stats.tsx @@ -1,5 +1,5 @@ -import { formatCount } from '@audius/common' import { ID } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/tipping/support/SupportingList.tsx b/packages/web/src/components/tipping/support/SupportingList.tsx index 58536ddc652..4c59806e910 100644 --- a/packages/web/src/components/tipping/support/SupportingList.tsx +++ b/packages/web/src/components/tipping/support/SupportingList.tsx @@ -1,12 +1,9 @@ import { useCallback } from 'react' -import { - profilePageSelectors, - MAX_PROFILE_SUPPORTING_TILES, - formatCount -} from '@audius/common' +import { profilePageSelectors } from '@audius/common' import { useRankedSupportingForUser } from '@audius/common/hooks' import { User } from '@audius/common/models' +import { formatCount, MAX_PROFILE_SUPPORTING_TILES } from '@audius/common/utils' import { IconArrow } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/tipping/support/SupportingTile.tsx b/packages/web/src/components/tipping/support/SupportingTile.tsx index 52ffab8d984..a1e0f6d32de 100644 --- a/packages/web/src/components/tipping/support/SupportingTile.tsx +++ b/packages/web/src/components/tipping/support/SupportingTile.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { - Nullable, cacheUsersSelectors, imageCoverPhotoBlank, imageProfilePicEmpty as profilePicEmpty @@ -12,6 +11,7 @@ import { Supporting, User } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { IconTrophy } from '@audius/stems' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/tipping/support/TopSupporters.tsx b/packages/web/src/components/tipping/support/TopSupporters.tsx index 02d01a7300e..261bbd9601d 100644 --- a/packages/web/src/components/tipping/support/TopSupporters.tsx +++ b/packages/web/src/components/tipping/support/TopSupporters.tsx @@ -3,10 +3,10 @@ import { useCallback } from 'react' import { cacheUsersSelectors, profilePageSelectors, - tippingSelectors, - MAX_PROFILE_TOP_SUPPORTERS + tippingSelectors } from '@audius/common' import { ID, User } from '@audius/common/models' +import { MAX_PROFILE_TOP_SUPPORTERS } from '@audius/common/utils' import { IconTrophy } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/SendTip.tsx b/packages/web/src/components/tipping/tip-audio/SendTip.tsx index 06831aba82d..556ba6e94fb 100644 --- a/packages/web/src/components/tipping/tip-audio/SendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/SendTip.tsx @@ -7,9 +7,6 @@ import { } from 'react' import { - formatWei, - stringWeiToBN, - weiToString, accountSelectors, tippingSelectors, tippingActions, @@ -18,11 +15,16 @@ import { OnRampProvider, buyAudioActions, FeatureFlags, - StringKeys, - isNullOrUndefined + StringKeys } from '@audius/common' import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import { BadgeTier, StringWei, StringAudio, BNWei } from '@audius/common/models' +import { + isNullOrUndefined, + stringWeiToBN, + weiToString, + formatWei +} from '@audius/common/utils' import { IconTrophy, TokenAmountInput, diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx index 755fe2aeb2e..d7a125a6c15 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx @@ -1,7 +1,6 @@ import { useCallback, useEffect } from 'react' import { - Nullable, tippingSelectors, tippingActions, TippingSendStatus, @@ -9,6 +8,7 @@ import { StringKeys, accountSelectors } from '@audius/common' +import { Nullable } from '@audius/common/utils' import { Modal, ModalHeader, ModalTitle } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/TipSent.tsx b/packages/web/src/components/tipping/tip-audio/TipSent.tsx index bab8a19253d..23ae01dd2a9 100644 --- a/packages/web/src/components/tipping/tip-audio/TipSent.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipSent.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - formatNumberCommas, accountSelectors, tippingSelectors, deriveUserBankAddress } from '@audius/common' import { Name } from '@audius/common/models' +import { formatNumberCommas } from '@audius/common/utils' import { Button, ButtonType, IconTwitterBird, IconCheck } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/tooltip/types.ts b/packages/web/src/components/tooltip/types.ts index 09ac2978f0a..4b736b4cec5 100644 --- a/packages/web/src/components/tooltip/types.ts +++ b/packages/web/src/components/tooltip/types.ts @@ -1,6 +1,6 @@ import React from 'react' -import { Maybe, Nullable } from '@audius/common' +import { Nullable, Maybe } from '@audius/common/utils' import { TooltipPlacement } from 'antd/lib/tooltip' import { ThemeColor } from 'utils/theme/theme' diff --git a/packages/web/src/components/track/CardTitle.tsx b/packages/web/src/components/track/CardTitle.tsx index d96f08e6576..4afcf4c4f5d 100644 --- a/packages/web/src/components/track/CardTitle.tsx +++ b/packages/web/src/components/track/CardTitle.tsx @@ -1,9 +1,10 @@ -import { FeatureFlags, Nullable } from '@audius/common' +import { FeatureFlags } from '@audius/common' import { isContentCollectibleGated, isContentUSDCPurchaseGated, AccessConditions } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { IconCart, IconCollectible, IconSpecialAccess } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/GatedConditionsPill.tsx b/packages/web/src/components/track/GatedConditionsPill.tsx index bb751ae4aed..3313421b493 100644 --- a/packages/web/src/components/track/GatedConditionsPill.tsx +++ b/packages/web/src/components/track/GatedConditionsPill.tsx @@ -1,10 +1,10 @@ import type { MouseEvent } from 'react' -import { formatPrice } from '@audius/common' import { isContentUSDCPurchaseGated, AccessConditions } from '@audius/common/models' +import { formatPrice } from '@audius/common/utils' import { Button, ButtonSize, IconLock } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/components/track/GatedContentLabel.tsx b/packages/web/src/components/track/GatedContentLabel.tsx index 06870632dfd..87b4ce56008 100644 --- a/packages/web/src/components/track/GatedContentLabel.tsx +++ b/packages/web/src/components/track/GatedContentLabel.tsx @@ -1,9 +1,9 @@ -import { Nullable } from '@audius/common' import { isContentCollectibleGated, isContentUSDCPurchaseGated, AccessConditions } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { IconCart, IconCollectible, IconSpecialAccess } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/GatedTrackSection.tsx b/packages/web/src/components/track/GatedTrackSection.tsx index ae327e3ee83..21357bb20a0 100644 --- a/packages/web/src/components/track/GatedTrackSection.tsx +++ b/packages/web/src/components/track/GatedTrackSection.tsx @@ -2,10 +2,7 @@ import { useCallback } from 'react' import { cacheUsersSelectors, - formatPrice, - Nullable, gatedContentSelectors, - removeNullable, tippingActions, usersSocialActions as socialActions, usePremiumContentPurchaseModal @@ -22,6 +19,7 @@ import { AccessConditions, User } from '@audius/common/models' +import { formatPrice, removeNullable, Nullable } from '@audius/common/utils' import { Button, ButtonType, diff --git a/packages/web/src/components/track/GiantArtwork.tsx b/packages/web/src/components/track/GiantArtwork.tsx index 3bd89c2f579..010962d50b8 100644 --- a/packages/web/src/components/track/GiantArtwork.tsx +++ b/packages/web/src/components/track/GiantArtwork.tsx @@ -1,7 +1,7 @@ import { memo, useEffect } from 'react' -import { Nullable } from '@audius/common' import { SquareSizes, CoverArtSizes, Remix } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import CoSign from 'components/co-sign/CoSign' import { Size } from 'components/co-sign/types' diff --git a/packages/web/src/components/track/GiantTrackTile.tsx b/packages/web/src/components/track/GiantTrackTile.tsx index 7c27447f378..badbc5b7c90 100644 --- a/packages/web/src/components/track/GiantTrackTile.tsx +++ b/packages/web/src/components/track/GiantTrackTile.tsx @@ -1,13 +1,7 @@ import { useCallback, useState } from 'react' import { - getCanonicalName, - formatDate, - formatSeconds, - Genre, FeatureFlags, - Nullable, - getDogEarType, publishTrackConfirmationModalUIActions, CommonState, cacheTracksSelectors @@ -20,6 +14,14 @@ import { Remix, AccessConditions } from '@audius/common/models' +import { + Genre, + getCanonicalName, + formatSeconds, + formatDate, + getDogEarType, + Nullable +} from '@audius/common/utils' import { Box, Flex } from '@audius/harmony' import { Mood } from '@audius/sdk' import { diff --git a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx index 5e5dd6f4926..3d022ede94f 100644 --- a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx +++ b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx @@ -1,10 +1,10 @@ import { CommonState, - formatLineupTileDuration, accountSelectors, playbackPositionSelectors } from '@audius/common' import { ID } from '@audius/common/models' +import { formatLineupTileDuration } from '@audius/common/utils' import { IconCheck, ProgressBar } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/LockedTrackDetailsTile.tsx b/packages/web/src/components/track/LockedTrackDetailsTile.tsx index 06f5f6fd0bc..8e229b380ae 100644 --- a/packages/web/src/components/track/LockedTrackDetailsTile.tsx +++ b/packages/web/src/components/track/LockedTrackDetailsTile.tsx @@ -1,4 +1,3 @@ -import { getDogEarType } from '@audius/common' import { SquareSizes, isContentCollectibleGated, @@ -7,6 +6,7 @@ import { Track, UserMetadata } from '@audius/common/models' +import { getDogEarType } from '@audius/common/utils' import { IconCart, IconCollectible, IconSpecialAccess } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/desktop/BottomRow.tsx b/packages/web/src/components/track/desktop/BottomRow.tsx index 680d25e5db1..77826274795 100644 --- a/packages/web/src/components/track/desktop/BottomRow.tsx +++ b/packages/web/src/components/track/desktop/BottomRow.tsx @@ -1,7 +1,8 @@ import { MouseEvent, ReactNode, useCallback } from 'react' -import { gatedContentSelectors, Nullable } from '@audius/common' +import { gatedContentSelectors } from '@audius/common' import { ID, FieldVisibility, AccessConditions } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx index 3129f761d89..6235149ec50 100644 --- a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx @@ -14,8 +14,7 @@ import { tracksSocialActions, shareModalUIActions, playerSelectors, - gatedContentActions, - Genre + gatedContentActions } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { @@ -25,6 +24,7 @@ import { ID, UID } from '@audius/common/models' +import { Genre } from '@audius/common/utils' import cn from 'classnames' import { connect, useDispatch } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/desktop/TrackListItem.tsx b/packages/web/src/components/track/desktop/TrackListItem.tsx index b95070efbe9..b051755e5b8 100644 --- a/packages/web/src/components/track/desktop/TrackListItem.tsx +++ b/packages/web/src/components/track/desktop/TrackListItem.tsx @@ -1,7 +1,8 @@ import { memo, MouseEvent, useRef } from 'react' -import { formatSeconds, EnhancedCollectionTrack, Genre } from '@audius/common' +import { EnhancedCollectionTrack } from '@audius/common' import { ID, UID } from '@audius/common/models' +import { Genre, formatSeconds } from '@audius/common/utils' import cn from 'classnames' import IconKebabHorizontal from 'assets/img/iconKebabHorizontal.svg' diff --git a/packages/web/src/components/track/desktop/TrackTile.tsx b/packages/web/src/components/track/desktop/TrackTile.tsx index bf2e5ce1e6f..3a18314b7af 100644 --- a/packages/web/src/components/track/desktop/TrackTile.tsx +++ b/packages/web/src/components/track/desktop/TrackTile.tsx @@ -1,17 +1,19 @@ import { memo } from 'react' import { - formatCount, accountSelectors, playbackPositionSelectors, FeatureFlags, - formatLineupTileDuration, - Genre, CommonState, - getDogEarType, usePremiumContentPurchaseModal } from '@audius/common' import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' +import { + formatCount, + Genre, + formatLineupTileDuration, + getDogEarType +} from '@audius/common/utils' import { IconCheck, IconCrown, IconHidden, ProgressBar } from '@audius/stems' import cn from 'classnames' import moment from 'moment' diff --git a/packages/web/src/components/track/desktop/stats/Stats.tsx b/packages/web/src/components/track/desktop/stats/Stats.tsx index 7549f16ce66..058fa2ee126 100644 --- a/packages/web/src/components/track/desktop/stats/Stats.tsx +++ b/packages/web/src/components/track/desktop/stats/Stats.tsx @@ -1,11 +1,8 @@ import { memo, useMemo, MouseEvent, useCallback } from 'react' -import { - createShallowSelector, - cacheUsersSelectors, - CommonState -} from '@audius/common' +import { cacheUsersSelectors, CommonState } from '@audius/common' import { Favorite, ID, Repost } from '@audius/common/models' +import { createShallowSelector } from '@audius/common/utils' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/stats/StatsText.tsx b/packages/web/src/components/track/desktop/stats/StatsText.tsx index dceb7816719..852da859f44 100644 --- a/packages/web/src/components/track/desktop/stats/StatsText.tsx +++ b/packages/web/src/components/track/desktop/stats/StatsText.tsx @@ -1,5 +1,5 @@ -import { formatCount, pluralize } from '@audius/common' import { User } from '@audius/common/models' +import { formatCount, pluralize } from '@audius/common/utils' import styles from './StatsText.module.css' diff --git a/packages/web/src/components/track/helpers.ts b/packages/web/src/components/track/helpers.ts index 9ccd6fd1762..d35c8642c92 100644 --- a/packages/web/src/components/track/helpers.ts +++ b/packages/web/src/components/track/helpers.ts @@ -1,5 +1,5 @@ -import { Genre } from '@audius/common' import { Collection, FieldVisibility, Track, User } from '@audius/common/models' +import { Genre } from '@audius/common/utils' const defaultFieldVisibility: FieldVisibility = { genre: true, diff --git a/packages/web/src/components/track/mobile/BottomButtons.tsx b/packages/web/src/components/track/mobile/BottomButtons.tsx index 6a76161f4ee..6d0f2ed0a76 100644 --- a/packages/web/src/components/track/mobile/BottomButtons.tsx +++ b/packages/web/src/components/track/mobile/BottomButtons.tsx @@ -1,11 +1,11 @@ import { MouseEvent, memo } from 'react' -import { Nullable } from '@audius/common' import { isContentUSDCPurchaseGated, AccessConditions, GatedTrackStatus } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' import FavoriteButton from 'components/alt-button/FavoriteButton' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx index 75452ff7aae..f530d1e36b8 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx @@ -14,8 +14,7 @@ import { repostsUserListActions, favoritesUserListActions, playerSelectors, - FeatureFlags, - Genre + FeatureFlags } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { @@ -25,6 +24,7 @@ import { FavoriteType, ID } from '@audius/common/models' +import { Genre } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/PlaylistTile.tsx b/packages/web/src/components/track/mobile/PlaylistTile.tsx index 9e32576d0a8..56a889fa776 100644 --- a/packages/web/src/components/track/mobile/PlaylistTile.tsx +++ b/packages/web/src/components/track/mobile/PlaylistTile.tsx @@ -1,7 +1,7 @@ import { useState, useEffect, MouseEvent } from 'react' -import { formatCount, formatLineupTileDuration } from '@audius/common' import { ID, UID, LineupTrack } from '@audius/common/models' +import { formatCount, formatLineupTileDuration } from '@audius/common/utils' import cn from 'classnames' import { range } from 'lodash' diff --git a/packages/web/src/components/track/mobile/TrackTile.tsx b/packages/web/src/components/track/mobile/TrackTile.tsx index b00e2d95c94..efcafcbbdde 100644 --- a/packages/web/src/components/track/mobile/TrackTile.tsx +++ b/packages/web/src/components/track/mobile/TrackTile.tsx @@ -1,13 +1,8 @@ import { useCallback, useState, useEffect, MouseEvent } from 'react' import { - formatCount, - Nullable, gatedContentSelectors, gatedContentActions, - formatLineupTileDuration, - Genre, - getDogEarType, usePremiumContentPurchaseModal } from '@audius/common' import { @@ -16,6 +11,13 @@ import { ID, AccessConditions } from '@audius/common/models' +import { + formatCount, + Genre, + formatLineupTileDuration, + getDogEarType, + Nullable +} from '@audius/common/utils' import { IconCrown, IconHidden, IconTrending } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/trackTileMessages.ts b/packages/web/src/components/track/trackTileMessages.ts index 8720a112245..88a20d49049 100644 --- a/packages/web/src/components/track/trackTileMessages.ts +++ b/packages/web/src/components/track/trackTileMessages.ts @@ -1,4 +1,4 @@ -import { pluralize } from '@audius/common' +import { pluralize } from '@audius/common/utils' export const messages = { artistPick: 'Artist Pick', diff --git a/packages/web/src/components/track/types.ts b/packages/web/src/components/track/types.ts index 0e02b630b37..6361f83e5e7 100644 --- a/packages/web/src/components/track/types.ts +++ b/packages/web/src/components/track/types.ts @@ -1,6 +1,5 @@ import { MouseEvent, ReactNode } from 'react' -import { Nullable, Genre } from '@audius/common' import { PlaybackSource, Collection, @@ -14,6 +13,7 @@ import { AccessConditions, LineupTrack } from '@audius/common/models' +import { Genre, Nullable } from '@audius/common/utils' export enum TrackTileSize { LARGE = 'LARGE', diff --git a/packages/web/src/components/tracks-table/TracksTable.tsx b/packages/web/src/components/tracks-table/TracksTable.tsx index d98e4c67f62..a4656fb8e55 100644 --- a/packages/web/src/components/tracks-table/TracksTable.tsx +++ b/packages/web/src/components/tracks-table/TracksTable.tsx @@ -1,8 +1,8 @@ import { MouseEvent, useCallback, useMemo, useRef } from 'react' -import { formatCount, formatSeconds } from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' import { UID, UserTrack } from '@audius/common/models' +import { formatCount, formatSeconds } from '@audius/common/utils' import { IconHidden, IconLock } from '@audius/stems' import cn from 'classnames' import moment from 'moment' diff --git a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx index b1c46421db7..4fe380e30e0 100644 --- a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx +++ b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx @@ -2,13 +2,15 @@ import { cacheUsersSelectors, TransactionDetails, TransactionMethod, - formatAudio, - TransactionType, - formatCapitalizeString, - makeSolanaTransactionLink, - isNullOrUndefined + TransactionType } from '@audius/common' import { ChallengeRewardID, User } from '@audius/common/models' +import { + formatAudio, + formatCapitalizeString, + isNullOrUndefined, + makeSolanaTransactionLink +} from '@audius/common/utils' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx b/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx index c6eecb79bcb..d371ddee161 100644 --- a/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx +++ b/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx @@ -1,9 +1,9 @@ +import { InAppAudioPurchaseMetadata } from '@audius/common' import { - InAppAudioPurchaseMetadata, formatNumberString, - Nullable, - makeSolanaTransactionLink -} from '@audius/common' + makeSolanaTransactionLink, + Nullable +} from '@audius/common/utils' import IconExternalLink from 'assets/img/iconExternalLink.svg' import { diff --git a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx index bb024098768..7f1a0479156 100644 --- a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx +++ b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx @@ -1,12 +1,10 @@ import { - TRENDING_GENRES, - ELECTRONIC_PREFIX, - Genre, trendingPageLineupActions, trendingPageActions, trendingPageSelectors } from '@audius/common' import { TimeRange } from '@audius/common/models' +import { Genre, ELECTRONIC_PREFIX, TRENDING_GENRES } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx b/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx index b667336a6e7..488c139a80a 100644 --- a/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx +++ b/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx @@ -1,12 +1,12 @@ import { MouseEventHandler, useCallback } from 'react' import { - Nullable, CommonState, cacheUsersActions, cacheUsersSelectors } from '@audius/common' import { useTwitterButtonStatus } from '@audius/common/hooks' +import { Nullable } from '@audius/common/utils' import { Button, ButtonProps } from '@audius/harmony' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx b/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx index eda5f00b731..c64b7ab59d2 100644 --- a/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx +++ b/packages/web/src/components/usdc-balance-pill/USDCBalancePill.tsx @@ -1,9 +1,9 @@ +import { useUSDCBalance } from '@audius/common/hooks' +import { Status, BNUSDC } from '@audius/common/models' import { formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber -} from '@audius/common' -import { useUSDCBalance } from '@audius/common/hooks' -import { Status, BNUSDC } from '@audius/common/models' +} from '@audius/common/utils' import { LogoUSDC } from '@audius/stems' import BN from 'bn.js' import cn from 'classnames' diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/PurchaseModalContent.tsx b/packages/web/src/components/usdc-purchase-details-modal/components/PurchaseModalContent.tsx index 1c4fc48e24b..12929a5593a 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/PurchaseModalContent.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/components/PurchaseModalContent.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { makeSolanaTransactionLink } from '@audius/common' import { useGetTrackById } from '@audius/common/api' +import { makeSolanaTransactionLink } from '@audius/common/utils' import { Button, Flex, diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx b/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx index b7b6cc7e2d8..c6be58237ac 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx @@ -4,9 +4,9 @@ import { CommonState, chatActions, chatSelectors, - makeSolanaTransactionLink, useInboxUnavailableModal } from '@audius/common' +import { makeSolanaTransactionLink } from '@audius/common/utils' import { Button, Flex, diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/TransactionSummary.tsx b/packages/web/src/components/usdc-purchase-details-modal/components/TransactionSummary.tsx index 690b663e40b..3b3a2bb0de4 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/TransactionSummary.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/components/TransactionSummary.tsx @@ -1,5 +1,5 @@ -import { formatUSDCWeiToUSDString } from '@audius/common' import { USDCPurchaseDetails } from '@audius/common/models' +import { formatUSDCWeiToUSDString } from '@audius/common/utils' import BN from 'bn.js' import { SummaryTable, SummaryTableItem } from 'components/summary-table' diff --git a/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx b/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx index 71fa88d6328..1ada069f06d 100644 --- a/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx +++ b/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx @@ -1,8 +1,8 @@ +import { useUSDCTransactionDetailsModal } from '@audius/common' import { formatUSDCWeiToUSDString, - useUSDCTransactionDetailsModal, makeSolanaTransactionLink -} from '@audius/common' +} from '@audius/common/utils' import { Button } from '@audius/harmony' import { IconExternalLink, diff --git a/packages/web/src/components/user-badges/UserBadges.tsx b/packages/web/src/components/user-badges/UserBadges.tsx index 7171f584387..9c19828a6fe 100644 --- a/packages/web/src/components/user-badges/UserBadges.tsx +++ b/packages/web/src/components/user-badges/UserBadges.tsx @@ -1,8 +1,8 @@ import { cloneElement, ReactElement } from 'react' -import { Nullable } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { BadgeTier, ID } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' import IconBronzeBadgeSVG from 'assets/img/IconBronzeBadge.svg' diff --git a/packages/web/src/components/user-generated-text/UserGeneratedText.tsx b/packages/web/src/components/user-generated-text/UserGeneratedText.tsx index 85aa968e8d5..6c06c1e124d 100644 --- a/packages/web/src/components/user-generated-text/UserGeneratedText.tsx +++ b/packages/web/src/components/user-generated-text/UserGeneratedText.tsx @@ -1,10 +1,10 @@ import { forwardRef, useMemo, MouseEvent } from 'react' import { - getPathFromAudiusUrl, + squashNewLines, isAudiusUrl, - squashNewLines -} from '@audius/common' + getPathFromAudiusUrl +} from '@audius/common/utils' import cn from 'classnames' import Linkify from 'linkify-react' import { IntermediateRepresentation, Opts } from 'linkifyjs' diff --git a/packages/web/src/components/welcome-modal/WelcomeModal.tsx b/packages/web/src/components/welcome-modal/WelcomeModal.tsx index 75829719e07..5c0d7574bd3 100644 --- a/packages/web/src/components/welcome-modal/WelcomeModal.tsx +++ b/packages/web/src/components/welcome-modal/WelcomeModal.tsx @@ -1,8 +1,9 @@ import { useCallback, useEffect } from 'react' -import { accountSelectors, fillString } from '@audius/common' +import { accountSelectors } from '@audius/common' import { welcomeModalMessages } from '@audius/common/messages' import { Name, SquareSizes } from '@audius/common/models' +import { fillString } from '@audius/common/utils' import { Button, Flex, diff --git a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx index f3340e0efb1..ab8f6acb758 100644 --- a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx @@ -4,8 +4,6 @@ import { useWithdrawUSDCModal, WithdrawUSDCModalPages, withdrawUSDCActions, - formatUSDCWeiToFloorCentsNumber, - Nullable, withdrawUSDCSelectors, WithdrawMethod, FeatureFlags, @@ -22,6 +20,7 @@ import { BNUSDC, SolanaWalletAddress } from '@audius/common/models' +import { formatUSDCWeiToFloorCentsNumber, Nullable } from '@audius/common/utils' import { Modal, ModalContent, ModalHeader } from '@audius/stems' import BN from 'bn.js' import { Formik, FormikProps, useFormikContext } from 'formik' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx index 6a9e2f71244..f3651177369 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx @@ -2,13 +2,15 @@ import { useCallback, useState } from 'react' import { WithdrawUSDCModalPages, - decimalIntegerToHumanReadable, useWithdrawUSDCModal, - formatUSDCWeiToFloorCentsNumber, WithdrawMethod } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' +import { + decimalIntegerToHumanReadable, + formatUSDCWeiToFloorCentsNumber +} from '@audius/common/utils' import { Button, IconQuestionCircle } from '@audius/harmony' import { Switch } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx index e34a2f8982c..0c6811a3900 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx @@ -8,15 +8,17 @@ import { import { useWithdrawUSDCModal, WithdrawUSDCModalPages, - formatUSDCWeiToFloorCentsNumber, - filterDecimalString, - padDecimalValue, - decimalIntegerToHumanReadable, WithdrawMethod, FeatureFlags } from '@audius/common' import { useFeatureFlag, useUSDCBalance } from '@audius/common/hooks' import { Name, BNUSDC } from '@audius/common/models' +import { + filterDecimalString, + padDecimalValue, + decimalIntegerToHumanReadable, + formatUSDCWeiToFloorCentsNumber +} from '@audius/common/utils' import { Button } from '@audius/harmony' import { SegmentedControl } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx index ae2b9c878ef..afd68dd8485 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx @@ -1,14 +1,13 @@ import { useCallback } from 'react' -import { - formatCurrencyBalance, - formatUSDCWeiToFloorDollarNumber, - useWithdrawUSDCModal, - WithdrawUSDCModalPages, - decimalIntegerToHumanReadable -} from '@audius/common' +import { useWithdrawUSDCModal, WithdrawUSDCModalPages } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' +import { + decimalIntegerToHumanReadable, + formatCurrencyBalance, + formatUSDCWeiToFloorDollarNumber +} from '@audius/common/utils' import BN from 'bn.js' import { useField } from 'formik' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx index 68b70437d9a..059330ab0fd 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/TransferInProgress.tsx @@ -1,9 +1,9 @@ -import { - formatUSDCWeiToFloorCentsNumber, - decimalIntegerToHumanReadable -} from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' +import { + decimalIntegerToHumanReadable, + formatUSDCWeiToFloorCentsNumber +} from '@audius/common/utils' import BN from 'bn.js' import { useField } from 'formik' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx index 22ed7f2ab7d..39379b94ff2 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx @@ -1,14 +1,13 @@ import { useCallback } from 'react' -import { - formatUSDCWeiToFloorCentsNumber, - makeSolanaTransactionLink, - decimalIntegerToHumanReadable, - withdrawUSDCSelectors, - WithdrawMethod -} from '@audius/common' +import { withdrawUSDCSelectors, WithdrawMethod } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { Name, Status, BNUSDC } from '@audius/common/models' +import { + decimalIntegerToHumanReadable, + formatUSDCWeiToFloorCentsNumber, + makeSolanaTransactionLink +} from '@audius/common/utils' import { Button, Flex } from '@audius/harmony' import { HarmonyPlainButton, diff --git a/packages/web/src/hooks/useTrackCoverArt.ts b/packages/web/src/hooks/useTrackCoverArt.ts index 140b5137a53..599aad52faf 100644 --- a/packages/web/src/hooks/useTrackCoverArt.ts +++ b/packages/web/src/hooks/useTrackCoverArt.ts @@ -1,11 +1,11 @@ import { cacheTracksActions, imageBlank as imageEmpty, - Maybe, cacheTracksSelectors } from '@audius/common' import { useImageSize } from '@audius/common/hooks' import { SquareSizes, ID, CoverArtSizes } from '@audius/common/models' +import { Maybe } from '@audius/common/utils' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx index 24df4633666..435ead8a373 100644 --- a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx @@ -1,16 +1,11 @@ import { ReactNode, useEffect, useMemo, useState } from 'react' import { - removeNullable, StringKeys, - fillString, - formatNumberCommas, challengesSelectors, audioRewardsPageActions, ChallengeRewardsModalType, - audioRewardsPageSelectors, - isAudioMatchingChallenge, - makeOptimisticChallengeSortComparator + audioRewardsPageSelectors } from '@audius/common' import { Name, @@ -18,6 +13,13 @@ import { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common/models' +import { + fillString, + formatNumberCommas, + removeNullable, + makeOptimisticChallengeSortComparator, + isAudioMatchingChallenge +} from '@audius/common/utils' import { ProgressBar, ButtonType, diff --git a/packages/web/src/pages/audio-rewards-page/Tiers.tsx b/packages/web/src/pages/audio-rewards-page/Tiers.tsx index 7108070ea62..3c6b1345939 100644 --- a/packages/web/src/pages/audio-rewards-page/Tiers.tsx +++ b/packages/web/src/pages/audio-rewards-page/Tiers.tsx @@ -1,7 +1,6 @@ import { ReactElement, useCallback, useEffect, useMemo } from 'react' import { - Nullable, accountSelectors, badgeTiers, getTierNumber, @@ -10,6 +9,7 @@ import { } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { BadgeTier } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { Button, ButtonType, IconDiscord } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/Tiles.tsx b/packages/web/src/pages/audio-rewards-page/Tiles.tsx index 7efd7916022..fbe61b4f3a8 100644 --- a/packages/web/src/pages/audio-rewards-page/Tiles.tsx +++ b/packages/web/src/pages/audio-rewards-page/Tiles.tsx @@ -1,12 +1,11 @@ import { useCallback, ReactNode } from 'react' import { - formatWei, tokenDashboardPageActions, tokenDashboardPageSelectors, - walletSelectors, - isNullOrUndefined + walletSelectors } from '@audius/common' +import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Button, ButtonType, IconInfo } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx index 6f7c354ba1f..78583f92450 100644 --- a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx @@ -1,10 +1,7 @@ import { ReactNode, useCallback } from 'react' import { - Nullable, FeatureFlags, - stringWeiToBN, - weiToString, accountSelectors, tokenDashboardPageActions, TokenDashboardPageModalState, @@ -12,6 +9,7 @@ import { walletSelectors } from '@audius/common' import { Chain, StringWei, BNWei, WalletAddress } from '@audius/common/models' +import { stringWeiToBN, weiToString, Nullable } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/DashboardTokenValueSlider.tsx b/packages/web/src/pages/audio-rewards-page/components/DashboardTokenValueSlider.tsx index fd618db9625..31e599e4d3e 100644 --- a/packages/web/src/pages/audio-rewards-page/components/DashboardTokenValueSlider.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/DashboardTokenValueSlider.tsx @@ -1,5 +1,5 @@ -import { formatNumberCommas } from '@audius/common' import { BNAudio } from '@audius/common/models' +import { formatNumberCommas } from '@audius/common/utils' import { TokenValueSlider } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/DisplayAudio.tsx b/packages/web/src/pages/audio-rewards-page/components/DisplayAudio.tsx index 68c3804eb56..6e8a31f0970 100644 --- a/packages/web/src/pages/audio-rewards-page/components/DisplayAudio.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/DisplayAudio.tsx @@ -1,5 +1,5 @@ -import { formatWei } from '@audius/common' import { BNWei } from '@audius/common/models' +import { formatWei } from '@audius/common/utils' import cn from 'classnames' import styles from './DisplayAudio.module.css' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx index 5f42080a84a..0a4c0453648 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx @@ -1,15 +1,6 @@ import { useCallback, useMemo, useState } from 'react' -import { - Nullable, - FeatureFlags, - IntKeys, - parseAudioInputToWei, - stringAudioToBN, - stringWeiToBN, - weiToAudio, - MIN_TRANSFERRABLE_WEI -} from '@audius/common' +import { FeatureFlags, IntKeys, MIN_TRANSFERRABLE_WEI } from '@audius/common' import { Chain, StringWei, @@ -19,6 +10,13 @@ import { WalletAddress, SolanaWalletAddress } from '@audius/common/models' +import { + weiToAudio, + stringWeiToBN, + stringAudioToBN, + parseAudioInputToWei, + Nullable +} from '@audius/common/utils' import { Button, TokenValueInput, diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx index f348bd552eb..3f10573f9b4 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx @@ -1,11 +1,8 @@ import { useEffect, useState } from 'react' -import { - stringAudioToBN, - weiToAudio, - tokenDashboardPageSelectors -} from '@audius/common' +import { tokenDashboardPageSelectors } from '@audius/common' import { StringAudio, BNWei, WalletAddress } from '@audius/common/models' +import { weiToAudio, stringAudioToBN } from '@audius/common/utils' import { Button, ButtonType, IconArrow } from '@audius/stems' import LoadingSpinner from 'components/loading-spinner/LoadingSpinner' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputSuccess.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputSuccess.tsx index 9309957e0d9..b7d761d7c53 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputSuccess.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputSuccess.tsx @@ -1,5 +1,5 @@ -import { formatWei } from '@audius/common' import { BNWei, WalletAddress } from '@audius/common/models' +import { formatWei } from '@audius/common/utils' import { ModalBodyTitle, ModalBodyWrapper } from '../WalletModal' diff --git a/packages/web/src/pages/audio-rewards-page/components/TokenHoverTooltip.tsx b/packages/web/src/pages/audio-rewards-page/components/TokenHoverTooltip.tsx index a2b429704be..9a17259773d 100644 --- a/packages/web/src/pages/audio-rewards-page/components/TokenHoverTooltip.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/TokenHoverTooltip.tsx @@ -1,7 +1,7 @@ import { ReactNode } from 'react' -import { formatWei } from '@audius/common' import { BNWei } from '@audius/common/models' +import { formatWei } from '@audius/common/utils' import Tooltip from 'components/tooltip/Tooltip' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx index a4ec552e3ca..399d13a449f 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx @@ -1,9 +1,6 @@ -import { - isNullOrUndefined, - tokenDashboardPageActions, - walletSelectors -} from '@audius/common' +import { tokenDashboardPageActions, walletSelectors } from '@audius/common' import { BNWei } from '@audius/common/models' +import { isNullOrUndefined } from '@audius/common/utils' import { Button, ButtonType } from '@audius/stems' import BN from 'bn.js' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx index d7a44b70f0d..1fd63ecd06d 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx @@ -4,15 +4,14 @@ import { tokenDashboardPageActions, walletSelectors, tokenDashboardPageSelectors, - formatWei, buyAudioActions, OnRampProvider, FeatureFlags, StringKeys, - Location, - isNullOrUndefined + Location } from '@audius/common' import { Client, BNWei } from '@audius/common/models' +import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Button, ButtonType, IconInfo } from '@audius/stems' import BN from 'bn.js' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx index 5d06dd87f86..55a351ea8c5 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx @@ -1,12 +1,11 @@ import { useCallback, useContext, useEffect, MouseEvent } from 'react' import { - shortenEthAddress, - shortenSPLAddress, tokenDashboardPageActions, tokenDashboardPageSelectors } from '@audius/common' import { Chain, BNWei } from '@audius/common/models' +import { shortenSPLAddress, shortenEthAddress } from '@audius/common/utils' import { LogoEth, LogoSol } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx index f665f9a7e31..ffb8f16aa94 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx @@ -1,12 +1,12 @@ import { ReactNode, useCallback } from 'react' -import { - challengeRewardsConfig, - formatNumberCommas, - challengesSelectors -} from '@audius/common' +import { challengesSelectors } from '@audius/common' import { useAudioMatchingChallengeCooldownSchedule } from '@audius/common/hooks' import { ChallengeName, OptimisticUserChallenge } from '@audius/common/models' +import { + formatNumberCommas, + challengeRewardsConfig +} from '@audius/common/utils' import { IconArrowRight, IconCloudUpload, Text } from '@audius/harmony' import { HarmonyButton, diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx index f6c0884a8c1..9b4dd08b8d0 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx @@ -1,20 +1,22 @@ import { useCallback, useEffect, useContext, useMemo } from 'react' import { - fillString, - formatNumberCommas, accountSelectors, challengesSelectors, audioRewardsPageActions, ChallengeRewardsModalType, ClaimStatus, audioRewardsPageSelectors, + musicConfettiActions +} from '@audius/common' +import { + fillString, + formatNumberCommas, getAAOErrorEmojis, - musicConfettiActions, challengeRewardsConfig, isAudioMatchingChallenge, getClaimableChallengeSpecifiers -} from '@audius/common' +} from '@audius/common/utils' import { Button, ButtonType, diff --git a/packages/web/src/pages/audio-rewards-page/config.tsx b/packages/web/src/pages/audio-rewards-page/config.tsx index d2eb2fba594..c74b0eb5811 100644 --- a/packages/web/src/pages/audio-rewards-page/config.tsx +++ b/packages/web/src/pages/audio-rewards-page/config.tsx @@ -1,7 +1,7 @@ import { ReactNode } from 'react' -import { Nullable, challengeRewardsConfig } from '@audius/common' import { ChallengeName, ChallengeRewardID } from '@audius/common/models' +import { challengeRewardsConfig, Nullable } from '@audius/common/utils' import { IconArrow, IconCheck, IconUpload } from '@audius/stems' import IconGoldBadge from 'assets/img/tokenBadgeGold40@2x.png' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageList.tsx b/packages/web/src/pages/chat-page/components/ChatMessageList.tsx index 84c0ca713cf..9e9af195a97 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageList.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageList.tsx @@ -11,17 +11,15 @@ import { useMemo } from 'react' +import { accountSelectors, chatActions, chatSelectors } from '@audius/common' +import { useCanSendMessage } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { - accountSelectors, - chatActions, - chatSelectors, encodeHashId, hasTail, isEarliestUnread, chatCanFetchMoreMessages -} from '@audius/common' -import { useCanSendMessage } from '@audius/common/hooks' -import { Status } from '@audius/common/models' +} from '@audius/common/utils' import { ResizeObserver } from '@juggle/resize-observer' import cn from 'classnames' import { throttle } from 'lodash' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx b/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx index 382fd3b2c9b..71ec4a22462 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx @@ -4,15 +4,17 @@ import { accountSelectors, cacheUsersSelectors, chatActions, - decodeHashId, - encodeHashId, - ReactionTypes, - formatMessageDate, - isTrackUrl, - isCollectionUrl + ReactionTypes } from '@audius/common' import { useProxySelector, useCanSendMessage } from '@audius/common/hooks' import { Status, ChatMessageWithExtras } from '@audius/common/models' +import { + formatMessageDate, + decodeHashId, + encodeHashId, + isCollectionUrl, + isTrackUrl +} from '@audius/common/utils' import { IconError, IconPlus, PopupPosition } from '@audius/stems' import cn from 'classnames' import { find } from 'linkifyjs' diff --git a/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx b/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx index 1f96a0e46bb..30f882f5a6b 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx @@ -1,10 +1,8 @@ import { useCallback, useMemo, useEffect } from 'react' import { - makeUid, QueueSource, playerSelectors, - getPathFromPlaylistUrl, accountSelectors, ChatMessageTileProps, cacheCollectionsActions, @@ -17,6 +15,7 @@ import { } from '@audius/common/api' import { usePlayTrack, usePauseTrack } from '@audius/common/hooks' import { Name, SquareSizes, Kind, Status, ID } from '@audius/common/models' +import { getPathFromPlaylistUrl, makeUid } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx index 276591b9431..56c29c64b1d 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx @@ -1,10 +1,8 @@ import { useCallback, useEffect, useMemo } from 'react' import { - makeUid, QueueSource, accountSelectors, - getPathFromTrackUrl, ChatMessageTileProps, cacheTracksActions } from '@audius/common' @@ -22,6 +20,7 @@ import { Status, ID } from '@audius/common/models' +import { getPathFromTrackUrl, makeUid } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx b/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx index b6569062517..9743cedde46 100644 --- a/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx +++ b/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx @@ -5,11 +5,11 @@ import { chatActions, ChatPermissionAction, chatSelectors, - removeNullable, tippingActions, tippingSelectors } from '@audius/common' import { User } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import { IconBlockMessages, IconButton, diff --git a/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx b/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx index f70caab4905..201b78b81e2 100644 --- a/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx +++ b/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx @@ -1,7 +1,8 @@ import { useState, useCallback, MouseEventHandler } from 'react' -import { ChatPermissionAction, CHAT_BLOG_POST_URL } from '@audius/common' +import { ChatPermissionAction } from '@audius/common' import { User } from '@audius/common/models' +import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { UserNameAndBadges } from 'components/user-name-and-badges/UserNameAndBadges' diff --git a/packages/web/src/pages/chat-page/components/LinkPreview.tsx b/packages/web/src/pages/chat-page/components/LinkPreview.tsx index c068a85e829..ea6356e6f1d 100644 --- a/packages/web/src/pages/chat-page/components/LinkPreview.tsx +++ b/packages/web/src/pages/chat-page/components/LinkPreview.tsx @@ -1,7 +1,8 @@ import { MouseEventHandler, useCallback, useEffect } from 'react' -import { isAudiusUrl, useLeavingAudiusModal } from '@audius/common' +import { useLeavingAudiusModal } from '@audius/common' import { useLinkUnfurlMetadata } from '@audius/common/hooks' +import { isAudiusUrl } from '@audius/common/utils' import cn from 'classnames' import styles from './LinkPreview.module.css' diff --git a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx index bb78992cdc5..4c0dcd2677f 100644 --- a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx +++ b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx @@ -8,7 +8,6 @@ import { } from 'react' import { - formatSeconds, cacheUsersSelectors, profilePageActions, CollectionTrack, @@ -17,8 +16,7 @@ import { QueueSource, collectibleDetailsUIActions, shareModalUIActions, - playerSelectors, - getHash + playerSelectors } from '@audius/common' import { ShareSource, @@ -30,6 +28,7 @@ import { SmartCollection, User } from '@audius/common/models' +import { getHash, formatSeconds } from '@audius/common/utils' import cn from 'classnames' import { push } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/collection-page/CollectionPageProvider.tsx b/packages/web/src/pages/collection-page/CollectionPageProvider.tsx index 18ce9c42a81..dc218dc7a47 100644 --- a/packages/web/src/pages/collection-page/CollectionPageProvider.tsx +++ b/packages/web/src/pages/collection-page/CollectionPageProvider.tsx @@ -1,9 +1,6 @@ import { ChangeEvent, Component, ComponentType } from 'react' import { - Nullable, - Uid, - formatUrlName, accountSelectors, cacheCollectionsActions, lineupSelectors, @@ -45,6 +42,7 @@ import { ID, UID } from '@audius/common/models' +import { formatUrlName, Uid, Nullable } from '@audius/common/utils' import { push as pushRoute, replace } from 'connected-react-router' import { UnregisterCallback } from 'history' import { connect } from 'react-redux' diff --git a/packages/web/src/pages/dashboard-page/DashboardPage.tsx b/packages/web/src/pages/dashboard-page/DashboardPage.tsx index 4dc22d30f72..c1a635a39d2 100644 --- a/packages/web/src/pages/dashboard-page/DashboardPage.tsx +++ b/packages/web/src/pages/dashboard-page/DashboardPage.tsx @@ -1,7 +1,8 @@ import { useState, Suspense, ReactNode, useEffect, useCallback } from 'react' -import { formatCount, themeSelectors } from '@audius/common' +import { themeSelectors } from '@audius/common' import { Status, Track } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { each } from 'lodash' import moment, { Moment } from 'moment' diff --git a/packages/web/src/pages/dashboard-page/components/TotalPlaysChart.jsx b/packages/web/src/pages/dashboard-page/components/TotalPlaysChart.jsx index 16e03f9891c..b827b3e094e 100644 --- a/packages/web/src/pages/dashboard-page/components/TotalPlaysChart.jsx +++ b/packages/web/src/pages/dashboard-page/components/TotalPlaysChart.jsx @@ -1,7 +1,7 @@ import { createRef, Component } from 'react' -import { formatCount } from '@audius/common' import { Theme } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import moment from 'moment' import numeral from 'numeral' import PropTypes from 'prop-types' diff --git a/packages/web/src/pages/dashboard-page/store/sagas.ts b/packages/web/src/pages/dashboard-page/store/sagas.ts index 67d62aa2205..eb7b4598705 100644 --- a/packages/web/src/pages/dashboard-page/store/sagas.ts +++ b/packages/web/src/pages/dashboard-page/store/sagas.ts @@ -2,11 +2,10 @@ import { IntKeys, accountSelectors, walletActions, - doEvery, - waitForValue, getContext } from '@audius/common' import { Collection, ID, Track } from '@audius/common/models' +import { waitForValue, doEvery } from '@audius/common/utils' import { each } from 'lodash' import moment from 'moment' import { EventChannel } from 'redux-saga' diff --git a/packages/web/src/pages/dashboard-page/store/types.ts b/packages/web/src/pages/dashboard-page/store/types.ts index 9fae0c69f3a..62d1c59fd1a 100644 --- a/packages/web/src/pages/dashboard-page/store/types.ts +++ b/packages/web/src/pages/dashboard-page/store/types.ts @@ -1,5 +1,5 @@ -import { Nullable } from '@audius/common' import { Status, Collection, Track } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' export default interface ArtistDashboardState { status: Status diff --git a/packages/web/src/pages/deleted-page/components/desktop/DeletedPage.tsx b/packages/web/src/pages/deleted-page/components/desktop/DeletedPage.tsx index a3e25a25aad..01f52c52f7e 100644 --- a/packages/web/src/pages/deleted-page/components/desktop/DeletedPage.tsx +++ b/packages/web/src/pages/deleted-page/components/desktop/DeletedPage.tsx @@ -1,4 +1,3 @@ -import { NestedNonNullable } from '@audius/common' import { PlayableType, SquareSizes, @@ -7,6 +6,7 @@ import { Playable, User } from '@audius/common/models' +import { NestedNonNullable } from '@audius/common/utils' import { Button, ButtonType, IconUser } from '@audius/stems' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/pages/deleted-page/components/mobile/DeletedPage.tsx b/packages/web/src/pages/deleted-page/components/mobile/DeletedPage.tsx index 61b2b92dba8..1bcb1b6e8f1 100644 --- a/packages/web/src/pages/deleted-page/components/mobile/DeletedPage.tsx +++ b/packages/web/src/pages/deleted-page/components/mobile/DeletedPage.tsx @@ -1,4 +1,3 @@ -import { NestedNonNullable } from '@audius/common' import { PlayableType, SquareSizes, @@ -7,6 +6,7 @@ import { Playable, User } from '@audius/common/models' +import { NestedNonNullable } from '@audius/common/utils' import { Button, ButtonType, IconUser } from '@audius/stems' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/pages/explore-page/ExplorePageProvider.tsx b/packages/web/src/pages/explore-page/ExplorePageProvider.tsx index 6c97ac862a3..bf58d616468 100644 --- a/packages/web/src/pages/explore-page/ExplorePageProvider.tsx +++ b/packages/web/src/pages/explore-page/ExplorePageProvider.tsx @@ -1,11 +1,11 @@ import { ComponentType, useEffect } from 'react' import { - formatCount, accountSelectors, explorePageActions, explorePageSelectors } from '@audius/common' +import { formatCount } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { withRouter, RouteComponentProps } from 'react-router-dom' diff --git a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx index 18afc579ad9..83e9a4774bf 100644 --- a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx @@ -11,8 +11,7 @@ import { explorePageActions, ExplorePageTabs as ExploreTabs, ExploreCollectionsVariant, - explorePageSelectors, - removeNullable + explorePageSelectors } from '@audius/common' import { Variant as CollectionVariant, @@ -21,6 +20,7 @@ import { SmartCollection, User } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/oauth-login-page/hooks.ts b/packages/web/src/pages/oauth-login-page/hooks.ts index 42b63f5a15c..c91f9a04a4b 100644 --- a/packages/web/src/pages/oauth-login-page/hooks.ts +++ b/packages/web/src/pages/oauth-login-page/hooks.ts @@ -1,12 +1,13 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import { accountSelectors, CommonState, encodeHashId } from '@audius/common' +import { accountSelectors, CommonState } from '@audius/common' import { Name, ErrorLevel, statusIsNotFinalized, User } from '@audius/common/models' +import { encodeHashId } from '@audius/common/utils' import * as queryString from 'query-string' import { useDispatch, useSelector } from 'react-redux' import { useHistory, useLocation } from 'react-router-dom' diff --git a/packages/web/src/pages/oauth-login-page/utils.ts b/packages/web/src/pages/oauth-login-page/utils.ts index f4670b72789..d4c004a6272 100644 --- a/packages/web/src/pages/oauth-login-page/utils.ts +++ b/packages/web/src/pages/oauth-login-page/utils.ts @@ -1,5 +1,9 @@ -import { decodeHashId, encodeHashId, getErrorMessage } from '@audius/common' import { SquareSizes, User } from '@audius/common/models' +import { + getErrorMessage, + decodeHashId, + encodeHashId +} from '@audius/common/utils' import { CreateGrantRequest } from '@audius/sdk' import base64url from 'base64url' diff --git a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTable.tsx b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTable.tsx index 83fd0ff5ae2..67208d59eec 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTable.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTable.tsx @@ -1,10 +1,10 @@ import { MouseEvent, useCallback, useMemo } from 'react' -import { formatUSDCWeiToUSDString } from '@audius/common' import { USDCContentPurchaseType, USDCPurchaseDetails } from '@audius/common/models' +import { formatUSDCWeiToUSDString } from '@audius/common/utils' import BN from 'bn.js' import moment from 'moment' diff --git a/packages/web/src/pages/pay-and-earn-page/components/SalesTable.tsx b/packages/web/src/pages/pay-and-earn-page/components/SalesTable.tsx index afae33ed92f..31c798db763 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/SalesTable.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/SalesTable.tsx @@ -1,10 +1,10 @@ import { MouseEvent, useCallback, useMemo } from 'react' -import { formatUSDCWeiToUSDString } from '@audius/common' import { USDCContentPurchaseType, USDCPurchaseDetails } from '@audius/common/models' +import { formatUSDCWeiToUSDString } from '@audius/common/utils' import { BN } from 'bn.js' import moment from 'moment' diff --git a/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx b/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx index fc7d6e80f30..108d213cd11 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx @@ -2,13 +2,15 @@ import { useCallback } from 'react' import { WithdrawUSDCModalPages, - formatCurrencyBalance, - formatUSDCWeiToFloorCentsNumber, useWithdrawUSDCModal, useAddFundsModal } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { Name, Status, BNUSDC } from '@audius/common/models' +import { + formatCurrencyBalance, + formatUSDCWeiToFloorCentsNumber +} from '@audius/common/utils' import { Button, PlainButton, IconQuestionCircle, Flex } from '@audius/harmony' import { LogoUSDC } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx index 3b78352e6f5..b2287bc764f 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx @@ -3,7 +3,6 @@ import { useCallback, useContext, useState } from 'react' import { WithdrawUSDCModalPages, accountSelectors, - formatUSDCWeiToFloorCentsNumber, useAllPaginatedQuery, useUSDCTransactionDetailsModal, useWithdrawUSDCModal @@ -22,6 +21,7 @@ import { USDCTransactionDetails, BNUSDC } from '@audius/common/models' +import { formatUSDCWeiToFloorCentsNumber } from '@audius/common/utils' import { full } from '@audius/sdk' import BN from 'bn.js' diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTable.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTable.tsx index 5da5263ad46..0914998a6a1 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTable.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTable.tsx @@ -1,7 +1,7 @@ import { MouseEvent, useCallback, useMemo } from 'react' -import { formatUSDCWeiToUSDString } from '@audius/common' import { USDCTransactionDetails } from '@audius/common/models' +import { formatUSDCWeiToUSDString } from '@audius/common/utils' import moment from 'moment' import { Table } from 'components/table' diff --git a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx index 5efaab45fd3..9b85632d5d9 100644 --- a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx +++ b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx @@ -1,8 +1,6 @@ import { ComponentType, PureComponent, RefObject } from 'react' import { - formatCount, - getErrorMessage, accountActions, accountSelectors, profilePageSelectors, @@ -25,7 +23,6 @@ import { newUserMetadata, playerSelectors, queueSelectors, - Nullable, chatActions, chatSelectors, ChatPermissionAction, @@ -42,6 +39,7 @@ import { ID, UID } from '@audius/common/models' +import { getErrorMessage, formatCount, Nullable } from '@audius/common/utils' import { push as pushRoute, replace } from 'connected-react-router' import { UnregisterCallback } from 'history' import { uniq } from 'lodash' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileMutuals.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileMutuals.tsx index 8325596b0a2..d68634c2f35 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileMutuals.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileMutuals.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' import { - removeNullable, accountSelectors, cacheUsersSelectors, profilePageSelectors } from '@audius/common' +import { removeNullable } from '@audius/common/utils' import { IconFollowing } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' import { createSelector } from 'reselect' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileWrapping.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileWrapping.tsx index 6601f184ba6..1c01a8bf5e5 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileWrapping.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileWrapping.tsx @@ -1,5 +1,5 @@ -import { Nullable } from '@audius/common' import { ID, ProfilePictureSizes } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' import BadgeArtist from 'assets/img/badgeArtist.svg' diff --git a/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx b/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx index e2bbebef9be..e18b5d28965 100644 --- a/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx @@ -1,10 +1,6 @@ import { useState, useRef, useCallback, useEffect, MouseEvent } from 'react' -import { - formatCount, - imageCoverPhotoBlank, - imageProfilePicEmpty -} from '@audius/common' +import { imageCoverPhotoBlank, imageProfilePicEmpty } from '@audius/common' import { Name, SquareSizes, @@ -13,6 +9,7 @@ import { ProfilePictureSizes, CoverPhotoSizes } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import { Button, ButtonType, diff --git a/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx b/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx index 0ea44835f0e..449b4eadb82 100644 --- a/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react' -import { Nullable, shareModalUIActions } from '@audius/common' +import { shareModalUIActions } from '@audius/common' import { ShareSource, ID } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { IconShare, IconButton } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/remixes-page/components/desktop/RemixesPage.tsx b/packages/web/src/pages/remixes-page/components/desktop/RemixesPage.tsx index aa89c8c129f..d5d75be2d2f 100644 --- a/packages/web/src/pages/remixes-page/components/desktop/RemixesPage.tsx +++ b/packages/web/src/pages/remixes-page/components/desktop/RemixesPage.tsx @@ -1,5 +1,5 @@ -import { pluralize } from '@audius/common' import { Track, User } from '@audius/common/models' +import { pluralize } from '@audius/common/utils' import cn from 'classnames' import IconRemixes from 'assets/img/iconRemix.svg' diff --git a/packages/web/src/pages/remixes-page/components/mobile/RemixesPage.tsx b/packages/web/src/pages/remixes-page/components/mobile/RemixesPage.tsx index 2c34abb8083..e5a155da47d 100644 --- a/packages/web/src/pages/remixes-page/components/mobile/RemixesPage.tsx +++ b/packages/web/src/pages/remixes-page/components/mobile/RemixesPage.tsx @@ -1,7 +1,7 @@ import { useEffect, useContext } from 'react' -import { pluralize } from '@audius/common' import { Track, User } from '@audius/common/models' +import { pluralize } from '@audius/common/utils' import cn from 'classnames' import IconRemixes from 'assets/img/iconRemix.svg' diff --git a/packages/web/src/pages/saved-page/components/utils.ts b/packages/web/src/pages/saved-page/components/utils.ts index aa852b21278..9937681ddf9 100644 --- a/packages/web/src/pages/saved-page/components/utils.ts +++ b/packages/web/src/pages/saved-page/components/utils.ts @@ -1,4 +1,4 @@ -import { formatCount } from '@audius/common' +import { formatCount } from '@audius/common/utils' export const formatCardSecondaryText = (saves: number, tracks: number) => { const savesText = saves === 1 ? 'Favorite' : 'Favorites' diff --git a/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx b/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx index 6bfa8b03079..a7d3c45c892 100644 --- a/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx +++ b/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx @@ -1,11 +1,11 @@ import { Component } from 'react' import { - formatCount, searchResultsPageTracksLineupActions as tracksActions, SearchKind } from '@audius/common' import { Status } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import { Redirect } from 'react-router' import IconBigSearch from 'assets/img/iconBigSearch.svg' diff --git a/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx b/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx index e5917dec3bd..61fed606755 100644 --- a/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx +++ b/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx @@ -1,9 +1,6 @@ import { memo, useCallback, useContext, useEffect, useMemo } from 'react' -import { - searchResultsPageTracksLineupActions as tracksActions, - trimToAlphaNumeric -} from '@audius/common' +import { searchResultsPageTracksLineupActions as tracksActions } from '@audius/common' import { Name, Status, @@ -12,6 +9,7 @@ import { LineupState, User } from '@audius/common/models' +import { trimToAlphaNumeric } from '@audius/common/utils' import { matchPath } from 'react-router' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx index 165a7f7ad09..d0c14ddef82 100644 --- a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx @@ -8,10 +8,10 @@ import { EmailFrequency, TikTokProfile, FeatureFlags, - removeNullable, settingsPageSelectors } from '@audius/common' import { OS, Theme, ID, ProfilePictureSizes } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import { IconAppearance } from '@audius/harmony' import { Modal, diff --git a/packages/web/src/pages/settings-page/store/sagas.ts b/packages/web/src/pages/settings-page/store/sagas.ts index c2d9220fcde..d89572720f8 100644 --- a/packages/web/src/pages/settings-page/store/sagas.ts +++ b/packages/web/src/pages/settings-page/store/sagas.ts @@ -1,11 +1,11 @@ import { - getErrorMessage, settingsPageActions as actions, settingsPageSelectors, BrowserNotificationSetting, getContext } from '@audius/common' import { Name } from '@audius/common/models' +import { getErrorMessage } from '@audius/common/utils' import { select, call, put, takeEvery } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/sign-on/components/ProfileForm.tsx b/packages/web/src/pages/sign-on/components/ProfileForm.tsx index b5bfedf3eb7..34e3f43123e 100644 --- a/packages/web/src/pages/sign-on/components/ProfileForm.tsx +++ b/packages/web/src/pages/sign-on/components/ProfileForm.tsx @@ -3,9 +3,9 @@ import { KeyboardEventHandler, useState } from 'react' import { imageProfilePicEmpty as profilePicEmpty, MAX_DISPLAY_NAME_LENGTH, - MAX_HANDLE_LENGTH, - getErrorMessage + MAX_HANDLE_LENGTH } from '@audius/common' +import { getErrorMessage } from '@audius/common/utils' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/sign-on/components/desktop/PasswordPage.jsx b/packages/web/src/pages/sign-on/components/desktop/PasswordPage.jsx index 087577eaa4f..408b4387320 100644 --- a/packages/web/src/pages/sign-on/components/desktop/PasswordPage.jsx +++ b/packages/web/src/pages/sign-on/components/desktop/PasswordPage.jsx @@ -1,6 +1,6 @@ import { useCallback, useState } from 'react' -import { commonPasswordCheck } from '@audius/common' +import { commonPasswordCheck } from '@audius/common/utils' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/pages/sign-on/components/mobile/PasswordPage.tsx b/packages/web/src/pages/sign-on/components/mobile/PasswordPage.tsx index 3a5bf4be7d2..a8fc4ff250f 100644 --- a/packages/web/src/pages/sign-on/components/mobile/PasswordPage.tsx +++ b/packages/web/src/pages/sign-on/components/mobile/PasswordPage.tsx @@ -1,6 +1,6 @@ import { useState, useCallback } from 'react' -import { commonPasswordCheck } from '@audius/common' +import { commonPasswordCheck } from '@audius/common/utils' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-up-page/components/FollowArtistCard.tsx b/packages/web/src/pages/sign-up-page/components/FollowArtistCard.tsx index 10cc2567f03..31f1f0d59a3 100644 --- a/packages/web/src/pages/sign-up-page/components/FollowArtistCard.tsx +++ b/packages/web/src/pages/sign-up-page/components/FollowArtistCard.tsx @@ -1,7 +1,7 @@ import { HTMLProps, useContext } from 'react' -import { formatCount } from '@audius/common' import { Name, WidthSizes, UserMetadata } from '@audius/common/models' +import { formatCount } from '@audius/common/utils' import { Box, Divider, diff --git a/packages/web/src/pages/sign-up-page/components/ImageField.tsx b/packages/web/src/pages/sign-up-page/components/ImageField.tsx index 30c0cc39071..59be869a21b 100644 --- a/packages/web/src/pages/sign-up-page/components/ImageField.tsx +++ b/packages/web/src/pages/sign-up-page/components/ImageField.tsx @@ -1,7 +1,7 @@ import { ReactNode, useCallback } from 'react' -import { Nullable } from '@audius/common' import { finishProfilePageMessages as messages } from '@audius/common/messages' +import { Nullable } from '@audius/common/utils' import cn from 'classnames' import { useField } from 'formik' import ReactDropzone, { DropFilesEventHandler } from 'react-dropzone' diff --git a/packages/web/src/pages/sign-up-page/components/layout.tsx b/packages/web/src/pages/sign-up-page/components/layout.tsx index de9baae78b6..c4c798a15fa 100644 --- a/packages/web/src/pages/sign-up-page/components/layout.tsx +++ b/packages/web/src/pages/sign-up-page/components/layout.tsx @@ -8,7 +8,7 @@ import { RefObject } from 'react' -import { Maybe } from '@audius/common' +import { Maybe } from '@audius/common/utils' import { Box, BoxProps, diff --git a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx index eca6f866d7f..ffd02c5e3f4 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx @@ -1,17 +1,14 @@ import { useCallback, useRef, useState } from 'react' import type { ChangeEvent } from 'react' -import { - Genre, - convertGenreLabelToValue, - selectArtistsSchema -} from '@audius/common' +import { selectArtistsSchema } from '@audius/common' import { useGetTopArtistsInGenre, useGetFeaturedArtists } from '@audius/common/api' import { selectArtistsPageMessages } from '@audius/common/messages' import { Status } from '@audius/common/models' +import { Genre, convertGenreLabelToValue } from '@audius/common/utils' import { Flex, Text, SelectablePill, Paper, useTheme } from '@audius/harmony' import { useSpring, animated } from '@react-spring/web' import { Form, Formik } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx index d880734f92e..16401bd3bed 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx @@ -1,8 +1,9 @@ import { MouseEventHandler, useCallback, useState } from 'react' -import { Genre, selectGenresSchema, selectableGenres } from '@audius/common' +import { selectGenresSchema, selectableGenres } from '@audius/common' import { selectGenresPageMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' +import { Genre } from '@audius/common/utils' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts b/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts index c6dc57f4b61..fd8d5b5c167 100644 --- a/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts +++ b/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts @@ -1,8 +1,5 @@ -import { - AudiusQueryContextType, - emailSchema, - isNotCommonPassword -} from '@audius/common' +import { AudiusQueryContextType, emailSchema } from '@audius/common' +import { isNotCommonPassword } from '@audius/common/utils' import { z } from 'zod' // Due to issue with zod merge, manually rewriting diff --git a/packages/web/src/pages/track-page/TrackPageProvider.tsx b/packages/web/src/pages/track-page/TrackPageProvider.tsx index 76dad485441..ab5246bf9a8 100644 --- a/packages/web/src/pages/track-page/TrackPageProvider.tsx +++ b/packages/web/src/pages/track-page/TrackPageProvider.tsx @@ -1,8 +1,6 @@ import { Component, ComponentType } from 'react' import { - Uid, - formatDate, accountSelectors, cacheTracksActions as cacheTrackActions, lineupSelectors, @@ -34,6 +32,7 @@ import { ID, Track } from '@audius/common/models' +import { formatDate, Uid } from '@audius/common/utils' import { push as pushRoute, replace } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/track-page/components/mobile/StatsButtonRow.tsx b/packages/web/src/pages/track-page/components/mobile/StatsButtonRow.tsx index 8918113bffb..ebf1b841faa 100644 --- a/packages/web/src/pages/track-page/components/mobile/StatsButtonRow.tsx +++ b/packages/web/src/pages/track-page/components/mobile/StatsButtonRow.tsx @@ -1,4 +1,4 @@ -import { formatCount } from '@audius/common' +import { formatCount } from '@audius/common/utils' import cn from 'classnames' import IconFavorite from 'assets/img/iconHeart.svg' diff --git a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx index 26297e30074..066600aedae 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx @@ -1,13 +1,8 @@ import { useCallback } from 'react' import { - getCanonicalName, - formatSeconds, - formatDate, OverflowAction, imageBlank as placeholderArt, - Nullable, - getDogEarType, FeatureFlags } from '@audius/common' import { @@ -20,6 +15,13 @@ import { Remix, AccessConditions } from '@audius/common/models' +import { + getCanonicalName, + formatSeconds, + formatDate, + getDogEarType, + Nullable +} from '@audius/common/utils' import { Button, ButtonSize, diff --git a/packages/web/src/pages/trending-page/TrendingPageProvider.jsx b/packages/web/src/pages/trending-page/TrendingPageProvider.jsx index be397b4ade1..1cc505bcc7f 100644 --- a/packages/web/src/pages/trending-page/TrendingPageProvider.jsx +++ b/packages/web/src/pages/trending-page/TrendingPageProvider.jsx @@ -1,7 +1,6 @@ import { PureComponent } from 'react' import { - GENRES, accountSelectors, lineupSelectors, trendingPageLineupActions, @@ -11,6 +10,7 @@ import { queueSelectors } from '@audius/common' import { Name, TimeRange } from '@audius/common/models' +import { GENRES } from '@audius/common/utils' import { push as pushRoute, replace as replaceRoute diff --git a/packages/web/src/pages/trending-page/components/desktop/TrendingGenreFilters.tsx b/packages/web/src/pages/trending-page/components/desktop/TrendingGenreFilters.tsx index 008bd43b36c..8b84b334213 100644 --- a/packages/web/src/pages/trending-page/components/desktop/TrendingGenreFilters.tsx +++ b/packages/web/src/pages/trending-page/components/desktop/TrendingGenreFilters.tsx @@ -1,6 +1,6 @@ import { useState } from 'react' -import { getCanonicalName } from '@audius/common' +import { getCanonicalName } from '@audius/common/utils' import IconKebabHorizontal from 'assets/img/iconKebabHorizontal.svg' import SelectablePills from 'components/selectable-pill/SelectablePills' diff --git a/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx b/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx index 8abff465504..e75bec0c9e8 100644 --- a/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx +++ b/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx @@ -1,11 +1,8 @@ import { useCallback, useRef, useState } from 'react' -import { - ELECTRONIC_PREFIX, - TRENDING_GENRES, - trendingPageLineupActions -} from '@audius/common' +import { trendingPageLineupActions } from '@audius/common' import { Name, Status, TimeRange } from '@audius/common/models' +import { ELECTRONIC_PREFIX, TRENDING_GENRES } from '@audius/common/utils' import { make, useRecord } from 'common/store/analytics/actions' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx index 98756311942..4f8b298be69 100644 --- a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx +++ b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx @@ -1,11 +1,6 @@ import { useCallback, useMemo } from 'react' -import { - accountSelectors, - FeatureFlags, - formatPrice, - Nullable -} from '@audius/common' +import { accountSelectors, FeatureFlags } from '@audius/common' import { USDCPurchaseConfig, useFeatureFlag, @@ -26,6 +21,7 @@ import { USDCPurchaseConditions, AccessConditions } from '@audius/common/models' +import { formatPrice, Nullable } from '@audius/common/utils' import { IconCart, IconCollectible, diff --git a/packages/web/src/pages/upload-page/fields/AttributionField.tsx b/packages/web/src/pages/upload-page/fields/AttributionField.tsx index 6f275ee1906..bf9dc368c7b 100644 --- a/packages/web/src/pages/upload-page/fields/AttributionField.tsx +++ b/packages/web/src/pages/upload-page/fields/AttributionField.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { creativeCommons } from '@audius/common' +import { creativeCommons } from '@audius/common/utils' import { IconRobot } from '@audius/stems' import cn from 'classnames' import { useField } from 'formik' diff --git a/packages/web/src/pages/upload-page/fields/ReleaseDateField.tsx b/packages/web/src/pages/upload-page/fields/ReleaseDateField.tsx index 46d5db3dba9..b7db26490e3 100644 --- a/packages/web/src/pages/upload-page/fields/ReleaseDateField.tsx +++ b/packages/web/src/pages/upload-page/fields/ReleaseDateField.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import { getLocalTimezone } from '@audius/common' +import { getLocalTimezone } from '@audius/common/utils' import { IconInfo, Flex } from '@audius/harmony' import { IconCalendar, RadioButtonGroup, ModalContent } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsField.tsx b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsField.tsx index f4535d41ee7..c77f0d40500 100644 --- a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsField.tsx +++ b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsField.tsx @@ -1,6 +1,5 @@ import { useCallback, useEffect, useMemo } from 'react' -import { Nullable } from '@audius/common' import { useGetTrackById } from '@audius/common/api' import { isContentUSDCPurchaseGated, @@ -8,6 +7,7 @@ import { FieldVisibility, Remix } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { get, set } from 'lodash' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx index 84ffd0d634d..8ac885438c6 100644 --- a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx +++ b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx @@ -1,12 +1,13 @@ import { useEffect } from 'react' -import { getPathFromTrackUrl, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' import { useGetTrackByPermalink } from '@audius/common/api' import { useGatedContentAccess } from '@audius/common/hooks' import { isContentCollectibleGated, isContentUSDCPurchaseGated } from '@audius/common/models' +import { getPathFromTrackUrl } from '@audius/common/utils' import { useField } from 'formik' import { useSelector } from 'react-redux' import { useThrottle } from 'react-use' diff --git a/packages/web/src/pages/upload-page/fields/SelectGenreField.tsx b/packages/web/src/pages/upload-page/fields/SelectGenreField.tsx index cad9c5abe33..2791a81e472 100644 --- a/packages/web/src/pages/upload-page/fields/SelectGenreField.tsx +++ b/packages/web/src/pages/upload-page/fields/SelectGenreField.tsx @@ -1,4 +1,4 @@ -import { convertGenreLabelToValue, GENRES } from '@audius/common' +import { GENRES, convertGenreLabelToValue } from '@audius/common/utils' import { DropdownField, DropdownFieldProps } from 'components/form-fields' diff --git a/packages/web/src/pages/upload-page/fields/SourceFilesField.tsx b/packages/web/src/pages/upload-page/fields/SourceFilesField.tsx index 243b52d0183..493fcdad701 100644 --- a/packages/web/src/pages/upload-page/fields/SourceFilesField.tsx +++ b/packages/web/src/pages/upload-page/fields/SourceFilesField.tsx @@ -1,12 +1,12 @@ import { useCallback, useMemo } from 'react' -import { removeNullable } from '@audius/common' import { StemCategory, stemCategoryFriendlyNames, StemUpload, Download } from '@audius/common/models' +import { removeNullable } from '@audius/common/utils' import { useField } from 'formik' import { get, set } from 'lodash' diff --git a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseFields.tsx b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseFields.tsx index 71defc081ac..b98bdb8bf08 100644 --- a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseFields.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseFields.tsx @@ -6,10 +6,10 @@ import { } from 'react' import { - decimalIntegerToHumanReadable, filterDecimalString, - padDecimalValue -} from '@audius/common' + padDecimalValue, + decimalIntegerToHumanReadable +} from '@audius/common/utils' import cn from 'classnames' import { useField } from 'formik' diff --git a/packages/web/src/pages/upload-page/hooks.ts b/packages/web/src/pages/upload-page/hooks.ts index 57fc8ce3af3..ab5ab468638 100644 --- a/packages/web/src/pages/upload-page/hooks.ts +++ b/packages/web/src/pages/upload-page/hooks.ts @@ -1,4 +1,4 @@ -import { Maybe } from '@audius/common' +import { Maybe } from '@audius/common/utils' import { useField } from 'formik' const getFieldName = (base: string, index: number, path: string) => diff --git a/packages/web/src/pages/upload-page/pages/SelectPage.tsx b/packages/web/src/pages/upload-page/pages/SelectPage.tsx index d9942ae7a6e..3082c6480fc 100644 --- a/packages/web/src/pages/upload-page/pages/SelectPage.tsx +++ b/packages/web/src/pages/upload-page/pages/SelectPage.tsx @@ -1,12 +1,7 @@ import { useCallback, useState } from 'react' -import { - Nullable, - UploadType, - removeNullable, - newCollectionMetadata, - FeatureFlags -} from '@audius/common' +import { UploadType, newCollectionMetadata, FeatureFlags } from '@audius/common' +import { removeNullable, Nullable } from '@audius/common/utils' import { Box } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/pages/upload-page/store/utils/processFiles.ts b/packages/web/src/pages/upload-page/store/utils/processFiles.ts index 4cde534bfc0..8f948658c57 100644 --- a/packages/web/src/pages/upload-page/store/utils/processFiles.ts +++ b/packages/web/src/pages/upload-page/store/utils/processFiles.ts @@ -1,9 +1,9 @@ +import { newTrackMetadata } from '@audius/common' import { - newTrackMetadata, ALLOWED_MAX_AUDIO_SIZE_BYTES, ALLOWED_AUDIO_FILE_EXTENSIONS, ALLOWED_AUDIO_FILE_MIME -} from '@audius/common' +} from '@audius/common/utils' import jsmediatags from 'jsmediatags' import { resizeImage } from 'utils/imageProcessingUtil' diff --git a/packages/web/src/pages/upload-page/types.ts b/packages/web/src/pages/upload-page/types.ts index 5fbc1ba8057..b3c8bb9fcc9 100644 --- a/packages/web/src/pages/upload-page/types.ts +++ b/packages/web/src/pages/upload-page/types.ts @@ -1,5 +1,6 @@ -import { Nullable, UploadType } from '@audius/common' +import { UploadType } from '@audius/common' import { TrackMetadata } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { CollectionValues } from './validation' diff --git a/packages/web/src/pages/upload-page/utils/computeLicenseIcons.ts b/packages/web/src/pages/upload-page/utils/computeLicenseIcons.ts index 8ba0f994a4b..1c12d6d1fc3 100644 --- a/packages/web/src/pages/upload-page/utils/computeLicenseIcons.ts +++ b/packages/web/src/pages/upload-page/utils/computeLicenseIcons.ts @@ -1,6 +1,8 @@ import type { ComponentType, SVGProps } from 'react' -import type { Nullable } from '@audius/common' +import { Nullable } from '@audius/common/utils' + +import type {} from '@audius/common' import IconAllowAttribution from 'assets/img/creativeCommons/by.svg' import IconCreativeCommons from 'assets/img/creativeCommons/cc.svg' diff --git a/packages/web/src/pages/upload-page/utils/uploadPreviewContext.tsx b/packages/web/src/pages/upload-page/utils/uploadPreviewContext.tsx index c663d8c6657..e0dc8504701 100644 --- a/packages/web/src/pages/upload-page/utils/uploadPreviewContext.tsx +++ b/packages/web/src/pages/upload-page/utils/uploadPreviewContext.tsx @@ -1,6 +1,7 @@ import { createContext, useCallback, useState } from 'react' -import { Nullable, playerSelectors, queueActions } from '@audius/common' +import { playerSelectors, queueActions } from '@audius/common' +import { Nullable } from '@audius/common/utils' import { useSelector, useDispatch } from 'react-redux' const { getPlaying } = playerSelectors diff --git a/packages/web/src/pages/visualizer/VisualizerProvider.tsx b/packages/web/src/pages/visualizer/VisualizerProvider.tsx index a2ffefa634c..671f0aeb278 100644 --- a/packages/web/src/pages/visualizer/VisualizerProvider.tsx +++ b/packages/web/src/pages/visualizer/VisualizerProvider.tsx @@ -1,4 +1,5 @@ -import { Name, SquareSizes, Track } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' + import { Name, SquareSizes, Track } from '@audius/common/models' import { useEffect, useState, useCallback } from 'react' import { push as pushRoute } from 'connected-react-router' import { AppState } from 'store/types' @@ -12,7 +13,7 @@ import Toast from 'components/toast/Toast' import styles from './VisualizerProvider.module.css' import { MountPlacement, ComponentPlacement } from 'components/types' import { - Nullable, + playerSelectors, queueSelectors, themeSelectors diff --git a/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx b/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx index e811fb3e8d9..b4af8974edc 100644 --- a/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx +++ b/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx @@ -1,8 +1,8 @@ import { useEffect, useState } from 'react' -import { Maybe, Nullable } from '@audius/common' import { useAppContext } from '@audius/common/context' import { SquareSizes, UserCollectionMetadata } from '@audius/common/models' +import { Nullable, Maybe } from '@audius/common/utils' import { StorageNodeSelectorService } from '@audius/sdk' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useSpring, animated } from 'react-spring' diff --git a/packages/web/src/services/analytics/amplitude.ts b/packages/web/src/services/analytics/amplitude.ts index 4798a4d0ecb..6c49278c929 100644 --- a/packages/web/src/services/analytics/amplitude.ts +++ b/packages/web/src/services/analytics/amplitude.ts @@ -1,5 +1,5 @@ -import { Nullable } from '@audius/common' import { Name, MobileOS } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' // Amplitude Analytics import amplitude from 'amplitude-js' diff --git a/packages/web/src/services/analytics/index.ts b/packages/web/src/services/analytics/index.ts index 3969f45374d..06f2342dff5 100644 --- a/packages/web/src/services/analytics/index.ts +++ b/packages/web/src/services/analytics/index.ts @@ -1,5 +1,5 @@ -import { Nullable } from '@audius/common' import { AnalyticsEvent, AllTrackingEvents } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { env } from 'services/env' import { remoteConfigInstance } from 'services/remote-config/remote-config-instance' diff --git a/packages/web/src/services/audius-backend/Jupiter.ts b/packages/web/src/services/audius-backend/Jupiter.ts index d3a020184f3..62cf95b0c9f 100644 --- a/packages/web/src/services/audius-backend/Jupiter.ts +++ b/packages/web/src/services/audius-backend/Jupiter.ts @@ -1,8 +1,5 @@ -import { - JupiterTokenSymbol, - TOKEN_LISTING_MAP, - convertBigIntToAmountObject -} from '@audius/common' +import { JupiterTokenSymbol, TOKEN_LISTING_MAP } from '@audius/common' +import { convertBigIntToAmountObject } from '@audius/common/utils' import { TransactionHandler } from '@audius/sdk/dist/core' import { createJupiterApiClient, Instruction, QuoteResponse } from '@jup-ag/api' import { PublicKey, TransactionInstruction } from '@solana/web3.js' diff --git a/packages/web/src/services/web3-modal/index.ts b/packages/web/src/services/web3-modal/index.ts index 9192c54dd74..f8ad2af6315 100644 --- a/packages/web/src/services/web3-modal/index.ts +++ b/packages/web/src/services/web3-modal/index.ts @@ -1,4 +1,4 @@ -import { getErrorMessage } from '@audius/common' +import { getErrorMessage } from '@audius/common/utils' import type { IProviderOptions } from 'web3modal' import phantomIconPurpleSvg from 'assets/img/phantom-icon-purple.svg' diff --git a/packages/web/src/ssr/SsrContext.tsx b/packages/web/src/ssr/SsrContext.tsx index c8f72a96c0b..5d38e11fab4 100644 --- a/packages/web/src/ssr/SsrContext.tsx +++ b/packages/web/src/ssr/SsrContext.tsx @@ -1,7 +1,7 @@ import { createContext, memo, useContext } from 'react' -import { Nullable } from '@audius/common' import { SsrPageProps } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' import { History } from 'history' import { isMobile as isMobileClient } from 'utils/clientUtil' diff --git a/packages/web/src/ssr/track/+onBeforeRender.tsx b/packages/web/src/ssr/track/+onBeforeRender.tsx index fe6f8a745fe..49a2a323358 100644 --- a/packages/web/src/ssr/track/+onBeforeRender.tsx +++ b/packages/web/src/ssr/track/+onBeforeRender.tsx @@ -1,4 +1,5 @@ -import type { Maybe } from '@audius/common' +import { Maybe } from '@audius/common/utils' +import type {} from '@audius/common' import { sdk, full as FullSdk, diff --git a/packages/web/src/store/application/ui/buy-audio/sagas.ts b/packages/web/src/store/application/ui/buy-audio/sagas.ts index e74cf6dc508..4d72185268c 100644 --- a/packages/web/src/store/application/ui/buy-audio/sagas.ts +++ b/packages/web/src/store/application/ui/buy-audio/sagas.ts @@ -2,10 +2,6 @@ import { IntKeys, getContext, walletActions, - convertBigIntToAmountObject, - convertWAudioToWei, - formatWei, - weiToString, TOKEN_LISTING_MAP, buyAudioSelectors, PurchaseInfoErrorType, @@ -23,12 +19,18 @@ import { FeatureFlags, LocalStorage, solanaSelectors, - deriveUserBankPubkey, - convertWeiToWAudio, - isNullOrUndefined, - dayjs + deriveUserBankPubkey } from '@audius/common' import { Name, ErrorLevel, BNWei } from '@audius/common/models' +import { + dayjs, + isNullOrUndefined, + weiToString, + formatWei, + convertBigIntToAmountObject, + convertWAudioToWei, + convertWeiToWAudio +} from '@audius/common/utils' /* eslint-disable new-cap */ import { TransactionHandler } from '@audius/sdk/dist/core' import { QuoteResponse } from '@jup-ag/api' diff --git a/packages/web/src/store/application/ui/notifications/notificationsUISelectors.ts b/packages/web/src/store/application/ui/notifications/notificationsUISelectors.ts index c4bacf1d0c4..488efa429f4 100644 --- a/packages/web/src/store/application/ui/notifications/notificationsUISelectors.ts +++ b/packages/web/src/store/application/ui/notifications/notificationsUISelectors.ts @@ -1,8 +1,8 @@ import { AnnouncementNotification, - notificationsSelectors, - Nullable + notificationsSelectors } from '@audius/common' +import { Nullable } from '@audius/common/utils' import { AppState } from 'store/types' diff --git a/packages/web/src/store/application/ui/notifications/notificationsUISlice.ts b/packages/web/src/store/application/ui/notifications/notificationsUISlice.ts index 18da6ab237c..dc5260f82a8 100644 --- a/packages/web/src/store/application/ui/notifications/notificationsUISlice.ts +++ b/packages/web/src/store/application/ui/notifications/notificationsUISlice.ts @@ -1,4 +1,4 @@ -import { Nullable } from '@audius/common' +import { Nullable } from '@audius/common/utils' import { createSlice, PayloadAction } from '@reduxjs/toolkit' export type NotificationsUIState = { diff --git a/packages/web/src/store/application/ui/theme/sagas.ts b/packages/web/src/store/application/ui/theme/sagas.ts index 814c92c3bdc..3a12516cd17 100644 --- a/packages/web/src/store/application/ui/theme/sagas.ts +++ b/packages/web/src/store/application/ui/theme/sagas.ts @@ -1,5 +1,6 @@ -import { themeActions, actionChannelDispatcher } from '@audius/common' +import { themeActions } from '@audius/common' import { Theme } from '@audius/common/models' +import { actionChannelDispatcher } from '@audius/common/utils' import { PayloadAction } from '@reduxjs/toolkit' import { eventChannel } from 'redux-saga' import { spawn, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts index 25df9c4faf0..fcf6e9557c2 100644 --- a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts +++ b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts @@ -7,7 +7,6 @@ import { getUserbankAccountInfo, relayVersionedTransaction, relayTransaction, - formatUSDCWeiToFloorCentsNumber, withdrawUSDCModalActions, WithdrawUSDCModalPages, WithdrawMethod, @@ -21,6 +20,7 @@ import { BNUSDC, SolanaWalletAddress } from '@audius/common/models' +import { formatUSDCWeiToFloorCentsNumber } from '@audius/common/utils' import { createAssociatedTokenAccountInstruction, getAssociatedTokenAddressSync diff --git a/packages/web/src/store/errors/reportToSentry.ts b/packages/web/src/store/errors/reportToSentry.ts index 286ba36cf42..1d29992d969 100644 --- a/packages/web/src/store/errors/reportToSentry.ts +++ b/packages/web/src/store/errors/reportToSentry.ts @@ -1,5 +1,5 @@ -import { getErrorMessage } from '@audius/common' import { ErrorLevel, ReportToSentryArgs } from '@audius/common/models' +import { getErrorMessage } from '@audius/common/utils' import { withScope, captureException } from '@sentry/browser' import type { SeverityLevel } from '@sentry/types' diff --git a/packages/web/src/store/notifications/sagas.ts b/packages/web/src/store/notifications/sagas.ts index 3ace240634c..1e66f247e57 100644 --- a/packages/web/src/store/notifications/sagas.ts +++ b/packages/web/src/store/notifications/sagas.ts @@ -1,4 +1,5 @@ -import { accountSelectors, getContext, waitForValue } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common' +import { waitForValue } from '@audius/common/utils' import { eventChannel } from 'redux-saga' import { call, delay, fork, take } from 'typed-redux-saga' diff --git a/packages/web/src/store/token-dashboard/establishWalletConnection.ts b/packages/web/src/store/token-dashboard/establishWalletConnection.ts index 37a81cc09fb..1284b88b858 100644 --- a/packages/web/src/store/token-dashboard/establishWalletConnection.ts +++ b/packages/web/src/store/token-dashboard/establishWalletConnection.ts @@ -1,10 +1,10 @@ import { BooleanKeys, getContext, - getErrorMessage, tokenDashboardPageActions } from '@audius/common' import { Chain } from '@audius/common/models' +import { getErrorMessage } from '@audius/common/utils' import { call, put } from 'typed-redux-saga' import { createSession } from 'services/web3-modal' diff --git a/packages/web/src/store/token-dashboard/sagas.ts b/packages/web/src/store/token-dashboard/sagas.ts index 244d2aa6c42..98a61b092ad 100644 --- a/packages/web/src/store/token-dashboard/sagas.ts +++ b/packages/web/src/store/token-dashboard/sagas.ts @@ -1,11 +1,11 @@ import { - weiToString, tokenDashboardPageActions, TokenDashboardPageModalState, tokenDashboardPageSelectors, walletActions, modalsActions } from '@audius/common' +import { weiToString } from '@audius/common/utils' import { all, put, race, select, take, takeLatest } from 'typed-redux-saga' import commonTokenDashboardSagas from 'common/store/pages/token-dashboard/sagas' diff --git a/packages/web/src/utils/dateUtils.ts b/packages/web/src/utils/dateUtils.ts index ccfdc3b37d3..2d24a35313a 100644 --- a/packages/web/src/utils/dateUtils.ts +++ b/packages/web/src/utils/dateUtils.ts @@ -1,4 +1,4 @@ -import { getLocalTimezone } from '@audius/common' +import { getLocalTimezone } from '@audius/common/utils' import moment from 'moment' import { Nullable } from 'vitest' diff --git a/packages/web/src/utils/domUtils.ts b/packages/web/src/utils/domUtils.ts index 7a61506d738..080ea1fe17c 100644 --- a/packages/web/src/utils/domUtils.ts +++ b/packages/web/src/utils/domUtils.ts @@ -1,4 +1,4 @@ -import { Nullable } from '@audius/common' +import { Nullable } from '@audius/common/utils' export const findAncestor = (el: Element, selector: string) => { if (el.closest) { diff --git a/packages/web/src/utils/gdpr.ts b/packages/web/src/utils/gdpr.ts index c1d1182b5c2..742af00b117 100644 --- a/packages/web/src/utils/gdpr.ts +++ b/packages/web/src/utils/gdpr.ts @@ -1,4 +1,4 @@ -import { Nullable } from '@audius/common' +import { Nullable } from '@audius/common/utils' import { getLocation } from 'services/Location' import { env } from 'services/env' diff --git a/packages/web/src/utils/restrictedHandles.ts b/packages/web/src/utils/restrictedHandles.ts index 9e9145aa080..23a20656cc8 100644 --- a/packages/web/src/utils/restrictedHandles.ts +++ b/packages/web/src/utils/restrictedHandles.ts @@ -1,4 +1,4 @@ -import { restrictedHandles as commonRestrictedHandles } from '@audius/common' +import { restrictedHandles as commonRestrictedHandles } from '@audius/common/utils' import { orderedRoutes } from 'utils/route' diff --git a/packages/web/src/utils/route.ts b/packages/web/src/utils/route.ts index b567cfa1230..83e948aefa6 100644 --- a/packages/web/src/utils/route.ts +++ b/packages/web/src/utils/route.ts @@ -1,5 +1,6 @@ -import { Env, encodeUrlName, getHash } from '@audius/common' +import { Env } from '@audius/common' import { ID } from '@audius/common/models' +import { encodeUrlName, getHash } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { Location } from 'history' import { matchPath } from 'react-router' diff --git a/packages/web/src/utils/route/collectionRouteParser.ts b/packages/web/src/utils/route/collectionRouteParser.ts index 039135b5928..2afee2ff733 100644 --- a/packages/web/src/utils/route/collectionRouteParser.ts +++ b/packages/web/src/utils/route/collectionRouteParser.ts @@ -1,5 +1,5 @@ -import { decodeHashId } from '@audius/common' import { ID } from '@audius/common/models' +import { decodeHashId } from '@audius/common/utils' import { matchPath } from 'react-router-dom' import { diff --git a/packages/web/src/utils/route/trackRouteParser.ts b/packages/web/src/utils/route/trackRouteParser.ts index e0508f19c30..62a97456961 100644 --- a/packages/web/src/utils/route/trackRouteParser.ts +++ b/packages/web/src/utils/route/trackRouteParser.ts @@ -1,5 +1,5 @@ -import { decodeHashId } from '@audius/common' import { ID } from '@audius/common/models' +import { decodeHashId } from '@audius/common/utils' import { matchPath } from 'react-router-dom' import { TRACK_ID_PAGE, TRACK_PAGE } from 'utils/route' diff --git a/packages/web/src/utils/route/userRouteParser.ts b/packages/web/src/utils/route/userRouteParser.ts index 7937ce0401b..a3cc909b293 100644 --- a/packages/web/src/utils/route/userRouteParser.ts +++ b/packages/web/src/utils/route/userRouteParser.ts @@ -1,5 +1,6 @@ -import { decodeHashId, ProfilePageTabRoute } from '@audius/common' +import { ProfilePageTabRoute } from '@audius/common' import { ID } from '@audius/common/models' +import { decodeHashId } from '@audius/common/utils' import { matchPath } from 'react-router-dom' import { USER_ID_PAGE, PROFILE_PAGE, staticRoutes } from 'utils/route' diff --git a/packages/web/src/utils/sagaHelpers.ts b/packages/web/src/utils/sagaHelpers.ts index 10d6893675c..15f3002dd57 100644 --- a/packages/web/src/utils/sagaHelpers.ts +++ b/packages/web/src/utils/sagaHelpers.ts @@ -1,4 +1,4 @@ -import { waitForAccount } from '@audius/common' +import { waitForAccount } from '@audius/common/utils' import { call } from 'typed-redux-saga' import { waitForBackendSetup } from 'common/store/backend/sagas' diff --git a/packages/web/src/utils/tweet.ts b/packages/web/src/utils/tweet.ts index 99b1cdd1370..8bec5b7f685 100644 --- a/packages/web/src/utils/tweet.ts +++ b/packages/web/src/utils/tweet.ts @@ -1,4 +1,4 @@ -import { makeTwitterShareUrl } from '@audius/common' +import { makeTwitterShareUrl } from '@audius/common/utils' export const openTwitterLink = (url: string | null, text: string) => { const twitterShareLink = makeTwitterShareUrl(url, text) From 69eeee36f74b18f202c82aa36b23f7eac3f20826 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 16:01:36 -0800 Subject: [PATCH 33/64] Convert schemas in web --- packages/common/src/index.ts | 3 +- packages/convert-exports.js | 190 ++---------------- packages/get-type-exports.js | 2 +- .../cache/collections/createPlaylistSaga.ts | 7 +- .../token-dashboard/associateNewWallet.ts | 2 +- .../pages/token-dashboard/removeWalletSaga.ts | 2 +- .../src/components/data-entry/FormTile.jsx | 3 +- .../edit-playlist/mobile/EditPlaylistPage.tsx | 3 +- .../src/components/sign-on/EnterPassword.tsx | 2 +- .../src/components/track/EditTrackModal.jsx | 2 +- .../profile-page/ProfilePageProvider.tsx | 8 +- .../pages/sign-in-page/ConfirmEmailPage.tsx | 8 +- .../web/src/pages/sign-in-page/SignInPage.tsx | 2 +- .../sign-up-page/components/EmailField.tsx | 2 +- .../sign-up-page/components/HandleField.tsx | 3 +- .../PasswordCompletionChecklist.tsx | 2 +- .../sign-up-page/hooks/socialMediaLogin.ts | 2 +- .../sign-up-page/pages/CreateEmailPage.tsx | 3 +- .../sign-up-page/pages/CreateLoginDetails.tsx | 3 +- .../sign-up-page/pages/CreatePasswordPage.tsx | 2 +- .../sign-up-page/pages/FinishProfilePage.tsx | 3 +- .../sign-up-page/pages/PickHandlePage.tsx | 3 +- .../sign-up-page/pages/ReviewHandlePage.tsx | 3 +- .../sign-up-page/pages/SelectArtistsPage.tsx | 7 +- .../sign-up-page/pages/SelectGenresPage.tsx | 7 +- .../sign-up-page/utils/loginDetailsSchema.ts | 4 +- .../pages/upload-page/pages/SelectPage.tsx | 8 +- .../upload-page/store/utils/processFiles.ts | 2 +- 28 files changed, 80 insertions(+), 208 deletions(-) diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 9a1aae2a8aa..8227b75c972 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,8 +1,7 @@ -import * as e from './utils' +import * as e from './schemas' console.log('exports', Object.keys(e)) export * from './audius-query' export * from './services' export * from './store' -export * from './schemas' export * from './assets' diff --git a/packages/convert-exports.js b/packages/convert-exports.js index c940607ecd6..f01f6e2111e 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -7,176 +7,26 @@ var getDirectories = function (callback) { const DIRECTORY = 'utils' const EXPORTS = [ - 'creativeCommons', - 'dayjs', - 'Dayjs', - 'allSettled', - 'Permission', - 'isAccountCollection', - 'filterCollections', - 'filterDecimalString', - 'padDecimalValue', - 'decimalIntegerToHumanReadable', - 'decimalIntegerFromHumanReadable', - 'toErrorWithMessage', - 'getErrorMessage', - 'fillString', - 'formatCount', - 'formatCurrencyBalance', - 'formatBytes', - 'formatUrlName', - 'encodeUrlName', - 'formatShareText', - 'squashNewLines', - 'trimToAlphaNumeric', - 'pluralize', - 'formatAudio', - 'formatWeiToAudioString', - 'formatNumberCommas', - 'formatPrice', - 'trimRightZeros', - 'AUDIO_DIVISOR', - 'WEI_DIVISOR', - 'USDC_DIVISOR', - 'checkOnlyNumeric', - 'checkOnlyWeiFloat', - 'convertFloatToWei', - 'checkWeiNumber', - 'parseWeiNumber', - 'formatNumberString', - 'formatCapitalizeString', - 'formatMessageDate', - 'getHash', - 'Genre', - 'ELECTRONIC_PREFIX', - 'ELECTRONIC_SUBGENRES', - 'getCanonicalName', - 'GENRES', - 'convertGenreLabelToValue', - 'TRENDING_GENRES', - 'decodeHashId', - 'encodeHashId', - 'Timer', - 'makeReducer', - 'shallowCompare', - 'areSetsEqual', - 'createShallowSelector', - 'createDeepEqualSelector', - 'formatSeconds', - 'formatSecondsAsText', - 'formatLineupTileDuration', - 'formatDate', - 'formatDateWithTimezoneOffset', - 'utcToLocalTime', - 'getLocalTimezone', - 'wait', - 'removeNullable', - 'isNullOrUndefined', - 'externalAudiusLinks', - 'isAudiusUrl', - 'isInteralAudiusUrl', - 'isExternalAudiusUrl', - 'getPathFromAudiusUrl', - 'isCollectionUrl', - 'getPathFromPlaylistUrl', - 'isTrackUrl', - 'getPathFromTrackUrl', - 'Uid', - 'makeUids', - 'makeUid', - 'makeKindId', - 'getIdFromKindId', - 'getKindFromKindId', - 'uuid', - 'getAAOErrorEmojis', - 'zeroBNWei', - 'weiToAudioString', - 'weiToAudio', - 'audioToWei', - 'stringWeiToBN', - 'stringUSDCToBN', - 'stringAudioToBN', - 'stringWeiToAudioBN', - 'weiToString', - 'stringAudioToStringWei', - 'parseAudioInputToWei', - 'formatWei', - 'convertBigIntToAmountObject', - 'convertWAudioToWei', - 'convertWeiToWAudio', - 'BN_USDC_WEI', - 'BN_USDC_CENT_WEI', - 'ceilingBNUSDCToNearestCent', - 'floorBNUSDCToNearestCent', - 'formatUSDCWeiToUSDString', - 'formatUSDCWeiToCeilingDollarNumber', - 'formatUSDCWeiToCeilingCentsNumber', - 'formatUSDCWeiToFloorDollarNumber', - 'formatUSDCWeiToFloorCentsNumber', - 'shortenSPLAddress', - 'shortenEthAddress', - 'batchYield', - 'actionChannelDispatcher', - 'channelCanceller', - 'waitForValue', - 'doEvery', - 'waitForAccount', - 'waitForRead', - 'dataURLtoFile', - 'MAX_PROFILE_TOP_SUPPORTERS', - 'MAX_PROFILE_RELATED_ARTISTS', - 'MAX_PROFILE_SUPPORTING_TILES', - 'MAX_ARTIST_HOVER_TOP_SUPPORTING', - 'SUPPORTING_PAGINATION_SIZE', - 'MESSAGE_GROUP_THRESHOLD_MINUTES', - 'paramsToQueryString', - 'parseTrackRouteFromPermalink', - 'parsePlaylistIdFromPermalink', - 'parseIntList', - 'challengeRewardsConfig', - 'makeChallengeSortComparator', - 'makeOptimisticChallengeSortComparator', - 'isAudioMatchingChallenge', - 'isCooldownChallengeClaimable', - 'getClaimableChallengeSpecifiers', - 'interleave', - 'CHAT_BLOG_POST_URL', - 'hasTail', - 'isEarliestUnread', - 'chatCanFetchMoreMessages', - 'makeTwitterShareUrl', - 'generateUserSignature', - 'getQueryParams', - 'getTrackPreviewDuration', - 'getDogEarType', - 'ALLOWED_MAX_AUDIO_SIZE_BYTES', - 'ALLOWED_AUDIO_FILE_EXTENSIONS', - 'ALLOWED_AUDIO_FILE_MIME', - 'updatePlaylistArtwork', - 'externalLinkAllowList', - 'isAllowedExternalLink', - 'makeSolanaTransactionLink', - 'promiseWithTimeout', - 'parseHandleReservedStatusFromSocial', - 'EMAIL_REGEX', - 'isValidEmailString', - 'commonPasswordCheck', - 'isNotCommonPassword', - 'restrictedHandles', - 'ChallengeRewardsInfo', - 'License', - 'DecimalUtilOptions', - 'HandleCheckStatus', - 'Recording', - 'ActionsMap', - 'NestedNonNullable', - 'Nullable', - 'DeepNullable', - 'Overwrite', - 'Maybe', - 'Brand', - 'ValueOf', - 'Prettify' + 'newTrackMetadata', + 'newCollectionMetadata', + 'newUserMetadata', + 'createRemixOfMetadata', + 'emailSchemaMessages', + 'emailSchema', + 'passwordSchema', + 'pickHandleErrorMessages', + 'pickHandleSchema', + 'finishProfileSchema', + 'selectableGenres', + 'selectGenresSchema', + 'createLoginDetailsSchema', + 'selectArtistsSchema', + 'messages', + 'signInSchema', + 'signInErrorMessages', + 'confirmEmailSchema', + 'formatOtp', + 'confirmEmailErrorMessages' ] getDirectories(async function (err, res) { diff --git a/packages/get-type-exports.js b/packages/get-type-exports.js index c4b9ba852e3..15cf4e6c8bb 100644 --- a/packages/get-type-exports.js +++ b/packages/get-type-exports.js @@ -2,7 +2,7 @@ const glob = require('glob') const fs = require('fs') var getDirectories = function (callback) { - glob('./common/dist/utils/**/*', callback) + glob('./common/dist/schemas/**/*', callback) } getDirectories(async function (err, res) { diff --git a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts index d54de3cdf3b..b8252f43dac 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts @@ -8,7 +8,6 @@ import { cacheCollectionsSelectors, cacheTracksSelectors, getContext, - newCollectionMetadata, confirmerActions, confirmTransaction, RequestConfirmationError, @@ -25,7 +24,11 @@ import { ID, Track } from '@audius/common/models' -import { makeKindId, Nullable } from '@audius/common/utils' +import { + newCollectionMetadata, + makeKindId, + Nullable +} from '@audius/common/utils' import { call, put, select, takeLatest } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts index 1b065a0d413..fd272dcf359 100644 --- a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts @@ -1,11 +1,11 @@ import { accountSelectors, getContext, - newUserMetadata, tokenDashboardPageActions, tokenDashboardPageSelectors } from '@audius/common' import { Name, Chain } from '@audius/common/models' +import { newUserMetadata } from '@audius/common/utils' import { call, put, select } from 'typed-redux-saga' const { getAccountUser } = accountSelectors diff --git a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts index ce5d812d76d..b79fe86b18e 100644 --- a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts +++ b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts @@ -4,12 +4,12 @@ import { confirmerActions, ConfirmRemoveWalletAction, getContext, - newUserMetadata, tokenDashboardPageActions, walletActions, confirmTransaction } from '@audius/common' import { Chain, Kind } from '@audius/common/models' +import { newUserMetadata } from '@audius/common/utils' import { call, fork, put, select, takeLatest } from 'typed-redux-saga' import { diff --git a/packages/web/src/components/data-entry/FormTile.jsx b/packages/web/src/components/data-entry/FormTile.jsx index ff674a8cef8..8de0d89183f 100644 --- a/packages/web/src/components/data-entry/FormTile.jsx +++ b/packages/web/src/components/data-entry/FormTile.jsx @@ -1,7 +1,8 @@ import { Component, useState, useCallback } from 'react' -import { createRemixOfMetadata, FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common' import { + createRemixOfMetadata, creativeCommons, getCanonicalName, GENRES, diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index b9b58c42f59..cd16b2f6520 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -6,14 +6,13 @@ import { cacheCollectionsActions, collectionPageLineupActions as tracksActions, imageBlank as placeholderCoverArt, - newCollectionMetadata, EditPlaylistValues, cacheCollectionsSelectors, useEditPlaylistModal } from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' import { SquareSizes, Collection, ID } from '@audius/common/models' -import { Nullable } from '@audius/common/utils' +import { newCollectionMetadata, Nullable } from '@audius/common/utils' import { capitalize } from 'lodash' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/sign-on/EnterPassword.tsx b/packages/web/src/components/sign-on/EnterPassword.tsx index dc99b760166..17ad1e90c59 100644 --- a/packages/web/src/components/sign-on/EnterPassword.tsx +++ b/packages/web/src/components/sign-on/EnterPassword.tsx @@ -1,4 +1,4 @@ -import { passwordSchema } from '@audius/common' +import { passwordSchema } from '@audius/common/utils' import { Button, Flex, IconArrowRight, IconComponent } from '@audius/harmony' import { Form, Formik } from 'formik' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/web/src/components/track/EditTrackModal.jsx b/packages/web/src/components/track/EditTrackModal.jsx index 8ee5f4d90d5..11ca6b40222 100644 --- a/packages/web/src/components/track/EditTrackModal.jsx +++ b/packages/web/src/components/track/EditTrackModal.jsx @@ -1,7 +1,7 @@ import { useState, useEffect, useCallback } from 'react' -import { newTrackMetadata } from '@audius/common' import { SquareSizes } from '@audius/common/models' +import { newTrackMetadata } from '@audius/common/utils' import { Modal, Button, ButtonSize, ButtonType } from '@audius/stems' import { mapValues } from 'lodash' import PropTypes from 'prop-types' diff --git a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx index 9b85632d5d9..73f3d540bc3 100644 --- a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx +++ b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx @@ -20,7 +20,6 @@ import { followingUserListActions, followersUserListActions, usersSocialActions as socialActions, - newUserMetadata, playerSelectors, queueSelectors, chatActions, @@ -39,7 +38,12 @@ import { ID, UID } from '@audius/common/models' -import { getErrorMessage, formatCount, Nullable } from '@audius/common/utils' +import { + newUserMetadata, + getErrorMessage, + formatCount, + Nullable +} from '@audius/common/utils' import { push as pushRoute, replace } from 'connected-react-router' import { UnregisterCallback } from 'history' import { uniq } from 'lodash' diff --git a/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx b/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx index fe9586c55f4..ef7c534101d 100644 --- a/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx +++ b/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx @@ -1,11 +1,11 @@ import { useCallback, useContext, useEffect, useState } from 'react' +import { confirmEmailMessages } from '@audius/common/messages' import { - confirmEmailErrorMessages, confirmEmailSchema, - formatOtp -} from '@audius/common' -import { confirmEmailMessages } from '@audius/common/messages' + formatOtp, + confirmEmailErrorMessages +} from '@audius/common/utils' import { Text, TextLink } from '@audius/harmony' import { Form, Formik, useField } from 'formik' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/sign-in-page/SignInPage.tsx b/packages/web/src/pages/sign-in-page/SignInPage.tsx index b0d85831072..5bc0159e583 100644 --- a/packages/web/src/pages/sign-in-page/SignInPage.tsx +++ b/packages/web/src/pages/sign-in-page/SignInPage.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect, useState } from 'react' -import { signInErrorMessages, signInSchema } from '@audius/common' import { signInPageMessages } from '@audius/common/messages' +import { signInSchema, signInErrorMessages } from '@audius/common/utils' import { Flex, IconAudiusLogoHorizontalColor, diff --git a/packages/web/src/pages/sign-up-page/components/EmailField.tsx b/packages/web/src/pages/sign-up-page/components/EmailField.tsx index 71ef97f4c7f..db44c15e76a 100644 --- a/packages/web/src/pages/sign-up-page/components/EmailField.tsx +++ b/packages/web/src/pages/sign-up-page/components/EmailField.tsx @@ -1,7 +1,7 @@ import { ChangeEvent } from 'react' -import { emailSchemaMessages } from '@audius/common' import { createEmailPageMessages } from '@audius/common/messages' +import { emailSchemaMessages } from '@audius/common/utils' import { Hint, IconError, TextLink } from '@audius/harmony' import { useField, useFormikContext } from 'formik' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/components/HandleField.tsx b/packages/web/src/pages/sign-up-page/components/HandleField.tsx index d4dded34cb1..0150d026368 100644 --- a/packages/web/src/pages/sign-up-page/components/HandleField.tsx +++ b/packages/web/src/pages/sign-up-page/components/HandleField.tsx @@ -1,11 +1,12 @@ import { Ref, forwardRef, useCallback, useContext } from 'react' -import { MAX_HANDLE_LENGTH, pickHandleErrorMessages } from '@audius/common' +import { MAX_HANDLE_LENGTH } from '@audius/common' import { useIsWaitingForValidation } from '@audius/common/hooks' import { socialMediaMessages, pickHandlePageMessages as messages } from '@audius/common/messages' +import { pickHandleErrorMessages } from '@audius/common/utils' import { TextLink } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx b/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx index ca4bc51d09f..f655adfaf04 100644 --- a/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx +++ b/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx @@ -1,8 +1,8 @@ -import { passwordSchema } from '@audius/common' import { createPasswordPageMessages, CompletionChecklistType } from '@audius/common/messages' +import { passwordSchema } from '@audius/common/utils' import { CompletionCheck, Flex, Text } from '@audius/harmony' import { useField } from 'formik' import { useAsync } from 'react-use' diff --git a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts index 2af05945b89..05f1f0da493 100644 --- a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts +++ b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts @@ -6,11 +6,11 @@ import { formatTikTokProfile, formatTwitterProfile, InstagramProfile, - pickHandleSchema, TikTokProfile, TwitterProfile } from '@audius/common' import { Name } from '@audius/common/models' +import { pickHandleSchema } from '@audius/common/utils' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx index c3de2125733..229b8794eff 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx @@ -1,7 +1,8 @@ import { useCallback, useMemo } from 'react' -import { emailSchema, useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' import { createEmailPageMessages } from '@audius/common/messages' +import { emailSchema } from '@audius/common/utils' import { Box, Button, diff --git a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx index c9eff8331ea..a352ec24cc9 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx @@ -1,7 +1,8 @@ import { useCallback, useMemo } from 'react' -import { emailSchema, useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' import { createLoginDetailsPageMessages } from '@audius/common/messages' +import { emailSchema } from '@audius/common/utils' import { Flex, IconVerified, useTheme } from '@audius/harmony' import { Form, Formik, useField } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx b/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx index 81eb3915c90..fa349739790 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx @@ -1,7 +1,7 @@ import { useCallback, useRef } from 'react' -import { passwordSchema } from '@audius/common' import { createPasswordPageMessages } from '@audius/common/messages' +import { passwordSchema } from '@audius/common/utils' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx index 4d03e6e18e5..8918722629f 100644 --- a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx @@ -1,8 +1,9 @@ import { useCallback, useRef } from 'react' -import { MAX_DISPLAY_NAME_LENGTH, finishProfileSchema } from '@audius/common' +import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' +import { finishProfileSchema } from '@audius/common/utils' import { Flex, Paper, PlainButton, Text, useTheme } from '@audius/harmony' import { Formik, Form, useField, useFormikContext } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx index d1d3141149f..228f0afdd68 100644 --- a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx @@ -1,10 +1,11 @@ import { useCallback, useContext, useMemo, useRef } from 'react' -import { pickHandleSchema, AudiusQueryContext } from '@audius/common' +import { AudiusQueryContext } from '@audius/common' import { pickHandlePageMessages, socialMediaMessages } from '@audius/common/messages' +import { pickHandleSchema } from '@audius/common/utils' import { Divider, Flex, IconVerified, Paper, Text } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx b/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx index 8f03ad358c8..82b02699088 100644 --- a/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx @@ -1,6 +1,7 @@ import { useCallback, useMemo } from 'react' -import { useAudiusQueryContext, pickHandleSchema } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' +import { pickHandleSchema } from '@audius/common/utils' import { Paper, useTheme } from '@audius/harmony' import { Formik, Form } from 'formik' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx index ffd02c5e3f4..09c7ae5512d 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx @@ -1,14 +1,17 @@ import { useCallback, useRef, useState } from 'react' import type { ChangeEvent } from 'react' -import { selectArtistsSchema } from '@audius/common' import { useGetTopArtistsInGenre, useGetFeaturedArtists } from '@audius/common/api' import { selectArtistsPageMessages } from '@audius/common/messages' import { Status } from '@audius/common/models' -import { Genre, convertGenreLabelToValue } from '@audius/common/utils' +import { + selectArtistsSchema, + Genre, + convertGenreLabelToValue +} from '@audius/common/utils' import { Flex, Text, SelectablePill, Paper, useTheme } from '@audius/harmony' import { useSpring, animated } from '@react-spring/web' import { Form, Formik } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx index 16401bd3bed..300bffc9567 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx @@ -1,9 +1,12 @@ import { MouseEventHandler, useCallback, useState } from 'react' -import { selectGenresSchema, selectableGenres } from '@audius/common' import { selectGenresPageMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' -import { Genre } from '@audius/common/utils' +import { + selectableGenres, + selectGenresSchema, + Genre +} from '@audius/common/utils' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts b/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts index fd8d5b5c167..0860ef19cc9 100644 --- a/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts +++ b/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts @@ -1,5 +1,5 @@ -import { AudiusQueryContextType, emailSchema } from '@audius/common' -import { isNotCommonPassword } from '@audius/common/utils' +import { AudiusQueryContextType } from '@audius/common' +import { emailSchema, isNotCommonPassword } from '@audius/common/utils' import { z } from 'zod' // Due to issue with zod merge, manually rewriting diff --git a/packages/web/src/pages/upload-page/pages/SelectPage.tsx b/packages/web/src/pages/upload-page/pages/SelectPage.tsx index 3082c6480fc..fc7d1c9c0f0 100644 --- a/packages/web/src/pages/upload-page/pages/SelectPage.tsx +++ b/packages/web/src/pages/upload-page/pages/SelectPage.tsx @@ -1,7 +1,11 @@ import { useCallback, useState } from 'react' -import { UploadType, newCollectionMetadata, FeatureFlags } from '@audius/common' -import { removeNullable, Nullable } from '@audius/common/utils' +import { UploadType, FeatureFlags } from '@audius/common' +import { + newCollectionMetadata, + removeNullable, + Nullable +} from '@audius/common/utils' import { Box } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/pages/upload-page/store/utils/processFiles.ts b/packages/web/src/pages/upload-page/store/utils/processFiles.ts index 8f948658c57..b87c406e222 100644 --- a/packages/web/src/pages/upload-page/store/utils/processFiles.ts +++ b/packages/web/src/pages/upload-page/store/utils/processFiles.ts @@ -1,5 +1,5 @@ -import { newTrackMetadata } from '@audius/common' import { + newTrackMetadata, ALLOWED_MAX_AUDIO_SIZE_BYTES, ALLOWED_AUDIO_FILE_EXTENSIONS, ALLOWED_AUDIO_FILE_MIME From e1b05e01a63845ac5d9439a6ba57f724e841abad Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 16:08:18 -0800 Subject: [PATCH 34/64] Fix "Convert schemas in web" --- packages/common/package.json | 3 ++- packages/convert-exports.js | 2 +- .../common/store/cache/collections/createPlaylistSaga.ts | 7 ++----- .../store/pages/token-dashboard/associateNewWallet.ts | 2 +- .../store/pages/token-dashboard/removeWalletSaga.ts | 2 +- packages/web/src/components/data-entry/FormTile.jsx | 2 +- .../components/edit-playlist/mobile/EditPlaylistPage.tsx | 3 ++- packages/web/src/components/sign-on/EnterPassword.tsx | 2 +- packages/web/src/components/track/EditTrackModal.jsx | 2 +- .../web/src/pages/profile-page/ProfilePageProvider.tsx | 8 ++------ packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx | 2 +- packages/web/src/pages/sign-in-page/SignInPage.tsx | 2 +- .../web/src/pages/sign-up-page/components/EmailField.tsx | 2 +- .../web/src/pages/sign-up-page/components/HandleField.tsx | 2 +- .../components/PasswordCompletionChecklist.tsx | 2 +- .../web/src/pages/sign-up-page/hooks/socialMediaLogin.ts | 2 +- .../web/src/pages/sign-up-page/pages/CreateEmailPage.tsx | 2 +- .../src/pages/sign-up-page/pages/CreateLoginDetails.tsx | 2 +- .../src/pages/sign-up-page/pages/CreatePasswordPage.tsx | 2 +- .../src/pages/sign-up-page/pages/FinishProfilePage.tsx | 2 +- .../web/src/pages/sign-up-page/pages/PickHandlePage.tsx | 2 +- .../web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx | 2 +- .../src/pages/sign-up-page/pages/SelectArtistsPage.tsx | 7 ++----- .../web/src/pages/sign-up-page/pages/SelectGenresPage.tsx | 7 ++----- .../src/pages/sign-up-page/utils/loginDetailsSchema.ts | 3 ++- packages/web/src/pages/upload-page/pages/SelectPage.tsx | 7 ++----- .../web/src/pages/upload-page/store/utils/processFiles.ts | 2 +- 27 files changed, 35 insertions(+), 48 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 221ba986333..2434fdda607 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -14,7 +14,8 @@ "./context": "./src/context/index.ts", "./api": "./src/api/index.ts", "./models": "./src/models/index.ts", - "./utils": "./src/utils/index.ts" + "./utils": "./src/utils/index.ts", + "./schemas": "./src/schemas/index.ts" }, "repository": { "type": "git", diff --git a/packages/convert-exports.js b/packages/convert-exports.js index f01f6e2111e..38f488170dd 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -5,7 +5,7 @@ var getDirectories = function (callback) { glob('./web/src/**/*', callback) } -const DIRECTORY = 'utils' +const DIRECTORY = 'schemas' const EXPORTS = [ 'newTrackMetadata', 'newCollectionMetadata', diff --git a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts index b8252f43dac..641f3f5ef54 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts @@ -24,11 +24,8 @@ import { ID, Track } from '@audius/common/models' -import { - newCollectionMetadata, - makeKindId, - Nullable -} from '@audius/common/utils' +import { newCollectionMetadata } from '@audius/common/schemas' +import { makeKindId, Nullable } from '@audius/common/utils' import { call, put, select, takeLatest } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts index fd272dcf359..fcf8da9aa5c 100644 --- a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts @@ -5,7 +5,7 @@ import { tokenDashboardPageSelectors } from '@audius/common' import { Name, Chain } from '@audius/common/models' -import { newUserMetadata } from '@audius/common/utils' +import { newUserMetadata } from '@audius/common/schemas' import { call, put, select } from 'typed-redux-saga' const { getAccountUser } = accountSelectors diff --git a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts index b79fe86b18e..3ae8a04878b 100644 --- a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts +++ b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts @@ -9,7 +9,7 @@ import { confirmTransaction } from '@audius/common' import { Chain, Kind } from '@audius/common/models' -import { newUserMetadata } from '@audius/common/utils' +import { newUserMetadata } from '@audius/common/schemas' import { call, fork, put, select, takeLatest } from 'typed-redux-saga' import { diff --git a/packages/web/src/components/data-entry/FormTile.jsx b/packages/web/src/components/data-entry/FormTile.jsx index 8de0d89183f..7eb0f706b5b 100644 --- a/packages/web/src/components/data-entry/FormTile.jsx +++ b/packages/web/src/components/data-entry/FormTile.jsx @@ -1,8 +1,8 @@ import { Component, useState, useCallback } from 'react' import { FeatureFlags } from '@audius/common' +import { createRemixOfMetadata } from '@audius/common/schemas' import { - createRemixOfMetadata, creativeCommons, getCanonicalName, GENRES, diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index cd16b2f6520..f292c718c1b 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -12,7 +12,8 @@ import { } from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' import { SquareSizes, Collection, ID } from '@audius/common/models' -import { newCollectionMetadata, Nullable } from '@audius/common/utils' +import { newCollectionMetadata } from '@audius/common/schemas' +import { Nullable } from '@audius/common/utils' import { capitalize } from 'lodash' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/sign-on/EnterPassword.tsx b/packages/web/src/components/sign-on/EnterPassword.tsx index 17ad1e90c59..885b88df408 100644 --- a/packages/web/src/components/sign-on/EnterPassword.tsx +++ b/packages/web/src/components/sign-on/EnterPassword.tsx @@ -1,4 +1,4 @@ -import { passwordSchema } from '@audius/common/utils' +import { passwordSchema } from '@audius/common/schemas' import { Button, Flex, IconArrowRight, IconComponent } from '@audius/harmony' import { Form, Formik } from 'formik' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/web/src/components/track/EditTrackModal.jsx b/packages/web/src/components/track/EditTrackModal.jsx index 11ca6b40222..65aa97c756d 100644 --- a/packages/web/src/components/track/EditTrackModal.jsx +++ b/packages/web/src/components/track/EditTrackModal.jsx @@ -1,7 +1,7 @@ import { useState, useEffect, useCallback } from 'react' import { SquareSizes } from '@audius/common/models' -import { newTrackMetadata } from '@audius/common/utils' +import { newTrackMetadata } from '@audius/common/schemas' import { Modal, Button, ButtonSize, ButtonType } from '@audius/stems' import { mapValues } from 'lodash' import PropTypes from 'prop-types' diff --git a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx index 73f3d540bc3..88e1509d151 100644 --- a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx +++ b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx @@ -38,12 +38,8 @@ import { ID, UID } from '@audius/common/models' -import { - newUserMetadata, - getErrorMessage, - formatCount, - Nullable -} from '@audius/common/utils' +import { newUserMetadata } from '@audius/common/schemas' +import { getErrorMessage, formatCount, Nullable } from '@audius/common/utils' import { push as pushRoute, replace } from 'connected-react-router' import { UnregisterCallback } from 'history' import { uniq } from 'lodash' diff --git a/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx b/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx index ef7c534101d..d1576d8450d 100644 --- a/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx +++ b/packages/web/src/pages/sign-in-page/ConfirmEmailPage.tsx @@ -5,7 +5,7 @@ import { confirmEmailSchema, formatOtp, confirmEmailErrorMessages -} from '@audius/common/utils' +} from '@audius/common/schemas' import { Text, TextLink } from '@audius/harmony' import { Form, Formik, useField } from 'formik' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/sign-in-page/SignInPage.tsx b/packages/web/src/pages/sign-in-page/SignInPage.tsx index 5bc0159e583..e49fd934601 100644 --- a/packages/web/src/pages/sign-in-page/SignInPage.tsx +++ b/packages/web/src/pages/sign-in-page/SignInPage.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect, useState } from 'react' import { signInPageMessages } from '@audius/common/messages' -import { signInSchema, signInErrorMessages } from '@audius/common/utils' +import { signInSchema, signInErrorMessages } from '@audius/common/schemas' import { Flex, IconAudiusLogoHorizontalColor, diff --git a/packages/web/src/pages/sign-up-page/components/EmailField.tsx b/packages/web/src/pages/sign-up-page/components/EmailField.tsx index db44c15e76a..6210efb6728 100644 --- a/packages/web/src/pages/sign-up-page/components/EmailField.tsx +++ b/packages/web/src/pages/sign-up-page/components/EmailField.tsx @@ -1,7 +1,7 @@ import { ChangeEvent } from 'react' import { createEmailPageMessages } from '@audius/common/messages' -import { emailSchemaMessages } from '@audius/common/utils' +import { emailSchemaMessages } from '@audius/common/schemas' import { Hint, IconError, TextLink } from '@audius/harmony' import { useField, useFormikContext } from 'formik' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/components/HandleField.tsx b/packages/web/src/pages/sign-up-page/components/HandleField.tsx index 0150d026368..c6304782c3f 100644 --- a/packages/web/src/pages/sign-up-page/components/HandleField.tsx +++ b/packages/web/src/pages/sign-up-page/components/HandleField.tsx @@ -6,7 +6,7 @@ import { socialMediaMessages, pickHandlePageMessages as messages } from '@audius/common/messages' -import { pickHandleErrorMessages } from '@audius/common/utils' +import { pickHandleErrorMessages } from '@audius/common/schemas' import { TextLink } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx b/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx index f655adfaf04..d0b8a9f474e 100644 --- a/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx +++ b/packages/web/src/pages/sign-up-page/components/PasswordCompletionChecklist.tsx @@ -2,7 +2,7 @@ import { createPasswordPageMessages, CompletionChecklistType } from '@audius/common/messages' -import { passwordSchema } from '@audius/common/utils' +import { passwordSchema } from '@audius/common/schemas' import { CompletionCheck, Flex, Text } from '@audius/harmony' import { useField } from 'formik' import { useAsync } from 'react-use' diff --git a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts index 05f1f0da493..2b997d74f02 100644 --- a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts +++ b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts @@ -10,7 +10,7 @@ import { TwitterProfile } from '@audius/common' import { Name } from '@audius/common/models' -import { pickHandleSchema } from '@audius/common/utils' +import { pickHandleSchema } from '@audius/common/schemas' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx index 229b8794eff..11c02e2da8b 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx @@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react' import { useAudiusQueryContext } from '@audius/common' import { createEmailPageMessages } from '@audius/common/messages' -import { emailSchema } from '@audius/common/utils' +import { emailSchema } from '@audius/common/schemas' import { Box, Button, diff --git a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx index a352ec24cc9..47411a4a100 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx @@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react' import { useAudiusQueryContext } from '@audius/common' import { createLoginDetailsPageMessages } from '@audius/common/messages' -import { emailSchema } from '@audius/common/utils' +import { emailSchema } from '@audius/common/schemas' import { Flex, IconVerified, useTheme } from '@audius/harmony' import { Form, Formik, useField } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx b/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx index fa349739790..73adf0f30c4 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreatePasswordPage.tsx @@ -1,7 +1,7 @@ import { useCallback, useRef } from 'react' import { createPasswordPageMessages } from '@audius/common/messages' -import { passwordSchema } from '@audius/common/utils' +import { passwordSchema } from '@audius/common/schemas' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx index 8918722629f..38eaeb13ae7 100644 --- a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx @@ -3,7 +3,7 @@ import { useCallback, useRef } from 'react' import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' -import { finishProfileSchema } from '@audius/common/utils' +import { finishProfileSchema } from '@audius/common/schemas' import { Flex, Paper, PlainButton, Text, useTheme } from '@audius/harmony' import { Formik, Form, useField, useFormikContext } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx index 228f0afdd68..443435020ca 100644 --- a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx @@ -5,7 +5,7 @@ import { pickHandlePageMessages, socialMediaMessages } from '@audius/common/messages' -import { pickHandleSchema } from '@audius/common/utils' +import { pickHandleSchema } from '@audius/common/schemas' import { Divider, Flex, IconVerified, Paper, Text } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx b/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx index 82b02699088..fda06387898 100644 --- a/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx @@ -1,7 +1,7 @@ import { useCallback, useMemo } from 'react' import { useAudiusQueryContext } from '@audius/common' -import { pickHandleSchema } from '@audius/common/utils' +import { pickHandleSchema } from '@audius/common/schemas' import { Paper, useTheme } from '@audius/harmony' import { Formik, Form } from 'formik' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx index 09c7ae5512d..ebd10221f4a 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectArtistsPage.tsx @@ -7,11 +7,8 @@ import { } from '@audius/common/api' import { selectArtistsPageMessages } from '@audius/common/messages' import { Status } from '@audius/common/models' -import { - selectArtistsSchema, - Genre, - convertGenreLabelToValue -} from '@audius/common/utils' +import { selectArtistsSchema } from '@audius/common/schemas' +import { Genre, convertGenreLabelToValue } from '@audius/common/utils' import { Flex, Text, SelectablePill, Paper, useTheme } from '@audius/harmony' import { useSpring, animated } from '@react-spring/web' import { Form, Formik } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx index 300bffc9567..6468f0347af 100644 --- a/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/SelectGenresPage.tsx @@ -2,11 +2,8 @@ import { MouseEventHandler, useCallback, useState } from 'react' import { selectGenresPageMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' -import { - selectableGenres, - selectGenresSchema, - Genre -} from '@audius/common/utils' +import { selectableGenres, selectGenresSchema } from '@audius/common/schemas' +import { Genre } from '@audius/common/utils' import { Flex } from '@audius/harmony' import { Form, Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts b/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts index 0860ef19cc9..2f521bc30df 100644 --- a/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts +++ b/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts @@ -1,5 +1,6 @@ import { AudiusQueryContextType } from '@audius/common' -import { emailSchema, isNotCommonPassword } from '@audius/common/utils' +import { emailSchema } from '@audius/common/schemas' +import { isNotCommonPassword } from '@audius/common/utils' import { z } from 'zod' // Due to issue with zod merge, manually rewriting diff --git a/packages/web/src/pages/upload-page/pages/SelectPage.tsx b/packages/web/src/pages/upload-page/pages/SelectPage.tsx index fc7d1c9c0f0..0eb8c2555c8 100644 --- a/packages/web/src/pages/upload-page/pages/SelectPage.tsx +++ b/packages/web/src/pages/upload-page/pages/SelectPage.tsx @@ -1,11 +1,8 @@ import { useCallback, useState } from 'react' import { UploadType, FeatureFlags } from '@audius/common' -import { - newCollectionMetadata, - removeNullable, - Nullable -} from '@audius/common/utils' +import { newCollectionMetadata } from '@audius/common/schemas' +import { removeNullable, Nullable } from '@audius/common/utils' import { Box } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/pages/upload-page/store/utils/processFiles.ts b/packages/web/src/pages/upload-page/store/utils/processFiles.ts index b87c406e222..b62faa57d24 100644 --- a/packages/web/src/pages/upload-page/store/utils/processFiles.ts +++ b/packages/web/src/pages/upload-page/store/utils/processFiles.ts @@ -1,5 +1,5 @@ +import { newTrackMetadata } from '@audius/common/schemas' import { - newTrackMetadata, ALLOWED_MAX_AUDIO_SIZE_BYTES, ALLOWED_AUDIO_FILE_EXTENSIONS, ALLOWED_AUDIO_FILE_MIME From 28140c425b6ec30e1b6bcda39051e5c2cad9f78c Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 16:11:39 -0800 Subject: [PATCH 35/64] Convert mobile schemas --- packages/mobile/e2e/signUp.test.ts | 2 +- .../edit-track-screen/screens/RemixSettingsScreen.tsx | 7 ++----- .../screens/sign-on-screen/components/EmailInUseHint.tsx | 2 +- .../screens/sign-on-screen/components/NewEmailField.tsx | 3 ++- .../components/PasswordCompletionChecklist.tsx | 2 +- .../sign-on-screen/components/SignUpFlowInstagramAuth.tsx | 3 ++- .../sign-on-screen/components/SignUpFlowTikTokAuth.tsx | 2 +- .../sign-on-screen/components/SignUpFlowTwitterAuth.tsx | 7 ++----- .../screens/sign-on-screen/screens/ConfirmEmailScreen.tsx | 8 ++++---- .../screens/sign-on-screen/screens/CreateEmailScreen.tsx | 3 ++- .../sign-on-screen/screens/CreateLoginDetailsScreen.tsx | 7 ++----- .../sign-on-screen/screens/CreatePasswordScreen.tsx | 2 +- .../sign-on-screen/screens/FinishProfileScreen.tsx | 3 ++- .../screens/sign-on-screen/screens/PickHandleScreen.tsx | 3 ++- .../screens/sign-on-screen/screens/ReviewHandleScreen.tsx | 3 ++- .../screens/sign-on-screen/screens/SelectGenresScreen.tsx | 2 +- .../src/screens/sign-on-screen/screens/SignInScreen.tsx | 2 +- .../src/screens/upload-screen/utils/processTrackFile.ts | 2 +- 18 files changed, 30 insertions(+), 33 deletions(-) diff --git a/packages/mobile/e2e/signUp.test.ts b/packages/mobile/e2e/signUp.test.ts index 505d14c1768..3867cc727f3 100644 --- a/packages/mobile/e2e/signUp.test.ts +++ b/packages/mobile/e2e/signUp.test.ts @@ -1,4 +1,4 @@ -import { dayjs } from '@audius/common' +import { dayjs } from '@audius/common/utils' import { device, expect } from 'detox' import { random } from 'lodash' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx index ba247d59333..74cbb61eefc 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx @@ -1,10 +1,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import { - createRemixOfMetadata, - remixSettingsActions, - remixSettingsSelectors -} from '@audius/common' +import { remixSettingsActions, remixSettingsSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { Status, @@ -12,6 +8,7 @@ import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import { createRemixOfMetadata } from '@audius/common/schemas' import type { Nullable } from '@audius/common/utils' import { useFocusEffect } from '@react-navigation/native' import { useField } from 'formik' diff --git a/packages/mobile/src/screens/sign-on-screen/components/EmailInUseHint.tsx b/packages/mobile/src/screens/sign-on-screen/components/EmailInUseHint.tsx index 5a0d99993e5..ad08b92c433 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/EmailInUseHint.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/EmailInUseHint.tsx @@ -1,5 +1,5 @@ -import { emailSchemaMessages } from '@audius/common' import { createEmailPageMessages } from '@audius/common/messages' +import { emailSchemaMessages } from '@audius/common/schemas' import { Hint, IconError, Text, TextLink } from '@audius/harmony-native' diff --git a/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx b/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx index a9965a68a99..4e56b0513df 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx @@ -1,4 +1,5 @@ -import { emailSchemaMessages } from '@audius/common' +import { emailSchemaMessages } from '@audius/common/schemas' +import {} from '@audius/common' import { useField, useFormikContext } from 'formik' import { usePrevious } from 'react-use' diff --git a/packages/mobile/src/screens/sign-on-screen/components/PasswordCompletionChecklist.tsx b/packages/mobile/src/screens/sign-on-screen/components/PasswordCompletionChecklist.tsx index 1ba6a688dcf..3f58175b8e0 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/PasswordCompletionChecklist.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/PasswordCompletionChecklist.tsx @@ -1,8 +1,8 @@ -import { passwordSchema } from '@audius/common' import { createPasswordPageMessages, type CompletionChecklistType } from '@audius/common/messages' +import { passwordSchema } from '@audius/common/schemas' import { useField } from 'formik' import { useAsync } from 'react-use' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx index 71f9c137760..c3703adb45a 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx @@ -1,8 +1,9 @@ import React, { useState } from 'react' -import { pickHandleSchema, useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' import { socialMediaMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' +import { pickHandleSchema } from '@audius/common/schemas' import * as signOnActions from 'common/store/pages/signon/actions' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx index d0d5a392a86..d69f21cf420 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx @@ -3,10 +3,10 @@ import { useEffect } from 'react' import { useAudiusQueryContext, type TikTokProfileData, - pickHandleSchema, formatTikTokProfile } from '@audius/common' import { Name } from '@audius/common/models' +import { pickHandleSchema } from '@audius/common/schemas' import type { GestureResponderEvent } from 'react-native' import { useDispatch, useSelector } from 'react-redux' import { restrictedHandles } from 'utils/restrictedHandles' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx index 63a64d75b90..d64bac67ec9 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx @@ -1,11 +1,8 @@ import React, { useState } from 'react' -import { - formatTwitterProfile, - pickHandleSchema, - useAudiusQueryContext -} from '@audius/common' +import { formatTwitterProfile, useAudiusQueryContext } from '@audius/common' import { socialMediaMessages } from '@audius/common/messages' +import { pickHandleSchema } from '@audius/common/schemas' import { useAsync } from 'react-use' import { SocialButton } from '@audius/harmony-native' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx index 27577cfa785..4c100f553df 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/ConfirmEmailScreen.tsx @@ -1,11 +1,11 @@ import { useCallback, useEffect, useState } from 'react' +import { confirmEmailMessages } from '@audius/common/messages' import { - confirmEmailErrorMessages, confirmEmailSchema, - formatOtp -} from '@audius/common' -import { confirmEmailMessages } from '@audius/common/messages' + formatOtp, + confirmEmailErrorMessages +} from '@audius/common/schemas' import { setValueField, signIn } from 'common/store/pages/signon/actions' import { getEmailField, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx index acc8fa7f519..4d3b961da7d 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx @@ -1,7 +1,8 @@ import { useCallback, useMemo } from 'react' -import { emailSchema, useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' import { createEmailPageMessages } from '@audius/common/messages' +import { emailSchema } from '@audius/common/schemas' import { setLinkedSocialOnFirstPage, setValueField, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx index a477d2cbe22..98caae17b1a 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx @@ -1,11 +1,8 @@ import { useCallback, useMemo } from 'react' -import { - createLoginDetailsSchema, - useAudiusQueryContext, - emailSchema -} from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' import { createLoginDetailsPageMessages } from '@audius/common/messages' +import { emailSchema, createLoginDetailsSchema } from '@audius/common/schemas' import { css } from '@emotion/native' import { setValueField } from 'audius-client/src/common/store/pages/signon/actions' import { diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx index db84827b721..bb66a45effa 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreatePasswordScreen.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import { passwordSchema } from '@audius/common' import { createPasswordPageMessages } from '@audius/common/messages' +import { passwordSchema } from '@audius/common/schemas' import { setValueField } from 'common/store/pages/signon/actions' import { Formik } from 'formik' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx index 941563d5d60..c570579ada9 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx @@ -1,8 +1,9 @@ import { useCallback } from 'react' -import { MAX_DISPLAY_NAME_LENGTH, finishProfileSchema } from '@audius/common' +import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common' import type { Image } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' +import { finishProfileSchema } from '@audius/common/schemas' import { css } from '@emotion/native' import { getHandleField, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx index 1c37c904bd3..8973b600c20 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx @@ -1,7 +1,8 @@ import { useCallback, useMemo } from 'react' -import { pickHandleSchema, useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' import { pickHandlePageMessages } from '@audius/common/messages' +import { pickHandleSchema } from '@audius/common/schemas' import { css } from '@emotion/native' import { getIsSocialConnected } from 'audius-client/src/common/store/pages/signon/selectors' import { diff --git a/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx index 911f7ee189f..86bcce8eabd 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx @@ -1,7 +1,8 @@ import { useCallback, useMemo } from 'react' -import { pickHandleSchema, useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' import { reviewHandlePageMessages } from '@audius/common/messages' +import { pickHandleSchema } from '@audius/common/schemas' import { setValueField } from 'audius-client/src/common/store/pages/signon/actions' import { getCoverPhotoField, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx index 781c10ef4e2..bdb69fe0847 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectGenresScreen.tsx @@ -1,7 +1,7 @@ import { memo, useCallback, useEffect, useState } from 'react' -import { selectGenresSchema, selectableGenres } from '@audius/common' import { selectGenresPageMessages } from '@audius/common/messages' +import { selectableGenres, selectGenresSchema } from '@audius/common/schemas' import type { GENRES } from '@audius/common/utils' import { setField } from 'common/store/pages/signon/actions' import { Formik, useField } from 'formik' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx index cc8338af111..0fc4225689c 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SignInScreen.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect } from 'react' -import { signInErrorMessages, signInSchema } from '@audius/common' import { signInPageMessages } from '@audius/common/messages' +import { signInSchema, signInErrorMessages } from '@audius/common/schemas' import { getEmailField, getPasswordField, diff --git a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts index de910ced291..ab33543fde2 100644 --- a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts +++ b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts @@ -1,5 +1,5 @@ import type { UploadTrack } from '@audius/common' -import { newTrackMetadata } from '@audius/common' +import { newTrackMetadata } from '@audius/common/schemas' import { ALLOWED_MAX_AUDIO_SIZE_BYTES, ALLOWED_AUDIO_FILE_EXTENSIONS, From 2dec819028fd9136f98b7aa7fff91c6c4b2bad9e Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 16:18:53 -0800 Subject: [PATCH 36/64] Convert services in web --- packages/common/package.json | 3 +- packages/common/src/index.ts | 3 +- packages/convert-exports.js | 139 +++++++++++++++--- packages/get-type-exports.js | 2 +- packages/web/src/app/App.tsx | 2 +- packages/web/src/app/web-player/WebPlayer.jsx | 5 +- .../web/src/common/store/account/sagas.js | 8 +- packages/web/src/common/store/cache/sagas.js | 5 +- .../store/cache/tracks/utils/reformat.ts | 2 +- packages/web/src/common/store/lineup/sagas.js | 3 +- .../store/notifications/fetchNotifications.ts | 3 +- .../src/common/store/notifications/sagas.ts | 7 +- .../common/store/pages/audio-rewards/sagas.ts | 14 +- .../store/pages/audio-rewards/store.test.ts | 3 +- .../common/store/pages/feed/lineup/sagas.ts | 2 +- .../web/src/common/store/pages/saved/sagas.ts | 3 +- .../common/store/pages/search-page/sagas.js | 4 +- .../src/common/store/pages/signon/sagas.js | 12 +- .../web/src/common/store/pages/track/sagas.js | 2 +- .../pages/trending-playlists/lineups/sagas.ts | 2 +- .../trending-underground/lineups/sagas.ts | 2 +- .../lineups/trending/retrieveTrending.ts | 2 +- packages/web/src/common/store/player/sagas.ts | 5 +- .../playlistUpdatesPollingDaemon.ts | 5 +- .../web/src/common/store/profile/sagas.js | 3 +- .../web/src/common/store/search-bar/sagas.ts | 3 +- .../src/common/store/social/tracks/sagas.ts | 5 +- .../web/src/common/store/tipping/sagas.ts | 12 +- .../src/common/store/ui/reactions/sagas.ts | 4 +- .../src/common/store/upload/sagaHelpers.ts | 8 +- .../common/store/user-list/mutuals/sagas.ts | 4 +- .../store/user-list/supporting/sagas.ts | 8 +- .../store/user-list/top-supporters/sagas.ts | 8 +- .../web/src/common/store/user-list/utils.ts | 3 +- packages/web/src/common/store/wallet/sagas.ts | 3 +- .../components/AmountInputPage.tsx | 4 +- .../collection/mobile/CollectionHeader.jsx | 3 +- .../src/components/data-entry/FormTile.jsx | 3 +- .../edit-playlist/mobile/EditPlaylistPage.tsx | 3 +- .../FeatureFlagOverrideModal.tsx | 3 +- .../components/feature-flag/FeatureFlag.tsx | 2 +- .../image-selection/ImageSelectionPopup.jsx | 3 +- .../web/src/components/menu/TrackMenu.tsx | 2 +- .../src/components/nav/desktop/NavHeader.tsx | 2 +- .../components/nav/desktop/NavPopupMenu.tsx | 3 +- .../web/src/components/nav/mobile/NavBar.tsx | 2 +- packages/web/src/components/notice/Notice.tsx | 2 +- .../src/components/now-playing/NowPlaying.tsx | 4 +- .../components/play-bar/desktop/PlayBar.jsx | 2 +- .../PremiumContentPurchaseModal.tsx | 4 +- .../components/PurchaseContentFormFields.tsx | 3 +- .../related-artists/RelatedArtists.tsx | 3 +- .../src/components/share-modal/ShareModal.tsx | 2 +- .../components/social-proof/SocialProof.tsx | 2 +- .../src/components/stat-banner/StatBanner.tsx | 2 +- .../components/tipping/tip-audio/SendTip.tsx | 5 +- .../tipping/tip-audio/TipAudioModal.tsx | 2 +- .../components/tipping/tip-audio/TipSent.tsx | 7 +- .../ConnectedMobileOverflowModal.tsx | 4 +- .../web/src/components/track/CardTitle.tsx | 2 +- .../src/components/track/GiantTrackTile.tsx | 2 +- .../src/components/track/PlayPauseButton.tsx | 2 +- .../components/track/desktop/TrackTile.tsx | 2 +- .../track/mobile/ConnectedPlaylistTile.tsx | 4 +- .../track/mobile/ConnectedTrackListItem.tsx | 4 +- .../track/mobile/ConnectedTrackTile.tsx | 4 +- .../src/components/upload/TrackPreviewNew.tsx | 2 +- .../web/src/components/upload/UploadChip.tsx | 3 +- .../withdraw-usdc-modal/WithdrawUSDCModal.tsx | 5 +- .../components/EnterTransferDetails.tsx | 4 +- .../useIsAudioMatchingChallengesEnabled.ts | 2 +- packages/web/src/hooks/useIsUSDCEnabled.ts | 2 +- .../audio-rewards-page/AudioRewardsPage.tsx | 8 +- .../ChallengeRewardsTile.tsx | 2 +- .../TrendingRewardsTile.tsx | 3 +- .../pages/audio-rewards-page/WalletModal.tsx | 2 +- .../components/ReceiveBody.tsx | 2 +- .../components/SendInputBody.tsx | 6 +- .../components/WalletManagementTile.tsx | 6 +- .../components/modals/TrendingRewards.tsx | 2 +- packages/web/src/pages/chat-page/ChatPage.tsx | 3 +- .../components/desktop/CollectionPage.tsx | 4 +- .../src/pages/dashboard-page/store/sagas.ts | 8 +- .../components/desktop/FeedPageContent.tsx | 6 +- .../desktop/NotificationSettings.tsx | 2 +- .../components/desktop/SettingsPage.tsx | 2 +- .../components/desktop/VerificationModal.tsx | 2 +- .../components/mobile/VerificationPage.tsx | 8 +- .../components/CompleteProfileWithSocial.tsx | 8 +- .../pages/sign-on/components/ProfileForm.tsx | 8 +- .../pages/sign-on/components/ProfilePage.tsx | 8 +- .../components/desktop/MetaMaskModal.jsx | 2 +- .../sign-up-page/components/HandleField.tsx | 6 +- .../components/SocialMediaLoginOptions.tsx | 2 +- .../sign-up-page/hooks/socialMediaLogin.ts | 10 +- .../sign-up-page/pages/FinishProfilePage.tsx | 6 +- .../components/mobile/TrackHeader.tsx | 7 +- .../upload-page/fields/AccessAndSaleField.tsx | 3 +- .../UsdcPurchaseGatedRadioField.tsx | 2 +- .../pages/upload-page/forms/EditTrackForm.tsx | 2 +- .../pages/upload-page/pages/SelectPage.tsx | 4 +- packages/web/src/services/Location.ts | 2 +- .../services/audius-api-client/apiClient.ts | 2 +- .../src/services/audius-backend/BuyAudio.ts | 3 +- .../src/services/audius-backend/Cognito.ts | 2 +- .../audius-backend/audius-backend-instance.ts | 2 +- .../services/audius-backend/eagerLoadUtils.ts | 3 +- .../audius-sdk/discoveryNodeSelector.ts | 2 +- .../audius-sdk/storageNodeSelector.ts | 2 +- packages/web/src/services/env/env.dev.ts | 2 +- packages/web/src/services/env/env.prod.ts | 2 +- packages/web/src/services/env/env.stage.ts | 2 +- packages/web/src/services/env/index.ts | 5 +- packages/web/src/services/explore.ts | 2 +- packages/web/src/services/fingerprint.ts | 2 +- packages/web/src/services/local-storage.ts | 2 +- .../__mocks__/remote-config-instance.ts | 2 +- .../remote-config/featureFlagHelpers.ts | 2 +- .../remote-config/remote-config-instance.ts | 2 +- .../web/src/services/serviceMonitoring.ts | 2 +- .../web/src/services/solana/WithdrawUSDC.ts | 5 +- packages/web/src/services/solana/solana.ts | 2 +- packages/web/src/services/track-download.ts | 2 +- packages/web/src/services/wallet-client.ts | 2 +- .../store/application/ui/buy-audio/sagas.ts | 14 +- .../application/ui/withdraw-usdc/sagas.ts | 8 +- packages/web/src/store/sign-out/signOut.ts | 2 +- packages/web/src/store/storeContext.ts | 8 +- .../establishWalletConnection.ts | 7 +- .../src/store/token-dashboard/signMessage.ts | 4 +- .../web/src/store/token-dashboard/types.ts | 2 +- .../web/src/utils/browserNotifications.ts | 2 +- packages/web/src/utils/route.ts | 2 +- 133 files changed, 370 insertions(+), 276 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 2434fdda607..bb40aff0056 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -15,7 +15,8 @@ "./api": "./src/api/index.ts", "./models": "./src/models/index.ts", "./utils": "./src/utils/index.ts", - "./schemas": "./src/schemas/index.ts" + "./schemas": "./src/schemas/index.ts", + "./services": "./src/services/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 8227b75c972..6dfe282b296 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,7 +1,6 @@ -import * as e from './schemas' +import * as e from './services' console.log('exports', Object.keys(e)) export * from './audius-query' -export * from './services' export * from './store' export * from './assets' diff --git a/packages/convert-exports.js b/packages/convert-exports.js index 38f488170dd..537d7cbe818 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -7,26 +7,125 @@ var getDirectories = function (callback) { const DIRECTORY = 'schemas' const EXPORTS = [ - 'newTrackMetadata', - 'newCollectionMetadata', - 'newUserMetadata', - 'createRemixOfMetadata', - 'emailSchemaMessages', - 'emailSchema', - 'passwordSchema', - 'pickHandleErrorMessages', - 'pickHandleSchema', - 'finishProfileSchema', - 'selectableGenres', - 'selectGenresSchema', - 'createLoginDetailsSchema', - 'selectArtistsSchema', - 'messages', - 'signInSchema', - 'signInErrorMessages', - 'confirmEmailSchema', - 'formatOtp', - 'confirmEmailErrorMessages' + 'IntKeys', + 'StringKeys', + 'DoubleKeys', + 'BooleanKeys', + 'FeatureFlags', + 'remoteConfig', + 'remoteConfigIntDefaults', + 'remoteConfigDoubleDefaults', + 'remoteConfigBooleanDefaults', + 'RandomImage', + 'responseAdapter', + 'AudiusAPIClient', + 'isApiActivityV2', + 'isApiActivityV1', + 'AuthHeaders', + 'BackendUtils', + 'audiusBackend', + 'ClientRewardsReporter', + 'getEagerDiscprov', + 'makeEagerRequest', + 'recordIP', + 'MEMO_PROGRAM_ID', + 'DEFAULT_MINT', + 'getRootSolanaAccount', + 'getSolanaConnection', + 'getRecentBlockhash', + 'getTokenAccountInfo', + 'deriveUserBankPubkey', + 'deriveUserBankAddress', + 'getUserbankAccountInfo', + 'createUserBankIfNeeded', + 'pollForTokenBalanceChange', + 'pollForBalanceChange', + 'purchaseContent', + 'purchaseContentWithPaymentRouter', + 'findAssociatedTokenAddress', + 'createRootWalletRecoveryTransaction', + 'createTransferToUserBankTransaction', + 'createPaymentRouterRouteTransaction', + 'relayTransaction', + 'relayVersionedTransaction', + 'getLookupTableAccounts', + 'createVersionedTransaction', + 'FingerprintClient', + 'LocalStorage', + 'MIN_TRANSFERRABLE_WEI', + 'WalletClient', + 'Explore', + 'AudioError', + 'isAssetValid', + 'assetToCollectible', + 'creationEventToCollectible', + 'transferEventToCollectible', + 'isNotFromNullAddress', + 'OpenSeaClient', + 'SolanaClient', + 'TrackDownload', + 'MAX_HANDLE_LENGTH', + 'MAX_DISPLAY_NAME_LENGTH', + 'formatTwitterProfile', + 'formatInstagramProfile', + 'formatTikTokProfile', + 'getLocation', + 'getCityAndRegion', + 'DiscoveryNodeSelectorService', + 'makeGetStorageNodeSelector', + 'AudioInfo', + 'AudioPlayer', + 'QueryParams', + 'AssociatedWalletsResponse', + 'GetSocialFeedArgs', + 'GetSupportingArgs', + 'GetSupportersArgs', + 'GetTipsArgs', + 'GetNFTGatedTrackSignaturesArgs', + 'OpaqueID', + 'APIUser', + 'APISearchUser', + 'APIRepost', + 'APIFavorite', + 'APIRemix', + 'APITrack', + 'APISearchTrack', + 'APIStem', + 'APIPlaylistAddedTimestamp', + 'APIPlaylist', + 'APISearchPlaylist', + 'APIItemType', + 'APIActivity', + 'APIActivityV2', + 'APISearch', + 'APISearchAutocomplete', + 'APIBlockConfirmation', + 'APIResponse', + 'SupportingResponse', + 'SupporterResponse', + 'GetTipsResponse', + 'GetNFTGatedTrackSignaturesResponse', + 'PhantomProvider', + 'AudiusBackend', + 'MintName', + 'PurchaseContentArgs', + 'PurchaseContentWithPaymentRouterArgs', + 'CreateStripeSessionArgs', + 'ServiceMonitoring', + 'MonitoringCallbacks', + 'Environment', + 'Env', + 'CachedDiscoveryProviderType', + 'Location', + 'TikTokProfileData', + 'RemoteConfigOptions', + 'RemoteConfigInstance', + 'AllRemoteConfigKeys', + 'MetaplexNFTPropertiesFile', + 'MetaplexNFT', + 'StarAtlasNFT', + 'SolanaNFT', + 'TrackDownloadConfig' ] getDirectories(async function (err, res) { diff --git a/packages/get-type-exports.js b/packages/get-type-exports.js index 15cf4e6c8bb..628bd66c0ec 100644 --- a/packages/get-type-exports.js +++ b/packages/get-type-exports.js @@ -2,7 +2,7 @@ const glob = require('glob') const fs = require('fs') var getDirectories = function (callback) { - glob('./common/dist/schemas/**/*', callback) + glob('./common/dist/services/**/*', callback) } getDirectories(async function (err, res) { diff --git a/packages/web/src/app/App.tsx b/packages/web/src/app/App.tsx index 7ed2dbcc2a2..c3c3e07b83d 100644 --- a/packages/web/src/app/App.tsx +++ b/packages/web/src/app/App.tsx @@ -2,8 +2,8 @@ import { useEffect, Suspense, lazy } from 'react' -import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/schemas' import { CoinflowPurchaseProtection } from '@coinflowlabs/react' import { Redirect, Route, Switch } from 'react-router-dom' diff --git a/packages/web/src/app/web-player/WebPlayer.jsx b/packages/web/src/app/web-player/WebPlayer.jsx index cafcfaa9104..f0eabddc730 100644 --- a/packages/web/src/app/web-player/WebPlayer.jsx +++ b/packages/web/src/app/web-player/WebPlayer.jsx @@ -1,13 +1,11 @@ import { lazy, Component, Suspense } from 'react' import { - StringKeys, accountSelectors, ExploreCollectionsVariant, themeSelectors, themeActions, - UploadType, - FeatureFlags + UploadType } from '@audius/common' import { Name, @@ -16,6 +14,7 @@ import { Status, Theme } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/schemas' import cn from 'classnames' import { connect } from 'react-redux' import { matchPath } from 'react-router' diff --git a/packages/web/src/common/store/account/sagas.js b/packages/web/src/common/store/account/sagas.js index 5c9351522fa..1eec04a7f34 100644 --- a/packages/web/src/common/store/account/sagas.js +++ b/packages/web/src/common/store/account/sagas.js @@ -3,14 +3,16 @@ import { cacheActions, profilePageActions, accountActions, - recordIP, solanaSelectors, - createUserBankIfNeeded, getContext, - FeatureFlags, chatActions } from '@audius/common' import { ErrorLevel, Kind } from '@audius/common/models' +import { + FeatureFlags, + recordIP, + createUserBankIfNeeded +} from '@audius/common/schemas' import { call, put, fork, select, takeEvery } from 'redux-saga/effects' import { identify } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/cache/sagas.js b/packages/web/src/common/store/cache/sagas.js index 2864e8020c6..79564b961ce 100644 --- a/packages/web/src/common/store/cache/sagas.js +++ b/packages/web/src/common/store/cache/sagas.js @@ -2,11 +2,10 @@ import { cacheActions, cacheSelectors, cacheConfig, - FeatureFlags, - confirmerSelectors, - IntKeys + confirmerSelectors } from '@audius/common' import { Status } from '@audius/common/models' +import { IntKeys, FeatureFlags } from '@audius/common/schemas' import { makeUids, getIdFromKindId } from '@audius/common/utils' import { pick } from 'lodash' import { diff --git a/packages/web/src/common/store/cache/tracks/utils/reformat.ts b/packages/web/src/common/store/cache/tracks/utils/reformat.ts index 3cb0a646637..6dff0ea6986 100644 --- a/packages/web/src/common/store/cache/tracks/utils/reformat.ts +++ b/packages/web/src/common/store/cache/tracks/utils/reformat.ts @@ -1,5 +1,5 @@ -import { AudiusBackend } from '@audius/common' import { TrackMetadata, Track } from '@audius/common/models' +import { AudiusBackend } from '@audius/common/schemas' import { omit } from 'lodash' /** diff --git a/packages/web/src/common/store/lineup/sagas.js b/packages/web/src/common/store/lineup/sagas.js index 63df343e0a5..d0773abf207 100644 --- a/packages/web/src/common/store/lineup/sagas.js +++ b/packages/web/src/common/store/lineup/sagas.js @@ -8,12 +8,11 @@ import { playerSelectors, queueSelectors, getContext, - FeatureFlags, - StringKeys, premiumTracksPageLineupActions, accountSelectors } from '@audius/common' import { Name, Kind, isContentUSDCPurchaseGated } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/schemas' import { Uid, makeUids, makeUid } from '@audius/common/utils' import { all, diff --git a/packages/web/src/common/store/notifications/fetchNotifications.ts b/packages/web/src/common/store/notifications/fetchNotifications.ts index e3eda2c963a..a5d6bfd5e69 100644 --- a/packages/web/src/common/store/notifications/fetchNotifications.ts +++ b/packages/web/src/common/store/notifications/fetchNotifications.ts @@ -1,4 +1,5 @@ -import { FeatureFlags, getContext, IntKeys } from '@audius/common' +import { getContext } from '@audius/common' +import { IntKeys, FeatureFlags } from '@audius/common/schemas' import { removeNullable } from '@audius/common/utils' import { partition } from 'lodash' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/sagas.ts b/packages/web/src/common/store/notifications/sagas.ts index 0120ef37ff4..956791eb2f6 100644 --- a/packages/web/src/common/store/notifications/sagas.ts +++ b/packages/web/src/common/store/notifications/sagas.ts @@ -1,10 +1,9 @@ +import { getContext, notificationsActions } from '@audius/common' import { IntKeys, remoteConfigIntDefaults, - RemoteConfigInstance, - getContext, - notificationsActions -} from '@audius/common' + RemoteConfigInstance +} from '@audius/common/schemas' import { call, takeEvery } from 'typed-redux-saga' import { waitForWrite } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/audio-rewards/sagas.ts b/packages/web/src/common/store/pages/audio-rewards/sagas.ts index 2626f36ca4a..5160322e4be 100644 --- a/packages/web/src/common/store/pages/audio-rewards/sagas.ts +++ b/packages/web/src/common/store/pages/audio-rewards/sagas.ts @@ -1,7 +1,4 @@ import { - IntKeys, - StringKeys, - RemoteConfigInstance, getContext, accountSelectors, accountActions, @@ -13,15 +10,20 @@ import { solanaSelectors, walletActions, modalsActions, - Env, - musicConfettiActions, - createUserBankIfNeeded + musicConfettiActions } from '@audius/common' import { FailureReason, UserChallenge, StringAudio } from '@audius/common/models' +import { + IntKeys, + StringKeys, + createUserBankIfNeeded, + Env, + RemoteConfigInstance +} from '@audius/common/schemas' import { stringAudioToStringWei, waitForValue } from '@audius/common/utils' import { call, diff --git a/packages/web/src/common/store/pages/audio-rewards/store.test.ts b/packages/web/src/common/store/pages/audio-rewards/store.test.ts index c79edb05093..5246368d0dd 100644 --- a/packages/web/src/common/store/pages/audio-rewards/store.test.ts +++ b/packages/web/src/common/store/pages/audio-rewards/store.test.ts @@ -1,6 +1,4 @@ import { - IntKeys, - StringKeys, accountSelectors, audioRewardsPageActions, AudioRewardsClaim, @@ -17,6 +15,7 @@ import { ChallengeRewardID, StringAudio } from '@audius/common/models' +import { IntKeys, StringKeys } from '@audius/common/schemas' import { stringAudioToStringWei } from '@audius/common/utils' import delayP from '@redux-saga/delay-p' import { all, fork } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/feed/lineup/sagas.ts b/packages/web/src/common/store/pages/feed/lineup/sagas.ts index 13e500b282b..2195db1b0ce 100644 --- a/packages/web/src/common/store/pages/feed/lineup/sagas.ts +++ b/packages/web/src/common/store/pages/feed/lineup/sagas.ts @@ -3,7 +3,6 @@ import { accountSelectors, feedPageLineupActions as feedActions, feedPageSelectors, - GetSocialFeedArgs, CommonState } from '@audius/common' import { @@ -16,6 +15,7 @@ import { UserTrackMetadata, LineupTrack } from '@audius/common/models' +import { GetSocialFeedArgs } from '@audius/common/schemas' import { select, all } from 'redux-saga/effects' import { processAndCacheCollections } from 'common/store/cache/collections/utils' diff --git a/packages/web/src/common/store/pages/saved/sagas.ts b/packages/web/src/common/store/pages/saved/sagas.ts index db0108af951..dc8f238e756 100644 --- a/packages/web/src/common/store/pages/saved/sagas.ts +++ b/packages/web/src/common/store/pages/saved/sagas.ts @@ -1,10 +1,8 @@ import { - APIActivityV2, LibraryCategoryType, accountSelectors, savedPageActions as actions, getContext, - responseAdapter, savedPageSelectors, savedPageTracksLineupActions as tracksActions } from '@audius/common' @@ -14,6 +12,7 @@ import { UserTrackMetadata, User } from '@audius/common/models' +import { responseAdapter, APIActivityV2 } from '@audius/common/schemas' import { decodeHashId, encodeHashId, diff --git a/packages/web/src/common/store/pages/search-page/sagas.js b/packages/web/src/common/store/pages/search-page/sagas.js index 99b7aaa50ad..a83b8f1b50a 100644 --- a/packages/web/src/common/store/pages/search-page/sagas.js +++ b/packages/web/src/common/store/pages/search-page/sagas.js @@ -3,9 +3,9 @@ import { searchResultsPageActions as searchPageActions, searchResultsPageTracksLineupActions as tracksLineupActions, SearchKind, - processAndCacheUsers, - FeatureFlags + processAndCacheUsers } from '@audius/common' +import { FeatureFlags } from '@audius/common/schemas' import { trimToAlphaNumeric, removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { diff --git a/packages/web/src/common/store/pages/signon/sagas.js b/packages/web/src/common/store/pages/signon/sagas.js index e398d15d681..a760fb85b36 100644 --- a/packages/web/src/common/store/pages/signon/sagas.js +++ b/packages/web/src/common/store/pages/signon/sagas.js @@ -1,11 +1,8 @@ import { - FeatureFlags, - MAX_HANDLE_LENGTH, accountActions, accountSelectors, cacheUsersSelectors, collectionsSocialActions, - getCityAndRegion, getContext, processAndCacheUsers, settingsPageActions, @@ -13,10 +10,15 @@ import { solanaSelectors, toastActions, confirmerActions, - confirmTransaction, - IntKeys + confirmTransaction } from '@audius/common' import { Name, FavoriteSource } from '@audius/common/models' +import { + IntKeys, + FeatureFlags, + MAX_HANDLE_LENGTH, + getCityAndRegion +} from '@audius/common/schemas' import { Genre, ELECTRONIC_SUBGENRES, diff --git a/packages/web/src/common/store/pages/track/sagas.js b/packages/web/src/common/store/pages/track/sagas.js index 9cc4943ac99..5d9c914b963 100644 --- a/packages/web/src/common/store/pages/track/sagas.js +++ b/packages/web/src/common/store/pages/track/sagas.js @@ -1,5 +1,4 @@ import { - StringKeys, cacheTracksActions as trackCacheActions, cacheTracksSelectors, cacheUsersSelectors, @@ -9,6 +8,7 @@ import { reachabilitySelectors } from '@audius/common' import { Kind } from '@audius/common/models' +import { StringKeys } from '@audius/common/schemas' import { makeUid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { keccak_256 } from 'js-sha3' diff --git a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts index 3f8b1e95f45..d271d730410 100644 --- a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts @@ -1,11 +1,11 @@ import { - StringKeys, accountSelectors, trendingPlaylistsPageLineupSelectors, trendingPlaylistsPageLineupActions, getContext } from '@audius/common' import { UserCollectionMetadata } from '@audius/common/models' +import { StringKeys } from '@audius/common/schemas' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts index 57df4d4c2e5..51c4226cbfd 100644 --- a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts @@ -1,10 +1,10 @@ import { - StringKeys, accountSelectors, trendingUndergroundPageLineupSelectors, trendingUndergroundPageLineupActions, getContext } from '@audius/common' +import { StringKeys } from '@audius/common/schemas' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts index 9be2483a79d..5571907dd18 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts +++ b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts @@ -1,5 +1,4 @@ import { - StringKeys, cacheTracksSelectors, trendingPageLineupSelectors, trendingPageActions, @@ -7,6 +6,7 @@ import { getContext } from '@audius/common' import { TimeRange, ID, Track, UserTrackMetadata } from '@audius/common/models' +import { StringKeys } from '@audius/common/schemas' import { Genre, Nullable } from '@audius/common/utils' import { keccak_256 } from 'js-sha3' import { call, put, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/player/sagas.ts b/packages/web/src/common/store/player/sagas.ts index ac9598b666b..451f021e9c7 100644 --- a/packages/web/src/common/store/player/sagas.ts +++ b/packages/web/src/common/store/player/sagas.ts @@ -10,11 +10,10 @@ import { playbackPositionActions, playbackPositionSelectors, reachabilitySelectors, - FeatureFlags, - gatedContentSelectors, - QueryParams + gatedContentSelectors } from '@audius/common' import { Kind } from '@audius/common/models' +import { FeatureFlags, QueryParams } from '@audius/common/schemas' import { Genre, encodeHashId, diff --git a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts index e763cab86ac..679e69d6175 100644 --- a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts +++ b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts @@ -1,10 +1,9 @@ import { accountActions, getContext, - IntKeys, - playlistUpdatesActions, - remoteConfigIntDefaults + playlistUpdatesActions } from '@audius/common' +import { IntKeys, remoteConfigIntDefaults } from '@audius/common/schemas' import { call, fork, take } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/profile/sagas.js b/packages/web/src/common/store/profile/sagas.js index 8bf0d2c2877..1c116391411 100644 --- a/packages/web/src/common/store/profile/sagas.js +++ b/packages/web/src/common/store/profile/sagas.js @@ -1,5 +1,4 @@ import { - DoubleKeys, accountSelectors, cacheActions, profilePageSelectors, @@ -11,11 +10,11 @@ import { collectiblesActions, processAndCacheUsers, chatActions, - FeatureFlags, confirmerActions, confirmTransaction } from '@audius/common' import { DefaultSizes, Kind } from '@audius/common/models' +import { DoubleKeys, FeatureFlags } from '@audius/common/schemas' import { squashNewLines, makeUid, diff --git a/packages/web/src/common/store/search-bar/sagas.ts b/packages/web/src/common/store/search-bar/sagas.ts index 9145598277f..d70a2458e34 100644 --- a/packages/web/src/common/store/search-bar/sagas.ts +++ b/packages/web/src/common/store/search-bar/sagas.ts @@ -1,5 +1,6 @@ -import { accountSelectors, getContext, FeatureFlags } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common' import { Name } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { diff --git a/packages/web/src/common/store/social/tracks/sagas.ts b/packages/web/src/common/store/social/tracks/sagas.ts index 746d78c01a9..756330428af 100644 --- a/packages/web/src/common/store/social/tracks/sagas.ts +++ b/packages/web/src/common/store/social/tracks/sagas.ts @@ -6,12 +6,11 @@ import { gatedContentSelectors, getContext, tracksSocialActions as socialActions, - QueryParams, confirmerActions, - confirmTransaction, - FeatureFlags + confirmTransaction } from '@audius/common' import { Name, Kind, ID, Track, User } from '@audius/common/models' +import { FeatureFlags, QueryParams } from '@audius/common/schemas' import { formatShareText, encodeHashId, diff --git a/packages/web/src/common/store/tipping/sagas.ts b/packages/web/src/common/store/tipping/sagas.ts index c1423c37713..3731dfd4b0d 100644 --- a/packages/web/src/common/store/tipping/sagas.ts +++ b/packages/web/src/common/store/tipping/sagas.ts @@ -7,13 +7,8 @@ import { walletSelectors, walletActions, getContext, - GetTipsArgs, - GetSupportingArgs, - GetSupportersArgs, - LocalStorage, processAndCacheUsers, solanaSelectors, - createUserBankIfNeeded, chatActions } from '@audius/common' import { @@ -28,6 +23,13 @@ import { BNWei, SolanaWalletAddress } from '@audius/common/models' +import { + createUserBankIfNeeded, + LocalStorage, + GetSupportingArgs, + GetSupportersArgs, + GetTipsArgs +} from '@audius/common/schemas' import { decodeHashId, isNullOrUndefined, diff --git a/packages/web/src/common/store/ui/reactions/sagas.ts b/packages/web/src/common/store/ui/reactions/sagas.ts index 1c3f821562e..67c82908431 100644 --- a/packages/web/src/common/store/ui/reactions/sagas.ts +++ b/packages/web/src/common/store/ui/reactions/sagas.ts @@ -3,9 +3,9 @@ import { reactionsMap, reactionsUIActions, reactionsUISelectors, - getContext, - AudiusBackend + getContext } from '@audius/common' +import { AudiusBackend } from '@audius/common/schemas' import { getErrorMessage, removeNullable } from '@audius/common/utils' import { call, takeEvery, all, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/upload/sagaHelpers.ts b/packages/web/src/common/store/upload/sagaHelpers.ts index 49fc27ae4cd..9d69022b71c 100644 --- a/packages/web/src/common/store/upload/sagaHelpers.ts +++ b/packages/web/src/common/store/upload/sagaHelpers.ts @@ -1,9 +1,4 @@ -import { - FeatureFlags, - accountSelectors, - getContext, - getUSDCUserBank -} from '@audius/common' +import { accountSelectors, getContext, getUSDCUserBank } from '@audius/common' import { Name, isContentCollectibleGated, @@ -12,6 +7,7 @@ import { isContentUSDCPurchaseGated, TrackMetadata } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { BN_USDC_CENT_WEI } from '@audius/common/utils' import { PublicKey } from '@solana/web3.js' import BN from 'bn.js' diff --git a/packages/web/src/common/store/user-list/mutuals/sagas.ts b/packages/web/src/common/store/user-list/mutuals/sagas.ts index 2558320b931..3bab0a8d65f 100644 --- a/packages/web/src/common/store/user-list/mutuals/sagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/sagas.ts @@ -3,10 +3,10 @@ import { UserListSagaFactory, mutualsUserListActions, mutualsUserListSelectors, - MUTUALS_USER_LIST_TAG, - AudiusBackend + MUTUALS_USER_LIST_TAG } from '@audius/common' import { ID, User } from '@audius/common/models' +import { AudiusBackend } from '@audius/common/schemas' import { put, select } from 'typed-redux-saga' import { watchMutualsError } from 'common/store/user-list/mutuals/errorSagas' diff --git a/packages/web/src/common/store/user-list/supporting/sagas.ts b/packages/web/src/common/store/user-list/supporting/sagas.ts index c1ce868cf1f..ce68a1ead4e 100644 --- a/packages/web/src/common/store/user-list/supporting/sagas.ts +++ b/packages/web/src/common/store/user-list/supporting/sagas.ts @@ -5,11 +5,13 @@ import { UserListSagaFactory, supportingUserListActions, supportingUserListSelectors, - SUPPORTING_USER_LIST_TAG, - responseAdapter as adapter, - SupportingResponse + SUPPORTING_USER_LIST_TAG } from '@audius/common' import { ID, UserMetadata, User } from '@audius/common/models' +import { + responseAdapter as adapter, + SupportingResponse +} from '@audius/common/schemas' import { decodeHashId, stringWeiToBN } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/top-supporters/sagas.ts b/packages/web/src/common/store/user-list/top-supporters/sagas.ts index 5627106ce55..477abbd4aea 100644 --- a/packages/web/src/common/store/user-list/top-supporters/sagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/sagas.ts @@ -3,13 +3,15 @@ import { tippingActions, SupportersMapForUser, UserListSagaFactory, - SupporterResponse, topSupportersUserListSelectors, topSupportersUserListActions, - TOP_SUPPORTERS_USER_LIST_TAG, - responseAdapter as adapter + TOP_SUPPORTERS_USER_LIST_TAG } from '@audius/common' import { ID, User } from '@audius/common/models' +import { + responseAdapter as adapter, + SupporterResponse +} from '@audius/common/schemas' import { decodeHashId, removeNullable } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/utils.ts b/packages/web/src/common/store/user-list/utils.ts index 075b0b3be32..83beade6d16 100644 --- a/packages/web/src/common/store/user-list/utils.ts +++ b/packages/web/src/common/store/user-list/utils.ts @@ -1,11 +1,10 @@ import { accountSelectors, getContext, - AudiusAPIClient, - AudiusBackend, processAndCacheUsers } from '@audius/common' import { ID, UserMetadata, User } from '@audius/common/models' +import { AudiusAPIClient, AudiusBackend } from '@audius/common/schemas' import { call, select } from 'typed-redux-saga' import { AppState } from 'store/types' diff --git a/packages/web/src/common/store/wallet/sagas.ts b/packages/web/src/common/store/wallet/sagas.ts index e56603dba4c..569f15ee63c 100644 --- a/packages/web/src/common/store/wallet/sagas.ts +++ b/packages/web/src/common/store/wallet/sagas.ts @@ -1,5 +1,4 @@ import { - FeatureFlags, accountSelectors, accountActions, tokenDashboardPageActions, @@ -7,7 +6,6 @@ import { InputSendDataAction, walletActions, getContext, - createUserBankIfNeeded, solanaSelectors } from '@audius/common' import { @@ -17,6 +15,7 @@ import { BNWei, SolanaWalletAddress } from '@audius/common/models' +import { FeatureFlags, createUserBankIfNeeded } from '@audius/common/schemas' import { getErrorMessage, isNullOrUndefined, diff --git a/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx b/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx index 717aab2fa4d..a5a7baef3d6 100644 --- a/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx +++ b/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx @@ -3,9 +3,9 @@ import { useCallback, useMemo } from 'react' import { buyAudioActions, buyAudioSelectors, - OnRampProvider, - StringKeys + OnRampProvider } from '@audius/common' +import { StringKeys } from '@audius/common/schemas' import { useDispatch, useSelector } from 'react-redux' import { useRemoteVar } from 'hooks/useRemoteConfig' diff --git a/packages/web/src/components/collection/mobile/CollectionHeader.jsx b/packages/web/src/components/collection/mobile/CollectionHeader.jsx index 3097da7081b..bcc81ee356c 100644 --- a/packages/web/src/components/collection/mobile/CollectionHeader.jsx +++ b/packages/web/src/components/collection/mobile/CollectionHeader.jsx @@ -1,7 +1,8 @@ import { memo } from 'react' -import { OverflowAction, FeatureFlags } from '@audius/common' +import { OverflowAction } from '@audius/common' import { Variant, SquareSizes } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { formatCount, formatSecondsAsText, diff --git a/packages/web/src/components/data-entry/FormTile.jsx b/packages/web/src/components/data-entry/FormTile.jsx index 7eb0f706b5b..3ceebaa6e47 100644 --- a/packages/web/src/components/data-entry/FormTile.jsx +++ b/packages/web/src/components/data-entry/FormTile.jsx @@ -1,7 +1,6 @@ import { Component, useState, useCallback } from 'react' -import { FeatureFlags } from '@audius/common' -import { createRemixOfMetadata } from '@audius/common/schemas' +import { FeatureFlags, createRemixOfMetadata } from '@audius/common/schemas' import { creativeCommons, getCanonicalName, diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index f292c718c1b..bacd864f2bb 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -1,7 +1,6 @@ import { useEffect, useState, useCallback } from 'react' import { - RandomImage, accountSelectors, cacheCollectionsActions, collectionPageLineupActions as tracksActions, @@ -12,7 +11,7 @@ import { } from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' import { SquareSizes, Collection, ID } from '@audius/common/models' -import { newCollectionMetadata } from '@audius/common/schemas' +import { RandomImage, newCollectionMetadata } from '@audius/common/schemas' import { Nullable } from '@audius/common/utils' import { capitalize } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx index 0ea8da07ceb..de5718d1947 100644 --- a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx +++ b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx @@ -1,10 +1,11 @@ import { useCallback, useEffect, useRef, useState } from 'react' -import { FeatureFlags, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' import { OverrideSetting, FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/schemas' import { Modal, ModalContent, diff --git a/packages/web/src/components/feature-flag/FeatureFlag.tsx b/packages/web/src/components/feature-flag/FeatureFlag.tsx index 46c4b57d07d..75a1d8e84b1 100644 --- a/packages/web/src/components/feature-flag/FeatureFlag.tsx +++ b/packages/web/src/components/feature-flag/FeatureFlag.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react' -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/schemas' import { useFlag } from 'hooks/useRemoteConfig' diff --git a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx index 0c51a884410..f1e01b26df1 100644 --- a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx +++ b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx @@ -1,7 +1,8 @@ import { useState, useCallback, useRef, useContext } from 'react' -import { RandomImage, accountSelectors, badgeTiers } from '@audius/common' +import { accountSelectors, badgeTiers } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { RandomImage } from '@audius/common/schemas' import { removeNullable } from '@audius/common/utils' import { Button, ButtonType, Popup, SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/menu/TrackMenu.tsx b/packages/web/src/components/menu/TrackMenu.tsx index 8d71778c507..57409b2f0ea 100644 --- a/packages/web/src/components/menu/TrackMenu.tsx +++ b/packages/web/src/components/menu/TrackMenu.tsx @@ -8,7 +8,6 @@ import { playbackPositionSelectors, tracksSocialActions, addToCollectionUIActions, - FeatureFlags, CommonState, useEditTrackModal } from '@audius/common' @@ -19,6 +18,7 @@ import { PlayableType, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Genre } from '@audius/common/utils' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/nav/desktop/NavHeader.tsx b/packages/web/src/components/nav/desktop/NavHeader.tsx index b669becacd7..3f1d673cedc 100644 --- a/packages/web/src/components/nav/desktop/NavHeader.tsx +++ b/packages/web/src/components/nav/desktop/NavHeader.tsx @@ -1,12 +1,12 @@ import { useCallback, useRef } from 'react' import { - FeatureFlags, accountSelectors, notificationsSelectors, themeSelectors } from '@audius/common' import { Name, Theme } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx index 8bffb1a2893..f56d7d5121a 100644 --- a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx +++ b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx @@ -1,6 +1,7 @@ -import { FeatureFlags, chatSelectors, StringKeys } from '@audius/common' +import { chatSelectors } from '@audius/common' import { useAccountHasClaimableRewards } from '@audius/common/hooks' import { Name } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/schemas' import { removeNullable } from '@audius/common/utils' import { IconCrown, diff --git a/packages/web/src/components/nav/mobile/NavBar.tsx b/packages/web/src/components/nav/mobile/NavBar.tsx index 5becf51428b..180b1b72669 100644 --- a/packages/web/src/components/nav/mobile/NavBar.tsx +++ b/packages/web/src/components/nav/mobile/NavBar.tsx @@ -1,7 +1,7 @@ import { useState, useContext, useCallback, useEffect } from 'react' -import { FeatureFlags } from '@audius/common' import { Status } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { formatCount } from '@audius/common/utils' import { IconCaretRight, diff --git a/packages/web/src/components/notice/Notice.tsx b/packages/web/src/components/notice/Notice.tsx index 53b4f1acca6..54d45196ac8 100644 --- a/packages/web/src/components/notice/Notice.tsx +++ b/packages/web/src/components/notice/Notice.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useState } from 'react' -import { StringKeys } from '@audius/common' +import { StringKeys } from '@audius/common/schemas' import { IconRemove } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/now-playing/NowPlaying.tsx b/packages/web/src/components/now-playing/NowPlaying.tsx index 3890a9f2f0e..3c25e7ab467 100644 --- a/packages/web/src/components/now-playing/NowPlaying.tsx +++ b/packages/web/src/components/now-playing/NowPlaying.tsx @@ -16,8 +16,7 @@ import { queueSelectors, playbackRateValueMap, gatedContentSelectors, - usePremiumContentPurchaseModal, - FeatureFlags + usePremiumContentPurchaseModal } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { @@ -31,6 +30,7 @@ import { SquareSizes, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { Location } from 'history' diff --git a/packages/web/src/components/play-bar/desktop/PlayBar.jsx b/packages/web/src/components/play-bar/desktop/PlayBar.jsx index 9d5d6900573..26567f0e131 100644 --- a/packages/web/src/components/play-bar/desktop/PlayBar.jsx +++ b/packages/web/src/components/play-bar/desktop/PlayBar.jsx @@ -10,7 +10,6 @@ import { playerActions, playerSelectors, queueSelectors, - FeatureFlags, playbackRateValueMap, cacheTracksSelectors } from '@audius/common' @@ -21,6 +20,7 @@ import { PlaybackSource, Kind } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx index 3f3d9db72f5..c9e0b901013 100644 --- a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx @@ -7,8 +7,7 @@ import { purchaseContentActions, purchaseContentSelectors, isContentPurchaseInProgress, - PurchaseContentPage, - FeatureFlags + PurchaseContentPage } from '@audius/common' import { useGetTrackById } from '@audius/common/api' import { @@ -19,6 +18,7 @@ import { isTrackPurchaseable } from '@audius/common/hooks' import { PurchaseVendor, Track } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { USDC } from '@audius/fixed-decimal' import { Flex } from '@audius/harmony' import { diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx index 87ca3347cad..47e42f4e17b 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect } from 'react' -import { PurchaseContentStage, FeatureFlags, IntKeys } from '@audius/common' +import { PurchaseContentStage } from '@audius/common' import { useFeatureFlag, useRemoteVar, @@ -11,6 +11,7 @@ import { usePurchaseMethod } from '@audius/common/hooks' import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' +import { IntKeys, FeatureFlags } from '@audius/common/schemas' import { Flex } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/components/related-artists/RelatedArtists.tsx b/packages/web/src/components/related-artists/RelatedArtists.tsx index 661c71a3811..0691320c4d6 100644 --- a/packages/web/src/components/related-artists/RelatedArtists.tsx +++ b/packages/web/src/components/related-artists/RelatedArtists.tsx @@ -1,8 +1,9 @@ import { useCallback } from 'react' -import { profilePageSelectors, FeatureFlags } from '@audius/common' +import { profilePageSelectors } from '@audius/common' import { useGetRelatedArtists } from '@audius/common/api' import { User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { MAX_PROFILE_RELATED_ARTISTS } from '@audius/common/utils' import { IconUserGroup } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/share-modal/ShareModal.tsx b/packages/web/src/components/share-modal/ShareModal.tsx index 7a38de30e53..7cb6e69c051 100644 --- a/packages/web/src/components/share-modal/ShareModal.tsx +++ b/packages/web/src/components/share-modal/ShareModal.tsx @@ -1,7 +1,6 @@ import { useCallback, useContext } from 'react' import { - FeatureFlags, accountSelectors, collectionsSocialActions, tracksSocialActions, @@ -12,6 +11,7 @@ import { useCreateChatModal } from '@audius/common' import { Name, PlayableType } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { useDispatch } from 'react-redux' import { make, useRecord } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/social-proof/SocialProof.tsx b/packages/web/src/components/social-proof/SocialProof.tsx index f62fcd3643b..4c0bc7e7bdd 100644 --- a/packages/web/src/components/social-proof/SocialProof.tsx +++ b/packages/web/src/components/social-proof/SocialProof.tsx @@ -1,7 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { - BooleanKeys, accountSelectors, TwitterProfile, InstagramProfile, @@ -9,6 +8,7 @@ import { TikTokProfile } from '@audius/common' import { Name, Status } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/schemas' import { useDispatch, useSelector } from 'react-redux' import IconValidationX from 'assets/img/iconValidationX.svg' diff --git a/packages/web/src/components/stat-banner/StatBanner.tsx b/packages/web/src/components/stat-banner/StatBanner.tsx index c05bf2d6f11..e9cc08082f7 100644 --- a/packages/web/src/components/stat-banner/StatBanner.tsx +++ b/packages/web/src/components/stat-banner/StatBanner.tsx @@ -1,7 +1,7 @@ import { useRef } from 'react' -import { FeatureFlags } from '@audius/common' import { ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Button, ButtonSize, diff --git a/packages/web/src/components/tipping/tip-audio/SendTip.tsx b/packages/web/src/components/tipping/tip-audio/SendTip.tsx index 556ba6e94fb..1269841aa86 100644 --- a/packages/web/src/components/tipping/tip-audio/SendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/SendTip.tsx @@ -13,12 +13,11 @@ import { walletSelectors, getTierAndNumberForBalance, OnRampProvider, - buyAudioActions, - FeatureFlags, - StringKeys + buyAudioActions } from '@audius/common' import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import { BadgeTier, StringWei, StringAudio, BNWei } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/schemas' import { isNullOrUndefined, stringWeiToBN, diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx index d7a125a6c15..aa49e359061 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx @@ -5,9 +5,9 @@ import { tippingActions, TippingSendStatus, walletActions, - StringKeys, accountSelectors } from '@audius/common' +import { StringKeys } from '@audius/common/schemas' import { Nullable } from '@audius/common/utils' import { Modal, ModalHeader, ModalTitle } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/tipping/tip-audio/TipSent.tsx b/packages/web/src/components/tipping/tip-audio/TipSent.tsx index 23ae01dd2a9..85f585eabfb 100644 --- a/packages/web/src/components/tipping/tip-audio/TipSent.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipSent.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' -import { - accountSelectors, - tippingSelectors, - deriveUserBankAddress -} from '@audius/common' +import { accountSelectors, tippingSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import { deriveUserBankAddress } from '@audius/common/schemas' import { formatNumberCommas } from '@audius/common/utils' import { Button, ButtonType, IconTwitterBird, IconCheck } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx index e09f193579a..45fd19346eb 100644 --- a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx +++ b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx @@ -15,8 +15,7 @@ import { modalsSelectors, queueSelectors, shareModalUIActions, - useEditPlaylistModal, - FeatureFlags + useEditPlaylistModal } from '@audius/common' import { ShareSource, @@ -25,6 +24,7 @@ import { FollowSource, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/CardTitle.tsx b/packages/web/src/components/track/CardTitle.tsx index 4afcf4c4f5d..eb40f126408 100644 --- a/packages/web/src/components/track/CardTitle.tsx +++ b/packages/web/src/components/track/CardTitle.tsx @@ -1,9 +1,9 @@ -import { FeatureFlags } from '@audius/common' import { isContentCollectibleGated, isContentUSDCPurchaseGated, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Nullable } from '@audius/common/utils' import { IconCart, IconCollectible, IconSpecialAccess } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/GiantTrackTile.tsx b/packages/web/src/components/track/GiantTrackTile.tsx index badbc5b7c90..7458520d8a3 100644 --- a/packages/web/src/components/track/GiantTrackTile.tsx +++ b/packages/web/src/components/track/GiantTrackTile.tsx @@ -1,7 +1,6 @@ import { useCallback, useState } from 'react' import { - FeatureFlags, publishTrackConfirmationModalUIActions, CommonState, cacheTracksSelectors @@ -14,6 +13,7 @@ import { Remix, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Genre, getCanonicalName, diff --git a/packages/web/src/components/track/PlayPauseButton.tsx b/packages/web/src/components/track/PlayPauseButton.tsx index c042ca64774..76db2719919 100644 --- a/packages/web/src/components/track/PlayPauseButton.tsx +++ b/packages/web/src/components/track/PlayPauseButton.tsx @@ -1,11 +1,11 @@ import { - FeatureFlags, accountSelectors, playerSelectors, playbackPositionSelectors, CommonState } from '@audius/common' import { ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Button } from '@audius/harmony' import { IconPause, IconPlay } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/TrackTile.tsx b/packages/web/src/components/track/desktop/TrackTile.tsx index 3a18314b7af..159dffd7bfb 100644 --- a/packages/web/src/components/track/desktop/TrackTile.tsx +++ b/packages/web/src/components/track/desktop/TrackTile.tsx @@ -3,11 +3,11 @@ import { memo } from 'react' import { accountSelectors, playbackPositionSelectors, - FeatureFlags, CommonState, usePremiumContentPurchaseModal } from '@audius/common' import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { formatCount, Genre, diff --git a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx index 9331d694dd4..d93c7268d08 100644 --- a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx @@ -13,8 +13,7 @@ import { RepostType, favoritesUserListActions, repostsUserListActions, - playerSelectors, - FeatureFlags + playerSelectors } from '@audius/common' import { Name, @@ -26,6 +25,7 @@ import { ID, Track } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx index 68493055684..c325a013fd3 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx @@ -6,10 +6,10 @@ import { tracksSocialActions, OverflowAction, OverflowSource, - mobileOverflowMenuUIActions, - FeatureFlags + mobileOverflowMenuUIActions } from '@audius/common' import { RepostSource, FavoriteSource, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx index f530d1e36b8..3750c975475 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx @@ -13,8 +13,7 @@ import { RepostType, repostsUserListActions, favoritesUserListActions, - playerSelectors, - FeatureFlags + playerSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { @@ -24,6 +23,7 @@ import { FavoriteType, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Genre } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/upload/TrackPreviewNew.tsx b/packages/web/src/components/upload/TrackPreviewNew.tsx index fd4af17e068..28542d9e1fd 100644 --- a/packages/web/src/components/upload/TrackPreviewNew.tsx +++ b/packages/web/src/components/upload/TrackPreviewNew.tsx @@ -1,8 +1,8 @@ import { useState } from 'react' -import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { StemCategory, stemCategoryFriendlyNames } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Box, FilterButton, Flex, IconPenSquare } from '@audius/harmony' import { HarmonyPlainButton, IconTrash } from '@audius/stems' import numeral from 'numeral' diff --git a/packages/web/src/components/upload/UploadChip.tsx b/packages/web/src/components/upload/UploadChip.tsx index 0219160314f..62fd841bce7 100644 --- a/packages/web/src/components/upload/UploadChip.tsx +++ b/packages/web/src/components/upload/UploadChip.tsx @@ -1,7 +1,8 @@ import { Ref, useCallback, useMemo } from 'react' -import { FeatureFlags, cacheCollectionsActions } from '@audius/common' +import { cacheCollectionsActions } from '@audius/common' import { Name, CreatePlaylistSource } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Box, HTMLButtonProps, diff --git a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx index ab8f6acb758..500121c478a 100644 --- a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx @@ -5,9 +5,7 @@ import { WithdrawUSDCModalPages, withdrawUSDCActions, withdrawUSDCSelectors, - WithdrawMethod, - FeatureFlags, - IntKeys + WithdrawMethod } from '@audius/common' import { useFeatureFlag, @@ -20,6 +18,7 @@ import { BNUSDC, SolanaWalletAddress } from '@audius/common/models' +import { IntKeys, FeatureFlags } from '@audius/common/schemas' import { formatUSDCWeiToFloorCentsNumber, Nullable } from '@audius/common/utils' import { Modal, ModalContent, ModalHeader } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx index 0c6811a3900..d0f97251a6f 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx @@ -8,11 +8,11 @@ import { import { useWithdrawUSDCModal, WithdrawUSDCModalPages, - WithdrawMethod, - FeatureFlags + WithdrawMethod } from '@audius/common' import { useFeatureFlag, useUSDCBalance } from '@audius/common/hooks' import { Name, BNUSDC } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { filterDecimalString, padDecimalValue, diff --git a/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts b/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts index 7f85ebf8b44..4956dcc65ce 100644 --- a/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts +++ b/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts @@ -1,4 +1,4 @@ -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/schemas' import { useFlag } from './useRemoteConfig' diff --git a/packages/web/src/hooks/useIsUSDCEnabled.ts b/packages/web/src/hooks/useIsUSDCEnabled.ts index cfae7b378db..2fe6834407f 100644 --- a/packages/web/src/hooks/useIsUSDCEnabled.ts +++ b/packages/web/src/hooks/useIsUSDCEnabled.ts @@ -1,5 +1,5 @@ -import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/schemas' export const useIsUSDCEnabled = () => useFeatureFlag(FeatureFlags.USDC_PURCHASES).isEnabled diff --git a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx index a311122b175..928492222c0 100644 --- a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx +++ b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx @@ -1,11 +1,7 @@ import { ReactNode, useContext, useEffect } from 'react' -import { - FeatureFlags, - StringKeys, - tokenDashboardPageActions, - walletActions -} from '@audius/common' +import { tokenDashboardPageActions, walletActions } from '@audius/common' +import { StringKeys, FeatureFlags } from '@audius/common/schemas' import { useDispatch } from 'react-redux' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx index 435ead8a373..8a2b4ff5045 100644 --- a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx @@ -1,7 +1,6 @@ import { ReactNode, useEffect, useMemo, useState } from 'react' import { - StringKeys, challengesSelectors, audioRewardsPageActions, ChallengeRewardsModalType, @@ -13,6 +12,7 @@ import { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common/models' +import { StringKeys } from '@audius/common/schemas' import { fillString, formatNumberCommas, diff --git a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx index 0196b2e2275..fded67089f0 100644 --- a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx @@ -1,10 +1,11 @@ import { ReactNode } from 'react' -import { StringKeys, audioRewardsPageActions } from '@audius/common' +import { audioRewardsPageActions } from '@audius/common' import { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common/models' +import { StringKeys } from '@audius/common/schemas' import { ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx index 78583f92450..64d399e716f 100644 --- a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx @@ -1,7 +1,6 @@ import { ReactNode, useCallback } from 'react' import { - FeatureFlags, accountSelectors, tokenDashboardPageActions, TokenDashboardPageModalState, @@ -9,6 +8,7 @@ import { walletSelectors } from '@audius/common' import { Chain, StringWei, BNWei, WalletAddress } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { stringWeiToBN, weiToString, Nullable } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx index 7b184a95a08..17b11dec7bf 100644 --- a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx @@ -1,6 +1,6 @@ -import { FeatureFlags } from '@audius/common' import { useCreateUserbankIfNeeded } from '@audius/common/hooks' import { WalletAddress, SolanaWalletAddress } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { Button, ButtonType, LogoSol } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx index 0a4c0453648..3219caa697b 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx @@ -1,6 +1,5 @@ import { useCallback, useMemo, useState } from 'react' -import { FeatureFlags, IntKeys, MIN_TRANSFERRABLE_WEI } from '@audius/common' import { Chain, StringWei, @@ -10,6 +9,11 @@ import { WalletAddress, SolanaWalletAddress } from '@audius/common/models' +import { + IntKeys, + FeatureFlags, + MIN_TRANSFERRABLE_WEI +} from '@audius/common/schemas' import { weiToAudio, stringWeiToBN, diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx index 1fd63ecd06d..cd4ff7731f5 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx @@ -5,12 +5,10 @@ import { walletSelectors, tokenDashboardPageSelectors, buyAudioActions, - OnRampProvider, - FeatureFlags, - StringKeys, - Location + OnRampProvider } from '@audius/common' import { Client, BNWei } from '@audius/common/models' +import { StringKeys, FeatureFlags, Location } from '@audius/common/schemas' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Button, ButtonType, IconInfo } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx index a6acec01522..b84133ac552 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx @@ -1,12 +1,12 @@ import { useCallback, useEffect, useState } from 'react' import { - StringKeys, audioRewardsPageActions, TrendingRewardsModalType, audioRewardsPageSelectors } from '@audius/common' import { Theme } from '@audius/common/models' +import { StringKeys } from '@audius/common/schemas' import { SegmentedControl, ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/ChatPage.tsx b/packages/web/src/pages/chat-page/ChatPage.tsx index f61bec24a72..8daaf7ed920 100644 --- a/packages/web/src/pages/chat-page/ChatPage.tsx +++ b/packages/web/src/pages/chat-page/ChatPage.tsx @@ -1,7 +1,8 @@ import { useCallback, useEffect, useRef } from 'react' -import { chatActions, FeatureFlags, chatSelectors } from '@audius/common' +import { chatActions, chatSelectors } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/schemas' import { ResizeObserver } from '@juggle/resize-observer' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx index 14bd6a36e88..1b00af6e55b 100644 --- a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx @@ -3,8 +3,7 @@ import { ChangeEvent, useMemo } from 'react' import { CollectionTrack, CollectionPageTrackRecord, - CollectionsPageType, - FeatureFlags + CollectionsPageType } from '@audius/common' import { Variant, @@ -15,6 +14,7 @@ import { ID, User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { CollectiblesPlaylistTableColumn, diff --git a/packages/web/src/pages/dashboard-page/store/sagas.ts b/packages/web/src/pages/dashboard-page/store/sagas.ts index eb7b4598705..964b6bc7705 100644 --- a/packages/web/src/pages/dashboard-page/store/sagas.ts +++ b/packages/web/src/pages/dashboard-page/store/sagas.ts @@ -1,10 +1,6 @@ -import { - IntKeys, - accountSelectors, - walletActions, - getContext -} from '@audius/common' +import { accountSelectors, walletActions, getContext } from '@audius/common' import { Collection, ID, Track } from '@audius/common/models' +import { IntKeys } from '@audius/common/schemas' import { waitForValue, doEvery } from '@audius/common/utils' import { each } from 'lodash' import moment from 'moment' diff --git a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx index 22e054894a2..d9f3cd99032 100644 --- a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx +++ b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx @@ -1,9 +1,7 @@ -import { - feedPageLineupActions as feedActions, - FeatureFlags -} from '@audius/common' +import { feedPageLineupActions as feedActions } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { Name, FeedFilter } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { make, useRecord } from 'common/store/analytics/actions' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx b/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx index 70e00bd874e..6541e1bace7 100644 --- a/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' import { - FeatureFlags, Notifications, BrowserNotificationSetting, EmailFrequency } from '@audius/common' +import { FeatureFlags } from '@audius/common/schemas' import { Modal, SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx index d0c14ddef82..80d6a217624 100644 --- a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx @@ -7,10 +7,10 @@ import { BrowserNotificationSetting, EmailFrequency, TikTokProfile, - FeatureFlags, settingsPageSelectors } from '@audius/common' import { OS, Theme, ID, ProfilePictureSizes } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { removeNullable } from '@audius/common/utils' import { IconAppearance } from '@audius/harmony' import { diff --git a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx index 2eb874c830c..ac87990ffa8 100644 --- a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx @@ -1,7 +1,6 @@ import { useCallback, useState } from 'react' import { - BooleanKeys, TwitterProfile, InstagramProfile, musicConfettiActions, @@ -14,6 +13,7 @@ import { ID, ProfilePictureSizes } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/schemas' import { Modal, Button, ButtonType, IconNote, ButtonSize } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx index 23d3f8adf13..cf9baa636f9 100644 --- a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx @@ -1,11 +1,6 @@ import { useCallback, useState } from 'react' -import { - BooleanKeys, - InstagramProfile, - TwitterProfile, - TikTokProfile -} from '@audius/common' +import { InstagramProfile, TwitterProfile, TikTokProfile } from '@audius/common' import { Name, SquareSizes, @@ -13,6 +8,7 @@ import { ID, ProfilePictureSizes } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/schemas' import { Button, ButtonSize, diff --git a/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx b/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx index a3e5d5f281c..362826fcd50 100644 --- a/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx +++ b/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx @@ -1,11 +1,7 @@ import { useCallback } from 'react' -import { - BooleanKeys, - InstagramProfile, - TikTokProfile, - TwitterProfile -} from '@audius/common' +import { InstagramProfile, TikTokProfile, TwitterProfile } from '@audius/common' +import { BooleanKeys } from '@audius/common/schemas' import { IconImage, IconUser, IconVerified } from '@audius/stems' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/sign-on/components/ProfileForm.tsx b/packages/web/src/pages/sign-on/components/ProfileForm.tsx index 34e3f43123e..5db872fd1f1 100644 --- a/packages/web/src/pages/sign-on/components/ProfileForm.tsx +++ b/packages/web/src/pages/sign-on/components/ProfileForm.tsx @@ -1,10 +1,10 @@ import { KeyboardEventHandler, useState } from 'react' +import { imageProfilePicEmpty as profilePicEmpty } from '@audius/common' import { - imageProfilePicEmpty as profilePicEmpty, - MAX_DISPLAY_NAME_LENGTH, - MAX_HANDLE_LENGTH -} from '@audius/common' + MAX_HANDLE_LENGTH, + MAX_DISPLAY_NAME_LENGTH +} from '@audius/common/schemas' import { getErrorMessage } from '@audius/common/utils' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-on/components/ProfilePage.tsx b/packages/web/src/pages/sign-on/components/ProfilePage.tsx index 04291f9c0c9..eb7f74511a6 100644 --- a/packages/web/src/pages/sign-on/components/ProfilePage.tsx +++ b/packages/web/src/pages/sign-on/components/ProfilePage.tsx @@ -4,11 +4,13 @@ import { Image, InstagramProfile, TwitterProfile, - formatInstagramProfile, - formatTwitterProfile, - formatTikTokProfile, TikTokProfile } from '@audius/common' +import { + formatTwitterProfile, + formatInstagramProfile, + formatTikTokProfile +} from '@audius/common/schemas' import cn from 'classnames' import IconCaretLeft from 'assets/img/iconCaretLeft.svg' diff --git a/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx b/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx index 8b3b3f8cc27..c08a7e40d94 100644 --- a/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx +++ b/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx @@ -1,6 +1,6 @@ import { Component } from 'react' -import { BackendUtils as Utils } from '@audius/common' +import { BackendUtils as Utils } from '@audius/common/schemas' import { Box, Text } from '@audius/harmony' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-up-page/components/HandleField.tsx b/packages/web/src/pages/sign-up-page/components/HandleField.tsx index c6304782c3f..b978b6ce0b6 100644 --- a/packages/web/src/pages/sign-up-page/components/HandleField.tsx +++ b/packages/web/src/pages/sign-up-page/components/HandleField.tsx @@ -1,12 +1,14 @@ import { Ref, forwardRef, useCallback, useContext } from 'react' -import { MAX_HANDLE_LENGTH } from '@audius/common' import { useIsWaitingForValidation } from '@audius/common/hooks' import { socialMediaMessages, pickHandlePageMessages as messages } from '@audius/common/messages' -import { pickHandleErrorMessages } from '@audius/common/schemas' +import { + MAX_HANDLE_LENGTH, + pickHandleErrorMessages +} from '@audius/common/schemas' import { TextLink } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx index 1a7968b4317..96da2d4348a 100644 --- a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx +++ b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react' -import { BooleanKeys } from '@audius/common' import { socialMediaMessages } from '@audius/common/messages' +import { BooleanKeys } from '@audius/common/schemas' import { Box, Flex, SocialButton } from '@audius/harmony' import { ToastContext } from 'components/toast/ToastContext' diff --git a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts index 2b997d74f02..d8a6ef337c4 100644 --- a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts +++ b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts @@ -2,15 +2,17 @@ import { useContext } from 'react' import { AudiusQueryContext, - formatInstagramProfile, - formatTikTokProfile, - formatTwitterProfile, InstagramProfile, TikTokProfile, TwitterProfile } from '@audius/common' import { Name } from '@audius/common/models' -import { pickHandleSchema } from '@audius/common/schemas' +import { + formatTwitterProfile, + formatInstagramProfile, + formatTikTokProfile, + pickHandleSchema +} from '@audius/common/schemas' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx index 38eaeb13ae7..30bfca3a490 100644 --- a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx @@ -1,9 +1,11 @@ import { useCallback, useRef } from 'react' -import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' -import { finishProfileSchema } from '@audius/common/schemas' +import { + MAX_DISPLAY_NAME_LENGTH, + finishProfileSchema +} from '@audius/common/schemas' import { Flex, Paper, PlainButton, Text, useTheme } from '@audius/harmony' import { Formik, Form, useField, useFormikContext } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx index 066600aedae..e3b507e5787 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx @@ -1,10 +1,6 @@ import { useCallback } from 'react' -import { - OverflowAction, - imageBlank as placeholderArt, - FeatureFlags -} from '@audius/common' +import { OverflowAction, imageBlank as placeholderArt } from '@audius/common' import { SquareSizes, isContentCollectibleGated, @@ -15,6 +11,7 @@ import { Remix, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { getCanonicalName, formatSeconds, diff --git a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx index 4f8b298be69..0f755d4e14b 100644 --- a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx +++ b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { accountSelectors, FeatureFlags } from '@audius/common' +import { accountSelectors } from '@audius/common' import { USDCPurchaseConfig, useFeatureFlag, @@ -21,6 +21,7 @@ import { USDCPurchaseConditions, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { formatPrice, Nullable } from '@audius/common/utils' import { IconCart, diff --git a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx index c172db5806c..af32530acd6 100644 --- a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' -import { FeatureFlags } from '@audius/common' import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' import { Name, TrackAvailabilityType, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/schemas' import { IconCart, IconStars } from '@audius/stems' import { ExternalLink } from 'components/link' diff --git a/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx b/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx index c61cb856986..2a3ec67c997 100644 --- a/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx +++ b/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx @@ -1,6 +1,6 @@ import { useCallback, useContext, useMemo } from 'react' -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/schemas' import { HarmonyPlainButton, IconCaretRight } from '@audius/stems' import cn from 'classnames' import { Form, Formik, FormikProps, useField } from 'formik' diff --git a/packages/web/src/pages/upload-page/pages/SelectPage.tsx b/packages/web/src/pages/upload-page/pages/SelectPage.tsx index 0eb8c2555c8..33c3c408da1 100644 --- a/packages/web/src/pages/upload-page/pages/SelectPage.tsx +++ b/packages/web/src/pages/upload-page/pages/SelectPage.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import { UploadType, FeatureFlags } from '@audius/common' -import { newCollectionMetadata } from '@audius/common/schemas' +import { UploadType } from '@audius/common' +import { FeatureFlags, newCollectionMetadata } from '@audius/common/schemas' import { removeNullable, Nullable } from '@audius/common/utils' import { Box } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/services/Location.ts b/packages/web/src/services/Location.ts index 83baa99fe12..ea7f9e97536 100644 --- a/packages/web/src/services/Location.ts +++ b/packages/web/src/services/Location.ts @@ -1,4 +1,4 @@ -import { getLocation as getLocationCommon } from '@audius/common' +import { getLocation as getLocationCommon } from '@audius/common/schemas' import { localStorage } from 'services/local-storage' diff --git a/packages/web/src/services/audius-api-client/apiClient.ts b/packages/web/src/services/audius-api-client/apiClient.ts index a355d6ee5af..ac53c33a0fb 100644 --- a/packages/web/src/services/audius-api-client/apiClient.ts +++ b/packages/web/src/services/audius-api-client/apiClient.ts @@ -1,4 +1,4 @@ -import { AudiusAPIClient } from '@audius/common' +import { AudiusAPIClient } from '@audius/common/schemas' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' import { waitForLibsInit } from 'services/audius-backend/eagerLoadUtils' diff --git a/packages/web/src/services/audius-backend/BuyAudio.ts b/packages/web/src/services/audius-backend/BuyAudio.ts index 41d188b041e..d4b3c7dda28 100644 --- a/packages/web/src/services/audius-backend/BuyAudio.ts +++ b/packages/web/src/services/audius-backend/BuyAudio.ts @@ -1,4 +1,5 @@ -import { InAppAudioPurchaseMetadata, MEMO_PROGRAM_ID } from '@audius/common' +import { InAppAudioPurchaseMetadata } from '@audius/common' +import { MEMO_PROGRAM_ID } from '@audius/common/schemas' import { TokenAccountNotFoundError, createTransferCheckedInstruction, diff --git a/packages/web/src/services/audius-backend/Cognito.ts b/packages/web/src/services/audius-backend/Cognito.ts index f1143bd119f..8a7b5999d59 100644 --- a/packages/web/src/services/audius-backend/Cognito.ts +++ b/packages/web/src/services/audius-backend/Cognito.ts @@ -1,4 +1,4 @@ -import { AuthHeaders } from '@audius/common' +import { AuthHeaders } from '@audius/common/schemas' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' import { waitForLibsInit } from 'services/audius-backend/eagerLoadUtils' diff --git a/packages/web/src/services/audius-backend/audius-backend-instance.ts b/packages/web/src/services/audius-backend/audius-backend-instance.ts index 9155bc12fad..97890401bbe 100644 --- a/packages/web/src/services/audius-backend/audius-backend-instance.ts +++ b/packages/web/src/services/audius-backend/audius-backend-instance.ts @@ -1,4 +1,4 @@ -import { audiusBackend } from '@audius/common' +import { audiusBackend } from '@audius/common/schemas' import type { AudiusLibs } from '@audius/sdk' import { track } from 'services/analytics' diff --git a/packages/web/src/services/audius-backend/eagerLoadUtils.ts b/packages/web/src/services/audius-backend/eagerLoadUtils.ts index fdb65edde68..eb9be73ebaf 100644 --- a/packages/web/src/services/audius-backend/eagerLoadUtils.ts +++ b/packages/web/src/services/audius-backend/eagerLoadUtils.ts @@ -1,10 +1,9 @@ +import { getEagerDiscprov, makeEagerRequest } from '@audius/common/schemas' /** * Utilities to assist in eager pre-fetching content from the * protocol before libs has initialized. */ -import { getEagerDiscprov, makeEagerRequest } from '@audius/common' - import { env } from 'services/env' import { localStorage } from 'services/local-storage' diff --git a/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts b/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts index 890f662092c..f10b95af6f9 100644 --- a/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts +++ b/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts @@ -1,4 +1,4 @@ -import { DiscoveryNodeSelectorService } from '@audius/common' +import { DiscoveryNodeSelectorService } from '@audius/common/schemas' import { env } from '../env' import { remoteConfigInstance } from '../remote-config/remote-config-instance' diff --git a/packages/web/src/services/audius-sdk/storageNodeSelector.ts b/packages/web/src/services/audius-sdk/storageNodeSelector.ts index 31de5d8a304..beb2b80b392 100644 --- a/packages/web/src/services/audius-sdk/storageNodeSelector.ts +++ b/packages/web/src/services/audius-sdk/storageNodeSelector.ts @@ -1,4 +1,4 @@ -import { makeGetStorageNodeSelector } from '@audius/common' +import { makeGetStorageNodeSelector } from '@audius/common/schemas' import { env } from 'services/env' diff --git a/packages/web/src/services/env/env.dev.ts b/packages/web/src/services/env/env.dev.ts index c699d2ae143..1f4e669dfc9 100644 --- a/packages/web/src/services/env/env.dev.ts +++ b/packages/web/src/services/env/env.dev.ts @@ -1,4 +1,4 @@ -import { Env } from '@audius/common' +import { Env } from '@audius/common/schemas' export const env: Env = { AAO_ENDPOINT: 'http://audius-protocol-anti-abuse-oracle-1', diff --git a/packages/web/src/services/env/env.prod.ts b/packages/web/src/services/env/env.prod.ts index 1d7d993e943..af87d874551 100644 --- a/packages/web/src/services/env/env.prod.ts +++ b/packages/web/src/services/env/env.prod.ts @@ -1,4 +1,4 @@ -import { Env } from '@audius/common' +import { Env } from '@audius/common/schemas' export const env: Env = { AAO_ENDPOINT: 'https://antiabuseoracle.audius.co', diff --git a/packages/web/src/services/env/env.stage.ts b/packages/web/src/services/env/env.stage.ts index 0b45d6f5c77..998733bd8ad 100644 --- a/packages/web/src/services/env/env.stage.ts +++ b/packages/web/src/services/env/env.stage.ts @@ -1,4 +1,4 @@ -import { Env } from '@audius/common' +import { Env } from '@audius/common/schemas' export const env: Env = { AAO_ENDPOINT: 'https://antiabuseoracle.staging.audius.co', diff --git a/packages/web/src/services/env/index.ts b/packages/web/src/services/env/index.ts index 74b19ac19b6..2210a334e70 100644 --- a/packages/web/src/services/env/index.ts +++ b/packages/web/src/services/env/index.ts @@ -1,5 +1,6 @@ -import { Environment } from '@audius/common' -import type { Env } from '@audius/common' +import { Environment, Env } from '@audius/common/schemas' + +import type {} from '@audius/common' import { env as envDev } from './env.dev' import { env as envProd } from './env.prod' diff --git a/packages/web/src/services/explore.ts b/packages/web/src/services/explore.ts index fcab1e89747..a5556ebac07 100644 --- a/packages/web/src/services/explore.ts +++ b/packages/web/src/services/explore.ts @@ -1,4 +1,4 @@ -import { Explore } from '@audius/common' +import { Explore } from '@audius/common/schemas' import { apiClient } from './audius-api-client' import { audiusBackendInstance } from './audius-backend/audius-backend-instance' diff --git a/packages/web/src/services/fingerprint.ts b/packages/web/src/services/fingerprint.ts index e6ca6d8a194..5cdc99faa3e 100644 --- a/packages/web/src/services/fingerprint.ts +++ b/packages/web/src/services/fingerprint.ts @@ -1,4 +1,4 @@ -import { FingerprintClient } from '@audius/common' +import { FingerprintClient } from '@audius/common/schemas' import FingerprintJS, { Agent } from '@fingerprintjs/fingerprintjs-pro' import { env } from './env' diff --git a/packages/web/src/services/local-storage.ts b/packages/web/src/services/local-storage.ts index 87c0e53178f..e1b495364e1 100644 --- a/packages/web/src/services/local-storage.ts +++ b/packages/web/src/services/local-storage.ts @@ -1,4 +1,4 @@ -import { LocalStorage } from '@audius/common' +import { LocalStorage } from '@audius/common/schemas' export const localStorage = new LocalStorage({ localStorage: diff --git a/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts b/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts index 01d9e713769..828b08e1d18 100644 --- a/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts +++ b/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts @@ -1,4 +1,4 @@ -import { RemoteConfigInstance } from '@audius/common' +import { RemoteConfigInstance } from '@audius/common/schemas' import { vitest } from 'vitest' let fakeConfig: Record = {} diff --git a/packages/web/src/services/remote-config/featureFlagHelpers.ts b/packages/web/src/services/remote-config/featureFlagHelpers.ts index 17401fcf73c..fee4a010be2 100644 --- a/packages/web/src/services/remote-config/featureFlagHelpers.ts +++ b/packages/web/src/services/remote-config/featureFlagHelpers.ts @@ -1,8 +1,8 @@ -import { FeatureFlags } from '@audius/common' import { OverrideSetting, FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/schemas' import { remoteConfigInstance } from './remote-config-instance' diff --git a/packages/web/src/services/remote-config/remote-config-instance.ts b/packages/web/src/services/remote-config/remote-config-instance.ts index 55353517323..d3afff0f4d2 100644 --- a/packages/web/src/services/remote-config/remote-config-instance.ts +++ b/packages/web/src/services/remote-config/remote-config-instance.ts @@ -1,5 +1,5 @@ -import { remoteConfig } from '@audius/common' import { ErrorLevel } from '@audius/common/models' +import { remoteConfig } from '@audius/common/schemas' import optimizely, { Config } from '@optimizely/optimizely-sdk' import { isEmpty } from 'lodash' diff --git a/packages/web/src/services/serviceMonitoring.ts b/packages/web/src/services/serviceMonitoring.ts index dc93b8f434f..dd8f7324df1 100644 --- a/packages/web/src/services/serviceMonitoring.ts +++ b/packages/web/src/services/serviceMonitoring.ts @@ -1,5 +1,5 @@ -import { IntKeys } from '@audius/common' import { Name, ServiceMonitorType, MonitorPayload } from '@audius/common/models' +import { IntKeys } from '@audius/common/schemas' import { track } from 'services/analytics' import { remoteConfigInstance } from 'services/remote-config/remote-config-instance' diff --git a/packages/web/src/services/solana/WithdrawUSDC.ts b/packages/web/src/services/solana/WithdrawUSDC.ts index 2a4cecdd625..e3b94ae2980 100644 --- a/packages/web/src/services/solana/WithdrawUSDC.ts +++ b/packages/web/src/services/solana/WithdrawUSDC.ts @@ -1,4 +1,7 @@ -import { getLookupTableAccounts, getRecentBlockhash } from '@audius/common' +import { + getRecentBlockhash, + getLookupTableAccounts +} from '@audius/common/schemas' import { MintName } from '@audius/sdk' import { createCloseAccountInstruction, diff --git a/packages/web/src/services/solana/solana.ts b/packages/web/src/services/solana/solana.ts index ad09c020928..c8d6270fbc5 100644 --- a/packages/web/src/services/solana/solana.ts +++ b/packages/web/src/services/solana/solana.ts @@ -1,5 +1,5 @@ -import { MintName, DEFAULT_MINT } from '@audius/common' import { SolanaWalletAddress } from '@audius/common/models' +import { DEFAULT_MINT, MintName } from '@audius/common/schemas' import { Account, getMinimumBalanceForRentExemptAccount, diff --git a/packages/web/src/services/track-download.ts b/packages/web/src/services/track-download.ts index fc77056a7e5..6a0342b7db9 100644 --- a/packages/web/src/services/track-download.ts +++ b/packages/web/src/services/track-download.ts @@ -1,4 +1,4 @@ -import { TrackDownload as TrackDownloadBase } from '@audius/common' +import { TrackDownload as TrackDownloadBase } from '@audius/common/schemas' import { audiusBackendInstance } from './audius-backend/audius-backend-instance' diff --git a/packages/web/src/services/wallet-client.ts b/packages/web/src/services/wallet-client.ts index 8f506d51cf1..6dc038c4ae0 100644 --- a/packages/web/src/services/wallet-client.ts +++ b/packages/web/src/services/wallet-client.ts @@ -1,4 +1,4 @@ -import { WalletClient } from '@audius/common' +import { WalletClient } from '@audius/common/schemas' import { apiClient } from './audius-api-client' import { audiusBackendInstance } from './audius-backend/audius-backend-instance' diff --git a/packages/web/src/store/application/ui/buy-audio/sagas.ts b/packages/web/src/store/application/ui/buy-audio/sagas.ts index 4d72185268c..3cb7ca52760 100644 --- a/packages/web/src/store/application/ui/buy-audio/sagas.ts +++ b/packages/web/src/store/application/ui/buy-audio/sagas.ts @@ -1,5 +1,4 @@ import { - IntKeys, getContext, walletActions, TOKEN_LISTING_MAP, @@ -13,15 +12,18 @@ import { TransactionMethod, TransactionDetails, walletSelectors, - createUserBankIfNeeded, modalsActions, AmountObject, - FeatureFlags, - LocalStorage, - solanaSelectors, - deriveUserBankPubkey + solanaSelectors } from '@audius/common' import { Name, ErrorLevel, BNWei } from '@audius/common/models' +import { + IntKeys, + FeatureFlags, + deriveUserBankPubkey, + createUserBankIfNeeded, + LocalStorage +} from '@audius/common/schemas' import { dayjs, isNullOrUndefined, diff --git a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts index fcf6e9557c2..4524b9ba831 100644 --- a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts +++ b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts @@ -4,9 +4,6 @@ import { getUSDCUserBank, getContext, TOKEN_LISTING_MAP, - getUserbankAccountInfo, - relayVersionedTransaction, - relayTransaction, withdrawUSDCModalActions, WithdrawUSDCModalPages, WithdrawMethod, @@ -20,6 +17,11 @@ import { BNUSDC, SolanaWalletAddress } from '@audius/common/models' +import { + getUserbankAccountInfo, + relayTransaction, + relayVersionedTransaction +} from '@audius/common/schemas' import { formatUSDCWeiToFloorCentsNumber } from '@audius/common/utils' import { createAssociatedTokenAccountInstruction, diff --git a/packages/web/src/store/sign-out/signOut.ts b/packages/web/src/store/sign-out/signOut.ts index e827c6020b1..9572ae99ff7 100644 --- a/packages/web/src/store/sign-out/signOut.ts +++ b/packages/web/src/store/sign-out/signOut.ts @@ -1,4 +1,4 @@ -import { AudiusBackend, LocalStorage } from '@audius/common' +import { LocalStorage, AudiusBackend } from '@audius/common/schemas' import { removeHasRequestedBrowserPermission } from 'utils/browserNotifications' diff --git a/packages/web/src/store/storeContext.ts b/packages/web/src/store/storeContext.ts index 51051b12a4c..5587e5a56c8 100644 --- a/packages/web/src/store/storeContext.ts +++ b/packages/web/src/store/storeContext.ts @@ -1,9 +1,9 @@ +import { CommonStoreContext } from '@audius/common' import { - SolanaClient, - CommonStoreContext, + FeatureFlags, OpenSeaClient, - FeatureFlags -} from '@audius/common' + SolanaClient +} from '@audius/common/schemas' import { setTag, configureScope } from '@sentry/browser' import * as analytics from 'services/analytics' diff --git a/packages/web/src/store/token-dashboard/establishWalletConnection.ts b/packages/web/src/store/token-dashboard/establishWalletConnection.ts index 1284b88b858..4aac0f8287d 100644 --- a/packages/web/src/store/token-dashboard/establishWalletConnection.ts +++ b/packages/web/src/store/token-dashboard/establishWalletConnection.ts @@ -1,9 +1,6 @@ -import { - BooleanKeys, - getContext, - tokenDashboardPageActions -} from '@audius/common' +import { getContext, tokenDashboardPageActions } from '@audius/common' import { Chain } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/schemas' import { getErrorMessage } from '@audius/common/utils' import { call, put } from 'typed-redux-saga' diff --git a/packages/web/src/store/token-dashboard/signMessage.ts b/packages/web/src/store/token-dashboard/signMessage.ts index e8b255067e6..f83734ad014 100644 --- a/packages/web/src/store/token-dashboard/signMessage.ts +++ b/packages/web/src/store/token-dashboard/signMessage.ts @@ -1,10 +1,10 @@ import { accountSelectors, tokenDashboardPageActions, - tokenDashboardPageSelectors, - PhantomProvider + tokenDashboardPageSelectors } from '@audius/common' import { Chain } from '@audius/common/models' +import { PhantomProvider } from '@audius/common/schemas' import { call, put, select } from 'typed-redux-saga' import { WalletConnection } from './types' diff --git a/packages/web/src/store/token-dashboard/types.ts b/packages/web/src/store/token-dashboard/types.ts index 007ced31e44..3e95ba2a5ff 100644 --- a/packages/web/src/store/token-dashboard/types.ts +++ b/packages/web/src/store/token-dashboard/types.ts @@ -1,5 +1,5 @@ -import { PhantomProvider } from '@audius/common' import { Chain } from '@audius/common/models' +import { PhantomProvider } from '@audius/common/schemas' export type PhantomWalletConnection = { chain: Chain.Sol diff --git a/packages/web/src/utils/browserNotifications.ts b/packages/web/src/utils/browserNotifications.ts index 6736f42c752..18080aa3699 100644 --- a/packages/web/src/utils/browserNotifications.ts +++ b/packages/web/src/utils/browserNotifications.ts @@ -1,4 +1,4 @@ -import { AudiusBackend } from '@audius/common' +import { AudiusBackend } from '@audius/common/schemas' import { env } from 'services/env' import { isElectron } from 'utils/clientUtil' diff --git a/packages/web/src/utils/route.ts b/packages/web/src/utils/route.ts index 83e948aefa6..1051e854df3 100644 --- a/packages/web/src/utils/route.ts +++ b/packages/web/src/utils/route.ts @@ -1,5 +1,5 @@ -import { Env } from '@audius/common' import { ID } from '@audius/common/models' +import { Env } from '@audius/common/schemas' import { encodeUrlName, getHash } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { Location } from 'history' From 1ff2385fb347e474c92c6baa364ae409c7271b53 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 16:32:51 -0800 Subject: [PATCH 37/64] Fix "Convert services in web" --- packages/web/src/app/App.tsx | 2 +- packages/web/src/app/web-player/WebPlayer.jsx | 5 +++-- packages/web/src/common/store/account/sagas.js | 8 +++----- packages/web/src/common/store/cache/sagas.js | 5 +++-- .../common/store/cache/tracks/utils/reformat.ts | 2 +- packages/web/src/common/store/lineup/sagas.js | 3 ++- .../store/notifications/fetchNotifications.ts | 3 +-- .../web/src/common/store/notifications/sagas.ts | 7 ++++--- .../src/common/store/pages/audio-rewards/sagas.ts | 14 ++++++-------- .../common/store/pages/audio-rewards/store.test.ts | 3 ++- .../src/common/store/pages/feed/lineup/sagas.ts | 2 +- packages/web/src/common/store/pages/saved/sagas.ts | 3 ++- .../src/common/store/pages/search-page/sagas.js | 4 ++-- .../web/src/common/store/pages/signon/sagas.js | 12 +++++------- packages/web/src/common/store/pages/track/sagas.js | 2 +- .../pages/trending-playlists/lineups/sagas.ts | 2 +- .../pages/trending-underground/lineups/sagas.ts | 2 +- .../trending/lineups/trending/retrieveTrending.ts | 2 +- packages/web/src/common/store/player/sagas.ts | 5 +++-- .../playlistUpdatesPollingDaemon.ts | 5 +++-- packages/web/src/common/store/profile/sagas.js | 3 ++- packages/web/src/common/store/search-bar/sagas.ts | 3 +-- .../web/src/common/store/social/tracks/sagas.ts | 5 +++-- packages/web/src/common/store/tipping/sagas.ts | 12 +++++------- .../web/src/common/store/ui/reactions/sagas.ts | 4 ++-- .../web/src/common/store/upload/sagaHelpers.ts | 8 ++++++-- .../src/common/store/user-list/mutuals/sagas.ts | 4 ++-- .../src/common/store/user-list/supporting/sagas.ts | 8 +++----- .../common/store/user-list/top-supporters/sagas.ts | 8 +++----- packages/web/src/common/store/user-list/utils.ts | 3 ++- packages/web/src/common/store/wallet/sagas.ts | 3 ++- .../buy-audio-modal/components/AmountInputPage.tsx | 4 ++-- .../collection/mobile/CollectionHeader.jsx | 3 +-- .../web/src/components/data-entry/FormTile.jsx | 3 ++- .../edit-playlist/mobile/EditPlaylistPage.tsx | 3 ++- .../FeatureFlagOverrideModal.tsx | 3 +-- .../src/components/feature-flag/FeatureFlag.tsx | 2 +- .../image-selection/ImageSelectionPopup.jsx | 3 +-- packages/web/src/components/menu/TrackMenu.tsx | 2 +- .../web/src/components/nav/desktop/NavHeader.tsx | 2 +- .../src/components/nav/desktop/NavPopupMenu.tsx | 3 +-- packages/web/src/components/nav/mobile/NavBar.tsx | 2 +- packages/web/src/components/notice/Notice.tsx | 2 +- .../web/src/components/now-playing/NowPlaying.tsx | 4 ++-- .../src/components/play-bar/desktop/PlayBar.jsx | 2 +- .../PremiumContentPurchaseModal.tsx | 4 ++-- .../components/PurchaseContentFormFields.tsx | 3 +-- .../components/related-artists/RelatedArtists.tsx | 3 +-- .../web/src/components/share-modal/ShareModal.tsx | 2 +- .../src/components/social-proof/SocialProof.tsx | 2 +- .../web/src/components/stat-banner/StatBanner.tsx | 2 +- .../src/components/tipping/tip-audio/SendTip.tsx | 5 +++-- .../components/tipping/tip-audio/TipAudioModal.tsx | 2 +- .../src/components/tipping/tip-audio/TipSent.tsx | 7 +++++-- .../ConnectedMobileOverflowModal.tsx | 4 ++-- packages/web/src/components/track/CardTitle.tsx | 2 +- .../web/src/components/track/GiantTrackTile.tsx | 2 +- .../web/src/components/track/PlayPauseButton.tsx | 2 +- .../web/src/components/track/desktop/TrackTile.tsx | 2 +- .../track/mobile/ConnectedPlaylistTile.tsx | 4 ++-- .../track/mobile/ConnectedTrackListItem.tsx | 4 ++-- .../components/track/mobile/ConnectedTrackTile.tsx | 4 ++-- .../web/src/components/upload/TrackPreviewNew.tsx | 2 +- packages/web/src/components/upload/UploadChip.tsx | 3 +-- .../withdraw-usdc-modal/WithdrawUSDCModal.tsx | 5 +++-- .../components/EnterTransferDetails.tsx | 4 ++-- .../hooks/useIsAudioMatchingChallengesEnabled.ts | 2 +- packages/web/src/hooks/useIsUSDCEnabled.ts | 2 +- .../pages/audio-rewards-page/AudioRewardsPage.tsx | 8 ++++++-- .../audio-rewards-page/ChallengeRewardsTile.tsx | 2 +- .../audio-rewards-page/TrendingRewardsTile.tsx | 3 +-- .../src/pages/audio-rewards-page/WalletModal.tsx | 2 +- .../audio-rewards-page/components/ReceiveBody.tsx | 2 +- .../components/SendInputBody.tsx | 6 +----- .../components/WalletManagementTile.tsx | 6 ++++-- .../components/modals/TrendingRewards.tsx | 2 +- packages/web/src/pages/chat-page/ChatPage.tsx | 3 +-- .../components/desktop/CollectionPage.tsx | 4 ++-- .../web/src/pages/dashboard-page/store/sagas.ts | 8 ++++++-- .../components/desktop/FeedPageContent.tsx | 6 ++++-- .../components/desktop/NotificationSettings.tsx | 2 +- .../components/desktop/SettingsPage.tsx | 2 +- .../components/desktop/VerificationModal.tsx | 2 +- .../components/mobile/VerificationPage.tsx | 8 ++++++-- .../components/CompleteProfileWithSocial.tsx | 8 ++++++-- .../src/pages/sign-on/components/ProfileForm.tsx | 8 ++++---- .../src/pages/sign-on/components/ProfilePage.tsx | 8 +++----- .../sign-on/components/desktop/MetaMaskModal.jsx | 2 +- .../pages/sign-up-page/components/HandleField.tsx | 6 ++---- .../components/SocialMediaLoginOptions.tsx | 2 +- .../pages/sign-up-page/hooks/socialMediaLogin.ts | 10 ++++------ .../pages/sign-up-page/pages/FinishProfilePage.tsx | 6 ++---- .../track-page/components/mobile/TrackHeader.tsx | 7 +++++-- .../upload-page/fields/AccessAndSaleField.tsx | 3 +-- .../UsdcPurchaseGatedRadioField.tsx | 2 +- .../src/pages/upload-page/forms/EditTrackForm.tsx | 2 +- .../web/src/pages/upload-page/pages/SelectPage.tsx | 4 ++-- packages/web/src/services/Location.ts | 2 +- .../src/services/audius-api-client/apiClient.ts | 2 +- .../web/src/services/audius-backend/BuyAudio.ts | 3 +-- .../web/src/services/audius-backend/Cognito.ts | 2 +- .../audius-backend/audius-backend-instance.ts | 2 +- .../src/services/audius-backend/eagerLoadUtils.ts | 3 ++- .../services/audius-sdk/discoveryNodeSelector.ts | 2 +- .../src/services/audius-sdk/storageNodeSelector.ts | 2 +- packages/web/src/services/env/env.dev.ts | 2 +- packages/web/src/services/env/env.prod.ts | 2 +- packages/web/src/services/env/env.stage.ts | 2 +- packages/web/src/services/env/index.ts | 5 ++--- packages/web/src/services/explore.ts | 2 +- packages/web/src/services/fingerprint.ts | 2 +- packages/web/src/services/local-storage.ts | 2 +- .../__mocks__/remote-config-instance.ts | 2 +- .../services/remote-config/featureFlagHelpers.ts | 2 +- .../remote-config/remote-config-instance.ts | 2 +- packages/web/src/services/serviceMonitoring.ts | 2 +- packages/web/src/services/solana/WithdrawUSDC.ts | 5 +---- packages/web/src/services/solana/solana.ts | 2 +- packages/web/src/services/track-download.ts | 2 +- packages/web/src/services/wallet-client.ts | 2 +- .../src/store/application/ui/buy-audio/sagas.ts | 14 ++++++-------- .../store/application/ui/withdraw-usdc/sagas.ts | 8 +++----- packages/web/src/store/sign-out/signOut.ts | 2 +- packages/web/src/store/storeContext.ts | 8 ++++---- .../token-dashboard/establishWalletConnection.ts | 7 +++++-- .../web/src/store/token-dashboard/signMessage.ts | 4 ++-- packages/web/src/store/token-dashboard/types.ts | 2 +- packages/web/src/utils/browserNotifications.ts | 2 +- packages/web/src/utils/route.ts | 2 +- 129 files changed, 252 insertions(+), 247 deletions(-) diff --git a/packages/web/src/app/App.tsx b/packages/web/src/app/App.tsx index c3c3e07b83d..7ed2dbcc2a2 100644 --- a/packages/web/src/app/App.tsx +++ b/packages/web/src/app/App.tsx @@ -2,8 +2,8 @@ import { useEffect, Suspense, lazy } from 'react' +import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' -import { FeatureFlags } from '@audius/common/schemas' import { CoinflowPurchaseProtection } from '@coinflowlabs/react' import { Redirect, Route, Switch } from 'react-router-dom' diff --git a/packages/web/src/app/web-player/WebPlayer.jsx b/packages/web/src/app/web-player/WebPlayer.jsx index f0eabddc730..cafcfaa9104 100644 --- a/packages/web/src/app/web-player/WebPlayer.jsx +++ b/packages/web/src/app/web-player/WebPlayer.jsx @@ -1,11 +1,13 @@ import { lazy, Component, Suspense } from 'react' import { + StringKeys, accountSelectors, ExploreCollectionsVariant, themeSelectors, themeActions, - UploadType + UploadType, + FeatureFlags } from '@audius/common' import { Name, @@ -14,7 +16,6 @@ import { Status, Theme } from '@audius/common/models' -import { StringKeys, FeatureFlags } from '@audius/common/schemas' import cn from 'classnames' import { connect } from 'react-redux' import { matchPath } from 'react-router' diff --git a/packages/web/src/common/store/account/sagas.js b/packages/web/src/common/store/account/sagas.js index 1eec04a7f34..5c9351522fa 100644 --- a/packages/web/src/common/store/account/sagas.js +++ b/packages/web/src/common/store/account/sagas.js @@ -3,16 +3,14 @@ import { cacheActions, profilePageActions, accountActions, + recordIP, solanaSelectors, + createUserBankIfNeeded, getContext, + FeatureFlags, chatActions } from '@audius/common' import { ErrorLevel, Kind } from '@audius/common/models' -import { - FeatureFlags, - recordIP, - createUserBankIfNeeded -} from '@audius/common/schemas' import { call, put, fork, select, takeEvery } from 'redux-saga/effects' import { identify } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/cache/sagas.js b/packages/web/src/common/store/cache/sagas.js index 79564b961ce..2864e8020c6 100644 --- a/packages/web/src/common/store/cache/sagas.js +++ b/packages/web/src/common/store/cache/sagas.js @@ -2,10 +2,11 @@ import { cacheActions, cacheSelectors, cacheConfig, - confirmerSelectors + FeatureFlags, + confirmerSelectors, + IntKeys } from '@audius/common' import { Status } from '@audius/common/models' -import { IntKeys, FeatureFlags } from '@audius/common/schemas' import { makeUids, getIdFromKindId } from '@audius/common/utils' import { pick } from 'lodash' import { diff --git a/packages/web/src/common/store/cache/tracks/utils/reformat.ts b/packages/web/src/common/store/cache/tracks/utils/reformat.ts index 6dff0ea6986..3cb0a646637 100644 --- a/packages/web/src/common/store/cache/tracks/utils/reformat.ts +++ b/packages/web/src/common/store/cache/tracks/utils/reformat.ts @@ -1,5 +1,5 @@ +import { AudiusBackend } from '@audius/common' import { TrackMetadata, Track } from '@audius/common/models' -import { AudiusBackend } from '@audius/common/schemas' import { omit } from 'lodash' /** diff --git a/packages/web/src/common/store/lineup/sagas.js b/packages/web/src/common/store/lineup/sagas.js index d0773abf207..63df343e0a5 100644 --- a/packages/web/src/common/store/lineup/sagas.js +++ b/packages/web/src/common/store/lineup/sagas.js @@ -8,11 +8,12 @@ import { playerSelectors, queueSelectors, getContext, + FeatureFlags, + StringKeys, premiumTracksPageLineupActions, accountSelectors } from '@audius/common' import { Name, Kind, isContentUSDCPurchaseGated } from '@audius/common/models' -import { StringKeys, FeatureFlags } from '@audius/common/schemas' import { Uid, makeUids, makeUid } from '@audius/common/utils' import { all, diff --git a/packages/web/src/common/store/notifications/fetchNotifications.ts b/packages/web/src/common/store/notifications/fetchNotifications.ts index a5d6bfd5e69..e3eda2c963a 100644 --- a/packages/web/src/common/store/notifications/fetchNotifications.ts +++ b/packages/web/src/common/store/notifications/fetchNotifications.ts @@ -1,5 +1,4 @@ -import { getContext } from '@audius/common' -import { IntKeys, FeatureFlags } from '@audius/common/schemas' +import { FeatureFlags, getContext, IntKeys } from '@audius/common' import { removeNullable } from '@audius/common/utils' import { partition } from 'lodash' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/sagas.ts b/packages/web/src/common/store/notifications/sagas.ts index 956791eb2f6..0120ef37ff4 100644 --- a/packages/web/src/common/store/notifications/sagas.ts +++ b/packages/web/src/common/store/notifications/sagas.ts @@ -1,9 +1,10 @@ -import { getContext, notificationsActions } from '@audius/common' import { IntKeys, remoteConfigIntDefaults, - RemoteConfigInstance -} from '@audius/common/schemas' + RemoteConfigInstance, + getContext, + notificationsActions +} from '@audius/common' import { call, takeEvery } from 'typed-redux-saga' import { waitForWrite } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/audio-rewards/sagas.ts b/packages/web/src/common/store/pages/audio-rewards/sagas.ts index 5160322e4be..2626f36ca4a 100644 --- a/packages/web/src/common/store/pages/audio-rewards/sagas.ts +++ b/packages/web/src/common/store/pages/audio-rewards/sagas.ts @@ -1,4 +1,7 @@ import { + IntKeys, + StringKeys, + RemoteConfigInstance, getContext, accountSelectors, accountActions, @@ -10,20 +13,15 @@ import { solanaSelectors, walletActions, modalsActions, - musicConfettiActions + Env, + musicConfettiActions, + createUserBankIfNeeded } from '@audius/common' import { FailureReason, UserChallenge, StringAudio } from '@audius/common/models' -import { - IntKeys, - StringKeys, - createUserBankIfNeeded, - Env, - RemoteConfigInstance -} from '@audius/common/schemas' import { stringAudioToStringWei, waitForValue } from '@audius/common/utils' import { call, diff --git a/packages/web/src/common/store/pages/audio-rewards/store.test.ts b/packages/web/src/common/store/pages/audio-rewards/store.test.ts index 5246368d0dd..c79edb05093 100644 --- a/packages/web/src/common/store/pages/audio-rewards/store.test.ts +++ b/packages/web/src/common/store/pages/audio-rewards/store.test.ts @@ -1,4 +1,6 @@ import { + IntKeys, + StringKeys, accountSelectors, audioRewardsPageActions, AudioRewardsClaim, @@ -15,7 +17,6 @@ import { ChallengeRewardID, StringAudio } from '@audius/common/models' -import { IntKeys, StringKeys } from '@audius/common/schemas' import { stringAudioToStringWei } from '@audius/common/utils' import delayP from '@redux-saga/delay-p' import { all, fork } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/feed/lineup/sagas.ts b/packages/web/src/common/store/pages/feed/lineup/sagas.ts index 2195db1b0ce..13e500b282b 100644 --- a/packages/web/src/common/store/pages/feed/lineup/sagas.ts +++ b/packages/web/src/common/store/pages/feed/lineup/sagas.ts @@ -3,6 +3,7 @@ import { accountSelectors, feedPageLineupActions as feedActions, feedPageSelectors, + GetSocialFeedArgs, CommonState } from '@audius/common' import { @@ -15,7 +16,6 @@ import { UserTrackMetadata, LineupTrack } from '@audius/common/models' -import { GetSocialFeedArgs } from '@audius/common/schemas' import { select, all } from 'redux-saga/effects' import { processAndCacheCollections } from 'common/store/cache/collections/utils' diff --git a/packages/web/src/common/store/pages/saved/sagas.ts b/packages/web/src/common/store/pages/saved/sagas.ts index dc8f238e756..db0108af951 100644 --- a/packages/web/src/common/store/pages/saved/sagas.ts +++ b/packages/web/src/common/store/pages/saved/sagas.ts @@ -1,8 +1,10 @@ import { + APIActivityV2, LibraryCategoryType, accountSelectors, savedPageActions as actions, getContext, + responseAdapter, savedPageSelectors, savedPageTracksLineupActions as tracksActions } from '@audius/common' @@ -12,7 +14,6 @@ import { UserTrackMetadata, User } from '@audius/common/models' -import { responseAdapter, APIActivityV2 } from '@audius/common/schemas' import { decodeHashId, encodeHashId, diff --git a/packages/web/src/common/store/pages/search-page/sagas.js b/packages/web/src/common/store/pages/search-page/sagas.js index a83b8f1b50a..99b7aaa50ad 100644 --- a/packages/web/src/common/store/pages/search-page/sagas.js +++ b/packages/web/src/common/store/pages/search-page/sagas.js @@ -3,9 +3,9 @@ import { searchResultsPageActions as searchPageActions, searchResultsPageTracksLineupActions as tracksLineupActions, SearchKind, - processAndCacheUsers + processAndCacheUsers, + FeatureFlags } from '@audius/common' -import { FeatureFlags } from '@audius/common/schemas' import { trimToAlphaNumeric, removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { diff --git a/packages/web/src/common/store/pages/signon/sagas.js b/packages/web/src/common/store/pages/signon/sagas.js index a760fb85b36..e398d15d681 100644 --- a/packages/web/src/common/store/pages/signon/sagas.js +++ b/packages/web/src/common/store/pages/signon/sagas.js @@ -1,8 +1,11 @@ import { + FeatureFlags, + MAX_HANDLE_LENGTH, accountActions, accountSelectors, cacheUsersSelectors, collectionsSocialActions, + getCityAndRegion, getContext, processAndCacheUsers, settingsPageActions, @@ -10,15 +13,10 @@ import { solanaSelectors, toastActions, confirmerActions, - confirmTransaction + confirmTransaction, + IntKeys } from '@audius/common' import { Name, FavoriteSource } from '@audius/common/models' -import { - IntKeys, - FeatureFlags, - MAX_HANDLE_LENGTH, - getCityAndRegion -} from '@audius/common/schemas' import { Genre, ELECTRONIC_SUBGENRES, diff --git a/packages/web/src/common/store/pages/track/sagas.js b/packages/web/src/common/store/pages/track/sagas.js index 5d9c914b963..9cc4943ac99 100644 --- a/packages/web/src/common/store/pages/track/sagas.js +++ b/packages/web/src/common/store/pages/track/sagas.js @@ -1,4 +1,5 @@ import { + StringKeys, cacheTracksActions as trackCacheActions, cacheTracksSelectors, cacheUsersSelectors, @@ -8,7 +9,6 @@ import { reachabilitySelectors } from '@audius/common' import { Kind } from '@audius/common/models' -import { StringKeys } from '@audius/common/schemas' import { makeUid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { keccak_256 } from 'js-sha3' diff --git a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts index d271d730410..3f8b1e95f45 100644 --- a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts @@ -1,11 +1,11 @@ import { + StringKeys, accountSelectors, trendingPlaylistsPageLineupSelectors, trendingPlaylistsPageLineupActions, getContext } from '@audius/common' import { UserCollectionMetadata } from '@audius/common/models' -import { StringKeys } from '@audius/common/schemas' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts index 51c4226cbfd..57df4d4c2e5 100644 --- a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts @@ -1,10 +1,10 @@ import { + StringKeys, accountSelectors, trendingUndergroundPageLineupSelectors, trendingUndergroundPageLineupActions, getContext } from '@audius/common' -import { StringKeys } from '@audius/common/schemas' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts index 5571907dd18..9be2483a79d 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts +++ b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts @@ -1,4 +1,5 @@ import { + StringKeys, cacheTracksSelectors, trendingPageLineupSelectors, trendingPageActions, @@ -6,7 +7,6 @@ import { getContext } from '@audius/common' import { TimeRange, ID, Track, UserTrackMetadata } from '@audius/common/models' -import { StringKeys } from '@audius/common/schemas' import { Genre, Nullable } from '@audius/common/utils' import { keccak_256 } from 'js-sha3' import { call, put, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/player/sagas.ts b/packages/web/src/common/store/player/sagas.ts index 451f021e9c7..ac9598b666b 100644 --- a/packages/web/src/common/store/player/sagas.ts +++ b/packages/web/src/common/store/player/sagas.ts @@ -10,10 +10,11 @@ import { playbackPositionActions, playbackPositionSelectors, reachabilitySelectors, - gatedContentSelectors + FeatureFlags, + gatedContentSelectors, + QueryParams } from '@audius/common' import { Kind } from '@audius/common/models' -import { FeatureFlags, QueryParams } from '@audius/common/schemas' import { Genre, encodeHashId, diff --git a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts index 679e69d6175..e763cab86ac 100644 --- a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts +++ b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts @@ -1,9 +1,10 @@ import { accountActions, getContext, - playlistUpdatesActions + IntKeys, + playlistUpdatesActions, + remoteConfigIntDefaults } from '@audius/common' -import { IntKeys, remoteConfigIntDefaults } from '@audius/common/schemas' import { call, fork, take } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/profile/sagas.js b/packages/web/src/common/store/profile/sagas.js index 1c116391411..8bf0d2c2877 100644 --- a/packages/web/src/common/store/profile/sagas.js +++ b/packages/web/src/common/store/profile/sagas.js @@ -1,4 +1,5 @@ import { + DoubleKeys, accountSelectors, cacheActions, profilePageSelectors, @@ -10,11 +11,11 @@ import { collectiblesActions, processAndCacheUsers, chatActions, + FeatureFlags, confirmerActions, confirmTransaction } from '@audius/common' import { DefaultSizes, Kind } from '@audius/common/models' -import { DoubleKeys, FeatureFlags } from '@audius/common/schemas' import { squashNewLines, makeUid, diff --git a/packages/web/src/common/store/search-bar/sagas.ts b/packages/web/src/common/store/search-bar/sagas.ts index d70a2458e34..9145598277f 100644 --- a/packages/web/src/common/store/search-bar/sagas.ts +++ b/packages/web/src/common/store/search-bar/sagas.ts @@ -1,6 +1,5 @@ -import { accountSelectors, getContext } from '@audius/common' +import { accountSelectors, getContext, FeatureFlags } from '@audius/common' import { Name } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { diff --git a/packages/web/src/common/store/social/tracks/sagas.ts b/packages/web/src/common/store/social/tracks/sagas.ts index 756330428af..746d78c01a9 100644 --- a/packages/web/src/common/store/social/tracks/sagas.ts +++ b/packages/web/src/common/store/social/tracks/sagas.ts @@ -6,11 +6,12 @@ import { gatedContentSelectors, getContext, tracksSocialActions as socialActions, + QueryParams, confirmerActions, - confirmTransaction + confirmTransaction, + FeatureFlags } from '@audius/common' import { Name, Kind, ID, Track, User } from '@audius/common/models' -import { FeatureFlags, QueryParams } from '@audius/common/schemas' import { formatShareText, encodeHashId, diff --git a/packages/web/src/common/store/tipping/sagas.ts b/packages/web/src/common/store/tipping/sagas.ts index 3731dfd4b0d..c1423c37713 100644 --- a/packages/web/src/common/store/tipping/sagas.ts +++ b/packages/web/src/common/store/tipping/sagas.ts @@ -7,8 +7,13 @@ import { walletSelectors, walletActions, getContext, + GetTipsArgs, + GetSupportingArgs, + GetSupportersArgs, + LocalStorage, processAndCacheUsers, solanaSelectors, + createUserBankIfNeeded, chatActions } from '@audius/common' import { @@ -23,13 +28,6 @@ import { BNWei, SolanaWalletAddress } from '@audius/common/models' -import { - createUserBankIfNeeded, - LocalStorage, - GetSupportingArgs, - GetSupportersArgs, - GetTipsArgs -} from '@audius/common/schemas' import { decodeHashId, isNullOrUndefined, diff --git a/packages/web/src/common/store/ui/reactions/sagas.ts b/packages/web/src/common/store/ui/reactions/sagas.ts index 67c82908431..1c3f821562e 100644 --- a/packages/web/src/common/store/ui/reactions/sagas.ts +++ b/packages/web/src/common/store/ui/reactions/sagas.ts @@ -3,9 +3,9 @@ import { reactionsMap, reactionsUIActions, reactionsUISelectors, - getContext + getContext, + AudiusBackend } from '@audius/common' -import { AudiusBackend } from '@audius/common/schemas' import { getErrorMessage, removeNullable } from '@audius/common/utils' import { call, takeEvery, all, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/upload/sagaHelpers.ts b/packages/web/src/common/store/upload/sagaHelpers.ts index 9d69022b71c..49fc27ae4cd 100644 --- a/packages/web/src/common/store/upload/sagaHelpers.ts +++ b/packages/web/src/common/store/upload/sagaHelpers.ts @@ -1,4 +1,9 @@ -import { accountSelectors, getContext, getUSDCUserBank } from '@audius/common' +import { + FeatureFlags, + accountSelectors, + getContext, + getUSDCUserBank +} from '@audius/common' import { Name, isContentCollectibleGated, @@ -7,7 +12,6 @@ import { isContentUSDCPurchaseGated, TrackMetadata } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { BN_USDC_CENT_WEI } from '@audius/common/utils' import { PublicKey } from '@solana/web3.js' import BN from 'bn.js' diff --git a/packages/web/src/common/store/user-list/mutuals/sagas.ts b/packages/web/src/common/store/user-list/mutuals/sagas.ts index 3bab0a8d65f..2558320b931 100644 --- a/packages/web/src/common/store/user-list/mutuals/sagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/sagas.ts @@ -3,10 +3,10 @@ import { UserListSagaFactory, mutualsUserListActions, mutualsUserListSelectors, - MUTUALS_USER_LIST_TAG + MUTUALS_USER_LIST_TAG, + AudiusBackend } from '@audius/common' import { ID, User } from '@audius/common/models' -import { AudiusBackend } from '@audius/common/schemas' import { put, select } from 'typed-redux-saga' import { watchMutualsError } from 'common/store/user-list/mutuals/errorSagas' diff --git a/packages/web/src/common/store/user-list/supporting/sagas.ts b/packages/web/src/common/store/user-list/supporting/sagas.ts index ce68a1ead4e..c1ce868cf1f 100644 --- a/packages/web/src/common/store/user-list/supporting/sagas.ts +++ b/packages/web/src/common/store/user-list/supporting/sagas.ts @@ -5,13 +5,11 @@ import { UserListSagaFactory, supportingUserListActions, supportingUserListSelectors, - SUPPORTING_USER_LIST_TAG -} from '@audius/common' -import { ID, UserMetadata, User } from '@audius/common/models' -import { + SUPPORTING_USER_LIST_TAG, responseAdapter as adapter, SupportingResponse -} from '@audius/common/schemas' +} from '@audius/common' +import { ID, UserMetadata, User } from '@audius/common/models' import { decodeHashId, stringWeiToBN } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/top-supporters/sagas.ts b/packages/web/src/common/store/user-list/top-supporters/sagas.ts index 477abbd4aea..5627106ce55 100644 --- a/packages/web/src/common/store/user-list/top-supporters/sagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/sagas.ts @@ -3,15 +3,13 @@ import { tippingActions, SupportersMapForUser, UserListSagaFactory, + SupporterResponse, topSupportersUserListSelectors, topSupportersUserListActions, - TOP_SUPPORTERS_USER_LIST_TAG + TOP_SUPPORTERS_USER_LIST_TAG, + responseAdapter as adapter } from '@audius/common' import { ID, User } from '@audius/common/models' -import { - responseAdapter as adapter, - SupporterResponse -} from '@audius/common/schemas' import { decodeHashId, removeNullable } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/utils.ts b/packages/web/src/common/store/user-list/utils.ts index 83beade6d16..075b0b3be32 100644 --- a/packages/web/src/common/store/user-list/utils.ts +++ b/packages/web/src/common/store/user-list/utils.ts @@ -1,10 +1,11 @@ import { accountSelectors, getContext, + AudiusAPIClient, + AudiusBackend, processAndCacheUsers } from '@audius/common' import { ID, UserMetadata, User } from '@audius/common/models' -import { AudiusAPIClient, AudiusBackend } from '@audius/common/schemas' import { call, select } from 'typed-redux-saga' import { AppState } from 'store/types' diff --git a/packages/web/src/common/store/wallet/sagas.ts b/packages/web/src/common/store/wallet/sagas.ts index 569f15ee63c..e56603dba4c 100644 --- a/packages/web/src/common/store/wallet/sagas.ts +++ b/packages/web/src/common/store/wallet/sagas.ts @@ -1,4 +1,5 @@ import { + FeatureFlags, accountSelectors, accountActions, tokenDashboardPageActions, @@ -6,6 +7,7 @@ import { InputSendDataAction, walletActions, getContext, + createUserBankIfNeeded, solanaSelectors } from '@audius/common' import { @@ -15,7 +17,6 @@ import { BNWei, SolanaWalletAddress } from '@audius/common/models' -import { FeatureFlags, createUserBankIfNeeded } from '@audius/common/schemas' import { getErrorMessage, isNullOrUndefined, diff --git a/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx b/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx index a5a7baef3d6..717aab2fa4d 100644 --- a/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx +++ b/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx @@ -3,9 +3,9 @@ import { useCallback, useMemo } from 'react' import { buyAudioActions, buyAudioSelectors, - OnRampProvider + OnRampProvider, + StringKeys } from '@audius/common' -import { StringKeys } from '@audius/common/schemas' import { useDispatch, useSelector } from 'react-redux' import { useRemoteVar } from 'hooks/useRemoteConfig' diff --git a/packages/web/src/components/collection/mobile/CollectionHeader.jsx b/packages/web/src/components/collection/mobile/CollectionHeader.jsx index bcc81ee356c..3097da7081b 100644 --- a/packages/web/src/components/collection/mobile/CollectionHeader.jsx +++ b/packages/web/src/components/collection/mobile/CollectionHeader.jsx @@ -1,8 +1,7 @@ import { memo } from 'react' -import { OverflowAction } from '@audius/common' +import { OverflowAction, FeatureFlags } from '@audius/common' import { Variant, SquareSizes } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { formatCount, formatSecondsAsText, diff --git a/packages/web/src/components/data-entry/FormTile.jsx b/packages/web/src/components/data-entry/FormTile.jsx index 3ceebaa6e47..7eb0f706b5b 100644 --- a/packages/web/src/components/data-entry/FormTile.jsx +++ b/packages/web/src/components/data-entry/FormTile.jsx @@ -1,6 +1,7 @@ import { Component, useState, useCallback } from 'react' -import { FeatureFlags, createRemixOfMetadata } from '@audius/common/schemas' +import { FeatureFlags } from '@audius/common' +import { createRemixOfMetadata } from '@audius/common/schemas' import { creativeCommons, getCanonicalName, diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index bacd864f2bb..f292c718c1b 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -1,6 +1,7 @@ import { useEffect, useState, useCallback } from 'react' import { + RandomImage, accountSelectors, cacheCollectionsActions, collectionPageLineupActions as tracksActions, @@ -11,7 +12,7 @@ import { } from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' import { SquareSizes, Collection, ID } from '@audius/common/models' -import { RandomImage, newCollectionMetadata } from '@audius/common/schemas' +import { newCollectionMetadata } from '@audius/common/schemas' import { Nullable } from '@audius/common/utils' import { capitalize } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx index de5718d1947..0ea8da07ceb 100644 --- a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx +++ b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx @@ -1,11 +1,10 @@ import { useCallback, useEffect, useRef, useState } from 'react' -import { accountSelectors } from '@audius/common' +import { FeatureFlags, accountSelectors } from '@audius/common' import { OverrideSetting, FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' -import { FeatureFlags } from '@audius/common/schemas' import { Modal, ModalContent, diff --git a/packages/web/src/components/feature-flag/FeatureFlag.tsx b/packages/web/src/components/feature-flag/FeatureFlag.tsx index 75a1d8e84b1..46c4b57d07d 100644 --- a/packages/web/src/components/feature-flag/FeatureFlag.tsx +++ b/packages/web/src/components/feature-flag/FeatureFlag.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react' -import { FeatureFlags } from '@audius/common/schemas' +import { FeatureFlags } from '@audius/common' import { useFlag } from 'hooks/useRemoteConfig' diff --git a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx index f1e01b26df1..0c51a884410 100644 --- a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx +++ b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx @@ -1,8 +1,7 @@ import { useState, useCallback, useRef, useContext } from 'react' -import { accountSelectors, badgeTiers } from '@audius/common' +import { RandomImage, accountSelectors, badgeTiers } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' -import { RandomImage } from '@audius/common/schemas' import { removeNullable } from '@audius/common/utils' import { Button, ButtonType, Popup, SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/menu/TrackMenu.tsx b/packages/web/src/components/menu/TrackMenu.tsx index 57409b2f0ea..8d71778c507 100644 --- a/packages/web/src/components/menu/TrackMenu.tsx +++ b/packages/web/src/components/menu/TrackMenu.tsx @@ -8,6 +8,7 @@ import { playbackPositionSelectors, tracksSocialActions, addToCollectionUIActions, + FeatureFlags, CommonState, useEditTrackModal } from '@audius/common' @@ -18,7 +19,6 @@ import { PlayableType, ID } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Genre } from '@audius/common/utils' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/nav/desktop/NavHeader.tsx b/packages/web/src/components/nav/desktop/NavHeader.tsx index 3f1d673cedc..b669becacd7 100644 --- a/packages/web/src/components/nav/desktop/NavHeader.tsx +++ b/packages/web/src/components/nav/desktop/NavHeader.tsx @@ -1,12 +1,12 @@ import { useCallback, useRef } from 'react' import { + FeatureFlags, accountSelectors, notificationsSelectors, themeSelectors } from '@audius/common' import { Name, Theme } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx index f56d7d5121a..8bffb1a2893 100644 --- a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx +++ b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx @@ -1,7 +1,6 @@ -import { chatSelectors } from '@audius/common' +import { FeatureFlags, chatSelectors, StringKeys } from '@audius/common' import { useAccountHasClaimableRewards } from '@audius/common/hooks' import { Name } from '@audius/common/models' -import { StringKeys, FeatureFlags } from '@audius/common/schemas' import { removeNullable } from '@audius/common/utils' import { IconCrown, diff --git a/packages/web/src/components/nav/mobile/NavBar.tsx b/packages/web/src/components/nav/mobile/NavBar.tsx index 180b1b72669..5becf51428b 100644 --- a/packages/web/src/components/nav/mobile/NavBar.tsx +++ b/packages/web/src/components/nav/mobile/NavBar.tsx @@ -1,7 +1,7 @@ import { useState, useContext, useCallback, useEffect } from 'react' +import { FeatureFlags } from '@audius/common' import { Status } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { formatCount } from '@audius/common/utils' import { IconCaretRight, diff --git a/packages/web/src/components/notice/Notice.tsx b/packages/web/src/components/notice/Notice.tsx index 54d45196ac8..53b4f1acca6 100644 --- a/packages/web/src/components/notice/Notice.tsx +++ b/packages/web/src/components/notice/Notice.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useState } from 'react' -import { StringKeys } from '@audius/common/schemas' +import { StringKeys } from '@audius/common' import { IconRemove } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/now-playing/NowPlaying.tsx b/packages/web/src/components/now-playing/NowPlaying.tsx index 3c25e7ab467..3890a9f2f0e 100644 --- a/packages/web/src/components/now-playing/NowPlaying.tsx +++ b/packages/web/src/components/now-playing/NowPlaying.tsx @@ -16,7 +16,8 @@ import { queueSelectors, playbackRateValueMap, gatedContentSelectors, - usePremiumContentPurchaseModal + usePremiumContentPurchaseModal, + FeatureFlags } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { @@ -30,7 +31,6 @@ import { SquareSizes, ID } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { Location } from 'history' diff --git a/packages/web/src/components/play-bar/desktop/PlayBar.jsx b/packages/web/src/components/play-bar/desktop/PlayBar.jsx index 26567f0e131..9d5d6900573 100644 --- a/packages/web/src/components/play-bar/desktop/PlayBar.jsx +++ b/packages/web/src/components/play-bar/desktop/PlayBar.jsx @@ -10,6 +10,7 @@ import { playerActions, playerSelectors, queueSelectors, + FeatureFlags, playbackRateValueMap, cacheTracksSelectors } from '@audius/common' @@ -20,7 +21,6 @@ import { PlaybackSource, Kind } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx index c9e0b901013..3f3d9db72f5 100644 --- a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx @@ -7,7 +7,8 @@ import { purchaseContentActions, purchaseContentSelectors, isContentPurchaseInProgress, - PurchaseContentPage + PurchaseContentPage, + FeatureFlags } from '@audius/common' import { useGetTrackById } from '@audius/common/api' import { @@ -18,7 +19,6 @@ import { isTrackPurchaseable } from '@audius/common/hooks' import { PurchaseVendor, Track } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { USDC } from '@audius/fixed-decimal' import { Flex } from '@audius/harmony' import { diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx index 47e42f4e17b..87ca3347cad 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect } from 'react' -import { PurchaseContentStage } from '@audius/common' +import { PurchaseContentStage, FeatureFlags, IntKeys } from '@audius/common' import { useFeatureFlag, useRemoteVar, @@ -11,7 +11,6 @@ import { usePurchaseMethod } from '@audius/common/hooks' import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' -import { IntKeys, FeatureFlags } from '@audius/common/schemas' import { Flex } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/components/related-artists/RelatedArtists.tsx b/packages/web/src/components/related-artists/RelatedArtists.tsx index 0691320c4d6..661c71a3811 100644 --- a/packages/web/src/components/related-artists/RelatedArtists.tsx +++ b/packages/web/src/components/related-artists/RelatedArtists.tsx @@ -1,9 +1,8 @@ import { useCallback } from 'react' -import { profilePageSelectors } from '@audius/common' +import { profilePageSelectors, FeatureFlags } from '@audius/common' import { useGetRelatedArtists } from '@audius/common/api' import { User } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { MAX_PROFILE_RELATED_ARTISTS } from '@audius/common/utils' import { IconUserGroup } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/share-modal/ShareModal.tsx b/packages/web/src/components/share-modal/ShareModal.tsx index 7cb6e69c051..7a38de30e53 100644 --- a/packages/web/src/components/share-modal/ShareModal.tsx +++ b/packages/web/src/components/share-modal/ShareModal.tsx @@ -1,6 +1,7 @@ import { useCallback, useContext } from 'react' import { + FeatureFlags, accountSelectors, collectionsSocialActions, tracksSocialActions, @@ -11,7 +12,6 @@ import { useCreateChatModal } from '@audius/common' import { Name, PlayableType } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { useDispatch } from 'react-redux' import { make, useRecord } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/social-proof/SocialProof.tsx b/packages/web/src/components/social-proof/SocialProof.tsx index 4c0bc7e7bdd..f62fcd3643b 100644 --- a/packages/web/src/components/social-proof/SocialProof.tsx +++ b/packages/web/src/components/social-proof/SocialProof.tsx @@ -1,6 +1,7 @@ import { useCallback, useEffect, useState } from 'react' import { + BooleanKeys, accountSelectors, TwitterProfile, InstagramProfile, @@ -8,7 +9,6 @@ import { TikTokProfile } from '@audius/common' import { Name, Status } from '@audius/common/models' -import { BooleanKeys } from '@audius/common/schemas' import { useDispatch, useSelector } from 'react-redux' import IconValidationX from 'assets/img/iconValidationX.svg' diff --git a/packages/web/src/components/stat-banner/StatBanner.tsx b/packages/web/src/components/stat-banner/StatBanner.tsx index e9cc08082f7..c05bf2d6f11 100644 --- a/packages/web/src/components/stat-banner/StatBanner.tsx +++ b/packages/web/src/components/stat-banner/StatBanner.tsx @@ -1,7 +1,7 @@ import { useRef } from 'react' +import { FeatureFlags } from '@audius/common' import { ID } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Button, ButtonSize, diff --git a/packages/web/src/components/tipping/tip-audio/SendTip.tsx b/packages/web/src/components/tipping/tip-audio/SendTip.tsx index 1269841aa86..556ba6e94fb 100644 --- a/packages/web/src/components/tipping/tip-audio/SendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/SendTip.tsx @@ -13,11 +13,12 @@ import { walletSelectors, getTierAndNumberForBalance, OnRampProvider, - buyAudioActions + buyAudioActions, + FeatureFlags, + StringKeys } from '@audius/common' import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import { BadgeTier, StringWei, StringAudio, BNWei } from '@audius/common/models' -import { StringKeys, FeatureFlags } from '@audius/common/schemas' import { isNullOrUndefined, stringWeiToBN, diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx index aa49e359061..d7a125a6c15 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx @@ -5,9 +5,9 @@ import { tippingActions, TippingSendStatus, walletActions, + StringKeys, accountSelectors } from '@audius/common' -import { StringKeys } from '@audius/common/schemas' import { Nullable } from '@audius/common/utils' import { Modal, ModalHeader, ModalTitle } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/tipping/tip-audio/TipSent.tsx b/packages/web/src/components/tipping/tip-audio/TipSent.tsx index 85f585eabfb..23ae01dd2a9 100644 --- a/packages/web/src/components/tipping/tip-audio/TipSent.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipSent.tsx @@ -1,8 +1,11 @@ import { useCallback } from 'react' -import { accountSelectors, tippingSelectors } from '@audius/common' +import { + accountSelectors, + tippingSelectors, + deriveUserBankAddress +} from '@audius/common' import { Name } from '@audius/common/models' -import { deriveUserBankAddress } from '@audius/common/schemas' import { formatNumberCommas } from '@audius/common/utils' import { Button, ButtonType, IconTwitterBird, IconCheck } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx index 45fd19346eb..e09f193579a 100644 --- a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx +++ b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx @@ -15,7 +15,8 @@ import { modalsSelectors, queueSelectors, shareModalUIActions, - useEditPlaylistModal + useEditPlaylistModal, + FeatureFlags } from '@audius/common' import { ShareSource, @@ -24,7 +25,6 @@ import { FollowSource, ID } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/CardTitle.tsx b/packages/web/src/components/track/CardTitle.tsx index eb40f126408..4afcf4c4f5d 100644 --- a/packages/web/src/components/track/CardTitle.tsx +++ b/packages/web/src/components/track/CardTitle.tsx @@ -1,9 +1,9 @@ +import { FeatureFlags } from '@audius/common' import { isContentCollectibleGated, isContentUSDCPurchaseGated, AccessConditions } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Nullable } from '@audius/common/utils' import { IconCart, IconCollectible, IconSpecialAccess } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/GiantTrackTile.tsx b/packages/web/src/components/track/GiantTrackTile.tsx index 7458520d8a3..badbc5b7c90 100644 --- a/packages/web/src/components/track/GiantTrackTile.tsx +++ b/packages/web/src/components/track/GiantTrackTile.tsx @@ -1,6 +1,7 @@ import { useCallback, useState } from 'react' import { + FeatureFlags, publishTrackConfirmationModalUIActions, CommonState, cacheTracksSelectors @@ -13,7 +14,6 @@ import { Remix, AccessConditions } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Genre, getCanonicalName, diff --git a/packages/web/src/components/track/PlayPauseButton.tsx b/packages/web/src/components/track/PlayPauseButton.tsx index 76db2719919..c042ca64774 100644 --- a/packages/web/src/components/track/PlayPauseButton.tsx +++ b/packages/web/src/components/track/PlayPauseButton.tsx @@ -1,11 +1,11 @@ import { + FeatureFlags, accountSelectors, playerSelectors, playbackPositionSelectors, CommonState } from '@audius/common' import { ID } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Button } from '@audius/harmony' import { IconPause, IconPlay } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/TrackTile.tsx b/packages/web/src/components/track/desktop/TrackTile.tsx index 159dffd7bfb..3a18314b7af 100644 --- a/packages/web/src/components/track/desktop/TrackTile.tsx +++ b/packages/web/src/components/track/desktop/TrackTile.tsx @@ -3,11 +3,11 @@ import { memo } from 'react' import { accountSelectors, playbackPositionSelectors, + FeatureFlags, CommonState, usePremiumContentPurchaseModal } from '@audius/common' import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { formatCount, Genre, diff --git a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx index d93c7268d08..9331d694dd4 100644 --- a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx @@ -13,7 +13,8 @@ import { RepostType, favoritesUserListActions, repostsUserListActions, - playerSelectors + playerSelectors, + FeatureFlags } from '@audius/common' import { Name, @@ -25,7 +26,6 @@ import { ID, Track } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx index c325a013fd3..68493055684 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx @@ -6,10 +6,10 @@ import { tracksSocialActions, OverflowAction, OverflowSource, - mobileOverflowMenuUIActions + mobileOverflowMenuUIActions, + FeatureFlags } from '@audius/common' import { RepostSource, FavoriteSource, ID } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx index 3750c975475..f530d1e36b8 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx @@ -13,7 +13,8 @@ import { RepostType, repostsUserListActions, favoritesUserListActions, - playerSelectors + playerSelectors, + FeatureFlags } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { @@ -23,7 +24,6 @@ import { FavoriteType, ID } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Genre } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/upload/TrackPreviewNew.tsx b/packages/web/src/components/upload/TrackPreviewNew.tsx index 28542d9e1fd..fd4af17e068 100644 --- a/packages/web/src/components/upload/TrackPreviewNew.tsx +++ b/packages/web/src/components/upload/TrackPreviewNew.tsx @@ -1,8 +1,8 @@ import { useState } from 'react' +import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { StemCategory, stemCategoryFriendlyNames } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Box, FilterButton, Flex, IconPenSquare } from '@audius/harmony' import { HarmonyPlainButton, IconTrash } from '@audius/stems' import numeral from 'numeral' diff --git a/packages/web/src/components/upload/UploadChip.tsx b/packages/web/src/components/upload/UploadChip.tsx index 62fd841bce7..0219160314f 100644 --- a/packages/web/src/components/upload/UploadChip.tsx +++ b/packages/web/src/components/upload/UploadChip.tsx @@ -1,8 +1,7 @@ import { Ref, useCallback, useMemo } from 'react' -import { cacheCollectionsActions } from '@audius/common' +import { FeatureFlags, cacheCollectionsActions } from '@audius/common' import { Name, CreatePlaylistSource } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Box, HTMLButtonProps, diff --git a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx index 500121c478a..ab8f6acb758 100644 --- a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx @@ -5,7 +5,9 @@ import { WithdrawUSDCModalPages, withdrawUSDCActions, withdrawUSDCSelectors, - WithdrawMethod + WithdrawMethod, + FeatureFlags, + IntKeys } from '@audius/common' import { useFeatureFlag, @@ -18,7 +20,6 @@ import { BNUSDC, SolanaWalletAddress } from '@audius/common/models' -import { IntKeys, FeatureFlags } from '@audius/common/schemas' import { formatUSDCWeiToFloorCentsNumber, Nullable } from '@audius/common/utils' import { Modal, ModalContent, ModalHeader } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx index d0f97251a6f..0c6811a3900 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx @@ -8,11 +8,11 @@ import { import { useWithdrawUSDCModal, WithdrawUSDCModalPages, - WithdrawMethod + WithdrawMethod, + FeatureFlags } from '@audius/common' import { useFeatureFlag, useUSDCBalance } from '@audius/common/hooks' import { Name, BNUSDC } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { filterDecimalString, padDecimalValue, diff --git a/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts b/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts index 4956dcc65ce..7f85ebf8b44 100644 --- a/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts +++ b/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts @@ -1,4 +1,4 @@ -import { FeatureFlags } from '@audius/common/schemas' +import { FeatureFlags } from '@audius/common' import { useFlag } from './useRemoteConfig' diff --git a/packages/web/src/hooks/useIsUSDCEnabled.ts b/packages/web/src/hooks/useIsUSDCEnabled.ts index 2fe6834407f..cfae7b378db 100644 --- a/packages/web/src/hooks/useIsUSDCEnabled.ts +++ b/packages/web/src/hooks/useIsUSDCEnabled.ts @@ -1,5 +1,5 @@ +import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' -import { FeatureFlags } from '@audius/common/schemas' export const useIsUSDCEnabled = () => useFeatureFlag(FeatureFlags.USDC_PURCHASES).isEnabled diff --git a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx index 928492222c0..a311122b175 100644 --- a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx +++ b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx @@ -1,7 +1,11 @@ import { ReactNode, useContext, useEffect } from 'react' -import { tokenDashboardPageActions, walletActions } from '@audius/common' -import { StringKeys, FeatureFlags } from '@audius/common/schemas' +import { + FeatureFlags, + StringKeys, + tokenDashboardPageActions, + walletActions +} from '@audius/common' import { useDispatch } from 'react-redux' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx index 8a2b4ff5045..435ead8a373 100644 --- a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx @@ -1,6 +1,7 @@ import { ReactNode, useEffect, useMemo, useState } from 'react' import { + StringKeys, challengesSelectors, audioRewardsPageActions, ChallengeRewardsModalType, @@ -12,7 +13,6 @@ import { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common/models' -import { StringKeys } from '@audius/common/schemas' import { fillString, formatNumberCommas, diff --git a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx index fded67089f0..0196b2e2275 100644 --- a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx @@ -1,11 +1,10 @@ import { ReactNode } from 'react' -import { audioRewardsPageActions } from '@audius/common' +import { StringKeys, audioRewardsPageActions } from '@audius/common' import { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common/models' -import { StringKeys } from '@audius/common/schemas' import { ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx index 64d399e716f..78583f92450 100644 --- a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx @@ -1,6 +1,7 @@ import { ReactNode, useCallback } from 'react' import { + FeatureFlags, accountSelectors, tokenDashboardPageActions, TokenDashboardPageModalState, @@ -8,7 +9,6 @@ import { walletSelectors } from '@audius/common' import { Chain, StringWei, BNWei, WalletAddress } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { stringWeiToBN, weiToString, Nullable } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx index 17b11dec7bf..7b184a95a08 100644 --- a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx @@ -1,6 +1,6 @@ +import { FeatureFlags } from '@audius/common' import { useCreateUserbankIfNeeded } from '@audius/common/hooks' import { WalletAddress, SolanaWalletAddress } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { Button, ButtonType, LogoSol } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx index 3219caa697b..0a4c0453648 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx @@ -1,5 +1,6 @@ import { useCallback, useMemo, useState } from 'react' +import { FeatureFlags, IntKeys, MIN_TRANSFERRABLE_WEI } from '@audius/common' import { Chain, StringWei, @@ -9,11 +10,6 @@ import { WalletAddress, SolanaWalletAddress } from '@audius/common/models' -import { - IntKeys, - FeatureFlags, - MIN_TRANSFERRABLE_WEI -} from '@audius/common/schemas' import { weiToAudio, stringWeiToBN, diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx index cd4ff7731f5..1fd63ecd06d 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx @@ -5,10 +5,12 @@ import { walletSelectors, tokenDashboardPageSelectors, buyAudioActions, - OnRampProvider + OnRampProvider, + FeatureFlags, + StringKeys, + Location } from '@audius/common' import { Client, BNWei } from '@audius/common/models' -import { StringKeys, FeatureFlags, Location } from '@audius/common/schemas' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Button, ButtonType, IconInfo } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx index b84133ac552..a6acec01522 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx @@ -1,12 +1,12 @@ import { useCallback, useEffect, useState } from 'react' import { + StringKeys, audioRewardsPageActions, TrendingRewardsModalType, audioRewardsPageSelectors } from '@audius/common' import { Theme } from '@audius/common/models' -import { StringKeys } from '@audius/common/schemas' import { SegmentedControl, ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/ChatPage.tsx b/packages/web/src/pages/chat-page/ChatPage.tsx index 8daaf7ed920..f61bec24a72 100644 --- a/packages/web/src/pages/chat-page/ChatPage.tsx +++ b/packages/web/src/pages/chat-page/ChatPage.tsx @@ -1,8 +1,7 @@ import { useCallback, useEffect, useRef } from 'react' -import { chatActions, chatSelectors } from '@audius/common' +import { chatActions, FeatureFlags, chatSelectors } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' -import { FeatureFlags } from '@audius/common/schemas' import { ResizeObserver } from '@juggle/resize-observer' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx index 1b00af6e55b..14bd6a36e88 100644 --- a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx @@ -3,7 +3,8 @@ import { ChangeEvent, useMemo } from 'react' import { CollectionTrack, CollectionPageTrackRecord, - CollectionsPageType + CollectionsPageType, + FeatureFlags } from '@audius/common' import { Variant, @@ -14,7 +15,6 @@ import { ID, User } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { CollectiblesPlaylistTableColumn, diff --git a/packages/web/src/pages/dashboard-page/store/sagas.ts b/packages/web/src/pages/dashboard-page/store/sagas.ts index 964b6bc7705..eb7b4598705 100644 --- a/packages/web/src/pages/dashboard-page/store/sagas.ts +++ b/packages/web/src/pages/dashboard-page/store/sagas.ts @@ -1,6 +1,10 @@ -import { accountSelectors, walletActions, getContext } from '@audius/common' +import { + IntKeys, + accountSelectors, + walletActions, + getContext +} from '@audius/common' import { Collection, ID, Track } from '@audius/common/models' -import { IntKeys } from '@audius/common/schemas' import { waitForValue, doEvery } from '@audius/common/utils' import { each } from 'lodash' import moment from 'moment' diff --git a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx index d9f3cd99032..22e054894a2 100644 --- a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx +++ b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx @@ -1,7 +1,9 @@ -import { feedPageLineupActions as feedActions } from '@audius/common' +import { + feedPageLineupActions as feedActions, + FeatureFlags +} from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { Name, FeedFilter } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { make, useRecord } from 'common/store/analytics/actions' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx b/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx index 6541e1bace7..70e00bd874e 100644 --- a/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' import { + FeatureFlags, Notifications, BrowserNotificationSetting, EmailFrequency } from '@audius/common' -import { FeatureFlags } from '@audius/common/schemas' import { Modal, SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx index 80d6a217624..d0c14ddef82 100644 --- a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx @@ -7,10 +7,10 @@ import { BrowserNotificationSetting, EmailFrequency, TikTokProfile, + FeatureFlags, settingsPageSelectors } from '@audius/common' import { OS, Theme, ID, ProfilePictureSizes } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { removeNullable } from '@audius/common/utils' import { IconAppearance } from '@audius/harmony' import { diff --git a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx index ac87990ffa8..2eb874c830c 100644 --- a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx @@ -1,6 +1,7 @@ import { useCallback, useState } from 'react' import { + BooleanKeys, TwitterProfile, InstagramProfile, musicConfettiActions, @@ -13,7 +14,6 @@ import { ID, ProfilePictureSizes } from '@audius/common/models' -import { BooleanKeys } from '@audius/common/schemas' import { Modal, Button, ButtonType, IconNote, ButtonSize } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx index cf9baa636f9..23d3f8adf13 100644 --- a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx @@ -1,6 +1,11 @@ import { useCallback, useState } from 'react' -import { InstagramProfile, TwitterProfile, TikTokProfile } from '@audius/common' +import { + BooleanKeys, + InstagramProfile, + TwitterProfile, + TikTokProfile +} from '@audius/common' import { Name, SquareSizes, @@ -8,7 +13,6 @@ import { ID, ProfilePictureSizes } from '@audius/common/models' -import { BooleanKeys } from '@audius/common/schemas' import { Button, ButtonSize, diff --git a/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx b/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx index 362826fcd50..a3e5d5f281c 100644 --- a/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx +++ b/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx @@ -1,7 +1,11 @@ import { useCallback } from 'react' -import { InstagramProfile, TikTokProfile, TwitterProfile } from '@audius/common' -import { BooleanKeys } from '@audius/common/schemas' +import { + BooleanKeys, + InstagramProfile, + TikTokProfile, + TwitterProfile +} from '@audius/common' import { IconImage, IconUser, IconVerified } from '@audius/stems' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/sign-on/components/ProfileForm.tsx b/packages/web/src/pages/sign-on/components/ProfileForm.tsx index 5db872fd1f1..34e3f43123e 100644 --- a/packages/web/src/pages/sign-on/components/ProfileForm.tsx +++ b/packages/web/src/pages/sign-on/components/ProfileForm.tsx @@ -1,10 +1,10 @@ import { KeyboardEventHandler, useState } from 'react' -import { imageProfilePicEmpty as profilePicEmpty } from '@audius/common' import { - MAX_HANDLE_LENGTH, - MAX_DISPLAY_NAME_LENGTH -} from '@audius/common/schemas' + imageProfilePicEmpty as profilePicEmpty, + MAX_DISPLAY_NAME_LENGTH, + MAX_HANDLE_LENGTH +} from '@audius/common' import { getErrorMessage } from '@audius/common/utils' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-on/components/ProfilePage.tsx b/packages/web/src/pages/sign-on/components/ProfilePage.tsx index eb7f74511a6..04291f9c0c9 100644 --- a/packages/web/src/pages/sign-on/components/ProfilePage.tsx +++ b/packages/web/src/pages/sign-on/components/ProfilePage.tsx @@ -4,13 +4,11 @@ import { Image, InstagramProfile, TwitterProfile, + formatInstagramProfile, + formatTwitterProfile, + formatTikTokProfile, TikTokProfile } from '@audius/common' -import { - formatTwitterProfile, - formatInstagramProfile, - formatTikTokProfile -} from '@audius/common/schemas' import cn from 'classnames' import IconCaretLeft from 'assets/img/iconCaretLeft.svg' diff --git a/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx b/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx index c08a7e40d94..8b3b3f8cc27 100644 --- a/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx +++ b/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx @@ -1,6 +1,6 @@ import { Component } from 'react' -import { BackendUtils as Utils } from '@audius/common/schemas' +import { BackendUtils as Utils } from '@audius/common' import { Box, Text } from '@audius/harmony' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-up-page/components/HandleField.tsx b/packages/web/src/pages/sign-up-page/components/HandleField.tsx index b978b6ce0b6..c6304782c3f 100644 --- a/packages/web/src/pages/sign-up-page/components/HandleField.tsx +++ b/packages/web/src/pages/sign-up-page/components/HandleField.tsx @@ -1,14 +1,12 @@ import { Ref, forwardRef, useCallback, useContext } from 'react' +import { MAX_HANDLE_LENGTH } from '@audius/common' import { useIsWaitingForValidation } from '@audius/common/hooks' import { socialMediaMessages, pickHandlePageMessages as messages } from '@audius/common/messages' -import { - MAX_HANDLE_LENGTH, - pickHandleErrorMessages -} from '@audius/common/schemas' +import { pickHandleErrorMessages } from '@audius/common/schemas' import { TextLink } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx index 96da2d4348a..1a7968b4317 100644 --- a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx +++ b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react' +import { BooleanKeys } from '@audius/common' import { socialMediaMessages } from '@audius/common/messages' -import { BooleanKeys } from '@audius/common/schemas' import { Box, Flex, SocialButton } from '@audius/harmony' import { ToastContext } from 'components/toast/ToastContext' diff --git a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts index d8a6ef337c4..2b997d74f02 100644 --- a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts +++ b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts @@ -2,17 +2,15 @@ import { useContext } from 'react' import { AudiusQueryContext, + formatInstagramProfile, + formatTikTokProfile, + formatTwitterProfile, InstagramProfile, TikTokProfile, TwitterProfile } from '@audius/common' import { Name } from '@audius/common/models' -import { - formatTwitterProfile, - formatInstagramProfile, - formatTikTokProfile, - pickHandleSchema -} from '@audius/common/schemas' +import { pickHandleSchema } from '@audius/common/schemas' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx index 30bfca3a490..38eaeb13ae7 100644 --- a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx @@ -1,11 +1,9 @@ import { useCallback, useRef } from 'react' +import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' -import { - MAX_DISPLAY_NAME_LENGTH, - finishProfileSchema -} from '@audius/common/schemas' +import { finishProfileSchema } from '@audius/common/schemas' import { Flex, Paper, PlainButton, Text, useTheme } from '@audius/harmony' import { Formik, Form, useField, useFormikContext } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx index e3b507e5787..066600aedae 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx @@ -1,6 +1,10 @@ import { useCallback } from 'react' -import { OverflowAction, imageBlank as placeholderArt } from '@audius/common' +import { + OverflowAction, + imageBlank as placeholderArt, + FeatureFlags +} from '@audius/common' import { SquareSizes, isContentCollectibleGated, @@ -11,7 +15,6 @@ import { Remix, AccessConditions } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { getCanonicalName, formatSeconds, diff --git a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx index 0f755d4e14b..4f8b298be69 100644 --- a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx +++ b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors, FeatureFlags } from '@audius/common' import { USDCPurchaseConfig, useFeatureFlag, @@ -21,7 +21,6 @@ import { USDCPurchaseConditions, AccessConditions } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { formatPrice, Nullable } from '@audius/common/utils' import { IconCart, diff --git a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx index af32530acd6..c172db5806c 100644 --- a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' +import { FeatureFlags } from '@audius/common' import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' import { Name, TrackAvailabilityType, AccessConditions } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/schemas' import { IconCart, IconStars } from '@audius/stems' import { ExternalLink } from 'components/link' diff --git a/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx b/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx index 2a3ec67c997..c61cb856986 100644 --- a/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx +++ b/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx @@ -1,6 +1,6 @@ import { useCallback, useContext, useMemo } from 'react' -import { FeatureFlags } from '@audius/common/schemas' +import { FeatureFlags } from '@audius/common' import { HarmonyPlainButton, IconCaretRight } from '@audius/stems' import cn from 'classnames' import { Form, Formik, FormikProps, useField } from 'formik' diff --git a/packages/web/src/pages/upload-page/pages/SelectPage.tsx b/packages/web/src/pages/upload-page/pages/SelectPage.tsx index 33c3c408da1..0eb8c2555c8 100644 --- a/packages/web/src/pages/upload-page/pages/SelectPage.tsx +++ b/packages/web/src/pages/upload-page/pages/SelectPage.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import { UploadType } from '@audius/common' -import { FeatureFlags, newCollectionMetadata } from '@audius/common/schemas' +import { UploadType, FeatureFlags } from '@audius/common' +import { newCollectionMetadata } from '@audius/common/schemas' import { removeNullable, Nullable } from '@audius/common/utils' import { Box } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/services/Location.ts b/packages/web/src/services/Location.ts index ea7f9e97536..83baa99fe12 100644 --- a/packages/web/src/services/Location.ts +++ b/packages/web/src/services/Location.ts @@ -1,4 +1,4 @@ -import { getLocation as getLocationCommon } from '@audius/common/schemas' +import { getLocation as getLocationCommon } from '@audius/common' import { localStorage } from 'services/local-storage' diff --git a/packages/web/src/services/audius-api-client/apiClient.ts b/packages/web/src/services/audius-api-client/apiClient.ts index ac53c33a0fb..a355d6ee5af 100644 --- a/packages/web/src/services/audius-api-client/apiClient.ts +++ b/packages/web/src/services/audius-api-client/apiClient.ts @@ -1,4 +1,4 @@ -import { AudiusAPIClient } from '@audius/common/schemas' +import { AudiusAPIClient } from '@audius/common' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' import { waitForLibsInit } from 'services/audius-backend/eagerLoadUtils' diff --git a/packages/web/src/services/audius-backend/BuyAudio.ts b/packages/web/src/services/audius-backend/BuyAudio.ts index d4b3c7dda28..41d188b041e 100644 --- a/packages/web/src/services/audius-backend/BuyAudio.ts +++ b/packages/web/src/services/audius-backend/BuyAudio.ts @@ -1,5 +1,4 @@ -import { InAppAudioPurchaseMetadata } from '@audius/common' -import { MEMO_PROGRAM_ID } from '@audius/common/schemas' +import { InAppAudioPurchaseMetadata, MEMO_PROGRAM_ID } from '@audius/common' import { TokenAccountNotFoundError, createTransferCheckedInstruction, diff --git a/packages/web/src/services/audius-backend/Cognito.ts b/packages/web/src/services/audius-backend/Cognito.ts index 8a7b5999d59..f1143bd119f 100644 --- a/packages/web/src/services/audius-backend/Cognito.ts +++ b/packages/web/src/services/audius-backend/Cognito.ts @@ -1,4 +1,4 @@ -import { AuthHeaders } from '@audius/common/schemas' +import { AuthHeaders } from '@audius/common' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' import { waitForLibsInit } from 'services/audius-backend/eagerLoadUtils' diff --git a/packages/web/src/services/audius-backend/audius-backend-instance.ts b/packages/web/src/services/audius-backend/audius-backend-instance.ts index 97890401bbe..9155bc12fad 100644 --- a/packages/web/src/services/audius-backend/audius-backend-instance.ts +++ b/packages/web/src/services/audius-backend/audius-backend-instance.ts @@ -1,4 +1,4 @@ -import { audiusBackend } from '@audius/common/schemas' +import { audiusBackend } from '@audius/common' import type { AudiusLibs } from '@audius/sdk' import { track } from 'services/analytics' diff --git a/packages/web/src/services/audius-backend/eagerLoadUtils.ts b/packages/web/src/services/audius-backend/eagerLoadUtils.ts index eb9be73ebaf..fdb65edde68 100644 --- a/packages/web/src/services/audius-backend/eagerLoadUtils.ts +++ b/packages/web/src/services/audius-backend/eagerLoadUtils.ts @@ -1,9 +1,10 @@ -import { getEagerDiscprov, makeEagerRequest } from '@audius/common/schemas' /** * Utilities to assist in eager pre-fetching content from the * protocol before libs has initialized. */ +import { getEagerDiscprov, makeEagerRequest } from '@audius/common' + import { env } from 'services/env' import { localStorage } from 'services/local-storage' diff --git a/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts b/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts index f10b95af6f9..890f662092c 100644 --- a/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts +++ b/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts @@ -1,4 +1,4 @@ -import { DiscoveryNodeSelectorService } from '@audius/common/schemas' +import { DiscoveryNodeSelectorService } from '@audius/common' import { env } from '../env' import { remoteConfigInstance } from '../remote-config/remote-config-instance' diff --git a/packages/web/src/services/audius-sdk/storageNodeSelector.ts b/packages/web/src/services/audius-sdk/storageNodeSelector.ts index beb2b80b392..31de5d8a304 100644 --- a/packages/web/src/services/audius-sdk/storageNodeSelector.ts +++ b/packages/web/src/services/audius-sdk/storageNodeSelector.ts @@ -1,4 +1,4 @@ -import { makeGetStorageNodeSelector } from '@audius/common/schemas' +import { makeGetStorageNodeSelector } from '@audius/common' import { env } from 'services/env' diff --git a/packages/web/src/services/env/env.dev.ts b/packages/web/src/services/env/env.dev.ts index 1f4e669dfc9..c699d2ae143 100644 --- a/packages/web/src/services/env/env.dev.ts +++ b/packages/web/src/services/env/env.dev.ts @@ -1,4 +1,4 @@ -import { Env } from '@audius/common/schemas' +import { Env } from '@audius/common' export const env: Env = { AAO_ENDPOINT: 'http://audius-protocol-anti-abuse-oracle-1', diff --git a/packages/web/src/services/env/env.prod.ts b/packages/web/src/services/env/env.prod.ts index af87d874551..1d7d993e943 100644 --- a/packages/web/src/services/env/env.prod.ts +++ b/packages/web/src/services/env/env.prod.ts @@ -1,4 +1,4 @@ -import { Env } from '@audius/common/schemas' +import { Env } from '@audius/common' export const env: Env = { AAO_ENDPOINT: 'https://antiabuseoracle.audius.co', diff --git a/packages/web/src/services/env/env.stage.ts b/packages/web/src/services/env/env.stage.ts index 998733bd8ad..0b45d6f5c77 100644 --- a/packages/web/src/services/env/env.stage.ts +++ b/packages/web/src/services/env/env.stage.ts @@ -1,4 +1,4 @@ -import { Env } from '@audius/common/schemas' +import { Env } from '@audius/common' export const env: Env = { AAO_ENDPOINT: 'https://antiabuseoracle.staging.audius.co', diff --git a/packages/web/src/services/env/index.ts b/packages/web/src/services/env/index.ts index 2210a334e70..74b19ac19b6 100644 --- a/packages/web/src/services/env/index.ts +++ b/packages/web/src/services/env/index.ts @@ -1,6 +1,5 @@ -import { Environment, Env } from '@audius/common/schemas' - -import type {} from '@audius/common' +import { Environment } from '@audius/common' +import type { Env } from '@audius/common' import { env as envDev } from './env.dev' import { env as envProd } from './env.prod' diff --git a/packages/web/src/services/explore.ts b/packages/web/src/services/explore.ts index a5556ebac07..fcab1e89747 100644 --- a/packages/web/src/services/explore.ts +++ b/packages/web/src/services/explore.ts @@ -1,4 +1,4 @@ -import { Explore } from '@audius/common/schemas' +import { Explore } from '@audius/common' import { apiClient } from './audius-api-client' import { audiusBackendInstance } from './audius-backend/audius-backend-instance' diff --git a/packages/web/src/services/fingerprint.ts b/packages/web/src/services/fingerprint.ts index 5cdc99faa3e..e6ca6d8a194 100644 --- a/packages/web/src/services/fingerprint.ts +++ b/packages/web/src/services/fingerprint.ts @@ -1,4 +1,4 @@ -import { FingerprintClient } from '@audius/common/schemas' +import { FingerprintClient } from '@audius/common' import FingerprintJS, { Agent } from '@fingerprintjs/fingerprintjs-pro' import { env } from './env' diff --git a/packages/web/src/services/local-storage.ts b/packages/web/src/services/local-storage.ts index e1b495364e1..87c0e53178f 100644 --- a/packages/web/src/services/local-storage.ts +++ b/packages/web/src/services/local-storage.ts @@ -1,4 +1,4 @@ -import { LocalStorage } from '@audius/common/schemas' +import { LocalStorage } from '@audius/common' export const localStorage = new LocalStorage({ localStorage: diff --git a/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts b/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts index 828b08e1d18..01d9e713769 100644 --- a/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts +++ b/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts @@ -1,4 +1,4 @@ -import { RemoteConfigInstance } from '@audius/common/schemas' +import { RemoteConfigInstance } from '@audius/common' import { vitest } from 'vitest' let fakeConfig: Record = {} diff --git a/packages/web/src/services/remote-config/featureFlagHelpers.ts b/packages/web/src/services/remote-config/featureFlagHelpers.ts index fee4a010be2..17401fcf73c 100644 --- a/packages/web/src/services/remote-config/featureFlagHelpers.ts +++ b/packages/web/src/services/remote-config/featureFlagHelpers.ts @@ -1,8 +1,8 @@ +import { FeatureFlags } from '@audius/common' import { OverrideSetting, FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' -import { FeatureFlags } from '@audius/common/schemas' import { remoteConfigInstance } from './remote-config-instance' diff --git a/packages/web/src/services/remote-config/remote-config-instance.ts b/packages/web/src/services/remote-config/remote-config-instance.ts index d3afff0f4d2..55353517323 100644 --- a/packages/web/src/services/remote-config/remote-config-instance.ts +++ b/packages/web/src/services/remote-config/remote-config-instance.ts @@ -1,5 +1,5 @@ +import { remoteConfig } from '@audius/common' import { ErrorLevel } from '@audius/common/models' -import { remoteConfig } from '@audius/common/schemas' import optimizely, { Config } from '@optimizely/optimizely-sdk' import { isEmpty } from 'lodash' diff --git a/packages/web/src/services/serviceMonitoring.ts b/packages/web/src/services/serviceMonitoring.ts index dd8f7324df1..dc93b8f434f 100644 --- a/packages/web/src/services/serviceMonitoring.ts +++ b/packages/web/src/services/serviceMonitoring.ts @@ -1,5 +1,5 @@ +import { IntKeys } from '@audius/common' import { Name, ServiceMonitorType, MonitorPayload } from '@audius/common/models' -import { IntKeys } from '@audius/common/schemas' import { track } from 'services/analytics' import { remoteConfigInstance } from 'services/remote-config/remote-config-instance' diff --git a/packages/web/src/services/solana/WithdrawUSDC.ts b/packages/web/src/services/solana/WithdrawUSDC.ts index e3b94ae2980..2a4cecdd625 100644 --- a/packages/web/src/services/solana/WithdrawUSDC.ts +++ b/packages/web/src/services/solana/WithdrawUSDC.ts @@ -1,7 +1,4 @@ -import { - getRecentBlockhash, - getLookupTableAccounts -} from '@audius/common/schemas' +import { getLookupTableAccounts, getRecentBlockhash } from '@audius/common' import { MintName } from '@audius/sdk' import { createCloseAccountInstruction, diff --git a/packages/web/src/services/solana/solana.ts b/packages/web/src/services/solana/solana.ts index c8d6270fbc5..ad09c020928 100644 --- a/packages/web/src/services/solana/solana.ts +++ b/packages/web/src/services/solana/solana.ts @@ -1,5 +1,5 @@ +import { MintName, DEFAULT_MINT } from '@audius/common' import { SolanaWalletAddress } from '@audius/common/models' -import { DEFAULT_MINT, MintName } from '@audius/common/schemas' import { Account, getMinimumBalanceForRentExemptAccount, diff --git a/packages/web/src/services/track-download.ts b/packages/web/src/services/track-download.ts index 6a0342b7db9..fc77056a7e5 100644 --- a/packages/web/src/services/track-download.ts +++ b/packages/web/src/services/track-download.ts @@ -1,4 +1,4 @@ -import { TrackDownload as TrackDownloadBase } from '@audius/common/schemas' +import { TrackDownload as TrackDownloadBase } from '@audius/common' import { audiusBackendInstance } from './audius-backend/audius-backend-instance' diff --git a/packages/web/src/services/wallet-client.ts b/packages/web/src/services/wallet-client.ts index 6dc038c4ae0..8f506d51cf1 100644 --- a/packages/web/src/services/wallet-client.ts +++ b/packages/web/src/services/wallet-client.ts @@ -1,4 +1,4 @@ -import { WalletClient } from '@audius/common/schemas' +import { WalletClient } from '@audius/common' import { apiClient } from './audius-api-client' import { audiusBackendInstance } from './audius-backend/audius-backend-instance' diff --git a/packages/web/src/store/application/ui/buy-audio/sagas.ts b/packages/web/src/store/application/ui/buy-audio/sagas.ts index 3cb7ca52760..4d72185268c 100644 --- a/packages/web/src/store/application/ui/buy-audio/sagas.ts +++ b/packages/web/src/store/application/ui/buy-audio/sagas.ts @@ -1,4 +1,5 @@ import { + IntKeys, getContext, walletActions, TOKEN_LISTING_MAP, @@ -12,18 +13,15 @@ import { TransactionMethod, TransactionDetails, walletSelectors, + createUserBankIfNeeded, modalsActions, AmountObject, - solanaSelectors + FeatureFlags, + LocalStorage, + solanaSelectors, + deriveUserBankPubkey } from '@audius/common' import { Name, ErrorLevel, BNWei } from '@audius/common/models' -import { - IntKeys, - FeatureFlags, - deriveUserBankPubkey, - createUserBankIfNeeded, - LocalStorage -} from '@audius/common/schemas' import { dayjs, isNullOrUndefined, diff --git a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts index 4524b9ba831..fcf6e9557c2 100644 --- a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts +++ b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts @@ -4,6 +4,9 @@ import { getUSDCUserBank, getContext, TOKEN_LISTING_MAP, + getUserbankAccountInfo, + relayVersionedTransaction, + relayTransaction, withdrawUSDCModalActions, WithdrawUSDCModalPages, WithdrawMethod, @@ -17,11 +20,6 @@ import { BNUSDC, SolanaWalletAddress } from '@audius/common/models' -import { - getUserbankAccountInfo, - relayTransaction, - relayVersionedTransaction -} from '@audius/common/schemas' import { formatUSDCWeiToFloorCentsNumber } from '@audius/common/utils' import { createAssociatedTokenAccountInstruction, diff --git a/packages/web/src/store/sign-out/signOut.ts b/packages/web/src/store/sign-out/signOut.ts index 9572ae99ff7..e827c6020b1 100644 --- a/packages/web/src/store/sign-out/signOut.ts +++ b/packages/web/src/store/sign-out/signOut.ts @@ -1,4 +1,4 @@ -import { LocalStorage, AudiusBackend } from '@audius/common/schemas' +import { AudiusBackend, LocalStorage } from '@audius/common' import { removeHasRequestedBrowserPermission } from 'utils/browserNotifications' diff --git a/packages/web/src/store/storeContext.ts b/packages/web/src/store/storeContext.ts index 5587e5a56c8..51051b12a4c 100644 --- a/packages/web/src/store/storeContext.ts +++ b/packages/web/src/store/storeContext.ts @@ -1,9 +1,9 @@ -import { CommonStoreContext } from '@audius/common' import { - FeatureFlags, + SolanaClient, + CommonStoreContext, OpenSeaClient, - SolanaClient -} from '@audius/common/schemas' + FeatureFlags +} from '@audius/common' import { setTag, configureScope } from '@sentry/browser' import * as analytics from 'services/analytics' diff --git a/packages/web/src/store/token-dashboard/establishWalletConnection.ts b/packages/web/src/store/token-dashboard/establishWalletConnection.ts index 4aac0f8287d..1284b88b858 100644 --- a/packages/web/src/store/token-dashboard/establishWalletConnection.ts +++ b/packages/web/src/store/token-dashboard/establishWalletConnection.ts @@ -1,6 +1,9 @@ -import { getContext, tokenDashboardPageActions } from '@audius/common' +import { + BooleanKeys, + getContext, + tokenDashboardPageActions +} from '@audius/common' import { Chain } from '@audius/common/models' -import { BooleanKeys } from '@audius/common/schemas' import { getErrorMessage } from '@audius/common/utils' import { call, put } from 'typed-redux-saga' diff --git a/packages/web/src/store/token-dashboard/signMessage.ts b/packages/web/src/store/token-dashboard/signMessage.ts index f83734ad014..e8b255067e6 100644 --- a/packages/web/src/store/token-dashboard/signMessage.ts +++ b/packages/web/src/store/token-dashboard/signMessage.ts @@ -1,10 +1,10 @@ import { accountSelectors, tokenDashboardPageActions, - tokenDashboardPageSelectors + tokenDashboardPageSelectors, + PhantomProvider } from '@audius/common' import { Chain } from '@audius/common/models' -import { PhantomProvider } from '@audius/common/schemas' import { call, put, select } from 'typed-redux-saga' import { WalletConnection } from './types' diff --git a/packages/web/src/store/token-dashboard/types.ts b/packages/web/src/store/token-dashboard/types.ts index 3e95ba2a5ff..007ced31e44 100644 --- a/packages/web/src/store/token-dashboard/types.ts +++ b/packages/web/src/store/token-dashboard/types.ts @@ -1,5 +1,5 @@ +import { PhantomProvider } from '@audius/common' import { Chain } from '@audius/common/models' -import { PhantomProvider } from '@audius/common/schemas' export type PhantomWalletConnection = { chain: Chain.Sol diff --git a/packages/web/src/utils/browserNotifications.ts b/packages/web/src/utils/browserNotifications.ts index 18080aa3699..6736f42c752 100644 --- a/packages/web/src/utils/browserNotifications.ts +++ b/packages/web/src/utils/browserNotifications.ts @@ -1,4 +1,4 @@ -import { AudiusBackend } from '@audius/common/schemas' +import { AudiusBackend } from '@audius/common' import { env } from 'services/env' import { isElectron } from 'utils/clientUtil' diff --git a/packages/web/src/utils/route.ts b/packages/web/src/utils/route.ts index 1051e854df3..83e948aefa6 100644 --- a/packages/web/src/utils/route.ts +++ b/packages/web/src/utils/route.ts @@ -1,5 +1,5 @@ +import { Env } from '@audius/common' import { ID } from '@audius/common/models' -import { Env } from '@audius/common/schemas' import { encodeUrlName, getHash } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { Location } from 'history' From a80bd29fcf51be44e71372b538c8cb8320814c60 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 16:33:10 -0800 Subject: [PATCH 38/64] Fix "Convert services in web" --- packages/convert-exports.js | 2 +- .../sign-on-screen/components/NewEmailField.tsx | 2 +- packages/web/src/app/App.tsx | 2 +- packages/web/src/app/web-player/WebPlayer.jsx | 5 ++--- packages/web/src/common/store/account/sagas.js | 8 +++++--- packages/web/src/common/store/cache/sagas.js | 5 ++--- .../common/store/cache/tracks/utils/reformat.ts | 2 +- packages/web/src/common/store/lineup/sagas.js | 3 +-- .../store/notifications/fetchNotifications.ts | 3 ++- .../web/src/common/store/notifications/sagas.ts | 7 +++---- .../src/common/store/pages/audio-rewards/sagas.ts | 14 ++++++++------ .../common/store/pages/audio-rewards/store.test.ts | 3 +-- .../src/common/store/pages/feed/lineup/sagas.ts | 2 +- packages/web/src/common/store/pages/saved/sagas.ts | 3 +-- .../src/common/store/pages/search-page/sagas.js | 4 ++-- .../web/src/common/store/pages/signon/sagas.js | 12 +++++++----- packages/web/src/common/store/pages/track/sagas.js | 2 +- .../pages/trending-playlists/lineups/sagas.ts | 2 +- .../pages/trending-underground/lineups/sagas.ts | 2 +- .../trending/lineups/trending/retrieveTrending.ts | 2 +- packages/web/src/common/store/player/sagas.ts | 5 ++--- .../playlistUpdatesPollingDaemon.ts | 5 ++--- packages/web/src/common/store/profile/sagas.js | 3 +-- packages/web/src/common/store/search-bar/sagas.ts | 3 ++- .../web/src/common/store/social/tracks/sagas.ts | 5 ++--- packages/web/src/common/store/tipping/sagas.ts | 12 +++++++----- .../web/src/common/store/ui/reactions/sagas.ts | 4 ++-- .../web/src/common/store/upload/sagaHelpers.ts | 8 ++------ .../src/common/store/user-list/mutuals/sagas.ts | 4 ++-- .../src/common/store/user-list/supporting/sagas.ts | 8 +++++--- .../common/store/user-list/top-supporters/sagas.ts | 8 +++++--- packages/web/src/common/store/user-list/utils.ts | 3 +-- packages/web/src/common/store/wallet/sagas.ts | 3 +-- .../buy-audio-modal/components/AmountInputPage.tsx | 4 ++-- .../collection/mobile/CollectionHeader.jsx | 3 ++- .../web/src/components/data-entry/FormTile.jsx | 2 +- .../edit-playlist/mobile/EditPlaylistPage.tsx | 2 +- .../FeatureFlagOverrideModal.tsx | 3 ++- .../src/components/feature-flag/FeatureFlag.tsx | 2 +- .../image-selection/ImageSelectionPopup.jsx | 3 ++- packages/web/src/components/menu/TrackMenu.tsx | 2 +- .../web/src/components/nav/desktop/NavHeader.tsx | 2 +- .../src/components/nav/desktop/NavPopupMenu.tsx | 3 ++- packages/web/src/components/nav/mobile/NavBar.tsx | 2 +- packages/web/src/components/notice/Notice.tsx | 2 +- .../web/src/components/now-playing/NowPlaying.tsx | 4 ++-- .../src/components/play-bar/desktop/PlayBar.jsx | 2 +- .../PremiumContentPurchaseModal.tsx | 4 ++-- .../components/PurchaseContentFormFields.tsx | 3 ++- .../components/related-artists/RelatedArtists.tsx | 3 ++- .../web/src/components/share-modal/ShareModal.tsx | 2 +- .../src/components/social-proof/SocialProof.tsx | 2 +- .../web/src/components/stat-banner/StatBanner.tsx | 2 +- .../src/components/tipping/tip-audio/SendTip.tsx | 5 ++--- .../components/tipping/tip-audio/TipAudioModal.tsx | 2 +- .../src/components/tipping/tip-audio/TipSent.tsx | 7 ++----- .../ConnectedMobileOverflowModal.tsx | 4 ++-- packages/web/src/components/track/CardTitle.tsx | 2 +- .../web/src/components/track/GiantTrackTile.tsx | 2 +- .../web/src/components/track/PlayPauseButton.tsx | 2 +- .../web/src/components/track/desktop/TrackTile.tsx | 2 +- .../track/mobile/ConnectedPlaylistTile.tsx | 4 ++-- .../track/mobile/ConnectedTrackListItem.tsx | 4 ++-- .../components/track/mobile/ConnectedTrackTile.tsx | 4 ++-- .../web/src/components/upload/TrackPreviewNew.tsx | 2 +- packages/web/src/components/upload/UploadChip.tsx | 3 ++- .../withdraw-usdc-modal/WithdrawUSDCModal.tsx | 5 ++--- .../components/EnterTransferDetails.tsx | 4 ++-- .../hooks/useIsAudioMatchingChallengesEnabled.ts | 2 +- packages/web/src/hooks/useIsUSDCEnabled.ts | 2 +- .../pages/audio-rewards-page/AudioRewardsPage.tsx | 8 ++------ .../audio-rewards-page/ChallengeRewardsTile.tsx | 2 +- .../audio-rewards-page/TrendingRewardsTile.tsx | 3 ++- .../src/pages/audio-rewards-page/WalletModal.tsx | 2 +- .../audio-rewards-page/components/ReceiveBody.tsx | 2 +- .../components/SendInputBody.tsx | 6 +++++- .../components/WalletManagementTile.tsx | 6 ++---- .../components/modals/TrendingRewards.tsx | 2 +- packages/web/src/pages/chat-page/ChatPage.tsx | 3 ++- .../components/desktop/CollectionPage.tsx | 4 ++-- .../web/src/pages/dashboard-page/store/sagas.ts | 8 ++------ .../components/desktop/FeedPageContent.tsx | 6 ++---- .../components/desktop/NotificationSettings.tsx | 2 +- .../components/desktop/SettingsPage.tsx | 2 +- .../components/desktop/VerificationModal.tsx | 2 +- .../components/mobile/VerificationPage.tsx | 8 ++------ .../components/CompleteProfileWithSocial.tsx | 8 ++------ .../src/pages/sign-on/components/ProfileForm.tsx | 8 ++++---- .../src/pages/sign-on/components/ProfilePage.tsx | 8 +++++--- .../sign-on/components/desktop/MetaMaskModal.jsx | 2 +- .../pages/sign-up-page/components/HandleField.tsx | 2 +- .../components/SocialMediaLoginOptions.tsx | 2 +- .../pages/sign-up-page/hooks/socialMediaLogin.ts | 8 +++++--- .../pages/sign-up-page/pages/FinishProfilePage.tsx | 2 +- .../track-page/components/mobile/TrackHeader.tsx | 7 ++----- .../upload-page/fields/AccessAndSaleField.tsx | 3 ++- .../UsdcPurchaseGatedRadioField.tsx | 2 +- .../src/pages/upload-page/forms/EditTrackForm.tsx | 2 +- .../web/src/pages/upload-page/pages/SelectPage.tsx | 3 ++- packages/web/src/services/Location.ts | 2 +- .../src/services/audius-api-client/apiClient.ts | 2 +- .../web/src/services/audius-backend/BuyAudio.ts | 3 ++- .../web/src/services/audius-backend/Cognito.ts | 2 +- .../audius-backend/audius-backend-instance.ts | 2 +- .../src/services/audius-backend/eagerLoadUtils.ts | 3 +-- .../services/audius-sdk/discoveryNodeSelector.ts | 2 +- .../src/services/audius-sdk/storageNodeSelector.ts | 2 +- packages/web/src/services/env/env.dev.ts | 2 +- packages/web/src/services/env/env.prod.ts | 2 +- packages/web/src/services/env/env.stage.ts | 2 +- packages/web/src/services/env/index.ts | 5 +++-- packages/web/src/services/explore.ts | 2 +- packages/web/src/services/fingerprint.ts | 2 +- packages/web/src/services/local-storage.ts | 2 +- .../__mocks__/remote-config-instance.ts | 2 +- .../services/remote-config/featureFlagHelpers.ts | 2 +- .../remote-config/remote-config-instance.ts | 2 +- packages/web/src/services/serviceMonitoring.ts | 2 +- packages/web/src/services/solana/WithdrawUSDC.ts | 5 ++++- packages/web/src/services/solana/solana.ts | 2 +- packages/web/src/services/track-download.ts | 2 +- packages/web/src/services/wallet-client.ts | 2 +- .../src/store/application/ui/buy-audio/sagas.ts | 14 ++++++++------ .../store/application/ui/withdraw-usdc/sagas.ts | 8 +++++--- packages/web/src/store/sign-out/signOut.ts | 2 +- packages/web/src/store/storeContext.ts | 8 ++++---- .../token-dashboard/establishWalletConnection.ts | 7 ++----- .../web/src/store/token-dashboard/signMessage.ts | 4 ++-- packages/web/src/store/token-dashboard/types.ts | 2 +- packages/web/src/utils/browserNotifications.ts | 2 +- packages/web/src/utils/route.ts | 2 +- 131 files changed, 242 insertions(+), 248 deletions(-) diff --git a/packages/convert-exports.js b/packages/convert-exports.js index 537d7cbe818..66d31a1b28d 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -5,7 +5,7 @@ var getDirectories = function (callback) { glob('./web/src/**/*', callback) } -const DIRECTORY = 'schemas' +const DIRECTORY = 'services' const EXPORTS = [ 'IntKeys', 'StringKeys', diff --git a/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx b/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx index 4e56b0513df..4c50bd0d451 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx @@ -1,5 +1,5 @@ import { emailSchemaMessages } from '@audius/common/schemas' -import {} from '@audius/common' + import { useField, useFormikContext } from 'formik' import { usePrevious } from 'react-use' diff --git a/packages/web/src/app/App.tsx b/packages/web/src/app/App.tsx index 7ed2dbcc2a2..137d91a8c9f 100644 --- a/packages/web/src/app/App.tsx +++ b/packages/web/src/app/App.tsx @@ -2,8 +2,8 @@ import { useEffect, Suspense, lazy } from 'react' -import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/services' import { CoinflowPurchaseProtection } from '@coinflowlabs/react' import { Redirect, Route, Switch } from 'react-router-dom' diff --git a/packages/web/src/app/web-player/WebPlayer.jsx b/packages/web/src/app/web-player/WebPlayer.jsx index cafcfaa9104..82a7556c11d 100644 --- a/packages/web/src/app/web-player/WebPlayer.jsx +++ b/packages/web/src/app/web-player/WebPlayer.jsx @@ -1,13 +1,11 @@ import { lazy, Component, Suspense } from 'react' import { - StringKeys, accountSelectors, ExploreCollectionsVariant, themeSelectors, themeActions, - UploadType, - FeatureFlags + UploadType } from '@audius/common' import { Name, @@ -16,6 +14,7 @@ import { Status, Theme } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/services' import cn from 'classnames' import { connect } from 'react-redux' import { matchPath } from 'react-router' diff --git a/packages/web/src/common/store/account/sagas.js b/packages/web/src/common/store/account/sagas.js index 5c9351522fa..1c66cc1cb21 100644 --- a/packages/web/src/common/store/account/sagas.js +++ b/packages/web/src/common/store/account/sagas.js @@ -3,14 +3,16 @@ import { cacheActions, profilePageActions, accountActions, - recordIP, solanaSelectors, - createUserBankIfNeeded, getContext, - FeatureFlags, chatActions } from '@audius/common' import { ErrorLevel, Kind } from '@audius/common/models' +import { + FeatureFlags, + recordIP, + createUserBankIfNeeded +} from '@audius/common/services' import { call, put, fork, select, takeEvery } from 'redux-saga/effects' import { identify } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/cache/sagas.js b/packages/web/src/common/store/cache/sagas.js index 2864e8020c6..2f35665f7e8 100644 --- a/packages/web/src/common/store/cache/sagas.js +++ b/packages/web/src/common/store/cache/sagas.js @@ -2,11 +2,10 @@ import { cacheActions, cacheSelectors, cacheConfig, - FeatureFlags, - confirmerSelectors, - IntKeys + confirmerSelectors } from '@audius/common' import { Status } from '@audius/common/models' +import { IntKeys, FeatureFlags } from '@audius/common/services' import { makeUids, getIdFromKindId } from '@audius/common/utils' import { pick } from 'lodash' import { diff --git a/packages/web/src/common/store/cache/tracks/utils/reformat.ts b/packages/web/src/common/store/cache/tracks/utils/reformat.ts index 3cb0a646637..d6e3ebfe2f4 100644 --- a/packages/web/src/common/store/cache/tracks/utils/reformat.ts +++ b/packages/web/src/common/store/cache/tracks/utils/reformat.ts @@ -1,5 +1,5 @@ -import { AudiusBackend } from '@audius/common' import { TrackMetadata, Track } from '@audius/common/models' +import { AudiusBackend } from '@audius/common/services' import { omit } from 'lodash' /** diff --git a/packages/web/src/common/store/lineup/sagas.js b/packages/web/src/common/store/lineup/sagas.js index 63df343e0a5..e59a8b8a607 100644 --- a/packages/web/src/common/store/lineup/sagas.js +++ b/packages/web/src/common/store/lineup/sagas.js @@ -8,12 +8,11 @@ import { playerSelectors, queueSelectors, getContext, - FeatureFlags, - StringKeys, premiumTracksPageLineupActions, accountSelectors } from '@audius/common' import { Name, Kind, isContentUSDCPurchaseGated } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/services' import { Uid, makeUids, makeUid } from '@audius/common/utils' import { all, diff --git a/packages/web/src/common/store/notifications/fetchNotifications.ts b/packages/web/src/common/store/notifications/fetchNotifications.ts index e3eda2c963a..01c501aed68 100644 --- a/packages/web/src/common/store/notifications/fetchNotifications.ts +++ b/packages/web/src/common/store/notifications/fetchNotifications.ts @@ -1,4 +1,5 @@ -import { FeatureFlags, getContext, IntKeys } from '@audius/common' +import { getContext } from '@audius/common' +import { IntKeys, FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' import { partition } from 'lodash' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/sagas.ts b/packages/web/src/common/store/notifications/sagas.ts index 0120ef37ff4..e0c399f606c 100644 --- a/packages/web/src/common/store/notifications/sagas.ts +++ b/packages/web/src/common/store/notifications/sagas.ts @@ -1,10 +1,9 @@ +import { getContext, notificationsActions } from '@audius/common' import { IntKeys, remoteConfigIntDefaults, - RemoteConfigInstance, - getContext, - notificationsActions -} from '@audius/common' + RemoteConfigInstance +} from '@audius/common/services' import { call, takeEvery } from 'typed-redux-saga' import { waitForWrite } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/audio-rewards/sagas.ts b/packages/web/src/common/store/pages/audio-rewards/sagas.ts index 2626f36ca4a..9f76640e8b1 100644 --- a/packages/web/src/common/store/pages/audio-rewards/sagas.ts +++ b/packages/web/src/common/store/pages/audio-rewards/sagas.ts @@ -1,7 +1,4 @@ import { - IntKeys, - StringKeys, - RemoteConfigInstance, getContext, accountSelectors, accountActions, @@ -13,15 +10,20 @@ import { solanaSelectors, walletActions, modalsActions, - Env, - musicConfettiActions, - createUserBankIfNeeded + musicConfettiActions } from '@audius/common' import { FailureReason, UserChallenge, StringAudio } from '@audius/common/models' +import { + IntKeys, + StringKeys, + createUserBankIfNeeded, + Env, + RemoteConfigInstance +} from '@audius/common/services' import { stringAudioToStringWei, waitForValue } from '@audius/common/utils' import { call, diff --git a/packages/web/src/common/store/pages/audio-rewards/store.test.ts b/packages/web/src/common/store/pages/audio-rewards/store.test.ts index c79edb05093..42011dd12bf 100644 --- a/packages/web/src/common/store/pages/audio-rewards/store.test.ts +++ b/packages/web/src/common/store/pages/audio-rewards/store.test.ts @@ -1,6 +1,4 @@ import { - IntKeys, - StringKeys, accountSelectors, audioRewardsPageActions, AudioRewardsClaim, @@ -17,6 +15,7 @@ import { ChallengeRewardID, StringAudio } from '@audius/common/models' +import { IntKeys, StringKeys } from '@audius/common/services' import { stringAudioToStringWei } from '@audius/common/utils' import delayP from '@redux-saga/delay-p' import { all, fork } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/feed/lineup/sagas.ts b/packages/web/src/common/store/pages/feed/lineup/sagas.ts index 13e500b282b..7d67825a06c 100644 --- a/packages/web/src/common/store/pages/feed/lineup/sagas.ts +++ b/packages/web/src/common/store/pages/feed/lineup/sagas.ts @@ -3,7 +3,6 @@ import { accountSelectors, feedPageLineupActions as feedActions, feedPageSelectors, - GetSocialFeedArgs, CommonState } from '@audius/common' import { @@ -16,6 +15,7 @@ import { UserTrackMetadata, LineupTrack } from '@audius/common/models' +import { GetSocialFeedArgs } from '@audius/common/services' import { select, all } from 'redux-saga/effects' import { processAndCacheCollections } from 'common/store/cache/collections/utils' diff --git a/packages/web/src/common/store/pages/saved/sagas.ts b/packages/web/src/common/store/pages/saved/sagas.ts index db0108af951..5b964e00da5 100644 --- a/packages/web/src/common/store/pages/saved/sagas.ts +++ b/packages/web/src/common/store/pages/saved/sagas.ts @@ -1,10 +1,8 @@ import { - APIActivityV2, LibraryCategoryType, accountSelectors, savedPageActions as actions, getContext, - responseAdapter, savedPageSelectors, savedPageTracksLineupActions as tracksActions } from '@audius/common' @@ -14,6 +12,7 @@ import { UserTrackMetadata, User } from '@audius/common/models' +import { responseAdapter, APIActivityV2 } from '@audius/common/services' import { decodeHashId, encodeHashId, diff --git a/packages/web/src/common/store/pages/search-page/sagas.js b/packages/web/src/common/store/pages/search-page/sagas.js index 99b7aaa50ad..05eb218a733 100644 --- a/packages/web/src/common/store/pages/search-page/sagas.js +++ b/packages/web/src/common/store/pages/search-page/sagas.js @@ -3,9 +3,9 @@ import { searchResultsPageActions as searchPageActions, searchResultsPageTracksLineupActions as tracksLineupActions, SearchKind, - processAndCacheUsers, - FeatureFlags + processAndCacheUsers } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { trimToAlphaNumeric, removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { diff --git a/packages/web/src/common/store/pages/signon/sagas.js b/packages/web/src/common/store/pages/signon/sagas.js index e398d15d681..6d5baf1c976 100644 --- a/packages/web/src/common/store/pages/signon/sagas.js +++ b/packages/web/src/common/store/pages/signon/sagas.js @@ -1,11 +1,8 @@ import { - FeatureFlags, - MAX_HANDLE_LENGTH, accountActions, accountSelectors, cacheUsersSelectors, collectionsSocialActions, - getCityAndRegion, getContext, processAndCacheUsers, settingsPageActions, @@ -13,10 +10,15 @@ import { solanaSelectors, toastActions, confirmerActions, - confirmTransaction, - IntKeys + confirmTransaction } from '@audius/common' import { Name, FavoriteSource } from '@audius/common/models' +import { + IntKeys, + FeatureFlags, + MAX_HANDLE_LENGTH, + getCityAndRegion +} from '@audius/common/services' import { Genre, ELECTRONIC_SUBGENRES, diff --git a/packages/web/src/common/store/pages/track/sagas.js b/packages/web/src/common/store/pages/track/sagas.js index 9cc4943ac99..0f1f59db40a 100644 --- a/packages/web/src/common/store/pages/track/sagas.js +++ b/packages/web/src/common/store/pages/track/sagas.js @@ -1,5 +1,4 @@ import { - StringKeys, cacheTracksActions as trackCacheActions, cacheTracksSelectors, cacheUsersSelectors, @@ -9,6 +8,7 @@ import { reachabilitySelectors } from '@audius/common' import { Kind } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { makeUid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { keccak_256 } from 'js-sha3' diff --git a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts index 3f8b1e95f45..723daed98fa 100644 --- a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts @@ -1,11 +1,11 @@ import { - StringKeys, accountSelectors, trendingPlaylistsPageLineupSelectors, trendingPlaylistsPageLineupActions, getContext } from '@audius/common' import { UserCollectionMetadata } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts index 57df4d4c2e5..13d071fc015 100644 --- a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts @@ -1,10 +1,10 @@ import { - StringKeys, accountSelectors, trendingUndergroundPageLineupSelectors, trendingUndergroundPageLineupActions, getContext } from '@audius/common' +import { StringKeys } from '@audius/common/services' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts index 9be2483a79d..45e35edaf0d 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts +++ b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts @@ -1,5 +1,4 @@ import { - StringKeys, cacheTracksSelectors, trendingPageLineupSelectors, trendingPageActions, @@ -7,6 +6,7 @@ import { getContext } from '@audius/common' import { TimeRange, ID, Track, UserTrackMetadata } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { Genre, Nullable } from '@audius/common/utils' import { keccak_256 } from 'js-sha3' import { call, put, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/player/sagas.ts b/packages/web/src/common/store/player/sagas.ts index ac9598b666b..e249dd8050b 100644 --- a/packages/web/src/common/store/player/sagas.ts +++ b/packages/web/src/common/store/player/sagas.ts @@ -10,11 +10,10 @@ import { playbackPositionActions, playbackPositionSelectors, reachabilitySelectors, - FeatureFlags, - gatedContentSelectors, - QueryParams + gatedContentSelectors } from '@audius/common' import { Kind } from '@audius/common/models' +import { FeatureFlags, QueryParams } from '@audius/common/services' import { Genre, encodeHashId, diff --git a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts index e763cab86ac..80b34948052 100644 --- a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts +++ b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts @@ -1,10 +1,9 @@ import { accountActions, getContext, - IntKeys, - playlistUpdatesActions, - remoteConfigIntDefaults + playlistUpdatesActions } from '@audius/common' +import { IntKeys, remoteConfigIntDefaults } from '@audius/common/services' import { call, fork, take } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/profile/sagas.js b/packages/web/src/common/store/profile/sagas.js index 8bf0d2c2877..bd1dd7a2ad8 100644 --- a/packages/web/src/common/store/profile/sagas.js +++ b/packages/web/src/common/store/profile/sagas.js @@ -1,5 +1,4 @@ import { - DoubleKeys, accountSelectors, cacheActions, profilePageSelectors, @@ -11,11 +10,11 @@ import { collectiblesActions, processAndCacheUsers, chatActions, - FeatureFlags, confirmerActions, confirmTransaction } from '@audius/common' import { DefaultSizes, Kind } from '@audius/common/models' +import { DoubleKeys, FeatureFlags } from '@audius/common/services' import { squashNewLines, makeUid, diff --git a/packages/web/src/common/store/search-bar/sagas.ts b/packages/web/src/common/store/search-bar/sagas.ts index 9145598277f..79a2babdbda 100644 --- a/packages/web/src/common/store/search-bar/sagas.ts +++ b/packages/web/src/common/store/search-bar/sagas.ts @@ -1,5 +1,6 @@ -import { accountSelectors, getContext, FeatureFlags } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common' import { Name } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { diff --git a/packages/web/src/common/store/social/tracks/sagas.ts b/packages/web/src/common/store/social/tracks/sagas.ts index 746d78c01a9..afc00b92eae 100644 --- a/packages/web/src/common/store/social/tracks/sagas.ts +++ b/packages/web/src/common/store/social/tracks/sagas.ts @@ -6,12 +6,11 @@ import { gatedContentSelectors, getContext, tracksSocialActions as socialActions, - QueryParams, confirmerActions, - confirmTransaction, - FeatureFlags + confirmTransaction } from '@audius/common' import { Name, Kind, ID, Track, User } from '@audius/common/models' +import { FeatureFlags, QueryParams } from '@audius/common/services' import { formatShareText, encodeHashId, diff --git a/packages/web/src/common/store/tipping/sagas.ts b/packages/web/src/common/store/tipping/sagas.ts index c1423c37713..c19d8d4cb60 100644 --- a/packages/web/src/common/store/tipping/sagas.ts +++ b/packages/web/src/common/store/tipping/sagas.ts @@ -7,13 +7,8 @@ import { walletSelectors, walletActions, getContext, - GetTipsArgs, - GetSupportingArgs, - GetSupportersArgs, - LocalStorage, processAndCacheUsers, solanaSelectors, - createUserBankIfNeeded, chatActions } from '@audius/common' import { @@ -28,6 +23,13 @@ import { BNWei, SolanaWalletAddress } from '@audius/common/models' +import { + createUserBankIfNeeded, + LocalStorage, + GetSupportingArgs, + GetSupportersArgs, + GetTipsArgs +} from '@audius/common/services' import { decodeHashId, isNullOrUndefined, diff --git a/packages/web/src/common/store/ui/reactions/sagas.ts b/packages/web/src/common/store/ui/reactions/sagas.ts index 1c3f821562e..9de9a3ff483 100644 --- a/packages/web/src/common/store/ui/reactions/sagas.ts +++ b/packages/web/src/common/store/ui/reactions/sagas.ts @@ -3,9 +3,9 @@ import { reactionsMap, reactionsUIActions, reactionsUISelectors, - getContext, - AudiusBackend + getContext } from '@audius/common' +import { AudiusBackend } from '@audius/common/services' import { getErrorMessage, removeNullable } from '@audius/common/utils' import { call, takeEvery, all, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/upload/sagaHelpers.ts b/packages/web/src/common/store/upload/sagaHelpers.ts index 49fc27ae4cd..9a6e90c48c0 100644 --- a/packages/web/src/common/store/upload/sagaHelpers.ts +++ b/packages/web/src/common/store/upload/sagaHelpers.ts @@ -1,9 +1,4 @@ -import { - FeatureFlags, - accountSelectors, - getContext, - getUSDCUserBank -} from '@audius/common' +import { accountSelectors, getContext, getUSDCUserBank } from '@audius/common' import { Name, isContentCollectibleGated, @@ -12,6 +7,7 @@ import { isContentUSDCPurchaseGated, TrackMetadata } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { BN_USDC_CENT_WEI } from '@audius/common/utils' import { PublicKey } from '@solana/web3.js' import BN from 'bn.js' diff --git a/packages/web/src/common/store/user-list/mutuals/sagas.ts b/packages/web/src/common/store/user-list/mutuals/sagas.ts index 2558320b931..e23b41d1633 100644 --- a/packages/web/src/common/store/user-list/mutuals/sagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/sagas.ts @@ -3,10 +3,10 @@ import { UserListSagaFactory, mutualsUserListActions, mutualsUserListSelectors, - MUTUALS_USER_LIST_TAG, - AudiusBackend + MUTUALS_USER_LIST_TAG } from '@audius/common' import { ID, User } from '@audius/common/models' +import { AudiusBackend } from '@audius/common/services' import { put, select } from 'typed-redux-saga' import { watchMutualsError } from 'common/store/user-list/mutuals/errorSagas' diff --git a/packages/web/src/common/store/user-list/supporting/sagas.ts b/packages/web/src/common/store/user-list/supporting/sagas.ts index c1ce868cf1f..861437fec8a 100644 --- a/packages/web/src/common/store/user-list/supporting/sagas.ts +++ b/packages/web/src/common/store/user-list/supporting/sagas.ts @@ -5,11 +5,13 @@ import { UserListSagaFactory, supportingUserListActions, supportingUserListSelectors, - SUPPORTING_USER_LIST_TAG, - responseAdapter as adapter, - SupportingResponse + SUPPORTING_USER_LIST_TAG } from '@audius/common' import { ID, UserMetadata, User } from '@audius/common/models' +import { + responseAdapter as adapter, + SupportingResponse +} from '@audius/common/services' import { decodeHashId, stringWeiToBN } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/top-supporters/sagas.ts b/packages/web/src/common/store/user-list/top-supporters/sagas.ts index 5627106ce55..979ca74a030 100644 --- a/packages/web/src/common/store/user-list/top-supporters/sagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/sagas.ts @@ -3,13 +3,15 @@ import { tippingActions, SupportersMapForUser, UserListSagaFactory, - SupporterResponse, topSupportersUserListSelectors, topSupportersUserListActions, - TOP_SUPPORTERS_USER_LIST_TAG, - responseAdapter as adapter + TOP_SUPPORTERS_USER_LIST_TAG } from '@audius/common' import { ID, User } from '@audius/common/models' +import { + responseAdapter as adapter, + SupporterResponse +} from '@audius/common/services' import { decodeHashId, removeNullable } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/utils.ts b/packages/web/src/common/store/user-list/utils.ts index 075b0b3be32..ec3fec2a61c 100644 --- a/packages/web/src/common/store/user-list/utils.ts +++ b/packages/web/src/common/store/user-list/utils.ts @@ -1,11 +1,10 @@ import { accountSelectors, getContext, - AudiusAPIClient, - AudiusBackend, processAndCacheUsers } from '@audius/common' import { ID, UserMetadata, User } from '@audius/common/models' +import { AudiusAPIClient, AudiusBackend } from '@audius/common/services' import { call, select } from 'typed-redux-saga' import { AppState } from 'store/types' diff --git a/packages/web/src/common/store/wallet/sagas.ts b/packages/web/src/common/store/wallet/sagas.ts index e56603dba4c..6ee8e044c17 100644 --- a/packages/web/src/common/store/wallet/sagas.ts +++ b/packages/web/src/common/store/wallet/sagas.ts @@ -1,5 +1,4 @@ import { - FeatureFlags, accountSelectors, accountActions, tokenDashboardPageActions, @@ -7,7 +6,6 @@ import { InputSendDataAction, walletActions, getContext, - createUserBankIfNeeded, solanaSelectors } from '@audius/common' import { @@ -17,6 +15,7 @@ import { BNWei, SolanaWalletAddress } from '@audius/common/models' +import { FeatureFlags, createUserBankIfNeeded } from '@audius/common/services' import { getErrorMessage, isNullOrUndefined, diff --git a/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx b/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx index 717aab2fa4d..61aabf873fd 100644 --- a/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx +++ b/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx @@ -3,9 +3,9 @@ import { useCallback, useMemo } from 'react' import { buyAudioActions, buyAudioSelectors, - OnRampProvider, - StringKeys + OnRampProvider } from '@audius/common' +import { StringKeys } from '@audius/common/services' import { useDispatch, useSelector } from 'react-redux' import { useRemoteVar } from 'hooks/useRemoteConfig' diff --git a/packages/web/src/components/collection/mobile/CollectionHeader.jsx b/packages/web/src/components/collection/mobile/CollectionHeader.jsx index 3097da7081b..0458ed37bef 100644 --- a/packages/web/src/components/collection/mobile/CollectionHeader.jsx +++ b/packages/web/src/components/collection/mobile/CollectionHeader.jsx @@ -1,7 +1,8 @@ import { memo } from 'react' -import { OverflowAction, FeatureFlags } from '@audius/common' +import { OverflowAction } from '@audius/common' import { Variant, SquareSizes } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { formatCount, formatSecondsAsText, diff --git a/packages/web/src/components/data-entry/FormTile.jsx b/packages/web/src/components/data-entry/FormTile.jsx index 7eb0f706b5b..ed6351c7ce6 100644 --- a/packages/web/src/components/data-entry/FormTile.jsx +++ b/packages/web/src/components/data-entry/FormTile.jsx @@ -1,7 +1,7 @@ import { Component, useState, useCallback } from 'react' -import { FeatureFlags } from '@audius/common' import { createRemixOfMetadata } from '@audius/common/schemas' +import { FeatureFlags } from '@audius/common/services' import { creativeCommons, getCanonicalName, diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index f292c718c1b..f7e73794312 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -1,7 +1,6 @@ import { useEffect, useState, useCallback } from 'react' import { - RandomImage, accountSelectors, cacheCollectionsActions, collectionPageLineupActions as tracksActions, @@ -13,6 +12,7 @@ import { import { useGatedContentAccessMap } from '@audius/common/hooks' import { SquareSizes, Collection, ID } from '@audius/common/models' import { newCollectionMetadata } from '@audius/common/schemas' +import { RandomImage } from '@audius/common/services' import { Nullable } from '@audius/common/utils' import { capitalize } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx index 0ea8da07ceb..ebd5c6b0f61 100644 --- a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx +++ b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx @@ -1,10 +1,11 @@ import { useCallback, useEffect, useRef, useState } from 'react' -import { FeatureFlags, accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common' import { OverrideSetting, FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/services' import { Modal, ModalContent, diff --git a/packages/web/src/components/feature-flag/FeatureFlag.tsx b/packages/web/src/components/feature-flag/FeatureFlag.tsx index 46c4b57d07d..07c26f1e433 100644 --- a/packages/web/src/components/feature-flag/FeatureFlag.tsx +++ b/packages/web/src/components/feature-flag/FeatureFlag.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react' -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { useFlag } from 'hooks/useRemoteConfig' diff --git a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx index 0c51a884410..5c5829ab2ed 100644 --- a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx +++ b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx @@ -1,7 +1,8 @@ import { useState, useCallback, useRef, useContext } from 'react' -import { RandomImage, accountSelectors, badgeTiers } from '@audius/common' +import { accountSelectors, badgeTiers } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { RandomImage } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' import { Button, ButtonType, Popup, SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/menu/TrackMenu.tsx b/packages/web/src/components/menu/TrackMenu.tsx index 8d71778c507..b3523442080 100644 --- a/packages/web/src/components/menu/TrackMenu.tsx +++ b/packages/web/src/components/menu/TrackMenu.tsx @@ -8,7 +8,6 @@ import { playbackPositionSelectors, tracksSocialActions, addToCollectionUIActions, - FeatureFlags, CommonState, useEditTrackModal } from '@audius/common' @@ -19,6 +18,7 @@ import { PlayableType, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Genre } from '@audius/common/utils' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/nav/desktop/NavHeader.tsx b/packages/web/src/components/nav/desktop/NavHeader.tsx index b669becacd7..319e6f830d9 100644 --- a/packages/web/src/components/nav/desktop/NavHeader.tsx +++ b/packages/web/src/components/nav/desktop/NavHeader.tsx @@ -1,12 +1,12 @@ import { useCallback, useRef } from 'react' import { - FeatureFlags, accountSelectors, notificationsSelectors, themeSelectors } from '@audius/common' import { Name, Theme } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx index 8bffb1a2893..78210a82b15 100644 --- a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx +++ b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx @@ -1,6 +1,7 @@ -import { FeatureFlags, chatSelectors, StringKeys } from '@audius/common' +import { chatSelectors } from '@audius/common' import { useAccountHasClaimableRewards } from '@audius/common/hooks' import { Name } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' import { IconCrown, diff --git a/packages/web/src/components/nav/mobile/NavBar.tsx b/packages/web/src/components/nav/mobile/NavBar.tsx index 5becf51428b..a0bdb87b7cc 100644 --- a/packages/web/src/components/nav/mobile/NavBar.tsx +++ b/packages/web/src/components/nav/mobile/NavBar.tsx @@ -1,7 +1,7 @@ import { useState, useContext, useCallback, useEffect } from 'react' -import { FeatureFlags } from '@audius/common' import { Status } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { formatCount } from '@audius/common/utils' import { IconCaretRight, diff --git a/packages/web/src/components/notice/Notice.tsx b/packages/web/src/components/notice/Notice.tsx index 53b4f1acca6..7268b28ff3a 100644 --- a/packages/web/src/components/notice/Notice.tsx +++ b/packages/web/src/components/notice/Notice.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useState } from 'react' -import { StringKeys } from '@audius/common' +import { StringKeys } from '@audius/common/services' import { IconRemove } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/now-playing/NowPlaying.tsx b/packages/web/src/components/now-playing/NowPlaying.tsx index 3890a9f2f0e..08df3de09ba 100644 --- a/packages/web/src/components/now-playing/NowPlaying.tsx +++ b/packages/web/src/components/now-playing/NowPlaying.tsx @@ -16,8 +16,7 @@ import { queueSelectors, playbackRateValueMap, gatedContentSelectors, - usePremiumContentPurchaseModal, - FeatureFlags + usePremiumContentPurchaseModal } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { @@ -31,6 +30,7 @@ import { SquareSizes, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { Location } from 'history' diff --git a/packages/web/src/components/play-bar/desktop/PlayBar.jsx b/packages/web/src/components/play-bar/desktop/PlayBar.jsx index 9d5d6900573..2c5813ae758 100644 --- a/packages/web/src/components/play-bar/desktop/PlayBar.jsx +++ b/packages/web/src/components/play-bar/desktop/PlayBar.jsx @@ -10,7 +10,6 @@ import { playerActions, playerSelectors, queueSelectors, - FeatureFlags, playbackRateValueMap, cacheTracksSelectors } from '@audius/common' @@ -21,6 +20,7 @@ import { PlaybackSource, Kind } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx index 3f3d9db72f5..1a56ae98ea3 100644 --- a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx @@ -7,8 +7,7 @@ import { purchaseContentActions, purchaseContentSelectors, isContentPurchaseInProgress, - PurchaseContentPage, - FeatureFlags + PurchaseContentPage } from '@audius/common' import { useGetTrackById } from '@audius/common/api' import { @@ -19,6 +18,7 @@ import { isTrackPurchaseable } from '@audius/common/hooks' import { PurchaseVendor, Track } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { USDC } from '@audius/fixed-decimal' import { Flex } from '@audius/harmony' import { diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx index 87ca3347cad..ce5255fd3fc 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect } from 'react' -import { PurchaseContentStage, FeatureFlags, IntKeys } from '@audius/common' +import { PurchaseContentStage } from '@audius/common' import { useFeatureFlag, useRemoteVar, @@ -11,6 +11,7 @@ import { usePurchaseMethod } from '@audius/common/hooks' import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' +import { IntKeys, FeatureFlags } from '@audius/common/services' import { Flex } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/components/related-artists/RelatedArtists.tsx b/packages/web/src/components/related-artists/RelatedArtists.tsx index 661c71a3811..00038a59063 100644 --- a/packages/web/src/components/related-artists/RelatedArtists.tsx +++ b/packages/web/src/components/related-artists/RelatedArtists.tsx @@ -1,8 +1,9 @@ import { useCallback } from 'react' -import { profilePageSelectors, FeatureFlags } from '@audius/common' +import { profilePageSelectors } from '@audius/common' import { useGetRelatedArtists } from '@audius/common/api' import { User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { MAX_PROFILE_RELATED_ARTISTS } from '@audius/common/utils' import { IconUserGroup } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/share-modal/ShareModal.tsx b/packages/web/src/components/share-modal/ShareModal.tsx index 7a38de30e53..f56961f7b3f 100644 --- a/packages/web/src/components/share-modal/ShareModal.tsx +++ b/packages/web/src/components/share-modal/ShareModal.tsx @@ -1,7 +1,6 @@ import { useCallback, useContext } from 'react' import { - FeatureFlags, accountSelectors, collectionsSocialActions, tracksSocialActions, @@ -12,6 +11,7 @@ import { useCreateChatModal } from '@audius/common' import { Name, PlayableType } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' import { make, useRecord } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/social-proof/SocialProof.tsx b/packages/web/src/components/social-proof/SocialProof.tsx index f62fcd3643b..4964c15f525 100644 --- a/packages/web/src/components/social-proof/SocialProof.tsx +++ b/packages/web/src/components/social-proof/SocialProof.tsx @@ -1,7 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { - BooleanKeys, accountSelectors, TwitterProfile, InstagramProfile, @@ -9,6 +8,7 @@ import { TikTokProfile } from '@audius/common' import { Name, Status } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/services' import { useDispatch, useSelector } from 'react-redux' import IconValidationX from 'assets/img/iconValidationX.svg' diff --git a/packages/web/src/components/stat-banner/StatBanner.tsx b/packages/web/src/components/stat-banner/StatBanner.tsx index c05bf2d6f11..a137a253e79 100644 --- a/packages/web/src/components/stat-banner/StatBanner.tsx +++ b/packages/web/src/components/stat-banner/StatBanner.tsx @@ -1,7 +1,7 @@ import { useRef } from 'react' -import { FeatureFlags } from '@audius/common' import { ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Button, ButtonSize, diff --git a/packages/web/src/components/tipping/tip-audio/SendTip.tsx b/packages/web/src/components/tipping/tip-audio/SendTip.tsx index 556ba6e94fb..6ff5bb6dfe6 100644 --- a/packages/web/src/components/tipping/tip-audio/SendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/SendTip.tsx @@ -13,12 +13,11 @@ import { walletSelectors, getTierAndNumberForBalance, OnRampProvider, - buyAudioActions, - FeatureFlags, - StringKeys + buyAudioActions } from '@audius/common' import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import { BadgeTier, StringWei, StringAudio, BNWei } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/services' import { isNullOrUndefined, stringWeiToBN, diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx index d7a125a6c15..b8afd7942ea 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx @@ -5,9 +5,9 @@ import { tippingActions, TippingSendStatus, walletActions, - StringKeys, accountSelectors } from '@audius/common' +import { StringKeys } from '@audius/common/services' import { Nullable } from '@audius/common/utils' import { Modal, ModalHeader, ModalTitle } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/tipping/tip-audio/TipSent.tsx b/packages/web/src/components/tipping/tip-audio/TipSent.tsx index 23ae01dd2a9..c911d641893 100644 --- a/packages/web/src/components/tipping/tip-audio/TipSent.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipSent.tsx @@ -1,11 +1,8 @@ import { useCallback } from 'react' -import { - accountSelectors, - tippingSelectors, - deriveUserBankAddress -} from '@audius/common' +import { accountSelectors, tippingSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import { deriveUserBankAddress } from '@audius/common/services' import { formatNumberCommas } from '@audius/common/utils' import { Button, ButtonType, IconTwitterBird, IconCheck } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx index e09f193579a..c4372800328 100644 --- a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx +++ b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx @@ -15,8 +15,7 @@ import { modalsSelectors, queueSelectors, shareModalUIActions, - useEditPlaylistModal, - FeatureFlags + useEditPlaylistModal } from '@audius/common' import { ShareSource, @@ -25,6 +24,7 @@ import { FollowSource, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/CardTitle.tsx b/packages/web/src/components/track/CardTitle.tsx index 4afcf4c4f5d..dde54163c49 100644 --- a/packages/web/src/components/track/CardTitle.tsx +++ b/packages/web/src/components/track/CardTitle.tsx @@ -1,9 +1,9 @@ -import { FeatureFlags } from '@audius/common' import { isContentCollectibleGated, isContentUSDCPurchaseGated, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Nullable } from '@audius/common/utils' import { IconCart, IconCollectible, IconSpecialAccess } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/GiantTrackTile.tsx b/packages/web/src/components/track/GiantTrackTile.tsx index badbc5b7c90..46667cce40c 100644 --- a/packages/web/src/components/track/GiantTrackTile.tsx +++ b/packages/web/src/components/track/GiantTrackTile.tsx @@ -1,7 +1,6 @@ import { useCallback, useState } from 'react' import { - FeatureFlags, publishTrackConfirmationModalUIActions, CommonState, cacheTracksSelectors @@ -14,6 +13,7 @@ import { Remix, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Genre, getCanonicalName, diff --git a/packages/web/src/components/track/PlayPauseButton.tsx b/packages/web/src/components/track/PlayPauseButton.tsx index c042ca64774..df5ab015738 100644 --- a/packages/web/src/components/track/PlayPauseButton.tsx +++ b/packages/web/src/components/track/PlayPauseButton.tsx @@ -1,11 +1,11 @@ import { - FeatureFlags, accountSelectors, playerSelectors, playbackPositionSelectors, CommonState } from '@audius/common' import { ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Button } from '@audius/harmony' import { IconPause, IconPlay } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/TrackTile.tsx b/packages/web/src/components/track/desktop/TrackTile.tsx index 3a18314b7af..eebcbbebafd 100644 --- a/packages/web/src/components/track/desktop/TrackTile.tsx +++ b/packages/web/src/components/track/desktop/TrackTile.tsx @@ -3,11 +3,11 @@ import { memo } from 'react' import { accountSelectors, playbackPositionSelectors, - FeatureFlags, CommonState, usePremiumContentPurchaseModal } from '@audius/common' import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { formatCount, Genre, diff --git a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx index 9331d694dd4..f931e4b4139 100644 --- a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx @@ -13,8 +13,7 @@ import { RepostType, favoritesUserListActions, repostsUserListActions, - playerSelectors, - FeatureFlags + playerSelectors } from '@audius/common' import { Name, @@ -26,6 +25,7 @@ import { ID, Track } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx index 68493055684..6c66ba0f1de 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx @@ -6,10 +6,10 @@ import { tracksSocialActions, OverflowAction, OverflowSource, - mobileOverflowMenuUIActions, - FeatureFlags + mobileOverflowMenuUIActions } from '@audius/common' import { RepostSource, FavoriteSource, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx index f530d1e36b8..64c5537555f 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx @@ -13,8 +13,7 @@ import { RepostType, repostsUserListActions, favoritesUserListActions, - playerSelectors, - FeatureFlags + playerSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { @@ -24,6 +23,7 @@ import { FavoriteType, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Genre } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/upload/TrackPreviewNew.tsx b/packages/web/src/components/upload/TrackPreviewNew.tsx index fd4af17e068..b139eb533e7 100644 --- a/packages/web/src/components/upload/TrackPreviewNew.tsx +++ b/packages/web/src/components/upload/TrackPreviewNew.tsx @@ -1,8 +1,8 @@ import { useState } from 'react' -import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { StemCategory, stemCategoryFriendlyNames } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Box, FilterButton, Flex, IconPenSquare } from '@audius/harmony' import { HarmonyPlainButton, IconTrash } from '@audius/stems' import numeral from 'numeral' diff --git a/packages/web/src/components/upload/UploadChip.tsx b/packages/web/src/components/upload/UploadChip.tsx index 0219160314f..67328733f60 100644 --- a/packages/web/src/components/upload/UploadChip.tsx +++ b/packages/web/src/components/upload/UploadChip.tsx @@ -1,7 +1,8 @@ import { Ref, useCallback, useMemo } from 'react' -import { FeatureFlags, cacheCollectionsActions } from '@audius/common' +import { cacheCollectionsActions } from '@audius/common' import { Name, CreatePlaylistSource } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Box, HTMLButtonProps, diff --git a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx index ab8f6acb758..dedfef14ed6 100644 --- a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx @@ -5,9 +5,7 @@ import { WithdrawUSDCModalPages, withdrawUSDCActions, withdrawUSDCSelectors, - WithdrawMethod, - FeatureFlags, - IntKeys + WithdrawMethod } from '@audius/common' import { useFeatureFlag, @@ -20,6 +18,7 @@ import { BNUSDC, SolanaWalletAddress } from '@audius/common/models' +import { IntKeys, FeatureFlags } from '@audius/common/services' import { formatUSDCWeiToFloorCentsNumber, Nullable } from '@audius/common/utils' import { Modal, ModalContent, ModalHeader } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx index 0c6811a3900..08bf6bce1a8 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx @@ -8,11 +8,11 @@ import { import { useWithdrawUSDCModal, WithdrawUSDCModalPages, - WithdrawMethod, - FeatureFlags + WithdrawMethod } from '@audius/common' import { useFeatureFlag, useUSDCBalance } from '@audius/common/hooks' import { Name, BNUSDC } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { filterDecimalString, padDecimalValue, diff --git a/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts b/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts index 7f85ebf8b44..5d901f67f9b 100644 --- a/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts +++ b/packages/web/src/hooks/useIsAudioMatchingChallengesEnabled.ts @@ -1,4 +1,4 @@ -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { useFlag } from './useRemoteConfig' diff --git a/packages/web/src/hooks/useIsUSDCEnabled.ts b/packages/web/src/hooks/useIsUSDCEnabled.ts index cfae7b378db..187e6deab6a 100644 --- a/packages/web/src/hooks/useIsUSDCEnabled.ts +++ b/packages/web/src/hooks/useIsUSDCEnabled.ts @@ -1,5 +1,5 @@ -import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/services' export const useIsUSDCEnabled = () => useFeatureFlag(FeatureFlags.USDC_PURCHASES).isEnabled diff --git a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx index a311122b175..ed855df38b4 100644 --- a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx +++ b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx @@ -1,11 +1,7 @@ import { ReactNode, useContext, useEffect } from 'react' -import { - FeatureFlags, - StringKeys, - tokenDashboardPageActions, - walletActions -} from '@audius/common' +import { tokenDashboardPageActions, walletActions } from '@audius/common' +import { StringKeys, FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx index 435ead8a373..afa97fdef98 100644 --- a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx @@ -1,7 +1,6 @@ import { ReactNode, useEffect, useMemo, useState } from 'react' import { - StringKeys, challengesSelectors, audioRewardsPageActions, ChallengeRewardsModalType, @@ -13,6 +12,7 @@ import { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { fillString, formatNumberCommas, diff --git a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx index 0196b2e2275..23e9355e3b8 100644 --- a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx @@ -1,10 +1,11 @@ import { ReactNode } from 'react' -import { StringKeys, audioRewardsPageActions } from '@audius/common' +import { audioRewardsPageActions } from '@audius/common' import { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx index 78583f92450..6313cb82fd4 100644 --- a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx @@ -1,7 +1,6 @@ import { ReactNode, useCallback } from 'react' import { - FeatureFlags, accountSelectors, tokenDashboardPageActions, TokenDashboardPageModalState, @@ -9,6 +8,7 @@ import { walletSelectors } from '@audius/common' import { Chain, StringWei, BNWei, WalletAddress } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { stringWeiToBN, weiToString, Nullable } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx index 7b184a95a08..fab27b43354 100644 --- a/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/ReceiveBody.tsx @@ -1,6 +1,6 @@ -import { FeatureFlags } from '@audius/common' import { useCreateUserbankIfNeeded } from '@audius/common/hooks' import { WalletAddress, SolanaWalletAddress } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Button, ButtonType, LogoSol } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx index 0a4c0453648..7cf9b3e0771 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputBody.tsx @@ -1,6 +1,5 @@ import { useCallback, useMemo, useState } from 'react' -import { FeatureFlags, IntKeys, MIN_TRANSFERRABLE_WEI } from '@audius/common' import { Chain, StringWei, @@ -10,6 +9,11 @@ import { WalletAddress, SolanaWalletAddress } from '@audius/common/models' +import { + IntKeys, + FeatureFlags, + MIN_TRANSFERRABLE_WEI +} from '@audius/common/services' import { weiToAudio, stringWeiToBN, diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx index 1fd63ecd06d..c784ca4e1a5 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx @@ -5,12 +5,10 @@ import { walletSelectors, tokenDashboardPageSelectors, buyAudioActions, - OnRampProvider, - FeatureFlags, - StringKeys, - Location + OnRampProvider } from '@audius/common' import { Client, BNWei } from '@audius/common/models' +import { StringKeys, FeatureFlags, Location } from '@audius/common/services' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Button, ButtonType, IconInfo } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx index a6acec01522..fc0bc8d73d6 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx @@ -1,12 +1,12 @@ import { useCallback, useEffect, useState } from 'react' import { - StringKeys, audioRewardsPageActions, TrendingRewardsModalType, audioRewardsPageSelectors } from '@audius/common' import { Theme } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { SegmentedControl, ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/ChatPage.tsx b/packages/web/src/pages/chat-page/ChatPage.tsx index f61bec24a72..e6c08f3164d 100644 --- a/packages/web/src/pages/chat-page/ChatPage.tsx +++ b/packages/web/src/pages/chat-page/ChatPage.tsx @@ -1,7 +1,8 @@ import { useCallback, useEffect, useRef } from 'react' -import { chatActions, FeatureFlags, chatSelectors } from '@audius/common' +import { chatActions, chatSelectors } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/services' import { ResizeObserver } from '@juggle/resize-observer' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx index 14bd6a36e88..b594be32970 100644 --- a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx @@ -3,8 +3,7 @@ import { ChangeEvent, useMemo } from 'react' import { CollectionTrack, CollectionPageTrackRecord, - CollectionsPageType, - FeatureFlags + CollectionsPageType } from '@audius/common' import { Variant, @@ -15,6 +14,7 @@ import { ID, User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { CollectiblesPlaylistTableColumn, diff --git a/packages/web/src/pages/dashboard-page/store/sagas.ts b/packages/web/src/pages/dashboard-page/store/sagas.ts index eb7b4598705..07a234d5f8a 100644 --- a/packages/web/src/pages/dashboard-page/store/sagas.ts +++ b/packages/web/src/pages/dashboard-page/store/sagas.ts @@ -1,10 +1,6 @@ -import { - IntKeys, - accountSelectors, - walletActions, - getContext -} from '@audius/common' +import { accountSelectors, walletActions, getContext } from '@audius/common' import { Collection, ID, Track } from '@audius/common/models' +import { IntKeys } from '@audius/common/services' import { waitForValue, doEvery } from '@audius/common/utils' import { each } from 'lodash' import moment from 'moment' diff --git a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx index 22e054894a2..a4e76eb1508 100644 --- a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx +++ b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx @@ -1,9 +1,7 @@ -import { - feedPageLineupActions as feedActions, - FeatureFlags -} from '@audius/common' +import { feedPageLineupActions as feedActions } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { Name, FeedFilter } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { make, useRecord } from 'common/store/analytics/actions' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx b/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx index 70e00bd874e..a5842bbba2a 100644 --- a/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' import { - FeatureFlags, Notifications, BrowserNotificationSetting, EmailFrequency } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { Modal, SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx index d0c14ddef82..ce4c6453ff6 100644 --- a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx @@ -7,10 +7,10 @@ import { BrowserNotificationSetting, EmailFrequency, TikTokProfile, - FeatureFlags, settingsPageSelectors } from '@audius/common' import { OS, Theme, ID, ProfilePictureSizes } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' import { IconAppearance } from '@audius/harmony' import { diff --git a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx index 2eb874c830c..832a9745813 100644 --- a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx @@ -1,7 +1,6 @@ import { useCallback, useState } from 'react' import { - BooleanKeys, TwitterProfile, InstagramProfile, musicConfettiActions, @@ -14,6 +13,7 @@ import { ID, ProfilePictureSizes } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/services' import { Modal, Button, ButtonType, IconNote, ButtonSize } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx index 23d3f8adf13..bacacad7cca 100644 --- a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx @@ -1,11 +1,6 @@ import { useCallback, useState } from 'react' -import { - BooleanKeys, - InstagramProfile, - TwitterProfile, - TikTokProfile -} from '@audius/common' +import { InstagramProfile, TwitterProfile, TikTokProfile } from '@audius/common' import { Name, SquareSizes, @@ -13,6 +8,7 @@ import { ID, ProfilePictureSizes } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/services' import { Button, ButtonSize, diff --git a/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx b/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx index a3e5d5f281c..93eeccea219 100644 --- a/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx +++ b/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx @@ -1,11 +1,7 @@ import { useCallback } from 'react' -import { - BooleanKeys, - InstagramProfile, - TikTokProfile, - TwitterProfile -} from '@audius/common' +import { InstagramProfile, TikTokProfile, TwitterProfile } from '@audius/common' +import { BooleanKeys } from '@audius/common/services' import { IconImage, IconUser, IconVerified } from '@audius/stems' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/sign-on/components/ProfileForm.tsx b/packages/web/src/pages/sign-on/components/ProfileForm.tsx index 34e3f43123e..3a4d94c42f2 100644 --- a/packages/web/src/pages/sign-on/components/ProfileForm.tsx +++ b/packages/web/src/pages/sign-on/components/ProfileForm.tsx @@ -1,10 +1,10 @@ import { KeyboardEventHandler, useState } from 'react' +import { imageProfilePicEmpty as profilePicEmpty } from '@audius/common' import { - imageProfilePicEmpty as profilePicEmpty, - MAX_DISPLAY_NAME_LENGTH, - MAX_HANDLE_LENGTH -} from '@audius/common' + MAX_HANDLE_LENGTH, + MAX_DISPLAY_NAME_LENGTH +} from '@audius/common/services' import { getErrorMessage } from '@audius/common/utils' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-on/components/ProfilePage.tsx b/packages/web/src/pages/sign-on/components/ProfilePage.tsx index 04291f9c0c9..40453f52ea1 100644 --- a/packages/web/src/pages/sign-on/components/ProfilePage.tsx +++ b/packages/web/src/pages/sign-on/components/ProfilePage.tsx @@ -4,11 +4,13 @@ import { Image, InstagramProfile, TwitterProfile, - formatInstagramProfile, - formatTwitterProfile, - formatTikTokProfile, TikTokProfile } from '@audius/common' +import { + formatTwitterProfile, + formatInstagramProfile, + formatTikTokProfile +} from '@audius/common/services' import cn from 'classnames' import IconCaretLeft from 'assets/img/iconCaretLeft.svg' diff --git a/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx b/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx index 8b3b3f8cc27..59ac98154a6 100644 --- a/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx +++ b/packages/web/src/pages/sign-on/components/desktop/MetaMaskModal.jsx @@ -1,6 +1,6 @@ import { Component } from 'react' -import { BackendUtils as Utils } from '@audius/common' +import { BackendUtils as Utils } from '@audius/common/services' import { Box, Text } from '@audius/harmony' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/sign-up-page/components/HandleField.tsx b/packages/web/src/pages/sign-up-page/components/HandleField.tsx index c6304782c3f..e085ed9831b 100644 --- a/packages/web/src/pages/sign-up-page/components/HandleField.tsx +++ b/packages/web/src/pages/sign-up-page/components/HandleField.tsx @@ -1,12 +1,12 @@ import { Ref, forwardRef, useCallback, useContext } from 'react' -import { MAX_HANDLE_LENGTH } from '@audius/common' import { useIsWaitingForValidation } from '@audius/common/hooks' import { socialMediaMessages, pickHandlePageMessages as messages } from '@audius/common/messages' import { pickHandleErrorMessages } from '@audius/common/schemas' +import { MAX_HANDLE_LENGTH } from '@audius/common/services' import { TextLink } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx index 1a7968b4317..15c9f82427a 100644 --- a/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx +++ b/packages/web/src/pages/sign-up-page/components/SocialMediaLoginOptions.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react' -import { BooleanKeys } from '@audius/common' import { socialMediaMessages } from '@audius/common/messages' +import { BooleanKeys } from '@audius/common/services' import { Box, Flex, SocialButton } from '@audius/harmony' import { ToastContext } from 'components/toast/ToastContext' diff --git a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts index 2b997d74f02..c5452dc4ab5 100644 --- a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts +++ b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts @@ -2,15 +2,17 @@ import { useContext } from 'react' import { AudiusQueryContext, - formatInstagramProfile, - formatTikTokProfile, - formatTwitterProfile, InstagramProfile, TikTokProfile, TwitterProfile } from '@audius/common' import { Name } from '@audius/common/models' import { pickHandleSchema } from '@audius/common/schemas' +import { + formatTwitterProfile, + formatInstagramProfile, + formatTikTokProfile +} from '@audius/common/services' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx index 38eaeb13ae7..cde87505a17 100644 --- a/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/FinishProfilePage.tsx @@ -1,9 +1,9 @@ import { useCallback, useRef } from 'react' -import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' import { finishProfileSchema } from '@audius/common/schemas' +import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common/services' import { Flex, Paper, PlainButton, Text, useTheme } from '@audius/harmony' import { Formik, Form, useField, useFormikContext } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx index 066600aedae..c8262062f95 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx @@ -1,10 +1,6 @@ import { useCallback } from 'react' -import { - OverflowAction, - imageBlank as placeholderArt, - FeatureFlags -} from '@audius/common' +import { OverflowAction, imageBlank as placeholderArt } from '@audius/common' import { SquareSizes, isContentCollectibleGated, @@ -15,6 +11,7 @@ import { Remix, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { getCanonicalName, formatSeconds, diff --git a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx index 4f8b298be69..53a6cb987a7 100644 --- a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx +++ b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { accountSelectors, FeatureFlags } from '@audius/common' +import { accountSelectors } from '@audius/common' import { USDCPurchaseConfig, useFeatureFlag, @@ -21,6 +21,7 @@ import { USDCPurchaseConditions, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { formatPrice, Nullable } from '@audius/common/utils' import { IconCart, diff --git a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx index c172db5806c..3ceac068803 100644 --- a/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/usdc-purchase-gated/UsdcPurchaseGatedRadioField.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' -import { FeatureFlags } from '@audius/common' import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' import { Name, TrackAvailabilityType, AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { IconCart, IconStars } from '@audius/stems' import { ExternalLink } from 'components/link' diff --git a/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx b/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx index c61cb856986..c0e20118315 100644 --- a/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx +++ b/packages/web/src/pages/upload-page/forms/EditTrackForm.tsx @@ -1,6 +1,6 @@ import { useCallback, useContext, useMemo } from 'react' -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { HarmonyPlainButton, IconCaretRight } from '@audius/stems' import cn from 'classnames' import { Form, Formik, FormikProps, useField } from 'formik' diff --git a/packages/web/src/pages/upload-page/pages/SelectPage.tsx b/packages/web/src/pages/upload-page/pages/SelectPage.tsx index 0eb8c2555c8..07ea3844107 100644 --- a/packages/web/src/pages/upload-page/pages/SelectPage.tsx +++ b/packages/web/src/pages/upload-page/pages/SelectPage.tsx @@ -1,7 +1,8 @@ import { useCallback, useState } from 'react' -import { UploadType, FeatureFlags } from '@audius/common' +import { UploadType } from '@audius/common' import { newCollectionMetadata } from '@audius/common/schemas' +import { FeatureFlags } from '@audius/common/services' import { removeNullable, Nullable } from '@audius/common/utils' import { Box } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/services/Location.ts b/packages/web/src/services/Location.ts index 83baa99fe12..887242fdc7a 100644 --- a/packages/web/src/services/Location.ts +++ b/packages/web/src/services/Location.ts @@ -1,4 +1,4 @@ -import { getLocation as getLocationCommon } from '@audius/common' +import { getLocation as getLocationCommon } from '@audius/common/services' import { localStorage } from 'services/local-storage' diff --git a/packages/web/src/services/audius-api-client/apiClient.ts b/packages/web/src/services/audius-api-client/apiClient.ts index a355d6ee5af..b3e049d3e62 100644 --- a/packages/web/src/services/audius-api-client/apiClient.ts +++ b/packages/web/src/services/audius-api-client/apiClient.ts @@ -1,4 +1,4 @@ -import { AudiusAPIClient } from '@audius/common' +import { AudiusAPIClient } from '@audius/common/services' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' import { waitForLibsInit } from 'services/audius-backend/eagerLoadUtils' diff --git a/packages/web/src/services/audius-backend/BuyAudio.ts b/packages/web/src/services/audius-backend/BuyAudio.ts index 41d188b041e..cae50ed0093 100644 --- a/packages/web/src/services/audius-backend/BuyAudio.ts +++ b/packages/web/src/services/audius-backend/BuyAudio.ts @@ -1,4 +1,5 @@ -import { InAppAudioPurchaseMetadata, MEMO_PROGRAM_ID } from '@audius/common' +import { InAppAudioPurchaseMetadata } from '@audius/common' +import { MEMO_PROGRAM_ID } from '@audius/common/services' import { TokenAccountNotFoundError, createTransferCheckedInstruction, diff --git a/packages/web/src/services/audius-backend/Cognito.ts b/packages/web/src/services/audius-backend/Cognito.ts index f1143bd119f..44ece4eb9a7 100644 --- a/packages/web/src/services/audius-backend/Cognito.ts +++ b/packages/web/src/services/audius-backend/Cognito.ts @@ -1,4 +1,4 @@ -import { AuthHeaders } from '@audius/common' +import { AuthHeaders } from '@audius/common/services' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' import { waitForLibsInit } from 'services/audius-backend/eagerLoadUtils' diff --git a/packages/web/src/services/audius-backend/audius-backend-instance.ts b/packages/web/src/services/audius-backend/audius-backend-instance.ts index 9155bc12fad..4f7845dc30e 100644 --- a/packages/web/src/services/audius-backend/audius-backend-instance.ts +++ b/packages/web/src/services/audius-backend/audius-backend-instance.ts @@ -1,4 +1,4 @@ -import { audiusBackend } from '@audius/common' +import { audiusBackend } from '@audius/common/services' import type { AudiusLibs } from '@audius/sdk' import { track } from 'services/analytics' diff --git a/packages/web/src/services/audius-backend/eagerLoadUtils.ts b/packages/web/src/services/audius-backend/eagerLoadUtils.ts index fdb65edde68..0f00f1e28f7 100644 --- a/packages/web/src/services/audius-backend/eagerLoadUtils.ts +++ b/packages/web/src/services/audius-backend/eagerLoadUtils.ts @@ -1,10 +1,9 @@ +import { getEagerDiscprov, makeEagerRequest } from '@audius/common/services' /** * Utilities to assist in eager pre-fetching content from the * protocol before libs has initialized. */ -import { getEagerDiscprov, makeEagerRequest } from '@audius/common' - import { env } from 'services/env' import { localStorage } from 'services/local-storage' diff --git a/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts b/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts index 890f662092c..4a08deb0cfa 100644 --- a/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts +++ b/packages/web/src/services/audius-sdk/discoveryNodeSelector.ts @@ -1,4 +1,4 @@ -import { DiscoveryNodeSelectorService } from '@audius/common' +import { DiscoveryNodeSelectorService } from '@audius/common/services' import { env } from '../env' import { remoteConfigInstance } from '../remote-config/remote-config-instance' diff --git a/packages/web/src/services/audius-sdk/storageNodeSelector.ts b/packages/web/src/services/audius-sdk/storageNodeSelector.ts index 31de5d8a304..e1b2b44bc38 100644 --- a/packages/web/src/services/audius-sdk/storageNodeSelector.ts +++ b/packages/web/src/services/audius-sdk/storageNodeSelector.ts @@ -1,4 +1,4 @@ -import { makeGetStorageNodeSelector } from '@audius/common' +import { makeGetStorageNodeSelector } from '@audius/common/services' import { env } from 'services/env' diff --git a/packages/web/src/services/env/env.dev.ts b/packages/web/src/services/env/env.dev.ts index c699d2ae143..afc85a95345 100644 --- a/packages/web/src/services/env/env.dev.ts +++ b/packages/web/src/services/env/env.dev.ts @@ -1,4 +1,4 @@ -import { Env } from '@audius/common' +import { Env } from '@audius/common/services' export const env: Env = { AAO_ENDPOINT: 'http://audius-protocol-anti-abuse-oracle-1', diff --git a/packages/web/src/services/env/env.prod.ts b/packages/web/src/services/env/env.prod.ts index 1d7d993e943..bb2824a7694 100644 --- a/packages/web/src/services/env/env.prod.ts +++ b/packages/web/src/services/env/env.prod.ts @@ -1,4 +1,4 @@ -import { Env } from '@audius/common' +import { Env } from '@audius/common/services' export const env: Env = { AAO_ENDPOINT: 'https://antiabuseoracle.audius.co', diff --git a/packages/web/src/services/env/env.stage.ts b/packages/web/src/services/env/env.stage.ts index 0b45d6f5c77..0f93ca44ece 100644 --- a/packages/web/src/services/env/env.stage.ts +++ b/packages/web/src/services/env/env.stage.ts @@ -1,4 +1,4 @@ -import { Env } from '@audius/common' +import { Env } from '@audius/common/services' export const env: Env = { AAO_ENDPOINT: 'https://antiabuseoracle.staging.audius.co', diff --git a/packages/web/src/services/env/index.ts b/packages/web/src/services/env/index.ts index 74b19ac19b6..1ea6d2a4c67 100644 --- a/packages/web/src/services/env/index.ts +++ b/packages/web/src/services/env/index.ts @@ -1,5 +1,6 @@ -import { Environment } from '@audius/common' -import type { Env } from '@audius/common' +import { Environment, Env } from '@audius/common/services' + +import type {} from '@audius/common' import { env as envDev } from './env.dev' import { env as envProd } from './env.prod' diff --git a/packages/web/src/services/explore.ts b/packages/web/src/services/explore.ts index fcab1e89747..e0e351fec49 100644 --- a/packages/web/src/services/explore.ts +++ b/packages/web/src/services/explore.ts @@ -1,4 +1,4 @@ -import { Explore } from '@audius/common' +import { Explore } from '@audius/common/services' import { apiClient } from './audius-api-client' import { audiusBackendInstance } from './audius-backend/audius-backend-instance' diff --git a/packages/web/src/services/fingerprint.ts b/packages/web/src/services/fingerprint.ts index e6ca6d8a194..b7fad01a93e 100644 --- a/packages/web/src/services/fingerprint.ts +++ b/packages/web/src/services/fingerprint.ts @@ -1,4 +1,4 @@ -import { FingerprintClient } from '@audius/common' +import { FingerprintClient } from '@audius/common/services' import FingerprintJS, { Agent } from '@fingerprintjs/fingerprintjs-pro' import { env } from './env' diff --git a/packages/web/src/services/local-storage.ts b/packages/web/src/services/local-storage.ts index 87c0e53178f..82709c90de1 100644 --- a/packages/web/src/services/local-storage.ts +++ b/packages/web/src/services/local-storage.ts @@ -1,4 +1,4 @@ -import { LocalStorage } from '@audius/common' +import { LocalStorage } from '@audius/common/services' export const localStorage = new LocalStorage({ localStorage: diff --git a/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts b/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts index 01d9e713769..aeb84c9c28d 100644 --- a/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts +++ b/packages/web/src/services/remote-config/__mocks__/remote-config-instance.ts @@ -1,4 +1,4 @@ -import { RemoteConfigInstance } from '@audius/common' +import { RemoteConfigInstance } from '@audius/common/services' import { vitest } from 'vitest' let fakeConfig: Record = {} diff --git a/packages/web/src/services/remote-config/featureFlagHelpers.ts b/packages/web/src/services/remote-config/featureFlagHelpers.ts index 17401fcf73c..b8b6c678cb7 100644 --- a/packages/web/src/services/remote-config/featureFlagHelpers.ts +++ b/packages/web/src/services/remote-config/featureFlagHelpers.ts @@ -1,8 +1,8 @@ -import { FeatureFlags } from '@audius/common' import { OverrideSetting, FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/services' import { remoteConfigInstance } from './remote-config-instance' diff --git a/packages/web/src/services/remote-config/remote-config-instance.ts b/packages/web/src/services/remote-config/remote-config-instance.ts index 55353517323..a369e5a7da8 100644 --- a/packages/web/src/services/remote-config/remote-config-instance.ts +++ b/packages/web/src/services/remote-config/remote-config-instance.ts @@ -1,5 +1,5 @@ -import { remoteConfig } from '@audius/common' import { ErrorLevel } from '@audius/common/models' +import { remoteConfig } from '@audius/common/services' import optimizely, { Config } from '@optimizely/optimizely-sdk' import { isEmpty } from 'lodash' diff --git a/packages/web/src/services/serviceMonitoring.ts b/packages/web/src/services/serviceMonitoring.ts index dc93b8f434f..e7e22056285 100644 --- a/packages/web/src/services/serviceMonitoring.ts +++ b/packages/web/src/services/serviceMonitoring.ts @@ -1,5 +1,5 @@ -import { IntKeys } from '@audius/common' import { Name, ServiceMonitorType, MonitorPayload } from '@audius/common/models' +import { IntKeys } from '@audius/common/services' import { track } from 'services/analytics' import { remoteConfigInstance } from 'services/remote-config/remote-config-instance' diff --git a/packages/web/src/services/solana/WithdrawUSDC.ts b/packages/web/src/services/solana/WithdrawUSDC.ts index 2a4cecdd625..bb3aee5f2cc 100644 --- a/packages/web/src/services/solana/WithdrawUSDC.ts +++ b/packages/web/src/services/solana/WithdrawUSDC.ts @@ -1,4 +1,7 @@ -import { getLookupTableAccounts, getRecentBlockhash } from '@audius/common' +import { + getRecentBlockhash, + getLookupTableAccounts +} from '@audius/common/services' import { MintName } from '@audius/sdk' import { createCloseAccountInstruction, diff --git a/packages/web/src/services/solana/solana.ts b/packages/web/src/services/solana/solana.ts index ad09c020928..2dacb710070 100644 --- a/packages/web/src/services/solana/solana.ts +++ b/packages/web/src/services/solana/solana.ts @@ -1,5 +1,5 @@ -import { MintName, DEFAULT_MINT } from '@audius/common' import { SolanaWalletAddress } from '@audius/common/models' +import { DEFAULT_MINT, MintName } from '@audius/common/services' import { Account, getMinimumBalanceForRentExemptAccount, diff --git a/packages/web/src/services/track-download.ts b/packages/web/src/services/track-download.ts index fc77056a7e5..166855caaea 100644 --- a/packages/web/src/services/track-download.ts +++ b/packages/web/src/services/track-download.ts @@ -1,4 +1,4 @@ -import { TrackDownload as TrackDownloadBase } from '@audius/common' +import { TrackDownload as TrackDownloadBase } from '@audius/common/services' import { audiusBackendInstance } from './audius-backend/audius-backend-instance' diff --git a/packages/web/src/services/wallet-client.ts b/packages/web/src/services/wallet-client.ts index 8f506d51cf1..48fb5bd3d25 100644 --- a/packages/web/src/services/wallet-client.ts +++ b/packages/web/src/services/wallet-client.ts @@ -1,4 +1,4 @@ -import { WalletClient } from '@audius/common' +import { WalletClient } from '@audius/common/services' import { apiClient } from './audius-api-client' import { audiusBackendInstance } from './audius-backend/audius-backend-instance' diff --git a/packages/web/src/store/application/ui/buy-audio/sagas.ts b/packages/web/src/store/application/ui/buy-audio/sagas.ts index 4d72185268c..9ed6835c01f 100644 --- a/packages/web/src/store/application/ui/buy-audio/sagas.ts +++ b/packages/web/src/store/application/ui/buy-audio/sagas.ts @@ -1,5 +1,4 @@ import { - IntKeys, getContext, walletActions, TOKEN_LISTING_MAP, @@ -13,15 +12,18 @@ import { TransactionMethod, TransactionDetails, walletSelectors, - createUserBankIfNeeded, modalsActions, AmountObject, - FeatureFlags, - LocalStorage, - solanaSelectors, - deriveUserBankPubkey + solanaSelectors } from '@audius/common' import { Name, ErrorLevel, BNWei } from '@audius/common/models' +import { + IntKeys, + FeatureFlags, + deriveUserBankPubkey, + createUserBankIfNeeded, + LocalStorage +} from '@audius/common/services' import { dayjs, isNullOrUndefined, diff --git a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts index fcf6e9557c2..8a2a8d5217d 100644 --- a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts +++ b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts @@ -4,9 +4,6 @@ import { getUSDCUserBank, getContext, TOKEN_LISTING_MAP, - getUserbankAccountInfo, - relayVersionedTransaction, - relayTransaction, withdrawUSDCModalActions, WithdrawUSDCModalPages, WithdrawMethod, @@ -20,6 +17,11 @@ import { BNUSDC, SolanaWalletAddress } from '@audius/common/models' +import { + getUserbankAccountInfo, + relayTransaction, + relayVersionedTransaction +} from '@audius/common/services' import { formatUSDCWeiToFloorCentsNumber } from '@audius/common/utils' import { createAssociatedTokenAccountInstruction, diff --git a/packages/web/src/store/sign-out/signOut.ts b/packages/web/src/store/sign-out/signOut.ts index e827c6020b1..a5e7026dfd1 100644 --- a/packages/web/src/store/sign-out/signOut.ts +++ b/packages/web/src/store/sign-out/signOut.ts @@ -1,4 +1,4 @@ -import { AudiusBackend, LocalStorage } from '@audius/common' +import { LocalStorage, AudiusBackend } from '@audius/common/services' import { removeHasRequestedBrowserPermission } from 'utils/browserNotifications' diff --git a/packages/web/src/store/storeContext.ts b/packages/web/src/store/storeContext.ts index 51051b12a4c..d39c36a35ca 100644 --- a/packages/web/src/store/storeContext.ts +++ b/packages/web/src/store/storeContext.ts @@ -1,9 +1,9 @@ +import { CommonStoreContext } from '@audius/common' import { - SolanaClient, - CommonStoreContext, + FeatureFlags, OpenSeaClient, - FeatureFlags -} from '@audius/common' + SolanaClient +} from '@audius/common/services' import { setTag, configureScope } from '@sentry/browser' import * as analytics from 'services/analytics' diff --git a/packages/web/src/store/token-dashboard/establishWalletConnection.ts b/packages/web/src/store/token-dashboard/establishWalletConnection.ts index 1284b88b858..6471fb11fb2 100644 --- a/packages/web/src/store/token-dashboard/establishWalletConnection.ts +++ b/packages/web/src/store/token-dashboard/establishWalletConnection.ts @@ -1,9 +1,6 @@ -import { - BooleanKeys, - getContext, - tokenDashboardPageActions -} from '@audius/common' +import { getContext, tokenDashboardPageActions } from '@audius/common' import { Chain } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/services' import { getErrorMessage } from '@audius/common/utils' import { call, put } from 'typed-redux-saga' diff --git a/packages/web/src/store/token-dashboard/signMessage.ts b/packages/web/src/store/token-dashboard/signMessage.ts index e8b255067e6..12822333556 100644 --- a/packages/web/src/store/token-dashboard/signMessage.ts +++ b/packages/web/src/store/token-dashboard/signMessage.ts @@ -1,10 +1,10 @@ import { accountSelectors, tokenDashboardPageActions, - tokenDashboardPageSelectors, - PhantomProvider + tokenDashboardPageSelectors } from '@audius/common' import { Chain } from '@audius/common/models' +import { PhantomProvider } from '@audius/common/services' import { call, put, select } from 'typed-redux-saga' import { WalletConnection } from './types' diff --git a/packages/web/src/store/token-dashboard/types.ts b/packages/web/src/store/token-dashboard/types.ts index 007ced31e44..d8984c39c2b 100644 --- a/packages/web/src/store/token-dashboard/types.ts +++ b/packages/web/src/store/token-dashboard/types.ts @@ -1,5 +1,5 @@ -import { PhantomProvider } from '@audius/common' import { Chain } from '@audius/common/models' +import { PhantomProvider } from '@audius/common/services' export type PhantomWalletConnection = { chain: Chain.Sol diff --git a/packages/web/src/utils/browserNotifications.ts b/packages/web/src/utils/browserNotifications.ts index 6736f42c752..e152c2bf9f9 100644 --- a/packages/web/src/utils/browserNotifications.ts +++ b/packages/web/src/utils/browserNotifications.ts @@ -1,4 +1,4 @@ -import { AudiusBackend } from '@audius/common' +import { AudiusBackend } from '@audius/common/services' import { env } from 'services/env' import { isElectron } from 'utils/clientUtil' diff --git a/packages/web/src/utils/route.ts b/packages/web/src/utils/route.ts index 83e948aefa6..74c394c8f53 100644 --- a/packages/web/src/utils/route.ts +++ b/packages/web/src/utils/route.ts @@ -1,5 +1,5 @@ -import { Env } from '@audius/common' import { ID } from '@audius/common/models' +import { Env } from '@audius/common/services' import { encodeUrlName, getHash } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { Location } from 'history' From 97cb871b844ead239f91300fc9de7a89bd6c5b83 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 16:20:26 -0800 Subject: [PATCH 39/64] Fix mobile babel --- packages/mobile/babel.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js index 5e4c1aae97c..8ef05d3f41e 100644 --- a/packages/mobile/babel.config.js +++ b/packages/mobile/babel.config.js @@ -14,7 +14,8 @@ module.exports = (api) => { '@audius/common/context': '../common/src/context', '@audius/common/api': '../common/src/api', '@audius/common/models': '../common/src/models', - '@audius/common/utils': '../common/src/utils' + '@audius/common/utils': '../common/src/utils', + '@audius/common/schemas': '../common/src/schemas' } } ] From a31aaf0ecc8eaef97eadb4114979844b682658aa Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 16:31:15 -0800 Subject: [PATCH 40/64] Fix all settled --- packages/common/src/utils/allSettled.ts | 31 ++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/packages/common/src/utils/allSettled.ts b/packages/common/src/utils/allSettled.ts index 14b5af333b3..440ad25a4b5 100644 --- a/packages/common/src/utils/allSettled.ts +++ b/packages/common/src/utils/allSettled.ts @@ -1,17 +1,16 @@ -export const allSettled = - // eslint-disable-next-line no-restricted-properties - Promise.allSettled.bind(Promise) || - ((promises: any[]) => - Promise.all( - promises.map((p: Promise) => - p - .then((value: any) => ({ - status: 'fulfilled', - value - })) - .catch((reason: any) => ({ - status: 'rejected', - reason - })) +export const allSettled = Promise.allSettled + ? Promise.allSettled.bind(Promise) + : (promises: any[]) => + Promise.all( + promises.map((p: Promise) => + p + .then((value: any) => ({ + status: 'fulfilled', + value + })) + .catch((reason: any) => ({ + status: 'rejected', + reason + })) + ) ) - )) From 712a86218c74c9f8839102a46d6606f21b34cc70 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 16:37:53 -0800 Subject: [PATCH 41/64] Convert audius-query in web --- packages/common/package.json | 3 +- packages/common/src/index.ts | 3 +- packages/convert-exports.js | 126 +----------------- packages/get-type-exports.js | 2 +- packages/web/src/app/AudiusQueryProvider.tsx | 2 +- .../components/PurchasesTab.tsx | 7 +- .../pay-and-earn-page/components/SalesTab.tsx | 7 +- .../components/WithdrawalsTab.tsx | 2 +- .../saved-page/hooks/useCollectionsData.tsx | 4 +- .../components/SignUpWithMetaMaskButton.tsx | 2 +- .../sign-up-page/hooks/socialMediaLogin.ts | 8 +- .../sign-up-page/pages/CreateEmailPage.tsx | 2 +- .../sign-up-page/pages/CreateLoginDetails.tsx | 2 +- .../sign-up-page/pages/PickHandlePage.tsx | 2 +- .../sign-up-page/pages/ReviewHandlePage.tsx | 2 +- 15 files changed, 25 insertions(+), 149 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index bb40aff0056..044a3ab87c6 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -16,7 +16,8 @@ "./models": "./src/models/index.ts", "./utils": "./src/utils/index.ts", "./schemas": "./src/schemas/index.ts", - "./services": "./src/services/index.ts" + "./services": "./src/services/index.ts", + "./audius-query": "./src/audius-query/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 6dfe282b296..ad591c604a6 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,6 +1,5 @@ -import * as e from './services' +import * as e from './audius-query' console.log('exports', Object.keys(e)) -export * from './audius-query' export * from './store' export * from './assets' diff --git a/packages/convert-exports.js b/packages/convert-exports.js index 66d31a1b28d..49298aa2fe1 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -5,127 +5,13 @@ var getDirectories = function (callback) { glob('./web/src/**/*', callback) } -const DIRECTORY = 'services' +const DIRECTORY = 'audius-query' const EXPORTS = [ - 'IntKeys', - 'StringKeys', - 'DoubleKeys', - 'BooleanKeys', - 'FeatureFlags', - 'remoteConfig', - 'remoteConfigIntDefaults', - 'remoteConfigDoubleDefaults', - 'remoteConfigBooleanDefaults', - 'RandomImage', - 'responseAdapter', - 'AudiusAPIClient', - 'isApiActivityV2', - 'isApiActivityV1', - 'AuthHeaders', - 'BackendUtils', - 'audiusBackend', - 'ClientRewardsReporter', - 'getEagerDiscprov', - 'makeEagerRequest', - 'recordIP', - 'MEMO_PROGRAM_ID', - 'DEFAULT_MINT', - 'getRootSolanaAccount', - 'getSolanaConnection', - 'getRecentBlockhash', - 'getTokenAccountInfo', - 'deriveUserBankPubkey', - 'deriveUserBankAddress', - 'getUserbankAccountInfo', - 'createUserBankIfNeeded', - 'pollForTokenBalanceChange', - 'pollForBalanceChange', - 'purchaseContent', - 'purchaseContentWithPaymentRouter', - 'findAssociatedTokenAddress', - 'createRootWalletRecoveryTransaction', - 'createTransferToUserBankTransaction', - 'createPaymentRouterRouteTransaction', - 'relayTransaction', - 'relayVersionedTransaction', - 'getLookupTableAccounts', - 'createVersionedTransaction', - 'FingerprintClient', - 'LocalStorage', - 'MIN_TRANSFERRABLE_WEI', - 'WalletClient', - 'Explore', - 'AudioError', - 'isAssetValid', - 'assetToCollectible', - 'creationEventToCollectible', - 'transferEventToCollectible', - 'isNotFromNullAddress', - 'OpenSeaClient', - 'SolanaClient', - 'TrackDownload', - 'MAX_HANDLE_LENGTH', - 'MAX_DISPLAY_NAME_LENGTH', - 'formatTwitterProfile', - 'formatInstagramProfile', - 'formatTikTokProfile', - 'getLocation', - 'getCityAndRegion', - 'DiscoveryNodeSelectorService', - 'makeGetStorageNodeSelector', - 'AudioInfo', - 'AudioPlayer', - 'QueryParams', - 'AssociatedWalletsResponse', - 'GetSocialFeedArgs', - 'GetSupportingArgs', - 'GetSupportersArgs', - 'GetTipsArgs', - 'GetNFTGatedTrackSignaturesArgs', - 'OpaqueID', - 'APIUser', - 'APISearchUser', - 'APIRepost', - 'APIFavorite', - 'APIRemix', - 'APITrack', - 'APISearchTrack', - 'APIStem', - 'APIPlaylistAddedTimestamp', - 'APIPlaylist', - 'APISearchPlaylist', - 'APIItemType', - 'APIActivity', - 'APIActivityV2', - 'APISearch', - 'APISearchAutocomplete', - 'APIBlockConfirmation', - 'APIResponse', - 'SupportingResponse', - 'SupporterResponse', - 'GetTipsResponse', - 'GetNFTGatedTrackSignaturesResponse', - 'PhantomProvider', - 'AudiusBackend', - 'MintName', - 'PurchaseContentArgs', - 'PurchaseContentWithPaymentRouterArgs', - 'CreateStripeSessionArgs', - 'ServiceMonitoring', - 'MonitoringCallbacks', - 'Environment', - 'Env', - 'CachedDiscoveryProviderType', - 'Location', - 'TikTokProfileData', - 'RemoteConfigOptions', - 'RemoteConfigInstance', - 'AllRemoteConfigKeys', - 'MetaplexNFTPropertiesFile', - 'MetaplexNFT', - 'StarAtlasNFT', - 'SolanaNFT', - 'TrackDownloadConfig' + 'AudiusQueryContext', + 'useAudiusQueryContext', + 'createApi', + 'usePaginatedQuery', + 'useAllPaginatedQuery' ] getDirectories(async function (err, res) { diff --git a/packages/get-type-exports.js b/packages/get-type-exports.js index 628bd66c0ec..477cc5cb980 100644 --- a/packages/get-type-exports.js +++ b/packages/get-type-exports.js @@ -2,7 +2,7 @@ const glob = require('glob') const fs = require('fs') var getDirectories = function (callback) { - glob('./common/dist/services/**/*', callback) + glob('./common/dist/audius-client/**/*', callback) } getDirectories(async function (err, res) { diff --git a/packages/web/src/app/AudiusQueryProvider.tsx b/packages/web/src/app/AudiusQueryProvider.tsx index 626aec1b765..12f86517d46 100644 --- a/packages/web/src/app/AudiusQueryProvider.tsx +++ b/packages/web/src/app/AudiusQueryProvider.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react' -import { AudiusQueryContext } from '@audius/common' +import { AudiusQueryContext } from '@audius/common/audius-query' import { useDispatch } from 'react-redux' import { apiClient } from 'services/audius-api-client' diff --git a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx index b4e8f17f4cb..732ad8bf865 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx @@ -1,11 +1,8 @@ import { useCallback, useContext, useState } from 'react' -import { - accountSelectors, - useAllPaginatedQuery, - useUSDCPurchaseDetailsModal -} from '@audius/common' +import { accountSelectors, useUSDCPurchaseDetailsModal } from '@audius/common' import { useGetPurchases, useGetPurchasesCount, Id } from '@audius/common/api' +import { useAllPaginatedQuery } from '@audius/common/audius-query' import { Status, statusIsNotFinalized, diff --git a/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx index 5af05818ffd..9ff09ce249e 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx @@ -1,11 +1,8 @@ import { useCallback, useContext, useState } from 'react' -import { - accountSelectors, - useAllPaginatedQuery, - useUSDCPurchaseDetailsModal -} from '@audius/common' +import { accountSelectors, useUSDCPurchaseDetailsModal } from '@audius/common' import { useGetSales, useGetSalesCount, Id } from '@audius/common/api' +import { useAllPaginatedQuery } from '@audius/common/audius-query' import { Status, statusIsNotFinalized, diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx index b2287bc764f..7d960a54f1b 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx @@ -3,7 +3,6 @@ import { useCallback, useContext, useState } from 'react' import { WithdrawUSDCModalPages, accountSelectors, - useAllPaginatedQuery, useUSDCTransactionDetailsModal, useWithdrawUSDCModal } from '@audius/common' @@ -12,6 +11,7 @@ import { useGetUSDCTransactionsCount, Id } from '@audius/common/api' +import { useAllPaginatedQuery } from '@audius/common/audius-query' import { useUSDCBalance } from '@audius/common/hooks' import { Name, diff --git a/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx b/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx index 5c37dfe9f37..f81d3c01a00 100644 --- a/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx +++ b/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx @@ -4,10 +4,10 @@ import { accountSelectors, cacheCollectionsSelectors, CommonState, - savedPageSelectors, - useAllPaginatedQuery + savedPageSelectors } from '@audius/common' import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' +import { useAllPaginatedQuery } from '@audius/common/audius-query' import { Status } from '@audius/common/models' import { uniqBy } from 'lodash' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/components/SignUpWithMetaMaskButton.tsx b/packages/web/src/pages/sign-up-page/components/SignUpWithMetaMaskButton.tsx index 94f23ca4b6b..37ec8995564 100644 --- a/packages/web/src/pages/sign-up-page/components/SignUpWithMetaMaskButton.tsx +++ b/packages/web/src/pages/sign-up-page/components/SignUpWithMetaMaskButton.tsx @@ -1,7 +1,7 @@ import { useContext, useState } from 'react' -import { AudiusQueryContext } from '@audius/common' import { signUpFetch } from '@audius/common/api' +import { AudiusQueryContext } from '@audius/common/audius-query' import { Button, IconMetamask } from '@audius/harmony' import { useFormikContext } from 'formik' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts index c5452dc4ab5..57b05662ed3 100644 --- a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts +++ b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts @@ -1,11 +1,7 @@ import { useContext } from 'react' -import { - AudiusQueryContext, - InstagramProfile, - TikTokProfile, - TwitterProfile -} from '@audius/common' +import { InstagramProfile, TikTokProfile, TwitterProfile } from '@audius/common' +import { AudiusQueryContext } from '@audius/common/audius-query' import { Name } from '@audius/common/models' import { pickHandleSchema } from '@audius/common/schemas' import { diff --git a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx index 11c02e2da8b..68a22925353 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateEmailPage.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { createEmailPageMessages } from '@audius/common/messages' import { emailSchema } from '@audius/common/schemas' import { diff --git a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx index 47411a4a100..4b1a2c8cda3 100644 --- a/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx +++ b/packages/web/src/pages/sign-up-page/pages/CreateLoginDetails.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { createLoginDetailsPageMessages } from '@audius/common/messages' import { emailSchema } from '@audius/common/schemas' import { Flex, IconVerified, useTheme } from '@audius/harmony' diff --git a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx index 443435020ca..1aedaaaa28a 100644 --- a/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/PickHandlePage.tsx @@ -1,6 +1,6 @@ import { useCallback, useContext, useMemo, useRef } from 'react' -import { AudiusQueryContext } from '@audius/common' +import { AudiusQueryContext } from '@audius/common/audius-query' import { pickHandlePageMessages, socialMediaMessages diff --git a/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx b/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx index fda06387898..1ee21522793 100644 --- a/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx +++ b/packages/web/src/pages/sign-up-page/pages/ReviewHandlePage.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { pickHandleSchema } from '@audius/common/schemas' import { Paper, useTheme } from '@audius/harmony' import { Formik, Form } from 'formik' From bb2216bf3d53890b0f098fed3662dec85b1b4b38 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 16:42:17 -0800 Subject: [PATCH 42/64] Migrate mobile services --- packages/mobile/babel.config.js | 3 ++- packages/mobile/src/components/audio/AudioPlayer.tsx | 5 +++-- .../ChallengeRewardsDrawerProvider.tsx | 3 +-- .../mobile/src/components/details-tile/DetailsTile.tsx | 2 +- .../details-tile/DetailsTileActionButtons.tsx | 3 ++- .../src/components/lineup-tile/CollectionTile.tsx | 4 ++-- .../src/components/lineup-tile/LineupTileTopRight.tsx | 7 ++----- .../mobile/src/components/lineup-tile/TrackTile.tsx | 2 +- .../src/components/now-playing-drawer/ActionsBar.tsx | 2 +- .../components/now-playing-drawer/AudioControls.tsx | 2 +- .../PremiumTrackPurchaseDrawer.tsx | 5 ++--- .../purchase-vendor-drawer/PurchaseVendorDrawer.tsx | 2 +- .../src/components/rate-cta-drawer/RateCtaReminder.tsx | 2 +- .../mobile/src/components/share-drawer/ShareDrawer.tsx | 2 +- .../src/components/tiktok-auth/TikTokAuthButton.tsx | 4 ++-- .../mobile/src/components/track-list/TrackListItem.tsx | 2 +- .../trending-rewards-drawer/TrendingRewardsDrawer.tsx | 2 +- packages/mobile/src/env/env.dev.ts | 2 +- packages/mobile/src/env/env.prod.ts | 2 +- packages/mobile/src/env/env.stage.ts | 2 +- packages/mobile/src/env/index.ts | 2 +- packages/mobile/src/hooks/useIsOfflineModeEnabled.ts | 2 +- packages/mobile/src/hooks/useIsUSDCEnabled.ts | 2 +- packages/mobile/src/hooks/useUpdateRequired.ts | 2 +- .../left-nav-drawer/LeftNavDrawer.tsx | 8 ++------ .../src/screens/app-screen/AccountPictureHeader.tsx | 8 ++------ .../src/screens/app-screen/useAppScreenOptions.tsx | 2 +- .../mobile/src/screens/audio-screen/AudioScreen.tsx | 2 +- .../src/screens/audio-screen/ChallengeRewards.tsx | 5 ++--- .../src/screens/audio-screen/TrendingRewards.tsx | 7 ++----- .../src/screens/collection-screen/CollectionScreen.tsx | 4 ++-- .../screens/edit-playlist-screen/RandomImageButton.tsx | 2 +- .../src/screens/edit-track-screen/EditTrackForm.tsx | 3 ++- .../screens/edit-track-screen/EditTrackNavigator.tsx | 2 +- .../PremiumRadioField/PremiumRadioField.tsx | 2 +- .../edit-track-screen/screens/AccessAndSaleScreen.tsx | 2 +- .../screens/AdvancedOptionsScreen.tsx | 2 +- .../FeatureFlagOverrideScreen.tsx | 2 +- packages/mobile/src/screens/feed-screen/FeedScreen.tsx | 4 ++-- .../profile-screen/ProfileHeader/ProfileInfoTiles.tsx | 7 ++----- .../mobile/src/screens/profile-screen/ProfileInfo.tsx | 4 ++-- .../src/screens/profile-screen/ProfileScreen.tsx | 2 +- packages/mobile/src/screens/root-screen/RootScreen.tsx | 8 ++------ .../settings-screen/AccountVerificationScreen.tsx | 3 ++- .../settings-screen/NotificationSettingsScreen.tsx | 7 ++----- .../src/screens/settings-screen/SettingsScreen.tsx | 2 +- .../screens/sign-on-screen/components/HandleField.tsx | 2 +- .../sign-on-screen/components/NewEmailField.tsx | 1 - .../sign-on-screen/components/SignUpFlowTikTokAuth.tsx | 8 +++----- .../components/SignUpFlowTwitterAuth.tsx | 3 ++- .../components/SocialMediaSignUpButtons.tsx | 2 +- .../sign-on-screen/screens/FinishProfileScreen.tsx | 2 +- packages/mobile/src/screens/signon/ProfileAuto.tsx | 2 +- .../screens/tip-artist-screen/DegradationNotice.tsx | 2 +- .../screens/track-screen/TrackScreenDetailsTile.tsx | 2 +- .../mobile/src/services/audius-api-client/apiClient.ts | 2 +- .../mobile/src/services/audius-backend-instance.ts | 2 +- packages/mobile/src/services/eagerLoadUtils.ts | 3 ++- packages/mobile/src/services/explore.ts | 2 +- packages/mobile/src/services/fingerprint.ts | 2 +- packages/mobile/src/services/local-storage.ts | 2 +- packages/mobile/src/services/monitoringCallbacks.ts | 2 +- .../src/services/remote-config/getFeatureEnabled.ts | 2 +- .../services/remote-config/remote-config-instance.ts | 4 ++-- .../mobile/src/services/sdk/discoveryNodeSelector.ts | 2 +- .../mobile/src/services/sdk/storageNodeSelector.ts | 2 +- packages/mobile/src/services/track-download.ts | 2 +- packages/mobile/src/services/wallet-client.ts | 2 +- packages/mobile/src/store/oauth/sagas.ts | 10 +++++----- .../offline-downloads/sagas/getIsOfflineEnabled.ts | 3 ++- .../offlineQueueSagas/workers/downloadTrackWorker.ts | 2 +- packages/mobile/src/store/sagas.ts | 4 ++-- packages/mobile/src/store/storeContext.ts | 3 ++- packages/web/src/common/store/cache/users/sagas.d.ts | 2 +- .../suggested-tracks/components/SuggestedTracks.tsx | 2 +- .../src/pages/upload-page/utils/computeLicenseIcons.ts | 2 -- packages/web/src/services/env/index.ts | 2 -- packages/web/src/ssr/track/+onBeforeRender.tsx | 2 +- 78 files changed, 107 insertions(+), 132 deletions(-) diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js index 8ef05d3f41e..5b1081c4ce4 100644 --- a/packages/mobile/babel.config.js +++ b/packages/mobile/babel.config.js @@ -15,7 +15,8 @@ module.exports = (api) => { '@audius/common/api': '../common/src/api', '@audius/common/models': '../common/src/models', '@audius/common/utils': '../common/src/utils', - '@audius/common/schemas': '../common/src/schemas' + '@audius/common/schemas': '../common/src/schemas', + '@audius/common/services': '../common/src/services' } } ] diff --git a/packages/mobile/src/components/audio/AudioPlayer.tsx b/packages/mobile/src/components/audio/AudioPlayer.tsx index 5fe476f77a9..c0fdc56d90a 100644 --- a/packages/mobile/src/components/audio/AudioPlayer.tsx +++ b/packages/mobile/src/components/audio/AudioPlayer.tsx @@ -1,6 +1,6 @@ import { useRef, useEffect, useCallback, useState } from 'react' -import type { CommonState, QueryParams, Queueable } from '@audius/common' +import type { CommonState, Queueable } from '@audius/common' import { playbackRateValueMap, accountSelectors, @@ -15,13 +15,14 @@ import { reachabilitySelectors, gatedContentSelectors, RepeatMode, - FeatureFlags, tracksSocialActions, savedPageTracksLineupActions } from '@audius/common' import { useAppContext } from '@audius/common/context' import { SquareSizes } from '@audius/common/models' import type { ID, Track } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' +import type { QueryParams } from '@audius/common/services' import { Genre, encodeHashId, diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx index f20ee6ebb59..765bf268539 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx @@ -2,13 +2,12 @@ import { useCallback, useEffect } from 'react' import type { CommonState } from '@audius/common' import { - IntKeys, - StringKeys, challengesSelectors, audioRewardsPageActions, ClaimStatus, audioRewardsPageSelectors } from '@audius/common' +import { IntKeys, StringKeys } from '@audius/common/services' import { isAudioMatchingChallenge, getClaimableChallengeSpecifiers diff --git a/packages/mobile/src/components/details-tile/DetailsTile.tsx b/packages/mobile/src/components/details-tile/DetailsTile.tsx index 3a8c1d5482c..ad4ffa94515 100644 --- a/packages/mobile/src/components/details-tile/DetailsTile.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTile.tsx @@ -2,7 +2,6 @@ import { useCallback } from 'react' import type { CommonState } from '@audius/common' import { - FeatureFlags, accountSelectors, playerSelectors, playbackPositionSelectors @@ -10,6 +9,7 @@ import { import { useGatedContentAccess } from '@audius/common/hooks' import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { Track } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { dayjs, squashNewLines, diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index 81c7cfe7eb3..9f5ba4dd39a 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -1,8 +1,9 @@ import type { CommonState } from '@audius/common' -import { FeatureFlags, cacheCollectionsSelectors } from '@audius/common' +import { cacheCollectionsSelectors } from '@audius/common' import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import { useFeatureFlag } from '@audius/common/hooks' import type { ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx index 8458063c304..6238e2b0180 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx @@ -11,8 +11,7 @@ import { OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, - RepostType, - FeatureFlags + RepostType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { @@ -24,6 +23,7 @@ import { SquareSizes } from '@audius/common/models' import type { Collection, Track, User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx b/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx index 6d4ba195054..a561b26d887 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx @@ -1,8 +1,5 @@ -import { - FeatureFlags, - accountSelectors, - playbackPositionSelectors -} from '@audius/common' +import { accountSelectors, playbackPositionSelectors } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { formatLineupTileDuration } from '@audius/common/utils' import type { ViewStyle } from 'react-native' import { StyleSheet, View } from 'react-native' diff --git a/packages/mobile/src/components/lineup-tile/TrackTile.tsx b/packages/mobile/src/components/lineup-tile/TrackTile.tsx index 5085b7444c6..23ad580241c 100644 --- a/packages/mobile/src/components/lineup-tile/TrackTile.tsx +++ b/packages/mobile/src/components/lineup-tile/TrackTile.tsx @@ -3,7 +3,6 @@ import { useCallback } from 'react' import type { CommonState } from '@audius/common' import { playbackPositionSelectors, - FeatureFlags, accountSelectors, cacheTracksSelectors, cacheUsersSelectors, @@ -25,6 +24,7 @@ import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { Track, User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Genre, removeNullable } from '@audius/common/utils' import { useNavigationState } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx index 3c8de317217..37634598312 100644 --- a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx @@ -1,7 +1,6 @@ import { useCallback, useLayoutEffect } from 'react' import { - FeatureFlags, playbackPositionSelectors, reachabilitySelectors, accountSelectors, @@ -22,6 +21,7 @@ import { ModalSource } from '@audius/common/models' import type { Track } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { formatPrice, Genre, removeNullable } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { View, Platform } from 'react-native' diff --git a/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx b/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx index c9cf481a9ff..b7f7e541c4e 100644 --- a/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx +++ b/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { - FeatureFlags, modalsActions, queueActions, queueSelectors, RepeatMode } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { Animated, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx index 258a81cb082..45980763ee3 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx @@ -3,13 +3,11 @@ import { useCallback, type ReactNode, useEffect } from 'react' import type { PurchaseContentError } from '@audius/common' import { PurchaseContentPage, - FeatureFlags, PurchaseContentStage, isContentPurchaseInProgress, purchaseContentActions, purchaseContentSelectors, - usePremiumContentPurchaseModal, - IntKeys + usePremiumContentPurchaseModal } from '@audius/common' import { useGetTrackById } from '@audius/common/api' import { @@ -29,6 +27,7 @@ import { PurchaseVendor, statusIsNotFinalized } from '@audius/common/models' +import { IntKeys, FeatureFlags } from '@audius/common/services' import { formatPrice } from '@audius/common/utils' import { Formik, useField, useFormikContext } from 'formik' import { diff --git a/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx b/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx index f04e5c17fbe..6d6c51d986d 100644 --- a/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx +++ b/packages/mobile/src/components/purchase-vendor-drawer/PurchaseVendorDrawer.tsx @@ -1,8 +1,8 @@ import { useCallback, useMemo } from 'react' -import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { PurchaseVendor } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' import { setPurchaseVendor } from 'app/store/purchase-vendor/slice' diff --git a/packages/mobile/src/components/rate-cta-drawer/RateCtaReminder.tsx b/packages/mobile/src/components/rate-cta-drawer/RateCtaReminder.tsx index 211666636e3..a10d013af02 100644 --- a/packages/mobile/src/components/rate-cta-drawer/RateCtaReminder.tsx +++ b/packages/mobile/src/components/rate-cta-drawer/RateCtaReminder.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import AsyncStorage from '@react-native-async-storage/async-storage' import { getHasCompletedAccount } from 'common/store/pages/signon/selectors' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/share-drawer/ShareDrawer.tsx b/packages/mobile/src/components/share-drawer/ShareDrawer.tsx index 4adc625e72c..b540cbdf9b8 100644 --- a/packages/mobile/src/components/share-drawer/ShareDrawer.tsx +++ b/packages/mobile/src/components/share-drawer/ShareDrawer.tsx @@ -3,13 +3,13 @@ import React, { useCallback, useRef } from 'react' import { accountSelectors, collectionsSocialActions, - FeatureFlags, shareModalUISelectors, shareSoundToTiktokModalActions, tracksSocialActions, usersSocialActions } from '@audius/common' import { Name, ShareSource } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import Clipboard from '@react-native-clipboard/clipboard' import { Linking } from 'react-native' import ViewShot from 'react-native-view-shot' diff --git a/packages/mobile/src/components/tiktok-auth/TikTokAuthButton.tsx b/packages/mobile/src/components/tiktok-auth/TikTokAuthButton.tsx index 814069a7ca5..67063c85a45 100644 --- a/packages/mobile/src/components/tiktok-auth/TikTokAuthButton.tsx +++ b/packages/mobile/src/components/tiktok-auth/TikTokAuthButton.tsx @@ -1,5 +1,5 @@ -import type { TikTokProfileData } from '@audius/common' -import { formatTikTokProfile } from '@audius/common' +import type { TikTokProfileData } from '@audius/common/services' +import { formatTikTokProfile } from '@audius/common/services' import type { GestureResponderEvent } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/track-list/TrackListItem.tsx b/packages/mobile/src/components/track-list/TrackListItem.tsx index bee8fc2fe90..871b2dc80d6 100644 --- a/packages/mobile/src/components/track-list/TrackListItem.tsx +++ b/packages/mobile/src/components/track-list/TrackListItem.tsx @@ -3,7 +3,6 @@ import { memo, useCallback, useMemo, useState } from 'react' import { cacheCollectionsSelectors, - FeatureFlags, playbackPositionSelectors, OverflowAction, OverflowSource, @@ -15,6 +14,7 @@ import { } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import type { Collection, ID, UID, Track, User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Genre, removeNullable } from '@audius/common/utils' import type { NativeSyntheticEvent, diff --git a/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx b/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx index 0e7135fdaac..b0bf2d2a0d4 100644 --- a/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx +++ b/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx @@ -2,11 +2,11 @@ import { useCallback } from 'react' import type { TrendingRewardsModalType } from '@audius/common' import { - StringKeys, audioRewardsPageActions, audioRewardsPageSelectors } from '@audius/common' import { Theme } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import type { ImageStyle } from 'react-native' import { Image, ScrollView, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/env/env.dev.ts b/packages/mobile/src/env/env.dev.ts index 6d630b5a266..8e2769355f4 100644 --- a/packages/mobile/src/env/env.dev.ts +++ b/packages/mobile/src/env/env.dev.ts @@ -1,4 +1,4 @@ -import type { Env } from '@audius/common' +import type { Env } from '@audius/common/services' import Config from 'react-native-config' export const env: Env = { diff --git a/packages/mobile/src/env/env.prod.ts b/packages/mobile/src/env/env.prod.ts index 8ce424675f6..122d8b23acd 100644 --- a/packages/mobile/src/env/env.prod.ts +++ b/packages/mobile/src/env/env.prod.ts @@ -1,4 +1,4 @@ -import type { Env } from '@audius/common' +import type { Env } from '@audius/common/services' import Config from 'react-native-config' export const env: Env = { diff --git a/packages/mobile/src/env/env.stage.ts b/packages/mobile/src/env/env.stage.ts index 7ec0533b7c6..fdd02a07fbb 100644 --- a/packages/mobile/src/env/env.stage.ts +++ b/packages/mobile/src/env/env.stage.ts @@ -1,4 +1,4 @@ -import type { Env } from '@audius/common' +import type { Env } from '@audius/common/services' import Config from 'react-native-config' export const env: Env = { diff --git a/packages/mobile/src/env/index.ts b/packages/mobile/src/env/index.ts index f74cfedf0f7..abaeb1c7eae 100644 --- a/packages/mobile/src/env/index.ts +++ b/packages/mobile/src/env/index.ts @@ -1,4 +1,4 @@ -import type { Env } from '@audius/common' +import type { Env } from '@audius/common/services' import Config from 'react-native-config' import { env as envDev } from './env.dev' diff --git a/packages/mobile/src/hooks/useIsOfflineModeEnabled.ts b/packages/mobile/src/hooks/useIsOfflineModeEnabled.ts index b5eb9a50b0d..b2853c84db9 100644 --- a/packages/mobile/src/hooks/useIsOfflineModeEnabled.ts +++ b/packages/mobile/src/hooks/useIsOfflineModeEnabled.ts @@ -1,4 +1,4 @@ -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { useFeatureFlag } from './useRemoteConfig' diff --git a/packages/mobile/src/hooks/useIsUSDCEnabled.ts b/packages/mobile/src/hooks/useIsUSDCEnabled.ts index cfae7b378db..187e6deab6a 100644 --- a/packages/mobile/src/hooks/useIsUSDCEnabled.ts +++ b/packages/mobile/src/hooks/useIsUSDCEnabled.ts @@ -1,5 +1,5 @@ -import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/services' export const useIsUSDCEnabled = () => useFeatureFlag(FeatureFlags.USDC_PURCHASES).isEnabled diff --git a/packages/mobile/src/hooks/useUpdateRequired.ts b/packages/mobile/src/hooks/useUpdateRequired.ts index d9427564ca8..14bed064683 100644 --- a/packages/mobile/src/hooks/useUpdateRequired.ts +++ b/packages/mobile/src/hooks/useUpdateRequired.ts @@ -1,4 +1,4 @@ -import { StringKeys } from '@audius/common' +import { StringKeys } from '@audius/common/services' import semver from 'semver' import { useRemoteVar } from 'app/hooks/useRemoteConfig' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx index f7b3d5e5e23..b927498241b 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx @@ -1,12 +1,8 @@ -import { - FeatureFlags, - StringKeys, - accountSelectors, - chatSelectors -} from '@audius/common' +import { accountSelectors, chatSelectors } from '@audius/common' import { useAccountHasClaimableRewards } from '@audius/common/hooks' import type { User } from '@audius/common/models' import { Name } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/services' import type { DrawerContentComponentProps } from '@react-navigation/drawer' import { DrawerContentScrollView } from '@react-navigation/drawer' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx b/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx index b008c29dc4f..050af924eca 100644 --- a/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx +++ b/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx @@ -1,10 +1,6 @@ -import { - accountSelectors, - chatSelectors, - StringKeys, - FeatureFlags -} from '@audius/common' +import { accountSelectors, chatSelectors } from '@audius/common' import { useAccountHasClaimableRewards } from '@audius/common/hooks' +import { StringKeys, FeatureFlags } from '@audius/common/services' import { useDrawerProgress } from '@react-navigation/drawer' import { View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/app-screen/useAppScreenOptions.tsx b/packages/mobile/src/screens/app-screen/useAppScreenOptions.tsx index 8b8887c2243..5e24f8d3cb4 100644 --- a/packages/mobile/src/screens/app-screen/useAppScreenOptions.tsx +++ b/packages/mobile/src/screens/app-screen/useAppScreenOptions.tsx @@ -1,6 +1,6 @@ import { useCallback, useContext } from 'react' -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import type { ParamListBase, RouteProp } from '@react-navigation/core' import type { NativeStackNavigationOptions, diff --git a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx index 239de86530e..aaa6648ac37 100644 --- a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx +++ b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx @@ -3,7 +3,6 @@ import { useCallback, useEffect } from 'react' import type { CommonState } from '@audius/common' import { tokenDashboardPageActions, - StringKeys, vipDiscordModalActions, tokenDashboardPageSelectors, walletSelectors, @@ -12,6 +11,7 @@ import { modalsActions } from '@audius/common' import type { StringWei } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { useFocusEffect } from '@react-navigation/native' import { Image, Linking, View } from 'react-native' diff --git a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx index 5eba946f2f6..8e6e7479487 100644 --- a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx @@ -2,15 +2,14 @@ import { useCallback, useEffect, useState } from 'react' import type { ChallengeRewardsModalType, CommonState } from '@audius/common' import { - StringKeys, challengesSelectors, audioRewardsPageActions, audioRewardsPageSelectors, - modalsActions, - FeatureFlags + modalsActions } from '@audius/common' import { Name, ChallengeName } from '@audius/common/models' import type { ChallengeRewardID } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/services' import { removeNullable, makeOptimisticChallengeSortComparator diff --git a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx index a1b86556a90..20579e991ad 100644 --- a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx @@ -1,10 +1,7 @@ -import { - StringKeys, - audioRewardsPageActions, - modalsActions -} from '@audius/common' +import { audioRewardsPageActions, modalsActions } from '@audius/common' import type { TrendingRewardsModalType, Modals } from '@audius/common' import type { ChallengeRewardID } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx index e3418d47fdd..aac56217aef 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx @@ -12,8 +12,7 @@ import { shareModalUIActions, RepostType, repostsUserListActions, - favoritesUserListActions, - FeatureFlags + favoritesUserListActions } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { @@ -29,6 +28,7 @@ import type { SearchPlaylist, User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { encodeUrlName, formatDate, removeNullable } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-playlist-screen/RandomImageButton.tsx b/packages/mobile/src/screens/edit-playlist-screen/RandomImageButton.tsx index 1d824e93198..f1bb0b8ddb1 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/RandomImageButton.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/RandomImageButton.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { RandomImage } from '@audius/common' +import { RandomImage } from '@audius/common/services' import { useField } from 'formik' import IconSearch from 'app/assets/images/iconSearch.svg' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx index bc743da42d9..1f22a094fb1 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { FeatureFlags, type UploadTrack } from '@audius/common' +import { type UploadTrack } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { Keyboard } from 'react-native' import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackNavigator.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackNavigator.tsx index 4b02b8b6194..0ac346a4b89 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackNavigator.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackNavigator.tsx @@ -1,4 +1,4 @@ -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { createNativeStackNavigator } from '@react-navigation/native-stack' import { GatedContentUploadPromptDrawer } from 'app/components/gated-content-upload-prompt-drawer' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx index 896a1c0f2fe..c6a2bcfba40 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/AccessAndSaleField/PremiumRadioField/PremiumRadioField.tsx @@ -1,8 +1,8 @@ import { useCallback, useEffect, useMemo, useRef } from 'react' -import { FeatureFlags } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { Name, isContentUSDCPurchaseGated } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { useField } from 'formik' import { Dimensions, View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx index 95793a99c19..e584896d7cd 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/AccessAndSaleScreen.tsx @@ -1,6 +1,5 @@ import { useCallback, useMemo, useState } from 'react' -import { FeatureFlags } from '@audius/common' import { useFeatureFlag, useAccessAndRemixSettings } from '@audius/common/hooks' import { isContentCollectibleGated, @@ -10,6 +9,7 @@ import { TrackAvailabilityType } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { useField, useFormikContext } from 'formik' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/AdvancedOptionsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/AdvancedOptionsScreen.tsx index 964e0aac680..d4e1bd9a073 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/AdvancedOptionsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/AdvancedOptionsScreen.tsx @@ -1,4 +1,4 @@ -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { View } from 'react-native' import IconIndent from 'app/assets/images/iconIndent.svg' diff --git a/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx b/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx index 5d6b54eb772..9bbb99570e5 100644 --- a/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx +++ b/packages/mobile/src/screens/feature-flag-override-screen/FeatureFlagOverrideScreen.tsx @@ -1,8 +1,8 @@ import { useCallback, useMemo, useState } from 'react' -import { FeatureFlags } from '@audius/common' import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' import type { OverrideSetting } from '@audius/common/hooks' +import { FeatureFlags } from '@audius/common/services' import AsyncStorage from '@react-native-async-storage/async-storage' import { createNativeStackNavigator } from '@react-navigation/native-stack' import { FlatList } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx index 76632c89a7d..5f3e7a71d72 100644 --- a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx +++ b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx @@ -3,11 +3,11 @@ import { useCallback } from 'react' import { lineupSelectors, feedPageLineupActions as feedActions, - feedPageSelectors, - FeatureFlags + feedPageSelectors } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { Name } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' import IconFeed from 'app/assets/images/iconFeed.svg' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx index d87326ed8d7..7b098c5c39b 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx @@ -1,11 +1,8 @@ import type { ComponentType } from 'react' import { useCallback } from 'react' -import { - FeatureFlags, - accountSelectors, - relatedArtistsUISelectors -} from '@audius/common' +import { accountSelectors, relatedArtistsUISelectors } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import type { ViewStyle } from 'react-native' import { View, ScrollView } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx b/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx index faecd9551ce..9f46cdb7813 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx @@ -5,10 +5,10 @@ import { chatSelectors, chatActions, profilePageSelectors, - reachabilitySelectors, - FeatureFlags + reachabilitySelectors } from '@audius/common' import { FollowSource } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { View, Text } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx index 19afac23e51..f734ab2746d 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx @@ -6,10 +6,10 @@ import { reachabilitySelectors, shareModalUIActions, modalsActions, - FeatureFlags, relatedArtistsUIActions } from '@audius/common' import { ShareSource, Status } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { encodeUrlName } from '@audius/common/utils' import { PortalHost } from '@gorhom/portal' import { useFocusEffect } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/root-screen/RootScreen.tsx b/packages/mobile/src/screens/root-screen/RootScreen.tsx index 0a8fdf48f3f..e6e54835b00 100644 --- a/packages/mobile/src/screens/root-screen/RootScreen.tsx +++ b/packages/mobile/src/screens/root-screen/RootScreen.tsx @@ -1,12 +1,8 @@ import { useCallback, useEffect, useState } from 'react' -import { - accountSelectors, - chatActions, - FeatureFlags, - playerActions -} from '@audius/common' +import { accountSelectors, chatActions, playerActions } from '@audius/common' import { Status } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { createNativeStackNavigator } from '@react-navigation/native-stack' import { getHasCompletedAccount, diff --git a/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx b/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx index e1250540546..495e9f9046a 100644 --- a/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx @@ -1,7 +1,8 @@ import { useCallback, useEffect, useState } from 'react' -import { accountSelectors, BooleanKeys } from '@audius/common' +import { accountSelectors } from '@audius/common' import { Status } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/services' import * as signOnActions from 'common/store/pages/signon/actions' import { getHandleField } from 'common/store/pages/signon/selectors' import type { EditableField } from 'common/store/pages/signon/types' diff --git a/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx b/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx index f96fc58be19..205968e22c9 100644 --- a/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx @@ -1,8 +1,5 @@ -import { - FeatureFlags, - PushNotificationSetting, - settingsPageActions -} from '@audius/common' +import { PushNotificationSetting, settingsPageActions } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/settings-screen/SettingsScreen.tsx b/packages/mobile/src/screens/settings-screen/SettingsScreen.tsx index 978208c5b5e..e237fa2cc31 100644 --- a/packages/mobile/src/screens/settings-screen/SettingsScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/SettingsScreen.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { FeatureFlags } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { Image, Platform } from 'react-native' import audiusLogoHorizontal from 'app/assets/images/Horizontal-Logo-Full-Color.png' diff --git a/packages/mobile/src/screens/sign-on-screen/components/HandleField.tsx b/packages/mobile/src/screens/sign-on-screen/components/HandleField.tsx index 58a0e338029..c82daf96a60 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/HandleField.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/HandleField.tsx @@ -1,5 +1,5 @@ -import { MAX_HANDLE_LENGTH } from '@audius/common' import { pickHandlePageMessages } from '@audius/common/messages' +import { MAX_HANDLE_LENGTH } from '@audius/common/services' import { useField, useFormikContext } from 'formik' import { IconCheck } from '@audius/harmony-native' diff --git a/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx b/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx index 4c50bd0d451..1742deda6f9 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/NewEmailField.tsx @@ -1,5 +1,4 @@ import { emailSchemaMessages } from '@audius/common/schemas' - import { useField, useFormikContext } from 'formik' import { usePrevious } from 'react-use' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx index d69f21cf420..9b23717a0c6 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx @@ -1,12 +1,10 @@ import { useEffect } from 'react' -import { - useAudiusQueryContext, - type TikTokProfileData, - formatTikTokProfile -} from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' import { Name } from '@audius/common/models' import { pickHandleSchema } from '@audius/common/schemas' +import { formatTikTokProfile } from '@audius/common/services' +import type { TikTokProfileData } from '@audius/common/services' import type { GestureResponderEvent } from 'react-native' import { useDispatch, useSelector } from 'react-redux' import { restrictedHandles } from 'utils/restrictedHandles' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx index d64bac67ec9..3c960caa01f 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx @@ -1,8 +1,9 @@ import React, { useState } from 'react' -import { formatTwitterProfile, useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common' import { socialMediaMessages } from '@audius/common/messages' import { pickHandleSchema } from '@audius/common/schemas' +import { formatTwitterProfile } from '@audius/common/services' import { useAsync } from 'react-use' import { SocialButton } from '@audius/harmony-native' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx b/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx index 95b39c0e0a0..088c425d8a1 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SocialMediaSignUpButtons.tsx @@ -1,6 +1,6 @@ -import { BooleanKeys } from '@audius/common' import { useRemoteVar } from '@audius/common/hooks' import { socialMediaMessages } from '@audius/common/messages' +import { BooleanKeys } from '@audius/common/services' import { Flex } from '@audius/harmony-native' import { useToast } from 'app/hooks/useToast' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx index c570579ada9..388cd435f2e 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx @@ -1,9 +1,9 @@ import { useCallback } from 'react' -import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common' import type { Image } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' import { finishProfileSchema } from '@audius/common/schemas' +import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common/services' import { css } from '@emotion/native' import { getHandleField, diff --git a/packages/mobile/src/screens/signon/ProfileAuto.tsx b/packages/mobile/src/screens/signon/ProfileAuto.tsx index 4a94f76cbeb..b3cc9dc1d9e 100644 --- a/packages/mobile/src/screens/signon/ProfileAuto.tsx +++ b/packages/mobile/src/screens/signon/ProfileAuto.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect, useState } from 'react' -import { BooleanKeys } from '@audius/common' import type { Name } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/services' import type { NativeStackScreenProps } from '@react-navigation/native-stack' import * as signOnActions from 'common/store/pages/signon/actions' import { diff --git a/packages/mobile/src/screens/tip-artist-screen/DegradationNotice.tsx b/packages/mobile/src/screens/tip-artist-screen/DegradationNotice.tsx index 89014f5b759..725a4ab842b 100644 --- a/packages/mobile/src/screens/tip-artist-screen/DegradationNotice.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/DegradationNotice.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { StringKeys } from '@audius/common' +import { StringKeys } from '@audius/common/services' import { Text } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx index a6b6b74fe85..c7bb0457a44 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx @@ -14,7 +14,6 @@ import { favoritesUserListActions, reachabilitySelectors, playbackPositionSelectors, - FeatureFlags, queueSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' @@ -36,6 +35,7 @@ import type { Track, User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { Genre, getCanonicalName, diff --git a/packages/mobile/src/services/audius-api-client/apiClient.ts b/packages/mobile/src/services/audius-api-client/apiClient.ts index 2fe3b40e9d5..b936d7513b1 100644 --- a/packages/mobile/src/services/audius-api-client/apiClient.ts +++ b/packages/mobile/src/services/audius-api-client/apiClient.ts @@ -1,4 +1,4 @@ -import { AudiusAPIClient } from '@audius/common' +import { AudiusAPIClient } from '@audius/common/services' import { env } from 'app/env' import { audiusBackendInstance } from 'app/services/audius-backend-instance' diff --git a/packages/mobile/src/services/audius-backend-instance.ts b/packages/mobile/src/services/audius-backend-instance.ts index 709d3bac00d..d1e0bfcd5f8 100644 --- a/packages/mobile/src/services/audius-backend-instance.ts +++ b/packages/mobile/src/services/audius-backend-instance.ts @@ -1,4 +1,4 @@ -import { audiusBackend } from '@audius/common' +import { audiusBackend } from '@audius/common/services' import * as nativeLibs from '@audius/sdk/dist/native-libs' import AsyncStorage from '@react-native-async-storage/async-storage' import { Image } from 'react-native' diff --git a/packages/mobile/src/services/eagerLoadUtils.ts b/packages/mobile/src/services/eagerLoadUtils.ts index d7d819de52a..b9d2c4c2798 100644 --- a/packages/mobile/src/services/eagerLoadUtils.ts +++ b/packages/mobile/src/services/eagerLoadUtils.ts @@ -1,9 +1,10 @@ +import { getEagerDiscprov, makeEagerRequest } from '@audius/common/services' /** * Utilities to assist in eager pre-fetching content from the * protocol before libs has initialized. */ -import { getEagerDiscprov, makeEagerRequest } from '@audius/common' +import {} from '@audius/common' import { env } from 'app/env' diff --git a/packages/mobile/src/services/explore.ts b/packages/mobile/src/services/explore.ts index bbcc298db8e..e68de46e04e 100644 --- a/packages/mobile/src/services/explore.ts +++ b/packages/mobile/src/services/explore.ts @@ -1,4 +1,4 @@ -import { Explore } from '@audius/common' +import { Explore } from '@audius/common/services' import { apiClient } from './audius-api-client' import { audiusBackendInstance } from './audius-backend-instance' diff --git a/packages/mobile/src/services/fingerprint.ts b/packages/mobile/src/services/fingerprint.ts index 9a30ae75342..802cfa0d988 100644 --- a/packages/mobile/src/services/fingerprint.ts +++ b/packages/mobile/src/services/fingerprint.ts @@ -1,4 +1,4 @@ -import { FingerprintClient } from '@audius/common' +import { FingerprintClient } from '@audius/common/services' import { FingerprintJsProAgent } from '@fingerprintjs/fingerprintjs-pro-react-native' import { env } from 'app/env' diff --git a/packages/mobile/src/services/local-storage.ts b/packages/mobile/src/services/local-storage.ts index 1627dc72a2c..44c5055d929 100644 --- a/packages/mobile/src/services/local-storage.ts +++ b/packages/mobile/src/services/local-storage.ts @@ -1,4 +1,4 @@ -import { LocalStorage } from '@audius/common' +import { LocalStorage } from '@audius/common/services' import AsyncStorage from '@react-native-async-storage/async-storage' export const localStorage = new LocalStorage({ diff --git a/packages/mobile/src/services/monitoringCallbacks.ts b/packages/mobile/src/services/monitoringCallbacks.ts index 88f4cbda3d9..62e317e7953 100644 --- a/packages/mobile/src/services/monitoringCallbacks.ts +++ b/packages/mobile/src/services/monitoringCallbacks.ts @@ -1,5 +1,5 @@ -import { IntKeys } from '@audius/common' import type { ServiceMonitorType, MonitorPayload } from '@audius/common/models' +import { IntKeys } from '@audius/common/services' import { track } from 'app/services/analytics' import { EventNames } from 'app/types/analytics' diff --git a/packages/mobile/src/services/remote-config/getFeatureEnabled.ts b/packages/mobile/src/services/remote-config/getFeatureEnabled.ts index 813aea36965..5689a700a88 100644 --- a/packages/mobile/src/services/remote-config/getFeatureEnabled.ts +++ b/packages/mobile/src/services/remote-config/getFeatureEnabled.ts @@ -1,6 +1,6 @@ -import type { FeatureFlags } from '@audius/common' import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' import type { OverrideSetting } from '@audius/common/hooks' +import type { FeatureFlags } from '@audius/common/services' import AsyncStorage from '@react-native-async-storage/async-storage' import { remoteConfigInstance } from './remote-config-instance' diff --git a/packages/mobile/src/services/remote-config/remote-config-instance.ts b/packages/mobile/src/services/remote-config/remote-config-instance.ts index 71e5314bbf5..9800401f49d 100644 --- a/packages/mobile/src/services/remote-config/remote-config-instance.ts +++ b/packages/mobile/src/services/remote-config/remote-config-instance.ts @@ -1,6 +1,6 @@ -import type { Environment } from '@audius/common' -import { remoteConfig } from '@audius/common' import { ErrorLevel } from '@audius/common/models' +import type { Environment } from '@audius/common/services' +import { remoteConfig } from '@audius/common/services' import * as optimizely from '@optimizely/optimizely-sdk' import AsyncStorage from '@react-native-async-storage/async-storage' import { Platform } from 'react-native' diff --git a/packages/mobile/src/services/sdk/discoveryNodeSelector.ts b/packages/mobile/src/services/sdk/discoveryNodeSelector.ts index 93da0493d7c..cce155e4e6c 100644 --- a/packages/mobile/src/services/sdk/discoveryNodeSelector.ts +++ b/packages/mobile/src/services/sdk/discoveryNodeSelector.ts @@ -1,4 +1,4 @@ -import { DiscoveryNodeSelectorService } from '@audius/common' +import { DiscoveryNodeSelectorService } from '@audius/common/services' import { env } from 'app/env' import { remoteConfigInstance } from 'app/services/remote-config/remote-config-instance' diff --git a/packages/mobile/src/services/sdk/storageNodeSelector.ts b/packages/mobile/src/services/sdk/storageNodeSelector.ts index 6288723981b..833e2319460 100644 --- a/packages/mobile/src/services/sdk/storageNodeSelector.ts +++ b/packages/mobile/src/services/sdk/storageNodeSelector.ts @@ -1,4 +1,4 @@ -import { makeGetStorageNodeSelector } from '@audius/common' +import { makeGetStorageNodeSelector } from '@audius/common/services' import { env } from 'app/env' diff --git a/packages/mobile/src/services/track-download.ts b/packages/mobile/src/services/track-download.ts index d787a4a339d..9bd7af4d074 100644 --- a/packages/mobile/src/services/track-download.ts +++ b/packages/mobile/src/services/track-download.ts @@ -1,4 +1,4 @@ -import { TrackDownload as TrackDownloadBase } from '@audius/common' +import { TrackDownload as TrackDownloadBase } from '@audius/common/services' import type { Nullable } from '@audius/common/utils' import { Platform, Share } from 'react-native' import type { diff --git a/packages/mobile/src/services/wallet-client.ts b/packages/mobile/src/services/wallet-client.ts index 8d085db2d14..1d6f9f7c1ba 100644 --- a/packages/mobile/src/services/wallet-client.ts +++ b/packages/mobile/src/services/wallet-client.ts @@ -1,4 +1,4 @@ -import { WalletClient } from '@audius/common' +import { WalletClient } from '@audius/common/services' import { apiClient } from './audius-api-client' import { audiusBackendInstance } from './audius-backend-instance' diff --git a/packages/mobile/src/store/oauth/sagas.ts b/packages/mobile/src/store/oauth/sagas.ts index bc3e72c607b..6d9127eea9c 100644 --- a/packages/mobile/src/store/oauth/sagas.ts +++ b/packages/mobile/src/store/oauth/sagas.ts @@ -1,9 +1,9 @@ -import type { RemoteConfigInstance } from '@audius/common' +import { getContext } from '@audius/common' +import type { RemoteConfigInstance } from '@audius/common/services' import { - getContext, - formatInstagramProfile, - formatTwitterProfile -} from '@audius/common' + formatTwitterProfile, + formatInstagramProfile +} from '@audius/common/services' import * as Sentry from '@sentry/react-native' import { takeEvery, put, takeLatest, call } from 'redux-saga/effects' diff --git a/packages/mobile/src/store/offline-downloads/sagas/getIsOfflineEnabled.ts b/packages/mobile/src/store/offline-downloads/sagas/getIsOfflineEnabled.ts index 72391c2bd37..fd932bfbc4d 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/getIsOfflineEnabled.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/getIsOfflineEnabled.ts @@ -1,4 +1,5 @@ -import { FeatureFlags, getContext } from '@audius/common' +import { getContext } from '@audius/common' +import { FeatureFlags } from '@audius/common/services' import { call } from 'typed-redux-saga' import { OFFLINE_OVERRIDE_STORAGE_KEY } from 'app/constants/storage-keys' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts index bcab8a8efb1..292d96db157 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts @@ -1,4 +1,3 @@ -import type { QueryParams } from '@audius/common' import { accountSelectors, getContext, @@ -11,6 +10,7 @@ import type { UserTrackMetadata } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' +import type { QueryParams } from '@audius/common/services' import { encodeHashId, removeNullable, diff --git a/packages/mobile/src/store/sagas.ts b/packages/mobile/src/store/sagas.ts index bdffe377eeb..f0115871417 100644 --- a/packages/mobile/src/store/sagas.ts +++ b/packages/mobile/src/store/sagas.ts @@ -4,7 +4,7 @@ import { playerSagas as commonPlayerSagas, playbackPositionSagas, gatedContentSagas, - remoteConfigSagas as remoteConfig, + remoteConfigSagas, deletePlaylistConfirmationModalUISagas as deletePlaylistConfirmationModalSagas, duplicateAddConfirmationModalUISagas as duplicateAddConfirmationModalSagas, publishPlaylistConfirmationModalUISagas as publishPlaylistConfirmationModalSagas, @@ -201,7 +201,7 @@ export default function* rootSaga() { ...toastSagas(), initKeyboardEvents, - ...remoteConfig(), + ...remoteConfigSagas(), ...oauthSagas(), ...walletsSagas() ] diff --git a/packages/mobile/src/store/storeContext.ts b/packages/mobile/src/store/storeContext.ts index 24a49d5f240..975bb0462eb 100644 --- a/packages/mobile/src/store/storeContext.ts +++ b/packages/mobile/src/store/storeContext.ts @@ -1,5 +1,6 @@ import type { CommonStoreContext } from '@audius/common' -import { OpenSeaClient, SolanaClient } from '@audius/common' +import { OpenSeaClient, SolanaClient } from '@audius/common/services' +import {} from '@audius/common' import AsyncStorage from '@react-native-async-storage/async-storage' import * as Sentry from '@sentry/react-native' diff --git a/packages/web/src/common/store/cache/users/sagas.d.ts b/packages/web/src/common/store/cache/users/sagas.d.ts index 78d25bf78c6..1b1b9b36fb5 100644 --- a/packages/web/src/common/store/cache/users/sagas.d.ts +++ b/packages/web/src/common/store/cache/users/sagas.d.ts @@ -1,5 +1,5 @@ import { User } from '@audius/common/models' -import type {} from '@audius/common' + export declare function* adjustUserField(config: { user: User fieldName: string diff --git a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx index c1fa89fe091..aa2db4f07cf 100644 --- a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx +++ b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx @@ -3,7 +3,7 @@ import { useCallback } from 'react' import { cacheUsersSelectors } from '@audius/common' import { SuggestedTrack } from '@audius/common/api' import { SquareSizes, ID, Track } from '@audius/common/models' -import type {} from '@audius/common' + import { Button, ButtonSize, diff --git a/packages/web/src/pages/upload-page/utils/computeLicenseIcons.ts b/packages/web/src/pages/upload-page/utils/computeLicenseIcons.ts index 1c12d6d1fc3..3d21c0b0bb4 100644 --- a/packages/web/src/pages/upload-page/utils/computeLicenseIcons.ts +++ b/packages/web/src/pages/upload-page/utils/computeLicenseIcons.ts @@ -2,8 +2,6 @@ import type { ComponentType, SVGProps } from 'react' import { Nullable } from '@audius/common/utils' -import type {} from '@audius/common' - import IconAllowAttribution from 'assets/img/creativeCommons/by.svg' import IconCreativeCommons from 'assets/img/creativeCommons/cc.svg' import IconNonCommercialUse from 'assets/img/creativeCommons/nc.svg' diff --git a/packages/web/src/services/env/index.ts b/packages/web/src/services/env/index.ts index 1ea6d2a4c67..f1683e6d9f5 100644 --- a/packages/web/src/services/env/index.ts +++ b/packages/web/src/services/env/index.ts @@ -1,7 +1,5 @@ import { Environment, Env } from '@audius/common/services' -import type {} from '@audius/common' - import { env as envDev } from './env.dev' import { env as envProd } from './env.prod' import { env as envStage } from './env.stage' diff --git a/packages/web/src/ssr/track/+onBeforeRender.tsx b/packages/web/src/ssr/track/+onBeforeRender.tsx index 49a2a323358..de6093dc8a7 100644 --- a/packages/web/src/ssr/track/+onBeforeRender.tsx +++ b/packages/web/src/ssr/track/+onBeforeRender.tsx @@ -1,5 +1,5 @@ import { Maybe } from '@audius/common/utils' -import type {} from '@audius/common' + import { sdk, full as FullSdk, From 427a338c64d243f6a2eb7834621a3a9e52a5f3f7 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 16:43:56 -0800 Subject: [PATCH 43/64] Convert assets in web --- packages/common/package.json | 3 ++- packages/common/src/index.ts | 1 - .../components/ai-attribution-modal/SearchBarResult.jsx | 3 ++- packages/web/src/components/card/desktop/Card.tsx | 2 +- .../web/src/components/card/desktop/CollectionArtCard.tsx | 4 ++-- packages/web/src/components/card/desktop/UserArtCard.tsx | 6 ++---- packages/web/src/components/card/mobile/Card.tsx | 2 +- packages/web/src/components/collection/desktop/Artwork.tsx | 7 ++----- .../components/edit-playlist/mobile/EditPlaylistPage.tsx | 2 +- .../web/src/components/search-bar/ConnectedSearchBar.jsx | 4 ++-- packages/web/src/components/search/SearchBarResult.jsx | 2 +- packages/web/src/hooks/useCollectionCoverArt.ts | 6 ++---- .../src/pages/track-page/components/mobile/TrackHeader.tsx | 3 ++- .../web/src/pages/upload-page/fields/MultiTrackSidebar.tsx | 2 +- packages/web/src/pages/upload-page/pages/FinishPage.tsx | 2 +- packages/web/src/pages/upload-page/validation.ts | 2 +- 16 files changed, 23 insertions(+), 28 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 044a3ab87c6..8a8bf952c57 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -17,7 +17,8 @@ "./utils": "./src/utils/index.ts", "./schemas": "./src/schemas/index.ts", "./services": "./src/services/index.ts", - "./audius-query": "./src/audius-query/index.ts" + "./audius-query": "./src/audius-query/index.ts", + "./assets": "./src/assets/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index ad591c604a6..27a095d1514 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -2,4 +2,3 @@ import * as e from './audius-query' console.log('exports', Object.keys(e)) export * from './store' -export * from './assets' diff --git a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx index edd5a3a3fb5..008cd1ae00f 100644 --- a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx +++ b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx @@ -1,6 +1,7 @@ import { useState, useEffect, memo, useCallback } from 'react' -import { imageBlank as placeholderArt, cacheUsersActions } from '@audius/common' +import { cacheUsersActions } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common/assets' import { Kind } from '@audius/common/models' import { Tag } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/card/desktop/Card.tsx b/packages/web/src/components/card/desktop/Card.tsx index 65d6081d79a..dfbbb357681 100644 --- a/packages/web/src/components/card/desktop/Card.tsx +++ b/packages/web/src/components/card/desktop/Card.tsx @@ -8,7 +8,7 @@ import { MouseEventHandler } from 'react' -import { imageBlank as placeholderArt } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common/assets' import { DogEarType, SquareSizes, diff --git a/packages/web/src/components/card/desktop/CollectionArtCard.tsx b/packages/web/src/components/card/desktop/CollectionArtCard.tsx index 2bad7caa190..5de54fd4300 100644 --- a/packages/web/src/components/card/desktop/CollectionArtCard.tsx +++ b/packages/web/src/components/card/desktop/CollectionArtCard.tsx @@ -3,9 +3,9 @@ import { useCallback, useEffect, useState } from 'react' import { accountSelectors, cacheCollectionsSelectors, - cacheUsersSelectors, - imageBlank as placeholderArt + cacheUsersSelectors } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/card/desktop/UserArtCard.tsx b/packages/web/src/components/card/desktop/UserArtCard.tsx index 55375d580e5..8f0760ab2a4 100644 --- a/packages/web/src/components/card/desktop/UserArtCard.tsx +++ b/packages/web/src/components/card/desktop/UserArtCard.tsx @@ -1,9 +1,7 @@ import { useCallback, useEffect } from 'react' -import { - cacheUsersSelectors, - imageBlank as placeholderArt -} from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' import { formatCount } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/card/mobile/Card.tsx b/packages/web/src/components/card/mobile/Card.tsx index af40a91a7a4..ea77089aefb 100644 --- a/packages/web/src/components/card/mobile/Card.tsx +++ b/packages/web/src/components/card/mobile/Card.tsx @@ -1,6 +1,6 @@ import React, { MouseEvent, ReactNode } from 'react' -import { imageBlank as placeholderArt } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, ID, diff --git a/packages/web/src/components/collection/desktop/Artwork.tsx b/packages/web/src/components/collection/desktop/Artwork.tsx index 4b4949a4512..0aa0fd301a1 100644 --- a/packages/web/src/components/collection/desktop/Artwork.tsx +++ b/packages/web/src/components/collection/desktop/Artwork.tsx @@ -1,10 +1,7 @@ import { ComponentType, SVGProps, useCallback, useEffect } from 'react' -import { - cacheCollectionsSelectors, - imageBlank, - useEditPlaylistModal -} from '@audius/common' +import { cacheCollectionsSelectors, useEditPlaylistModal } from '@audius/common' +import { imageBlank } from '@audius/common/assets' import { SquareSizes, CoverArtSizes } from '@audius/common/models' import { Button, ButtonType, IconPencil } from '@audius/stems' diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index f7e73794312..df5ae86e88e 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -4,11 +4,11 @@ import { accountSelectors, cacheCollectionsActions, collectionPageLineupActions as tracksActions, - imageBlank as placeholderCoverArt, EditPlaylistValues, cacheCollectionsSelectors, useEditPlaylistModal } from '@audius/common' +import { imageBlank as placeholderCoverArt } from '@audius/common/assets' import { useGatedContentAccessMap } from '@audius/common/hooks' import { SquareSizes, Collection, ID } from '@audius/common/models' import { newCollectionMetadata } from '@audius/common/schemas' diff --git a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx index ee379c670d5..e8fb52c9d5c 100644 --- a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx +++ b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx @@ -1,10 +1,10 @@ import { Component } from 'react' +import { getTierForUser } from '@audius/common' import { - getTierForUser, imageBlank as placeholderArt, imageProfilePicEmpty as profilePicEmpty -} from '@audius/common' +} from '@audius/common/assets' import { Name, SquareSizes } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { has } from 'lodash' diff --git a/packages/web/src/components/search/SearchBarResult.jsx b/packages/web/src/components/search/SearchBarResult.jsx index db079ec5118..b2557c10652 100644 --- a/packages/web/src/components/search/SearchBarResult.jsx +++ b/packages/web/src/components/search/SearchBarResult.jsx @@ -1,6 +1,6 @@ import { useState, useEffect, memo } from 'react' -import { imageBlank as placeholderArt } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common/assets' import { Kind } from '@audius/common/models' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/hooks/useCollectionCoverArt.ts b/packages/web/src/hooks/useCollectionCoverArt.ts index 3e3f7562619..7b23268e210 100644 --- a/packages/web/src/hooks/useCollectionCoverArt.ts +++ b/packages/web/src/hooks/useCollectionCoverArt.ts @@ -1,7 +1,5 @@ -import { - cacheCollectionsActions, - imageBlank as imageEmpty -} from '@audius/common' +import { cacheCollectionsActions } from '@audius/common' +import { imageBlank as imageEmpty } from '@audius/common/assets' import { useImageSize } from '@audius/common/hooks' import { SquareSizes, CoverArtSizes } from '@audius/common/models' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx index c8262062f95..b1020c3a1ff 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react' -import { OverflowAction, imageBlank as placeholderArt } from '@audius/common' +import { OverflowAction } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, isContentCollectibleGated, diff --git a/packages/web/src/pages/upload-page/fields/MultiTrackSidebar.tsx b/packages/web/src/pages/upload-page/fields/MultiTrackSidebar.tsx index 4d55f5b8f94..c212e8536e5 100644 --- a/packages/web/src/pages/upload-page/fields/MultiTrackSidebar.tsx +++ b/packages/web/src/pages/upload-page/fields/MultiTrackSidebar.tsx @@ -1,6 +1,6 @@ import { MouseEvent, useCallback, useContext } from 'react' -import { imageBlank as placeholderArt } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common/assets' import { Button } from '@audius/harmony' import { IconError, IconUpload } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/upload-page/pages/FinishPage.tsx b/packages/web/src/pages/upload-page/pages/FinishPage.tsx index c266ccbd5f9..ea5fa48a41e 100644 --- a/packages/web/src/pages/upload-page/pages/FinishPage.tsx +++ b/packages/web/src/pages/upload-page/pages/FinishPage.tsx @@ -3,12 +3,12 @@ import { useCallback, useMemo } from 'react' import { accountSelectors, CommonState, - imageBlank as placeholderArt, ProgressState, ProgressStatus, uploadSelectors, UploadType } from '@audius/common' +import { imageBlank as placeholderArt } from '@audius/common/assets' import { Name } from '@audius/common/models' import { HarmonyPlainButton, diff --git a/packages/web/src/pages/upload-page/validation.ts b/packages/web/src/pages/upload-page/validation.ts index 0164dbac11f..9d136a3f980 100644 --- a/packages/web/src/pages/upload-page/validation.ts +++ b/packages/web/src/pages/upload-page/validation.ts @@ -1,4 +1,4 @@ -import { imageBlank } from '@audius/common' +import { imageBlank } from '@audius/common/assets' import { Genre, HashId, From 473686a779c0ddc920b2065583dd67187c3e5617 Mon Sep 17 00:00:00 2001 From: sliptype Date: Tue, 30 Jan 2024 16:52:14 -0800 Subject: [PATCH 44/64] Convert assets on web pt 2 --- packages/common/src/index.ts | 2 +- .../ai-attribution-modal/AiAttributionDropdown.tsx | 3 ++- packages/web/src/components/avatar/Avatar.tsx | 7 ++----- packages/web/src/components/avatar/AvatarLegacy.tsx | 7 ++----- packages/web/src/components/cover-photo/CoverPhoto.tsx | 2 +- .../web/src/components/tipping/support/SupportingTile.tsx | 8 ++++---- packages/web/src/components/upload/UploadArtwork.jsx | 2 +- packages/web/src/hooks/useCoverPhoto.ts | 5 ++--- packages/web/src/hooks/useTrackCoverArt.ts | 7 ++----- packages/web/src/hooks/useUserProfilePicture.ts | 7 ++----- .../profile-page/components/mobile/ProfileHeader.tsx | 5 ++++- packages/web/src/pages/sign-on/components/ProfileForm.tsx | 2 +- 12 files changed, 24 insertions(+), 33 deletions(-) diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 27a095d1514..ebc8f933bb1 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,4 +1,4 @@ -import * as e from './audius-query' +import * as e from './store' console.log('exports', Object.keys(e)) export * from './store' diff --git a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx index 6a5e9ad1490..127dd98aff1 100644 --- a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx +++ b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx @@ -1,6 +1,7 @@ import { useCallback, useState } from 'react' -import { getTierForUser, imageProfilePicEmpty } from '@audius/common' +import { getTierForUser } from '@audius/common' +import { imageProfilePicEmpty } from '@audius/common/assets' import { SquareSizes, Kind } from '@audius/common/models' import { SelectProps } from 'antd' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/avatar/Avatar.tsx b/packages/web/src/components/avatar/Avatar.tsx index 338d3336478..91df4a45937 100644 --- a/packages/web/src/components/avatar/Avatar.tsx +++ b/packages/web/src/components/avatar/Avatar.tsx @@ -1,8 +1,5 @@ -import { - accountSelectors, - cacheUsersSelectors, - imageProfilePicEmpty -} from '@audius/common' +import { accountSelectors, cacheUsersSelectors } from '@audius/common' +import { imageProfilePicEmpty } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' import { Maybe } from '@audius/common/utils' import { diff --git a/packages/web/src/components/avatar/AvatarLegacy.tsx b/packages/web/src/components/avatar/AvatarLegacy.tsx index 7134bbb1d70..9832124af27 100644 --- a/packages/web/src/components/avatar/AvatarLegacy.tsx +++ b/packages/web/src/components/avatar/AvatarLegacy.tsx @@ -1,8 +1,5 @@ -import { - accountSelectors, - cacheUsersSelectors, - imageProfilePicEmpty -} from '@audius/common' +import { accountSelectors, cacheUsersSelectors } from '@audius/common' +import { imageProfilePicEmpty } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' import { Maybe } from '@audius/common/utils' import { Link } from 'react-router-dom' diff --git a/packages/web/src/components/cover-photo/CoverPhoto.tsx b/packages/web/src/components/cover-photo/CoverPhoto.tsx index 6c94adf1514..43f397aa9bd 100644 --- a/packages/web/src/components/cover-photo/CoverPhoto.tsx +++ b/packages/web/src/components/cover-photo/CoverPhoto.tsx @@ -1,6 +1,6 @@ import { memo, useState } from 'react' -import { imageCoverPhotoBlank } from '@audius/common' +import { imageCoverPhotoBlank } from '@audius/common/assets' import { WidthSizes } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/tipping/support/SupportingTile.tsx b/packages/web/src/components/tipping/support/SupportingTile.tsx index a1e0f6d32de..d1b42125ade 100644 --- a/packages/web/src/components/tipping/support/SupportingTile.tsx +++ b/packages/web/src/components/tipping/support/SupportingTile.tsx @@ -1,10 +1,10 @@ import { useCallback } from 'react' +import { cacheUsersSelectors } from '@audius/common' import { - cacheUsersSelectors, - imageCoverPhotoBlank, - imageProfilePicEmpty as profilePicEmpty -} from '@audius/common' + imageProfilePicEmpty as profilePicEmpty, + imageCoverPhotoBlank +} from '@audius/common/assets' import { SquareSizes, WidthSizes, diff --git a/packages/web/src/components/upload/UploadArtwork.jsx b/packages/web/src/components/upload/UploadArtwork.jsx index 99dddec5fa6..8446913ef84 100644 --- a/packages/web/src/components/upload/UploadArtwork.jsx +++ b/packages/web/src/components/upload/UploadArtwork.jsx @@ -1,6 +1,6 @@ import { useState, useEffect, useRef } from 'react' -import { imageBlank, imageBlank as placeholderArt } from '@audius/common' +import { imageBlank, imageBlank as placeholderArt } from '@audius/common/assets' import cn from 'classnames' import ImageSelectionButton from 'components/image-selection/ImageSelectionButton' diff --git a/packages/web/src/hooks/useCoverPhoto.ts b/packages/web/src/hooks/useCoverPhoto.ts index 02efa59d72d..3292d797cb1 100644 --- a/packages/web/src/hooks/useCoverPhoto.ts +++ b/packages/web/src/hooks/useCoverPhoto.ts @@ -1,11 +1,10 @@ import { useCallback } from 'react' +import { cacheUsersActions, cacheUsersSelectors } from '@audius/common' import { - cacheUsersActions, imageCoverPhotoBlank, - cacheUsersSelectors, imageProfilePicEmpty -} from '@audius/common' +} from '@audius/common/assets' import { useImageSize } from '@audius/common/hooks' import { SquareSizes, WidthSizes, CoverPhotoSizes } from '@audius/common/models' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/hooks/useTrackCoverArt.ts b/packages/web/src/hooks/useTrackCoverArt.ts index 599aad52faf..041f0356686 100644 --- a/packages/web/src/hooks/useTrackCoverArt.ts +++ b/packages/web/src/hooks/useTrackCoverArt.ts @@ -1,8 +1,5 @@ -import { - cacheTracksActions, - imageBlank as imageEmpty, - cacheTracksSelectors -} from '@audius/common' +import { cacheTracksActions, cacheTracksSelectors } from '@audius/common' +import { imageBlank as imageEmpty } from '@audius/common/assets' import { useImageSize } from '@audius/common/hooks' import { SquareSizes, ID, CoverArtSizes } from '@audius/common/models' import { Maybe } from '@audius/common/utils' diff --git a/packages/web/src/hooks/useUserProfilePicture.ts b/packages/web/src/hooks/useUserProfilePicture.ts index 086d2f33c4f..b40a00c1c97 100644 --- a/packages/web/src/hooks/useUserProfilePicture.ts +++ b/packages/web/src/hooks/useUserProfilePicture.ts @@ -1,8 +1,5 @@ -import { - cacheUsersActions, - imageProfilePicEmpty as profilePicEmpty, - cacheUsersSelectors -} from '@audius/common' +import { cacheUsersActions, cacheUsersSelectors } from '@audius/common' +import { imageProfilePicEmpty as profilePicEmpty } from '@audius/common/assets' import { useImageSize } from '@audius/common/hooks' import { SquareSizes, ProfilePictureSizes } from '@audius/common/models' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx b/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx index e18b5d28965..22e6c8487c8 100644 --- a/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/ProfileHeader.tsx @@ -1,6 +1,9 @@ import { useState, useRef, useCallback, useEffect, MouseEvent } from 'react' -import { imageCoverPhotoBlank, imageProfilePicEmpty } from '@audius/common' +import { + imageCoverPhotoBlank, + imageProfilePicEmpty +} from '@audius/common/assets' import { Name, SquareSizes, diff --git a/packages/web/src/pages/sign-on/components/ProfileForm.tsx b/packages/web/src/pages/sign-on/components/ProfileForm.tsx index 3a4d94c42f2..8bddee65888 100644 --- a/packages/web/src/pages/sign-on/components/ProfileForm.tsx +++ b/packages/web/src/pages/sign-on/components/ProfileForm.tsx @@ -1,6 +1,6 @@ import { KeyboardEventHandler, useState } from 'react' -import { imageProfilePicEmpty as profilePicEmpty } from '@audius/common' +import { imageProfilePicEmpty as profilePicEmpty } from '@audius/common/assets' import { MAX_HANDLE_LENGTH, MAX_DISPLAY_NAME_LENGTH From 6272d97878f6e466e9e43295c0745da95343acd5 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 16:50:11 -0800 Subject: [PATCH 45/64] Mobile audius-query --- packages/mobile/babel.config.js | 3 ++- packages/mobile/src/app/AudiusQueryProvider.tsx | 2 +- .../src/screens/favorites-screen/useCollectionsScreenData.ts | 2 +- .../sign-on-screen/components/SignUpFlowInstagramAuth.tsx | 2 +- .../screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx | 2 +- .../sign-on-screen/components/SignUpFlowTwitterAuth.tsx | 2 +- .../src/screens/sign-on-screen/screens/CreateEmailScreen.tsx | 2 +- .../sign-on-screen/screens/CreateLoginDetailsScreen.tsx | 2 +- .../src/screens/sign-on-screen/screens/PickHandleScreen.tsx | 2 +- .../src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js index 5b1081c4ce4..cbee15b9ba2 100644 --- a/packages/mobile/babel.config.js +++ b/packages/mobile/babel.config.js @@ -16,7 +16,8 @@ module.exports = (api) => { '@audius/common/models': '../common/src/models', '@audius/common/utils': '../common/src/utils', '@audius/common/schemas': '../common/src/schemas', - '@audius/common/services': '../common/src/services' + '@audius/common/services': '../common/src/services', + '@audius/common/audius-query': '../common/src/audius-query' } } ] diff --git a/packages/mobile/src/app/AudiusQueryProvider.tsx b/packages/mobile/src/app/AudiusQueryProvider.tsx index 4de7fe5bb64..1e017278c71 100644 --- a/packages/mobile/src/app/AudiusQueryProvider.tsx +++ b/packages/mobile/src/app/AudiusQueryProvider.tsx @@ -1,6 +1,6 @@ import type { ReactNode } from 'react' -import { AudiusQueryContext } from '@audius/common' +import { AudiusQueryContext } from '@audius/common/audius-query' import { env } from 'app/env' import { apiClient } from 'app/services/audius-api-client' diff --git a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts index cd1244b5bcf..fa362bc0db8 100644 --- a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts +++ b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts @@ -4,10 +4,10 @@ import { accountSelectors, cacheCollectionsSelectors, reachabilitySelectors, - useAllPaginatedQuery, savedPageSelectors } from '@audius/common' import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' +import { useAllPaginatedQuery } from '@audius/common/audius-query' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' import { diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx index c3703adb45a..1c1d7926078 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowInstagramAuth.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { socialMediaMessages } from '@audius/common/messages' import { Name } from '@audius/common/models' import { pickHandleSchema } from '@audius/common/schemas' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx index 9b23717a0c6..bca8bfa388f 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTikTokAuth.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { Name } from '@audius/common/models' import { pickHandleSchema } from '@audius/common/schemas' import { formatTikTokProfile } from '@audius/common/services' diff --git a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx index 3c960caa01f..cba95fe5643 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/SignUpFlowTwitterAuth.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { socialMediaMessages } from '@audius/common/messages' import { pickHandleSchema } from '@audius/common/schemas' import { formatTwitterProfile } from '@audius/common/services' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx index 4d3b961da7d..d2e08175486 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreateEmailScreen.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { createEmailPageMessages } from '@audius/common/messages' import { emailSchema } from '@audius/common/schemas' import { diff --git a/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx index 98caae17b1a..6fd418b2227 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/CreateLoginDetailsScreen.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { createLoginDetailsPageMessages } from '@audius/common/messages' import { emailSchema, createLoginDetailsSchema } from '@audius/common/schemas' import { css } from '@emotion/native' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx index 8973b600c20..d55ceaa818d 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/PickHandleScreen.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { pickHandlePageMessages } from '@audius/common/messages' import { pickHandleSchema } from '@audius/common/schemas' import { css } from '@emotion/native' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx index 86bcce8eabd..c23f4732d0c 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/ReviewHandleScreen.tsx @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react' -import { useAudiusQueryContext } from '@audius/common' +import { useAudiusQueryContext } from '@audius/common/audius-query' import { reviewHandlePageMessages } from '@audius/common/messages' import { pickHandleSchema } from '@audius/common/schemas' import { setValueField } from 'audius-client/src/common/store/pages/signon/actions' From 7d15f7f9477679a6076e21a4f78163e04c16129d Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 17:05:33 -0800 Subject: [PATCH 46/64] Add store variables --- packages/common/src/index.ts | 5 +- packages/convert-exports.js | 806 ++++++++++++++++++++++++++++++++++- packages/get-type-exports.js | 2 +- 3 files changed, 802 insertions(+), 11 deletions(-) diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index ebc8f933bb1..336ce12bb91 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,4 +1 @@ -import * as e from './store' -console.log('exports', Object.keys(e)) - -export * from './store' +export {} diff --git a/packages/convert-exports.js b/packages/convert-exports.js index 49298aa2fe1..f199b977e4e 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -5,13 +5,807 @@ var getDirectories = function (callback) { glob('./web/src/**/*', callback) } -const DIRECTORY = 'audius-query' +const DIRECTORY = 'store' const EXPORTS = [ - 'AudiusQueryContext', - 'useAudiusQueryContext', - 'createApi', - 'usePaginatedQuery', - 'useAllPaginatedQuery' + 'accountReducer', + 'accountActions', + 'accountSelectors', + 'accountSagas', + 'averageColorReducer', + 'averageColorActions', + 'averageColorSelectors', + 'buyCryptoReducer', + 'buyCryptoActions', + 'buyCryptoSagas', + 'buyUSDCReducer', + 'buyUSDCActions', + 'buyUSDCSelectors', + 'buyUSDCSagas', + 'getUSDCUserBank', + 'getBuyUSDCRemoteConfig', + 'BuyUSDCStage', + 'BuyUSDCErrorCode', + 'BuyUSDCError', + 'cacheCollectionsActions', + 'cacheCollectionsReducer', + 'cacheCollectionsSelectors', + 'cacheTracksActions', + 'cacheTracksReducer', + 'cacheTracksSelectors', + 'cacheUsersActions', + 'cacheUsersReducer', + 'cacheActions', + 'CIDCache', + 'cacheConfig', + 'cacheReducer', + 'cacheSelectors', + 'processAndCacheUsers', + 'reformatUser', + 'PlaylistOperations', + 'reformatCollection', + 'cacheUsersSelectors', + 'castSagas', + 'castSelectors', + 'castReducer', + 'castActions', + 'CAST_METHOD', + 'challengesSelectors', + 'changePasswordSelectors', + 'changePasswordReducer', + 'changePasswordActions', + 'ChangePasswordPageStep', + 'lineupActions', + 'lineupReducer', + 'lineupSelectors', + 'LineupBaseActions', + 'lineupRegistry', + 'notificationsReducer', + 'notificationsActions', + 'notificationsSelectors', + 'NotificationType', + 'PushNotificationType', + 'Entity', + 'Achievement', + 'trendingUndergroundLineupPageReducer', + 'trendingUndergroundPageLineupSelectors', + 'trendingUndergroundPageLineupActions', + 'trendingUndergroundPageReducer', + 'trendingPlaylistsPageLineupReducer', + 'trendingPlaylistsPageLineupSelectors', + 'trendingPlaylistsPageLineupActions', + 'trendingPlaylistsPageReducer', + 'trendingPageLineupReducer', + 'trendingPageLineupSelectors', + 'trendingPageLineupActions', + 'trendingPageReducer', + 'trendingPageActions', + 'trendingPageSelectors', + 'trackPageLineupReducer', + 'trackPageLineupActions', + 'trackPageReducer', + 'trackPageActions', + 'trackPageSelectors', + 'tokenDashboardPageSelectors', + 'tokenDashboardPageReducer', + 'tokenDashboardPageActions', + 'smartCollectionPageSelectors', + 'smartCollectionPageReducer', + 'smartCollectionPageActions', + 'settingsPageSelectors', + 'settingsPageReducer', + 'settingsPageInitialState', + 'settingsPageActions', + 'searchResultsPageTracksLineupReducer', + 'searchResultsPageTracksLineupActions', + 'searchResultsPageActions', + 'searchResultsPageSelectors', + 'searchResultsPageReducer', + 'savedPageTracksLineupReducer', + 'savedPageTracksLineupActions', + 'savedPageActions', + 'savedPageSelectors', + 'persistedSavePageReducer', + 'remixesPageLineupReducer', + 'remixesPageLineupInitialState', + 'remixesPageLineupActions', + 'remixesPageReducer', + 'remixesPageActions', + 'remixesPageSelectors', + 'aiPageLineupReducer', + 'aiPageLineupInitialState', + 'aiPageLineupActions', + 'aiPageReducer', + 'aiPageActions', + 'aiPageSelectors', + 'profilePageFeedLineupReducer', + 'profilePageFeedLineupActions', + 'profilePageTracksLineupReducer', + 'profilePageTracksLineupActions', + 'profilePageActions', + 'profilePageSelectors', + 'profilePageReducer', + 'historyPageTracksLineupReducer', + 'historyPageTracksLineupActions', + 'historyPageSelectors', + 'historyPageReducer', + 'feedPageLineupReducer', + 'feedPageLineupActions', + 'feedPageSelectors', + 'feedPageActions', + 'feedPageReducer', + 'explorePageCollectionsSelectors', + 'explorePageCollectionsReducer', + 'explorePageCollectionsActions', + 'explorePageSelectors', + 'explorePageReducer', + 'explorePageActions', + 'collectionPageLineupReducer', + 'collectionPageLineupActions', + 'collectionPageSelectors', + 'collectionPageActions', + 'collectionPageReducer', + 'audioRewardsPageSelectors', + 'audioRewardsPageReducer', + 'audioRewardsPageActions', + 'audioTransactionsPageSelectors', + 'audioTransactionsPageReducer', + 'audioTransactionsPageActions', + 'premiumTracksPageLineupReducer', + 'premiumTracksPageLineupSelectors', + 'premiumTracksPageLineupActions', + 'BrowserNotificationSetting', + 'PushNotificationSetting', + 'EmailFrequency', + 'emailFrequency', + 'Cast', + 'SearchKind', + 'LibraryCategory', + 'isLibraryCategory', + 'SavedPageTabs', + 'calculateNewLibraryCategories', + 'FollowType', + 'CollectionSortMode', + 'TracksSortMode', + 'ProfilePageTabs', + 'ProfilePageTabRoute', + 'getTabForRoute', + 'ExplorePageTabs', + 'ExploreCollectionsVariant', + 'HCaptchaStatus', + 'ClaimStatus', + 'deactivateAccountReducer', + 'deactivateAccountActions', + 'deactivateAccountSelectors', + 'chatReducer', + 'chatActions', + 'chatSelectors', + 'chatSagas', + 'chatMiddleware', + 'makeChatId', + 'ChatPermissionAction', + 'ChatWebsocketError', + 'playlistLibraryReducer', + 'playlistLibraryActions', + 'playlistLibraryHelpers', + 'playlistLibrarySelectors', + 'queueReducer', + 'queueActions', + 'initialQueueState', + 'queueSelectors', + 'RepeatMode', + 'QueueSource', + 'reachabilityActions', + 'reachabilityReducer', + 'reachabilitySelectors', + 'reachabilitySagas', + 'recoveryEmailReducer', + 'recoveryEmailActions', + 'recoveryEmailSelectors', + 'remoteConfigSagas', + 'remoteConfigSelectors', + 'remoteConfigActions', + 'remoteConfigReducer', + 'remoteConfigInitialState', + 'signOutReducer', + 'signOutActions', + 'collectionsSocialActions', + 'tracksSocialActions', + 'usersSocialActions', + 'solanaSelectors', + 'solanaReducer', + 'solanaActions', + 'solanaSagas', + 'stemsUploadActions', + 'stemsUploadReducer', + 'stemsUploadSelectors', + 'tippingSelectors', + 'tippingReducer', + 'tippingActions', + 'walletSelectors', + 'walletReducer', + 'walletActions', + 'badgeTiers', + 'getVerifiedForUser', + 'getWeiBalanceForUser', + 'makeGetTierAndVerifiedForUser', + 'getTierAndNumberForBalance', + 'getTierNumber', + 'getUserBalance', + 'getTierForUser', + 'addToCollectionUISelectors', + 'addToCollectionUIActions', + 'addToCollectionUIReducer', + 'relatedArtistsUISelectors', + 'relatedArtistsUIReducer', + 'relatedArtistsUIActions', + 'relatedArtistsSagas', + 'collectibleDetailsUISelectors', + 'collectibleDetailsUIReducer', + 'collectibleDetailsUIActions', + 'deletePlaylistConfirmationModalUISelectors', + 'deletePlaylistConfirmationModalUIReducer', + 'deletePlaylistConfirmationModalUIActions', + 'deletePlaylistConfirmationModalUISagas', + 'duplicateAddConfirmationModalUISelectors', + 'duplicateAddConfirmationModalUIReducer', + 'duplicateAddConfirmationModalUIActions', + 'duplicateAddConfirmationModalUISagas', + 'mobileOverflowMenuUISelectors', + 'mobileOverflowMenuUIReducer', + 'mobileOverflowMenuUIActions', + 'mobileOverflowMenuUISagas', + 'nowPlayingUISelectors', + 'nowPlayingUIReducer', + 'nowPlayingUIActions', + 'publishPlaylistConfirmationModalUISelectors', + 'publishPlaylistConfirmationModalUIReducer', + 'publishPlaylistConfirmationModalUIActions', + 'publishPlaylistConfirmationModalUISagas', + 'reactionsUIReducer', + 'reactionsUIActions', + 'reactionsUISelectors', + 'shareModalUIReducer', + 'shareModalUIActions', + 'shareModalUISelectors', + 'shareModalUISagas', + 'stripeModalUIReducer', + 'stripeModalUIActions', + 'stripeModalUISelectors', + 'stripeModalUISagas', + 'coinflowModalUIReducer', + 'coinflowModalUIActions', + 'vipDiscordModalReducer', + 'vipDiscordModalActions', + 'vipDiscordModalSelectors', + 'vipDiscordModalSagas', + 'shareSoundToTiktokModalReducer', + 'shareSoundToTiktokModalActions', + 'shareSoundToTiktokModalSelectors', + 'themeReducer', + 'themeActions', + 'themeSelectors', + 'toastReducer', + 'toastActions', + 'toastSelectors', + 'toastSagas', + 'buyAudioReducer', + 'buyAudioActions', + 'buyAudioSelectors', + 'uploadConfirmationModalUISelectors', + 'uploadConfirmationModalUIReducer', + 'uploadConfirmationModalUIActions', + 'uploadConfirmationModalUISagas', + 'publishTrackConfirmationModalUISelectors', + 'publishTrackConfirmationModalUIReducer', + 'publishTrackConfirmationModalUIActions', + 'publishTrackConfirmationModalUISagas', + 'withdrawUSDCReducer', + 'withdrawUSDCActions', + 'withdrawUSDCSelectors', + 'transactionDetailsReducer', + 'transactionDetailsActions', + 'transactionDetailsSelectors', + 'searchUsersModalReducer', + 'searchUsersModalActions', + 'searchUsersModalSelectors', + 'searchUsersModalSagas', + 'OverflowAction', + 'OverflowSource', + 'modalsSelectors', + 'modalsActions', + 'modalsReducer', + 'modalsSagas', + 'useCreateChatModal', + 'createChatModalActions', + 'createChatModalReducer', + 'useCoinflowOnrampModal', + 'coinflowOnrampModalActions', + 'coinflowOnrampModalReducer', + 'useCoinflowWithdrawModal', + 'coinflowWithdrawModalActions', + 'coinflowWithdrawModalReducer', + 'useLeavingAudiusModal', + 'leavingAudiusModalReducer', + 'useInboxUnavailableModal', + 'inboxUnavailableModalActions', + 'inboxUnavailableModalReducer', + 'useUSDCPurchaseDetailsModal', + 'usdcPurchaseDetailsModalReducer', + 'useUSDCTransactionDetailsModal', + 'usdcTransactionDetailsModalReducer', + 'WithdrawUSDCModalPages', + 'useWithdrawUSDCModal', + 'withdrawUSDCModalReducer', + 'withdrawUSDCModalActions', + 'useEditPlaylistModal', + 'editPlaylistModalActions', + 'editPlaylistModalReducer', + 'editTrackModalSelectors', + 'useEditTrackModal', + 'editTrackModalActions', + 'editTrackModalReducer', + 'usePremiumContentPurchaseModal', + 'premiumContentPurchaseModalReducer', + 'useUSDCManualTransferModal', + 'usdcManualTransferModalReducer', + 'useAddFundsModal', + 'addFundsModalReducer', + 'reactionOrder', + 'reactionsMap', + 'getReactionFromRawValue', + 'StripeSessionCreationError', + 'ShareSoundToTiktokModalStatus', + 'OnRampProvider', + 'PurchaseInfoErrorType', + 'BuyAudioStage', + 'TOKEN_LISTING_MAP', + 'CoinflowWithdrawState', + 'WithdrawMethod', + 'TransactionType', + 'TransactionMethod', + 'TransactionMetadataType', + 'userListActions', + 'UserListSagaFactory', + 'userListSelectors', + 'topSupportersUserListActions', + 'topSupportersUserListSelectors', + 'supportingUserListActions', + 'supportingUserListSelectors', + 'repostsUserListActions', + 'repostsUserListSelectors', + 'notificationsUserListActions', + 'notificationsUserListSelectors', + 'notificationsUserListReducer', + 'mutualsUserListActions', + 'mutualsUserListSelectors', + 'mutualsUserListReducer', + 'followingUserListActions', + 'followingUserListSelectors', + 'followersUserListActions', + 'followersUserListSelectors', + 'favoritesUserListActions', + 'favoritesUserListSelectors', + 'relatedArtistsUserListActions', + 'relatedArtistsUserListSelectors', + 'UserListReducerFactory', + 'TOP_SUPPORTERS_USER_LIST_TAG', + 'SUPPORTING_USER_LIST_TAG', + 'RepostType', + 'REPOSTS_USER_LIST_TAG', + 'NOTIFICATIONS_USER_LIST_TAG', + 'MUTUALS_USER_LIST_TAG', + 'FOLLOWING_USER_LIST_TAG', + 'FOLLOWERS_USER_LIST_TAG', + 'FAVORITES_USER_LIST_TAG', + 'RELATED_ARTISTS_USER_LIST_TAG', + 'reducers', + 'sagas', + 'getContext', + 'playerReducer', + 'playerActions', + 'initialPlayerState', + 'playerSelectors', + 'playerSagas', + 'PLAYBACK_RATE_LS_KEY', + 'playbackRateValueMap', + 'playbackPositionReducer', + 'playbackPositionActions', + 'playbackPositionSelectors', + 'playbackPositionSagas', + 'LEGACY_PLAYBACK_POSITION_LS_KEY', + 'PLAYBACK_POSITION_LS_KEY', + 'musicConfettiSelectors', + 'musicConfettiReducer', + 'musicConfettiActions', + 'uploadReducer', + 'uploadActions', + 'uploadSelectors', + 'UploadType', + 'ProgressStatus', + 'remixSettingsSelectors', + 'remixSettingsReducer', + 'remixSettingsActions', + 'gatedContentReducer', + 'gatedContentActions', + 'gatedContentSelectors', + 'gatedContentSagas', + 'purchaseContentReducer', + 'purchaseContentActions', + 'purchaseContentSelectors', + 'purchaseContentSagas', + 'ContentType', + 'PurchaseContentStage', + 'PurchaseContentPage', + 'PurchaseErrorCode', + 'PurchaseContentError', + 'zeroBalance', + 'isContentPurchaseInProgress', + 'getPurchaseSummaryValues', + 'getBalanceNeeded', + 'collectiblesReducer', + 'collectiblesActions', + 'collectiblesSelectors', + 'playlistUpdatesActions', + 'playlistUpdatesReducer', + 'playlistUpdatesSelectors', + 'playlistUpdatesSagas', + 'savedCollectionsReducer', + 'savedCollectionsActions', + 'savedCollectionsSelectors', + 'confirmerActions', + 'confirmerReducer', + 'confirmerSelectors', + 'confirmerSagas', + 'confirmTransaction', + 'AccountCollection', + 'TwitterAccountPayload', + 'InstagramAccountPayload', + 'TikTokAccountPayload', + 'InstagramProfile', + 'TwitterProfile', + 'TikTokProfile', + 'BuyCryptoConfig', + 'BuyCryptoViaSolLocalStorageState', + 'PurchaseInfo', + 'AddSuccededAction', + 'AddEntriesAction', + 'CacheType', + 'SetCacheConfigAction', + 'EnhancedCollection', + 'EnhancedCollectionTrack', + 'CollectionsCacheState', + 'Image', + 'EditPlaylistValues', + 'TracksCacheState', + 'Metadata', + 'UsersCacheState', + 'CastMethod', + 'ChangePasswordState', + 'ConfirmationOptions', + 'ConfirmerState', + 'RequestConfirmationError', + 'MusicConfettiState', + 'TrackEntity', + 'CollectionEntity', + 'EntityType', + 'BaseNotification', + 'DiscoveryBaseNotification', + 'DiscoveryAction', + 'DiscoveryAnnouncementNotificationAction', + 'DiscoveryFollowNotificationAction', + 'DiscoverySaveNotificationAction', + 'DiscoverySaveOfRepostNotificationAction', + 'DiscoveryRepostNotificationAction', + 'DiscoveryRepostOfRepostNotificationAction', + 'DiscoveryTastemakerNotificationAction', + 'DiscoveryTipSendNotificationAction', + 'DiscoveryTipReceiveNotificationAction', + 'DiscoveryAddTrackToPlaylistNotificationAction', + 'DiscoveryMilestoneFollowNotificationAction', + 'DiscoveryMilestoneTrackNotificationAction', + 'DiscoveryMilestonePlaylistNotificationAction', + 'DiscoveryRemixNotificationAction', + 'DiscoveryCosignNotificationAction', + 'DiscoverySupporterRankUpNotificationAction', + 'DiscoverySupportingRankUpNotificationAction', + 'DiscoverySupporterDethronedNotificationAction', + 'DiscoveryReactionNotificationAction', + 'DiscoveryChallengeRewardNotificationAction', + 'DiscoveryTierChangeNotificationAction', + 'DiscoveryCreateTrackNotificationAction', + 'DiscoveryCreatePlaylistNotificationAction', + 'DiscoveryUSDCPurchaseNotificationAction', + 'TrendingRange', + 'DiscoveryTrendingNotificationAction', + 'DiscoveryAnnouncementNotification', + 'DiscoveryFollowNotification', + 'DiscoverySaveNotification', + 'DiscoveryRepostNotification', + 'DiscoveryTastemakerNotification', + 'DiscoveryAddTrackToPlaylistNotification', + 'DiscoveryTipSendNotification', + 'DiscoveryTipReceiveNotification', + 'DiscoveryRemixNotification', + 'DiscoveryCosignNotification', + 'DiscoverySupporterRankUpNotification', + 'DiscoverySupportingRankUpNotification', + 'DiscoverySupporterDethronedNotification', + 'DiscoveryReactionNotification', + 'DiscoveryChallengeRewardNotification', + 'DiscoveryTierChangeNotification', + 'DiscoveryCreateNotification', + 'DiscoveryUSDCPurchaseBuyerNotification', + 'DiscoveryUSDCPurchaseSellerNotification', + 'DiscoveryTrendingPlaylistNotification', + 'DiscoveryTrendingNotification', + 'DiscoveryTrendingUndergroundNotification', + 'DiscoveryMilestoneNotification', + 'DiscoveryRepostOfRepostNotification', + 'DiscoverySaveOfRepostNotification', + 'DiscoveryNotification', + 'AnnouncementNotification', + 'UserSubscriptionNotification', + 'FollowNotification', + 'FollowPushNotification', + 'RepostNotification', + 'RepostPushNotification', + 'RepostOfRepostNotification', + 'RepostOfRepostPushNotification', + 'FavoriteOfRepostNotification', + 'FavoriteOfRepostPushNotification', + 'FavoriteNotification', + 'FavoritePushNotification', + 'MilestoneNotification', + 'MilestoneFollowPushNotification', + 'MilestoneListenPushNotification', + 'MilestoneRepostPushNotification', + 'MilestoneFavoritePushNotification', + 'RemixCreateNotification', + 'RemixCreatePushNotification', + 'RemixCosignNotification', + 'RemixCosignPushNotification', + 'TrendingPlaylistNotification', + 'TrendingTrackNotification', + 'TrendingUndergroundNotification', + 'TastemakerNotification', + 'ChallengeRewardNotification', + 'TierChangeNotification', + 'ReactionNotification', + 'ReactionPushNotification', + 'TipReceiveNotification', + 'TipReceivePushNotification', + 'TipSendNotification', + 'TipSendPushNotification', + 'SupporterRankUpNotification', + 'SupporterRankUpPushNotification', + 'SupportingRankUpNotification', + 'SupportingRankUpPushNotification', + 'SupporterDethronedNotification', + 'AddTrackToPlaylistNotification', + 'AddTrackToPlaylistPushNotification', + 'USDCPurchaseSellerNotification', + 'USDCPurchaseBuyerNotification', + 'Notification', + 'IdentityNotification', + 'NotificationsState', + 'AddNotificationsAction', + 'UpdateNotificationsAction', + 'FetchNotificationsAction', + 'FetchNotificationsFailedAction', + 'MessagePushNotification', + 'MessageReactionPushNotification', + 'AiPageState', + 'FetchAiUserAction', + 'TrendingRewardsModalType', + 'ChallengeRewardsModalType', + 'ClaimState', + 'AudioRewardsClaim', + 'UndisbursedUserChallenge', + 'ChatMessageTileProps', + 'CollectionTrack', + 'CollectionsPageState', + 'CollectionsPageType', + 'CollectionPageTrackRecord', + 'DeactivateAccountState', + 'ErrorState', + 'CollectionsState', + 'GetExplore', + 'ExploreContent', + 'FeedPageState', + 'HistoryPageState', + 'ProfilePageFollow', + 'ProfileState', + 'ProfilePageState', + 'ProfileUser', + 'LibraryCategoryType', + 'SavedPageState', + 'SavedPageTrack', + 'TrackRecord', + 'SavedPageCollection', + 'FetchSearchPageResultsAction', + 'FetchSearchPageResultsSuceededAction', + 'FetchSearchPageResultsFailedAction', + 'FetchSearchPageTagsSucceededAction', + 'FetchSearchPageTagsFailedAction', + 'FetchSearchPageTagsAction', + 'SearchPageActions', + 'SearchPageState', + 'ToggleNotificationSetting', + 'TogglePushNotificationSetting', + 'TogglePushNotificationSettingFailed', + 'RequestPushNotificationPermissions', + 'UpdateEmailFrequency', + 'GetNotificationSettings', + 'GetNotificationSettingsFailed', + 'SetNotificationSettings', + 'GetPushNotificationSettings', + 'GetPushNotificationSettingsFailed', + 'SetPushNotificationSettings', + 'SetBrowserNotificationPermission', + 'SetBrowserNotificationEnabled', + 'SetBrowserNotificationSettingsOn', + 'SetBrowserNotificationSettingsOff', + 'BrowserPushNotificationFailed', + 'SetAiAttribution', + 'SettingActions', + 'Notifications', + 'PushNotifications', + 'SettingsPageState', + 'SmartCollectionState', + 'ConnectWalletsState', + 'TokenDashboardPageModalState', + 'CanReceiveWAudio', + 'AssociatedWallet', + 'AssociatedWallets', + 'ConfirmRemoveWalletAction', + 'InputSendDataAction', + 'AssociatedWalletsState', + 'TokenDashboardState', + 'TrackPageState', + 'TrendingPageState', + 'PlaybackStatus', + 'PlaybackPositionInfo', + 'PlaybackPositionState', + 'PlayerState', + 'PlaybackRate', + 'PlaylistLibraryState', + 'UpdatePayload', + 'ReorderAction', + 'AddToFolderAction', + 'PlaylistUpdate', + 'PlaylistUpdateState', + 'PlaylistUpdatesReceivedAction', + 'UpdatedPlaylistViewedAction', + 'PurchaseContentErrorCode', + 'Queueable', + 'QueueItem', + 'ReachabilityState', + 'RecoveryEmailState', + 'CommonState', + 'RemixSettingsState', + 'RemoteConfigState', + 'StateWithRemoteConfig', + 'CollectionListState', + 'SavedCollectionsState', + 'CollectionType', + 'CommonStoreContext', + 'TippingSendStatus', + 'SupportersMapForUser', + 'SupportersMap', + 'SupportingMapForUser', + 'SupportingMap', + 'TippingState', + 'RefreshSupportPayloadAction', + 'AddToCollectionState', + 'AddToPlaylistState', + 'JupiterTokenListing', + 'JupiterTokenSymbol', + 'AmountObject', + 'CollectibleDetailsState', + 'OpenPayload', + 'DeletePlaylistConfirmationModalState', + 'OpenPayload', + 'DuplicateAddConfirmationModalState', + 'OpenOverflowMenuPayload', + 'OverflowActionCallbacks', + 'MobileOverflowModalState', + 'AddFundsModalState', + 'CoinflowPurchaseMetadata', + 'CoinflowOnrampModalState', + 'CoinflowWithdrawModalState', + 'CreateChatModalState', + 'BaseModalState', + 'FocusableFields', + 'EditPlaylistModalState', + 'EditTrackModalState', + 'InboxUnavailableModalState', + 'LeavingAudiusModalState', + 'PremiumContentPurchaseModalState', + 'Modals', + 'BasicModalsState', + 'StatefulModalsState', + 'ModalsState', + 'TrackModalOpenedActionPayload', + 'TrackModalClosedActionPayload', + 'USDCManualTransferModalState', + 'USDCPurchaseDetailsModalState', + 'USDCTransactionDetailsModalState', + 'WithdrawUSDCModalState', + 'NowPlayingState', + 'OpenPayload', + 'PublishPlaylistConfirmationModalState', + 'OpenPayload', + 'PublishTrackConfirmationState', + 'PublishTrackConfirmationModalState', + 'ReactionsState', + 'ReactionTypes', + 'RelatedArtists', + 'RelatedArtistsState', + 'SearchUsersModalState', + 'ShareType', + 'ShareContent', + 'ShareModalState', + 'ShareModalRequestOpenAction', + 'ShareModalOpenAction', + 'ShareSoundToTiktokModalTrack', + 'ShareSoundToTikTokModalState', + 'ShareSoundToTiktokModalAuthenticatedPayload', + 'ShareSoundToTiktokModalRequestOpenPayload', + 'ShareSoundToTiktokModalOpenPayload', + 'ShareSoundToTiktokModalSetStatusPayload', + 'StripeSessionStatus', + 'StripeFixedTransactionDetails', + 'StripeTransactionDetails', + 'StripeQuoteDetails', + 'StripeSessionData', + 'StripeDestinationCurrencyType', + 'StripeModalState', + 'StripeSessionCreationErrorResponseData', + 'ThemeState', + 'SetThemeAction', + 'SetSystemAppearanceAction', + 'ToastType', + 'Toast', + 'ToastState', + 'ToastAction', + 'AddToastAction', + 'DissmissToastAction', + 'ManualClearToastAction', + 'InAppAudioPurchaseMetadata', + 'TransactionDetails', + 'TransactionDetailsState', + 'OpenPayload', + 'UploadConfirmationState', + 'UploadConfirmationModalState', + 'VipDiscordModalState', + 'NativeFile', + 'UploadTrack', + 'ExtendedTrackMetadata', + 'ExtendedCollectionMetadata', + 'Progress', + 'ProgressState', + 'UploadState', + 'FavoritesOwnState', + 'FavoritesPageState', + 'FollowersOwnState', + 'FollowersPageState', + 'FollowingOwnState', + 'FollowingPageState', + 'MutualsOwnState', + 'MutualsPageState', + 'NotificationUsersPageOwnState', + 'NotificationUsersPageState', + 'RelatedArtistsOwnState', + 'RelatedArtistsPageState', + 'RepostsOwnState', + 'RepostsPageState', + 'SupportingOwnState', + 'SupportingPageState', + 'TopSupportersOwnState', + 'TopSupportersPageState', + 'UserListStoreState', + 'FetchUserIdsSaga', + 'BadgeTierInfo' ] getDirectories(async function (err, res) { diff --git a/packages/get-type-exports.js b/packages/get-type-exports.js index 477cc5cb980..6c771588ffc 100644 --- a/packages/get-type-exports.js +++ b/packages/get-type-exports.js @@ -2,7 +2,7 @@ const glob = require('glob') const fs = require('fs') var getDirectories = function (callback) { - glob('./common/dist/audius-client/**/*', callback) + glob('./common/dist/store/**/*', callback) } getDirectories(async function (err, res) { From 44b94fb74ff031fb1fb06ca895421a985541dd0f Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 17:38:32 -0800 Subject: [PATCH 47/64] store wip 1 --- packages/common/package.json | 3 +- packages/convert-exports.js | 2 +- packages/web/src/app/ThemeProvider.tsx | 2 +- packages/web/src/app/TrpcProvider.tsx | 2 +- packages/web/src/app/web-player/WebPlayer.jsx | 14 ++--- .../web/src/common/hooks/useModalState.ts | 4 +- packages/web/src/common/hooks/useSelector.ts | 3 +- .../web/src/common/store/account/sagas.js | 9 ++-- .../common/store/add-to-collection/sagas.ts | 7 +-- .../web/src/common/store/analytics/sagas.ts | 3 +- .../web/src/common/store/backend/sagas.ts | 7 +-- .../collections/addTrackToPlaylistSaga.ts | 17 +++--- .../store/cache/collections/commonSagas.js | 21 ++++---- .../cache/collections/confirmOrderPlaylist.js | 5 +- .../createPlaylistRequestedSaga.ts | 3 +- .../cache/collections/createPlaylistSaga.ts | 17 +++--- .../store/cache/collections/errorSagas.ts | 3 +- .../collections/fixInvalidTracksInPlaylist.js | 3 +- .../utils/addUsersFromCollections.ts | 7 +-- .../utils/getUnclaimedPlaylistId.ts | 3 +- .../utils/optimisticUpdateCollection.ts | 3 +- .../utils/processAndCacheCollections.ts | 7 ++- .../collections/utils/retrieveCollections.ts | 18 +++---- packages/web/src/common/store/cache/sagas.js | 5 +- .../web/src/common/store/cache/store.test.js | 7 +-- .../common/store/cache/tracks/sagaHelpers.ts | 3 +- .../src/common/store/cache/tracks/sagas.js | 7 +-- .../tracks/utils/fetchAndProcessRemixes.ts | 3 +- .../tracks/utils/fetchAndProcessStems.ts | 7 ++- .../store/cache/tracks/utils/helpers.ts | 7 +-- .../tracks/utils/processAndCacheTracks.ts | 3 +- .../cache/tracks/utils/retrieveTracks.ts | 13 ++--- .../web/src/common/store/cache/users/sagas.js | 9 ++-- .../src/common/store/change-password/sagas.ts | 3 +- .../web/src/common/store/lineup/sagas.d.ts | 3 +- packages/web/src/common/store/lineup/sagas.js | 9 ++-- .../checkForNewNotificationsSaga.ts | 7 +-- .../common/store/notifications/errorSagas.ts | 3 +- .../store/notifications/fetchNotifications.ts | 3 +- .../notifications/fetchNotificationsSaga.ts | 7 +-- .../parseAndProcessNotifications.ts | 9 ++-- .../notifications/refreshNotificationsSaga.ts | 3 +- .../src/common/store/notifications/sagas.ts | 3 +- .../store/pages/ai/lineups/tracks/sagas.ts | 3 +- .../web/src/common/store/pages/ai/sagas.ts | 3 +- .../common/store/pages/audio-rewards/sagas.ts | 15 +++--- .../store/pages/audio-rewards/store.test.ts | 11 ++-- .../store/pages/audio-transactions/sagas.ts | 14 ++--- .../store/pages/collection/lineups/sagas.js | 3 +- .../common/store/pages/collection/sagas.js | 5 +- .../store/pages/deactivate-account/sagas.ts | 11 ++-- .../pages/explore/exploreCollections/sagas.ts | 3 +- .../src/common/store/pages/explore/sagas.ts | 7 +-- .../common/store/pages/feed/lineup/sagas.ts | 5 +- .../web/src/common/store/pages/feed/sagas.ts | 3 +- .../store/pages/history/lineups/sagas.js | 3 +- .../premium-tracks/lineups/tracks/sagas.ts | 5 +- .../lineups/feed/retrieveUserReposts.ts | 3 +- .../store/pages/profile/lineups/feed/sagas.js | 7 +-- .../lineups/tracks/retrieveUserTracks.ts | 3 +- .../pages/profile/lineups/tracks/sagas.js | 9 ++-- .../lineups/tracks/watchUploadTracksSaga.ts | 3 +- .../remixes-page/lineups/tracks/sagas.ts | 3 +- .../common/store/pages/remixes-page/sagas.ts | 3 +- .../common/store/pages/saved/lineups/sagas.js | 11 ++-- .../web/src/common/store/pages/saved/sagas.ts | 9 ++-- .../pages/search-page/lineups/tracks/sagas.js | 7 +-- .../common/store/pages/search-page/sagas.js | 9 ++-- .../common/store/pages/settings/errorSagas.ts | 3 +- .../src/common/store/pages/settings/sagas.ts | 9 ++-- .../src/common/store/pages/signon/actions.ts | 3 +- .../src/common/store/pages/signon/sagas.js | 9 ++-- .../common/store/pages/signon/selectors.ts | 3 +- .../pages/token-dashboard/addWalletToUser.ts | 7 +-- .../token-dashboard/associateNewWallet.ts | 7 +-- .../pages/token-dashboard/checkIsNewWallet.ts | 7 +-- .../token-dashboard/getAccountMetadataCID.ts | 3 +- .../pages/token-dashboard/getWalletInfo.ts | 3 +- .../pages/token-dashboard/removeWalletSaga.ts | 11 ++-- .../store/pages/token-dashboard/sagas.ts | 3 +- .../common/store/pages/track/lineups/sagas.ts | 3 +- .../web/src/common/store/pages/track/sagas.js | 5 +- .../pages/trending-playlists/lineups/sagas.ts | 3 +- .../trending-underground/lineups/sagas.ts | 3 +- .../lineups/trending/retrieveTrending.ts | 3 +- .../pages/trending/lineups/trending/sagas.js | 3 +- .../web/src/common/store/player/errorSagas.ts | 3 +- packages/web/src/common/store/player/sagas.ts | 5 +- .../web/src/common/store/player/store.test.js | 3 +- .../common/store/playlist-library/sagas.ts | 7 +-- .../playlist-library/watchAddToFolderSaga.ts | 9 ++-- .../watchReorderLibrarySaga.ts | 11 ++-- .../playlistUpdatesPollingDaemon.ts | 3 +- .../common/store/playlist-updates/sagas.ts | 2 +- .../profile/fetchProfileCollectionsSaga.ts | 8 +-- .../common/store/profile/fetchTopTagsSaga.ts | 2 +- .../web/src/common/store/profile/sagas.js | 12 ++--- packages/web/src/common/store/queue/sagas.ts | 30 +++++------ .../web/src/common/store/queue/store.test.js | 4 +- .../src/common/store/recommendation/sagas.ts | 3 +- .../src/common/store/recovery-email/sagas.ts | 3 +- .../src/common/store/remix-settings/sagas.ts | 3 +- .../common/store/saved-collections/sagas.ts | 8 +-- .../src/common/store/search-ai-bar/sagas.ts | 3 +- .../web/src/common/store/search-bar/sagas.ts | 3 +- .../common/store/smart-collection/sagas.ts | 7 +-- .../store/social/collections/errorSagas.ts | 3 +- .../common/store/social/collections/sagas.ts | 17 +++--- .../store/social/collections/store.test.js | 3 +- .../common/store/social/tracks/errorSagas.ts | 3 +- .../store/social/tracks/recordListen.ts | 9 ++-- .../src/common/store/social/tracks/sagas.ts | 9 ++-- .../common/store/social/tracks/store.test.js | 6 ++- .../common/store/social/users/errorSagas.ts | 3 +- .../src/common/store/social/users/sagas.ts | 7 +-- .../common/store/social/users/store.test.js | 6 ++- .../web/src/common/store/tipping/sagas.ts | 11 ++-- .../src/common/store/ui/reactions/sagas.ts | 7 +-- .../web/src/common/store/upload/errorSagas.ts | 3 +- .../src/common/store/upload/sagaHelpers.ts | 7 ++- packages/web/src/common/store/upload/sagas.js | 17 +++--- .../store/user-list/favorites/errorSagas.ts | 3 +- .../common/store/user-list/favorites/sagas.ts | 3 +- .../store/user-list/followers/errorSagas.ts | 3 +- .../common/store/user-list/followers/sagas.ts | 5 +- .../store/user-list/following/errorSagas.ts | 3 +- .../common/store/user-list/following/sagas.ts | 3 +- .../store/user-list/mutuals/errorSagas.ts | 3 +- .../common/store/user-list/mutuals/sagas.ts | 3 +- .../user-list/notifications/errorSagas.ts | 3 +- .../store/user-list/notifications/sagas.ts | 3 +- .../user-list/related-artists/errorSagas.ts | 3 +- .../store/user-list/related-artists/sagas.ts | 5 +- .../store/user-list/reposts/errorSagas.ts | 3 +- .../common/store/user-list/reposts/sagas.ts | 5 +- .../store/user-list/supporting/errorSagas.ts | 3 +- .../store/user-list/supporting/sagas.ts | 7 +-- .../user-list/top-supporters/errorSagas.ts | 3 +- .../store/user-list/top-supporters/sagas.ts | 9 ++-- .../web/src/common/store/user-list/utils.ts | 7 +-- packages/web/src/common/store/wallet/sagas.ts | 9 ++-- .../web/src/common/utils/ensureLoggedIn.ts | 2 +- .../web/src/common/utils/requiresAccount.ts | 2 +- .../src/components/actions-tab/ActionsTab.jsx | 4 +- .../add-funds-modal/AddFundsModal.tsx | 12 +++-- .../desktop/AddToCollectionModal.tsx | 8 +-- .../mobile/AddToCollection.tsx | 12 +++-- .../AiAttributionDropdown.tsx | 4 +- .../ai-attribution-modal/SearchBarResult.jsx | 4 +- .../AiAttributionSettingsModal.tsx | 5 +- .../ArtistRecommendations.tsx | 14 ++--- .../ArtistRecommendationsPopup.tsx | 2 +- .../web/src/components/artist/ArtistCard.tsx | 2 +- .../artist/ArtistChipSupportFor.tsx | 2 +- .../artist/ArtistChipSupportFrom.tsx | 2 +- .../src/components/artist/ArtistPopover.tsx | 8 +-- .../components/artist/ArtistSupporting.tsx | 4 +- .../audio-balance-pill/AUDIOBalancePill.tsx | 2 +- .../AudioTransactionIcon.tsx | 2 +- .../AudioTransactionsTable.tsx | 6 +-- packages/web/src/components/avatar/Avatar.tsx | 2 +- .../src/components/avatar/AvatarLegacy.tsx | 2 +- .../banner/DirectMessagesBanner.tsx | 2 +- .../components/banner/DownloadAppBanner.tsx | 2 +- .../BrowserPushConfirmationModal.tsx | 8 +-- .../buy-audio-modal/BuyAudioModal.tsx | 2 +- .../components/AmountInputPage.tsx | 4 +- .../components/CoinbaseBuyAudioButton.tsx | 4 +- .../components/InProgressPage.tsx | 6 +-- .../components/PurchaseQuote.tsx | 2 +- .../components/StripeBuyAudioButton.tsx | 8 +-- .../components/SuccessPage.tsx | 10 ++-- .../card/desktop/CollectionArtCard.tsx | 8 +-- .../components/card/desktop/UserArtCard.tsx | 4 +- .../change-password/ChangePassword.tsx | 8 +-- .../change-password/ChangePasswordModal.tsx | 8 +-- .../change-password/ConfirmCredentials.tsx | 5 +- .../components/chat-listener/ChatListener.tsx | 2 +- .../CoinflowOnrampModal.tsx | 7 ++- .../components/CollectibleDetails.tsx | 8 +-- .../components/CollectibleDetailsModal.tsx | 14 ++--- .../components/CollectiblesPage.tsx | 12 +++-- .../components/collection/desktop/Artwork.tsx | 7 ++- .../collection/desktop/CollectionHeader.tsx | 4 +- .../collection/desktop/EditButton.tsx | 4 +- .../collection/desktop/FavoriteButton.tsx | 12 +++-- .../collection/desktop/OverflowMenuButton.tsx | 12 +++-- .../collection/desktop/OwnerActionButtons.tsx | 3 +- .../collection/desktop/PublishButton.tsx | 4 +- .../desktop/PublishConfirmationModal.tsx | 12 +++-- .../collection/desktop/RepostButton.tsx | 12 +++-- .../collection/desktop/ShareButton.tsx | 4 +- .../desktop/ViewerActionButtons.tsx | 3 +- .../collection/mobile/CollectionHeader.jsx | 4 +- .../confirmer-preview/ConfirmerPreview.tsx | 2 +- .../components/cookie-banner/CookieBanner.tsx | 4 +- .../data-entry/AccessAndSaleTriggerLegacy.tsx | 4 +- .../DeletePlaylistConfirmationModal.tsx | 4 +- .../download-buttons/DownloadButtons.tsx | 4 +- .../DuplicateAddConfirmationModal.tsx | 4 +- .../edit-folder-modal/EditFolderModal.tsx | 4 +- .../desktop/EditPlaylistModal.tsx | 2 +- .../edit-playlist/mobile/EditPlaylistPage.tsx | 16 +++--- .../components/edit-track/EditTrackModal.tsx | 14 ++--- .../components/embed-modal/store/selectors.ts | 6 ++- .../FeatureFlagOverrideModal.tsx | 4 +- .../first-upload-modal/FirstUploadModal.tsx | 4 +- .../image-selection/ImageSelectionPopup.jsx | 2 +- .../InboxUnavailableModal.tsx | 6 +-- .../LeavingAudiusModal.tsx | 4 +- .../src/components/lineup/LineupProvider.tsx | 8 +-- packages/web/src/components/lineup/hooks.ts | 12 +++-- .../web/src/components/link/ExternalLink.tsx | 4 +- packages/web/src/components/link/UserLink.tsx | 3 +- .../LockedContentModal.tsx | 4 +- .../src/components/menu/CollectionMenu.tsx | 10 ++-- .../web/src/components/menu/TrackMenu.tsx | 22 ++++---- packages/web/src/components/menu/UserMenu.tsx | 4 +- .../MobilePageContainer.tsx | 2 +- .../music-confetti/ConnectedMusicConfetti.tsx | 8 +-- .../components/nav/desktop/AccountDetails.tsx | 2 +- .../src/components/nav/desktop/LeftNav.tsx | 10 ++-- .../src/components/nav/desktop/NavButton.tsx | 4 +- .../src/components/nav/desktop/NavHeader.tsx | 6 +-- .../components/nav/desktop/NavPopupMenu.tsx | 2 +- .../nav/desktop/NowPlayingArtworkTile.tsx | 14 ++--- .../AudioNftPlaylistNavItem.tsx | 2 +- .../PlaylistLibrary/CollectionNavItem.tsx | 16 +++--- .../CreatePlaylistLibraryItemButton.tsx | 4 +- .../DeleteCollectionConfirmationModal.tsx | 4 +- .../DeleteFolderConfirmationModal.tsx | 4 +- .../PlaylistLibrary/EmptyLibraryNavLink.tsx | 2 +- .../PlaylistLibrary/PlaylistFolderNavItem.tsx | 10 ++-- .../PlaylistLibrary/PlaylistLibrary.tsx | 5 +- .../PlaylistLibrary/PlaylistNavItem.tsx | 2 +- .../useAddAudioNftPlaylistToLibrary.ts | 8 +-- .../useSanitizePlaylistLibrary.ts | 2 +- .../nav/mobile/ConnectedBottomBar.tsx | 2 +- .../components/nav/mobile/ConnectedNavBar.tsx | 4 +- .../web/src/components/nav/mobile/SignOut.tsx | 2 +- .../components/nav/mobile/TopLevelPage.tsx | 2 +- .../AddTrackToPlaylistNotification.tsx | 12 +++-- .../Notification/AnnouncementNotification.tsx | 4 +- .../ChallengeRewardNotification.tsx | 10 ++-- .../Notification/FavoriteNotification.tsx | 8 +-- .../FavoriteOfRepostNotification.tsx | 7 +-- .../Notification/FollowNotification.tsx | 4 +- .../Notification/MilestoneNotification.tsx | 8 +-- .../Notification/Notification.tsx | 7 ++- .../Notification/RemixCosignNotification.tsx | 12 +++-- .../Notification/RemixCreateNotification.tsx | 12 +++-- .../Notification/RepostNotification.tsx | 6 ++- .../RepostOfRepostNotification.tsx | 5 +- .../SupporterDethronedNotification.tsx | 8 +-- .../Notification/TastemakerNotification.tsx | 8 +-- .../Notification/TierChangeNotification.tsx | 7 +-- .../Notification/TipReactionNotification.tsx | 12 +++-- .../Notification/TipReceivedNotification.tsx | 16 +++--- .../Notification/TipSentNotification.tsx | 7 ++- .../Notification/TopSupporterNotification.tsx | 8 +-- .../TopSupportingNotification.tsx | 8 +-- .../TrendingPlaylistNotification.tsx | 12 +++-- .../TrendingTrackNotification.tsx | 8 +-- .../TrendingUndergroundNotification.tsx | 8 +-- .../USDCPurchaseBuyerNotification.tsx | 14 ++--- .../USDCPurchaseSellerNotification.tsx | 10 ++-- .../UserSubscriptionNotification.tsx | 8 +-- .../Notification/components/EntityLink.tsx | 4 +- .../components/NotificationTile.tsx | 4 +- .../components/Reaction/index.tsx | 4 +- .../Notification/components/TrackContent.tsx | 3 +- .../components/TwitterShareButton.tsx | 12 +++-- .../Notification/components/UserNameLink.tsx | 4 +- .../notification/Notification/utils.ts | 3 +- .../notification/NotificationModal.tsx | 3 +- .../notification/NotificationPage.tsx | 11 ++-- .../notification/NotificationPanel.tsx | 11 ++-- .../src/components/now-playing/NowPlaying.tsx | 18 ++++--- .../now-playing/NowPlayingDrawer.tsx | 4 +- .../on-ramp-button/OnRampButton.tsx | 3 +- .../password-reset/PasswordResetModal.tsx | 4 +- .../components/password-reset/store/sagas.tsx | 3 +- .../PinTrackConfirmation.tsx | 4 +- .../components/play-bar/PlayBarProvider.tsx | 2 +- .../components/play-bar/desktop/PlayBar.jsx | 24 ++++----- .../desktop/components/PlayingTrackInfo.tsx | 10 ++-- .../desktop/components/SocialActions.tsx | 10 ++-- .../components/play-bar/mobile/PlayBar.tsx | 12 ++--- .../next-button/NextButtonProvider.tsx | 2 +- .../PlaybackRateButton.tsx | 6 ++- .../PreviousButtonProvider.tsx | 2 +- .../PremiumContentPurchaseModal.tsx | 18 +++---- .../components/PurchaseContentFormFields.tsx | 4 +- .../components/PurchaseContentFormFooter.tsx | 7 ++- .../hooks/usePurchaseContentFormState.ts | 3 +- .../hooks/usePurchaseSummaryValues.ts | 3 +- .../ConnectedProfileCompletionHeroCard.jsx | 3 +- .../ConnectedProfileCompletionPane.jsx | 8 +-- .../PublishTrackConfirmationModal.tsx | 2 +- .../related-artists/RelatedArtists.tsx | 2 +- .../remix-card/ConnectedRemixCard.tsx | 2 +- .../ConnectedRemixSettingsModal.tsx | 7 ++- .../RewardClaimedToast.tsx | 8 +-- .../search-bar/ConnectedSearchBar.jsx | 4 +- .../search-users-modal/SearchUsersModal.tsx | 12 +++-- .../src/components/share-modal/ShareModal.tsx | 8 +-- .../src/components/share-modal/messages.ts | 3 +- .../web/src/components/share-modal/types.ts | 2 +- .../web/src/components/share-modal/utils.ts | 3 +- .../ShareSoundToTikTokModal.tsx | 6 +-- .../store/sagas.ts | 10 ++-- .../components/social-proof/SocialProof.tsx | 10 ++-- .../StripeOnRampModal.tsx | 7 ++- .../components/SuggestedTracks.tsx | 5 +- .../tiktok-auth/TikTokAuthButton.tsx | 2 +- .../tipping/feed-tip-tile/FeedTipTile.tsx | 8 +-- .../tipping/support/SupportingList.tsx | 4 +- .../tipping/support/SupportingTile.tsx | 4 +- .../tipping/support/TopSupporters.tsx | 8 +-- .../tipping/tip-audio/ConfirmSendTip.tsx | 4 +- .../components/tipping/tip-audio/SendTip.tsx | 20 +++---- .../tipping/tip-audio/TipAudioButton.tsx | 3 +- .../tipping/tip-audio/TipAudioModal.tsx | 12 +++-- .../components/tipping/tip-audio/TipSent.tsx | 4 +- packages/web/src/components/toast/Toast.tsx | 4 +- .../web/src/components/toast/ToastContext.tsx | 4 +- .../ConnectedMobileOverflowModal.tsx | 15 +++--- .../components/MobileOverflowModal.tsx | 3 +- .../src/components/track/AiTrackSection.tsx | 4 +- .../web/src/components/track/DownloadRow.tsx | 8 ++- .../src/components/track/DownloadSection.tsx | 12 +++-- .../components/track/GatedTrackSection.tsx | 14 ++--- .../src/components/track/GiantTrackTile.tsx | 12 +++-- .../track/GiantTrackTileProgressInfo.tsx | 7 +-- .../src/components/track/PlayPauseButton.tsx | 3 +- .../components/track/desktop/BottomRow.tsx | 4 +- .../track/desktop/ConnectedPlaylistTile.tsx | 18 ++++--- .../track/desktop/ConnectedTrackTile.tsx | 20 +++---- .../track/desktop/TrackListItem.tsx | 4 +- .../components/track/desktop/TrackTile.tsx | 12 +++-- .../track/desktop/stats/ProfileImage.tsx | 4 +- .../components/track/desktop/stats/Stats.tsx | 4 +- .../track/mobile/ConnectedPlaylistTile.tsx | 16 +++--- .../track/mobile/ConnectedTrackListItem.tsx | 12 +++-- .../track/mobile/ConnectedTrackTile.tsx | 14 ++--- .../src/components/track/mobile/TrackTile.tsx | 12 +++-- .../TransactionDetailsModal.tsx | 8 +-- .../components/TransactionDetailsContent.tsx | 7 +-- .../TransactionPurchaseMetadata.tsx | 3 +- .../TrendingGenreSelectionPage.tsx | 3 +- .../components/twitter-auth/TwitterAuth.tsx | 3 +- .../TwitterShareButton.tsx | 8 +-- .../UnfollowConfirmationModal.tsx | 3 +- .../components/unload-dialog/UnloadDialog.jsx | 4 +- .../UploadConfirmationModal.tsx | 4 +- .../web/src/components/upload/UploadChip.tsx | 2 +- .../USDCManualTransfer.tsx | 8 +-- .../USDCPurchaseDetailsModal.tsx | 3 +- .../components/SaleModalContent.tsx | 8 +-- .../USDCTransactionDetailsModal.tsx | 3 +- .../user-badges/FollowsYouBadge.tsx | 2 +- .../user-badges/ProfilePageBadge.tsx | 2 +- .../components/UserListModal.tsx | 24 ++++----- .../web/src/components/user-list/UserList.tsx | 8 +-- .../user-list/components/UserList.tsx | 8 +-- .../UserNameAndBadges.tsx | 4 +- .../components/welcome-modal/WelcomeModal.tsx | 2 +- .../withdraw-usdc-modal/WithdrawUSDCModal.tsx | 12 +++-- .../components/CoinflowWithdrawModal.tsx | 7 ++- .../components/ConfirmTransferDetails.tsx | 8 +-- .../components/EnterTransferDetails.tsx | 12 +++-- .../components/ErrorPage.tsx | 7 ++- .../components/PrepareTransfer.tsx | 8 +-- .../components/TransferSuccessful.tsx | 4 +- .../components/withdraw-usdc-modal/types.ts | 2 +- .../web/src/hooks/useAuthenticatedCallback.ts | 2 +- .../web/src/hooks/useCollectionCoverArt.ts | 2 +- packages/web/src/hooks/useCoverPhoto.ts | 2 +- packages/web/src/hooks/useRemoteConfig.ts | 2 +- packages/web/src/hooks/useRequiresAccount.ts | 2 +- packages/web/src/hooks/useTrackCoverArt.ts | 2 +- .../web/src/hooks/useUserProfilePicture.ts | 2 +- packages/web/src/hooks/wallet.tsx | 2 +- .../AiPageProvider.tsx | 12 +++-- .../audio-rewards-page/AudioRewardsPage.tsx | 4 +- .../ChallengeRewardsTile.tsx | 12 +++-- .../src/pages/audio-rewards-page/Tiers.tsx | 8 +-- .../src/pages/audio-rewards-page/Tiles.tsx | 6 ++- .../TrendingRewardsTile.tsx | 4 +- .../pages/audio-rewards-page/WalletModal.tsx | 14 ++--- .../components/ConnectWalletsBody.tsx | 8 +-- .../components/RemoveWalletBody.tsx | 8 +-- .../components/SendInputConfirmation.tsx | 4 +- .../components/WalletActionsTile.tsx | 6 ++- .../components/WalletManagementTile.tsx | 10 ++-- .../components/WalletsTable.tsx | 10 ++-- .../components/modals/AudioBreakdownModal.tsx | 6 ++- .../AudioMatchingRewardsModalContent.tsx | 4 +- .../ChallengeRewardsModal.tsx | 10 ++-- .../components/modals/HCaptchaModal.tsx | 4 +- .../components/modals/TrendingRewards.tsx | 12 +++-- .../components/modals/VipDiscordModal.tsx | 3 +- .../AudioTransactionsPage.tsx | 12 ++--- packages/web/src/pages/chat-page/ChatPage.tsx | 2 +- .../components/BlockUserConfirmationModal.tsx | 2 +- .../chat-page/components/ChatComposer.tsx | 2 +- .../pages/chat-page/components/ChatHeader.tsx | 2 +- .../pages/chat-page/components/ChatList.tsx | 2 +- .../chat-page/components/ChatListItem.tsx | 2 +- .../chat-page/components/ChatMessageList.tsx | 6 ++- .../components/ChatMessageListItem.tsx | 6 +-- .../components/ChatMessagePlaylist.tsx | 18 +++---- .../chat-page/components/ChatMessageTrack.tsx | 12 ++--- .../chat-page/components/CreateChatModal.tsx | 16 +++--- .../chat-page/components/CreateChatPrompt.tsx | 2 +- .../components/CreateChatUserResult.tsx | 10 ++-- .../DeleteChatConfirmationModal.tsx | 2 +- .../components/InboxUnavailableMessage.tsx | 2 +- .../chat-page/components/LinkPreview.tsx | 2 +- .../components/ReactionPopupMenu.tsx | 2 +- .../UnblockUserConfirmationModal.tsx | 2 +- .../web/src/pages/check-page/CheckPage.tsx | 4 +- .../CollectiblesPlaylistPageProvider.tsx | 24 +++++---- .../pages/collection-page/CollectionPage.tsx | 2 +- .../CollectionPageProvider.tsx | 52 +++++++++--------- .../components/desktop/CollectionPage.tsx | 10 ++-- .../components/mobile/CollectionPage.tsx | 10 ++-- .../pages/dashboard-page/DashboardPage.tsx | 4 +- .../src/pages/dashboard-page/store/sagas.ts | 7 ++- .../pages/dashboard-page/store/selectors.ts | 3 +- .../DeactivateAccountPage.tsx | 4 +- .../deleted-page/DeletedPageProvider.tsx | 8 +-- .../store/lineups/more-by/actions.ts | 2 +- .../store/lineups/more-by/reducer.ts | 3 +- .../store/lineups/more-by/sagas.ts | 3 +- .../web/src/pages/deleted-page/store/slice.ts | 3 +- .../web/src/pages/demo-trpc/DemoTrpcPage.tsx | 2 +- .../explore-page/ExploreCollectionsPage.tsx | 2 +- .../ExploreCollectionsPageProvider.tsx | 10 ++-- .../src/pages/explore-page/ExplorePage.tsx | 2 +- .../explore-page/ExplorePageProvider.tsx | 6 +-- .../web/src/pages/explore-page/collections.ts | 2 +- .../components/desktop/ExplorePage.tsx | 2 +- .../components/mobile/ExplorePage.tsx | 12 ++--- .../pages/favorites-page/FavoritesPage.tsx | 2 +- .../src/pages/fb-share-page/FbSharePage.tsx | 2 +- .../src/pages/feed-page/FeedPageProvider.jsx | 8 +-- .../components/desktop/FeedPageContent.tsx | 2 +- .../components/mobile/FeedPageContent.tsx | 2 +- .../pages/followers-page/FollowersPage.tsx | 4 +- .../pages/following-page/FollowingPage.tsx | 2 +- .../history-page/HistoryPageProvider.tsx | 18 +++---- packages/web/src/pages/modals/AppModal.tsx | 2 +- packages/web/src/pages/modals/Modals.tsx | 4 +- .../web/src/pages/modals/useModalState.ts | 2 +- .../src/pages/not-found-page/NotFoundPage.tsx | 2 +- .../NotificationUsersPage.tsx | 2 +- .../pages/oauth-login-page/OAuthLoginPage.tsx | 2 +- .../web/src/pages/oauth-login-page/hooks.ts | 2 +- .../pay-and-earn-page/PayAndEarnPage.tsx | 2 +- .../components/PurchasesTab.tsx | 5 +- .../pay-and-earn-page/components/SalesTab.tsx | 5 +- .../pay-and-earn-page/components/USDCCard.tsx | 6 +-- .../components/WithdrawalsTab.tsx | 12 ++--- .../desktop/PayAndEarnPage.tsx | 2 +- .../mobile/PayAndEarnPage.tsx | 2 +- .../premium-tracks-page/PremiumTracksPage.tsx | 6 +-- .../profile-page/ProfilePageProvider.tsx | 54 +++++++++---------- .../components/desktop/ProfileLeftNav.tsx | 2 +- .../components/desktop/ProfileMutuals.tsx | 2 +- .../components/desktop/ProfilePage.tsx | 14 ++--- .../components/desktop/ProfileTopTags.tsx | 2 +- .../components/mobile/ProfilePage.tsx | 14 ++--- .../components/mobile/ShareUserButton.tsx | 2 +- .../pages/profile-page/useProfileParams.ts | 2 +- .../remixes-page/RemixesPageProvider.tsx | 12 +++-- .../src/pages/reposts-page/RepostsPage.tsx | 5 +- .../pages/saved-page/SavedPageProvider.tsx | 36 ++++++------- .../components/desktop/AlbumsTabPage.tsx | 10 ++-- .../components/desktop/CollectionCard.tsx | 4 +- .../desktop/LibraryCategorySelectionMenu.tsx | 10 ++-- .../components/desktop/PlaylistsTabPage.tsx | 14 ++--- .../components/desktop/SavedPage.tsx | 14 ++--- .../components/mobile/NewPlaylistButton.tsx | 2 +- .../components/mobile/SavedPage.tsx | 20 +++---- .../saved-page/hooks/useCollectionsData.tsx | 12 ++--- .../pages/search-page/SearchPageProvider.jsx | 10 ++-- .../components/desktop/SearchPageContent.jsx | 4 +- .../components/mobile/SearchPageContent.tsx | 2 +- packages/web/src/pages/search-page/helpers.ts | 2 +- .../settings-page/SettingsPageProvider.tsx | 20 +++---- .../DeveloperApps/CreateNewAppPage.tsx | 2 +- .../DeleteAppConfirmationPage.tsx | 2 +- .../desktop/DeveloperApps/YourAppsPage.tsx | 2 +- .../desktop/NotificationSettings.tsx | 8 +-- .../components/desktop/SettingsPage.tsx | 14 ++--- .../components/desktop/VerificationModal.tsx | 12 ++--- .../components/mobile/ChangePasswordPage.tsx | 8 +-- .../mobile/NotificationsSettingsPage.tsx | 2 +- .../components/mobile/SettingsPage.tsx | 20 +++---- .../components/mobile/VerificationPage.tsx | 6 ++- .../pages/settings-page/store/errorSagas.ts | 2 +- .../src/pages/settings-page/store/sagas.ts | 6 +-- .../pages/settings-page/store/selectors.ts | 2 +- packages/web/src/pages/sign-on/SignOn.tsx | 2 +- .../web/src/pages/sign-on/SignOnProvider.tsx | 10 ++-- .../components/CompleteProfileWithSocial.tsx | 6 ++- .../pages/sign-on/components/ProfilePage.tsx | 12 ++--- .../sign-on/components/desktop/SignOnPage.tsx | 12 +++-- .../sign-on/components/mobile/SignOnPage.tsx | 12 +++-- .../sign-up-page/components/AccountHeader.tsx | 2 +- .../components/CoverPhotoBanner.tsx | 2 +- .../components/SignupFlowInstagramAuth.tsx | 2 +- .../components/SignupFlowTikTokAuth.tsx | 2 +- .../components/SignupFlowTwitterAuth.tsx | 2 +- .../sign-up-page/hooks/socialMediaLogin.ts | 6 ++- .../utils/selectArtistsPreviewContext.tsx | 2 +- .../utils/useDetermineAllowedRoutes.ts | 2 +- .../smart-collection/SmartCollectionPage.tsx | 4 +- .../pages/supporting-page/SupportingPage.tsx | 4 +- .../top-supporters-page/TopSupportersPage.tsx | 2 +- .../pages/track-page/TrackPageProvider.tsx | 38 ++++++------- .../components/desktop/TrackPage.tsx | 2 +- .../components/mobile/TrackHeader.tsx | 2 +- .../components/mobile/TrackPage.tsx | 10 ++-- .../trending-page/TrendingPageProvider.jsx | 14 ++--- .../components/RewardsBanner.tsx | 4 +- .../desktop/TrendingPageContent.tsx | 4 +- .../components/mobile/TrendingPageContent.tsx | 4 +- .../TrendingPlaylistPage.tsx | 2 +- .../TrendingUndergroundPage.tsx | 8 +-- .../web/src/pages/upload-page/UploadPage.tsx | 8 +-- .../upload-page/components/ShareBanner.tsx | 14 ++--- .../upload-page/components/TracksPreview.tsx | 2 +- .../upload-page/fields/AccessAndSaleField.tsx | 2 +- .../RemixSettingsMenuFields.tsx | 2 +- .../availability/SpecialAccessFields.tsx | 2 +- .../CollectibleGatedDescription.tsx | 2 +- .../CollectibleGatedFields.tsx | 2 +- .../CollectibleGatedRadioField.tsx | 2 +- .../upload-page/forms/EditCollectionForm.tsx | 2 +- .../src/pages/upload-page/pages/EditPage.tsx | 2 +- .../pages/upload-page/pages/FinishPage.tsx | 14 ++--- .../pages/upload-page/pages/SelectPage.tsx | 2 +- packages/web/src/pages/upload-page/types.ts | 2 +- .../utils/uploadPreviewContext.tsx | 2 +- .../pages/visualizer/VisualizerProvider.tsx | 16 +++--- .../src/services/audio-player/AudioPlayer.ts | 2 +- .../src/services/audius-backend/BuyAudio.ts | 2 +- .../src/services/audius-backend/Jupiter.ts | 2 +- .../web/src/ssr/track/+onBeforeRender.tsx | 1 - packages/web/src/store/account/sagas.ts | 6 +-- packages/web/src/store/analytics/sagas.ts | 2 +- .../store/application/ui/buy-audio/sagas.ts | 36 ++++++------- .../src/store/application/ui/chat/sagas.ts | 2 +- .../notifications/notificationsUISelectors.ts | 6 +-- .../store/application/ui/stemsUpload/sagas.ts | 4 +- .../src/store/application/ui/theme/sagas.ts | 2 +- .../application/ui/userListModal/sagas.ts | 8 +-- .../application/ui/withdraw-usdc/sagas.ts | 22 ++++---- packages/web/src/store/configureStore.ts | 2 +- packages/web/src/store/errors/sagas.ts | 2 +- .../web/src/store/lineup/lineupForRoute.js | 4 +- packages/web/src/store/lineup/store.test.js | 6 +-- packages/web/src/store/notifications/sagas.ts | 2 +- packages/web/src/store/reachability/sagas.ts | 2 +- packages/web/src/store/reducers.ts | 4 +- packages/web/src/store/sagas.ts | 30 +++++------ packages/web/src/store/sign-out/sagas.ts | 10 ++-- packages/web/src/store/storeContext.ts | 2 +- .../token-dashboard/connectNewWalletSaga.ts | 2 +- .../establishWalletConnection.ts | 2 +- .../web/src/store/token-dashboard/sagas.ts | 8 +-- .../src/store/token-dashboard/signMessage.ts | 10 ++-- packages/web/src/store/types.ts | 22 ++++---- .../web/src/utils/route/userRouteParser.ts | 2 +- packages/web/src/utils/sagaPollingDaemons.ts | 2 +- 577 files changed, 2156 insertions(+), 1596 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 8a8bf952c57..a4c2993b3a6 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -18,7 +18,8 @@ "./schemas": "./src/schemas/index.ts", "./services": "./src/services/index.ts", "./audius-query": "./src/audius-query/index.ts", - "./assets": "./src/assets/index.ts" + "./assets": "./src/assets/index.ts", + "./store": "./src/store/index.ts" }, "repository": { "type": "git", diff --git a/packages/convert-exports.js b/packages/convert-exports.js index f199b977e4e..cd9eeb4d1aa 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -824,7 +824,7 @@ getDirectories(async function (err, res) { let match = content.match(regex)?.[2] if (match) { - matches.push(exportName) + matches.push(match.replace(',', '')) // Delete old import newContent = newContent.replace(regex, '$1$4') diff --git a/packages/web/src/app/ThemeProvider.tsx b/packages/web/src/app/ThemeProvider.tsx index 85432ab6d1b..ef629dfe8e0 100644 --- a/packages/web/src/app/ThemeProvider.tsx +++ b/packages/web/src/app/ThemeProvider.tsx @@ -1,7 +1,7 @@ import { ReactNode } from 'react' -import { themeSelectors } from '@audius/common' import { Theme, SystemAppearance } from '@audius/common/models' +import { themeSelectors } from '@audius/common/store' import { ThemeProvider as HarmonyThemeProvider } from '@audius/harmony' import { AppState } from 'store/types' diff --git a/packages/web/src/app/TrpcProvider.tsx b/packages/web/src/app/TrpcProvider.tsx index 04fcf47bd1c..2d12208dd31 100644 --- a/packages/web/src/app/TrpcProvider.tsx +++ b/packages/web/src/app/TrpcProvider.tsx @@ -1,6 +1,6 @@ import { ReactNode, useMemo, useState } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { useSelector } from 'react-redux' diff --git a/packages/web/src/app/web-player/WebPlayer.jsx b/packages/web/src/app/web-player/WebPlayer.jsx index 82a7556c11d..34595c0709f 100644 --- a/packages/web/src/app/web-player/WebPlayer.jsx +++ b/packages/web/src/app/web-player/WebPlayer.jsx @@ -1,12 +1,5 @@ import { lazy, Component, Suspense } from 'react' -import { - accountSelectors, - ExploreCollectionsVariant, - themeSelectors, - themeActions, - UploadType -} from '@audius/common' import { Name, Client, @@ -15,6 +8,13 @@ import { Theme } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + ExploreCollectionsVariant, + themeActions, + themeSelectors, + UploadType +} from '@audius/common/store' import cn from 'classnames' import { connect } from 'react-redux' import { matchPath } from 'react-router' diff --git a/packages/web/src/common/hooks/useModalState.ts b/packages/web/src/common/hooks/useModalState.ts index 0fc72e53b15..bc36e895684 100644 --- a/packages/web/src/common/hooks/useModalState.ts +++ b/packages/web/src/common/hooks/useModalState.ts @@ -1,6 +1,8 @@ import { useCallback, useMemo } from 'react' -import { modalsSelectors, modalsActions, Modals } from '@audius/common' +import { modalsSelectors, modalsActions, Modals } from '@audius/common/store' + +import {} from '@audius/common' import { useDispatch } from 'react-redux' import { useSelector } from './useSelector' diff --git a/packages/web/src/common/hooks/useSelector.ts b/packages/web/src/common/hooks/useSelector.ts index fe030c43140..6fb617aadba 100644 --- a/packages/web/src/common/hooks/useSelector.ts +++ b/packages/web/src/common/hooks/useSelector.ts @@ -1,4 +1,5 @@ -import { CommonState } from '@audius/common' +import { CommonState } from '@audius/common/store' +import {} from '@audius/common' import { useSelector as untypedUseSelector, TypedUseSelectorHook diff --git a/packages/web/src/common/store/account/sagas.js b/packages/web/src/common/store/account/sagas.js index 1c66cc1cb21..4830341f991 100644 --- a/packages/web/src/common/store/account/sagas.js +++ b/packages/web/src/common/store/account/sagas.js @@ -1,12 +1,13 @@ import { + accountActions, accountSelectors, cacheActions, profilePageActions, - accountActions, + chatActions, solanaSelectors, - getContext, - chatActions -} from '@audius/common' + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { ErrorLevel, Kind } from '@audius/common/models' import { FeatureFlags, diff --git a/packages/web/src/common/store/add-to-collection/sagas.ts b/packages/web/src/common/store/add-to-collection/sagas.ts index 3e05163dac1..966f1a5f660 100644 --- a/packages/web/src/common/store/add-to-collection/sagas.ts +++ b/packages/web/src/common/store/add-to-collection/sagas.ts @@ -1,8 +1,9 @@ import { accountActions, - modalsActions, - addToCollectionUIActions as actions -} from '@audius/common' + addToCollectionUIActions as actions, + modalsActions +} from '@audius/common/store' +import {} from '@audius/common' import { takeEvery, put } from 'redux-saga/effects' import { requiresAccount } from 'common/utils/requiresAccount' diff --git a/packages/web/src/common/store/analytics/sagas.ts b/packages/web/src/common/store/analytics/sagas.ts index 9848fc716b7..f3144755e9a 100644 --- a/packages/web/src/common/store/analytics/sagas.ts +++ b/packages/web/src/common/store/analytics/sagas.ts @@ -1,4 +1,5 @@ -import { getContext } from '@audius/common' +import { getContext } from '@audius/common/store' +import {} from '@audius/common' import { omit } from 'lodash' import { takeEvery, call } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/backend/sagas.ts b/packages/web/src/common/store/backend/sagas.ts index 00d9de31b40..497cc1aefa2 100644 --- a/packages/web/src/common/store/backend/sagas.ts +++ b/packages/web/src/common/store/backend/sagas.ts @@ -1,9 +1,10 @@ import { + accountActions, reachabilityActions, reachabilitySelectors, - getContext, - accountActions -} from '@audius/common' + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { put, all, diff --git a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts index b6e20725077..284216187d0 100644 --- a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts @@ -1,16 +1,17 @@ import { - cacheCollectionsSelectors, cacheCollectionsActions, - PlaylistOperations, + cacheCollectionsSelectors, + cacheTracksSelectors, cacheActions, - getContext, + PlaylistOperations, + reformatCollection, audioRewardsPageActions, - cacheTracksSelectors, + toastActions, + getContext, confirmerActions, - confirmTransaction, - reformatCollection, - toastActions -} from '@audius/common' + confirmTransaction +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Kind, Collection, ID } from '@audius/common/models' import { makeUid, diff --git a/packages/web/src/common/store/cache/collections/commonSagas.js b/packages/web/src/common/store/cache/collections/commonSagas.js index 3f060dedd05..11847f4f04c 100644 --- a/packages/web/src/common/store/cache/collections/commonSagas.js +++ b/packages/web/src/common/store/cache/collections/commonSagas.js @@ -1,20 +1,21 @@ import { - accountSelectors, accountActions, - cacheCollectionsSelectors, + accountSelectors, cacheCollectionsActions as collectionActions, + cacheCollectionsSelectors, + cacheTracksSelectors, + cacheActions, PlaylistOperations, + reformatCollection, cacheUsersSelectors, - cacheActions, - getContext, + savedPageActions, + LibraryCategory, toastActions, - cacheTracksSelectors, + getContext, confirmerActions, - LibraryCategory, - confirmTransaction, - reformatCollection, - savedPageActions -} from '@audius/common' + confirmTransaction +} from '@audius/common/store' +import {} from '@audius/common' import { Name, DefaultSizes, Kind } from '@audius/common/models' import { squashNewLines, diff --git a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js index 42ed35e431b..8e143373508 100644 --- a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js +++ b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js @@ -1,11 +1,12 @@ import { cacheCollectionsActions as collectionActions, - PlaylistOperations, cacheActions, + PlaylistOperations, getContext, confirmerActions, confirmTransaction -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { makeKindId } from '@audius/common/utils' import { call, put } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts index 8f743907d4f..547d4283581 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts @@ -2,7 +2,8 @@ import { cacheCollectionsActions, cacheCollectionsSelectors, toastActions -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { push } from 'connected-react-router' import { put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts index 641f3f5ef54..9f16a0ce412 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts @@ -1,20 +1,21 @@ import { - EditPlaylistValues, accountActions, accountSelectors, - cacheUsersSelectors, - cacheActions, cacheCollectionsActions, cacheCollectionsSelectors, cacheTracksSelectors, + cacheActions, + reformatCollection, + cacheUsersSelectors, + savedPageActions, + LibraryCategory, getContext, confirmerActions, confirmTransaction, - RequestConfirmationError, - reformatCollection, - savedPageActions, - LibraryCategory -} from '@audius/common' + EditPlaylistValues, + RequestConfirmationError +} from '@audius/common/store' +import {} from '@audius/common' import { Name, DefaultSizes, diff --git a/packages/web/src/common/store/cache/collections/errorSagas.ts b/packages/web/src/common/store/cache/collections/errorSagas.ts index 99680a1c359..62bc3f2b70d 100644 --- a/packages/web/src/common/store/cache/collections/errorSagas.ts +++ b/packages/web/src/common/store/cache/collections/errorSagas.ts @@ -1,4 +1,5 @@ -import { cacheCollectionsActions } from '@audius/common' +import { cacheCollectionsActions } from '@audius/common/store' +import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js b/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js index 6bd2736bd47..b421fa40295 100644 --- a/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js +++ b/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js @@ -2,7 +2,8 @@ import { accountSelectors, cacheCollectionsSelectors, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { call, select } from 'redux-saga/effects' import { waitForWrite } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts index c9a52c5bdfa..b780edb53fa 100644 --- a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts @@ -1,9 +1,10 @@ import { accountSelectors, cacheActions, - getContext, - reformatUser -} from '@audius/common' + reformatUser, + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Kind, UserCollectionMetadata } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { uniqBy } from 'lodash' diff --git a/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts b/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts index 6c329f1d29f..b02f1edae6a 100644 --- a/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts +++ b/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts @@ -1,4 +1,5 @@ -import { getContext } from '@audius/common' +import { getContext } from '@audius/common/store' +import {} from '@audius/common' import { decodeHashId } from '@audius/common/utils' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts b/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts index 6caea7a06cd..f75d7689305 100644 --- a/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts +++ b/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts @@ -1,4 +1,5 @@ -import { cacheActions } from '@audius/common' +import { cacheActions } from '@audius/common/store' +import {} from '@audius/common' import { Kind, Collection } from '@audius/common/models' import { put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts index ad74059ce4f..67a560e28df 100644 --- a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts @@ -1,4 +1,9 @@ -import { cacheActions, getContext, reformatCollection } from '@audius/common' +import { + cacheActions, + reformatCollection, + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Kind, CollectionMetadata, diff --git a/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts b/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts index 0ee87a31e51..6256e205536 100644 --- a/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/retrieveCollections.ts @@ -1,12 +1,3 @@ -import { - accountSelectors, - cacheCollectionsSelectors, - cacheSelectors, - CommonState, - getContext, - cacheCollectionsActions, - reformatCollection -} from '@audius/common' import { Kind, CollectionMetadata, @@ -14,6 +5,15 @@ import { UserCollectionMetadata, ID } from '@audius/common/models' +import { + accountSelectors, + cacheCollectionsActions, + cacheCollectionsSelectors, + cacheSelectors, + reformatCollection, + getContext, + CommonState +} from '@audius/common/store' import { makeUid, Nullable } from '@audius/common/utils' import { chunk } from 'lodash' import { all, call, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/sagas.js b/packages/web/src/common/store/cache/sagas.js index 2f35665f7e8..adc63704c39 100644 --- a/packages/web/src/common/store/cache/sagas.js +++ b/packages/web/src/common/store/cache/sagas.js @@ -1,9 +1,10 @@ import { cacheActions, - cacheSelectors, cacheConfig, + cacheSelectors, confirmerSelectors -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Status } from '@audius/common/models' import { IntKeys, FeatureFlags } from '@audius/common/services' import { makeUids, getIdFromKindId } from '@audius/common/utils' diff --git a/packages/web/src/common/store/cache/store.test.js b/packages/web/src/common/store/cache/store.test.js index fcfada9c3b9..4f4385e7346 100644 --- a/packages/web/src/common/store/cache/store.test.js +++ b/packages/web/src/common/store/cache/store.test.js @@ -1,8 +1,9 @@ import { cacheActions as actions, - cacheReducer, - cacheConfig as config -} from '@audius/common' + cacheConfig as config, + cacheReducer +} from '@audius/common/store' +import {} from '@audius/common' import { Kind, Status } from '@audius/common/models' import { makeKindId } from '@audius/common/utils' /* eslint-disable no-import-assign */ diff --git a/packages/web/src/common/store/cache/tracks/sagaHelpers.ts b/packages/web/src/common/store/cache/tracks/sagaHelpers.ts index 9c229201502..7f0f4ab57af 100644 --- a/packages/web/src/common/store/cache/tracks/sagaHelpers.ts +++ b/packages/web/src/common/store/cache/tracks/sagaHelpers.ts @@ -1,4 +1,5 @@ -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' +import {} from '@audius/common' import { Name, TrackAccessType, diff --git a/packages/web/src/common/store/cache/tracks/sagas.js b/packages/web/src/common/store/cache/tracks/sagas.js index 2d924dfdf61..716a1518ce4 100644 --- a/packages/web/src/common/store/cache/tracks/sagas.js +++ b/packages/web/src/common/store/cache/tracks/sagas.js @@ -1,13 +1,14 @@ import { accountSelectors, averageColorActions, - cacheTracksSelectors, cacheTracksActions as trackActions, - cacheUsersSelectors, + cacheTracksSelectors, cacheActions, + cacheUsersSelectors, confirmerActions, confirmTransaction -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Name, DefaultSizes, SquareSizes, Kind } from '@audius/common/models' import { formatUrlName, diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts index 85048a6da69..4f8d5834093 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts @@ -3,7 +3,8 @@ import { cacheTracksSelectors, cacheActions, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind, ID, UserTrackMetadata } from '@audius/common/models' import { removeNullable, waitForValue } from '@audius/common/utils' import { select, call, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts index 9887893f152..a8278b5946f 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts @@ -1,4 +1,9 @@ -import { cacheTracksSelectors, cacheActions, getContext } from '@audius/common' +import { + cacheTracksSelectors, + cacheActions, + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Kind, StemCategory, diff --git a/packages/web/src/common/store/cache/tracks/utils/helpers.ts b/packages/web/src/common/store/cache/tracks/utils/helpers.ts index af500914619..0c75eb6a378 100644 --- a/packages/web/src/common/store/cache/tracks/utils/helpers.ts +++ b/packages/web/src/common/store/cache/tracks/utils/helpers.ts @@ -1,9 +1,10 @@ import { accountSelectors, cacheActions, - getContext, - reformatUser -} from '@audius/common' + reformatUser, + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Kind, TrackMetadata, User } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { uniqBy } from 'lodash' diff --git a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts index 7ae4f736b25..6d656083964 100644 --- a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts +++ b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts @@ -1,4 +1,5 @@ -import { cacheActions, getContext } from '@audius/common' +import { cacheActions, getContext } from '@audius/common/store' +import {} from '@audius/common' import { Kind, TrackMetadata, Track } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { put, call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts b/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts index 149f8e4604a..8d7fab8f9ca 100644 --- a/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts +++ b/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts @@ -1,13 +1,14 @@ import { accountSelectors, - CommonState, - getContext, - cacheSelectors, - cacheTracksSelectors, cacheTracksActions, + cacheTracksSelectors, + cacheSelectors, + trackPageActions, trackPageSelectors, - trackPageActions -} from '@audius/common' + getContext, + CommonState +} from '@audius/common/store' +import {} from '@audius/common' import { Kind, ID, diff --git a/packages/web/src/common/store/cache/users/sagas.js b/packages/web/src/common/store/cache/users/sagas.js index c2c2700a8ce..a2aa186b460 100644 --- a/packages/web/src/common/store/cache/users/sagas.js +++ b/packages/web/src/common/store/cache/users/sagas.js @@ -1,11 +1,12 @@ import { accountSelectors, + cacheUsersActions as userActions, cacheActions, - cacheUsersSelectors, cacheReducer, - cacheUsersActions as userActions, - reformatUser -} from '@audius/common' + reformatUser, + cacheUsersSelectors +} from '@audius/common/store' +import {} from '@audius/common' import { DefaultSizes, Kind } from '@audius/common/models' import { waitForValue, waitForAccount } from '@audius/common/utils' import { mergeWith } from 'lodash' diff --git a/packages/web/src/common/store/change-password/sagas.ts b/packages/web/src/common/store/change-password/sagas.ts index 32ca60b8636..afe9c2d98f6 100644 --- a/packages/web/src/common/store/change-password/sagas.ts +++ b/packages/web/src/common/store/change-password/sagas.ts @@ -1,4 +1,5 @@ -import { changePasswordActions, getContext } from '@audius/common' +import { changePasswordActions, getContext } from '@audius/common/store' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { call, put, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/lineup/sagas.d.ts b/packages/web/src/common/store/lineup/sagas.d.ts index 16d7ab9fad0..68e5506c97b 100644 --- a/packages/web/src/common/store/lineup/sagas.d.ts +++ b/packages/web/src/common/store/lineup/sagas.d.ts @@ -1,4 +1,5 @@ -import { LineupBaseActions } from '@audius/common' +import { LineupBaseActions } from '@audius/common/store' +import {} from '@audius/common' import { Collection, LineupState, LineupTrack } from '@audius/common/models' export class LineupSagas { diff --git a/packages/web/src/common/store/lineup/sagas.js b/packages/web/src/common/store/lineup/sagas.js index e59a8b8a607..3588be98638 100644 --- a/packages/web/src/common/store/lineup/sagas.js +++ b/packages/web/src/common/store/lineup/sagas.js @@ -1,16 +1,17 @@ import { + accountSelectors, cacheCollectionsSelectors, cacheTracksSelectors, cacheActions, cacheUsersSelectors, lineupActions as baseLineupActions, + premiumTracksPageLineupActions, queueActions, - playerSelectors, queueSelectors, getContext, - premiumTracksPageLineupActions, - accountSelectors -} from '@audius/common' + playerSelectors +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Kind, isContentUSDCPurchaseGated } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' import { Uid, makeUids, makeUid } from '@audius/common/utils' diff --git a/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts b/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts index 7d74c37bb5f..35a3cdfcdb3 100644 --- a/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts @@ -1,11 +1,12 @@ import { accountSelectors, - Notification, notificationsActions, notificationsSelectors, NotificationType, - walletActions -} from '@audius/common' + walletActions, + Notification +} from '@audius/common/store' +import {} from '@audius/common' import { Dictionary } from '@reduxjs/toolkit' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/errorSagas.ts b/packages/web/src/common/store/notifications/errorSagas.ts index 8b709cfa2ba..36623ba7ef8 100644 --- a/packages/web/src/common/store/notifications/errorSagas.ts +++ b/packages/web/src/common/store/notifications/errorSagas.ts @@ -1,7 +1,8 @@ import { notificationsActions, FetchNotificationsFailedAction -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { ErrorLevel } from '@audius/common/models' import { put, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/notifications/fetchNotifications.ts b/packages/web/src/common/store/notifications/fetchNotifications.ts index 01c501aed68..88368ed645c 100644 --- a/packages/web/src/common/store/notifications/fetchNotifications.ts +++ b/packages/web/src/common/store/notifications/fetchNotifications.ts @@ -1,4 +1,5 @@ -import { getContext } from '@audius/common' +import { getContext } from '@audius/common/store' +import {} from '@audius/common' import { IntKeys, FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' import { partition } from 'lodash' diff --git a/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts b/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts index 26cbf1a21f0..544001dd18e 100644 --- a/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts @@ -1,8 +1,9 @@ import { - FetchNotificationsAction, notificationsActions, - notificationsSelectors -} from '@audius/common' + notificationsSelectors, + FetchNotificationsAction +} from '@audius/common/store' +import {} from '@audius/common' import { getErrorMessage } from '@audius/common/utils' import { call, put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts index 91cc9cfd65d..2f9f95bc269 100644 --- a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts +++ b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts @@ -1,11 +1,12 @@ import { - Notification, + accountSelectors, NotificationType, Entity, - reactionsUIActions, Achievement, - accountSelectors -} from '@audius/common' + reactionsUIActions, + Notification +} from '@audius/common/store' +import {} from '@audius/common' import { ID, Remix, Track } from '@audius/common/models' import { waitForAccount, waitForRead } from '@audius/common/utils' import moment from 'moment' diff --git a/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts b/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts index bae7176af12..286ccb25ea4 100644 --- a/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts @@ -1,4 +1,5 @@ -import { notificationsActions } from '@audius/common' +import { notificationsActions } from '@audius/common/store' +import {} from '@audius/common' import { getErrorMessage } from '@audius/common/utils' import { call, put, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/sagas.ts b/packages/web/src/common/store/notifications/sagas.ts index e0c399f606c..bb4f8a96d88 100644 --- a/packages/web/src/common/store/notifications/sagas.ts +++ b/packages/web/src/common/store/notifications/sagas.ts @@ -1,4 +1,5 @@ -import { getContext, notificationsActions } from '@audius/common' +import { notificationsActions, getContext } from '@audius/common/store' +import {} from '@audius/common' import { IntKeys, remoteConfigIntDefaults, diff --git a/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts index 4f85cfbe0f1..32be1f9101f 100644 --- a/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts @@ -5,7 +5,8 @@ import { aiPageSelectors, getContext, CommonState -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { call, put, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/ai/sagas.ts b/packages/web/src/common/store/pages/ai/sagas.ts index bce02747a1d..82ff7a03ec0 100644 --- a/packages/web/src/common/store/pages/ai/sagas.ts +++ b/packages/web/src/common/store/pages/ai/sagas.ts @@ -1,4 +1,5 @@ -import { aiPageActions, FetchAiUserAction } from '@audius/common' +import { aiPageActions, FetchAiUserAction } from '@audius/common/store' +import {} from '@audius/common' import { User } from '@audius/common/models' import { Maybe } from '@audius/common/utils' import { takeEvery, call, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/audio-rewards/sagas.ts b/packages/web/src/common/store/pages/audio-rewards/sagas.ts index 9f76640e8b1..46895fc9c87 100644 --- a/packages/web/src/common/store/pages/audio-rewards/sagas.ts +++ b/packages/web/src/common/store/pages/audio-rewards/sagas.ts @@ -1,17 +1,18 @@ import { - getContext, - accountSelectors, accountActions, + accountSelectors, + audioRewardsPageSelectors, audioRewardsPageActions, - ClaimStatus, HCaptchaStatus, - UndisbursedUserChallenge, - audioRewardsPageSelectors, + ClaimStatus, solanaSelectors, walletActions, modalsActions, - musicConfettiActions -} from '@audius/common' + getContext, + musicConfettiActions, + UndisbursedUserChallenge +} from '@audius/common/store' +import {} from '@audius/common' import { FailureReason, UserChallenge, diff --git a/packages/web/src/common/store/pages/audio-rewards/store.test.ts b/packages/web/src/common/store/pages/audio-rewards/store.test.ts index 42011dd12bf..4abd8dd5a01 100644 --- a/packages/web/src/common/store/pages/audio-rewards/store.test.ts +++ b/packages/web/src/common/store/pages/audio-rewards/store.test.ts @@ -1,14 +1,15 @@ import { accountSelectors, + audioRewardsPageSelectors, audioRewardsPageActions, - AudioRewardsClaim, - ClaimStatus, HCaptchaStatus, - audioRewardsPageSelectors, + ClaimStatus, solanaSelectors, walletActions, - modalsActions -} from '@audius/common' + modalsActions, + AudioRewardsClaim +} from '@audius/common/store' +import {} from '@audius/common' import { FailureReason, UserChallenge, diff --git a/packages/web/src/common/store/pages/audio-transactions/sagas.ts b/packages/web/src/common/store/pages/audio-transactions/sagas.ts index 076f6f12da5..6cf5e32b889 100644 --- a/packages/web/src/common/store/pages/audio-transactions/sagas.ts +++ b/packages/web/src/common/store/pages/audio-transactions/sagas.ts @@ -1,12 +1,14 @@ import { audioTransactionsPageActions, - TransactionDetails, - TransactionMethod, - TransactionType, transactionDetailsActions, - getContext -} from '@audius/common' -import type { InAppAudioPurchaseMetadata } from '@audius/common' + TransactionType, + TransactionMethod, + getContext, + InAppAudioPurchaseMetadata, + TransactionDetails +} from '@audius/common/store' +import {} from '@audius/common' +import type {} from '@audius/common' import { StringAudio } from '@audius/common/models' import { formatDate, Nullable } from '@audius/common/utils' import { AudiusLibs, full } from '@audius/sdk' diff --git a/packages/web/src/common/store/pages/collection/lineups/sagas.js b/packages/web/src/common/store/pages/collection/lineups/sagas.js index 8492d9d025c..3701ac774c8 100644 --- a/packages/web/src/common/store/pages/collection/lineups/sagas.js +++ b/packages/web/src/common/store/pages/collection/lineups/sagas.js @@ -3,7 +3,8 @@ import { collectionPageLineupActions as tracksActions, collectionPageSelectors, queueSelectors -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { removeNullable, Uid, waitForValue } from '@audius/common/utils' import { keyBy } from 'lodash' diff --git a/packages/web/src/common/store/pages/collection/sagas.js b/packages/web/src/common/store/pages/collection/sagas.js index 8686cd8c319..19a7d8abf42 100644 --- a/packages/web/src/common/store/pages/collection/sagas.js +++ b/packages/web/src/common/store/pages/collection/sagas.js @@ -1,10 +1,11 @@ import { cacheActions, - collectionPageActions as collectionActions, collectionPageLineupActions as tracksActions, collectionPageSelectors, + collectionPageActions as collectionActions, reachabilitySelectors -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/common/store/pages/deactivate-account/sagas.ts b/packages/web/src/common/store/pages/deactivate-account/sagas.ts index 2583d5085fe..cc68c3de77f 100644 --- a/packages/web/src/common/store/pages/deactivate-account/sagas.ts +++ b/packages/web/src/common/store/pages/deactivate-account/sagas.ts @@ -1,12 +1,13 @@ import { accountSelectors, - getContext, - signOutActions, deactivateAccountActions, + signOutActions, + getContext, confirmerActions, - confirmTransaction, - confirmerSelectors -} from '@audius/common' + confirmerSelectors, + confirmTransaction +} from '@audius/common/store' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { waitForValue } from '@audius/common/utils' import { call, delay, put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts b/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts index 01c9e9160d4..8948eeb914b 100644 --- a/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts +++ b/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts @@ -3,7 +3,8 @@ import { explorePageCollectionsActions, ExploreCollectionsVariant, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Collection, UserCollectionMetadata } from '@audius/common/models' import { uniq } from 'lodash' import { takeEvery, call, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/explore/sagas.ts b/packages/web/src/common/store/pages/explore/sagas.ts index a18ab3dc756..5571fa9687d 100644 --- a/packages/web/src/common/store/pages/explore/sagas.ts +++ b/packages/web/src/common/store/pages/explore/sagas.ts @@ -1,8 +1,9 @@ import { + explorePageSelectors, explorePageActions, - getContext, - explorePageSelectors -} from '@audius/common' + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { ID } from '@audius/common/models' import { call, put, takeEvery, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/feed/lineup/sagas.ts b/packages/web/src/common/store/pages/feed/lineup/sagas.ts index 7d67825a06c..117567531f1 100644 --- a/packages/web/src/common/store/pages/feed/lineup/sagas.ts +++ b/packages/web/src/common/store/pages/feed/lineup/sagas.ts @@ -1,10 +1,11 @@ import { - getContext, accountSelectors, feedPageLineupActions as feedActions, feedPageSelectors, + getContext, CommonState -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { FeedFilter, Kind, diff --git a/packages/web/src/common/store/pages/feed/sagas.ts b/packages/web/src/common/store/pages/feed/sagas.ts index 0b44eaa9d3a..302d1576c42 100644 --- a/packages/web/src/common/store/pages/feed/sagas.ts +++ b/packages/web/src/common/store/pages/feed/sagas.ts @@ -2,7 +2,8 @@ import { feedPageLineupActions as feedActions, feedPageActions as discoverActions, usersSocialActions as socialActions -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { FollowSource, ID } from '@audius/common/models' import { getErrorMessage } from '@audius/common/utils' import { call, put, take, fork, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/history/lineups/sagas.js b/packages/web/src/common/store/pages/history/lineups/sagas.js index de412b1cef8..3e378396ad7 100644 --- a/packages/web/src/common/store/pages/history/lineups/sagas.js +++ b/packages/web/src/common/store/pages/history/lineups/sagas.js @@ -1,7 +1,8 @@ import { accountSelectors, historyPageTracksLineupActions as tracksActions -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { keyBy } from 'lodash' import { call, getContext, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts index 5d0c9edd186..3c5284e83d3 100644 --- a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts @@ -1,9 +1,10 @@ import { accountSelectors, - premiumTracksPageLineupActions, premiumTracksPageLineupSelectors, + premiumTracksPageLineupActions, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { call, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts index c630ac4d859..7a7297839e7 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts +++ b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts @@ -1,4 +1,5 @@ -import { getContext } from '@audius/common' +import { getContext } from '@audius/common/store' +import {} from '@audius/common' import { UserCollection, ID, diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js index eff92dfcc65..7a932ba30b8 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js +++ b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js @@ -2,12 +2,13 @@ import { accountSelectors, cacheCollectionsSelectors, cacheTracksSelectors, - profilePageSelectors, profilePageFeedLineupActions as feedActions, - tracksSocialActions, + profilePageSelectors, collectionsSocialActions, + tracksSocialActions, confirmerSelectors -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { makeUid, diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts index ae225568be7..703edc942b5 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts @@ -1,4 +1,5 @@ -import { getContext } from '@audius/common' +import { getContext } from '@audius/common/store' +import {} from '@audius/common' import { ID, Track } from '@audius/common/models' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js b/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js index d0e3133bd34..9599da57c4d 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js @@ -1,14 +1,15 @@ +import { profilePageTracksLineupActions as tracksActions } from '@audius/common' +import { Kind } from '@audius/common/models' import { accountSelectors, cacheTracksActions, cacheTracksSelectors, + lineupActions, + profilePageTracksLineupActions as lineupActions, profilePageSelectors, TracksSortMode, - profilePageTracksLineupActions as tracksActions, - profilePageTracksLineupActions as lineupActions, tracksSocialActions -} from '@audius/common' -import { Kind } from '@audius/common/models' +} from '@audius/common/store' import { call, select, takeEvery, put } from 'redux-saga/effects' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts index e13116856e3..91fc09d00c9 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts @@ -3,7 +3,8 @@ import { profilePageTracksLineupActions, profilePageSelectors, uploadActions -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts index ace799e5f54..318b440b575 100644 --- a/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts @@ -5,7 +5,8 @@ import { remixesPageSelectors, getContext, CommonState -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { call, put, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/remixes-page/sagas.ts b/packages/web/src/common/store/pages/remixes-page/sagas.ts index 93ef5e50e0f..af8a904cbf8 100644 --- a/packages/web/src/common/store/pages/remixes-page/sagas.ts +++ b/packages/web/src/common/store/pages/remixes-page/sagas.ts @@ -1,4 +1,5 @@ -import { remixesPageActions } from '@audius/common' +import { remixesPageActions } from '@audius/common/store' +import {} from '@audius/common' import { TrackMetadata, Track } from '@audius/common/models' import { takeEvery, call, put } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/saved/lineups/sagas.js b/packages/web/src/common/store/pages/saved/lineups/sagas.js index 3d7a4450d39..536a96880af 100644 --- a/packages/web/src/common/store/pages/saved/lineups/sagas.js +++ b/packages/web/src/common/store/pages/saved/lineups/sagas.js @@ -3,17 +3,18 @@ import { savedPageTracksLineupActions as savedTracksActions, savedPageActions as saveActions, savedPageSelectors, + LibraryCategory, + SavedPageTabs, queueActions, queueSelectors, - tracksSocialActions, - playerSelectors, QueueSource, + tracksSocialActions, getContext, - LibraryCategory, - SavedPageTabs, + playerSelectors, purchaseContentActions, ContentType -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { uniq } from 'lodash' diff --git a/packages/web/src/common/store/pages/saved/sagas.ts b/packages/web/src/common/store/pages/saved/sagas.ts index 5b964e00da5..857dd1280f4 100644 --- a/packages/web/src/common/store/pages/saved/sagas.ts +++ b/packages/web/src/common/store/pages/saved/sagas.ts @@ -1,11 +1,12 @@ import { - LibraryCategoryType, accountSelectors, + savedPageTracksLineupActions as tracksActions, savedPageActions as actions, - getContext, savedPageSelectors, - savedPageTracksLineupActions as tracksActions -} from '@audius/common' + getContext, + LibraryCategoryType +} from '@audius/common/store' +import {} from '@audius/common' import { FavoriteType, Favorite, diff --git a/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js b/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js index 2963b164ef2..5943f15c661 100644 --- a/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js +++ b/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js @@ -1,9 +1,10 @@ import { cacheTracksSelectors, + searchResultsPageTracksLineupActions as tracksActions, searchResultsPageSelectors, - SearchKind, - searchResultsPageTracksLineupActions as tracksActions -} from '@audius/common' + SearchKind +} from '@audius/common/store' +import {} from '@audius/common' import { trimToAlphaNumeric } from '@audius/common/utils' import { select, all, call, getContext } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/search-page/sagas.js b/packages/web/src/common/store/pages/search-page/sagas.js index 05eb218a733..cbb4b2dd2af 100644 --- a/packages/web/src/common/store/pages/search-page/sagas.js +++ b/packages/web/src/common/store/pages/search-page/sagas.js @@ -1,10 +1,11 @@ import { accountSelectors, - searchResultsPageActions as searchPageActions, + processAndCacheUsers, searchResultsPageTracksLineupActions as tracksLineupActions, - SearchKind, - processAndCacheUsers -} from '@audius/common' + searchResultsPageActions as searchPageActions, + SearchKind +} from '@audius/common/store' +import {} from '@audius/common' import { FeatureFlags } from '@audius/common/services' import { trimToAlphaNumeric, removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' diff --git a/packages/web/src/common/store/pages/settings/errorSagas.ts b/packages/web/src/common/store/pages/settings/errorSagas.ts index dc8f5a78626..2118a8d0ae5 100644 --- a/packages/web/src/common/store/pages/settings/errorSagas.ts +++ b/packages/web/src/common/store/pages/settings/errorSagas.ts @@ -1,4 +1,5 @@ -import { settingsPageActions as actions } from '@audius/common' +import { settingsPageActions as actions } from '@audius/common/store' +import {} from '@audius/common' import { createErrorSagas } from '../../../../utils/errorSagas' diff --git a/packages/web/src/common/store/pages/settings/sagas.ts b/packages/web/src/common/store/pages/settings/sagas.ts index 9e78a8d31e0..469791a4dcf 100644 --- a/packages/web/src/common/store/pages/settings/sagas.ts +++ b/packages/web/src/common/store/pages/settings/sagas.ts @@ -1,9 +1,10 @@ import { - settingsPageActions as actions, - getContext, accountSelectors, - cacheActions -} from '@audius/common' + cacheActions, + settingsPageActions as actions, + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { getErrorMessage } from '@audius/common/utils' import { call, put, takeEvery, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/signon/actions.ts b/packages/web/src/common/store/pages/signon/actions.ts index a99c5df0ba1..763e442f064 100644 --- a/packages/web/src/common/store/pages/signon/actions.ts +++ b/packages/web/src/common/store/pages/signon/actions.ts @@ -3,7 +3,8 @@ import { TwitterProfile, TikTokProfile, Image -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { ID, User } from '@audius/common/models' import { createCustomAction } from 'typesafe-actions' diff --git a/packages/web/src/common/store/pages/signon/sagas.js b/packages/web/src/common/store/pages/signon/sagas.js index 6d5baf1c976..a0e0768e95b 100644 --- a/packages/web/src/common/store/pages/signon/sagas.js +++ b/packages/web/src/common/store/pages/signon/sagas.js @@ -1,17 +1,18 @@ import { accountActions, accountSelectors, - cacheUsersSelectors, - collectionsSocialActions, - getContext, processAndCacheUsers, + cacheUsersSelectors, settingsPageActions, + collectionsSocialActions, usersSocialActions as socialActions, solanaSelectors, toastActions, + getContext, confirmerActions, confirmTransaction -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Name, FavoriteSource } from '@audius/common/models' import { IntKeys, diff --git a/packages/web/src/common/store/pages/signon/selectors.ts b/packages/web/src/common/store/pages/signon/selectors.ts index 8dfe35cc934..b0e58ff32d1 100644 --- a/packages/web/src/common/store/pages/signon/selectors.ts +++ b/packages/web/src/common/store/pages/signon/selectors.ts @@ -1,4 +1,5 @@ -import { accountSelectors, cacheUsersSelectors } from '@audius/common' +import { accountSelectors, cacheUsersSelectors } from '@audius/common/store' +import {} from '@audius/common' import { createSelector } from 'reselect' import { AppState } from 'store/types' diff --git a/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts b/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts index 9ef9c9327c4..264d6d3e551 100644 --- a/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts +++ b/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts @@ -1,12 +1,13 @@ import { accountSelectors, cacheActions, - confirmerActions, - getContext, tokenDashboardPageActions, walletActions, + getContext, + confirmerActions, confirmTransaction -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind, User } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts index fcf8da9aa5c..97ff9f39d2d 100644 --- a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts @@ -1,9 +1,10 @@ import { accountSelectors, - getContext, + tokenDashboardPageSelectors, tokenDashboardPageActions, - tokenDashboardPageSelectors -} from '@audius/common' + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Chain } from '@audius/common/models' import { newUserMetadata } from '@audius/common/schemas' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts index a773a6c0f6a..646dcaad2df 100644 --- a/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts @@ -1,8 +1,9 @@ import { - getContext, + tokenDashboardPageSelectors, tokenDashboardPageActions, - tokenDashboardPageSelectors -} from '@audius/common' + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Chain } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts b/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts index 71d05f4fa25..30185d49956 100644 --- a/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts +++ b/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts @@ -1,4 +1,5 @@ -import { accountSelectors, getContext } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common/store' +import {} from '@audius/common' import { select, call } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts b/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts index 2a912bc6943..1b957dd8e40 100644 --- a/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts +++ b/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts @@ -1,4 +1,5 @@ -import { getContext } from '@audius/common' +import { getContext } from '@audius/common/store' +import {} from '@audius/common' import { Chain } from '@audius/common/models' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts index 3ae8a04878b..6e6034d6d81 100644 --- a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts +++ b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts @@ -1,13 +1,14 @@ import { accountSelectors, cacheActions, - confirmerActions, - ConfirmRemoveWalletAction, - getContext, tokenDashboardPageActions, walletActions, - confirmTransaction -} from '@audius/common' + getContext, + confirmerActions, + confirmTransaction, + ConfirmRemoveWalletAction +} from '@audius/common/store' +import {} from '@audius/common' import { Chain, Kind } from '@audius/common/models' import { newUserMetadata } from '@audius/common/schemas' import { call, fork, put, select, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/sagas.ts b/packages/web/src/common/store/pages/token-dashboard/sagas.ts index 1be603fa0db..6facc04aa3b 100644 --- a/packages/web/src/common/store/pages/token-dashboard/sagas.ts +++ b/packages/web/src/common/store/pages/token-dashboard/sagas.ts @@ -2,7 +2,8 @@ import { accountSelectors, tokenDashboardPageActions, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Chain, CollectibleState } from '@audius/common/models' import { call, put, select, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/track/lineups/sagas.ts b/packages/web/src/common/store/pages/track/lineups/sagas.ts index 09dd114f059..87f1d9ad440 100644 --- a/packages/web/src/common/store/pages/track/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/track/lineups/sagas.ts @@ -3,7 +3,8 @@ import { cacheTracksSelectors, trackPageLineupActions, trackPageSelectors -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { waitForValue } from '@audius/common/utils' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/track/sagas.js b/packages/web/src/common/store/pages/track/sagas.js index 0f1f59db40a..e78d55948a3 100644 --- a/packages/web/src/common/store/pages/track/sagas.js +++ b/packages/web/src/common/store/pages/track/sagas.js @@ -2,11 +2,12 @@ import { cacheTracksActions as trackCacheActions, cacheTracksSelectors, cacheUsersSelectors, + trackPageLineupActions, trackPageActions, trackPageSelectors, - trackPageLineupActions, reachabilitySelectors -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { makeUid } from '@audius/common/utils' diff --git a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts index 723daed98fa..dff1da318c1 100644 --- a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts @@ -3,7 +3,8 @@ import { trendingPlaylistsPageLineupSelectors, trendingPlaylistsPageLineupActions, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { UserCollectionMetadata } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { keccak_256 } from 'js-sha3' diff --git a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts index 13d071fc015..5a41d646dda 100644 --- a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts @@ -3,7 +3,8 @@ import { trendingUndergroundPageLineupSelectors, trendingUndergroundPageLineupActions, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { StringKeys } from '@audius/common/services' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts index 45e35edaf0d..f717c7ebb2d 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts +++ b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts @@ -4,7 +4,8 @@ import { trendingPageActions, trendingPageSelectors, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { TimeRange, ID, Track, UserTrackMetadata } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { Genre, Nullable } from '@audius/common/utils' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js b/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js index ff8a2af0601..68dc31e75d1 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js +++ b/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js @@ -2,7 +2,8 @@ import { accountSelectors, trendingPageLineupActions, trendingPageSelectors -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { TimeRange } from '@audius/common/models' import { select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/player/errorSagas.ts b/packages/web/src/common/store/player/errorSagas.ts index 8fa37b0e483..21042332ca2 100644 --- a/packages/web/src/common/store/player/errorSagas.ts +++ b/packages/web/src/common/store/player/errorSagas.ts @@ -1,4 +1,5 @@ -import { playerActions } from '@audius/common' +import { playerActions } from '@audius/common/store' +import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/player/sagas.ts b/packages/web/src/common/store/player/sagas.ts index e249dd8050b..0b889568c14 100644 --- a/packages/web/src/common/store/player/sagas.ts +++ b/packages/web/src/common/store/player/sagas.ts @@ -3,15 +3,16 @@ import { cacheTracksSelectors, cacheActions, queueActions, + reachabilitySelectors, tracksSocialActions, getContext, playerActions, playerSelectors, playbackPositionActions, playbackPositionSelectors, - reachabilitySelectors, gatedContentSelectors -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { FeatureFlags, QueryParams } from '@audius/common/services' import { diff --git a/packages/web/src/common/store/player/store.test.js b/packages/web/src/common/store/player/store.test.js index 611ff33f93a..3f7e391db0f 100644 --- a/packages/web/src/common/store/player/store.test.js +++ b/packages/web/src/common/store/player/store.test.js @@ -1,4 +1,5 @@ -import { playerReducer, playerActions } from '@audius/common' +import { playerReducer, playerActions } from '@audius/common/store' +import {} from '@audius/common' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import { describe, it, expect, vitest } from 'vitest' diff --git a/packages/web/src/common/store/playlist-library/sagas.ts b/packages/web/src/common/store/playlist-library/sagas.ts index d1705535e58..3baeb67e20b 100644 --- a/packages/web/src/common/store/playlist-library/sagas.ts +++ b/packages/web/src/common/store/playlist-library/sagas.ts @@ -1,10 +1,11 @@ import { accountSelectors, - AccountCollection, cacheActions, + playlistLibraryActions, playlistLibraryHelpers, - playlistLibraryActions -} from '@audius/common' + AccountCollection +} from '@audius/common/store' +import {} from '@audius/common' import { Kind, PlaylistLibraryID, diff --git a/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts b/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts index de233fa2ad5..b56156e3ec0 100644 --- a/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts +++ b/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts @@ -2,11 +2,12 @@ import { accountSelectors, playlistLibraryActions, playlistLibraryHelpers, - AddToFolderAction, + collectionsSocialActions, toastActions, - CommonState, - collectionsSocialActions -} from '@audius/common' + AddToFolderAction, + CommonState +} from '@audius/common/store' +import {} from '@audius/common' import { Name, FavoriteSource } from '@audius/common/models' import { takeEvery, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts b/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts index 038fe7b4797..a8086865588 100644 --- a/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts +++ b/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts @@ -1,11 +1,12 @@ import { - CommonState, - ReorderAction, accountSelectors, - collectionsSocialActions, playlistLibraryActions, - playlistLibraryHelpers -} from '@audius/common' + playlistLibraryHelpers, + collectionsSocialActions, + ReorderAction, + CommonState +} from '@audius/common/store' +import {} from '@audius/common' import { Name, FavoriteSource } from '@audius/common/models' import { takeEvery, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts index 80b34948052..f81ee028fb6 100644 --- a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts +++ b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts @@ -2,7 +2,8 @@ import { accountActions, getContext, playlistUpdatesActions -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { IntKeys, remoteConfigIntDefaults } from '@audius/common/services' import { call, fork, take } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/playlist-updates/sagas.ts b/packages/web/src/common/store/playlist-updates/sagas.ts index 52302cbe5c5..09209d94038 100644 --- a/packages/web/src/common/store/playlist-updates/sagas.ts +++ b/packages/web/src/common/store/playlist-updates/sagas.ts @@ -1,4 +1,4 @@ -import { playlistUpdatesSagas } from '@audius/common' +import { playlistUpdatesSagas } from '@audius/common/store' import { playlistUpdatesPollingDaemon } from './playlistUpdatesPollingDaemon' diff --git a/packages/web/src/common/store/profile/fetchProfileCollectionsSaga.ts b/packages/web/src/common/store/profile/fetchProfileCollectionsSaga.ts index 6483096d707..f8d91b5ffe6 100644 --- a/packages/web/src/common/store/profile/fetchProfileCollectionsSaga.ts +++ b/packages/web/src/common/store/profile/fetchProfileCollectionsSaga.ts @@ -1,10 +1,10 @@ +import { Kind } from '@audius/common/models' import { cacheActions, - getContext, profilePageActions, - profilePageSelectors -} from '@audius/common' -import { Kind } from '@audius/common/models' + profilePageSelectors, + getContext +} from '@audius/common/store' import { isEqual } from 'lodash' import { put, select, takeLatest, call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/profile/fetchTopTagsSaga.ts b/packages/web/src/common/store/profile/fetchTopTagsSaga.ts index 67368ca5582..c055173ca00 100644 --- a/packages/web/src/common/store/profile/fetchTopTagsSaga.ts +++ b/packages/web/src/common/store/profile/fetchTopTagsSaga.ts @@ -1,4 +1,4 @@ -import { getContext, profilePageActions } from '@audius/common' +import { profilePageActions, getContext } from '@audius/common/store' import { takeLatest, call, put } from 'typed-redux-saga' const { FETCH_TOP_TAGS, diff --git a/packages/web/src/common/store/profile/sagas.js b/packages/web/src/common/store/profile/sagas.js index bd1dd7a2ad8..fbc15a702c3 100644 --- a/packages/web/src/common/store/profile/sagas.js +++ b/packages/web/src/common/store/profile/sagas.js @@ -1,20 +1,20 @@ +import { DefaultSizes, Kind } from '@audius/common/models' +import { DoubleKeys, FeatureFlags } from '@audius/common/services' import { accountSelectors, cacheActions, + processAndCacheUsers, + profilePageActions as profileActions, profilePageSelectors, FollowType, - profilePageActions as profileActions, + chatActions, reachabilitySelectors, tippingActions, relatedArtistsUIActions as relatedArtistsActions, collectiblesActions, - processAndCacheUsers, - chatActions, confirmerActions, confirmTransaction -} from '@audius/common' -import { DefaultSizes, Kind } from '@audius/common/models' -import { DoubleKeys, FeatureFlags } from '@audius/common/services' +} from '@audius/common/store' import { squashNewLines, makeUid, diff --git a/packages/web/src/common/store/queue/sagas.ts b/packages/web/src/common/store/queue/sagas.ts index e5eb08ba89e..f30ec2dee2f 100644 --- a/packages/web/src/common/store/queue/sagas.ts +++ b/packages/web/src/common/store/queue/sagas.ts @@ -1,28 +1,28 @@ +import { + Name, + PlaybackSource, + Kind, + ID, + UID, + LineupState, + User +} from '@audius/common/models' import { accountSelectors, cacheCollectionsSelectors, cacheTracksSelectors, - cacheUsersSelectors, cacheActions, cacheSelectors, + cacheUsersSelectors, + lineupRegistry, queueActions, + queueSelectors, RepeatMode, QueueSource, - playerActions, - playerSelectors, - queueSelectors, getContext, - lineupRegistry -} from '@audius/common' -import { - Name, - PlaybackSource, - Kind, - ID, - UID, - LineupState, - User -} from '@audius/common/models' + playerActions, + playerSelectors +} from '@audius/common/store' import { Uid, makeUid, waitForAccount, Nullable } from '@audius/common/utils' import { all, call, put, select, takeEvery, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/queue/store.test.js b/packages/web/src/common/store/queue/store.test.js index 2f3cd986a61..2764139ad6e 100644 --- a/packages/web/src/common/store/queue/store.test.js +++ b/packages/web/src/common/store/queue/store.test.js @@ -1,3 +1,4 @@ +import { Kind } from '@audius/common/models' import { accountReducer, cacheActions, @@ -7,8 +8,7 @@ import { QueueSource, playerReducer, playerActions -} from '@audius/common' -import { Kind } from '@audius/common/models' +} from '@audius/common/store' import { combineReducers } from 'redux' import { take } from 'redux-saga/effects' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/recommendation/sagas.ts b/packages/web/src/common/store/recommendation/sagas.ts index 54fc855a6df..61fd53978db 100644 --- a/packages/web/src/common/store/recommendation/sagas.ts +++ b/packages/web/src/common/store/recommendation/sagas.ts @@ -1,4 +1,5 @@ -import { getContext } from '@audius/common' +import { getContext } from '@audius/common/store' +import {} from '@audius/common' import { ID } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/recovery-email/sagas.ts b/packages/web/src/common/store/recovery-email/sagas.ts index 58b2a229aa9..cecf918e532 100644 --- a/packages/web/src/common/store/recovery-email/sagas.ts +++ b/packages/web/src/common/store/recovery-email/sagas.ts @@ -1,4 +1,5 @@ -import { getContext, recoveryEmailActions } from '@audius/common' +import { recoveryEmailActions, getContext } from '@audius/common/store' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { takeLatest, put, call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/remix-settings/sagas.ts b/packages/web/src/common/store/remix-settings/sagas.ts index 9702917a9a0..582a1944947 100644 --- a/packages/web/src/common/store/remix-settings/sagas.ts +++ b/packages/web/src/common/store/remix-settings/sagas.ts @@ -1,4 +1,5 @@ -import { remixSettingsActions, getContext } from '@audius/common' +import { getContext, remixSettingsActions } from '@audius/common/store' +import {} from '@audius/common' import { TrackMetadata, Track } from '@audius/common/models' import { takeLatest, call, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/saved-collections/sagas.ts b/packages/web/src/common/store/saved-collections/sagas.ts index 29ecf60e833..aceeb8ddb95 100644 --- a/packages/web/src/common/store/saved-collections/sagas.ts +++ b/packages/web/src/common/store/saved-collections/sagas.ts @@ -1,9 +1,9 @@ +import { ID } from '@audius/common/models' import { - CollectionType, savedCollectionsActions, - savedCollectionsSelectors -} from '@audius/common' -import { ID } from '@audius/common/models' + savedCollectionsSelectors, + CollectionType +} from '@audius/common/store' import { waitForRead } from '@audius/common/utils' import { all, call, select, put, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/search-ai-bar/sagas.ts b/packages/web/src/common/store/search-ai-bar/sagas.ts index 6a6217f1add..5436ff42095 100644 --- a/packages/web/src/common/store/search-ai-bar/sagas.ts +++ b/packages/web/src/common/store/search-ai-bar/sagas.ts @@ -1,4 +1,5 @@ -import { SearchKind, accountSelectors, getContext } from '@audius/common' +import { accountSelectors, SearchKind, getContext } from '@audius/common/store' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' diff --git a/packages/web/src/common/store/search-bar/sagas.ts b/packages/web/src/common/store/search-bar/sagas.ts index 79a2babdbda..103615ed8cb 100644 --- a/packages/web/src/common/store/search-bar/sagas.ts +++ b/packages/web/src/common/store/search-bar/sagas.ts @@ -1,4 +1,5 @@ -import { accountSelectors, getContext } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common/store' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' diff --git a/packages/web/src/common/store/smart-collection/sagas.ts b/packages/web/src/common/store/smart-collection/sagas.ts index 3eb624a53e9..c533bf0cac8 100644 --- a/packages/web/src/common/store/smart-collection/sagas.ts +++ b/packages/web/src/common/store/smart-collection/sagas.ts @@ -1,10 +1,11 @@ import { accountSelectors, smartCollectionPageActions, + collectionPageLineupActions, collectionPageActions, - getContext, - collectionPageLineupActions -} from '@audius/common' + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { SmartCollectionVariant, Track, diff --git a/packages/web/src/common/store/social/collections/errorSagas.ts b/packages/web/src/common/store/social/collections/errorSagas.ts index 2931a9b280a..80e61453cc7 100644 --- a/packages/web/src/common/store/social/collections/errorSagas.ts +++ b/packages/web/src/common/store/social/collections/errorSagas.ts @@ -1,4 +1,5 @@ -import { collectionsSocialActions as socialCollectionActions } from '@audius/common' +import { collectionsSocialActions as socialCollectionActions } from '@audius/common/store' +import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/social/collections/sagas.ts b/packages/web/src/common/store/social/collections/sagas.ts index 25c1fc87070..50890bf8a06 100644 --- a/packages/web/src/common/store/social/collections/sagas.ts +++ b/packages/web/src/common/store/social/collections/sagas.ts @@ -1,19 +1,20 @@ import { - accountSelectors, accountActions, + accountSelectors, cacheCollectionsSelectors, - cacheUsersSelectors, cacheActions, - getContext, - collectionsSocialActions as socialActions, + cacheUsersSelectors, + savedPageActions, + LibraryCategory, playlistLibraryActions, playlistLibraryHelpers, + collectionsSocialActions as socialActions, + getContext, playlistUpdatesActions, confirmerActions, - confirmTransaction, - savedPageActions, - LibraryCategory -} from '@audius/common' + confirmTransaction +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Kind, diff --git a/packages/web/src/common/store/social/collections/store.test.js b/packages/web/src/common/store/social/collections/store.test.js index aebcacf61f9..0b00c062e28 100644 --- a/packages/web/src/common/store/social/collections/store.test.js +++ b/packages/web/src/common/store/social/collections/store.test.js @@ -1,7 +1,8 @@ import { cacheActions, collectionsSocialActions as actions -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/social/tracks/errorSagas.ts b/packages/web/src/common/store/social/tracks/errorSagas.ts index dcd73e6544a..be757c44296 100644 --- a/packages/web/src/common/store/social/tracks/errorSagas.ts +++ b/packages/web/src/common/store/social/tracks/errorSagas.ts @@ -1,4 +1,5 @@ -import { tracksSocialActions as socialTrackActions } from '@audius/common' +import { tracksSocialActions as socialTrackActions } from '@audius/common/store' +import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/social/tracks/recordListen.ts b/packages/web/src/common/store/social/tracks/recordListen.ts index 2aca8fcb206..f0d3460f2ed 100644 --- a/packages/web/src/common/store/social/tracks/recordListen.ts +++ b/packages/web/src/common/store/social/tracks/recordListen.ts @@ -1,10 +1,11 @@ import { accountSelectors, - audioRewardsPageActions, cacheTracksSelectors, - getContext, - tracksSocialActions -} from '@audius/common' + audioRewardsPageActions, + tracksSocialActions, + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { call, put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/social/tracks/sagas.ts b/packages/web/src/common/store/social/tracks/sagas.ts index afc00b92eae..f47c4bd46c0 100644 --- a/packages/web/src/common/store/social/tracks/sagas.ts +++ b/packages/web/src/common/store/social/tracks/sagas.ts @@ -1,14 +1,15 @@ import { accountSelectors, cacheTracksSelectors, - cacheUsersSelectors, cacheActions, - gatedContentSelectors, - getContext, + cacheUsersSelectors, tracksSocialActions as socialActions, + getContext, + gatedContentSelectors, confirmerActions, confirmTransaction -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Kind, ID, Track, User } from '@audius/common/models' import { FeatureFlags, QueryParams } from '@audius/common/services' import { diff --git a/packages/web/src/common/store/social/tracks/store.test.js b/packages/web/src/common/store/social/tracks/store.test.js index 0a50aa0a57b..aa562c8e006 100644 --- a/packages/web/src/common/store/social/tracks/store.test.js +++ b/packages/web/src/common/store/social/tracks/store.test.js @@ -1,4 +1,8 @@ -import { cacheActions, tracksSocialActions as actions } from '@audius/common' +import { + cacheActions, + tracksSocialActions as actions +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/social/users/errorSagas.ts b/packages/web/src/common/store/social/users/errorSagas.ts index eaddf629386..184354be06f 100644 --- a/packages/web/src/common/store/social/users/errorSagas.ts +++ b/packages/web/src/common/store/social/users/errorSagas.ts @@ -1,4 +1,5 @@ -import { usersSocialActions as socialUserActions } from '@audius/common' +import { usersSocialActions as socialUserActions } from '@audius/common/store' +import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/social/users/sagas.ts b/packages/web/src/common/store/social/users/sagas.ts index 623506d1d87..779ff66b1e4 100644 --- a/packages/web/src/common/store/social/users/sagas.ts +++ b/packages/web/src/common/store/social/users/sagas.ts @@ -2,12 +2,13 @@ import { accountSelectors, cacheActions, cacheUsersSelectors, - getContext, - usersSocialActions as socialActions, profilePageActions, + usersSocialActions as socialActions, + getContext, confirmerActions, confirmTransaction -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Kind, ID } from '@audius/common/models' import { makeKindId } from '@audius/common/utils' import { call, select, takeEvery, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/social/users/store.test.js b/packages/web/src/common/store/social/users/store.test.js index 01da1da0e5a..9c178e3e03c 100644 --- a/packages/web/src/common/store/social/users/store.test.js +++ b/packages/web/src/common/store/social/users/store.test.js @@ -1,4 +1,8 @@ -import { cacheActions, usersSocialActions as actions } from '@audius/common' +import { + cacheActions, + usersSocialActions as actions +} from '@audius/common/store' +import {} from '@audius/common' import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/tipping/sagas.ts b/packages/web/src/common/store/tipping/sagas.ts index c19d8d4cb60..227238a585c 100644 --- a/packages/web/src/common/store/tipping/sagas.ts +++ b/packages/web/src/common/store/tipping/sagas.ts @@ -1,16 +1,17 @@ import { accountSelectors, cacheActions, - RefreshSupportPayloadAction, + processAndCacheUsers, + chatActions, + solanaSelectors, tippingSelectors, tippingActions, walletSelectors, walletActions, getContext, - processAndCacheUsers, - solanaSelectors, - chatActions -} from '@audius/common' + RefreshSupportPayloadAction +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Kind, diff --git a/packages/web/src/common/store/ui/reactions/sagas.ts b/packages/web/src/common/store/ui/reactions/sagas.ts index 9de9a3ff483..058e81669c1 100644 --- a/packages/web/src/common/store/ui/reactions/sagas.ts +++ b/packages/web/src/common/store/ui/reactions/sagas.ts @@ -1,10 +1,11 @@ import { - getReactionFromRawValue, - reactionsMap, reactionsUIActions, reactionsUISelectors, + reactionsMap, + getReactionFromRawValue, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { AudiusBackend } from '@audius/common/services' import { getErrorMessage, removeNullable } from '@audius/common/utils' import { call, takeEvery, all, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/upload/errorSagas.ts b/packages/web/src/common/store/upload/errorSagas.ts index 3c8dbffa45b..4cb298e80e0 100644 --- a/packages/web/src/common/store/upload/errorSagas.ts +++ b/packages/web/src/common/store/upload/errorSagas.ts @@ -1,4 +1,5 @@ -import { uploadActions } from '@audius/common' +import { uploadActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/upload/sagaHelpers.ts b/packages/web/src/common/store/upload/sagaHelpers.ts index 9a6e90c48c0..44d76a9fcf9 100644 --- a/packages/web/src/common/store/upload/sagaHelpers.ts +++ b/packages/web/src/common/store/upload/sagaHelpers.ts @@ -1,4 +1,9 @@ -import { accountSelectors, getContext, getUSDCUserBank } from '@audius/common' +import { + accountSelectors, + getUSDCUserBank, + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Name, isContentCollectibleGated, diff --git a/packages/web/src/common/store/upload/sagas.js b/packages/web/src/common/store/upload/sagas.js index 34cbc73d829..21794a9115b 100644 --- a/packages/web/src/common/store/upload/sagas.js +++ b/packages/web/src/common/store/upload/sagas.js @@ -1,18 +1,19 @@ import { - accountSelectors, accountActions, - cacheUsersSelectors, + accountSelectors, cacheActions, + reformatCollection, + cacheUsersSelectors, + savedPageActions, + LibraryCategory, uploadActions, + uploadSelectors, UploadType, ProgressStatus, - uploadSelectors, confirmerActions, - confirmTransaction, - LibraryCategory, - reformatCollection, - savedPageActions -} from '@audius/common' + confirmTransaction +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Kind } from '@audius/common/models' import { formatUrlName, diff --git a/packages/web/src/common/store/user-list/favorites/errorSagas.ts b/packages/web/src/common/store/user-list/favorites/errorSagas.ts index ccc5bb55d8e..e1a82ce3252 100644 --- a/packages/web/src/common/store/user-list/favorites/errorSagas.ts +++ b/packages/web/src/common/store/user-list/favorites/errorSagas.ts @@ -1,4 +1,5 @@ -import { favoritesUserListActions } from '@audius/common' +import { favoritesUserListActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/favorites/sagas.ts b/packages/web/src/common/store/user-list/favorites/sagas.ts index 4cd6a9d40ca..50817a10147 100644 --- a/packages/web/src/common/store/user-list/favorites/sagas.ts +++ b/packages/web/src/common/store/user-list/favorites/sagas.ts @@ -5,7 +5,8 @@ import { favoritesUserListActions, favoritesUserListSelectors, FAVORITES_USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { FavoriteType, Collection, ID, Track } from '@audius/common/models' import { select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/followers/errorSagas.ts b/packages/web/src/common/store/user-list/followers/errorSagas.ts index fa65c785425..e66b4b3e67f 100644 --- a/packages/web/src/common/store/user-list/followers/errorSagas.ts +++ b/packages/web/src/common/store/user-list/followers/errorSagas.ts @@ -1,4 +1,5 @@ -import { followersUserListActions } from '@audius/common' +import { followersUserListActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/followers/sagas.ts b/packages/web/src/common/store/user-list/followers/sagas.ts index 23c3d2bfe60..41edd1752bc 100644 --- a/packages/web/src/common/store/user-list/followers/sagas.ts +++ b/packages/web/src/common/store/user-list/followers/sagas.ts @@ -1,10 +1,11 @@ import { cacheUsersSelectors, - followersUserListSelectors, UserListSagaFactory, followersUserListActions, + followersUserListSelectors, FOLLOWERS_USER_LIST_TAG as USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/following/errorSagas.ts b/packages/web/src/common/store/user-list/following/errorSagas.ts index 8e5e2a71b71..ea84f1054f8 100644 --- a/packages/web/src/common/store/user-list/following/errorSagas.ts +++ b/packages/web/src/common/store/user-list/following/errorSagas.ts @@ -1,4 +1,5 @@ -import { followingUserListActions } from '@audius/common' +import { followingUserListActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/following/sagas.ts b/packages/web/src/common/store/user-list/following/sagas.ts index f8c0e74c270..456c582ac11 100644 --- a/packages/web/src/common/store/user-list/following/sagas.ts +++ b/packages/web/src/common/store/user-list/following/sagas.ts @@ -4,7 +4,8 @@ import { followingUserListActions, followingUserListSelectors, FOLLOWING_USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/mutuals/errorSagas.ts b/packages/web/src/common/store/user-list/mutuals/errorSagas.ts index 383d0fae67c..6bcfaea0b44 100644 --- a/packages/web/src/common/store/user-list/mutuals/errorSagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/errorSagas.ts @@ -1,4 +1,5 @@ -import { mutualsUserListActions } from '@audius/common' +import { mutualsUserListActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/mutuals/sagas.ts b/packages/web/src/common/store/user-list/mutuals/sagas.ts index e23b41d1633..35f1e081a3e 100644 --- a/packages/web/src/common/store/user-list/mutuals/sagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/sagas.ts @@ -4,7 +4,8 @@ import { mutualsUserListActions, mutualsUserListSelectors, MUTUALS_USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { ID, User } from '@audius/common/models' import { AudiusBackend } from '@audius/common/services' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/notifications/errorSagas.ts b/packages/web/src/common/store/user-list/notifications/errorSagas.ts index 369aec9cdb0..73296be7591 100644 --- a/packages/web/src/common/store/user-list/notifications/errorSagas.ts +++ b/packages/web/src/common/store/user-list/notifications/errorSagas.ts @@ -1,4 +1,5 @@ -import { notificationsUserListActions } from '@audius/common' +import { notificationsUserListActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/notifications/sagas.ts b/packages/web/src/common/store/user-list/notifications/sagas.ts index 58d7ffeae9c..d98a6cb43c8 100644 --- a/packages/web/src/common/store/user-list/notifications/sagas.ts +++ b/packages/web/src/common/store/user-list/notifications/sagas.ts @@ -4,7 +4,8 @@ import { notificationsUserListActions, notificationsUserListSelectors, NOTIFICATIONS_USER_LIST_TAG as USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { call, put, select } from 'typed-redux-saga' import { fetchUsers as retrieveUsers } from 'common/store/cache/users/sagas' diff --git a/packages/web/src/common/store/user-list/related-artists/errorSagas.ts b/packages/web/src/common/store/user-list/related-artists/errorSagas.ts index 539be17418c..fe26b189375 100644 --- a/packages/web/src/common/store/user-list/related-artists/errorSagas.ts +++ b/packages/web/src/common/store/user-list/related-artists/errorSagas.ts @@ -1,4 +1,5 @@ -import { relatedArtistsUserListActions } from '@audius/common' +import { relatedArtistsUserListActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/related-artists/sagas.ts b/packages/web/src/common/store/user-list/related-artists/sagas.ts index 9e311cdb8dc..3b5f46da67e 100644 --- a/packages/web/src/common/store/user-list/related-artists/sagas.ts +++ b/packages/web/src/common/store/user-list/related-artists/sagas.ts @@ -1,10 +1,11 @@ import { UserListSagaFactory, - relatedArtistsUserListSelectors, relatedArtistsUserListActions, + relatedArtistsUserListSelectors, RELATED_ARTISTS_USER_LIST_TAG, getContext -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { ID } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/reposts/errorSagas.ts b/packages/web/src/common/store/user-list/reposts/errorSagas.ts index 71e34813d40..d7d3f7b366f 100644 --- a/packages/web/src/common/store/user-list/reposts/errorSagas.ts +++ b/packages/web/src/common/store/user-list/reposts/errorSagas.ts @@ -1,4 +1,5 @@ -import { repostsUserListActions } from '@audius/common' +import { repostsUserListActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/reposts/sagas.ts b/packages/web/src/common/store/user-list/reposts/sagas.ts index c702c162a2c..288cd09ce2d 100644 --- a/packages/web/src/common/store/user-list/reposts/sagas.ts +++ b/packages/web/src/common/store/user-list/reposts/sagas.ts @@ -1,12 +1,13 @@ import { cacheCollectionsSelectors, cacheTracksSelectors, - RepostType, UserListSagaFactory, repostsUserListActions, repostsUserListSelectors, + RepostType, REPOSTS_USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { Collection, ID, Track } from '@audius/common/models' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/supporting/errorSagas.ts b/packages/web/src/common/store/user-list/supporting/errorSagas.ts index 4a4a08af543..88fc15cb3c0 100644 --- a/packages/web/src/common/store/user-list/supporting/errorSagas.ts +++ b/packages/web/src/common/store/user-list/supporting/errorSagas.ts @@ -1,4 +1,5 @@ -import { supportingUserListActions } from '@audius/common' +import { supportingUserListActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/supporting/sagas.ts b/packages/web/src/common/store/user-list/supporting/sagas.ts index 861437fec8a..6855f41ef4f 100644 --- a/packages/web/src/common/store/user-list/supporting/sagas.ts +++ b/packages/web/src/common/store/user-list/supporting/sagas.ts @@ -1,12 +1,13 @@ import { cacheUsersSelectors, tippingActions, - SupportingMapForUser, UserListSagaFactory, supportingUserListActions, supportingUserListSelectors, - SUPPORTING_USER_LIST_TAG -} from '@audius/common' + SUPPORTING_USER_LIST_TAG, + SupportingMapForUser +} from '@audius/common/store' +import {} from '@audius/common' import { ID, UserMetadata, User } from '@audius/common/models' import { responseAdapter as adapter, diff --git a/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts b/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts index 90f50b6ebfa..32df929fb97 100644 --- a/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts @@ -1,4 +1,5 @@ -import { topSupportersUserListActions } from '@audius/common' +import { topSupportersUserListActions } from '@audius/common/store' +import {} from '@audius/common' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/top-supporters/sagas.ts b/packages/web/src/common/store/user-list/top-supporters/sagas.ts index 979ca74a030..271ece7dd41 100644 --- a/packages/web/src/common/store/user-list/top-supporters/sagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/sagas.ts @@ -1,12 +1,13 @@ import { cacheUsersSelectors, tippingActions, - SupportersMapForUser, UserListSagaFactory, - topSupportersUserListSelectors, topSupportersUserListActions, - TOP_SUPPORTERS_USER_LIST_TAG -} from '@audius/common' + topSupportersUserListSelectors, + TOP_SUPPORTERS_USER_LIST_TAG, + SupportersMapForUser +} from '@audius/common/store' +import {} from '@audius/common' import { ID, User } from '@audius/common/models' import { responseAdapter as adapter, diff --git a/packages/web/src/common/store/user-list/utils.ts b/packages/web/src/common/store/user-list/utils.ts index ec3fec2a61c..5b950d738d8 100644 --- a/packages/web/src/common/store/user-list/utils.ts +++ b/packages/web/src/common/store/user-list/utils.ts @@ -1,8 +1,9 @@ import { accountSelectors, - getContext, - processAndCacheUsers -} from '@audius/common' + processAndCacheUsers, + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { ID, UserMetadata, User } from '@audius/common/models' import { AudiusAPIClient, AudiusBackend } from '@audius/common/services' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/wallet/sagas.ts b/packages/web/src/common/store/wallet/sagas.ts index 6ee8e044c17..11235e98925 100644 --- a/packages/web/src/common/store/wallet/sagas.ts +++ b/packages/web/src/common/store/wallet/sagas.ts @@ -1,13 +1,14 @@ import { - accountSelectors, accountActions, + accountSelectors, tokenDashboardPageActions, + solanaSelectors, walletSelectors, - InputSendDataAction, walletActions, getContext, - solanaSelectors -} from '@audius/common' + InputSendDataAction +} from '@audius/common/store' +import {} from '@audius/common' import { Name, Chain, diff --git a/packages/web/src/common/utils/ensureLoggedIn.ts b/packages/web/src/common/utils/ensureLoggedIn.ts index 8bc1a73353d..f5463994fbd 100644 --- a/packages/web/src/common/utils/ensureLoggedIn.ts +++ b/packages/web/src/common/utils/ensureLoggedIn.ts @@ -1,5 +1,5 @@ -import { accountSelectors } from '@audius/common' import { Name, CreateAccountOpen } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { put, select, cancel } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/utils/requiresAccount.ts b/packages/web/src/common/utils/requiresAccount.ts index a51da2c5bd2..b8c208d5759 100644 --- a/packages/web/src/common/utils/requiresAccount.ts +++ b/packages/web/src/common/utils/requiresAccount.ts @@ -1,4 +1,4 @@ -import { accountSelectors, getContext } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common/store' import { waitForAccount } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/components/actions-tab/ActionsTab.jsx b/packages/web/src/components/actions-tab/ActionsTab.jsx index df475b9329d..578adc44a0f 100644 --- a/packages/web/src/components/actions-tab/ActionsTab.jsx +++ b/packages/web/src/components/actions-tab/ActionsTab.jsx @@ -1,12 +1,12 @@ import { PureComponent } from 'react' +import { ShareSource, RepostSource } from '@audius/common/models' import { accountSelectors, collectionsSocialActions, tracksSocialActions, shareModalUIActions -} from '@audius/common' -import { ShareSource, RepostSource } from '@audius/common/models' +} from '@audius/common/store' import cn from 'classnames' import PropTypes from 'prop-types' import { connect } from 'react-redux' diff --git a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx index 441178d6661..a6de1f798de 100644 --- a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx +++ b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx @@ -1,11 +1,13 @@ -import { useCallback, useEffect, useState } from 'react' - import { - useAddFundsModal, buyUSDCActions, buyUSDCSelectors, - BuyUSDCStage -} from '@audius/common' + BuyUSDCStage, + useAddFundsModal +} from '@audius/common/store' + +import { useCallback, useEffect, useState } from 'react' + +import {} from '@audius/common' import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { ModalContent, ModalHeader } from '@audius/stems' diff --git a/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx b/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx index 9f8ae6eead8..159d8e94d79 100644 --- a/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx +++ b/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx @@ -1,5 +1,3 @@ -import { useMemo, useState } from 'react' - import { accountSelectors, cacheCollectionsActions, @@ -7,7 +5,11 @@ import { addToCollectionUISelectors, duplicateAddConfirmationModalUIActions, toastActions -} from '@audius/common' +} from '@audius/common/store' + +import { useMemo, useState } from 'react' + +import {} from '@audius/common' import { CreatePlaylistSource, SquareSizes, diff --git a/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx b/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx index bd406a8d804..d943bb8b501 100644 --- a/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx +++ b/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx @@ -1,11 +1,13 @@ -import { useCallback, useContext } from 'react' - import { accountSelectors, cacheCollectionsActions, - addToCollectionUIActions, - addToCollectionUISelectors -} from '@audius/common' + addToCollectionUISelectors, + addToCollectionUIActions +} from '@audius/common/store' + +import { useCallback, useContext } from 'react' + +import {} from '@audius/common' import { CreatePlaylistSource, Collection, ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { capitalize } from 'lodash' diff --git a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx index 127dd98aff1..8860b5f953b 100644 --- a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx +++ b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx @@ -1,6 +1,8 @@ +import { getTierForUser } from '@audius/common/store' + import { useCallback, useState } from 'react' -import { getTierForUser } from '@audius/common' +import {} from '@audius/common' import { imageProfilePicEmpty } from '@audius/common/assets' import { SquareSizes, Kind } from '@audius/common/models' import { SelectProps } from 'antd' diff --git a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx index 008cd1ae00f..df449d8d85a 100644 --- a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx +++ b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx @@ -1,6 +1,8 @@ +import { cacheUsersActions } from '@audius/common/store' + import { useState, useEffect, memo, useCallback } from 'react' -import { cacheUsersActions } from '@audius/common' +import {} from '@audius/common' import { imageBlank as placeholderArt } from '@audius/common/assets' import { Kind } from '@audius/common/models' import { Tag } from '@audius/stems' diff --git a/packages/web/src/components/ai-attribution-settings-modal/AiAttributionSettingsModal.tsx b/packages/web/src/components/ai-attribution-settings-modal/AiAttributionSettingsModal.tsx index 885c1580228..bb633bed9b5 100644 --- a/packages/web/src/components/ai-attribution-settings-modal/AiAttributionSettingsModal.tsx +++ b/packages/web/src/components/ai-attribution-settings-modal/AiAttributionSettingsModal.tsx @@ -1,6 +1,9 @@ import { useCallback } from 'react' -import { settingsPageActions, settingsPageSelectors } from '@audius/common' +import { + settingsPageSelectors, + settingsPageActions +} from '@audius/common/store' import { Button, ButtonSize, diff --git a/packages/web/src/components/artist-recommendations/ArtistRecommendations.tsx b/packages/web/src/components/artist-recommendations/ArtistRecommendations.tsx index 0140aa4c2fb..652c61a8af7 100644 --- a/packages/web/src/components/artist-recommendations/ArtistRecommendations.tsx +++ b/packages/web/src/components/artist-recommendations/ArtistRecommendations.tsx @@ -1,12 +1,5 @@ import { forwardRef, ReactNode, useCallback, useEffect, useState } from 'react' -import { - relatedArtistsUISelectors, - relatedArtistsUIActions, - usersSocialActions as socialActions, - cacheUsersSelectors, - CommonState -} from '@audius/common' import { Name, FollowSource, @@ -15,6 +8,13 @@ import { ProfilePictureSizes, User } from '@audius/common/models' +import { + cacheUsersSelectors, + usersSocialActions as socialActions, + relatedArtistsUISelectors, + relatedArtistsUIActions, + CommonState +} from '@audius/common/store' import cn from 'classnames' import { push } from 'connected-react-router' import { isEmpty } from 'lodash' diff --git a/packages/web/src/components/artist-recommendations/ArtistRecommendationsPopup.tsx b/packages/web/src/components/artist-recommendations/ArtistRecommendationsPopup.tsx index 1c7e0d37582..b2c770be08c 100644 --- a/packages/web/src/components/artist-recommendations/ArtistRecommendationsPopup.tsx +++ b/packages/web/src/components/artist-recommendations/ArtistRecommendationsPopup.tsx @@ -1,7 +1,7 @@ import { RefObject, useContext } from 'react' -import { cacheUsersSelectors } from '@audius/common' import { ID, User } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import { Popup, PopupPosition } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/artist/ArtistCard.tsx b/packages/web/src/components/artist/ArtistCard.tsx index 4832f826290..3cc0452fe22 100644 --- a/packages/web/src/components/artist/ArtistCard.tsx +++ b/packages/web/src/components/artist/ArtistCard.tsx @@ -1,7 +1,7 @@ import { MouseEventHandler, useCallback, useMemo } from 'react' -import { profilePageActions, usersSocialActions } from '@audius/common' import { FollowSource, User } from '@audius/common/models' +import { profilePageActions, usersSocialActions } from '@audius/common/store' import { useDispatch } from 'react-redux' import { FollowButton } from 'components/follow-button/FollowButton' diff --git a/packages/web/src/components/artist/ArtistChipSupportFor.tsx b/packages/web/src/components/artist/ArtistChipSupportFor.tsx index 9ea621ba36e..32409c8bf36 100644 --- a/packages/web/src/components/artist/ArtistChipSupportFor.tsx +++ b/packages/web/src/components/artist/ArtistChipSupportFor.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react' -import { tippingSelectors } from '@audius/common' import { ID, StringWei } from '@audius/common/models' +import { tippingSelectors } from '@audius/common/store' import { stringWeiToBN, formatWei, Nullable } from '@audius/common/utils' import { IconTrophy, IconTrending } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/artist/ArtistChipSupportFrom.tsx b/packages/web/src/components/artist/ArtistChipSupportFrom.tsx index 153216ded06..e73ffbf89bc 100644 --- a/packages/web/src/components/artist/ArtistChipSupportFrom.tsx +++ b/packages/web/src/components/artist/ArtistChipSupportFrom.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react' -import { tippingSelectors } from '@audius/common' import { ID, StringWei } from '@audius/common/models' +import { tippingSelectors } from '@audius/common/store' import { stringWeiToBN, formatWei, Nullable } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/artist/ArtistPopover.tsx b/packages/web/src/components/artist/ArtistPopover.tsx index b968d4af935..1d43c85d92d 100644 --- a/packages/web/src/components/artist/ArtistPopover.tsx +++ b/packages/web/src/components/artist/ArtistPopover.tsx @@ -1,11 +1,11 @@ import { useCallback, ReactNode, useState } from 'react' +import { SquareSizes, WidthSizes } from '@audius/common/models' import { accountSelectors, - CommonState, - cacheUsersSelectors -} from '@audius/common' -import { SquareSizes, WidthSizes } from '@audius/common/models' + cacheUsersSelectors, + CommonState +} from '@audius/common/store' import Popover from 'antd/lib/popover' import cn from 'classnames' diff --git a/packages/web/src/components/artist/ArtistSupporting.tsx b/packages/web/src/components/artist/ArtistSupporting.tsx index 0c9595c40a9..ae24655e892 100644 --- a/packages/web/src/components/artist/ArtistSupporting.tsx +++ b/packages/web/src/components/artist/ArtistSupporting.tsx @@ -1,13 +1,13 @@ import { useCallback, useEffect } from 'react' +import { ID, User } from '@audius/common/models' import { cacheUsersSelectors, tippingSelectors, tippingActions, userListActions, SUPPORTING_USER_LIST_TAG as SUPPORTING_TAG -} from '@audius/common' -import { ID, User } from '@audius/common/models' +} from '@audius/common/store' import { stringWeiToBN, MAX_ARTIST_HOVER_TOP_SUPPORTING diff --git a/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx b/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx index 3c043128107..904c3f99110 100644 --- a/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx +++ b/packages/web/src/components/audio-balance-pill/AUDIOBalancePill.tsx @@ -1,10 +1,10 @@ import { cloneElement } from 'react' -import { accountSelectors } from '@audius/common' import { useSelectTierInfo, useTotalBalanceWithFallback } from '@audius/common/hooks' +import { accountSelectors } from '@audius/common/store' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import BN from 'bn.js' import cn from 'classnames' diff --git a/packages/web/src/components/audio-transaction-icon/AudioTransactionIcon.tsx b/packages/web/src/components/audio-transaction-icon/AudioTransactionIcon.tsx index ead6f596849..a90bc647d74 100644 --- a/packages/web/src/components/audio-transaction-icon/AudioTransactionIcon.tsx +++ b/packages/web/src/components/audio-transaction-icon/AudioTransactionIcon.tsx @@ -1,6 +1,6 @@ import React, { ReactNode } from 'react' -import { TransactionMethod, TransactionType } from '@audius/common' +import { TransactionType, TransactionMethod } from '@audius/common/store' import cn from 'classnames' import AppIcon from 'assets/img/appIcon.png' diff --git a/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx b/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx index c23e5713585..0890f27df79 100644 --- a/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx +++ b/packages/web/src/components/audio-transactions-table/AudioTransactionsTable.tsx @@ -1,11 +1,11 @@ import { MouseEvent, useCallback, useMemo } from 'react' +import { Kind } from '@audius/common/models' import { - TransactionMethod, TransactionType, + TransactionMethod, TransactionDetails -} from '@audius/common' -import { Kind } from '@audius/common/models' +} from '@audius/common/store' import { formatAudio } from '@audius/common/utils' import cn from 'classnames' import moment from 'moment' diff --git a/packages/web/src/components/avatar/Avatar.tsx b/packages/web/src/components/avatar/Avatar.tsx index 91df4a45937..f103c139dd3 100644 --- a/packages/web/src/components/avatar/Avatar.tsx +++ b/packages/web/src/components/avatar/Avatar.tsx @@ -1,6 +1,6 @@ -import { accountSelectors, cacheUsersSelectors } from '@audius/common' import { imageProfilePicEmpty } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' +import { accountSelectors, cacheUsersSelectors } from '@audius/common/store' import { Maybe } from '@audius/common/utils' import { Box, diff --git a/packages/web/src/components/avatar/AvatarLegacy.tsx b/packages/web/src/components/avatar/AvatarLegacy.tsx index 9832124af27..d8f268bc1f1 100644 --- a/packages/web/src/components/avatar/AvatarLegacy.tsx +++ b/packages/web/src/components/avatar/AvatarLegacy.tsx @@ -1,6 +1,6 @@ -import { accountSelectors, cacheUsersSelectors } from '@audius/common' import { imageProfilePicEmpty } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' +import { accountSelectors, cacheUsersSelectors } from '@audius/common/store' import { Maybe } from '@audius/common/utils' import { Link } from 'react-router-dom' diff --git a/packages/web/src/components/banner/DirectMessagesBanner.tsx b/packages/web/src/components/banner/DirectMessagesBanner.tsx index 47f9b0c9a3e..dba3855bd5b 100644 --- a/packages/web/src/components/banner/DirectMessagesBanner.tsx +++ b/packages/web/src/components/banner/DirectMessagesBanner.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import { accountSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/banner/DownloadAppBanner.tsx b/packages/web/src/components/banner/DownloadAppBanner.tsx index 4e6d773bc4d..14f206d4c6e 100644 --- a/packages/web/src/components/banner/DownloadAppBanner.tsx +++ b/packages/web/src/components/banner/DownloadAppBanner.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import { accountSelectors } from '@audius/common' import { Client } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { useDispatch } from 'react-redux' import { useSelector } from 'common/hooks/useSelector' diff --git a/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx b/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx index 5549a036486..e7e93aff2ee 100644 --- a/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx +++ b/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx @@ -4,9 +4,11 @@ import { accountActions, settingsPageSelectors, settingsPageActions as settingPageActions, - modalsActions, - modalsSelectors -} from '@audius/common' + modalsSelectors, + modalsActions +} from '@audius/common/store' + +import {} from '@audius/common' import { Modal, Anchor, Button, ButtonType, ButtonSize } from '@audius/stems' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/buy-audio-modal/BuyAudioModal.tsx b/packages/web/src/components/buy-audio-modal/BuyAudioModal.tsx index e934dce0059..e26728c786f 100644 --- a/packages/web/src/components/buy-audio-modal/BuyAudioModal.tsx +++ b/packages/web/src/components/buy-audio-modal/BuyAudioModal.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { buyAudioSelectors, BuyAudioStage } from '@audius/common' +import { buyAudioSelectors, BuyAudioStage } from '@audius/common/store' import { Modal, ModalContentPages, diff --git a/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx b/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx index 61aabf873fd..83333bee213 100644 --- a/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx +++ b/packages/web/src/components/buy-audio-modal/components/AmountInputPage.tsx @@ -1,11 +1,11 @@ import { useCallback, useMemo } from 'react' +import { StringKeys } from '@audius/common/services' import { buyAudioActions, buyAudioSelectors, OnRampProvider -} from '@audius/common' -import { StringKeys } from '@audius/common/services' +} from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { useRemoteVar } from 'hooks/useRemoteConfig' diff --git a/packages/web/src/components/buy-audio-modal/components/CoinbaseBuyAudioButton.tsx b/packages/web/src/components/buy-audio-modal/components/CoinbaseBuyAudioButton.tsx index 04d2a2047ee..9b633eb08e2 100644 --- a/packages/web/src/components/buy-audio-modal/components/CoinbaseBuyAudioButton.tsx +++ b/packages/web/src/components/buy-audio-modal/components/CoinbaseBuyAudioButton.tsx @@ -1,11 +1,11 @@ import { useCallback, useContext } from 'react' +import { Status } from '@audius/common/models' import { buyAudioActions, buyAudioSelectors, OnRampProvider -} from '@audius/common' -import { Status } from '@audius/common/models' +} from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { useAsync } from 'react-use' diff --git a/packages/web/src/components/buy-audio-modal/components/InProgressPage.tsx b/packages/web/src/components/buy-audio-modal/components/InProgressPage.tsx index 3ac23ce71e9..8fb275b2537 100644 --- a/packages/web/src/components/buy-audio-modal/components/InProgressPage.tsx +++ b/packages/web/src/components/buy-audio-modal/components/InProgressPage.tsx @@ -2,9 +2,9 @@ import { ReactNode } from 'react' import { buyAudioSelectors, - BuyAudioStage, - OnRampProvider -} from '@audius/common' + OnRampProvider, + BuyAudioStage +} from '@audius/common/store' import { formatNumberString } from '@audius/common/utils' import { IconCaretDown, IconMultiselectRemove } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx b/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx index 91612f4e325..5a6e4cdd5f2 100644 --- a/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx +++ b/packages/web/src/components/buy-audio-modal/components/PurchaseQuote.tsx @@ -1,5 +1,5 @@ -import { PurchaseInfoErrorType, buyAudioSelectors } from '@audius/common' import { Status } from '@audius/common/models' +import { buyAudioSelectors, PurchaseInfoErrorType } from '@audius/common/store' import { formatNumberString } from '@audius/common/utils' import { IconCaretDown } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.tsx b/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.tsx index c3326635045..c6c6c1ceed5 100644 --- a/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.tsx +++ b/packages/web/src/components/buy-audio-modal/components/StripeBuyAudioButton.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' import { + stripeModalUIActions, buyAudioActions, buyAudioSelectors, - stripeModalUIActions, - OnRampProvider, - modalsActions -} from '@audius/common' + modalsActions, + OnRampProvider +} from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { OnRampButton } from 'components/on-ramp-button' diff --git a/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx b/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx index 83f7e967176..c08097a213e 100644 --- a/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx +++ b/packages/web/src/components/buy-audio-modal/components/SuccessPage.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' +import { Status } from '@audius/common/models' import { - transactionDetailsSelectors, + buyAudioSelectors, transactionDetailsActions, - modalsActions, - buyAudioSelectors -} from '@audius/common' -import { Status } from '@audius/common/models' + transactionDetailsSelectors, + modalsActions +} from '@audius/common/store' import { formatAudio, isNullOrUndefined } from '@audius/common/utils' import { Button, ButtonSize, ButtonType, IconInfo } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/card/desktop/CollectionArtCard.tsx b/packages/web/src/components/card/desktop/CollectionArtCard.tsx index 5de54fd4300..7ebc32c7805 100644 --- a/packages/web/src/components/card/desktop/CollectionArtCard.tsx +++ b/packages/web/src/components/card/desktop/CollectionArtCard.tsx @@ -1,10 +1,12 @@ -import { useCallback, useEffect, useState } from 'react' - import { accountSelectors, cacheCollectionsSelectors, cacheUsersSelectors -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback, useEffect, useState } from 'react' + +import {} from '@audius/common' import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' import cn from 'classnames' diff --git a/packages/web/src/components/card/desktop/UserArtCard.tsx b/packages/web/src/components/card/desktop/UserArtCard.tsx index 8f0760ab2a4..abc45504b68 100644 --- a/packages/web/src/components/card/desktop/UserArtCard.tsx +++ b/packages/web/src/components/card/desktop/UserArtCard.tsx @@ -1,6 +1,8 @@ +import { cacheUsersSelectors } from '@audius/common/store' + import { useCallback, useEffect } from 'react' -import { cacheUsersSelectors } from '@audius/common' +import {} from '@audius/common' import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' import { formatCount } from '@audius/common/utils' diff --git a/packages/web/src/components/change-password/ChangePassword.tsx b/packages/web/src/components/change-password/ChangePassword.tsx index 1adac9f7980..787bb2cb045 100644 --- a/packages/web/src/components/change-password/ChangePassword.tsx +++ b/packages/web/src/components/change-password/ChangePassword.tsx @@ -1,11 +1,11 @@ import { useCallback, useEffect, useState } from 'react' +import { Status } from '@audius/common/models' import { - ChangePasswordPageStep, changePasswordSelectors, - changePasswordActions -} from '@audius/common' -import { Status } from '@audius/common/models' + changePasswordActions, + ChangePasswordPageStep +} from '@audius/common/store' import { Button, ButtonType, IconLock } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/change-password/ChangePasswordModal.tsx b/packages/web/src/components/change-password/ChangePasswordModal.tsx index 6533da95dca..ecb12ff0c7f 100644 --- a/packages/web/src/components/change-password/ChangePasswordModal.tsx +++ b/packages/web/src/components/change-password/ChangePasswordModal.tsx @@ -1,11 +1,11 @@ import { useEffect } from 'react' +import { Name } from '@audius/common/models' import { - ChangePasswordPageStep, changePasswordSelectors, - changePasswordActions -} from '@audius/common' -import { Name } from '@audius/common/models' + changePasswordActions, + ChangePasswordPageStep +} from '@audius/common/store' import { Modal } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/change-password/ConfirmCredentials.tsx b/packages/web/src/components/change-password/ConfirmCredentials.tsx index f076e153dff..3e197004e5e 100644 --- a/packages/web/src/components/change-password/ConfirmCredentials.tsx +++ b/packages/web/src/components/change-password/ConfirmCredentials.tsx @@ -1,7 +1,10 @@ import { FormEvent, useEffect, useState } from 'react' -import { changePasswordSelectors, changePasswordActions } from '@audius/common' import { Status } from '@audius/common/models' +import { + changePasswordSelectors, + changePasswordActions +} from '@audius/common/store' import { Button, ButtonType, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/chat-listener/ChatListener.tsx b/packages/web/src/components/chat-listener/ChatListener.tsx index e3008304055..5c69939f800 100644 --- a/packages/web/src/components/chat-listener/ChatListener.tsx +++ b/packages/web/src/components/chat-listener/ChatListener.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react' -import { accountSelectors, chatActions } from '@audius/common' import { Status } from '@audius/common/models' +import { accountSelectors, chatActions } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' const { connect, disconnect, fetchMoreChats, fetchUnreadMessagesCount } = diff --git a/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx b/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx index 0176c450923..d3ff2869e8f 100644 --- a/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx +++ b/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx @@ -1,6 +1,11 @@ +import { + coinflowModalUIActions, + useCoinflowOnrampModal +} from '@audius/common/store' + import { useCallback, useEffect, useState } from 'react' -import { useCoinflowOnrampModal, coinflowModalUIActions } from '@audius/common' +import {} from '@audius/common' import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowPurchase } from '@coinflowlabs/react' import { Transaction } from '@solana/web3.js' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx index ccca5c2b22b..95ff70f6eec 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx @@ -1,9 +1,11 @@ -import { useCallback, useEffect, useState } from 'react' - import { profilePageSelectors, collectibleDetailsUIActions -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback, useEffect, useState } from 'react' + +import {} from '@audius/common' import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' import { getHash } from '@audius/common/utils' import { LogoEth, LogoSol } from '@audius/stems' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx index a235851b92a..55d8eff09dd 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx @@ -1,3 +1,10 @@ +import { + accountSelectors, + badgeTiers, + collectibleDetailsUISelectors, + collectibleDetailsUIActions +} from '@audius/common/store' + import { Suspense, lazy, @@ -7,12 +14,7 @@ import { useState } from 'react' -import { - accountSelectors, - badgeTiers, - collectibleDetailsUISelectors, - collectibleDetailsUIActions -} from '@audius/common' +import {} from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' import { formatDateWithTimezoneOffset } from '@audius/common/utils' diff --git a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx index a399a341484..2ce2562677f 100644 --- a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx +++ b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx @@ -1,3 +1,9 @@ +import { + collectibleDetailsUISelectors, + collectibleDetailsUIActions, + ProfileUser +} from '@audius/common/store' + import { useCallback, useContext, @@ -7,11 +13,7 @@ import { useState } from 'react' -import { - ProfileUser, - collectibleDetailsUISelectors, - collectibleDetailsUIActions -} from '@audius/common' +import {} from '@audius/common' import { useInstanceVar } from '@audius/common/hooks' import { CollectiblesMetadata, Collectible } from '@audius/common/models' import { getHash } from '@audius/common/utils' diff --git a/packages/web/src/components/collection/desktop/Artwork.tsx b/packages/web/src/components/collection/desktop/Artwork.tsx index 0aa0fd301a1..3270c219517 100644 --- a/packages/web/src/components/collection/desktop/Artwork.tsx +++ b/packages/web/src/components/collection/desktop/Artwork.tsx @@ -1,6 +1,11 @@ +import { + cacheCollectionsSelectors, + useEditPlaylistModal +} from '@audius/common/store' + import { ComponentType, SVGProps, useCallback, useEffect } from 'react' -import { cacheCollectionsSelectors, useEditPlaylistModal } from '@audius/common' +import {} from '@audius/common' import { imageBlank } from '@audius/common/assets' import { SquareSizes, CoverArtSizes } from '@audius/common/models' import { Button, ButtonType, IconPencil } from '@audius/stems' diff --git a/packages/web/src/components/collection/desktop/CollectionHeader.tsx b/packages/web/src/components/collection/desktop/CollectionHeader.tsx index abb7f4a7f6f..ad9519bbe13 100644 --- a/packages/web/src/components/collection/desktop/CollectionHeader.tsx +++ b/packages/web/src/components/collection/desktop/CollectionHeader.tsx @@ -1,6 +1,8 @@ import { ChangeEvent, useCallback, useState } from 'react' -import { useEditPlaylistModal } from '@audius/common' +import { useEditPlaylistModal } from '@audius/common/store' + +import {} from '@audius/common' import { formatSecondsAsText, formatDate } from '@audius/common/utils' import { IconHidden, IconPencil } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/collection/desktop/EditButton.tsx b/packages/web/src/components/collection/desktop/EditButton.tsx index 46dbe9cfa30..8675daf67fc 100644 --- a/packages/web/src/components/collection/desktop/EditButton.tsx +++ b/packages/web/src/components/collection/desktop/EditButton.tsx @@ -1,6 +1,8 @@ import { useCallback } from 'react' -import { useEditPlaylistModal } from '@audius/common' +import { useEditPlaylistModal } from '@audius/common/store' + +import {} from '@audius/common' import { ButtonProps, ButtonType, IconPencil } from '@audius/stems' import { EntityActionButton } from '../../entity-page/EntityActionButton' diff --git a/packages/web/src/components/collection/desktop/FavoriteButton.tsx b/packages/web/src/components/collection/desktop/FavoriteButton.tsx index 0d7be8b50d5..42171702758 100644 --- a/packages/web/src/components/collection/desktop/FavoriteButton.tsx +++ b/packages/web/src/components/collection/desktop/FavoriteButton.tsx @@ -1,11 +1,13 @@ -import { useCallback } from 'react' - import { accountSelectors, collectionPageSelectors, - CommonState, - collectionsSocialActions -} from '@audius/common' + collectionsSocialActions, + CommonState +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { FavoriteSource, Collection, diff --git a/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx b/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx index c8c983d749f..4e4bf2bb9bb 100644 --- a/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx +++ b/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { collectionPageSelectors, - CommonState, - usersSocialActions -} from '@audius/common' + usersSocialActions, + CommonState +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { FollowSource, Collection, User } from '@audius/common/models' import { Button, ButtonType, IconKebabHorizontal } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx index b2e1280d396..e0dce4e935b 100644 --- a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx @@ -1,4 +1,5 @@ -import { collectionPageSelectors, CommonState } from '@audius/common' +import { collectionPageSelectors, CommonState } from '@audius/common/store' +import {} from '@audius/common' import { Collection } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/PublishButton.tsx b/packages/web/src/components/collection/desktop/PublishButton.tsx index b44a5676820..b1dec900fa8 100644 --- a/packages/web/src/components/collection/desktop/PublishButton.tsx +++ b/packages/web/src/components/collection/desktop/PublishButton.tsx @@ -1,9 +1,9 @@ +import { Collection } from '@audius/common/models' import { cacheCollectionsSelectors, collectionPageSelectors, CommonState -} from '@audius/common' -import { Collection } from '@audius/common/models' +} from '@audius/common/store' import { ButtonProps, ButtonType, IconRocket } from '@audius/stems' import { useSelector } from 'react-redux' import { useToggle } from 'react-use' diff --git a/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx b/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx index a00a98f808e..882a6bcb40f 100644 --- a/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx +++ b/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { - CommonState, cacheCollectionsActions, - collectionPageSelectors -} from '@audius/common' + collectionPageSelectors, + CommonState +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Collection } from '@audius/common/models' import { Button, diff --git a/packages/web/src/components/collection/desktop/RepostButton.tsx b/packages/web/src/components/collection/desktop/RepostButton.tsx index b4b2cfb03b8..00935ed4b5c 100644 --- a/packages/web/src/components/collection/desktop/RepostButton.tsx +++ b/packages/web/src/components/collection/desktop/RepostButton.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { collectionPageSelectors, - CommonState, - collectionsSocialActions -} from '@audius/common' + collectionsSocialActions, + CommonState +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { RepostSource, Collection, ID } from '@audius/common/models' import { ButtonProps, ButtonType, IconRepost } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/ShareButton.tsx b/packages/web/src/components/collection/desktop/ShareButton.tsx index b45cfcd30c9..714f6555055 100644 --- a/packages/web/src/components/collection/desktop/ShareButton.tsx +++ b/packages/web/src/components/collection/desktop/ShareButton.tsx @@ -1,6 +1,8 @@ +import { shareModalUIActions } from '@audius/common/store' + import { useCallback } from 'react' -import { shareModalUIActions } from '@audius/common' +import {} from '@audius/common' import { ShareSource, SmartCollectionVariant, ID } from '@audius/common/models' import { ButtonProps, ButtonType, IconShare } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx b/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx index e62fa732944..7d12b547901 100644 --- a/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx @@ -1,4 +1,5 @@ -import { collectionPageSelectors, CommonState } from '@audius/common' +import { collectionPageSelectors, CommonState } from '@audius/common/store' +import {} from '@audius/common' import { Collection, ID } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/mobile/CollectionHeader.jsx b/packages/web/src/components/collection/mobile/CollectionHeader.jsx index 0458ed37bef..c16bd12cb39 100644 --- a/packages/web/src/components/collection/mobile/CollectionHeader.jsx +++ b/packages/web/src/components/collection/mobile/CollectionHeader.jsx @@ -1,6 +1,8 @@ +import { OverflowAction } from '@audius/common/store' + import { memo } from 'react' -import { OverflowAction } from '@audius/common' +import {} from '@audius/common' import { Variant, SquareSizes } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { diff --git a/packages/web/src/components/confirmer-preview/ConfirmerPreview.tsx b/packages/web/src/components/confirmer-preview/ConfirmerPreview.tsx index 6726937b07d..6fff38ab170 100644 --- a/packages/web/src/components/confirmer-preview/ConfirmerPreview.tsx +++ b/packages/web/src/components/confirmer-preview/ConfirmerPreview.tsx @@ -1,4 +1,4 @@ -import { CommonState } from '@audius/common' +import { CommonState } from '@audius/common/store' import { connect } from 'react-redux' import { useDevModeHotkey } from 'hooks/useHotkey' diff --git a/packages/web/src/components/cookie-banner/CookieBanner.tsx b/packages/web/src/components/cookie-banner/CookieBanner.tsx index 0de1b7edb1f..42a27e7f5da 100644 --- a/packages/web/src/components/cookie-banner/CookieBanner.tsx +++ b/packages/web/src/components/cookie-banner/CookieBanner.tsx @@ -1,6 +1,8 @@ import { memo } from 'react' -import { playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common/store' + +import {} from '@audius/common' import cn from 'classnames' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx index 12eb1dd2812..3fbbfa50bb7 100644 --- a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx +++ b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx @@ -1,6 +1,8 @@ +import { accountSelectors } from '@audius/common/store' + import { useMemo } from 'react' -import { accountSelectors } from '@audius/common' +import {} from '@audius/common' import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { isContentCollectibleGated, diff --git a/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx b/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx index f63fbdf2dea..d7b673c920e 100644 --- a/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx +++ b/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx @@ -3,7 +3,9 @@ import { useCallback, useContext, useMemo } from 'react' import { cacheCollectionsActions, deletePlaylistConfirmationModalUISelectors -} from '@audius/common' +} from '@audius/common/store' + +import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/download-buttons/DownloadButtons.tsx b/packages/web/src/components/download-buttons/DownloadButtons.tsx index ebc7f8d79d5..eabea2ac816 100644 --- a/packages/web/src/components/download-buttons/DownloadButtons.tsx +++ b/packages/web/src/components/download-buttons/DownloadButtons.tsx @@ -1,6 +1,8 @@ +import { toastActions } from '@audius/common/store' + import { memo, useCallback } from 'react' -import { toastActions } from '@audius/common' +import {} from '@audius/common' import { ButtonState, ButtonType, diff --git a/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx b/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx index 25e3e21a393..5faa34d94c5 100644 --- a/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx +++ b/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx @@ -5,7 +5,9 @@ import { cacheCollectionsActions, cacheCollectionsSelectors, duplicateAddConfirmationModalUISelectors -} from '@audius/common' +} from '@audius/common/store' + +import {} from '@audius/common' import { fillString } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/edit-folder-modal/EditFolderModal.tsx b/packages/web/src/components/edit-folder-modal/EditFolderModal.tsx index 9c482e80268..b2d25133917 100644 --- a/packages/web/src/components/edit-folder-modal/EditFolderModal.tsx +++ b/packages/web/src/components/edit-folder-modal/EditFolderModal.tsx @@ -1,11 +1,11 @@ import { useCallback, useState } from 'react' +import { Name, PlaylistLibraryFolder } from '@audius/common/models' import { accountSelectors, playlistLibraryActions, playlistLibraryHelpers -} from '@audius/common' -import { Name, PlaylistLibraryFolder } from '@audius/common/models' +} from '@audius/common/store' import { IconFolder, Modal, diff --git a/packages/web/src/components/edit-playlist/desktop/EditPlaylistModal.tsx b/packages/web/src/components/edit-playlist/desktop/EditPlaylistModal.tsx index d435cbc246c..14d7af3e478 100644 --- a/packages/web/src/components/edit-playlist/desktop/EditPlaylistModal.tsx +++ b/packages/web/src/components/edit-playlist/desktop/EditPlaylistModal.tsx @@ -5,7 +5,7 @@ import { cacheCollectionsActions, cacheCollectionsSelectors, useEditPlaylistModal -} from '@audius/common' +} from '@audius/common/store' import { IconPlaylists, Modal, diff --git a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx index df5ae86e88e..059fdaac610 100644 --- a/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx +++ b/packages/web/src/components/edit-playlist/mobile/EditPlaylistPage.tsx @@ -1,18 +1,18 @@ import { useEffect, useState, useCallback } from 'react' -import { - accountSelectors, - cacheCollectionsActions, - collectionPageLineupActions as tracksActions, - EditPlaylistValues, - cacheCollectionsSelectors, - useEditPlaylistModal -} from '@audius/common' import { imageBlank as placeholderCoverArt } from '@audius/common/assets' import { useGatedContentAccessMap } from '@audius/common/hooks' import { SquareSizes, Collection, ID } from '@audius/common/models' import { newCollectionMetadata } from '@audius/common/schemas' import { RandomImage } from '@audius/common/services' +import { + accountSelectors, + cacheCollectionsActions, + cacheCollectionsSelectors, + collectionPageLineupActions as tracksActions, + useEditPlaylistModal, + EditPlaylistValues +} from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { capitalize } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/components/edit-track/EditTrackModal.tsx b/packages/web/src/components/edit-track/EditTrackModal.tsx index a7ecfb6045b..8ef8cb0b084 100644 --- a/packages/web/src/components/edit-track/EditTrackModal.tsx +++ b/packages/web/src/components/edit-track/EditTrackModal.tsx @@ -1,13 +1,15 @@ -import { useEffect, useState } from 'react' - import { cacheTracksActions as cacheTrackActions, - stemsUploadSelectors, stemsUploadActions, + stemsUploadSelectors, + publishTrackConfirmationModalUIActions, editTrackModalSelectors, - useEditTrackModal, - publishTrackConfirmationModalUIActions -} from '@audius/common' + useEditTrackModal +} from '@audius/common/store' + +import { useEffect, useState } from 'react' + +import {} from '@audius/common' import { StemCategory, ID, diff --git a/packages/web/src/components/embed-modal/store/selectors.ts b/packages/web/src/components/embed-modal/store/selectors.ts index 2d2b8efae05..f3e221f84c4 100644 --- a/packages/web/src/components/embed-modal/store/selectors.ts +++ b/packages/web/src/components/embed-modal/store/selectors.ts @@ -1,4 +1,8 @@ -import { cacheCollectionsSelectors, cacheTracksSelectors } from '@audius/common' +import { + cacheCollectionsSelectors, + cacheTracksSelectors +} from '@audius/common/store' +import {} from '@audius/common' import { PlayableType } from '@audius/common/models' import { AppState } from 'store/types' diff --git a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx index ebd5c6b0f61..4574934ef1e 100644 --- a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx +++ b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx @@ -1,6 +1,8 @@ +import { accountSelectors } from '@audius/common/store' + import { useCallback, useEffect, useRef, useState } from 'react' -import { accountSelectors } from '@audius/common' +import {} from '@audius/common' import { OverrideSetting, FEATURE_FLAG_OVERRIDE_KEY diff --git a/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx b/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx index 501df9cc24c..3ac3de70d43 100644 --- a/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx +++ b/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx @@ -1,6 +1,8 @@ +import { accountSelectors, musicConfettiActions } from '@audius/common/store' + import { useCallback, useEffect } from 'react' -import { accountSelectors, musicConfettiActions } from '@audius/common' +import {} from '@audius/common' import { Name, SquareSizes } from '@audius/common/models' import { Modal } from '@audius/stems' import { connect, useDispatch } from 'react-redux' diff --git a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx index 5c5829ab2ed..df6b7449944 100644 --- a/packages/web/src/components/image-selection/ImageSelectionPopup.jsx +++ b/packages/web/src/components/image-selection/ImageSelectionPopup.jsx @@ -1,8 +1,8 @@ import { useState, useCallback, useRef, useContext } from 'react' -import { accountSelectors, badgeTiers } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { RandomImage } from '@audius/common/services' +import { accountSelectors, badgeTiers } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { Button, ButtonType, Popup, SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx b/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx index d5e696f1cf8..13c654d2ed3 100644 --- a/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx +++ b/packages/web/src/components/inbox-unavailable-modal/InboxUnavailableModal.tsx @@ -1,16 +1,16 @@ import { ReactNode, useCallback } from 'react' +import { User } from '@audius/common/models' import { - ChatPermissionAction, accountSelectors, cacheUsersSelectors, chatActions, chatSelectors, makeChatId, + ChatPermissionAction, tippingActions, useInboxUnavailableModal -} from '@audius/common' -import { User } from '@audius/common/models' +} from '@audius/common/store' import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { IconMessageLocked, diff --git a/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx b/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx index 51bb1ecdf7a..25df9700e1b 100644 --- a/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx +++ b/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx @@ -1,6 +1,8 @@ import { useCallback } from 'react' -import { useLeavingAudiusModal } from '@audius/common' +import { useLeavingAudiusModal } from '@audius/common/store' + +import {} from '@audius/common' import { Button } from '@audius/harmony' import { IconExternalLink, diff --git a/packages/web/src/components/lineup/LineupProvider.tsx b/packages/web/src/components/lineup/LineupProvider.tsx index b79e8ee308d..69b2e7907a2 100644 --- a/packages/web/src/components/lineup/LineupProvider.tsx +++ b/packages/web/src/components/lineup/LineupProvider.tsx @@ -1,10 +1,12 @@ -import { ComponentType, createRef, PureComponent } from 'react' - import { LineupBaseActions, tippingSelectors, playerSelectors -} from '@audius/common' +} from '@audius/common/store' + +import { ComponentType, createRef, PureComponent } from 'react' + +import {} from '@audius/common' import { Name, PlaybackSource, diff --git a/packages/web/src/components/lineup/hooks.ts b/packages/web/src/components/lineup/hooks.ts index eb2a9deacfa..19b9375d404 100644 --- a/packages/web/src/components/lineup/hooks.ts +++ b/packages/web/src/components/lineup/hooks.ts @@ -1,10 +1,12 @@ -import { useMemo } from 'react' - import { lineupSelectors, - playerSelectors, - queueSelectors -} from '@audius/common' + queueSelectors, + playerSelectors +} from '@audius/common/store' + +import { useMemo } from 'react' + +import {} from '@audius/common' import { LineupState } from '@audius/common/models' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/link/ExternalLink.tsx b/packages/web/src/components/link/ExternalLink.tsx index 9df54d1faaa..afd8b2b7c86 100644 --- a/packages/web/src/components/link/ExternalLink.tsx +++ b/packages/web/src/components/link/ExternalLink.tsx @@ -1,6 +1,8 @@ +import { useLeavingAudiusModal } from '@audius/common/store' + import { MouseEvent, useCallback } from 'react' -import { useLeavingAudiusModal } from '@audius/common' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { isAllowedExternalLink } from '@audius/common/utils' diff --git a/packages/web/src/components/link/UserLink.tsx b/packages/web/src/components/link/UserLink.tsx index 764b91cc1c6..7aa60dd181b 100644 --- a/packages/web/src/components/link/UserLink.tsx +++ b/packages/web/src/components/link/UserLink.tsx @@ -1,4 +1,5 @@ -import { cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common/store' +import {} from '@audius/common' import { ID } from '@audius/common/models' import cn from 'classnames' diff --git a/packages/web/src/components/locked-content-modal/LockedContentModal.tsx b/packages/web/src/components/locked-content-modal/LockedContentModal.tsx index 002c3193c7f..64a0320a916 100644 --- a/packages/web/src/components/locked-content-modal/LockedContentModal.tsx +++ b/packages/web/src/components/locked-content-modal/LockedContentModal.tsx @@ -1,6 +1,8 @@ +import { gatedContentActions } from '@audius/common/store' + import { useCallback } from 'react' -import { gatedContentActions } from '@audius/common' +import {} from '@audius/common' import { useGatedContentAccess, useLockedContent } from '@audius/common/hooks' import { IconLock, ModalContent, ModalHeader, ModalTitle } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/menu/CollectionMenu.tsx b/packages/web/src/components/menu/CollectionMenu.tsx index 1d23ad42a8a..ff795d03972 100644 --- a/packages/web/src/components/menu/CollectionMenu.tsx +++ b/packages/web/src/components/menu/CollectionMenu.tsx @@ -1,8 +1,3 @@ -import { - cacheUsersSelectors, - collectionsSocialActions as socialActions, - useEditPlaylistModal -} from '@audius/common' import { ShareSource, RepostSource, @@ -10,6 +5,11 @@ import { PlayableType, ID } from '@audius/common/models' +import { + cacheUsersSelectors, + collectionsSocialActions as socialActions, + useEditPlaylistModal +} from '@audius/common/store' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/menu/TrackMenu.tsx b/packages/web/src/components/menu/TrackMenu.tsx index b3523442080..199ec321514 100644 --- a/packages/web/src/components/menu/TrackMenu.tsx +++ b/packages/web/src/components/menu/TrackMenu.tsx @@ -1,16 +1,5 @@ import { useContext } from 'react' -import { - accountSelectors, - cacheCollectionsActions, - collectionPageSelectors, - playbackPositionActions, - playbackPositionSelectors, - tracksSocialActions, - addToCollectionUIActions, - CommonState, - useEditTrackModal -} from '@audius/common' import { ShareSource, RepostSource, @@ -19,6 +8,17 @@ import { ID } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + cacheCollectionsActions, + collectionPageSelectors, + tracksSocialActions, + addToCollectionUIActions, + useEditTrackModal, + playbackPositionActions, + playbackPositionSelectors, + CommonState +} from '@audius/common/store' import { Genre } from '@audius/common/utils' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/menu/UserMenu.tsx b/packages/web/src/components/menu/UserMenu.tsx index 2e62e54a741..ae39358af5b 100644 --- a/packages/web/src/components/menu/UserMenu.tsx +++ b/packages/web/src/components/menu/UserMenu.tsx @@ -1,8 +1,8 @@ +import { ShareSource, FollowSource, ID } from '@audius/common/models' import { usersSocialActions as socialActions, shareModalUIActions -} from '@audius/common' -import { ShareSource, FollowSource, ID } from '@audius/common/models' +} from '@audius/common/store' import { PopupMenuItem } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/mobile-page-container/MobilePageContainer.tsx b/packages/web/src/components/mobile-page-container/MobilePageContainer.tsx index 1cd033b6fa0..58e7ffb8fa4 100644 --- a/packages/web/src/components/mobile-page-container/MobilePageContainer.tsx +++ b/packages/web/src/components/mobile-page-container/MobilePageContainer.tsx @@ -1,7 +1,7 @@ import { ReactNode, useEffect, useContext } from 'react' -import { playerSelectors } from '@audius/common' import { useInstanceVar } from '@audius/common/hooks' +import { playerSelectors } from '@audius/common/store' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/music-confetti/ConnectedMusicConfetti.tsx b/packages/web/src/components/music-confetti/ConnectedMusicConfetti.tsx index 9a04ffdf842..de4dda41339 100644 --- a/packages/web/src/components/music-confetti/ConnectedMusicConfetti.tsx +++ b/packages/web/src/components/music-confetti/ConnectedMusicConfetti.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' +import { Theme } from '@audius/common/models' import { - musicConfettiActions, + themeSelectors, musicConfettiSelectors, - themeSelectors -} from '@audius/common' -import { Theme } from '@audius/common/models' + musicConfettiActions +} from '@audius/common/store' import { useDispatch } from 'react-redux' import { MusicConfetti } from 'components/background-animations/MusicConfetti' diff --git a/packages/web/src/components/nav/desktop/AccountDetails.tsx b/packages/web/src/components/nav/desktop/AccountDetails.tsx index 12f0cc281bf..b0d0f112b6d 100644 --- a/packages/web/src/components/nav/desktop/AccountDetails.tsx +++ b/packages/web/src/components/nav/desktop/AccountDetails.tsx @@ -1,4 +1,4 @@ -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { AvatarLegacy } from 'components/avatar/AvatarLegacy' import { Link, UserLink } from 'components/link' diff --git a/packages/web/src/components/nav/desktop/LeftNav.tsx b/packages/web/src/components/nav/desktop/LeftNav.tsx index 8ce7b93e18e..8bb00568181 100644 --- a/packages/web/src/components/nav/desktop/LeftNav.tsx +++ b/packages/web/src/components/nav/desktop/LeftNav.tsx @@ -1,16 +1,16 @@ import { MouseEvent, useCallback, useRef, useState } from 'react' -import { - accountSelectors, - collectionsSocialActions, - tracksSocialActions -} from '@audius/common' import { Name, FavoriteSource, Status, CreateAccountOpen } from '@audius/common/models' +import { + accountSelectors, + collectionsSocialActions, + tracksSocialActions +} from '@audius/common/store' import { Scrollbar } from '@audius/stems' import { ResizeObserver } from '@juggle/resize-observer' import cn from 'classnames' diff --git a/packages/web/src/components/nav/desktop/NavButton.tsx b/packages/web/src/components/nav/desktop/NavButton.tsx index 7113a1f598d..9a1a53e7e3e 100644 --- a/packages/web/src/components/nav/desktop/NavButton.tsx +++ b/packages/web/src/components/nav/desktop/NavButton.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' +import { Name, Status } from '@audius/common/models' import { accountSelectors, uploadActions, uploadSelectors -} from '@audius/common' -import { Name, Status } from '@audius/common/models' +} from '@audius/common/store' import { Button, ButtonType, diff --git a/packages/web/src/components/nav/desktop/NavHeader.tsx b/packages/web/src/components/nav/desktop/NavHeader.tsx index 319e6f830d9..65dc17dd761 100644 --- a/packages/web/src/components/nav/desktop/NavHeader.tsx +++ b/packages/web/src/components/nav/desktop/NavHeader.tsx @@ -1,12 +1,12 @@ import { useCallback, useRef } from 'react' +import { Name, Theme } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, notificationsSelectors, themeSelectors -} from '@audius/common' -import { Name, Theme } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' +} from '@audius/common/store' import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx index 78210a82b15..2a5705b95ca 100644 --- a/packages/web/src/components/nav/desktop/NavPopupMenu.tsx +++ b/packages/web/src/components/nav/desktop/NavPopupMenu.tsx @@ -1,7 +1,7 @@ -import { chatSelectors } from '@audius/common' import { useAccountHasClaimableRewards } from '@audius/common/hooks' import { Name } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' +import { chatSelectors } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { IconCrown, diff --git a/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx b/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx index 4b18a5b9bc7..d33e673aae0 100644 --- a/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx +++ b/packages/web/src/components/nav/desktop/NowPlayingArtworkTile.tsx @@ -1,14 +1,14 @@ import { CSSProperties, MouseEvent, ReactNode, useCallback } from 'react' -import { - playerSelectors, - cacheTracksSelectors, - CommonState, - accountSelectors, - averageColorSelectors -} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { DogEarType, SquareSizes } from '@audius/common/models' +import { + accountSelectors, + averageColorSelectors, + cacheTracksSelectors, + playerSelectors, + CommonState +} from '@audius/common/store' import { IconButton } from '@audius/stems' import { animated, useSpring } from '@react-spring/web' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/AudioNftPlaylistNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/AudioNftPlaylistNavItem.tsx index fe11d2eeb9b..55227b7e594 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/AudioNftPlaylistNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/AudioNftPlaylistNavItem.tsx @@ -1,5 +1,5 @@ -import { accountSelectors } from '@audius/common' import { SmartCollectionVariant } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import { SMART_COLLECTION_MAP } from 'common/store/smart-collection/smartCollections' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/CollectionNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/CollectionNavItem.tsx index b4f5e8d6f02..12c25c7f94f 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/CollectionNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/CollectionNavItem.tsx @@ -1,13 +1,5 @@ import { useCallback, useState } from 'react' -import { - cacheCollectionsActions, - cacheTracksSelectors, - cacheCollectionsSelectors, - playlistLibraryActions, - shareModalUIActions, - useEditPlaylistModal -} from '@audius/common' import { Name, ShareSource, @@ -15,6 +7,14 @@ import { PlaylistLibraryID, PlaylistLibraryKind } from '@audius/common/models' +import { + cacheCollectionsActions, + cacheCollectionsSelectors, + cacheTracksSelectors, + playlistLibraryActions, + shareModalUIActions, + useEditPlaylistModal +} from '@audius/common/store' import { PopupMenuItem } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/CreatePlaylistLibraryItemButton.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/CreatePlaylistLibraryItemButton.tsx index 68fc6443cb4..bf1b461a450 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/CreatePlaylistLibraryItemButton.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/CreatePlaylistLibraryItemButton.tsx @@ -1,12 +1,12 @@ import { MutableRefObject, useCallback, useMemo } from 'react' +import { CreatePlaylistSource } from '@audius/common/models' import { accountSelectors, cacheCollectionsActions, playlistLibraryActions, playlistLibraryHelpers -} from '@audius/common' -import { CreatePlaylistSource } from '@audius/common/models' +} from '@audius/common/store' import { PopupMenu, IconFolder, diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteCollectionConfirmationModal.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteCollectionConfirmationModal.tsx index bbd32478eb9..5c419fc6711 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteCollectionConfirmationModal.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteCollectionConfirmationModal.tsx @@ -1,10 +1,10 @@ import { useCallback } from 'react' +import { ID } from '@audius/common/models' import { cacheCollectionsActions, cacheCollectionsSelectors -} from '@audius/common' -import { ID } from '@audius/common/models' +} from '@audius/common/store' import { useDispatch } from 'react-redux' import { SetRequired } from 'type-fest' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteFolderConfirmationModal.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteFolderConfirmationModal.tsx index f27c360ad08..cec629703f1 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteFolderConfirmationModal.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/DeleteFolderConfirmationModal.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' +import { Name } from '@audius/common/models' import { accountSelectors, playlistLibraryActions, playlistLibraryHelpers, playlistLibrarySelectors -} from '@audius/common' -import { Name } from '@audius/common/models' +} from '@audius/common/store' import { useDispatch } from 'react-redux' import { SetRequired } from 'type-fest' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/EmptyLibraryNavLink.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/EmptyLibraryNavLink.tsx index 9a1cccf8efb..df9a7bc4078 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/EmptyLibraryNavLink.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/EmptyLibraryNavLink.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { cacheCollectionsActions } from '@audius/common' import { CreatePlaylistSource } from '@audius/common/models' +import { cacheCollectionsActions } from '@audius/common/store' import { useDispatch } from 'react-redux' import { LeftNavLink } from '../LeftNavLink' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistFolderNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistFolderNavItem.tsx index cb79338abc3..465562bec90 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistFolderNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistFolderNavItem.tsx @@ -1,16 +1,16 @@ import { useCallback, useState, MouseEvent, useEffect, useMemo } from 'react' -import { - modalsActions, - playlistLibraryActions, - playlistUpdatesSelectors -} from '@audius/common' import { Name, PlaylistLibraryID, PlaylistLibraryKind, PlaylistLibraryFolder } from '@audius/common/models' +import { + playlistLibraryActions, + modalsActions, + playlistUpdatesSelectors +} from '@audius/common/store' import { IconFolder, IconFolderOutline, diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibrary.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibrary.tsx index f82656ba686..13a4d3509df 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibrary.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistLibrary.tsx @@ -1,7 +1,10 @@ import { MutableRefObject, useCallback } from 'react' -import { accountSelectors, collectionsSocialActions } from '@audius/common' import { FavoriteSource } from '@audius/common/models' +import { + accountSelectors, + collectionsSocialActions +} from '@audius/common/store' import cn from 'classnames' import { isEmpty } from 'lodash' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistNavItem.tsx b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistNavItem.tsx index a1f010c0f30..e65db1e92b7 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistNavItem.tsx +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/PlaylistNavItem.tsx @@ -3,7 +3,7 @@ import { useCallback } from 'react' import { playlistUpdatesActions, playlistUpdatesSelectors -} from '@audius/common' +} from '@audius/common/store' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/useAddAudioNftPlaylistToLibrary.ts b/packages/web/src/components/nav/desktop/PlaylistLibrary/useAddAudioNftPlaylistToLibrary.ts index 00d76b277c1..1f054b3c482 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/useAddAudioNftPlaylistToLibrary.ts +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/useAddAudioNftPlaylistToLibrary.ts @@ -1,11 +1,11 @@ import { useEffect } from 'react' +import { FavoriteSource, SmartCollectionVariant } from '@audius/common/models' import { accountSelectors, - collectionsSocialActions, - playlistLibraryHelpers -} from '@audius/common' -import { FavoriteSource, SmartCollectionVariant } from '@audius/common/models' + playlistLibraryHelpers, + collectionsSocialActions +} from '@audius/common/store' import { useDispatch } from 'react-redux' import { AUDIO_NFT_PLAYLIST } from 'common/store/smart-collection/smartCollections' diff --git a/packages/web/src/components/nav/desktop/PlaylistLibrary/useSanitizePlaylistLibrary.ts b/packages/web/src/components/nav/desktop/PlaylistLibrary/useSanitizePlaylistLibrary.ts index da289b78e7f..fa797897748 100644 --- a/packages/web/src/components/nav/desktop/PlaylistLibrary/useSanitizePlaylistLibrary.ts +++ b/packages/web/src/components/nav/desktop/PlaylistLibrary/useSanitizePlaylistLibrary.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' -import { accountSelectors, playlistLibraryActions } from '@audius/common' import { PlaylistLibraryFolder } from '@audius/common/models' +import { accountSelectors, playlistLibraryActions } from '@audius/common/store' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/nav/mobile/ConnectedBottomBar.tsx b/packages/web/src/components/nav/mobile/ConnectedBottomBar.tsx index 6558ba2ed90..8766bd181e4 100644 --- a/packages/web/src/components/nav/mobile/ConnectedBottomBar.tsx +++ b/packages/web/src/components/nav/mobile/ConnectedBottomBar.tsx @@ -4,7 +4,7 @@ import { accountSelectors, explorePageActions, ExplorePageTabs -} from '@audius/common' +} from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { withRouter, RouteComponentProps } from 'react-router-dom' diff --git a/packages/web/src/components/nav/mobile/ConnectedNavBar.tsx b/packages/web/src/components/nav/mobile/ConnectedNavBar.tsx index f53e8549e42..70db93b94b3 100644 --- a/packages/web/src/components/nav/mobile/ConnectedNavBar.tsx +++ b/packages/web/src/components/nav/mobile/ConnectedNavBar.tsx @@ -1,11 +1,11 @@ import { useCallback, useContext } from 'react' +import { Name, Status } from '@audius/common/models' import { accountSelectors, notificationsSelectors, searchResultsPageSelectors -} from '@audius/common' -import { Name, Status } from '@audius/common/models' +} from '@audius/common/store' import { push as pushRoute, goBack } from 'connected-react-router' import { connect } from 'react-redux' import { withRouter, RouteComponentProps } from 'react-router-dom' diff --git a/packages/web/src/components/nav/mobile/SignOut.tsx b/packages/web/src/components/nav/mobile/SignOut.tsx index a4c3423681b..3d0368928ef 100644 --- a/packages/web/src/components/nav/mobile/SignOut.tsx +++ b/packages/web/src/components/nav/mobile/SignOut.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { signOutActions } from '@audius/common' import { Name } from '@audius/common/models' +import { signOutActions } from '@audius/common/store' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/nav/mobile/TopLevelPage.tsx b/packages/web/src/components/nav/mobile/TopLevelPage.tsx index ff8565228cd..25b39a2ff55 100644 --- a/packages/web/src/components/nav/mobile/TopLevelPage.tsx +++ b/packages/web/src/components/nav/mobile/TopLevelPage.tsx @@ -1,4 +1,4 @@ -import { modalsSelectors, useEditPlaylistModal } from '@audius/common' +import { modalsSelectors, useEditPlaylistModal } from '@audius/common/store' import cn from 'classnames' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx b/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx index 683623bcc67..87802a8b77c 100644 --- a/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx +++ b/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx @@ -1,11 +1,13 @@ -import { useCallback } from 'react' - import { notificationsSelectors, - AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType, + Entity, CollectionEntity, - Entity -} from '@audius/common' + AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name, Track } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx b/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx index cf2679bf944..39d0d79d374 100644 --- a/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx +++ b/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx @@ -1,6 +1,8 @@ +import { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common/store' + import { useCallback } from 'react' -import { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { MarkdownViewer } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx b/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx index c519e7334ce..df9d03ca4a0 100644 --- a/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx +++ b/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx @@ -1,9 +1,11 @@ +import { + audioRewardsPageSelectors, + ChallengeRewardNotification as ChallengeRewardNotificationType +} from '@audius/common/store' + import { useCallback } from 'react' -import { - ChallengeRewardNotification as ChallengeRewardNotificationType, - audioRewardsPageSelectors -} from '@audius/common' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/FavoriteNotification.tsx b/packages/web/src/components/notification/Notification/FavoriteNotification.tsx index 4bfc66ae334..a4fb4c0ae63 100644 --- a/packages/web/src/components/notification/Notification/FavoriteNotification.tsx +++ b/packages/web/src/components/notification/Notification/FavoriteNotification.tsx @@ -2,9 +2,11 @@ import { MouseEventHandler, useCallback } from 'react' import { notificationsSelectors, - FavoriteNotification as FavoriteNotificationType, - Entity -} from '@audius/common' + Entity, + FavoriteNotification as FavoriteNotificationType +} from '@audius/common/store' + +import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/FavoriteOfRepostNotification.tsx b/packages/web/src/components/notification/Notification/FavoriteOfRepostNotification.tsx index ebd3ee4e304..0822de515e9 100644 --- a/packages/web/src/components/notification/Notification/FavoriteOfRepostNotification.tsx +++ b/packages/web/src/components/notification/Notification/FavoriteOfRepostNotification.tsx @@ -1,8 +1,9 @@ import { notificationsSelectors, - FavoriteOfRepostNotification as FavoriteOfRepostNotificationType, - Entity -} from '@audius/common' + Entity, + FavoriteOfRepostNotification as FavoriteOfRepostNotificationType +} from '@audius/common/store' +import {} from '@audius/common' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/FollowNotification.tsx b/packages/web/src/components/notification/Notification/FollowNotification.tsx index e04e28bcc08..4fbc3a1743d 100644 --- a/packages/web/src/components/notification/Notification/FollowNotification.tsx +++ b/packages/web/src/components/notification/Notification/FollowNotification.tsx @@ -3,7 +3,9 @@ import { useCallback } from 'react' import { notificationsSelectors, FollowNotification as FollowNotificationType -} from '@audius/common' +} from '@audius/common/store' + +import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx index d141196b8c0..aacf6bad9a5 100644 --- a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx +++ b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx @@ -1,11 +1,13 @@ -import { useCallback } from 'react' - import { notificationsSelectors, Achievement, EntityType, MilestoneNotification as MilestoneNotificationType -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name, User } from '@audius/common/models' import { formatCount, Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/Notification.tsx b/packages/web/src/components/notification/Notification/Notification.tsx index 88108322b9a..3b294bebbfa 100644 --- a/packages/web/src/components/notification/Notification/Notification.tsx +++ b/packages/web/src/components/notification/Notification/Notification.tsx @@ -1,4 +1,9 @@ -import { Notification as Notifications, NotificationType } from '@audius/common' +import { + NotificationType, + Notification as Notifications, + Notifications +} from '@audius/common/store' +import {} from '@audius/common' import ErrorWrapper from 'components/error-wrapper/ErrorWrapper' diff --git a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx index 15cd056f7cc..062f23157b7 100644 --- a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx +++ b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { notificationsSelectors, - RemixCosignNotification as RemixCosignNotificationType, - TrackEntity -} from '@audius/common' + TrackEntity, + RemixCosignNotification as RemixCosignNotificationType +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx b/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx index a510b277854..7859f5a4895 100644 --- a/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx +++ b/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { notificationsSelectors, - RemixCreateNotification as RemixCreateNotificationType, - TrackEntity -} from '@audius/common' + TrackEntity, + RemixCreateNotification as RemixCreateNotificationType +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/RepostNotification.tsx b/packages/web/src/components/notification/Notification/RepostNotification.tsx index 9643135530c..968ab49e030 100644 --- a/packages/web/src/components/notification/Notification/RepostNotification.tsx +++ b/packages/web/src/components/notification/Notification/RepostNotification.tsx @@ -1,10 +1,12 @@ import { MouseEventHandler, useCallback } from 'react' import { - Entity, notificationsSelectors, + Entity, RepostNotification as RepostNotificationType -} from '@audius/common' +} from '@audius/common/store' + +import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/RepostOfRepostNotification.tsx b/packages/web/src/components/notification/Notification/RepostOfRepostNotification.tsx index 4bfe8005786..596ff1f65d3 100644 --- a/packages/web/src/components/notification/Notification/RepostOfRepostNotification.tsx +++ b/packages/web/src/components/notification/Notification/RepostOfRepostNotification.tsx @@ -1,8 +1,9 @@ import { - Entity, notificationsSelectors, + Entity, RepostOfRepostNotification as RepostOfRepostNotificationType -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx index bdb79e5b544..f57329cd2dd 100644 --- a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx +++ b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { cacheUsersSelectors, notificationsSelectors, SupporterDethronedNotification as SupporterDethroned -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' diff --git a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx index e408ac86c59..54e69021f85 100644 --- a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx +++ b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { notificationsSelectors, TrackEntity, TastemakerNotification as TastemakerNotificationType -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/TierChangeNotification.tsx b/packages/web/src/components/notification/Notification/TierChangeNotification.tsx index c8e107de2cf..13647937242 100644 --- a/packages/web/src/components/notification/Notification/TierChangeNotification.tsx +++ b/packages/web/src/components/notification/Notification/TierChangeNotification.tsx @@ -1,9 +1,10 @@ import { notificationsSelectors, + badgeTiers, TierChangeNotification as TierChangeNotificationType, - BadgeTierInfo, - badgeTiers -} from '@audius/common' + BadgeTierInfo +} from '@audius/common/store' +import {} from '@audius/common' import { audioTierMapPng } from 'components/user-badges/UserBadges' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx index ae86737093a..736bfbf9538 100644 --- a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { notificationsSelectors, - ReactionNotification, - getReactionFromRawValue -} from '@audius/common' + getReactionFromRawValue, + ReactionNotification +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { Name } from '@audius/common/models' diff --git a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx index f8a2077b020..1fe27edb7fa 100644 --- a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx @@ -1,13 +1,15 @@ -import { ComponentType, useCallback, useState } from 'react' - import { notificationsSelectors, - TipReceiveNotification, - reactionOrder, - ReactionTypes, reactionsUIActions, - reactionsUISelectors -} from '@audius/common' + reactionsUISelectors, + reactionOrder, + TipReceiveNotification, + ReactionTypes +} from '@audius/common/store' + +import { ComponentType, useCallback, useState } from 'react' + +import {} from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' diff --git a/packages/web/src/components/notification/Notification/TipSentNotification.tsx b/packages/web/src/components/notification/Notification/TipSentNotification.tsx index 16b5c1d1dc8..7ae8570ce78 100644 --- a/packages/web/src/components/notification/Notification/TipSentNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipSentNotification.tsx @@ -1,6 +1,11 @@ +import { + notificationsSelectors, + TipSendNotification +} from '@audius/common/store' + import { useCallback } from 'react' -import { notificationsSelectors, TipSendNotification } from '@audius/common' +import {} from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { Name } from '@audius/common/models' diff --git a/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx b/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx index 412a11e14dc..487af22efb3 100644 --- a/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx +++ b/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx @@ -1,9 +1,11 @@ -import { useCallback } from 'react' - import { notificationsSelectors, SupporterRankUpNotification -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import IconTrending from 'assets/img/iconTrending.svg' diff --git a/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx b/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx index 95c7e260b07..8919ec6c86b 100644 --- a/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx +++ b/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx @@ -1,9 +1,11 @@ -import { useCallback } from 'react' - import { notificationsSelectors, SupportingRankUpNotification -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import IconTrending from 'assets/img/iconTrending.svg' diff --git a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx index ffcb1d965fd..a6d3bccb0f3 100644 --- a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { notificationsSelectors, - TrendingPlaylistNotification as TrendingPlaylistNotificationType, - CollectionEntity -} from '@audius/common' + CollectionEntity, + TrendingPlaylistNotification as TrendingPlaylistNotificationType +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx index cdd02ea55db..3f6c2eb44be 100644 --- a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { notificationsSelectors, TrackEntity, TrendingTrackNotification as TrendingTrackNotificationType -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx index b2b0e33ee4a..df587a2604e 100644 --- a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { notificationsSelectors, TrackEntity, TrendingUndergroundNotification as TrendingUndergroundNotificationType -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx index 38628991278..f46dffafd12 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx @@ -1,11 +1,13 @@ -import { useCallback } from 'react' - import { - USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType, - TrackEntity, + notificationsSelectors, Entity, - notificationsSelectors -} from '@audius/common' + TrackEntity, + USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx index f01399c7465..cd295ce93d9 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx @@ -1,11 +1,13 @@ -import { useCallback } from 'react' - import { - Entity, notificationsSelectors, + Entity, TrackEntity, USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { StringUSDC } from '@audius/common/models' import { stringUSDCToBN, diff --git a/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx b/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx index 1a022cc1b8e..cfae6a941cf 100644 --- a/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx +++ b/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { notificationsSelectors, Entity, UserSubscriptionNotification as UserSubscriptionNotificationType -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/EntityLink.tsx b/packages/web/src/components/notification/Notification/components/EntityLink.tsx index 5fcad2d0010..3440c97fe01 100644 --- a/packages/web/src/components/notification/Notification/components/EntityLink.tsx +++ b/packages/web/src/components/notification/Notification/components/EntityLink.tsx @@ -1,6 +1,8 @@ +import { Entity } from '@audius/common/store' + import { MouseEventHandler, useCallback } from 'react' -import { Entity } from '@audius/common' +import {} from '@audius/common' import { Name, Collection, Track, User } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/components/NotificationTile.tsx b/packages/web/src/components/notification/Notification/components/NotificationTile.tsx index c822931f63c..a9217650bf5 100644 --- a/packages/web/src/components/notification/Notification/components/NotificationTile.tsx +++ b/packages/web/src/components/notification/Notification/components/NotificationTile.tsx @@ -5,7 +5,9 @@ import { useCallback } from 'react' -import { Notification } from '@audius/common' +import { Notification } from '@audius/common/store' + +import {} from '@audius/common' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/Reaction/index.tsx b/packages/web/src/components/notification/Notification/components/Reaction/index.tsx index 14d4a06638d..542f2ef5280 100644 --- a/packages/web/src/components/notification/Notification/components/Reaction/index.tsx +++ b/packages/web/src/components/notification/Notification/components/Reaction/index.tsx @@ -1,6 +1,8 @@ import React, { ComponentType } from 'react' -import { ReactionTypes } from '@audius/common' +import { ReactionTypes } from '@audius/common/store' + +import {} from '@audius/common' import { Reaction, ReactionProps as BaseReactionProps } from './Reaction' diff --git a/packages/web/src/components/notification/Notification/components/TrackContent.tsx b/packages/web/src/components/notification/Notification/components/TrackContent.tsx index 93737c39c35..355117f515f 100644 --- a/packages/web/src/components/notification/Notification/components/TrackContent.tsx +++ b/packages/web/src/components/notification/Notification/components/TrackContent.tsx @@ -1,4 +1,5 @@ -import { TrackEntity } from '@audius/common' +import { TrackEntity } from '@audius/common/store' +import {} from '@audius/common' import { SquareSizes } from '@audius/common/models' import CoSign, { Size } from 'components/co-sign/CoSign' diff --git a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx index 31ae9dd081f..d087095b9c4 100644 --- a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx +++ b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx @@ -1,10 +1,12 @@ -import { MouseEventHandler, useCallback } from 'react' - import { - CommonState, cacheUsersActions, - cacheUsersSelectors -} from '@audius/common' + cacheUsersSelectors, + CommonState +} from '@audius/common/store' + +import { MouseEventHandler, useCallback } from 'react' + +import {} from '@audius/common' import { useTwitterButtonStatus } from '@audius/common/hooks' import { Nullable } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/notification/Notification/components/UserNameLink.tsx b/packages/web/src/components/notification/Notification/components/UserNameLink.tsx index b40d6dc11c9..223854e3dba 100644 --- a/packages/web/src/components/notification/Notification/components/UserNameLink.tsx +++ b/packages/web/src/components/notification/Notification/components/UserNameLink.tsx @@ -1,6 +1,8 @@ +import { Notification } from '@audius/common/store' + import { MouseEventHandler, useCallback } from 'react' -import { Notification } from '@audius/common' +import {} from '@audius/common' import { Name, User } from '@audius/common/models' import cn from 'classnames' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/utils.ts b/packages/web/src/components/notification/Notification/utils.ts index c5465223f5d..a10b6ddc5e3 100644 --- a/packages/web/src/components/notification/Notification/utils.ts +++ b/packages/web/src/components/notification/Notification/utils.ts @@ -1,4 +1,5 @@ -import { Entity, EntityType } from '@audius/common' +import { Entity, EntityType } from '@audius/common/store' +import {} from '@audius/common' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' import { UserListEntityType } from 'store/application/ui/userListModal/types' diff --git a/packages/web/src/components/notification/NotificationModal.tsx b/packages/web/src/components/notification/NotificationModal.tsx index 8aafb881e19..23cfc36f900 100644 --- a/packages/web/src/components/notification/NotificationModal.tsx +++ b/packages/web/src/components/notification/NotificationModal.tsx @@ -1,4 +1,5 @@ -import { AnnouncementNotification } from '@audius/common' +import { AnnouncementNotification } from '@audius/common/store' +import {} from '@audius/common' import { Modal, Scrollbar, MarkdownViewer } from '@audius/stems' import IconRemove from 'assets/img/iconRemove.svg' diff --git a/packages/web/src/components/notification/NotificationPage.tsx b/packages/web/src/components/notification/NotificationPage.tsx index 87fb57d8c36..18aec2beb91 100644 --- a/packages/web/src/components/notification/NotificationPage.tsx +++ b/packages/web/src/components/notification/NotificationPage.tsx @@ -1,10 +1,13 @@ -import { useEffect, useCallback, useContext } from 'react' - import { + notificationsActions, notificationsSelectors, Notification as Notifications, - notificationsActions -} from '@audius/common' + Notifications +} from '@audius/common/store' + +import { useEffect, useCallback, useContext } from 'react' + +import {} from '@audius/common' import { Status } from '@audius/common/models' import InfiniteScroll from 'react-infinite-scroller' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/notification/NotificationPanel.tsx b/packages/web/src/components/notification/NotificationPanel.tsx index e2a1c94ea01..50c967e783e 100644 --- a/packages/web/src/components/notification/NotificationPanel.tsx +++ b/packages/web/src/components/notification/NotificationPanel.tsx @@ -1,10 +1,13 @@ -import { useRef, useCallback, useEffect, RefObject } from 'react' - import { + notificationsActions, notificationsSelectors, Notification as Notifications, - notificationsActions -} from '@audius/common' + Notifications +} from '@audius/common/store' + +import { useRef, useCallback, useEffect, RefObject } from 'react' + +import {} from '@audius/common' import { Status } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { Popup, PopupPosition, Scrollbar } from '@audius/stems' diff --git a/packages/web/src/components/now-playing/NowPlaying.tsx b/packages/web/src/components/now-playing/NowPlaying.tsx index 08df3de09ba..fd956a6364c 100644 --- a/packages/web/src/components/now-playing/NowPlaying.tsx +++ b/packages/web/src/components/now-playing/NowPlaying.tsx @@ -1,23 +1,25 @@ -import { useCallback, useEffect, useRef, useState } from 'react' - import { accountSelectors, averageColorSelectors, queueActions, + queueSelectors, RepeatMode, tracksSocialActions, - OverflowAction, - OverflowActionCallbacks, - OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, + OverflowAction, + OverflowSource, + usePremiumContentPurchaseModal, playerActions, playerSelectors, - queueSelectors, playbackRateValueMap, gatedContentSelectors, - usePremiumContentPurchaseModal -} from '@audius/common' + OverflowActionCallbacks +} from '@audius/common/store' + +import { useCallback, useEffect, useRef, useState } from 'react' + +import {} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { Name, diff --git a/packages/web/src/components/now-playing/NowPlayingDrawer.tsx b/packages/web/src/components/now-playing/NowPlayingDrawer.tsx index aa1dae1d059..81e94886d74 100644 --- a/packages/web/src/components/now-playing/NowPlayingDrawer.tsx +++ b/packages/web/src/components/now-playing/NowPlayingDrawer.tsx @@ -1,6 +1,8 @@ +import { nowPlayingUIActions } from '@audius/common/store' + import { useEffect, useCallback } from 'react' -import { nowPlayingUIActions } from '@audius/common' +import {} from '@audius/common' import { useInstanceVar } from '@audius/common/hooks' import { useDispatch } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/components/on-ramp-button/OnRampButton.tsx b/packages/web/src/components/on-ramp-button/OnRampButton.tsx index e5dc8573648..3d4f58b2173 100644 --- a/packages/web/src/components/on-ramp-button/OnRampButton.tsx +++ b/packages/web/src/components/on-ramp-button/OnRampButton.tsx @@ -1,4 +1,5 @@ -import { OnRampProvider } from '@audius/common' +import { OnRampProvider } from '@audius/common/store' +import {} from '@audius/common' import { Button, ButtonProps, ButtonType } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/password-reset/PasswordResetModal.tsx b/packages/web/src/components/password-reset/PasswordResetModal.tsx index a0b41fb56b6..d60a18abc31 100644 --- a/packages/web/src/components/password-reset/PasswordResetModal.tsx +++ b/packages/web/src/components/password-reset/PasswordResetModal.tsx @@ -1,6 +1,8 @@ +import { accountSelectors } from '@audius/common/store' + import { useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' +import {} from '@audius/common' import { Status } from '@audius/common/models' import { Flex, Text } from '@audius/harmony' import { Modal } from '@audius/stems' diff --git a/packages/web/src/components/password-reset/store/sagas.tsx b/packages/web/src/components/password-reset/store/sagas.tsx index bf69ab61fa4..182c3449d2d 100644 --- a/packages/web/src/components/password-reset/store/sagas.tsx +++ b/packages/web/src/components/password-reset/store/sagas.tsx @@ -1,4 +1,5 @@ -import { getContext } from '@audius/common' +import { getContext } from '@audius/common/store' +import {} from '@audius/common' import { call, put, takeEvery } from 'redux-saga/effects' import * as actions from './actions' diff --git a/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx b/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx index f35a19ace33..89eefe03dd5 100644 --- a/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx +++ b/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx @@ -1,6 +1,8 @@ +import { accountSelectors, tracksSocialActions } from '@audius/common/store' + import { memo } from 'react' -import { accountSelectors, tracksSocialActions } from '@audius/common' +import {} from '@audius/common' import { ID } from '@audius/common/models' import { Modal, Button, ButtonSize, ButtonType } from '@audius/stems' import { connect } from 'react-redux' diff --git a/packages/web/src/components/play-bar/PlayBarProvider.tsx b/packages/web/src/components/play-bar/PlayBarProvider.tsx index 91bcbd8d172..15a37c6bfcf 100644 --- a/packages/web/src/components/play-bar/PlayBarProvider.tsx +++ b/packages/web/src/components/play-bar/PlayBarProvider.tsx @@ -1,4 +1,4 @@ -import { modalsSelectors, playerSelectors } from '@audius/common' +import { modalsSelectors, playerSelectors } from '@audius/common/store' import cn from 'classnames' import { connect } from 'react-redux' import { RouteComponentProps, withRouter } from 'react-router-dom' diff --git a/packages/web/src/components/play-bar/desktop/PlayBar.jsx b/packages/web/src/components/play-bar/desktop/PlayBar.jsx index 2c5813ae758..20e219ece44 100644 --- a/packages/web/src/components/play-bar/desktop/PlayBar.jsx +++ b/packages/web/src/components/play-bar/desktop/PlayBar.jsx @@ -1,26 +1,26 @@ import { Component } from 'react' +import { + Name, + RepostSource, + FavoriteSource, + PlaybackSource, + Kind +} from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, + cacheTracksSelectors, lineupSelectors, queueActions, + queueSelectors, RepeatMode, tracksSocialActions, themeSelectors, playerActions, playerSelectors, - queueSelectors, - playbackRateValueMap, - cacheTracksSelectors -} from '@audius/common' -import { - Name, - RepostSource, - FavoriteSource, - PlaybackSource, - Kind -} from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' + playbackRateValueMap +} from '@audius/common/store' import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx b/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx index 4cb2cc77b25..dcc3df068ab 100644 --- a/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx +++ b/packages/web/src/components/play-bar/desktop/components/PlayingTrackInfo.tsx @@ -1,10 +1,5 @@ import { memo, useEffect } from 'react' -import { - CommonState, - cacheTracksSelectors, - playerSelectors -} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { SquareSizes, @@ -12,6 +7,11 @@ import { ID, ProfilePictureSizes } from '@audius/common/models' +import { + cacheTracksSelectors, + playerSelectors, + CommonState +} from '@audius/common/store' import cn from 'classnames' import { useSelector } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx b/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx index 8cc80901ecf..25e9cf49472 100644 --- a/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx +++ b/packages/web/src/components/play-bar/desktop/components/SocialActions.tsx @@ -1,12 +1,12 @@ +import { useGatedContentAccess } from '@audius/common/hooks' +import { ModalSource, Theme, ID, UID } from '@audius/common/models' import { + cacheTracksSelectors, + themeSelectors, usePremiumContentPurchaseModal, gatedContentSelectors, - themeSelectors, - cacheTracksSelectors, CommonState -} from '@audius/common' -import { useGatedContentAccess } from '@audius/common/hooks' -import { ModalSource, Theme, ID, UID } from '@audius/common/models' +} from '@audius/common/store' import { useSelector } from 'react-redux' import FavoriteButton from 'components/alt-button/FavoriteButton' diff --git a/packages/web/src/components/play-bar/mobile/PlayBar.tsx b/packages/web/src/components/play-bar/mobile/PlayBar.tsx index a0e4f67fb2f..75447704587 100644 --- a/packages/web/src/components/play-bar/mobile/PlayBar.tsx +++ b/packages/web/src/components/play-bar/mobile/PlayBar.tsx @@ -1,11 +1,5 @@ import { useEffect, useState } from 'react' -import { - queueActions, - tracksSocialActions, - playerSelectors, - queueSelectors -} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { Name, @@ -14,6 +8,12 @@ import { SquareSizes, ID } from '@audius/common/models' +import { + queueActions, + queueSelectors, + tracksSocialActions, + playerSelectors +} from '@audius/common/store' import { IconLock } from '@audius/stems' import cn from 'classnames' import { connect, useSelector } from 'react-redux' diff --git a/packages/web/src/components/play-bar/next-button/NextButtonProvider.tsx b/packages/web/src/components/play-bar/next-button/NextButtonProvider.tsx index 11737998253..bd6d96553a0 100644 --- a/packages/web/src/components/play-bar/next-button/NextButtonProvider.tsx +++ b/packages/web/src/components/play-bar/next-button/NextButtonProvider.tsx @@ -1,4 +1,4 @@ -import { playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common/store' import { Genre } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/play-bar/playback-rate-button/PlaybackRateButton.tsx b/packages/web/src/components/play-bar/playback-rate-button/PlaybackRateButton.tsx index 6eeee1d59db..edeceff1cd5 100644 --- a/packages/web/src/components/play-bar/playback-rate-button/PlaybackRateButton.tsx +++ b/packages/web/src/components/play-bar/playback-rate-button/PlaybackRateButton.tsx @@ -1,6 +1,10 @@ import { MutableRefObject, useCallback, useMemo } from 'react' -import { PlaybackRate, playerActions, playerSelectors } from '@audius/common' +import { + playerActions, + playerSelectors, + PlaybackRate +} from '@audius/common/store' import { PopupMenu, PopupMenuItem, PopupPosition } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/play-bar/previous-button/PreviousButtonProvider.tsx b/packages/web/src/components/play-bar/previous-button/PreviousButtonProvider.tsx index 40ccdaa8f3f..245617ab0fe 100644 --- a/packages/web/src/components/play-bar/previous-button/PreviousButtonProvider.tsx +++ b/packages/web/src/components/play-bar/previous-button/PreviousButtonProvider.tsx @@ -1,4 +1,4 @@ -import { playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common/store' import { Genre } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx index 1a56ae98ea3..f0e9e763f63 100644 --- a/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/PremiumContentPurchaseModal.tsx @@ -1,14 +1,5 @@ import { useCallback, useEffect } from 'react' -import { - PurchaseContentStage, - usePremiumContentPurchaseModal, - buyUSDCActions, - purchaseContentActions, - purchaseContentSelectors, - isContentPurchaseInProgress, - PurchaseContentPage -} from '@audius/common' import { useGetTrackById } from '@audius/common/api' import { PurchaseableTrackMetadata, @@ -19,6 +10,15 @@ import { } from '@audius/common/hooks' import { PurchaseVendor, Track } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + buyUSDCActions, + usePremiumContentPurchaseModal, + purchaseContentActions, + purchaseContentSelectors, + PurchaseContentStage, + PurchaseContentPage, + isContentPurchaseInProgress +} from '@audius/common/store' import { USDC } from '@audius/fixed-decimal' import { Flex } from '@audius/harmony' import { diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx index ce5255fd3fc..14a42cef242 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx @@ -1,6 +1,8 @@ +import { PurchaseContentStage } from '@audius/common/store' + import { useCallback, useEffect } from 'react' -import { PurchaseContentStage } from '@audius/common' +import {} from '@audius/common' import { useFeatureFlag, useRemoteVar, diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx index 73220cf6497..58ee5504218 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx @@ -1,6 +1,11 @@ +import { + PurchaseContentStage, + PurchaseContentError +} from '@audius/common/store' + import { useCallback } from 'react' -import { PurchaseContentError, PurchaseContentStage } from '@audius/common' +import {} from '@audius/common' import { PurchaseableTrackMetadata, usePurchaseContentErrorMessage diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts index 75e57e9ec03..0e3a74cba78 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts @@ -1,7 +1,8 @@ import { purchaseContentSelectors, isContentPurchaseInProgress -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts index d953d7a74a1..e167293342e 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts @@ -1,4 +1,5 @@ -import { getPurchaseSummaryValues } from '@audius/common' +import { getPurchaseSummaryValues } from '@audius/common/store' +import {} from '@audius/common' import { useUSDCPurchaseConfig, usePayExtraPresets, diff --git a/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx b/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx index b172b20f80a..9986487be37 100644 --- a/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx +++ b/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx @@ -1,4 +1,5 @@ -import { challengesSelectors, profilePageActions } from '@audius/common' +import { challengesSelectors, profilePageActions } from '@audius/common/store' +import {} from '@audius/common' import { connect } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx b/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx index 6168b06e42a..2cfd3279906 100644 --- a/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx +++ b/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx @@ -1,10 +1,12 @@ import { useState, useEffect } from 'react' import { - musicConfettiActions, accountSelectors, - challengesSelectors -} from '@audius/common' + challengesSelectors, + musicConfettiActions +} from '@audius/common/store' + +import {} from '@audius/common' import { connect, useDispatch } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/components/publish-track-confirmation-modal/PublishTrackConfirmationModal.tsx b/packages/web/src/components/publish-track-confirmation-modal/PublishTrackConfirmationModal.tsx index 4173ef74a5b..5da8fcfb1d9 100644 --- a/packages/web/src/components/publish-track-confirmation-modal/PublishTrackConfirmationModal.tsx +++ b/packages/web/src/components/publish-track-confirmation-modal/PublishTrackConfirmationModal.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { publishTrackConfirmationModalUISelectors } from '@audius/common' +import { publishTrackConfirmationModalUISelectors } from '@audius/common/store' import { IconRocket } from '@audius/harmony' import { Button, diff --git a/packages/web/src/components/related-artists/RelatedArtists.tsx b/packages/web/src/components/related-artists/RelatedArtists.tsx index 00038a59063..d3e0dcf83ff 100644 --- a/packages/web/src/components/related-artists/RelatedArtists.tsx +++ b/packages/web/src/components/related-artists/RelatedArtists.tsx @@ -1,9 +1,9 @@ import { useCallback } from 'react' -import { profilePageSelectors } from '@audius/common' import { useGetRelatedArtists } from '@audius/common/api' import { User } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { profilePageSelectors } from '@audius/common/store' import { MAX_PROFILE_RELATED_ARTISTS } from '@audius/common/utils' import { IconUserGroup } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/remix-card/ConnectedRemixCard.tsx b/packages/web/src/components/remix-card/ConnectedRemixCard.tsx index 562d503587c..3971258101b 100644 --- a/packages/web/src/components/remix-card/ConnectedRemixCard.tsx +++ b/packages/web/src/components/remix-card/ConnectedRemixCard.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common' import { SquareSizes, ID } from '@audius/common/models' +import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx index ed2f951bc50..6517b2b7d86 100644 --- a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx +++ b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx @@ -1,6 +1,11 @@ +import { + remixSettingsSelectors, + remixSettingsActions +} from '@audius/common/store' + import { useEffect } from 'react' -import { remixSettingsSelectors, remixSettingsActions } from '@audius/common' +import {} from '@audius/common' import { Status, ID, AccessConditions } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { connect } from 'react-redux' diff --git a/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx b/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx index 5ce22eafc10..bc978453845 100644 --- a/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx +++ b/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx @@ -1,9 +1,11 @@ import { useContext, useEffect } from 'react' import { - audioRewardsPageActions, - audioRewardsPageSelectors -} from '@audius/common' + audioRewardsPageSelectors, + audioRewardsPageActions +} from '@audius/common/store' + +import {} from '@audius/common' import { useDispatch, useSelector } from 'react-redux' import IconCaretRight from 'assets/img/iconCaretRight.svg' diff --git a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx index e8fb52c9d5c..eb40de38eeb 100644 --- a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx +++ b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx @@ -1,6 +1,8 @@ +import { getTierForUser } from '@audius/common/store' + import { Component } from 'react' -import { getTierForUser } from '@audius/common' +import {} from '@audius/common' import { imageBlank as placeholderArt, imageProfilePicEmpty as profilePicEmpty diff --git a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx index 9e6d2adcaca..35e5ea77bef 100644 --- a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx +++ b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx @@ -1,3 +1,9 @@ +import { + cacheUsersSelectors, + searchUsersModalActions, + searchUsersModalSelectors +} from '@audius/common/store' + import { ChangeEvent, ReactNode, @@ -7,11 +13,7 @@ import { useState } from 'react' -import { - cacheUsersSelectors, - searchUsersModalSelectors, - searchUsersModalActions -} from '@audius/common' +import {} from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { Status, ID, User } from '@audius/common/models' import { diff --git a/packages/web/src/components/share-modal/ShareModal.tsx b/packages/web/src/components/share-modal/ShareModal.tsx index f56961f7b3f..1349be5a15d 100644 --- a/packages/web/src/components/share-modal/ShareModal.tsx +++ b/packages/web/src/components/share-modal/ShareModal.tsx @@ -1,5 +1,3 @@ -import { useCallback, useContext } from 'react' - import { accountSelectors, collectionsSocialActions, @@ -9,7 +7,11 @@ import { shareSoundToTiktokModalActions, modalsActions, useCreateChatModal -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback, useContext } from 'react' + +import {} from '@audius/common' import { Name, PlayableType } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/share-modal/messages.ts b/packages/web/src/components/share-modal/messages.ts index 6f81dfd60b7..21fac6948b7 100644 --- a/packages/web/src/components/share-modal/messages.ts +++ b/packages/web/src/components/share-modal/messages.ts @@ -1,4 +1,5 @@ -import { ShareType } from '@audius/common' +import { ShareType } from '@audius/common/store' +import {} from '@audius/common' const shareTypeMap: Record = { track: 'Track', diff --git a/packages/web/src/components/share-modal/types.ts b/packages/web/src/components/share-modal/types.ts index 69a7a74a79c..c66890846cb 100644 --- a/packages/web/src/components/share-modal/types.ts +++ b/packages/web/src/components/share-modal/types.ts @@ -1,4 +1,4 @@ -import { ShareType } from '@audius/common' +import { ShareType } from '@audius/common/store' export type ShareProps = { onShareToDirectMessage: () => void diff --git a/packages/web/src/components/share-modal/utils.ts b/packages/web/src/components/share-modal/utils.ts index 2afae7b1de9..047d7a1127e 100644 --- a/packages/web/src/components/share-modal/utils.ts +++ b/packages/web/src/components/share-modal/utils.ts @@ -1,4 +1,5 @@ -import { ShareContent } from '@audius/common' +import { ShareContent } from '@audius/common/store' +import {} from '@audius/common' import { ShareToTwitter } from '@audius/common/models' import { getTwitterHandleByUserHandle } from 'components/notification/Notification/utils' diff --git a/packages/web/src/components/share-sound-to-tiktok-modal/ShareSoundToTikTokModal.tsx b/packages/web/src/components/share-sound-to-tiktok-modal/ShareSoundToTikTokModal.tsx index 6e2fc6d4d34..2e795b5988e 100644 --- a/packages/web/src/components/share-sound-to-tiktok-modal/ShareSoundToTikTokModal.tsx +++ b/packages/web/src/components/share-sound-to-tiktok-modal/ShareSoundToTikTokModal.tsx @@ -1,10 +1,10 @@ import { useCallback, useMemo } from 'react' import { - ShareSoundToTiktokModalStatus, shareSoundToTiktokModalActions, - shareSoundToTiktokModalSelectors -} from '@audius/common' + shareSoundToTiktokModalSelectors, + ShareSoundToTiktokModalStatus +} from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts b/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts index b57ca7451c9..17d10cdb254 100644 --- a/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts +++ b/packages/web/src/components/share-sound-to-tiktok-modal/store/sagas.ts @@ -1,13 +1,13 @@ +import { Name } from '@audius/common/models' import { - getContext, cacheTracksSelectors, - modalsActions, - ShareSoundToTiktokModalStatus, shareSoundToTiktokModalActions, shareSoundToTiktokModalSelectors, + modalsActions, + ShareSoundToTiktokModalStatus, + getContext, musicConfettiActions -} from '@audius/common' -import { Name } from '@audius/common/models' +} from '@audius/common/store' import { getErrorMessage, encodeHashId } from '@audius/common/utils' import { takeEvery, put, call, select } from 'typed-redux-saga' diff --git a/packages/web/src/components/social-proof/SocialProof.tsx b/packages/web/src/components/social-proof/SocialProof.tsx index 4964c15f525..e854b7cfc18 100644 --- a/packages/web/src/components/social-proof/SocialProof.tsx +++ b/packages/web/src/components/social-proof/SocialProof.tsx @@ -1,14 +1,14 @@ import { useCallback, useEffect, useState } from 'react' +import { Name, Status } from '@audius/common/models' +import { BooleanKeys } from '@audius/common/services' import { + accountActions, accountSelectors, - TwitterProfile, InstagramProfile, - accountActions, + TwitterProfile, TikTokProfile -} from '@audius/common' -import { Name, Status } from '@audius/common/models' -import { BooleanKeys } from '@audius/common/services' +} from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import IconValidationX from 'assets/img/iconValidationX.svg' diff --git a/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx b/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx index cb9f32ea7a0..3d8b6a4d836 100644 --- a/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx +++ b/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx @@ -1,6 +1,11 @@ import { MouseEvent, useCallback, useEffect, useState, useRef } from 'react' -import { stripeModalUISelectors, stripeModalUIActions } from '@audius/common' +import { + stripeModalUIActions, + stripeModalUISelectors +} from '@audius/common/store' + +import {} from '@audius/common' import { loadStripeOnramp, OnrampSession } from '@stripe/crypto' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx index aa2db4f07cf..d868683e009 100644 --- a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx +++ b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx @@ -1,9 +1,10 @@ +import { cacheUsersSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import { cacheUsersSelectors } from '@audius/common' +import {} from '@audius/common' import { SuggestedTrack } from '@audius/common/api' import { SquareSizes, ID, Track } from '@audius/common/models' - import { Button, ButtonSize, diff --git a/packages/web/src/components/tiktok-auth/TikTokAuthButton.tsx b/packages/web/src/components/tiktok-auth/TikTokAuthButton.tsx index cce9feb348a..1db3b0f3167 100644 --- a/packages/web/src/components/tiktok-auth/TikTokAuthButton.tsx +++ b/packages/web/src/components/tiktok-auth/TikTokAuthButton.tsx @@ -1,6 +1,6 @@ import { MouseEvent, ReactElement, cloneElement, useCallback } from 'react' -import { TikTokProfile } from '@audius/common' +import { TikTokProfile } from '@audius/common/store' import { TikTokButton, diff --git a/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx b/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx index 0c27ea0bd3f..7df46315e26 100644 --- a/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx +++ b/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx @@ -1,11 +1,13 @@ -import { useCallback, useEffect, useRef } from 'react' - import { accountSelectors, cacheUsersSelectors, tippingSelectors, tippingActions -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback, useEffect, useRef } from 'react' + +import {} from '@audius/common' import { Name, User } from '@audius/common/models' import { IconButton, PillButton } from '@audius/stems' import { ResizeObserver } from '@juggle/resize-observer' diff --git a/packages/web/src/components/tipping/support/SupportingList.tsx b/packages/web/src/components/tipping/support/SupportingList.tsx index 4c59806e910..ab3998af4ff 100644 --- a/packages/web/src/components/tipping/support/SupportingList.tsx +++ b/packages/web/src/components/tipping/support/SupportingList.tsx @@ -1,6 +1,8 @@ +import { profilePageSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import { profilePageSelectors } from '@audius/common' +import {} from '@audius/common' import { useRankedSupportingForUser } from '@audius/common/hooks' import { User } from '@audius/common/models' import { formatCount, MAX_PROFILE_SUPPORTING_TILES } from '@audius/common/utils' diff --git a/packages/web/src/components/tipping/support/SupportingTile.tsx b/packages/web/src/components/tipping/support/SupportingTile.tsx index d1b42125ade..8e7154acba2 100644 --- a/packages/web/src/components/tipping/support/SupportingTile.tsx +++ b/packages/web/src/components/tipping/support/SupportingTile.tsx @@ -1,6 +1,8 @@ +import { cacheUsersSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import { cacheUsersSelectors } from '@audius/common' +import {} from '@audius/common' import { imageProfilePicEmpty as profilePicEmpty, imageCoverPhotoBlank diff --git a/packages/web/src/components/tipping/support/TopSupporters.tsx b/packages/web/src/components/tipping/support/TopSupporters.tsx index 261bbd9601d..d15ac0b7aec 100644 --- a/packages/web/src/components/tipping/support/TopSupporters.tsx +++ b/packages/web/src/components/tipping/support/TopSupporters.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - import { cacheUsersSelectors, profilePageSelectors, tippingSelectors -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { ID, User } from '@audius/common/models' import { MAX_PROFILE_TOP_SUPPORTERS } from '@audius/common/utils' import { IconTrophy } from '@audius/stems' diff --git a/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx b/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx index dac7463e94b..0940e0ca870 100644 --- a/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx @@ -1,6 +1,8 @@ import { useCallback, useEffect, useState } from 'react' -import { tippingSelectors, tippingActions } from '@audius/common' +import { tippingSelectors, tippingActions } from '@audius/common/store' + +import {} from '@audius/common' import { Button, ButtonType, IconCheck } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/SendTip.tsx b/packages/web/src/components/tipping/tip-audio/SendTip.tsx index 6ff5bb6dfe6..e61af5a1814 100644 --- a/packages/web/src/components/tipping/tip-audio/SendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/SendTip.tsx @@ -1,3 +1,13 @@ +import { + accountSelectors, + tippingSelectors, + tippingActions, + walletSelectors, + getTierAndNumberForBalance, + buyAudioActions, + OnRampProvider +} from '@audius/common/store' + import { cloneElement, ReactNode, @@ -6,15 +16,7 @@ import { useState } from 'react' -import { - accountSelectors, - tippingSelectors, - tippingActions, - walletSelectors, - getTierAndNumberForBalance, - OnRampProvider, - buyAudioActions -} from '@audius/common' +import {} from '@audius/common' import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import { BadgeTier, StringWei, StringAudio, BNWei } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx index 1d5ebfdd634..156a8064b12 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx @@ -1,4 +1,5 @@ -import { profilePageSelectors, tippingActions } from '@audius/common' +import { profilePageSelectors, tippingActions } from '@audius/common/store' +import {} from '@audius/common' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx index b8afd7942ea..0122cb24fee 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx @@ -1,12 +1,14 @@ -import { useCallback, useEffect } from 'react' - import { + accountSelectors, tippingSelectors, tippingActions, - TippingSendStatus, walletActions, - accountSelectors -} from '@audius/common' + TippingSendStatus +} from '@audius/common/store' + +import { useCallback, useEffect } from 'react' + +import {} from '@audius/common' import { StringKeys } from '@audius/common/services' import { Nullable } from '@audius/common/utils' import { Modal, ModalHeader, ModalTitle } from '@audius/stems' diff --git a/packages/web/src/components/tipping/tip-audio/TipSent.tsx b/packages/web/src/components/tipping/tip-audio/TipSent.tsx index c911d641893..ff1176ffa7d 100644 --- a/packages/web/src/components/tipping/tip-audio/TipSent.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipSent.tsx @@ -1,6 +1,8 @@ +import { accountSelectors, tippingSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import { accountSelectors, tippingSelectors } from '@audius/common' +import {} from '@audius/common' import { Name } from '@audius/common/models' import { deriveUserBankAddress } from '@audius/common/services' import { formatNumberCommas } from '@audius/common/utils' diff --git a/packages/web/src/components/toast/Toast.tsx b/packages/web/src/components/toast/Toast.tsx index fb1461c3687..116e09ce5cb 100644 --- a/packages/web/src/components/toast/Toast.tsx +++ b/packages/web/src/components/toast/Toast.tsx @@ -1,6 +1,8 @@ import { PureComponent } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' + +import {} from '@audius/common' import Tooltip from 'antd/lib/tooltip' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/toast/ToastContext.tsx b/packages/web/src/components/toast/ToastContext.tsx index f5ddc32e163..c27bdb5a150 100644 --- a/packages/web/src/components/toast/ToastContext.tsx +++ b/packages/web/src/components/toast/ToastContext.tsx @@ -1,6 +1,8 @@ import { createContext, ReactNode, useCallback } from 'react' -import { CommonState, toastActions } from '@audius/common' +import { toastActions, CommonState } from '@audius/common/store' + +import {} from '@audius/common' import { useDispatch, useSelector } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useTransition, animated } from 'react-spring' diff --git a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx index c4372800328..87ae5ba687d 100644 --- a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx +++ b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx @@ -3,20 +3,21 @@ import { cacheCollectionsSelectors, cacheTracksSelectors, cacheUsersSelectors, - Notification, + queueSelectors, collectionsSocialActions, tracksSocialActions, usersSocialActions, addToCollectionUIActions, deletePlaylistConfirmationModalUIActions, - OverflowSource, mobileOverflowMenuUISelectors, - modalsActions, - modalsSelectors, - queueSelectors, shareModalUIActions, - useEditPlaylistModal -} from '@audius/common' + OverflowSource, + modalsSelectors, + modalsActions, + useEditPlaylistModal, + Notification +} from '@audius/common/store' +import {} from '@audius/common' import { ShareSource, RepostSource, diff --git a/packages/web/src/components/track-overflow-modal/components/MobileOverflowModal.tsx b/packages/web/src/components/track-overflow-modal/components/MobileOverflowModal.tsx index 78bcc217cf4..6ca445583d0 100644 --- a/packages/web/src/components/track-overflow-modal/components/MobileOverflowModal.tsx +++ b/packages/web/src/components/track-overflow-modal/components/MobileOverflowModal.tsx @@ -1,4 +1,5 @@ -import { OverflowAction, OverflowActionCallbacks } from '@audius/common' +import { OverflowAction, OverflowActionCallbacks } from '@audius/common/store' +import {} from '@audius/common' import ActionSheetModal from 'components/action-drawer/ActionDrawer' diff --git a/packages/web/src/components/track/AiTrackSection.tsx b/packages/web/src/components/track/AiTrackSection.tsx index 429ec681ee9..67e901076d2 100644 --- a/packages/web/src/components/track/AiTrackSection.tsx +++ b/packages/web/src/components/track/AiTrackSection.tsx @@ -1,6 +1,8 @@ +import { cacheUsersActions, cacheUsersSelectors } from '@audius/common/store' + import { useCallback, useEffect } from 'react' -import { cacheUsersSelectors, cacheUsersActions } from '@audius/common' +import {} from '@audius/common' import { ID, User } from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/DownloadRow.tsx b/packages/web/src/components/track/DownloadRow.tsx index c48a65cddce..becb1f57306 100644 --- a/packages/web/src/components/track/DownloadRow.tsx +++ b/packages/web/src/components/track/DownloadRow.tsx @@ -1,6 +1,12 @@ +import { + cacheTracksSelectors, + toastActions, + CommonState +} from '@audius/common/store' + import { useCallback } from 'react' -import { CommonState, cacheTracksSelectors, toastActions } from '@audius/common' +import {} from '@audius/common' import { useDownloadableContentAccess } from '@audius/common/hooks' import { DownloadQuality, ID } from '@audius/common/models' import { Flex, IconReceive, PlainButton, Text } from '@audius/harmony' diff --git a/packages/web/src/components/track/DownloadSection.tsx b/packages/web/src/components/track/DownloadSection.tsx index c9c30350579..8b1042bc506 100644 --- a/packages/web/src/components/track/DownloadSection.tsx +++ b/packages/web/src/components/track/DownloadSection.tsx @@ -1,10 +1,12 @@ -import { useCallback, useState } from 'react' - import { - CommonState, cacheTracksSelectors, - usePremiumContentPurchaseModal -} from '@audius/common' + usePremiumContentPurchaseModal, + CommonState +} from '@audius/common/store' + +import { useCallback, useState } from 'react' + +import {} from '@audius/common' import { useCurrentStems, useDownloadableContentAccess diff --git a/packages/web/src/components/track/GatedTrackSection.tsx b/packages/web/src/components/track/GatedTrackSection.tsx index 21357bb20a0..2bacac4a097 100644 --- a/packages/web/src/components/track/GatedTrackSection.tsx +++ b/packages/web/src/components/track/GatedTrackSection.tsx @@ -1,12 +1,14 @@ -import { useCallback } from 'react' - import { cacheUsersSelectors, - gatedContentSelectors, - tippingActions, usersSocialActions as socialActions, - usePremiumContentPurchaseModal -} from '@audius/common' + tippingActions, + usePremiumContentPurchaseModal, + gatedContentSelectors +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { FollowSource, ModalSource, diff --git a/packages/web/src/components/track/GiantTrackTile.tsx b/packages/web/src/components/track/GiantTrackTile.tsx index 46667cce40c..87b86a19f81 100644 --- a/packages/web/src/components/track/GiantTrackTile.tsx +++ b/packages/web/src/components/track/GiantTrackTile.tsx @@ -1,10 +1,12 @@ -import { useCallback, useState } from 'react' - import { + cacheTracksSelectors, publishTrackConfirmationModalUIActions, - CommonState, - cacheTracksSelectors -} from '@audius/common' + CommonState +} from '@audius/common/store' + +import { useCallback, useState } from 'react' + +import {} from '@audius/common' import { isContentUSDCPurchaseGated, ID, diff --git a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx index 3d022ede94f..96ee845bdba 100644 --- a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx +++ b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx @@ -1,8 +1,9 @@ import { - CommonState, accountSelectors, - playbackPositionSelectors -} from '@audius/common' + playbackPositionSelectors, + CommonState +} from '@audius/common/store' +import {} from '@audius/common' import { ID } from '@audius/common/models' import { formatLineupTileDuration } from '@audius/common/utils' import { IconCheck, ProgressBar } from '@audius/stems' diff --git a/packages/web/src/components/track/PlayPauseButton.tsx b/packages/web/src/components/track/PlayPauseButton.tsx index df5ab015738..a3be6d64085 100644 --- a/packages/web/src/components/track/PlayPauseButton.tsx +++ b/packages/web/src/components/track/PlayPauseButton.tsx @@ -3,7 +3,8 @@ import { playerSelectors, playbackPositionSelectors, CommonState -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { ID } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { Button } from '@audius/harmony' diff --git a/packages/web/src/components/track/desktop/BottomRow.tsx b/packages/web/src/components/track/desktop/BottomRow.tsx index 77826274795..32a65bd8cb4 100644 --- a/packages/web/src/components/track/desktop/BottomRow.tsx +++ b/packages/web/src/components/track/desktop/BottomRow.tsx @@ -1,6 +1,8 @@ +import { gatedContentSelectors } from '@audius/common/store' + import { MouseEvent, ReactNode, useCallback } from 'react' -import { gatedContentSelectors } from '@audius/common' +import {} from '@audius/common' import { ID, FieldVisibility, AccessConditions } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx index b57af476103..6fd77113fa6 100644 --- a/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx @@ -1,3 +1,12 @@ +import { + accountSelectors, + cacheCollectionsSelectors, + cacheUsersSelectors, + collectionsSocialActions, + shareModalUIActions, + playerSelectors +} from '@audius/common/store' + import { MouseEvent, memo, @@ -9,14 +18,7 @@ import { useRef } from 'react' -import { - accountSelectors, - cacheCollectionsSelectors, - cacheUsersSelectors, - collectionsSocialActions, - shareModalUIActions, - playerSelectors -} from '@audius/common' +import {} from '@audius/common' import { Name, ShareSource, diff --git a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx index 6235149ec50..b62f29e88fd 100644 --- a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx @@ -1,3 +1,13 @@ +import { + accountSelectors, + cacheTracksSelectors, + cacheUsersSelectors, + tracksSocialActions, + shareModalUIActions, + playerSelectors, + gatedContentActions +} from '@audius/common/store' + import { memo, useState, @@ -7,15 +17,7 @@ import { useRef } from 'react' -import { - accountSelectors, - cacheTracksSelectors, - cacheUsersSelectors, - tracksSocialActions, - shareModalUIActions, - playerSelectors, - gatedContentActions -} from '@audius/common' +import {} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { ShareSource, diff --git a/packages/web/src/components/track/desktop/TrackListItem.tsx b/packages/web/src/components/track/desktop/TrackListItem.tsx index b051755e5b8..7356bcaba30 100644 --- a/packages/web/src/components/track/desktop/TrackListItem.tsx +++ b/packages/web/src/components/track/desktop/TrackListItem.tsx @@ -1,6 +1,8 @@ +import { EnhancedCollectionTrack } from '@audius/common/store' + import { memo, MouseEvent, useRef } from 'react' -import { EnhancedCollectionTrack } from '@audius/common' +import {} from '@audius/common' import { ID, UID } from '@audius/common/models' import { Genre, formatSeconds } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/track/desktop/TrackTile.tsx b/packages/web/src/components/track/desktop/TrackTile.tsx index eebcbbebafd..ac1d2d9d718 100644 --- a/packages/web/src/components/track/desktop/TrackTile.tsx +++ b/packages/web/src/components/track/desktop/TrackTile.tsx @@ -1,11 +1,13 @@ -import { memo } from 'react' - import { accountSelectors, + usePremiumContentPurchaseModal, playbackPositionSelectors, - CommonState, - usePremiumContentPurchaseModal -} from '@audius/common' + CommonState +} from '@audius/common/store' + +import { memo } from 'react' + +import {} from '@audius/common' import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { diff --git a/packages/web/src/components/track/desktop/stats/ProfileImage.tsx b/packages/web/src/components/track/desktop/stats/ProfileImage.tsx index 1f03f6b7d00..ead5778b38c 100644 --- a/packages/web/src/components/track/desktop/stats/ProfileImage.tsx +++ b/packages/web/src/components/track/desktop/stats/ProfileImage.tsx @@ -1,6 +1,8 @@ +import { cacheUsersSelectors } from '@audius/common/store' + import { memo } from 'react' -import { cacheUsersSelectors } from '@audius/common' +import {} from '@audius/common' import { SquareSizes, ID } from '@audius/common/models' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/stats/Stats.tsx b/packages/web/src/components/track/desktop/stats/Stats.tsx index 058fa2ee126..36b65266961 100644 --- a/packages/web/src/components/track/desktop/stats/Stats.tsx +++ b/packages/web/src/components/track/desktop/stats/Stats.tsx @@ -1,6 +1,8 @@ +import { cacheUsersSelectors, CommonState } from '@audius/common/store' + import { memo, useMemo, MouseEvent, useCallback } from 'react' -import { cacheUsersSelectors, CommonState } from '@audius/common' +import {} from '@audius/common' import { Favorite, ID, Repost } from '@audius/common/models' import { createShallowSelector } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx index f931e4b4139..c68b5d97e25 100644 --- a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx @@ -1,20 +1,22 @@ -import { memo, useCallback, useMemo, MouseEvent } from 'react' - import { accountSelectors, cacheCollectionsSelectors, cacheUsersSelectors, collectionsSocialActions, - OverflowAction, - OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, themeSelectors, - RepostType, - favoritesUserListActions, + OverflowAction, + OverflowSource, repostsUserListActions, + favoritesUserListActions, + RepostType, playerSelectors -} from '@audius/common' +} from '@audius/common/store' + +import { memo, useCallback, useMemo, MouseEvent } from 'react' + +import {} from '@audius/common' import { Name, ShareSource, diff --git a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx index 6c66ba0f1de..242f441dea8 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx @@ -1,13 +1,15 @@ -import { memo } from 'react' - import { accountSelectors, cacheUsersSelectors, tracksSocialActions, + mobileOverflowMenuUIActions, OverflowAction, - OverflowSource, - mobileOverflowMenuUIActions -} from '@audius/common' + OverflowSource +} from '@audius/common/store' + +import { memo } from 'react' + +import {} from '@audius/common' import { RepostSource, FavoriteSource, ID } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx index 64c5537555f..c08b7345dbd 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx @@ -1,20 +1,22 @@ -import { memo, MouseEvent } from 'react' - import { accountSelectors, cacheTracksSelectors, cacheUsersSelectors, tracksSocialActions, - OverflowAction, - OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, themeSelectors, - RepostType, + OverflowAction, + OverflowSource, repostsUserListActions, favoritesUserListActions, + RepostType, playerSelectors -} from '@audius/common' +} from '@audius/common/store' + +import { memo, MouseEvent } from 'react' + +import {} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { ShareSource, diff --git a/packages/web/src/components/track/mobile/TrackTile.tsx b/packages/web/src/components/track/mobile/TrackTile.tsx index efcafcbbdde..fefc8a2aa67 100644 --- a/packages/web/src/components/track/mobile/TrackTile.tsx +++ b/packages/web/src/components/track/mobile/TrackTile.tsx @@ -1,10 +1,12 @@ -import { useCallback, useState, useEffect, MouseEvent } from 'react' - import { - gatedContentSelectors, + usePremiumContentPurchaseModal, gatedContentActions, - usePremiumContentPurchaseModal -} from '@audius/common' + gatedContentSelectors +} from '@audius/common/store' + +import { useCallback, useState, useEffect, MouseEvent } from 'react' + +import {} from '@audius/common' import { ModalSource, isContentUSDCPurchaseGated, diff --git a/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx b/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx index d9c3ea72f94..55e519f7bad 100644 --- a/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx +++ b/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx @@ -1,9 +1,11 @@ -import { useCallback } from 'react' - import { transactionDetailsActions, transactionDetailsSelectors -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback } from 'react' + +import {} from '@audius/common' import { Status } from '@audius/common/models' import { Button, diff --git a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx index 4fe380e30e0..25512393679 100644 --- a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx +++ b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx @@ -1,9 +1,10 @@ import { cacheUsersSelectors, - TransactionDetails, + TransactionType, TransactionMethod, - TransactionType -} from '@audius/common' + TransactionDetails +} from '@audius/common/store' +import {} from '@audius/common' import { ChallengeRewardID, User } from '@audius/common/models' import { formatAudio, diff --git a/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx b/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx index d371ddee161..b630e4ac91a 100644 --- a/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx +++ b/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx @@ -1,4 +1,5 @@ -import { InAppAudioPurchaseMetadata } from '@audius/common' +import { InAppAudioPurchaseMetadata } from '@audius/common/store' +import {} from '@audius/common' import { formatNumberString, makeSolanaTransactionLink, diff --git a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx index 7f1a0479156..50adcfe4336 100644 --- a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx +++ b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx @@ -2,7 +2,8 @@ import { trendingPageLineupActions, trendingPageActions, trendingPageSelectors -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { TimeRange } from '@audius/common/models' import { Genre, ELECTRONIC_PREFIX, TRENDING_GENRES } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/twitter-auth/TwitterAuth.tsx b/packages/web/src/components/twitter-auth/TwitterAuth.tsx index c447f9e570c..2e48a17aa57 100644 --- a/packages/web/src/components/twitter-auth/TwitterAuth.tsx +++ b/packages/web/src/components/twitter-auth/TwitterAuth.tsx @@ -1,8 +1,9 @@ import { CSSProperties, MouseEventHandler, ReactNode } from 'react' + +import { TwitterProfile } from '@audius/common/store' import 'whatwg-fetch' import 'url-search-params-polyfill' -import { TwitterProfile } from '@audius/common' import { captureException } from '@sentry/browser' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' diff --git a/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx b/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx index 488c139a80a..8df82af5e01 100644 --- a/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx +++ b/packages/web/src/components/twitter-share-button/TwitterShareButton.tsx @@ -1,11 +1,11 @@ import { MouseEventHandler, useCallback } from 'react' +import { useTwitterButtonStatus } from '@audius/common/hooks' import { - CommonState, cacheUsersActions, - cacheUsersSelectors -} from '@audius/common' -import { useTwitterButtonStatus } from '@audius/common/hooks' + cacheUsersSelectors, + CommonState +} from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { Button, ButtonProps } from '@audius/harmony' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx b/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx index 930a095795e..da19d9c8378 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx +++ b/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx @@ -1,7 +1,8 @@ import { profilePageActions, usersSocialActions as socialActions -} from '@audius/common' +} from '@audius/common/store' +import {} from '@audius/common' import { FollowSource, ID } from '@audius/common/models' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/unload-dialog/UnloadDialog.jsx b/packages/web/src/components/unload-dialog/UnloadDialog.jsx index 085dcdd403a..5a1d9524954 100644 --- a/packages/web/src/components/unload-dialog/UnloadDialog.jsx +++ b/packages/web/src/components/unload-dialog/UnloadDialog.jsx @@ -1,6 +1,8 @@ import { useState, useEffect, useRef } from 'react' -import { confirmerSelectors } from '@audius/common' +import { confirmerSelectors } from '@audius/common/store' + +import {} from '@audius/common' import { Modal } from '@audius/stems' import { connect } from 'react-redux' diff --git a/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx b/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx index 13cf393b79c..2780e97ceea 100644 --- a/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx +++ b/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx @@ -1,6 +1,8 @@ import { useCallback } from 'react' -import { uploadConfirmationModalUISelectors } from '@audius/common' +import { uploadConfirmationModalUISelectors } from '@audius/common/store' + +import {} from '@audius/common' import { Button, ButtonType, diff --git a/packages/web/src/components/upload/UploadChip.tsx b/packages/web/src/components/upload/UploadChip.tsx index 67328733f60..5e9017f557a 100644 --- a/packages/web/src/components/upload/UploadChip.tsx +++ b/packages/web/src/components/upload/UploadChip.tsx @@ -1,8 +1,8 @@ import { Ref, useCallback, useMemo } from 'react' -import { cacheCollectionsActions } from '@audius/common' import { Name, CreatePlaylistSource } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { cacheCollectionsActions } from '@audius/common/store' import { Box, HTMLButtonProps, diff --git a/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx b/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx index 545d4823bea..48489f5366b 100644 --- a/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx +++ b/packages/web/src/components/usdc-manual-transfer/USDCManualTransfer.tsx @@ -1,11 +1,11 @@ import { useCallback, useContext } from 'react' -import { - isContentPurchaseInProgress, - purchaseContentSelectors -} from '@audius/common' import { useUSDCBalance, useCreateUserbankIfNeeded } from '@audius/common/hooks' import { Name } from '@audius/common/models' +import { + purchaseContentSelectors, + isContentPurchaseInProgress +} from '@audius/common/store' import { USDC } from '@audius/fixed-decimal' import { Button, Flex, IconLogoCircleUSDC } from '@audius/harmony' import { IconError } from '@audius/stems' diff --git a/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx b/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx index 5cd3117b577..b5e1e2d68d3 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx @@ -1,4 +1,5 @@ -import { useUSDCPurchaseDetailsModal } from '@audius/common' +import { useUSDCPurchaseDetailsModal } from '@audius/common/store' +import {} from '@audius/common' import { Modal } from '@audius/stems' import { PurchaseModalContent } from './components/PurchaseModalContent' diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx b/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx index c6be58237ac..4e3d05179ec 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx @@ -1,11 +1,13 @@ import { useCallback } from 'react' import { - CommonState, chatActions, chatSelectors, - useInboxUnavailableModal -} from '@audius/common' + useInboxUnavailableModal, + CommonState +} from '@audius/common/store' + +import {} from '@audius/common' import { makeSolanaTransactionLink } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx b/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx index 1ada069f06d..1d3f1cf95e1 100644 --- a/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx +++ b/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx @@ -1,4 +1,5 @@ -import { useUSDCTransactionDetailsModal } from '@audius/common' +import { useUSDCTransactionDetailsModal } from '@audius/common/store' +import {} from '@audius/common' import { formatUSDCWeiToUSDString, makeSolanaTransactionLink diff --git a/packages/web/src/components/user-badges/FollowsYouBadge.tsx b/packages/web/src/components/user-badges/FollowsYouBadge.tsx index 2956de37c6e..3e28a8579cf 100644 --- a/packages/web/src/components/user-badges/FollowsYouBadge.tsx +++ b/packages/web/src/components/user-badges/FollowsYouBadge.tsx @@ -1,5 +1,5 @@ -import { accountSelectors } from '@audius/common' import { ID } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import { useWithMobileStyle } from 'hooks/useWithMobileStyle' diff --git a/packages/web/src/components/user-badges/ProfilePageBadge.tsx b/packages/web/src/components/user-badges/ProfilePageBadge.tsx index f8f84a4f6c1..05759ae9847 100644 --- a/packages/web/src/components/user-badges/ProfilePageBadge.tsx +++ b/packages/web/src/components/user-badges/ProfilePageBadge.tsx @@ -1,8 +1,8 @@ import { useCallback } from 'react' -import { modalsActions } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { BadgeTier, ID } from '@audius/common/models' +import { modalsActions } from '@audius/common/store' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/user-list-modal/components/UserListModal.tsx b/packages/web/src/components/user-list-modal/components/UserListModal.tsx index 20eefea06f8..a6cd99c4938 100644 --- a/packages/web/src/components/user-list-modal/components/UserListModal.tsx +++ b/packages/web/src/components/user-list-modal/components/UserListModal.tsx @@ -1,29 +1,29 @@ import { ReactElement, useRef } from 'react' +import { ID } from '@audius/common/models' import { cacheUsersSelectors, profilePageSelectors, topSupportersUserListSelectors, - UserListStoreState, supportingUserListSelectors, repostsUserListSelectors, notificationsUserListSelectors, - relatedArtistsUserListSelectors, - NOTIFICATIONS_USER_LIST_TAG as NOTIFICATION_TAG, mutualsUserListSelectors, - MUTUALS_USER_LIST_TAG as MUTUALS_TAG, followingUserListSelectors, followersUserListSelectors, favoritesUserListSelectors, - FAVORITES_USER_LIST_TAG as FAVORITES_TAG, - FOLLOWERS_USER_LIST_TAG as FOLLOWER_TAG, - FOLLOWING_USER_LIST_TAG as FOLLOWING_TAG, - REPOSTS_USER_LIST_TAG as REPOST_TAG, - SUPPORTING_USER_LIST_TAG as SUPPORTING_TAG, + relatedArtistsUserListSelectors, TOP_SUPPORTERS_USER_LIST_TAG as SUPPORTER_TAG, - RELATED_ARTISTS_USER_LIST_TAG as RELATED_ARTISTS_TAG -} from '@audius/common' -import { ID } from '@audius/common/models' + SUPPORTING_USER_LIST_TAG as SUPPORTING_TAG, + REPOSTS_USER_LIST_TAG as REPOST_TAG, + NOTIFICATIONS_USER_LIST_TAG as NOTIFICATION_TAG, + MUTUALS_USER_LIST_TAG as MUTUALS_TAG, + FOLLOWING_USER_LIST_TAG as FOLLOWING_TAG, + FOLLOWERS_USER_LIST_TAG as FOLLOWER_TAG, + FAVORITES_USER_LIST_TAG as FAVORITES_TAG, + RELATED_ARTISTS_USER_LIST_TAG as RELATED_ARTISTS_TAG, + UserListStoreState +} from '@audius/common/store' import { Modal, IconTrophy, diff --git a/packages/web/src/components/user-list/UserList.tsx b/packages/web/src/components/user-list/UserList.tsx index 9e6cdf104cc..d980abad932 100644 --- a/packages/web/src/components/user-list/UserList.tsx +++ b/packages/web/src/components/user-list/UserList.tsx @@ -1,15 +1,15 @@ import { useEffect, useState } from 'react' +import { FollowSource, ID, User } from '@audius/common/models' import { accountSelectors, cacheUsersSelectors, profilePageActions, + usersSocialActions as socialActions, userListActions, userListSelectors, - UserListStoreState, - usersSocialActions as socialActions -} from '@audius/common' -import { FollowSource, ID, User } from '@audius/common/models' + UserListStoreState +} from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/user-list/components/UserList.tsx b/packages/web/src/components/user-list/components/UserList.tsx index 2b98ffa0033..e393ddbf1cf 100644 --- a/packages/web/src/components/user-list/components/UserList.tsx +++ b/packages/web/src/components/user-list/components/UserList.tsx @@ -1,8 +1,8 @@ -import { - SUPPORTING_USER_LIST_TAG, - TOP_SUPPORTERS_USER_LIST_TAG -} from '@audius/common' import { ID, User } from '@audius/common/models' +import { + TOP_SUPPORTERS_USER_LIST_TAG, + SUPPORTING_USER_LIST_TAG +} from '@audius/common/store' import cn from 'classnames' import InfiniteScroll from 'react-infinite-scroller' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx b/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx index fa865d0c550..3617f6204b8 100644 --- a/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx +++ b/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx @@ -1,6 +1,8 @@ +import { accountSelectors } from '@audius/common/store' + import { MouseEventHandler, useCallback } from 'react' -import { accountSelectors } from '@audius/common' +import {} from '@audius/common' import { useGetUserById } from '@audius/common/api' import { UserMetadata } from '@audius/common/models' import cn from 'classnames' diff --git a/packages/web/src/components/welcome-modal/WelcomeModal.tsx b/packages/web/src/components/welcome-modal/WelcomeModal.tsx index 5c0d7574bd3..139d126657a 100644 --- a/packages/web/src/components/welcome-modal/WelcomeModal.tsx +++ b/packages/web/src/components/welcome-modal/WelcomeModal.tsx @@ -1,8 +1,8 @@ import { useCallback, useEffect } from 'react' -import { accountSelectors } from '@audius/common' import { welcomeModalMessages } from '@audius/common/messages' import { Name, SquareSizes } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { fillString } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx index dedfef14ed6..8bf7cf6c8d3 100644 --- a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx @@ -1,12 +1,14 @@ -import { useCallback, useEffect, useRef, useState } from 'react' - import { - useWithdrawUSDCModal, - WithdrawUSDCModalPages, withdrawUSDCActions, withdrawUSDCSelectors, + WithdrawUSDCModalPages, + useWithdrawUSDCModal, WithdrawMethod -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback, useEffect, useRef, useState } from 'react' + +import {} from '@audius/common' import { useFeatureFlag, useRemoteVar, diff --git a/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx b/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx index 13c0fc5a893..57d0fa1b594 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx @@ -1,6 +1,11 @@ +import { + withdrawUSDCActions, + useCoinflowWithdrawModal +} from '@audius/common/store' + import { useCallback } from 'react' -import { useCoinflowWithdrawModal, withdrawUSDCActions } from '@audius/common' +import {} from '@audius/common' import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowWithdraw } from '@coinflowlabs/react' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx index f3651177369..ddc17a22061 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx @@ -1,10 +1,12 @@ -import { useCallback, useState } from 'react' - import { WithdrawUSDCModalPages, useWithdrawUSDCModal, WithdrawMethod -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback, useState } from 'react' + +import {} from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' import { diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx index 08bf6bce1a8..94b6c5ed3a8 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx @@ -1,3 +1,9 @@ +import { + WithdrawUSDCModalPages, + useWithdrawUSDCModal, + WithdrawMethod +} from '@audius/common/store' + import { ChangeEventHandler, FocusEventHandler, @@ -5,11 +11,7 @@ import { useState } from 'react' -import { - useWithdrawUSDCModal, - WithdrawUSDCModalPages, - WithdrawMethod -} from '@audius/common' +import {} from '@audius/common' import { useFeatureFlag, useUSDCBalance } from '@audius/common/hooks' import { Name, BNUSDC } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx index afd68dd8485..bf290f5a52b 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx @@ -1,6 +1,11 @@ +import { + WithdrawUSDCModalPages, + useWithdrawUSDCModal +} from '@audius/common/store' + import { useCallback } from 'react' -import { useWithdrawUSDCModal, WithdrawUSDCModalPages } from '@audius/common' +import {} from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' import { diff --git a/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx b/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx index 0e3473018ed..6aff4e30578 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx @@ -1,12 +1,14 @@ import { useEffect } from 'react' import { - CoinflowWithdrawState, withdrawUSDCSelectors, + useCoinflowWithdrawModal, WithdrawUSDCModalPages, useWithdrawUSDCModal, - useCoinflowWithdrawModal -} from '@audius/common' + CoinflowWithdrawState +} from '@audius/common/store' + +import {} from '@audius/common' import { Flex, Text } from '@audius/harmony' import { useField } from 'formik' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx index 39379b94ff2..080e75f345e 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx @@ -1,6 +1,8 @@ +import { withdrawUSDCSelectors, WithdrawMethod } from '@audius/common/store' + import { useCallback } from 'react' -import { withdrawUSDCSelectors, WithdrawMethod } from '@audius/common' +import {} from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { Name, Status, BNUSDC } from '@audius/common/models' import { diff --git a/packages/web/src/components/withdraw-usdc-modal/types.ts b/packages/web/src/components/withdraw-usdc-modal/types.ts index 7114fe074c2..7c8b1c59dd6 100644 --- a/packages/web/src/components/withdraw-usdc-modal/types.ts +++ b/packages/web/src/components/withdraw-usdc-modal/types.ts @@ -1,4 +1,4 @@ -import { WithdrawMethod } from '@audius/common' +import { WithdrawMethod } from '@audius/common/store' export const AMOUNT = 'amount' export const ADDRESS = 'address' diff --git a/packages/web/src/hooks/useAuthenticatedCallback.ts b/packages/web/src/hooks/useAuthenticatedCallback.ts index 36dcf7fafc3..30205bde401 100644 --- a/packages/web/src/hooks/useAuthenticatedCallback.ts +++ b/packages/web/src/hooks/useAuthenticatedCallback.ts @@ -1,6 +1,6 @@ import { MouseEvent as ReactMouseEvent, useCallback } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { useDispatch } from 'react-redux' import { diff --git a/packages/web/src/hooks/useCollectionCoverArt.ts b/packages/web/src/hooks/useCollectionCoverArt.ts index 7b23268e210..a81c4c03592 100644 --- a/packages/web/src/hooks/useCollectionCoverArt.ts +++ b/packages/web/src/hooks/useCollectionCoverArt.ts @@ -1,7 +1,7 @@ -import { cacheCollectionsActions } from '@audius/common' import { imageBlank as imageEmpty } from '@audius/common/assets' import { useImageSize } from '@audius/common/hooks' import { SquareSizes, CoverArtSizes } from '@audius/common/models' +import { cacheCollectionsActions } from '@audius/common/store' import { useDispatch } from 'react-redux' const { fetchCoverArt } = cacheCollectionsActions diff --git a/packages/web/src/hooks/useCoverPhoto.ts b/packages/web/src/hooks/useCoverPhoto.ts index 3292d797cb1..1d706c859fe 100644 --- a/packages/web/src/hooks/useCoverPhoto.ts +++ b/packages/web/src/hooks/useCoverPhoto.ts @@ -1,12 +1,12 @@ import { useCallback } from 'react' -import { cacheUsersActions, cacheUsersSelectors } from '@audius/common' import { imageCoverPhotoBlank, imageProfilePicEmpty } from '@audius/common/assets' import { useImageSize } from '@audius/common/hooks' import { SquareSizes, WidthSizes, CoverPhotoSizes } from '@audius/common/models' +import { cacheUsersActions, cacheUsersSelectors } from '@audius/common/store' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/hooks/useRemoteConfig.ts b/packages/web/src/hooks/useRemoteConfig.ts index f8e990d64c5..7a5e9dc6013 100644 --- a/packages/web/src/hooks/useRemoteConfig.ts +++ b/packages/web/src/hooks/useRemoteConfig.ts @@ -1,8 +1,8 @@ -import { accountSelectors, remoteConfigSelectors } from '@audius/common' import { createUseFeatureFlagHook, createUseRemoteVarHook } from '@audius/common/hooks' +import { accountSelectors, remoteConfigSelectors } from '@audius/common/store' import { remoteConfigInstance } from 'services/remote-config/remote-config-instance' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/hooks/useRequiresAccount.ts b/packages/web/src/hooks/useRequiresAccount.ts index a7eaaa02169..9fa3433356c 100644 --- a/packages/web/src/hooks/useRequiresAccount.ts +++ b/packages/web/src/hooks/useRequiresAccount.ts @@ -1,7 +1,7 @@ import { useEffect } from 'react' -import { accountSelectors } from '@audius/common' import { Status } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/hooks/useTrackCoverArt.ts b/packages/web/src/hooks/useTrackCoverArt.ts index 041f0356686..7ffaab3e734 100644 --- a/packages/web/src/hooks/useTrackCoverArt.ts +++ b/packages/web/src/hooks/useTrackCoverArt.ts @@ -1,7 +1,7 @@ -import { cacheTracksActions, cacheTracksSelectors } from '@audius/common' import { imageBlank as imageEmpty } from '@audius/common/assets' import { useImageSize } from '@audius/common/hooks' import { SquareSizes, ID, CoverArtSizes } from '@audius/common/models' +import { cacheTracksActions, cacheTracksSelectors } from '@audius/common/store' import { Maybe } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/hooks/useUserProfilePicture.ts b/packages/web/src/hooks/useUserProfilePicture.ts index b40a00c1c97..a7f161a2a29 100644 --- a/packages/web/src/hooks/useUserProfilePicture.ts +++ b/packages/web/src/hooks/useUserProfilePicture.ts @@ -1,7 +1,7 @@ -import { cacheUsersActions, cacheUsersSelectors } from '@audius/common' import { imageProfilePicEmpty as profilePicEmpty } from '@audius/common/assets' import { useImageSize } from '@audius/common/hooks' import { SquareSizes, ProfilePictureSizes } from '@audius/common/models' +import { cacheUsersActions, cacheUsersSelectors } from '@audius/common/store' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/hooks/wallet.tsx b/packages/web/src/hooks/wallet.tsx index 020a2fabbf4..ce5f16ac7c3 100644 --- a/packages/web/src/hooks/wallet.tsx +++ b/packages/web/src/hooks/wallet.tsx @@ -1,5 +1,5 @@ -import { accountSelectors, profilePageSelectors } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import { accountSelectors, profilePageSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' const { getProfileUser } = profilePageSelectors diff --git a/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx b/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx index 92e947b5209..91cd40c22d5 100644 --- a/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx +++ b/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx @@ -1,13 +1,15 @@ -import { useEffect, useCallback, ComponentType, RefObject } from 'react' - import { lineupSelectors, aiPageLineupActions as tracksActions, aiPageActions, aiPageSelectors, - playerSelectors, - queueSelectors -} from '@audius/common' + queueSelectors, + playerSelectors +} from '@audius/common/store' + +import { useEffect, useCallback, ComponentType, RefObject } from 'react' + +import {} from '@audius/common' import { ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx index ed855df38b4..cdeb02dfc61 100644 --- a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx +++ b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx @@ -1,6 +1,8 @@ +import { tokenDashboardPageActions, walletActions } from '@audius/common/store' + import { ReactNode, useContext, useEffect } from 'react' -import { tokenDashboardPageActions, walletActions } from '@audius/common' +import {} from '@audius/common' import { StringKeys, FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx index afa97fdef98..0517b3edb3a 100644 --- a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx @@ -1,11 +1,13 @@ -import { ReactNode, useEffect, useMemo, useState } from 'react' - import { challengesSelectors, + audioRewardsPageSelectors, audioRewardsPageActions, - ChallengeRewardsModalType, - audioRewardsPageSelectors -} from '@audius/common' + ChallengeRewardsModalType +} from '@audius/common/store' + +import { ReactNode, useEffect, useMemo, useState } from 'react' + +import {} from '@audius/common' import { Name, ChallengeName, diff --git a/packages/web/src/pages/audio-rewards-page/Tiers.tsx b/packages/web/src/pages/audio-rewards-page/Tiers.tsx index 3c6b1345939..26cce92f424 100644 --- a/packages/web/src/pages/audio-rewards-page/Tiers.tsx +++ b/packages/web/src/pages/audio-rewards-page/Tiers.tsx @@ -1,12 +1,14 @@ -import { ReactElement, useCallback, useEffect, useMemo } from 'react' - import { accountSelectors, badgeTiers, getTierNumber, vipDiscordModalActions, musicConfettiActions -} from '@audius/common' +} from '@audius/common/store' + +import { ReactElement, useCallback, useEffect, useMemo } from 'react' + +import {} from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { BadgeTier } from '@audius/common/models' import { Nullable } from '@audius/common/utils' diff --git a/packages/web/src/pages/audio-rewards-page/Tiles.tsx b/packages/web/src/pages/audio-rewards-page/Tiles.tsx index fbe61b4f3a8..9d3a193b74a 100644 --- a/packages/web/src/pages/audio-rewards-page/Tiles.tsx +++ b/packages/web/src/pages/audio-rewards-page/Tiles.tsx @@ -1,10 +1,12 @@ import { useCallback, ReactNode } from 'react' import { - tokenDashboardPageActions, tokenDashboardPageSelectors, + tokenDashboardPageActions, walletSelectors -} from '@audius/common' +} from '@audius/common/store' + +import {} from '@audius/common' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Button, ButtonType, IconInfo } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx index 23e9355e3b8..357e67c9531 100644 --- a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx @@ -1,6 +1,8 @@ +import { audioRewardsPageActions } from '@audius/common/store' + import { ReactNode } from 'react' -import { audioRewardsPageActions } from '@audius/common' +import {} from '@audius/common' import { ChallengeRewardID, OptimisticUserChallenge diff --git a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx index 6313cb82fd4..a37310f0ec9 100644 --- a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx @@ -1,12 +1,14 @@ -import { ReactNode, useCallback } from 'react' - import { accountSelectors, - tokenDashboardPageActions, - TokenDashboardPageModalState, tokenDashboardPageSelectors, - walletSelectors -} from '@audius/common' + tokenDashboardPageActions, + walletSelectors, + TokenDashboardPageModalState +} from '@audius/common/store' + +import { ReactNode, useCallback } from 'react' + +import {} from '@audius/common' import { Chain, StringWei, BNWei, WalletAddress } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { stringWeiToBN, weiToString, Nullable } from '@audius/common/utils' diff --git a/packages/web/src/pages/audio-rewards-page/components/ConnectWalletsBody.tsx b/packages/web/src/pages/audio-rewards-page/components/ConnectWalletsBody.tsx index 2acf0adbfcc..376d45f483d 100644 --- a/packages/web/src/pages/audio-rewards-page/components/ConnectWalletsBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/ConnectWalletsBody.tsx @@ -1,9 +1,11 @@ import { useCallback } from 'react' import { - tokenDashboardPageActions, - tokenDashboardPageSelectors -} from '@audius/common' + tokenDashboardPageSelectors, + tokenDashboardPageActions +} from '@audius/common/store' + +import {} from '@audius/common' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/RemoveWalletBody.tsx b/packages/web/src/pages/audio-rewards-page/components/RemoveWalletBody.tsx index a09576817d3..7d6cf79ebef 100644 --- a/packages/web/src/pages/audio-rewards-page/components/RemoveWalletBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/RemoveWalletBody.tsx @@ -1,9 +1,11 @@ import { useCallback } from 'react' import { - tokenDashboardPageActions, - tokenDashboardPageSelectors -} from '@audius/common' + tokenDashboardPageSelectors, + tokenDashboardPageActions +} from '@audius/common/store' + +import {} from '@audius/common' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx index 3f10573f9b4..8c9f2d34c91 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx @@ -1,6 +1,8 @@ +import { tokenDashboardPageSelectors } from '@audius/common/store' + import { useEffect, useState } from 'react' -import { tokenDashboardPageSelectors } from '@audius/common' +import {} from '@audius/common' import { StringAudio, BNWei, WalletAddress } from '@audius/common/models' import { weiToAudio, stringAudioToBN } from '@audius/common/utils' import { Button, ButtonType, IconArrow } from '@audius/stems' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx index 399d13a449f..860f00d35f2 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx @@ -1,4 +1,8 @@ -import { tokenDashboardPageActions, walletSelectors } from '@audius/common' +import { + tokenDashboardPageActions, + walletSelectors +} from '@audius/common/store' +import {} from '@audius/common' import { BNWei } from '@audius/common/models' import { isNullOrUndefined } from '@audius/common/utils' import { Button, ButtonType } from '@audius/stems' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx index c784ca4e1a5..4103b03d1e7 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx @@ -1,12 +1,14 @@ -import { useCallback, useContext, useEffect, useMemo } from 'react' - import { + tokenDashboardPageSelectors, tokenDashboardPageActions, walletSelectors, - tokenDashboardPageSelectors, buyAudioActions, OnRampProvider -} from '@audius/common' +} from '@audius/common/store' + +import { useCallback, useContext, useEffect, useMemo } from 'react' + +import {} from '@audius/common' import { Client, BNWei } from '@audius/common/models' import { StringKeys, FeatureFlags, Location } from '@audius/common/services' import { isNullOrUndefined, formatWei } from '@audius/common/utils' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx index 55a351ea8c5..e700d07bfd6 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx @@ -1,9 +1,11 @@ +import { + tokenDashboardPageSelectors, + tokenDashboardPageActions +} from '@audius/common/store' + import { useCallback, useContext, useEffect, MouseEvent } from 'react' -import { - tokenDashboardPageActions, - tokenDashboardPageSelectors -} from '@audius/common' +import {} from '@audius/common' import { Chain, BNWei } from '@audius/common/models' import { shortenSPLAddress, shortenEthAddress } from '@audius/common/utils' import { LogoEth, LogoSol } from '@audius/stems' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx index 9c985b99e89..ac1f90aa759 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx @@ -1,4 +1,8 @@ -import { tokenDashboardPageSelectors, walletSelectors } from '@audius/common' +import { + tokenDashboardPageSelectors, + walletSelectors +} from '@audius/common/store' +import {} from '@audius/common' import { BNWei } from '@audius/common/models' import { IconInfo } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx index ffb8f16aa94..4085013d0dc 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx @@ -1,6 +1,8 @@ +import { challengesSelectors } from '@audius/common/store' + import { ReactNode, useCallback } from 'react' -import { challengesSelectors } from '@audius/common' +import {} from '@audius/common' import { useAudioMatchingChallengeCooldownSchedule } from '@audius/common/hooks' import { ChallengeName, OptimisticUserChallenge } from '@audius/common/models' import { diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx index 9b4dd08b8d0..84170c0157f 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx @@ -3,12 +3,14 @@ import { useCallback, useEffect, useContext, useMemo } from 'react' import { accountSelectors, challengesSelectors, + audioRewardsPageSelectors, audioRewardsPageActions, - ChallengeRewardsModalType, ClaimStatus, - audioRewardsPageSelectors, - musicConfettiActions -} from '@audius/common' + musicConfettiActions, + ChallengeRewardsModalType +} from '@audius/common/store' + +import {} from '@audius/common' import { fillString, formatNumberCommas, diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/HCaptchaModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/HCaptchaModal.tsx index b9861faa492..8ad3ba1c466 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/HCaptchaModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/HCaptchaModal.tsx @@ -1,6 +1,8 @@ import { useCallback } from 'react' -import { audioRewardsPageActions, HCaptchaStatus } from '@audius/common' +import { audioRewardsPageActions, HCaptchaStatus } from '@audius/common/store' + +import {} from '@audius/common' import HCaptcha from '@hcaptcha/react-hcaptcha' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx index fc0bc8d73d6..5f369282c01 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx @@ -1,10 +1,12 @@ -import { useCallback, useEffect, useState } from 'react' - import { + audioRewardsPageSelectors, audioRewardsPageActions, - TrendingRewardsModalType, - audioRewardsPageSelectors -} from '@audius/common' + TrendingRewardsModalType +} from '@audius/common/store' + +import { useCallback, useEffect, useState } from 'react' + +import {} from '@audius/common' import { Theme } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { SegmentedControl, ButtonType, Button, IconArrow } from '@audius/stems' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/VipDiscordModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/VipDiscordModal.tsx index 81df51ce244..4348f167090 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/VipDiscordModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/VipDiscordModal.tsx @@ -1,4 +1,5 @@ -import { vipDiscordModalSelectors } from '@audius/common' +import { vipDiscordModalSelectors } from '@audius/common/store' +import {} from '@audius/common' import { Button, ButtonType, IconDiscord } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/audio-transactions-page/AudioTransactionsPage.tsx b/packages/web/src/pages/audio-transactions-page/AudioTransactionsPage.tsx index 3ac1015e0bc..dec6617ceed 100644 --- a/packages/web/src/pages/audio-transactions-page/AudioTransactionsPage.tsx +++ b/packages/web/src/pages/audio-transactions-page/AudioTransactionsPage.tsx @@ -6,14 +6,14 @@ import { useLayoutEffect } from 'react' +import { statusIsNotFinalized } from '@audius/common/models' import { - TransactionDetails, - TransactionType, - audioTransactionsPageActions, audioTransactionsPageSelectors, - transactionDetailsActions -} from '@audius/common' -import { statusIsNotFinalized } from '@audius/common/models' + audioTransactionsPageActions, + transactionDetailsActions, + TransactionType, + TransactionDetails +} from '@audius/common/store' import { full } from '@audius/sdk' import { IconCaretRight } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/ChatPage.tsx b/packages/web/src/pages/chat-page/ChatPage.tsx index e6c08f3164d..2e2bbe79a38 100644 --- a/packages/web/src/pages/chat-page/ChatPage.tsx +++ b/packages/web/src/pages/chat-page/ChatPage.tsx @@ -1,8 +1,8 @@ import { useCallback, useEffect, useRef } from 'react' -import { chatActions, chatSelectors } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' import { FeatureFlags } from '@audius/common/services' +import { chatActions, chatSelectors } from '@audius/common/store' import { ResizeObserver } from '@juggle/resize-observer' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/BlockUserConfirmationModal.tsx b/packages/web/src/pages/chat-page/components/BlockUserConfirmationModal.tsx index 083254293bb..980238d5e6f 100644 --- a/packages/web/src/pages/chat-page/components/BlockUserConfirmationModal.tsx +++ b/packages/web/src/pages/chat-page/components/BlockUserConfirmationModal.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { chatActions } from '@audius/common' import { Name, User } from '@audius/common/models' +import { chatActions } from '@audius/common/store' import { Button, ButtonType, diff --git a/packages/web/src/pages/chat-page/components/ChatComposer.tsx b/packages/web/src/pages/chat-page/components/ChatComposer.tsx index 8ec61b7bad9..a9b0143ffda 100644 --- a/packages/web/src/pages/chat-page/components/ChatComposer.tsx +++ b/packages/web/src/pages/chat-page/components/ChatComposer.tsx @@ -8,7 +8,7 @@ import { useEffect } from 'react' -import { chatActions } from '@audius/common' +import { chatActions } from '@audius/common/store' import { IconButton, IconSend } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/ChatHeader.tsx b/packages/web/src/pages/chat-page/components/ChatHeader.tsx index e9cea2eaf52..ec28e871e8a 100644 --- a/packages/web/src/pages/chat-page/components/ChatHeader.tsx +++ b/packages/web/src/pages/chat-page/components/ChatHeader.tsx @@ -1,8 +1,8 @@ import { forwardRef, useCallback, useState } from 'react' -import { chatSelectors, useCreateChatModal } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { User } from '@audius/common/models' +import { chatSelectors, useCreateChatModal } from '@audius/common/store' import { IconButton, IconCompose, diff --git a/packages/web/src/pages/chat-page/components/ChatList.tsx b/packages/web/src/pages/chat-page/components/ChatList.tsx index 9e75ab1a9ac..d10f13cdfa0 100644 --- a/packages/web/src/pages/chat-page/components/ChatList.tsx +++ b/packages/web/src/pages/chat-page/components/ChatList.tsx @@ -5,8 +5,8 @@ import { useState } from 'react' -import { chatSelectors, chatActions } from '@audius/common' import { Status } from '@audius/common/models' +import { chatActions, chatSelectors } from '@audius/common/store' import cn from 'classnames' import InfiniteScroll from 'react-infinite-scroller' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/ChatListItem.tsx b/packages/web/src/pages/chat-page/components/ChatListItem.tsx index 6531365a3ab..144c7090628 100644 --- a/packages/web/src/pages/chat-page/components/ChatListItem.tsx +++ b/packages/web/src/pages/chat-page/components/ChatListItem.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { chatSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { chatSelectors } from '@audius/common/store' import type { UserChat } from '@audius/sdk' import cn from 'classnames' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageList.tsx b/packages/web/src/pages/chat-page/components/ChatMessageList.tsx index 9e9af195a97..1ec0e6cb7e8 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageList.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageList.tsx @@ -11,9 +11,13 @@ import { useMemo } from 'react' -import { accountSelectors, chatActions, chatSelectors } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' import { Status } from '@audius/common/models' +import { + accountSelectors, + chatActions, + chatSelectors +} from '@audius/common/store' import { encodeHashId, hasTail, diff --git a/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx b/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx index 71ec4a22462..dc1065e0cf7 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageListItem.tsx @@ -1,13 +1,13 @@ import { useCallback, useRef, useState } from 'react' +import { useProxySelector, useCanSendMessage } from '@audius/common/hooks' +import { Status, ChatMessageWithExtras } from '@audius/common/models' import { accountSelectors, cacheUsersSelectors, chatActions, ReactionTypes -} from '@audius/common' -import { useProxySelector, useCanSendMessage } from '@audius/common/hooks' -import { Status, ChatMessageWithExtras } from '@audius/common/models' +} from '@audius/common/store' import { formatMessageDate, decodeHashId, diff --git a/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx b/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx index 30f882f5a6b..fe137ddede0 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx @@ -1,20 +1,20 @@ import { useCallback, useMemo, useEffect } from 'react' -import { - QueueSource, - playerSelectors, - accountSelectors, - ChatMessageTileProps, - cacheCollectionsActions, - cacheCollectionsSelectors, - CommonState -} from '@audius/common' import { useGetTracksByIds, useGetPlaylistByPermalink } from '@audius/common/api' import { usePlayTrack, usePauseTrack } from '@audius/common/hooks' import { Name, SquareSizes, Kind, Status, ID } from '@audius/common/models' +import { + accountSelectors, + cacheCollectionsActions, + cacheCollectionsSelectors, + QueueSource, + playerSelectors, + ChatMessageTileProps, + CommonState +} from '@audius/common/store' import { getPathFromPlaylistUrl, makeUid } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx index 56c29c64b1d..de2475ad699 100644 --- a/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx +++ b/packages/web/src/pages/chat-page/components/ChatMessageTrack.tsx @@ -1,11 +1,5 @@ import { useCallback, useEffect, useMemo } from 'react' -import { - QueueSource, - accountSelectors, - ChatMessageTileProps, - cacheTracksActions -} from '@audius/common' import { useGetTrackByPermalink } from '@audius/common/api' import { TrackPlayback, @@ -20,6 +14,12 @@ import { Status, ID } from '@audius/common/models' +import { + accountSelectors, + cacheTracksActions, + QueueSource, + ChatMessageTileProps +} from '@audius/common/store' import { getPathFromTrackUrl, makeUid } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/CreateChatModal.tsx b/packages/web/src/pages/chat-page/components/CreateChatModal.tsx index 9a3b464417e..c989605a537 100644 --- a/packages/web/src/pages/chat-page/components/CreateChatModal.tsx +++ b/packages/web/src/pages/chat-page/components/CreateChatModal.tsx @@ -1,19 +1,19 @@ import { useCallback, useEffect } from 'react' +import { User } from '@audius/common/models' import { accountSelectors, chatActions, + chatSelectors, + searchUsersModalActions, + useCreateChatModal, + createChatModalActions, + useInboxUnavailableModal, userListActions, - FOLLOWERS_USER_LIST_TAG, followersUserListActions, followersUserListSelectors, - useCreateChatModal, - useInboxUnavailableModal, - createChatModalActions, - searchUsersModalActions, - chatSelectors -} from '@audius/common' -import { User } from '@audius/common/models' + FOLLOWERS_USER_LIST_TAG +} from '@audius/common/store' import { IconCompose } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/chat-page/components/CreateChatPrompt.tsx b/packages/web/src/pages/chat-page/components/CreateChatPrompt.tsx index 70bdf994104..9be8250b0ff 100644 --- a/packages/web/src/pages/chat-page/components/CreateChatPrompt.tsx +++ b/packages/web/src/pages/chat-page/components/CreateChatPrompt.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { chatSelectors, useCreateChatModal } from '@audius/common' +import { chatSelectors, useCreateChatModal } from '@audius/common/store' import { Button, ButtonType, IconCompose } from '@audius/stems' import { useSelector } from 'common/hooks/useSelector' diff --git a/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx b/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx index 9743cedde46..1bfab929a4a 100644 --- a/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx +++ b/packages/web/src/pages/chat-page/components/CreateChatUserResult.tsx @@ -1,14 +1,14 @@ import { useCallback, useEffect } from 'react' +import { User } from '@audius/common/models' import { accountSelectors, chatActions, - ChatPermissionAction, chatSelectors, - tippingActions, - tippingSelectors -} from '@audius/common' -import { User } from '@audius/common/models' + ChatPermissionAction, + tippingSelectors, + tippingActions +} from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { IconBlockMessages, diff --git a/packages/web/src/pages/chat-page/components/DeleteChatConfirmationModal.tsx b/packages/web/src/pages/chat-page/components/DeleteChatConfirmationModal.tsx index b03d318e594..1a162c03467 100644 --- a/packages/web/src/pages/chat-page/components/DeleteChatConfirmationModal.tsx +++ b/packages/web/src/pages/chat-page/components/DeleteChatConfirmationModal.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { chatActions } from '@audius/common' +import { chatActions } from '@audius/common/store' import { Button, ButtonType, diff --git a/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx b/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx index 201b78b81e2..ad4389d11bd 100644 --- a/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx +++ b/packages/web/src/pages/chat-page/components/InboxUnavailableMessage.tsx @@ -1,7 +1,7 @@ import { useState, useCallback, MouseEventHandler } from 'react' -import { ChatPermissionAction } from '@audius/common' import { User } from '@audius/common/models' +import { ChatPermissionAction } from '@audius/common/store' import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { UserNameAndBadges } from 'components/user-name-and-badges/UserNameAndBadges' diff --git a/packages/web/src/pages/chat-page/components/LinkPreview.tsx b/packages/web/src/pages/chat-page/components/LinkPreview.tsx index ea6356e6f1d..0e5e0c4113b 100644 --- a/packages/web/src/pages/chat-page/components/LinkPreview.tsx +++ b/packages/web/src/pages/chat-page/components/LinkPreview.tsx @@ -1,7 +1,7 @@ import { MouseEventHandler, useCallback, useEffect } from 'react' -import { useLeavingAudiusModal } from '@audius/common' import { useLinkUnfurlMetadata } from '@audius/common/hooks' +import { useLeavingAudiusModal } from '@audius/common/store' import { isAudiusUrl } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/pages/chat-page/components/ReactionPopupMenu.tsx b/packages/web/src/pages/chat-page/components/ReactionPopupMenu.tsx index 43b6a9fc0da..7be64457ad7 100644 --- a/packages/web/src/pages/chat-page/components/ReactionPopupMenu.tsx +++ b/packages/web/src/pages/chat-page/components/ReactionPopupMenu.tsx @@ -1,6 +1,6 @@ import { ComponentType, MutableRefObject } from 'react' -import { reactionOrder, ReactionTypes } from '@audius/common' +import { reactionOrder, ReactionTypes } from '@audius/common/store' import { Popup, PopupPosition } from '@audius/stems' import { diff --git a/packages/web/src/pages/chat-page/components/UnblockUserConfirmationModal.tsx b/packages/web/src/pages/chat-page/components/UnblockUserConfirmationModal.tsx index 65c9d9d944d..7ee7dff5d0d 100644 --- a/packages/web/src/pages/chat-page/components/UnblockUserConfirmationModal.tsx +++ b/packages/web/src/pages/chat-page/components/UnblockUserConfirmationModal.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { chatActions } from '@audius/common' import { User } from '@audius/common/models' +import { chatActions } from '@audius/common/store' import { Button, ButtonType, diff --git a/packages/web/src/pages/check-page/CheckPage.tsx b/packages/web/src/pages/check-page/CheckPage.tsx index 8200d258081..e0632f7ecb0 100644 --- a/packages/web/src/pages/check-page/CheckPage.tsx +++ b/packages/web/src/pages/check-page/CheckPage.tsx @@ -1,6 +1,8 @@ +import { accountSelectors } from '@audius/common/store' + import { useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' +import {} from '@audius/common' import { Status } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx index 4c0dcd2677f..bc1ac2e3b1f 100644 --- a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx +++ b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx @@ -1,3 +1,15 @@ +import { + cacheUsersSelectors, + profilePageActions, + queueActions, + QueueSource, + collectibleDetailsUIActions, + shareModalUIActions, + playerSelectors, + CollectionTrack, + CollectionPageTrackRecord +} from '@audius/common/store' + import { useCallback, useEffect, @@ -7,17 +19,7 @@ import { ComponentType } from 'react' -import { - cacheUsersSelectors, - profilePageActions, - CollectionTrack, - CollectionPageTrackRecord, - queueActions, - QueueSource, - collectibleDetailsUIActions, - shareModalUIActions, - playerSelectors -} from '@audius/common' +import {} from '@audius/common' import { ShareSource, Chain, diff --git a/packages/web/src/pages/collection-page/CollectionPage.tsx b/packages/web/src/pages/collection-page/CollectionPage.tsx index 87170500a0f..a4d6bf63b5a 100644 --- a/packages/web/src/pages/collection-page/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/CollectionPage.tsx @@ -1,5 +1,5 @@ -import { CollectionsPageType } from '@audius/common' import { SmartCollection } from '@audius/common/models' +import { CollectionsPageType } from '@audius/common/store' import { useIsMobile } from 'hooks/useIsMobile' diff --git a/packages/web/src/pages/collection-page/CollectionPageProvider.tsx b/packages/web/src/pages/collection-page/CollectionPageProvider.tsx index dc218dc7a47..fddaafd8677 100644 --- a/packages/web/src/pages/collection-page/CollectionPageProvider.tsx +++ b/packages/web/src/pages/collection-page/CollectionPageProvider.tsx @@ -1,31 +1,5 @@ import { ChangeEvent, Component, ComponentType } from 'react' -import { - accountSelectors, - cacheCollectionsActions, - lineupSelectors, - collectionPageActions as collectionActions, - collectionPageLineupActions as tracksActions, - collectionPageSelectors, - CollectionPageTrackRecord, - CollectionTrack, - CollectionsPageType, - OverflowAction, - OverflowSource, - mobileOverflowMenuUIActions, - shareModalUIActions, - RepostType, - repostsUserListActions, - favoritesUserListActions, - collectionsSocialActions as socialCollectionsActions, - tracksSocialActions as socialTracksActions, - usersSocialActions as socialUsersActions, - playerSelectors, - queueSelectors, - playlistUpdatesActions, - playlistUpdatesSelectors, - editPlaylistModalActions -} from '@audius/common' import { Name, ShareSource, @@ -42,6 +16,32 @@ import { ID, UID } from '@audius/common/models' +import { + accountSelectors, + cacheCollectionsActions, + lineupSelectors, + collectionPageLineupActions as tracksActions, + collectionPageSelectors, + collectionPageActions as collectionActions, + queueSelectors, + collectionsSocialActions as socialCollectionsActions, + tracksSocialActions as socialTracksActions, + usersSocialActions as socialUsersActions, + mobileOverflowMenuUIActions, + shareModalUIActions, + OverflowAction, + OverflowSource, + editPlaylistModalActions, + repostsUserListActions, + favoritesUserListActions, + RepostType, + playerSelectors, + playlistUpdatesActions, + playlistUpdatesSelectors, + CollectionTrack, + CollectionsPageType, + CollectionPageTrackRecord +} from '@audius/common/store' import { formatUrlName, Uid, Nullable } from '@audius/common/utils' import { push as pushRoute, replace } from 'connected-react-router' import { UnregisterCallback } from 'history' diff --git a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx index b594be32970..70452915d27 100644 --- a/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/components/desktop/CollectionPage.tsx @@ -1,10 +1,5 @@ import { ChangeEvent, useMemo } from 'react' -import { - CollectionTrack, - CollectionPageTrackRecord, - CollectionsPageType -} from '@audius/common' import { Variant, DogEarType, @@ -15,6 +10,11 @@ import { User } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + CollectionTrack, + CollectionsPageType, + CollectionPageTrackRecord +} from '@audius/common/store' import { CollectiblesPlaylistTableColumn, diff --git a/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx b/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx index d03920ffa38..eb31380ed98 100644 --- a/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx +++ b/packages/web/src/pages/collection-page/components/mobile/CollectionPage.tsx @@ -1,10 +1,5 @@ import { memo, useEffect, useContext } from 'react' -import { - CollectionsPageType, - CollectionTrack, - OverflowAction -} from '@audius/common' import { useGatedContentAccessMap } from '@audius/common/hooks' import { Variant, @@ -15,6 +10,11 @@ import { ID, User } from '@audius/common/models' +import { + OverflowAction, + CollectionTrack, + CollectionsPageType +} from '@audius/common/store' import CollectionHeader from 'components/collection/mobile/CollectionHeader' import { HeaderContext } from 'components/header/mobile/HeaderContextProvider' diff --git a/packages/web/src/pages/dashboard-page/DashboardPage.tsx b/packages/web/src/pages/dashboard-page/DashboardPage.tsx index c1a635a39d2..27e366603aa 100644 --- a/packages/web/src/pages/dashboard-page/DashboardPage.tsx +++ b/packages/web/src/pages/dashboard-page/DashboardPage.tsx @@ -1,6 +1,8 @@ +import { themeSelectors } from '@audius/common/store' + import { useState, Suspense, ReactNode, useEffect, useCallback } from 'react' -import { themeSelectors } from '@audius/common' +import {} from '@audius/common' import { Status, Track } from '@audius/common/models' import { formatCount } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/pages/dashboard-page/store/sagas.ts b/packages/web/src/pages/dashboard-page/store/sagas.ts index 07a234d5f8a..4d04f7b833d 100644 --- a/packages/web/src/pages/dashboard-page/store/sagas.ts +++ b/packages/web/src/pages/dashboard-page/store/sagas.ts @@ -1,4 +1,9 @@ -import { accountSelectors, walletActions, getContext } from '@audius/common' +import { + accountSelectors, + walletActions, + getContext +} from '@audius/common/store' +import {} from '@audius/common' import { Collection, ID, Track } from '@audius/common/models' import { IntKeys } from '@audius/common/services' import { waitForValue, doEvery } from '@audius/common/utils' diff --git a/packages/web/src/pages/dashboard-page/store/selectors.ts b/packages/web/src/pages/dashboard-page/store/selectors.ts index 05a45465c51..00a86bba20f 100644 --- a/packages/web/src/pages/dashboard-page/store/selectors.ts +++ b/packages/web/src/pages/dashboard-page/store/selectors.ts @@ -1,4 +1,5 @@ -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' +import {} from '@audius/common' import { createSelector } from 'reselect' import { AppState } from 'store/types' diff --git a/packages/web/src/pages/deactivate-account-page/DeactivateAccountPage.tsx b/packages/web/src/pages/deactivate-account-page/DeactivateAccountPage.tsx index 3fa6bb3037a..6ea2f29b538 100644 --- a/packages/web/src/pages/deactivate-account-page/DeactivateAccountPage.tsx +++ b/packages/web/src/pages/deactivate-account-page/DeactivateAccountPage.tsx @@ -1,10 +1,10 @@ import { ReactNode, useCallback, useEffect } from 'react' +import { Name, Status } from '@audius/common/models' import { deactivateAccountActions, deactivateAccountSelectors -} from '@audius/common' -import { Name, Status } from '@audius/common/models' +} from '@audius/common/store' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/pages/deleted-page/DeletedPageProvider.tsx b/packages/web/src/pages/deleted-page/DeletedPageProvider.tsx index 6b0f073117c..7b049b9a040 100644 --- a/packages/web/src/pages/deleted-page/DeletedPageProvider.tsx +++ b/packages/web/src/pages/deleted-page/DeletedPageProvider.tsx @@ -1,11 +1,11 @@ import { useEffect, useCallback, ComponentType } from 'react' +import { Playable, User } from '@audius/common/models' import { lineupSelectors, - playerSelectors, - queueSelectors -} from '@audius/common' -import { Playable, User } from '@audius/common/models' + queueSelectors, + playerSelectors +} from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/deleted-page/store/lineups/more-by/actions.ts b/packages/web/src/pages/deleted-page/store/lineups/more-by/actions.ts index 53a4d1f3c33..87e80529428 100644 --- a/packages/web/src/pages/deleted-page/store/lineups/more-by/actions.ts +++ b/packages/web/src/pages/deleted-page/store/lineups/more-by/actions.ts @@ -1,4 +1,4 @@ -import { LineupBaseActions } from '@audius/common' +import { LineupBaseActions } from '@audius/common/store' export const PREFIX = 'DELETED_PAGE_MORE_BY' diff --git a/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts b/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts index 1ce2f975be6..912362179bf 100644 --- a/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts +++ b/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts @@ -1,4 +1,5 @@ -import { lineupActions, lineupReducer } from '@audius/common' +import { lineupActions, lineupReducer } from '@audius/common/store' +import {} from '@audius/common' import { LineupState, Track } from '@audius/common/models' import { PREFIX } from 'pages/deleted-page/store/lineups/more-by/actions' diff --git a/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts b/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts index 3ce36ec0b55..fdb86e32ad3 100644 --- a/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts +++ b/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts @@ -1,4 +1,5 @@ -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' +import {} from '@audius/common' import { call, select } from 'typed-redux-saga' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/pages/deleted-page/store/slice.ts b/packages/web/src/pages/deleted-page/store/slice.ts index 3040ee52072..4dbce395423 100644 --- a/packages/web/src/pages/deleted-page/store/slice.ts +++ b/packages/web/src/pages/deleted-page/store/slice.ts @@ -1,4 +1,5 @@ -import { lineupReducer } from '@audius/common' +import { lineupReducer } from '@audius/common/store' +import {} from '@audius/common' import { createSlice } from '@reduxjs/toolkit' import { combineReducers } from 'redux' diff --git a/packages/web/src/pages/demo-trpc/DemoTrpcPage.tsx b/packages/web/src/pages/demo-trpc/DemoTrpcPage.tsx index a19ffb73938..6e746dc2687 100644 --- a/packages/web/src/pages/demo-trpc/DemoTrpcPage.tsx +++ b/packages/web/src/pages/demo-trpc/DemoTrpcPage.tsx @@ -1,6 +1,6 @@ import { CSSProperties, Suspense, useMemo, useState } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { RouterInput } from '@audius/trpc-server' import { useSelector } from 'react-redux' import { create } from 'zustand' diff --git a/packages/web/src/pages/explore-page/ExploreCollectionsPage.tsx b/packages/web/src/pages/explore-page/ExploreCollectionsPage.tsx index 875b72619f7..28ca5e43795 100644 --- a/packages/web/src/pages/explore-page/ExploreCollectionsPage.tsx +++ b/packages/web/src/pages/explore-page/ExploreCollectionsPage.tsx @@ -1,4 +1,4 @@ -import { ExploreCollectionsVariant } from '@audius/common' +import { ExploreCollectionsVariant } from '@audius/common/store' import { useIsMobile } from 'hooks/useIsMobile' diff --git a/packages/web/src/pages/explore-page/ExploreCollectionsPageProvider.tsx b/packages/web/src/pages/explore-page/ExploreCollectionsPageProvider.tsx index e1e328c7ee1..28b1d6c063b 100644 --- a/packages/web/src/pages/explore-page/ExploreCollectionsPageProvider.tsx +++ b/packages/web/src/pages/explore-page/ExploreCollectionsPageProvider.tsx @@ -1,14 +1,14 @@ import { useEffect, useState, useCallback, ComponentType } from 'react' +import { FavoriteType, ID } from '@audius/common/models' import { - ExploreCollectionsVariant, explorePageCollectionsSelectors, explorePageCollectionsActions, - RepostType, + ExploreCollectionsVariant, repostsUserListActions, - favoritesUserListActions -} from '@audius/common' -import { FavoriteType, ID } from '@audius/common/models' + favoritesUserListActions, + RepostType +} from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { matchPath } from 'react-router' diff --git a/packages/web/src/pages/explore-page/ExplorePage.tsx b/packages/web/src/pages/explore-page/ExplorePage.tsx index f95dc8ac585..94390469032 100644 --- a/packages/web/src/pages/explore-page/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/ExplorePage.tsx @@ -1,4 +1,4 @@ -import { remoteConfigSelectors } from '@audius/common' +import { remoteConfigSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import { useIsMobile } from 'hooks/useIsMobile' diff --git a/packages/web/src/pages/explore-page/ExplorePageProvider.tsx b/packages/web/src/pages/explore-page/ExplorePageProvider.tsx index bf58d616468..dc2642df7f0 100644 --- a/packages/web/src/pages/explore-page/ExplorePageProvider.tsx +++ b/packages/web/src/pages/explore-page/ExplorePageProvider.tsx @@ -2,9 +2,9 @@ import { ComponentType, useEffect } from 'react' import { accountSelectors, - explorePageActions, - explorePageSelectors -} from '@audius/common' + explorePageSelectors, + explorePageActions +} from '@audius/common/store' import { formatCount } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/pages/explore-page/collections.ts b/packages/web/src/pages/explore-page/collections.ts index d177828480b..6ea42e968fa 100644 --- a/packages/web/src/pages/explore-page/collections.ts +++ b/packages/web/src/pages/explore-page/collections.ts @@ -1,6 +1,6 @@ import { ComponentType, SVGProps } from 'react' -import { ExploreCollectionsVariant } from '@audius/common' +import { ExploreCollectionsVariant } from '@audius/common/store' import { IconCart } from '@audius/stems' import IconCassette from 'assets/img/iconCassette.svg' diff --git a/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx b/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx index 79b66cd2592..d69a89d2809 100644 --- a/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/components/desktop/ExplorePage.tsx @@ -1,12 +1,12 @@ import { Fragment, useCallback } from 'react' -import { ExploreCollectionsVariant } from '@audius/common' import { Variant as CollectionVariant, Status, UserCollection, User } from '@audius/common/models' +import { ExploreCollectionsVariant } from '@audius/common/store' import Lottie from 'react-lottie' import loadingSpinner from 'assets/animations/loadingSpinner.json' diff --git a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx index 83e9a4774bf..f8105186c36 100644 --- a/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx +++ b/packages/web/src/pages/explore-page/components/mobile/ExplorePage.tsx @@ -7,12 +7,6 @@ import React, { useCallback } from 'react' -import { - explorePageActions, - ExplorePageTabs as ExploreTabs, - ExploreCollectionsVariant, - explorePageSelectors -} from '@audius/common' import { Variant as CollectionVariant, Status, @@ -20,6 +14,12 @@ import { SmartCollection, User } from '@audius/common/models' +import { + explorePageSelectors, + explorePageActions, + ExplorePageTabs as ExploreTabs, + ExploreCollectionsVariant +} from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/favorites-page/FavoritesPage.tsx b/packages/web/src/pages/favorites-page/FavoritesPage.tsx index 48c212fb3b1..2aa3460e52b 100644 --- a/packages/web/src/pages/favorites-page/FavoritesPage.tsx +++ b/packages/web/src/pages/favorites-page/FavoritesPage.tsx @@ -3,7 +3,7 @@ import { useEffect, useContext } from 'react' import { favoritesUserListSelectors, FAVORITES_USER_LIST_TAG as USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' import MobilePageContainer from 'components/mobile-page-container/MobilePageContainer' import NavContext, { LeftPreset } from 'components/nav/store/context' diff --git a/packages/web/src/pages/fb-share-page/FbSharePage.tsx b/packages/web/src/pages/fb-share-page/FbSharePage.tsx index b0087c71b70..48f8987cba3 100644 --- a/packages/web/src/pages/fb-share-page/FbSharePage.tsx +++ b/packages/web/src/pages/fb-share-page/FbSharePage.tsx @@ -1,6 +1,6 @@ import React, { useEffect } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import cn from 'classnames' import { Text } from 'components/typography' diff --git a/packages/web/src/pages/feed-page/FeedPageProvider.jsx b/packages/web/src/pages/feed-page/FeedPageProvider.jsx index b15f1c9edf1..b56e0cf56f1 100644 --- a/packages/web/src/pages/feed-page/FeedPageProvider.jsx +++ b/packages/web/src/pages/feed-page/FeedPageProvider.jsx @@ -1,15 +1,15 @@ import { PureComponent } from 'react' +import { Name } from '@audius/common/models' import { accountSelectors, lineupSelectors, feedPageLineupActions as feedActions, feedPageSelectors, feedPageActions as discoverPageAction, - playerSelectors, - queueSelectors -} from '@audius/common' -import { Name } from '@audius/common/models' + queueSelectors, + playerSelectors +} from '@audius/common/store' import { push as pushRoute, replace as replaceRoute diff --git a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx index a4e76eb1508..786e20778a3 100644 --- a/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx +++ b/packages/web/src/pages/feed-page/components/desktop/FeedPageContent.tsx @@ -1,7 +1,7 @@ -import { feedPageLineupActions as feedActions } from '@audius/common' import { useFeatureFlag } from '@audius/common/hooks' import { Name, FeedFilter } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { feedPageLineupActions as feedActions } from '@audius/common/store' import { make, useRecord } from 'common/store/analytics/actions' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/feed-page/components/mobile/FeedPageContent.tsx b/packages/web/src/pages/feed-page/components/mobile/FeedPageContent.tsx index 9ca980cce53..d2cbb7b7bb0 100644 --- a/packages/web/src/pages/feed-page/components/mobile/FeedPageContent.tsx +++ b/packages/web/src/pages/feed-page/components/mobile/FeedPageContent.tsx @@ -1,7 +1,7 @@ import { useContext, useEffect } from 'react' -import { feedPageLineupActions as feedActions } from '@audius/common' import { Name, FeedFilter } from '@audius/common/models' +import { feedPageLineupActions as feedActions } from '@audius/common/store' import cn from 'classnames' import { useModalState } from 'common/hooks/useModalState' diff --git a/packages/web/src/pages/followers-page/FollowersPage.tsx b/packages/web/src/pages/followers-page/FollowersPage.tsx index 8333608091d..1c8de2fba68 100644 --- a/packages/web/src/pages/followers-page/FollowersPage.tsx +++ b/packages/web/src/pages/followers-page/FollowersPage.tsx @@ -3,7 +3,9 @@ import { useContext, useEffect } from 'react' import { followersUserListSelectors, FOLLOWERS_USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' + +import {} from '@audius/common' import MobilePageContainer from 'components/mobile-page-container/MobilePageContainer' import NavContext, { LeftPreset } from 'components/nav/store/context' diff --git a/packages/web/src/pages/following-page/FollowingPage.tsx b/packages/web/src/pages/following-page/FollowingPage.tsx index bf600dc653e..1981e3c6030 100644 --- a/packages/web/src/pages/following-page/FollowingPage.tsx +++ b/packages/web/src/pages/following-page/FollowingPage.tsx @@ -3,7 +3,7 @@ import { useContext, useEffect } from 'react' import { followingUserListSelectors, FOLLOWING_USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' import MobilePageContainer from 'components/mobile-page-container/MobilePageContainer' import NavContext, { LeftPreset } from 'components/nav/store/context' diff --git a/packages/web/src/pages/history-page/HistoryPageProvider.tsx b/packages/web/src/pages/history-page/HistoryPageProvider.tsx index 57b6d98ce3f..49592de5062 100644 --- a/packages/web/src/pages/history-page/HistoryPageProvider.tsx +++ b/packages/web/src/pages/history-page/HistoryPageProvider.tsx @@ -7,15 +7,6 @@ import { ComponentType } from 'react' -import { - accountSelectors, - lineupSelectors, - historyPageTracksLineupActions as tracksActions, - historyPageSelectors, - tracksSocialActions as socialActions, - playerSelectors, - queueSelectors -} from '@audius/common' import { Name, RepostSource, @@ -26,6 +17,15 @@ import { UID, LineupTrack } from '@audius/common/models' +import { + accountSelectors, + lineupSelectors, + historyPageTracksLineupActions as tracksActions, + historyPageSelectors, + queueSelectors, + tracksSocialActions as socialActions, + playerSelectors +} from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { isEqual } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/pages/modals/AppModal.tsx b/packages/web/src/pages/modals/AppModal.tsx index 2d27e2aa05e..a3ce97fba62 100644 --- a/packages/web/src/pages/modals/AppModal.tsx +++ b/packages/web/src/pages/modals/AppModal.tsx @@ -1,6 +1,6 @@ import { ComponentType, Suspense } from 'react' -import { Modals } from '@audius/common' +import { Modals } from '@audius/common/store' import { useModalState } from './useModalState' diff --git a/packages/web/src/pages/modals/Modals.tsx b/packages/web/src/pages/modals/Modals.tsx index b836c6a3c64..2b635501b48 100644 --- a/packages/web/src/pages/modals/Modals.tsx +++ b/packages/web/src/pages/modals/Modals.tsx @@ -1,6 +1,8 @@ import { ComponentType, lazy } from 'react' -import type { Modals as ModalTypes } from '@audius/common' +import { Modals as ModalTypes } from '@audius/common/store' + +import type {} from '@audius/common' import { AddFundsModal } from 'components/add-funds-modal/AddFundsModal' import AddToCollectionModal from 'components/add-to-collection/desktop/AddToCollectionModal' diff --git a/packages/web/src/pages/modals/useModalState.ts b/packages/web/src/pages/modals/useModalState.ts index f7783cded02..82c416cc9d3 100644 --- a/packages/web/src/pages/modals/useModalState.ts +++ b/packages/web/src/pages/modals/useModalState.ts @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { modalsActions, modalsSelectors, Modals } from '@audius/common' +import { modalsSelectors, modalsActions, Modals } from '@audius/common/store' import { useDispatch } from 'react-redux' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/pages/not-found-page/NotFoundPage.tsx b/packages/web/src/pages/not-found-page/NotFoundPage.tsx index 20d0789d6ef..556552edaa0 100644 --- a/packages/web/src/pages/not-found-page/NotFoundPage.tsx +++ b/packages/web/src/pages/not-found-page/NotFoundPage.tsx @@ -1,7 +1,7 @@ import { useEffect, useContext } from 'react' -import { themeSelectors } from '@audius/common' import { Name } from '@audius/common/models' +import { themeSelectors } from '@audius/common/store' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/pages/notification-users-page/NotificationUsersPage.tsx b/packages/web/src/pages/notification-users-page/NotificationUsersPage.tsx index 8d9a7254e9a..65adf3d267c 100644 --- a/packages/web/src/pages/notification-users-page/NotificationUsersPage.tsx +++ b/packages/web/src/pages/notification-users-page/NotificationUsersPage.tsx @@ -4,7 +4,7 @@ import { userListActions, notificationsUserListSelectors, NOTIFICATIONS_USER_LIST_TAG as USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' import { connect } from 'react-redux' import { withRouter, RouteComponentProps } from 'react-router-dom' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx b/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx index a42ade83dd4..879e1671962 100644 --- a/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx +++ b/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx @@ -1,7 +1,7 @@ import { FormEvent, useLayoutEffect, useState } from 'react' -import { accountSelectors, signOutActions } from '@audius/common' import { Name, ErrorLevel } from '@audius/common/models' +import { accountSelectors, signOutActions } from '@audius/common/store' import { IconValidationX } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/oauth-login-page/hooks.ts b/packages/web/src/pages/oauth-login-page/hooks.ts index c91f9a04a4b..ae924715c34 100644 --- a/packages/web/src/pages/oauth-login-page/hooks.ts +++ b/packages/web/src/pages/oauth-login-page/hooks.ts @@ -1,12 +1,12 @@ import { useCallback, useEffect, useMemo, useState } from 'react' -import { accountSelectors, CommonState } from '@audius/common' import { Name, ErrorLevel, statusIsNotFinalized, User } from '@audius/common/models' +import { accountSelectors, CommonState } from '@audius/common/store' import { encodeHashId } from '@audius/common/utils' import * as queryString from 'query-string' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/pay-and-earn-page/PayAndEarnPage.tsx b/packages/web/src/pages/pay-and-earn-page/PayAndEarnPage.tsx index 776c302075d..b82b2fa471f 100644 --- a/packages/web/src/pages/pay-and-earn-page/PayAndEarnPage.tsx +++ b/packages/web/src/pages/pay-and-earn-page/PayAndEarnPage.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react' -import { buyUSDCActions } from '@audius/common' +import { buyUSDCActions } from '@audius/common/store' import { useDispatch } from 'react-redux' import { useIsMobile } from 'hooks/useIsMobile' diff --git a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx index 732ad8bf865..cdbd8003b78 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx @@ -1,6 +1,5 @@ import { useCallback, useContext, useState } from 'react' -import { accountSelectors, useUSDCPurchaseDetailsModal } from '@audius/common' import { useGetPurchases, useGetPurchasesCount, Id } from '@audius/common/api' import { useAllPaginatedQuery } from '@audius/common/audius-query' import { @@ -9,6 +8,10 @@ import { combineStatuses, USDCPurchaseDetails } from '@audius/common/models' +import { + accountSelectors, + useUSDCPurchaseDetailsModal +} from '@audius/common/store' import { full } from '@audius/sdk' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx index 9ff09ce249e..d1abc924250 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx @@ -1,6 +1,5 @@ import { useCallback, useContext, useState } from 'react' -import { accountSelectors, useUSDCPurchaseDetailsModal } from '@audius/common' import { useGetSales, useGetSalesCount, Id } from '@audius/common/api' import { useAllPaginatedQuery } from '@audius/common/audius-query' import { @@ -9,6 +8,10 @@ import { combineStatuses, USDCPurchaseDetails } from '@audius/common/models' +import { + accountSelectors, + useUSDCPurchaseDetailsModal +} from '@audius/common/store' import { full } from '@audius/sdk' import { push as pushRoute } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx b/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx index 108d213cd11..2b34d118067 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/USDCCard.tsx @@ -1,12 +1,12 @@ import { useCallback } from 'react' +import { useUSDCBalance } from '@audius/common/hooks' +import { Name, Status, BNUSDC } from '@audius/common/models' import { WithdrawUSDCModalPages, useWithdrawUSDCModal, useAddFundsModal -} from '@audius/common' -import { useUSDCBalance } from '@audius/common/hooks' -import { Name, Status, BNUSDC } from '@audius/common/models' +} from '@audius/common/store' import { formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx index 7d960a54f1b..0af97b522fc 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx @@ -1,11 +1,5 @@ import { useCallback, useContext, useState } from 'react' -import { - WithdrawUSDCModalPages, - accountSelectors, - useUSDCTransactionDetailsModal, - useWithdrawUSDCModal -} from '@audius/common' import { useGetUSDCTransactions, useGetUSDCTransactionsCount, @@ -21,6 +15,12 @@ import { USDCTransactionDetails, BNUSDC } from '@audius/common/models' +import { + accountSelectors, + useUSDCTransactionDetailsModal, + WithdrawUSDCModalPages, + useWithdrawUSDCModal +} from '@audius/common/store' import { formatUSDCWeiToFloorCentsNumber } from '@audius/common/utils' import { full } from '@audius/sdk' import BN from 'bn.js' diff --git a/packages/web/src/pages/pay-and-earn-page/desktop/PayAndEarnPage.tsx b/packages/web/src/pages/pay-and-earn-page/desktop/PayAndEarnPage.tsx index 267f535ef05..21b89b965d0 100644 --- a/packages/web/src/pages/pay-and-earn-page/desktop/PayAndEarnPage.tsx +++ b/packages/web/src/pages/pay-and-earn-page/desktop/PayAndEarnPage.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { Button, Flex, diff --git a/packages/web/src/pages/pay-and-earn-page/mobile/PayAndEarnPage.tsx b/packages/web/src/pages/pay-and-earn-page/mobile/PayAndEarnPage.tsx index 51108937357..a722ccf24c8 100644 --- a/packages/web/src/pages/pay-and-earn-page/mobile/PayAndEarnPage.tsx +++ b/packages/web/src/pages/pay-and-earn-page/mobile/PayAndEarnPage.tsx @@ -1,6 +1,6 @@ import { useCallback, useContext, useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { Flex, Paper, SelectablePill } from '@audius/harmony' import { replace } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/premium-tracks-page/PremiumTracksPage.tsx b/packages/web/src/pages/premium-tracks-page/PremiumTracksPage.tsx index 61d91d3a41e..7771c4c9b06 100644 --- a/packages/web/src/pages/premium-tracks-page/PremiumTracksPage.tsx +++ b/packages/web/src/pages/premium-tracks-page/PremiumTracksPage.tsx @@ -1,9 +1,9 @@ import { useEffect } from 'react' import { - premiumTracksPageLineupActions, - premiumTracksPageLineupSelectors -} from '@audius/common' + premiumTracksPageLineupSelectors, + premiumTracksPageLineupActions +} from '@audius/common/store' import { useDispatch } from 'react-redux' import EndOfLineup from 'components/lineup/EndOfLineup' diff --git a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx index 88e1509d151..11c0a9a24ec 100644 --- a/packages/web/src/pages/profile-page/ProfilePageProvider.tsx +++ b/packages/web/src/pages/profile-page/ProfilePageProvider.tsx @@ -1,44 +1,44 @@ import { ComponentType, PureComponent, RefObject } from 'react' +import { + Name, + ShareSource, + FollowSource, + CreatePlaylistSource, + Status, + BadgeTier, + ID, + UID +} from '@audius/common/models' +import { newUserMetadata } from '@audius/common/schemas' import { accountActions, accountSelectors, + cacheCollectionsActions, + profilePageFeedLineupActions as feedActions, + profilePageTracksLineupActions as tracksActions, + profilePageActions as profileActions, profilePageSelectors, - CollectionSortMode, - ProfilePageTabs, FollowType, + CollectionSortMode, TracksSortMode, + ProfilePageTabs, getTabForRoute, - profilePageActions as profileActions, - profilePageTracksLineupActions as tracksActions, - profilePageFeedLineupActions as feedActions, + chatActions, + chatSelectors, + ChatPermissionAction, + queueSelectors, + usersSocialActions as socialActions, relatedArtistsUISelectors, - OverflowSource, - OverflowAction, mobileOverflowMenuUIActions, shareModalUIActions, + OverflowAction, + OverflowSource, + inboxUnavailableModalActions, followingUserListActions, followersUserListActions, - usersSocialActions as socialActions, - playerSelectors, - queueSelectors, - chatActions, - chatSelectors, - ChatPermissionAction, - inboxUnavailableModalActions, - cacheCollectionsActions -} from '@audius/common' -import { - Name, - ShareSource, - FollowSource, - CreatePlaylistSource, - Status, - BadgeTier, - ID, - UID -} from '@audius/common/models' -import { newUserMetadata } from '@audius/common/schemas' + playerSelectors +} from '@audius/common/store' import { getErrorMessage, formatCount, Nullable } from '@audius/common/utils' import { push as pushRoute, replace } from 'connected-react-router' import { UnregisterCallback } from 'history' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileLeftNav.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileLeftNav.tsx index 1b023ae9027..280bc75914a 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileLeftNav.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileLeftNav.tsx @@ -1,5 +1,5 @@ -import { accountSelectors } from '@audius/common' import { ID } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileMutuals.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileMutuals.tsx index d68634c2f35..382004a0888 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileMutuals.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileMutuals.tsx @@ -4,7 +4,7 @@ import { accountSelectors, cacheUsersSelectors, profilePageSelectors -} from '@audius/common' +} from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { IconFollowing } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx index f7c2cbf3bdf..7b6bf83062f 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx @@ -1,12 +1,5 @@ import { useCallback, memo, MouseEvent } from 'react' -import { - profilePageTracksLineupActions as tracksActions, - ProfileUser, - ProfilePageTabs, - profilePageFeedLineupActions as feedActions, - badgeTiers -} from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { CreatePlaylistSource, @@ -18,6 +11,13 @@ import { CoverPhotoSizes, LineupState } from '@audius/common/models' +import { + profilePageFeedLineupActions as feedActions, + profilePageTracksLineupActions as tracksActions, + ProfilePageTabs, + badgeTiers, + ProfileUser +} from '@audius/common/store' import IconAlbum from 'assets/img/iconAlbum.svg' import IconCollectibles from 'assets/img/iconCollectibles.svg' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfileTopTags.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfileTopTags.tsx index 1013ae46754..8838a8cef6f 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfileTopTags.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfileTopTags.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react' -import { profilePageActions, profilePageSelectors } from '@audius/common' import { Status } from '@audius/common/models' +import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { IconTrending } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx b/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx index 9414589c59c..9bca9cc9e42 100644 --- a/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/ProfilePage.tsx @@ -1,12 +1,5 @@ import { useEffect, useContext, MouseEvent, ReactNode } from 'react' -import { - ProfilePageTabs, - ProfileUser, - profilePageTracksLineupActions as tracksActions, - profilePageFeedLineupActions as feedActions, - badgeTiers -} from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { Status, @@ -18,6 +11,13 @@ import { LineupState, User } from '@audius/common/models' +import { + profilePageFeedLineupActions as feedActions, + profilePageTracksLineupActions as tracksActions, + ProfilePageTabs, + badgeTiers, + ProfileUser +} from '@audius/common/store' import cn from 'classnames' import IconAlbum from 'assets/img/iconAlbum.svg' diff --git a/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx b/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx index 449b4eadb82..5a97535a810 100644 --- a/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx +++ b/packages/web/src/pages/profile-page/components/mobile/ShareUserButton.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { shareModalUIActions } from '@audius/common' import { ShareSource, ID } from '@audius/common/models' +import { shareModalUIActions } from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { IconShare, IconButton } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/profile-page/useProfileParams.ts b/packages/web/src/pages/profile-page/useProfileParams.ts index d1bfcad0998..e2a4b56d0d4 100644 --- a/packages/web/src/pages/profile-page/useProfileParams.ts +++ b/packages/web/src/pages/profile-page/useProfileParams.ts @@ -1,4 +1,4 @@ -import { cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import { useLocation } from 'react-router-dom' diff --git a/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx b/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx index 790df89ffb3..fec5fa6a4fc 100644 --- a/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx +++ b/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx @@ -1,13 +1,15 @@ -import { useEffect, useCallback, ComponentType, RefObject } from 'react' - import { lineupSelectors, remixesPageLineupActions as tracksActions, remixesPageActions, remixesPageSelectors, - playerSelectors, - queueSelectors -} from '@audius/common' + queueSelectors, + playerSelectors +} from '@audius/common/store' + +import { useEffect, useCallback, ComponentType, RefObject } from 'react' + +import {} from '@audius/common' import { ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/pages/reposts-page/RepostsPage.tsx b/packages/web/src/pages/reposts-page/RepostsPage.tsx index da42c4714ab..227af4aa6d5 100644 --- a/packages/web/src/pages/reposts-page/RepostsPage.tsx +++ b/packages/web/src/pages/reposts-page/RepostsPage.tsx @@ -1,6 +1,9 @@ import { useContext, useEffect } from 'react' -import { repostsUserListSelectors, REPOSTS_USER_LIST_TAG } from '@audius/common' +import { + repostsUserListSelectors, + REPOSTS_USER_LIST_TAG +} from '@audius/common/store' import MobilePageContainer from 'components/mobile-page-container/MobilePageContainer' import NavContext, { LeftPreset } from 'components/nav/store/context' diff --git a/packages/web/src/pages/saved-page/SavedPageProvider.tsx b/packages/web/src/pages/saved-page/SavedPageProvider.tsx index 05e55dfacd2..91d59b5ef08 100644 --- a/packages/web/src/pages/saved-page/SavedPageProvider.tsx +++ b/packages/web/src/pages/saved-page/SavedPageProvider.tsx @@ -1,23 +1,6 @@ import { ComponentType, PureComponent } from 'react' -import { - LibraryCategoryType, - SavedPageTabs as ProfileTabs, - SavedPageTabs, - SavedPageTrack, - TrackRecord, - accountActions, - accountSelectors, - lineupSelectors, - playerSelectors, - playlistUpdatesActions, - playlistUpdatesSelectors, - queueSelectors, - savedPageActions as saveActions, - savedPageSelectors, - tracksSocialActions as socialActions, - savedPageTracksLineupActions as tracksActions -} from '@audius/common' +import { SavedPageTabs as ProfileTabs } from '@audius/common' import { Name, RepostSource, @@ -27,6 +10,23 @@ import { UID, LineupTrack } from '@audius/common/models' +import { + accountActions, + accountSelectors, + lineupSelectors, + savedPageTracksLineupActions as tracksActions, + savedPageActions as saveActions, + savedPageSelectors, + SavedPageTabs, + queueSelectors, + tracksSocialActions as socialActions, + playerSelectors, + playlistUpdatesActions, + playlistUpdatesSelectors, + LibraryCategoryType, + SavedPageTrack, + TrackRecord +} from '@audius/common/store' import { full } from '@audius/sdk' import { push as pushRoute } from 'connected-react-router' import { debounce, isEqual } from 'lodash' diff --git a/packages/web/src/pages/saved-page/components/desktop/AlbumsTabPage.tsx b/packages/web/src/pages/saved-page/components/desktop/AlbumsTabPage.tsx index 873ecf7b51d..0473337b55e 100644 --- a/packages/web/src/pages/saved-page/components/desktop/AlbumsTabPage.tsx +++ b/packages/web/src/pages/saved-page/components/desktop/AlbumsTabPage.tsx @@ -1,12 +1,12 @@ import { useMemo } from 'react' +import { statusIsNotFinalized } from '@audius/common/models' import { - LibraryCategory, savedPageSelectors, - CommonState, - SavedPageTabs -} from '@audius/common' -import { statusIsNotFinalized } from '@audius/common/models' + LibraryCategory, + SavedPageTabs, + CommonState +} from '@audius/common/store' import { useSelector } from 'react-redux' import { InfiniteCardLineup } from 'components/lineup/InfiniteCardLineup' diff --git a/packages/web/src/pages/saved-page/components/desktop/CollectionCard.tsx b/packages/web/src/pages/saved-page/components/desktop/CollectionCard.tsx index 33a764e3d49..9ae17ac98ed 100644 --- a/packages/web/src/pages/saved-page/components/desktop/CollectionCard.tsx +++ b/packages/web/src/pages/saved-page/components/desktop/CollectionCard.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' +import { ID } from '@audius/common/models' import { cacheCollectionsSelectors, cacheUsersSelectors, CommonState -} from '@audius/common' -import { ID } from '@audius/common/models' +} from '@audius/common/store' import { useSelector } from 'react-redux' import Card, { CardProps } from 'components/card/desktop/Card' diff --git a/packages/web/src/pages/saved-page/components/desktop/LibraryCategorySelectionMenu.tsx b/packages/web/src/pages/saved-page/components/desktop/LibraryCategorySelectionMenu.tsx index 5517bafa89a..a7be881e8e2 100644 --- a/packages/web/src/pages/saved-page/components/desktop/LibraryCategorySelectionMenu.tsx +++ b/packages/web/src/pages/saved-page/components/desktop/LibraryCategorySelectionMenu.tsx @@ -1,11 +1,11 @@ import { - CommonState, - LibraryCategory, - LibraryCategoryType, savedPageActions, savedPageSelectors, - SavedPageTabs -} from '@audius/common' + LibraryCategory, + SavedPageTabs, + LibraryCategoryType, + CommonState +} from '@audius/common/store' import { SelectablePill } from '@audius/harmony' import { IconHeart, IconCart, IconRepost } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/saved-page/components/desktop/PlaylistsTabPage.tsx b/packages/web/src/pages/saved-page/components/desktop/PlaylistsTabPage.tsx index 6ac0cca0533..6d54778528d 100644 --- a/packages/web/src/pages/saved-page/components/desktop/PlaylistsTabPage.tsx +++ b/packages/web/src/pages/saved-page/components/desktop/PlaylistsTabPage.tsx @@ -1,16 +1,16 @@ import { useCallback, useMemo } from 'react' -import { - cacheCollectionsActions, - CommonState, - LibraryCategory, - savedPageSelectors, - SavedPageTabs -} from '@audius/common' import { CreatePlaylistSource, statusIsNotFinalized } from '@audius/common/models' +import { + cacheCollectionsActions, + savedPageSelectors, + LibraryCategory, + SavedPageTabs, + CommonState +} from '@audius/common/store' import { IconPlus } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx b/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx index 54bd1590071..8a2c1a7d00d 100644 --- a/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx +++ b/packages/web/src/pages/saved-page/components/desktop/SavedPage.tsx @@ -1,16 +1,16 @@ import { useContext } from 'react' +import { Kind, Status, ID, UID, Lineup, User } from '@audius/common/models' import { - CommonState, - LibraryCategory, - QueueItem, - SavedPageCollection, savedPageSelectors, + LibraryCategory, SavedPageTabs, SavedPageTrack, - TrackRecord -} from '@audius/common' -import { Kind, Status, ID, UID, Lineup, User } from '@audius/common/models' + TrackRecord, + SavedPageCollection, + QueueItem, + CommonState +} from '@audius/common/store' import { Button, ButtonType, IconPause, IconPlay } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/saved-page/components/mobile/NewPlaylistButton.tsx b/packages/web/src/pages/saved-page/components/mobile/NewPlaylistButton.tsx index 62f6ee8584c..263a68a9f22 100644 --- a/packages/web/src/pages/saved-page/components/mobile/NewPlaylistButton.tsx +++ b/packages/web/src/pages/saved-page/components/mobile/NewPlaylistButton.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { cacheCollectionsActions } from '@audius/common' import { Name, CreatePlaylistSource } from '@audius/common/models' +import { cacheCollectionsActions } from '@audius/common/store' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx b/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx index ee5840c1cf8..88a78ccc83b 100644 --- a/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx +++ b/packages/web/src/pages/saved-page/components/mobile/SavedPage.tsx @@ -7,16 +7,6 @@ import { useState } from 'react' -import { - CommonState, - LibraryCategory, - QueueItem, - SavedPageTabs, - SavedPageTrack, - cacheCollectionsSelectors, - cacheUsersSelectors, - savedPageSelectors -} from '@audius/common' import { useGatedContentAccessMap, useDebouncedCallback @@ -28,6 +18,16 @@ import { UID, Lineup } from '@audius/common/models' +import { + cacheCollectionsSelectors, + cacheUsersSelectors, + savedPageSelectors, + LibraryCategory, + SavedPageTabs, + SavedPageTrack, + QueueItem, + CommonState +} from '@audius/common/store' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx b/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx index f81d3c01a00..4617c939048 100644 --- a/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx +++ b/packages/web/src/pages/saved-page/hooks/useCollectionsData.tsx @@ -1,14 +1,14 @@ import { useMemo } from 'react' -import { - accountSelectors, - cacheCollectionsSelectors, - CommonState, - savedPageSelectors -} from '@audius/common' import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' import { useAllPaginatedQuery } from '@audius/common/audius-query' import { Status } from '@audius/common/models' +import { + accountSelectors, + cacheCollectionsSelectors, + savedPageSelectors, + CommonState +} from '@audius/common/store' import { uniqBy } from 'lodash' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/search-page/SearchPageProvider.jsx b/packages/web/src/pages/search-page/SearchPageProvider.jsx index e598f8afab8..1d5b7da8366 100644 --- a/packages/web/src/pages/search-page/SearchPageProvider.jsx +++ b/packages/web/src/pages/search-page/SearchPageProvider.jsx @@ -1,16 +1,16 @@ import { Component } from 'react' +import { Name } from '@audius/common/models' import { accountSelectors, lineupSelectors, + searchResultsPageTracksLineupActions as tracksActions, searchResultsPageActions as searchPageActions, searchResultsPageSelectors, SearchKind, - searchResultsPageTracksLineupActions as tracksActions, - playerSelectors, - queueSelectors -} from '@audius/common' -import { Name } from '@audius/common/models' + queueSelectors, + playerSelectors +} from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Redirect } from 'react-router' diff --git a/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx b/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx index a7d3c45c892..f298f34a93a 100644 --- a/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx +++ b/packages/web/src/pages/search-page/components/desktop/SearchPageContent.jsx @@ -1,10 +1,10 @@ import { Component } from 'react' +import { Status } from '@audius/common/models' import { searchResultsPageTracksLineupActions as tracksActions, SearchKind -} from '@audius/common' -import { Status } from '@audius/common/models' +} from '@audius/common/store' import { formatCount } from '@audius/common/utils' import { Redirect } from 'react-router' diff --git a/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx b/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx index 61fed606755..2def3a1d6e4 100644 --- a/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx +++ b/packages/web/src/pages/search-page/components/mobile/SearchPageContent.tsx @@ -1,6 +1,5 @@ import { memo, useCallback, useContext, useEffect, useMemo } from 'react' -import { searchResultsPageTracksLineupActions as tracksActions } from '@audius/common' import { Name, Status, @@ -9,6 +8,7 @@ import { LineupState, User } from '@audius/common/models' +import { searchResultsPageTracksLineupActions as tracksActions } from '@audius/common/store' import { trimToAlphaNumeric } from '@audius/common/utils' import { matchPath } from 'react-router' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/search-page/helpers.ts b/packages/web/src/pages/search-page/helpers.ts index e8a73e2d668..7eb323ac49b 100644 --- a/packages/web/src/pages/search-page/helpers.ts +++ b/packages/web/src/pages/search-page/helpers.ts @@ -1,4 +1,4 @@ -import { SearchKind } from '@audius/common' +import { SearchKind } from '@audius/common/store' import { Location } from 'history' import { matchPath } from 'react-router' diff --git a/packages/web/src/pages/settings-page/SettingsPageProvider.tsx b/packages/web/src/pages/settings-page/SettingsPageProvider.tsx index f69961a2a9f..db839086e7c 100644 --- a/packages/web/src/pages/settings-page/SettingsPageProvider.tsx +++ b/packages/web/src/pages/settings-page/SettingsPageProvider.tsx @@ -1,24 +1,24 @@ import { ComponentType, PureComponent } from 'react' +import { Name, Theme } from '@audius/common/models' import { + accountActions, accountSelectors, - InstagramProfile, settingsPageSelectors, + settingsPageActions as settingPageActions, BrowserNotificationSetting, - EmailFrequency, PushNotificationSetting, - settingsPageActions as settingPageActions, + EmailFrequency, + signOutActions, makeGetTierAndVerifiedForUser, - modalsActions, - themeSelectors, themeActions, - accountActions, - TwitterProfile, - signOutActions, + themeSelectors, + modalsActions, musicConfettiActions, + InstagramProfile, + TwitterProfile, TikTokProfile -} from '@audius/common' -import { Name, Theme } from '@audius/common/models' +} from '@audius/common/store' import { push as pushRoute, goBack } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/CreateNewAppPage.tsx b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/CreateNewAppPage.tsx index b882dc89261..fe4877f2766 100644 --- a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/CreateNewAppPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/CreateNewAppPage.tsx @@ -1,6 +1,5 @@ import { useCallback, useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' import { DEVELOPER_APP_DESCRIPTION_MAX_LENGTH, DEVELOPER_APP_NAME_MAX_LENGTH, @@ -8,6 +7,7 @@ import { useAddDeveloperApp } from '@audius/common/api' import { Name, Status } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { Button, ButtonType } from '@audius/stems' import { Form, Formik } from 'formik' import { z } from 'zod' diff --git a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/DeleteAppConfirmationPage.tsx b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/DeleteAppConfirmationPage.tsx index 751648e2a02..bf6fea99d73 100644 --- a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/DeleteAppConfirmationPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/DeleteAppConfirmationPage.tsx @@ -1,8 +1,8 @@ import { useCallback, useEffect } from 'react' -import { accountSelectors } from '@audius/common' import { useDeleteDeveloperApp } from '@audius/common/api' import { Name, Status } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { Button, ButtonType, ModalFooter } from '@audius/stems' import { useSelector } from 'common/hooks/useSelector' diff --git a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/YourAppsPage.tsx b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/YourAppsPage.tsx index 5a1e4df7761..bb32f7dd8cf 100644 --- a/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/YourAppsPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/DeveloperApps/YourAppsPage.tsx @@ -1,6 +1,6 @@ -import { accountSelectors } from '@audius/common' import { useGetDeveloperApps } from '@audius/common/api' import { Status } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { Button, ButtonSize, diff --git a/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx b/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx index a5842bbba2a..d31dfff480f 100644 --- a/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/NotificationSettings.tsx @@ -1,11 +1,11 @@ import { useCallback } from 'react' +import { FeatureFlags } from '@audius/common/services' import { - Notifications, BrowserNotificationSetting, - EmailFrequency -} from '@audius/common' -import { FeatureFlags } from '@audius/common/services' + EmailFrequency, + Notifications +} from '@audius/common/store' import { Modal, SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx index ce4c6453ff6..77fa4fe7fc4 100644 --- a/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/SettingsPage.tsx @@ -1,16 +1,16 @@ import { useCallback, useEffect, useMemo, useState } from 'react' +import { OS, Theme, ID, ProfilePictureSizes } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { - InstagramProfile, - TwitterProfile, - Notifications, + settingsPageSelectors, BrowserNotificationSetting, EmailFrequency, + InstagramProfile, + TwitterProfile, TikTokProfile, - settingsPageSelectors -} from '@audius/common' -import { OS, Theme, ID, ProfilePictureSizes } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' + Notifications +} from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { IconAppearance } from '@audius/harmony' import { diff --git a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx index 832a9745813..ebdf7379376 100644 --- a/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx +++ b/packages/web/src/pages/settings-page/components/desktop/VerificationModal.tsx @@ -1,11 +1,5 @@ import { useCallback, useState } from 'react' -import { - TwitterProfile, - InstagramProfile, - musicConfettiActions, - TikTokProfile -} from '@audius/common' import { Name, SquareSizes, @@ -14,6 +8,12 @@ import { ProfilePictureSizes } from '@audius/common/models' import { BooleanKeys } from '@audius/common/services' +import { + musicConfettiActions, + InstagramProfile, + TwitterProfile, + TikTokProfile +} from '@audius/common/store' import { Modal, Button, ButtonType, IconNote, ButtonSize } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/settings-page/components/mobile/ChangePasswordPage.tsx b/packages/web/src/pages/settings-page/components/mobile/ChangePasswordPage.tsx index 2c2831f4381..935c4a58a10 100644 --- a/packages/web/src/pages/settings-page/components/mobile/ChangePasswordPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/ChangePasswordPage.tsx @@ -1,11 +1,11 @@ import { useCallback, useContext, useEffect } from 'react' +import { Name } from '@audius/common/models' import { - ChangePasswordPageStep, changePasswordSelectors, - changePasswordActions -} from '@audius/common' -import { Name } from '@audius/common/models' + changePasswordActions, + ChangePasswordPageStep +} from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { make, TrackEvent } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/settings-page/components/mobile/NotificationsSettingsPage.tsx b/packages/web/src/pages/settings-page/components/mobile/NotificationsSettingsPage.tsx index dd574ab3e99..1cbc853ed52 100644 --- a/packages/web/src/pages/settings-page/components/mobile/NotificationsSettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/NotificationsSettingsPage.tsx @@ -1,4 +1,4 @@ -import { EmailFrequency } from '@audius/common' +import { EmailFrequency } from '@audius/common/store' import { SegmentedControl } from '@audius/stems' import GroupableList from 'components/groupable-list/GroupableList' diff --git a/packages/web/src/pages/settings-page/components/mobile/SettingsPage.tsx b/packages/web/src/pages/settings-page/components/mobile/SettingsPage.tsx index bd5ba1b604b..93f34655ce7 100644 --- a/packages/web/src/pages/settings-page/components/mobile/SettingsPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/SettingsPage.tsx @@ -1,21 +1,21 @@ import { useContext, useEffect, FC } from 'react' -import { - InstagramProfile, - TwitterProfile, - Notifications, - EmailFrequency, - BrowserNotificationSetting, - PushNotificationSetting, - PushNotifications, - TikTokProfile -} from '@audius/common' import { SquareSizes, Theme, ID, ProfilePictureSizes } from '@audius/common/models' +import { + BrowserNotificationSetting, + PushNotificationSetting, + EmailFrequency, + InstagramProfile, + TwitterProfile, + TikTokProfile, + Notifications, + PushNotifications +} from '@audius/common/store' import { SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx index bacacad7cca..ccaafefa022 100644 --- a/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx +++ b/packages/web/src/pages/settings-page/components/mobile/VerificationPage.tsx @@ -1,6 +1,5 @@ import { useCallback, useState } from 'react' -import { InstagramProfile, TwitterProfile, TikTokProfile } from '@audius/common' import { Name, SquareSizes, @@ -9,6 +8,11 @@ import { ProfilePictureSizes } from '@audius/common/models' import { BooleanKeys } from '@audius/common/services' +import { + InstagramProfile, + TwitterProfile, + TikTokProfile +} from '@audius/common/store' import { Button, ButtonSize, diff --git a/packages/web/src/pages/settings-page/store/errorSagas.ts b/packages/web/src/pages/settings-page/store/errorSagas.ts index f9c5335ea8d..7850959e0dd 100644 --- a/packages/web/src/pages/settings-page/store/errorSagas.ts +++ b/packages/web/src/pages/settings-page/store/errorSagas.ts @@ -1,4 +1,4 @@ -import { settingsPageActions as actions } from '@audius/common' +import { settingsPageActions as actions } from '@audius/common/store' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/pages/settings-page/store/sagas.ts b/packages/web/src/pages/settings-page/store/sagas.ts index d89572720f8..0f36963e1e5 100644 --- a/packages/web/src/pages/settings-page/store/sagas.ts +++ b/packages/web/src/pages/settings-page/store/sagas.ts @@ -1,10 +1,10 @@ +import { Name } from '@audius/common/models' import { - settingsPageActions as actions, settingsPageSelectors, + settingsPageActions as actions, BrowserNotificationSetting, getContext -} from '@audius/common' -import { Name } from '@audius/common/models' +} from '@audius/common/store' import { getErrorMessage } from '@audius/common/utils' import { select, call, put, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/pages/settings-page/store/selectors.ts b/packages/web/src/pages/settings-page/store/selectors.ts index 89a3a93ff4a..e5ae3d34b90 100644 --- a/packages/web/src/pages/settings-page/store/selectors.ts +++ b/packages/web/src/pages/settings-page/store/selectors.ts @@ -1,4 +1,4 @@ -import { CommonState } from '@audius/common' +import { CommonState } from '@audius/common/store' export const getBrowserNotificationSettings = (state: CommonState) => { return state.pages.settings.browserNotifications diff --git a/packages/web/src/pages/sign-on/SignOn.tsx b/packages/web/src/pages/sign-on/SignOn.tsx index a719692bba7..70fabaca320 100644 --- a/packages/web/src/pages/sign-on/SignOn.tsx +++ b/packages/web/src/pages/sign-on/SignOn.tsx @@ -1,7 +1,7 @@ import type { ComponentType } from 'react' import { useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { replace as replaceRoute } from 'connected-react-router' import { connect } from 'react-redux' import { withRouter, RouteComponentProps } from 'react-router-dom' diff --git a/packages/web/src/pages/sign-on/SignOnProvider.tsx b/packages/web/src/pages/sign-on/SignOnProvider.tsx index d19e43debca..8c01106260d 100644 --- a/packages/web/src/pages/sign-on/SignOnProvider.tsx +++ b/packages/web/src/pages/sign-on/SignOnProvider.tsx @@ -1,14 +1,14 @@ import { Component, ComponentType } from 'react' +import { Name, ID, User } from '@audius/common/models' import { + accountActions, accountSelectors, InstagramProfile, - Image, TwitterProfile, - accountActions, - TikTokProfile -} from '@audius/common' -import { Name, ID, User } from '@audius/common/models' + TikTokProfile, + Image +} from '@audius/common/store' import { push as pushRoute, replace as replaceRoute, diff --git a/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx b/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx index 93eeccea219..453b28eaeeb 100644 --- a/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx +++ b/packages/web/src/pages/sign-on/components/CompleteProfileWithSocial.tsx @@ -1,7 +1,11 @@ import { useCallback } from 'react' -import { InstagramProfile, TikTokProfile, TwitterProfile } from '@audius/common' import { BooleanKeys } from '@audius/common/services' +import { + InstagramProfile, + TwitterProfile, + TikTokProfile +} from '@audius/common/store' import { IconImage, IconUser, IconVerified } from '@audius/stems' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/sign-on/components/ProfilePage.tsx b/packages/web/src/pages/sign-on/components/ProfilePage.tsx index 40453f52ea1..0f9fa5861b4 100644 --- a/packages/web/src/pages/sign-on/components/ProfilePage.tsx +++ b/packages/web/src/pages/sign-on/components/ProfilePage.tsx @@ -1,16 +1,16 @@ import { useState, useCallback, KeyboardEvent, useContext } from 'react' -import { - Image, - InstagramProfile, - TwitterProfile, - TikTokProfile -} from '@audius/common' import { formatTwitterProfile, formatInstagramProfile, formatTikTokProfile } from '@audius/common/services' +import { + InstagramProfile, + TwitterProfile, + TikTokProfile, + Image +} from '@audius/common/store' import cn from 'classnames' import IconCaretLeft from 'assets/img/iconCaretLeft.svg' diff --git a/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx b/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx index 6594e623121..021ec7e3ec4 100644 --- a/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx +++ b/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx @@ -1,12 +1,14 @@ -import { Suspense, useEffect } from 'react' - import { accountSelectors, - Image, InstagramProfile, TwitterProfile, - TikTokProfile -} from '@audius/common' + TikTokProfile, + Image +} from '@audius/common/store' + +import { Suspense, useEffect } from 'react' + +import {} from '@audius/common' import { Status, ID, User } from '@audius/common/models' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx b/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx index 45a9c68b329..483763d1bac 100644 --- a/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx +++ b/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx @@ -1,11 +1,13 @@ -import { useEffect } from 'react' - import { - Image, InstagramProfile, TwitterProfile, - TikTokProfile -} from '@audius/common' + TikTokProfile, + Image +} from '@audius/common/store' + +import { useEffect } from 'react' + +import {} from '@audius/common' import { ID, User } from '@audius/common/models' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx index 03c224af9b0..906151c0e39 100644 --- a/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx +++ b/packages/web/src/pages/sign-up-page/components/AccountHeader.tsx @@ -1,5 +1,5 @@ -import { accountSelectors } from '@audius/common' import { Name, SquareSizes } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { Avatar, Box, diff --git a/packages/web/src/pages/sign-up-page/components/CoverPhotoBanner.tsx b/packages/web/src/pages/sign-up-page/components/CoverPhotoBanner.tsx index 33ede4c5ae7..301da2c08c3 100644 --- a/packages/web/src/pages/sign-up-page/components/CoverPhotoBanner.tsx +++ b/packages/web/src/pages/sign-up-page/components/CoverPhotoBanner.tsx @@ -1,5 +1,5 @@ -import { accountSelectors } from '@audius/common' import { SquareSizes, WidthSizes } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { Box, useTheme, IconImage, IconButton } from '@audius/harmony' import { diff --git a/packages/web/src/pages/sign-up-page/components/SignupFlowInstagramAuth.tsx b/packages/web/src/pages/sign-up-page/components/SignupFlowInstagramAuth.tsx index 40ba8a52465..f02438c852d 100644 --- a/packages/web/src/pages/sign-up-page/components/SignupFlowInstagramAuth.tsx +++ b/packages/web/src/pages/sign-up-page/components/SignupFlowInstagramAuth.tsx @@ -1,6 +1,6 @@ import { PropsWithChildren } from 'react' -import { InstagramProfile } from '@audius/common' +import { InstagramProfile } from '@audius/common/store' import InstagramAuth from 'components/instagram-auth/InstagramAuth' diff --git a/packages/web/src/pages/sign-up-page/components/SignupFlowTikTokAuth.tsx b/packages/web/src/pages/sign-up-page/components/SignupFlowTikTokAuth.tsx index 3ba19f15e12..83d48f98ef0 100644 --- a/packages/web/src/pages/sign-up-page/components/SignupFlowTikTokAuth.tsx +++ b/packages/web/src/pages/sign-up-page/components/SignupFlowTikTokAuth.tsx @@ -1,6 +1,6 @@ import { ReactElement } from 'react' -import { TikTokProfile } from '@audius/common' +import { TikTokProfile } from '@audius/common/store' import { TikTokAuth } from 'components/tiktok-auth/TikTokAuthButton' diff --git a/packages/web/src/pages/sign-up-page/components/SignupFlowTwitterAuth.tsx b/packages/web/src/pages/sign-up-page/components/SignupFlowTwitterAuth.tsx index 6d018318fa3..cd60179f816 100644 --- a/packages/web/src/pages/sign-up-page/components/SignupFlowTwitterAuth.tsx +++ b/packages/web/src/pages/sign-up-page/components/SignupFlowTwitterAuth.tsx @@ -1,6 +1,6 @@ import { PropsWithChildren } from 'react' -import { TwitterProfile } from '@audius/common' +import { TwitterProfile } from '@audius/common/store' import TwitterAuth from 'components/twitter-auth/TwitterAuth' diff --git a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts index 57b05662ed3..e9ebf684b94 100644 --- a/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts +++ b/packages/web/src/pages/sign-up-page/hooks/socialMediaLogin.ts @@ -1,6 +1,5 @@ import { useContext } from 'react' -import { InstagramProfile, TikTokProfile, TwitterProfile } from '@audius/common' import { AudiusQueryContext } from '@audius/common/audius-query' import { Name } from '@audius/common/models' import { pickHandleSchema } from '@audius/common/schemas' @@ -9,6 +8,11 @@ import { formatInstagramProfile, formatTikTokProfile } from '@audius/common/services' +import { + InstagramProfile, + TwitterProfile, + TikTokProfile +} from '@audius/common/store' import { useDispatch } from 'react-redux' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/sign-up-page/utils/selectArtistsPreviewContext.tsx b/packages/web/src/pages/sign-up-page/utils/selectArtistsPreviewContext.tsx index 6bfcd94d9a9..9c1141c31f1 100644 --- a/packages/web/src/pages/sign-up-page/utils/selectArtistsPreviewContext.tsx +++ b/packages/web/src/pages/sign-up-page/utils/selectArtistsPreviewContext.tsx @@ -1,8 +1,8 @@ import { createContext, useCallback, useEffect, useState } from 'react' -import { playerActions } from '@audius/common' import { useGetUserTracksByHandle, useGetUserById } from '@audius/common/api' import { ID, UserTrackMetadata } from '@audius/common/models' +import { playerActions } from '@audius/common/store' import { useDispatch } from 'react-redux' import { useUnmount } from 'react-use' diff --git a/packages/web/src/pages/sign-up-page/utils/useDetermineAllowedRoutes.ts b/packages/web/src/pages/sign-up-page/utils/useDetermineAllowedRoutes.ts index 75814711ecb..d51fbbac4ee 100644 --- a/packages/web/src/pages/sign-up-page/utils/useDetermineAllowedRoutes.ts +++ b/packages/web/src/pages/sign-up-page/utils/useDetermineAllowedRoutes.ts @@ -1,4 +1,4 @@ -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import { useModalState } from 'common/hooks/useModalState' diff --git a/packages/web/src/pages/smart-collection/SmartCollectionPage.tsx b/packages/web/src/pages/smart-collection/SmartCollectionPage.tsx index 7852b84fd79..74b3312a6f7 100644 --- a/packages/web/src/pages/smart-collection/SmartCollectionPage.tsx +++ b/packages/web/src/pages/smart-collection/SmartCollectionPage.tsx @@ -1,12 +1,12 @@ import { useEffect } from 'react' +import { SmartCollectionVariant } from '@audius/common/models' import { accountSelectors, smartCollectionPageSelectors, smartCollectionPageActions, playlistLibraryHelpers -} from '@audius/common' -import { SmartCollectionVariant } from '@audius/common/models' +} from '@audius/common/store' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/pages/supporting-page/SupportingPage.tsx b/packages/web/src/pages/supporting-page/SupportingPage.tsx index 0c326685e18..8675268a0c0 100644 --- a/packages/web/src/pages/supporting-page/SupportingPage.tsx +++ b/packages/web/src/pages/supporting-page/SupportingPage.tsx @@ -3,7 +3,9 @@ import { useContext, useEffect } from 'react' import { supportingUserListSelectors, SUPPORTING_USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' + +import {} from '@audius/common' import MobilePageContainer from 'components/mobile-page-container/MobilePageContainer' import NavContext, { LeftPreset } from 'components/nav/store/context' diff --git a/packages/web/src/pages/top-supporters-page/TopSupportersPage.tsx b/packages/web/src/pages/top-supporters-page/TopSupportersPage.tsx index 05295cedc48..adbb234b61b 100644 --- a/packages/web/src/pages/top-supporters-page/TopSupportersPage.tsx +++ b/packages/web/src/pages/top-supporters-page/TopSupportersPage.tsx @@ -3,7 +3,7 @@ import { useContext, useEffect } from 'react' import { topSupportersUserListSelectors, TOP_SUPPORTERS_USER_LIST_TAG as USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' import MobilePageContainer from 'components/mobile-page-container/MobilePageContainer' import NavContext, { LeftPreset } from 'components/nav/store/context' diff --git a/packages/web/src/pages/track-page/TrackPageProvider.tsx b/packages/web/src/pages/track-page/TrackPageProvider.tsx index ab5246bf9a8..d6a16f69b32 100644 --- a/packages/web/src/pages/track-page/TrackPageProvider.tsx +++ b/packages/web/src/pages/track-page/TrackPageProvider.tsx @@ -1,24 +1,5 @@ import { Component, ComponentType } from 'react' -import { - accountSelectors, - cacheTracksActions as cacheTrackActions, - lineupSelectors, - trackPageActions, - trackPageSelectors, - trackPageLineupActions, - OverflowAction, - OverflowSource, - mobileOverflowMenuUIActions, - shareModalUIActions, - RepostType, - repostsUserListActions, - favoritesUserListActions, - tracksSocialActions as socialTracksActions, - usersSocialActions as socialUsersActions, - playerSelectors, - queueSelectors -} from '@audius/common' import { Name, ShareSource, @@ -32,6 +13,25 @@ import { ID, Track } from '@audius/common/models' +import { + accountSelectors, + cacheTracksActions as cacheTrackActions, + lineupSelectors, + trackPageLineupActions, + trackPageActions, + trackPageSelectors, + queueSelectors, + tracksSocialActions as socialTracksActions, + usersSocialActions as socialUsersActions, + mobileOverflowMenuUIActions, + shareModalUIActions, + OverflowAction, + OverflowSource, + repostsUserListActions, + favoritesUserListActions, + RepostType, + playerSelectors +} from '@audius/common/store' import { formatDate, Uid } from '@audius/common/utils' import { push as pushRoute, replace } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx b/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx index 2e643852a0a..2689f355392 100644 --- a/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx +++ b/packages/web/src/pages/track-page/components/desktop/TrackPage.tsx @@ -1,6 +1,6 @@ -import { trackPageLineupActions, QueueItem } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { ID, LineupState, Track, User } from '@audius/common/models' +import { trackPageLineupActions, QueueItem } from '@audius/common/store' import cn from 'classnames' import CoverPhoto from 'components/cover-photo/CoverPhoto' diff --git a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx index b1020c3a1ff..9c5f4731f6e 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackHeader.tsx @@ -1,6 +1,5 @@ import { useCallback } from 'react' -import { OverflowAction } from '@audius/common' import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, @@ -13,6 +12,7 @@ import { AccessConditions } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { OverflowAction } from '@audius/common/store' import { getCanonicalName, formatSeconds, diff --git a/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx b/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx index 5845f7764f2..b053ba84ee4 100644 --- a/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx +++ b/packages/web/src/pages/track-page/components/mobile/TrackPage.tsx @@ -1,12 +1,12 @@ import { useEffect, useContext } from 'react' -import { - trackPageLineupActions, - QueueItem, - OverflowAction -} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { ID, LineupState, Track, User } from '@audius/common/models' +import { + trackPageLineupActions, + OverflowAction, + QueueItem +} from '@audius/common/store' import { HeaderContext } from 'components/header/mobile/HeaderContextProvider' import Lineup from 'components/lineup/Lineup' diff --git a/packages/web/src/pages/trending-page/TrendingPageProvider.jsx b/packages/web/src/pages/trending-page/TrendingPageProvider.jsx index 1cc505bcc7f..9eb080e2e19 100644 --- a/packages/web/src/pages/trending-page/TrendingPageProvider.jsx +++ b/packages/web/src/pages/trending-page/TrendingPageProvider.jsx @@ -1,14 +1,16 @@ -import { PureComponent } from 'react' - import { accountSelectors, lineupSelectors, trendingPageLineupActions, - trendingPageSelectors, trendingPageActions, - playerSelectors, - queueSelectors -} from '@audius/common' + trendingPageSelectors, + queueSelectors, + playerSelectors +} from '@audius/common/store' + +import { PureComponent } from 'react' + +import {} from '@audius/common' import { Name, TimeRange } from '@audius/common/models' import { GENRES } from '@audius/common/utils' import { diff --git a/packages/web/src/pages/trending-page/components/RewardsBanner.tsx b/packages/web/src/pages/trending-page/components/RewardsBanner.tsx index 0e26bb2f6c3..e240d96ebcf 100644 --- a/packages/web/src/pages/trending-page/components/RewardsBanner.tsx +++ b/packages/web/src/pages/trending-page/components/RewardsBanner.tsx @@ -3,7 +3,9 @@ import { useCallback } from 'react' import { audioRewardsPageActions, TrendingRewardsModalType -} from '@audius/common' +} from '@audius/common/store' + +import {} from '@audius/common' import { IconArrow, IconCrown } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx b/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx index e75bec0c9e8..9c43a2cbd57 100644 --- a/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx +++ b/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx @@ -1,6 +1,8 @@ +import { trendingPageLineupActions } from '@audius/common/store' + import { useCallback, useRef, useState } from 'react' -import { trendingPageLineupActions } from '@audius/common' +import {} from '@audius/common' import { Name, Status, TimeRange } from '@audius/common/models' import { ELECTRONIC_PREFIX, TRENDING_GENRES } from '@audius/common/utils' diff --git a/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx b/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx index ed58c7a7344..1f49f6bc2f0 100644 --- a/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx +++ b/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx @@ -1,6 +1,8 @@ +import { trendingPageLineupActions } from '@audius/common/store' + import { useCallback, useContext, useEffect, useMemo } from 'react' -import { trendingPageLineupActions } from '@audius/common' +import {} from '@audius/common' import { Name, TimeRange } from '@audius/common/models' import cn from 'classnames' diff --git a/packages/web/src/pages/trending-playlists/TrendingPlaylistPage.tsx b/packages/web/src/pages/trending-playlists/TrendingPlaylistPage.tsx index c6d71005657..49e2a69cdcd 100644 --- a/packages/web/src/pages/trending-playlists/TrendingPlaylistPage.tsx +++ b/packages/web/src/pages/trending-playlists/TrendingPlaylistPage.tsx @@ -3,7 +3,7 @@ import { useEffect } from 'react' import { trendingPlaylistsPageLineupSelectors, trendingPlaylistsPageLineupActions -} from '@audius/common' +} from '@audius/common/store' import { useDispatch } from 'react-redux' import DesktopHeader from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx b/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx index d82a01c64a4..640403343d2 100644 --- a/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx +++ b/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx @@ -1,9 +1,11 @@ import { useEffect } from 'react' import { - trendingUndergroundPageLineupActions, - trendingUndergroundPageLineupSelectors -} from '@audius/common' + trendingUndergroundPageLineupSelectors, + trendingUndergroundPageLineupActions +} from '@audius/common/store' + +import {} from '@audius/common' import { useDispatch } from 'react-redux' import DesktopHeader from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/upload-page/UploadPage.tsx b/packages/web/src/pages/upload-page/UploadPage.tsx index fe3dcd35421..9680d38715e 100644 --- a/packages/web/src/pages/upload-page/UploadPage.tsx +++ b/packages/web/src/pages/upload-page/UploadPage.tsx @@ -1,11 +1,11 @@ import { createContext, useCallback, useEffect, useState } from 'react' import { - UploadType, - uploadActions, uploadConfirmationModalUIActions, - uploadSelectors -} from '@audius/common' + uploadActions, + uploadSelectors, + UploadType +} from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/upload-page/components/ShareBanner.tsx b/packages/web/src/pages/upload-page/components/ShareBanner.tsx index 4257f76a5d3..db3680f57c9 100644 --- a/packages/web/src/pages/upload-page/components/ShareBanner.tsx +++ b/packages/web/src/pages/upload-page/components/ShareBanner.tsx @@ -1,12 +1,5 @@ import { useCallback, useContext } from 'react' -import { - ShareContent, - UploadType, - accountSelectors, - tracksSocialActions, - usersSocialActions -} from '@audius/common' import { Name, ShareSource, @@ -14,6 +7,13 @@ import { Track, User } from '@audius/common/models' +import { + accountSelectors, + tracksSocialActions, + usersSocialActions, + UploadType, + ShareContent +} from '@audius/common/store' import { Button, ButtonType, IconLink, IconTwitterBird } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/upload-page/components/TracksPreview.tsx b/packages/web/src/pages/upload-page/components/TracksPreview.tsx index 90ecee45ed2..24b315ccc7d 100644 --- a/packages/web/src/pages/upload-page/components/TracksPreview.tsx +++ b/packages/web/src/pages/upload-page/components/TracksPreview.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { UploadType } from '@audius/common' +import { UploadType } from '@audius/common/store' import { Button } from '@audius/harmony' import { IconCaretRight, Scrollbar, SegmentedControl } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx index 53a6cb987a7..44f3136f4b2 100644 --- a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx +++ b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx @@ -1,6 +1,5 @@ import { useCallback, useMemo } from 'react' -import { accountSelectors } from '@audius/common' import { USDCPurchaseConfig, useFeatureFlag, @@ -22,6 +21,7 @@ import { AccessConditions } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { accountSelectors } from '@audius/common/store' import { formatPrice, Nullable } from '@audius/common/utils' import { IconCart, diff --git a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx index 8ac885438c6..66486ed8577 100644 --- a/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx +++ b/packages/web/src/pages/upload-page/fields/RemixSettingsField/RemixSettingsMenuFields.tsx @@ -1,12 +1,12 @@ import { useEffect } from 'react' -import { accountSelectors } from '@audius/common' import { useGetTrackByPermalink } from '@audius/common/api' import { useGatedContentAccess } from '@audius/common/hooks' import { isContentCollectibleGated, isContentUSDCPurchaseGated } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { getPathFromTrackUrl } from '@audius/common/utils' import { useField } from 'formik' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/upload-page/fields/availability/SpecialAccessFields.tsx b/packages/web/src/pages/upload-page/fields/availability/SpecialAccessFields.tsx index 27fd04b691f..a1426c36ca5 100644 --- a/packages/web/src/pages/upload-page/fields/availability/SpecialAccessFields.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/SpecialAccessFields.tsx @@ -1,6 +1,6 @@ import { ChangeEvent, useCallback } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { IconInfo, RadioButton, RadioButtonGroup } from '@audius/stems' import cn from 'classnames' import { useField } from 'formik' diff --git a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedDescription.tsx b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedDescription.tsx index b042a1d8318..486aac1ab57 100644 --- a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedDescription.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedDescription.tsx @@ -1,4 +1,4 @@ -import { collectiblesSelectors } from '@audius/common' +import { collectiblesSelectors } from '@audius/common/store' import { Button, ButtonType } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedFields.tsx b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedFields.tsx index 737602eca30..909fe7215df 100644 --- a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedFields.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedFields.tsx @@ -1,11 +1,11 @@ import { useMemo } from 'react' -import { collectiblesSelectors } from '@audius/common' import { Chain, isContentCollectibleGated, TrackAvailabilityType } from '@audius/common/models' +import { collectiblesSelectors } from '@audius/common/store' import { useField } from 'formik' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx index 21c9549c410..4ad31089658 100644 --- a/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx +++ b/packages/web/src/pages/upload-page/fields/availability/collectible-gated/CollectibleGatedRadioField.tsx @@ -1,6 +1,6 @@ -import { collectiblesSelectors } from '@audius/common' import { useAccessAndRemixSettings } from '@audius/common/hooks' import { TrackAvailabilityType, AccessConditions } from '@audius/common/models' +import { collectiblesSelectors } from '@audius/common/store' import { IconCollectible } from '@audius/stems' import { ModalRadioItem } from 'components/modal-radio/ModalRadioItem' diff --git a/packages/web/src/pages/upload-page/forms/EditCollectionForm.tsx b/packages/web/src/pages/upload-page/forms/EditCollectionForm.tsx index dcb8afb19c7..41a53e106a7 100644 --- a/packages/web/src/pages/upload-page/forms/EditCollectionForm.tsx +++ b/packages/web/src/pages/upload-page/forms/EditCollectionForm.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react' -import { UploadType } from '@audius/common' +import { UploadType } from '@audius/common/store' import { Form, Formik } from 'formik' import moment from 'moment' import { toFormikValidationSchema } from 'zod-formik-adapter' diff --git a/packages/web/src/pages/upload-page/pages/EditPage.tsx b/packages/web/src/pages/upload-page/pages/EditPage.tsx index 6568c38ec74..8a2cc6e5cd5 100644 --- a/packages/web/src/pages/upload-page/pages/EditPage.tsx +++ b/packages/web/src/pages/upload-page/pages/EditPage.tsx @@ -1,6 +1,6 @@ import { useContext } from 'react' -import { UploadType } from '@audius/common' +import { UploadType } from '@audius/common/store' import { useUnmount } from 'react-use' import { EditCollectionForm } from '../forms/EditCollectionForm' diff --git a/packages/web/src/pages/upload-page/pages/FinishPage.tsx b/packages/web/src/pages/upload-page/pages/FinishPage.tsx index ea5fa48a41e..92b69cdc27c 100644 --- a/packages/web/src/pages/upload-page/pages/FinishPage.tsx +++ b/packages/web/src/pages/upload-page/pages/FinishPage.tsx @@ -1,15 +1,15 @@ import { useCallback, useMemo } from 'react' +import { imageBlank as placeholderArt } from '@audius/common/assets' +import { Name } from '@audius/common/models' import { accountSelectors, - CommonState, - ProgressState, - ProgressStatus, uploadSelectors, - UploadType -} from '@audius/common' -import { imageBlank as placeholderArt } from '@audius/common/assets' -import { Name } from '@audius/common/models' + UploadType, + ProgressStatus, + CommonState, + ProgressState +} from '@audius/common/store' import { HarmonyPlainButton, IconArrow, diff --git a/packages/web/src/pages/upload-page/pages/SelectPage.tsx b/packages/web/src/pages/upload-page/pages/SelectPage.tsx index 07ea3844107..1459445432b 100644 --- a/packages/web/src/pages/upload-page/pages/SelectPage.tsx +++ b/packages/web/src/pages/upload-page/pages/SelectPage.tsx @@ -1,8 +1,8 @@ import { useCallback, useState } from 'react' -import { UploadType } from '@audius/common' import { newCollectionMetadata } from '@audius/common/schemas' import { FeatureFlags } from '@audius/common/services' +import { UploadType } from '@audius/common/store' import { removeNullable, Nullable } from '@audius/common/utils' import { Box } from '@audius/harmony' import cn from 'classnames' diff --git a/packages/web/src/pages/upload-page/types.ts b/packages/web/src/pages/upload-page/types.ts index b3c8bb9fcc9..caa2912d31f 100644 --- a/packages/web/src/pages/upload-page/types.ts +++ b/packages/web/src/pages/upload-page/types.ts @@ -1,5 +1,5 @@ -import { UploadType } from '@audius/common' import { TrackMetadata } from '@audius/common/models' +import { UploadType } from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { CollectionValues } from './validation' diff --git a/packages/web/src/pages/upload-page/utils/uploadPreviewContext.tsx b/packages/web/src/pages/upload-page/utils/uploadPreviewContext.tsx index e0dc8504701..68ba7214e7b 100644 --- a/packages/web/src/pages/upload-page/utils/uploadPreviewContext.tsx +++ b/packages/web/src/pages/upload-page/utils/uploadPreviewContext.tsx @@ -1,6 +1,6 @@ import { createContext, useCallback, useState } from 'react' -import { playerSelectors, queueActions } from '@audius/common' +import { queueActions, playerSelectors } from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/visualizer/VisualizerProvider.tsx b/packages/web/src/pages/visualizer/VisualizerProvider.tsx index 671f0aeb278..c371c97941e 100644 --- a/packages/web/src/pages/visualizer/VisualizerProvider.tsx +++ b/packages/web/src/pages/visualizer/VisualizerProvider.tsx @@ -1,5 +1,11 @@ +import { + averageColorSelectors, + queueSelectors, + themeSelectors, + playerSelectors +} from '@audius/common/store' import { Nullable } from '@audius/common/utils' - import { Name, SquareSizes, Track } from '@audius/common/models' +import { Name, SquareSizes, Track } from '@audius/common/models' import { useEffect, useState, useCallback } from 'react' import { push as pushRoute } from 'connected-react-router' import { AppState } from 'store/types' @@ -12,12 +18,6 @@ import Toast from 'components/toast/Toast' import styles from './VisualizerProvider.module.css' import { MountPlacement, ComponentPlacement } from 'components/types' -import { - - playerSelectors, - queueSelectors, - themeSelectors -} from '@audius/common' import { shouldShowDark } from 'utils/theme/theme' import { profilePage } from 'utils/route' @@ -25,7 +25,7 @@ import { make, TrackEvent } from 'common/store/analytics/actions' import DynamicImage from 'components/dynamic-image/DynamicImage' import PlayingTrackInfo from 'components/play-bar/desktop/components/PlayingTrackInfo' import { webglSupported } from './utils' -import { averageColorSelectors } from '@audius/common' + import IconRemove from 'assets/img/iconRemove.svg' import AudiusLogoHorizontal from 'assets/img/audiusLogoHorizontal.svg' import { useTrackCoverArt } from 'hooks/useTrackCoverArt' diff --git a/packages/web/src/services/audio-player/AudioPlayer.ts b/packages/web/src/services/audio-player/AudioPlayer.ts index 200d153d97c..60bc1dd0a9b 100644 --- a/packages/web/src/services/audio-player/AudioPlayer.ts +++ b/packages/web/src/services/audio-player/AudioPlayer.ts @@ -1,4 +1,4 @@ -import { PlaybackRate, playbackRateValueMap } from '@audius/common' +import { playbackRateValueMap, PlaybackRate } from '@audius/common/store' declare global { interface Window { diff --git a/packages/web/src/services/audius-backend/BuyAudio.ts b/packages/web/src/services/audius-backend/BuyAudio.ts index cae50ed0093..5d7852c1e6b 100644 --- a/packages/web/src/services/audius-backend/BuyAudio.ts +++ b/packages/web/src/services/audius-backend/BuyAudio.ts @@ -1,5 +1,5 @@ -import { InAppAudioPurchaseMetadata } from '@audius/common' import { MEMO_PROGRAM_ID } from '@audius/common/services' +import { InAppAudioPurchaseMetadata } from '@audius/common/store' import { TokenAccountNotFoundError, createTransferCheckedInstruction, diff --git a/packages/web/src/services/audius-backend/Jupiter.ts b/packages/web/src/services/audius-backend/Jupiter.ts index 62cf95b0c9f..a658259eee2 100644 --- a/packages/web/src/services/audius-backend/Jupiter.ts +++ b/packages/web/src/services/audius-backend/Jupiter.ts @@ -1,4 +1,4 @@ -import { JupiterTokenSymbol, TOKEN_LISTING_MAP } from '@audius/common' +import { TOKEN_LISTING_MAP, JupiterTokenSymbol } from '@audius/common/store' import { convertBigIntToAmountObject } from '@audius/common/utils' import { TransactionHandler } from '@audius/sdk/dist/core' import { createJupiterApiClient, Instruction, QuoteResponse } from '@jup-ag/api' diff --git a/packages/web/src/ssr/track/+onBeforeRender.tsx b/packages/web/src/ssr/track/+onBeforeRender.tsx index de6093dc8a7..3a923a6a7bb 100644 --- a/packages/web/src/ssr/track/+onBeforeRender.tsx +++ b/packages/web/src/ssr/track/+onBeforeRender.tsx @@ -1,5 +1,4 @@ import { Maybe } from '@audius/common/utils' - import { sdk, full as FullSdk, diff --git a/packages/web/src/store/account/sagas.ts b/packages/web/src/store/account/sagas.ts index 349175264b6..017a25f73d2 100644 --- a/packages/web/src/store/account/sagas.ts +++ b/packages/web/src/store/account/sagas.ts @@ -1,10 +1,10 @@ import { accountActions, accountSelectors, + accountSagas as commonAccountSagas, settingsPageActions, - modalsActions, - accountSagas as commonAccountSagas -} from '@audius/common' + modalsActions +} from '@audius/common/store' import { call, getContext, put, select, takeEvery } from 'typed-redux-saga' import webCommonAccountSagas from 'common/store/account/sagas' diff --git a/packages/web/src/store/analytics/sagas.ts b/packages/web/src/store/analytics/sagas.ts index 43b4817791e..ef876f965d9 100644 --- a/packages/web/src/store/analytics/sagas.ts +++ b/packages/web/src/store/analytics/sagas.ts @@ -1,5 +1,5 @@ -import { getContext } from '@audius/common' import { Name } from '@audius/common/models' +import { getContext } from '@audius/common/store' import { LOCATION_CHANGE } from 'connected-react-router' import { take } from 'redux-saga/effects' diff --git a/packages/web/src/store/application/ui/buy-audio/sagas.ts b/packages/web/src/store/application/ui/buy-audio/sagas.ts index 9ed6835c01f..680f8369d1b 100644 --- a/packages/web/src/store/application/ui/buy-audio/sagas.ts +++ b/packages/web/src/store/application/ui/buy-audio/sagas.ts @@ -1,21 +1,3 @@ -import { - getContext, - walletActions, - TOKEN_LISTING_MAP, - buyAudioSelectors, - PurchaseInfoErrorType, - buyAudioActions, - OnRampProvider, - transactionDetailsActions, - TransactionMetadataType, - TransactionType, - TransactionMethod, - TransactionDetails, - walletSelectors, - modalsActions, - AmountObject, - solanaSelectors -} from '@audius/common' import { Name, ErrorLevel, BNWei } from '@audius/common/models' import { IntKeys, @@ -24,6 +6,24 @@ import { createUserBankIfNeeded, LocalStorage } from '@audius/common/services' +import { + solanaSelectors, + walletSelectors, + walletActions, + buyAudioActions, + buyAudioSelectors, + transactionDetailsActions, + modalsActions, + OnRampProvider, + PurchaseInfoErrorType, + TOKEN_LISTING_MAP, + TransactionType, + TransactionMethod, + TransactionMetadataType, + getContext, + AmountObject, + TransactionDetails +} from '@audius/common/store' import { dayjs, isNullOrUndefined, diff --git a/packages/web/src/store/application/ui/chat/sagas.ts b/packages/web/src/store/application/ui/chat/sagas.ts index dcd75c9dedb..527a79266d6 100644 --- a/packages/web/src/store/application/ui/chat/sagas.ts +++ b/packages/web/src/store/application/ui/chat/sagas.ts @@ -1,4 +1,4 @@ -import { chatActions } from '@audius/common' +import { chatActions } from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { takeLatest } from 'redux-saga/effects' import { put } from 'typed-redux-saga' diff --git a/packages/web/src/store/application/ui/notifications/notificationsUISelectors.ts b/packages/web/src/store/application/ui/notifications/notificationsUISelectors.ts index 488efa429f4..a5e6e17a8c3 100644 --- a/packages/web/src/store/application/ui/notifications/notificationsUISelectors.ts +++ b/packages/web/src/store/application/ui/notifications/notificationsUISelectors.ts @@ -1,7 +1,7 @@ import { - AnnouncementNotification, - notificationsSelectors -} from '@audius/common' + notificationsSelectors, + AnnouncementNotification +} from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { AppState } from 'store/types' diff --git a/packages/web/src/store/application/ui/stemsUpload/sagas.ts b/packages/web/src/store/application/ui/stemsUpload/sagas.ts index 766b1403917..00611466778 100644 --- a/packages/web/src/store/application/ui/stemsUpload/sagas.ts +++ b/packages/web/src/store/application/ui/stemsUpload/sagas.ts @@ -1,9 +1,9 @@ +import { Name, Track, User } from '@audius/common/models' import { cacheTracksSelectors, cacheUsersSelectors, stemsUploadActions -} from '@audius/common' -import { Name, Track, User } from '@audius/common/models' +} from '@audius/common/store' import { takeEvery, put, call, select } from 'redux-saga/effects' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/store/application/ui/theme/sagas.ts b/packages/web/src/store/application/ui/theme/sagas.ts index 3a12516cd17..93d2d9e1564 100644 --- a/packages/web/src/store/application/ui/theme/sagas.ts +++ b/packages/web/src/store/application/ui/theme/sagas.ts @@ -1,5 +1,5 @@ -import { themeActions } from '@audius/common' import { Theme } from '@audius/common/models' +import { themeActions } from '@audius/common/store' import { actionChannelDispatcher } from '@audius/common/utils' import { PayloadAction } from '@reduxjs/toolkit' import { eventChannel } from 'redux-saga' diff --git a/packages/web/src/store/application/ui/userListModal/sagas.ts b/packages/web/src/store/application/ui/userListModal/sagas.ts index 0e97be0d20e..e4e62c5026e 100644 --- a/packages/web/src/store/application/ui/userListModal/sagas.ts +++ b/packages/web/src/store/application/ui/userListModal/sagas.ts @@ -1,16 +1,16 @@ +import { FavoriteType } from '@audius/common/models' import { topSupportersUserListActions as topSupporterActions, supportingUserListActions as supportingActions, - RepostType, repostsUserListActions as repostActions, notificationsUserListActions as notificationActions, mutualsUserListActions, followingUserListActions as followingActions, followersUserListActions as followerActions, favoritesUserListActions as favoritesActions, - relatedArtistsUserListActions -} from '@audius/common' -import { FavoriteType } from '@audius/common/models' + relatedArtistsUserListActions, + RepostType +} from '@audius/common/store' import { takeEvery, put } from 'redux-saga/effects' import { setUsers } from './slice' diff --git a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts index 8a2a8d5217d..9ce796e928f 100644 --- a/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts +++ b/packages/web/src/store/application/ui/withdraw-usdc/sagas.ts @@ -1,14 +1,3 @@ -import { - withdrawUSDCActions, - solanaSelectors, - getUSDCUserBank, - getContext, - TOKEN_LISTING_MAP, - withdrawUSDCModalActions, - WithdrawUSDCModalPages, - WithdrawMethod, - buyUSDCActions -} from '@audius/common' import { Name, ErrorLevel, @@ -22,6 +11,17 @@ import { relayTransaction, relayVersionedTransaction } from '@audius/common/services' +import { + buyUSDCActions, + getUSDCUserBank, + solanaSelectors, + withdrawUSDCActions, + WithdrawUSDCModalPages, + withdrawUSDCModalActions, + TOKEN_LISTING_MAP, + WithdrawMethod, + getContext +} from '@audius/common/store' import { formatUSDCWeiToFloorCentsNumber } from '@audius/common/utils' import { createAssociatedTokenAccountInstruction, diff --git a/packages/web/src/store/configureStore.ts b/packages/web/src/store/configureStore.ts index 638ffc008c2..dfae87b0d62 100644 --- a/packages/web/src/store/configureStore.ts +++ b/packages/web/src/store/configureStore.ts @@ -1,5 +1,5 @@ -import { chatMiddleware } from '@audius/common' import { Name, ErrorLevel, SsrPageProps } from '@audius/common/models' +import { chatMiddleware } from '@audius/common/store' import { composeWithDevToolsLogOnlyInProduction } from '@redux-devtools/extension' import { configureScope, addBreadcrumb } from '@sentry/browser' import { routerMiddleware } from 'connected-react-router' diff --git a/packages/web/src/store/errors/sagas.ts b/packages/web/src/store/errors/sagas.ts index 6d38c6a211d..e1b75256d9f 100644 --- a/packages/web/src/store/errors/sagas.ts +++ b/packages/web/src/store/errors/sagas.ts @@ -1,4 +1,4 @@ -import { toastActions } from '@audius/common' +import { toastActions } from '@audius/common/store' import { takeEvery, put } from 'redux-saga/effects' import * as errorActions from './actions' diff --git a/packages/web/src/store/lineup/lineupForRoute.js b/packages/web/src/store/lineup/lineupForRoute.js index df95e7dceb0..659564d08b8 100644 --- a/packages/web/src/store/lineup/lineupForRoute.js +++ b/packages/web/src/store/lineup/lineupForRoute.js @@ -1,13 +1,13 @@ import { - trackPageSelectors, trendingPageSelectors, + trackPageSelectors, searchResultsPageSelectors, savedPageSelectors, profilePageSelectors, historyPageSelectors, feedPageSelectors, collectionPageSelectors -} from '@audius/common' +} from '@audius/common/store' import { matchPath } from 'react-router' import { diff --git a/packages/web/src/store/lineup/store.test.js b/packages/web/src/store/lineup/store.test.js index c68d29a7bd6..8bfc967925f 100644 --- a/packages/web/src/store/lineup/store.test.js +++ b/packages/web/src/store/lineup/store.test.js @@ -1,13 +1,13 @@ +import { Kind } from '@audius/common/models' import { cacheReducer, - LineupBaseActions, lineupReducer, + LineupBaseActions, queueReducer, initialQueueState, playerReducer, initialPlayerState -} from '@audius/common' -import { Kind } from '@audius/common/models' +} from '@audius/common/store' import { combineReducers } from 'redux' import { all } from 'redux-saga/effects' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/store/notifications/sagas.ts b/packages/web/src/store/notifications/sagas.ts index 1e66f247e57..ef6f289c64c 100644 --- a/packages/web/src/store/notifications/sagas.ts +++ b/packages/web/src/store/notifications/sagas.ts @@ -1,4 +1,4 @@ -import { accountSelectors, getContext } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common/store' import { waitForValue } from '@audius/common/utils' import { eventChannel } from 'redux-saga' import { call, delay, fork, take } from 'typed-redux-saga' diff --git a/packages/web/src/store/reachability/sagas.ts b/packages/web/src/store/reachability/sagas.ts index f5816d14468..99d8a1349aa 100644 --- a/packages/web/src/store/reachability/sagas.ts +++ b/packages/web/src/store/reachability/sagas.ts @@ -2,7 +2,7 @@ import { reachabilityActions, reachabilitySelectors, getContext -} from '@audius/common' +} from '@audius/common/store' import { delay, race, put, all, take, select, call } from 'typed-redux-saga' import { isMobileWeb } from 'common/utils/isMobileWeb' diff --git a/packages/web/src/store/reducers.ts b/packages/web/src/store/reducers.ts index ac220d92d56..70358334b8d 100644 --- a/packages/web/src/store/reducers.ts +++ b/packages/web/src/store/reducers.ts @@ -1,9 +1,9 @@ +import { SsrPageProps } from '@audius/common/models' import { queueReducer as queue, remoteConfigReducer as remoteConfig, reducers as clientStoreReducers -} from '@audius/common' -import { SsrPageProps } from '@audius/common/models' +} from '@audius/common/store' import { connectRouter } from 'connected-react-router' import { History } from 'history' import localForage from 'localforage' diff --git a/packages/web/src/store/sagas.ts b/packages/web/src/store/sagas.ts index 3fb436d51f7..c7a5127450c 100644 --- a/packages/web/src/store/sagas.ts +++ b/packages/web/src/store/sagas.ts @@ -1,30 +1,30 @@ import { + buyCryptoSagas, buyUSDCSagas, castSagas, - playerSagas as commonPlayerSagas, - playbackPositionSagas, chatSagas, - gatedContentSagas, - purchaseContentSagas, + reachabilitySagas as commonReachabilitySagas, remoteConfigSagas, + solanaSagas, + relatedArtistsSagas, deletePlaylistConfirmationModalUISagas as deletePlaylistConfirmationModalSagas, duplicateAddConfirmationModalUISagas as duplicateAddConfirmationModalSagas, - uploadConfirmationModalUISagas as uploadConfirmationModalSagas, - publishTrackConfirmationModalUISagas as publishTrackConfirmationModalSagas, - publishPlaylistConfirmationModalUISagas as publishPlaylistConfirmationModalSagas, mobileOverflowMenuUISagas as overflowMenuSagas, + publishPlaylistConfirmationModalUISagas as publishPlaylistConfirmationModalSagas, shareModalUISagas as shareModalSagas, stripeModalUISagas as stripeModalSagas, - toastSagas, vipDiscordModalSagas, - reachabilitySagas as commonReachabilitySagas, + toastSagas, + uploadConfirmationModalUISagas as uploadConfirmationModalSagas, + publishTrackConfirmationModalUISagas as publishTrackConfirmationModalSagas, searchUsersModalSagas, - relatedArtistsSagas, - solanaSagas, - confirmerSagas, - buyCryptoSagas, - modalsSagas -} from '@audius/common' + modalsSagas, + playerSagas as commonPlayerSagas, + playbackPositionSagas, + gatedContentSagas, + purchaseContentSagas, + confirmerSagas +} from '@audius/common/store' import { all, fork } from 'redux-saga/effects' import addToCollectionSagas from 'common/store/add-to-collection/sagas' diff --git a/packages/web/src/store/sign-out/sagas.ts b/packages/web/src/store/sign-out/sagas.ts index 19938e47d39..5bff40ddbb0 100644 --- a/packages/web/src/store/sign-out/sagas.ts +++ b/packages/web/src/store/sign-out/sagas.ts @@ -1,10 +1,10 @@ +import { Name } from '@audius/common/models' import { - signOutActions, - getContext, accountActions, - tokenDashboardPageActions -} from '@audius/common' -import { Name } from '@audius/common/models' + tokenDashboardPageActions, + signOutActions, + getContext +} from '@audius/common/store' import { takeLatest, put } from 'redux-saga/effects' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/store/storeContext.ts b/packages/web/src/store/storeContext.ts index d39c36a35ca..2c63f23fb31 100644 --- a/packages/web/src/store/storeContext.ts +++ b/packages/web/src/store/storeContext.ts @@ -1,9 +1,9 @@ -import { CommonStoreContext } from '@audius/common' import { FeatureFlags, OpenSeaClient, SolanaClient } from '@audius/common/services' +import { CommonStoreContext } from '@audius/common/store' import { setTag, configureScope } from '@sentry/browser' import * as analytics from 'services/analytics' diff --git a/packages/web/src/store/token-dashboard/connectNewWalletSaga.ts b/packages/web/src/store/token-dashboard/connectNewWalletSaga.ts index 5944f4000ff..7306633b735 100644 --- a/packages/web/src/store/token-dashboard/connectNewWalletSaga.ts +++ b/packages/web/src/store/token-dashboard/connectNewWalletSaga.ts @@ -1,5 +1,5 @@ -import { getContext, tokenDashboardPageActions } from '@audius/common' import { Name } from '@audius/common/models' +import { tokenDashboardPageActions, getContext } from '@audius/common/store' import { captureException } from '@sentry/browser' import { fork, put, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/store/token-dashboard/establishWalletConnection.ts b/packages/web/src/store/token-dashboard/establishWalletConnection.ts index 6471fb11fb2..d02a3b69bc3 100644 --- a/packages/web/src/store/token-dashboard/establishWalletConnection.ts +++ b/packages/web/src/store/token-dashboard/establishWalletConnection.ts @@ -1,6 +1,6 @@ -import { getContext, tokenDashboardPageActions } from '@audius/common' import { Chain } from '@audius/common/models' import { BooleanKeys } from '@audius/common/services' +import { tokenDashboardPageActions, getContext } from '@audius/common/store' import { getErrorMessage } from '@audius/common/utils' import { call, put } from 'typed-redux-saga' diff --git a/packages/web/src/store/token-dashboard/sagas.ts b/packages/web/src/store/token-dashboard/sagas.ts index 98a61b092ad..2e2dddb051d 100644 --- a/packages/web/src/store/token-dashboard/sagas.ts +++ b/packages/web/src/store/token-dashboard/sagas.ts @@ -1,10 +1,10 @@ import { - tokenDashboardPageActions, - TokenDashboardPageModalState, tokenDashboardPageSelectors, + tokenDashboardPageActions, walletActions, - modalsActions -} from '@audius/common' + modalsActions, + TokenDashboardPageModalState +} from '@audius/common/store' import { weiToString } from '@audius/common/utils' import { all, put, race, select, take, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/store/token-dashboard/signMessage.ts b/packages/web/src/store/token-dashboard/signMessage.ts index 12822333556..e333ff479d3 100644 --- a/packages/web/src/store/token-dashboard/signMessage.ts +++ b/packages/web/src/store/token-dashboard/signMessage.ts @@ -1,10 +1,10 @@ -import { - accountSelectors, - tokenDashboardPageActions, - tokenDashboardPageSelectors -} from '@audius/common' import { Chain } from '@audius/common/models' import { PhantomProvider } from '@audius/common/services' +import { + accountSelectors, + tokenDashboardPageSelectors, + tokenDashboardPageActions +} from '@audius/common/store' import { call, put, select } from 'typed-redux-saga' import { WalletConnection } from './types' diff --git a/packages/web/src/store/types.ts b/packages/web/src/store/types.ts index 18b9f69d423..d1bf092796b 100644 --- a/packages/web/src/store/types.ts +++ b/packages/web/src/store/types.ts @@ -1,21 +1,21 @@ import { averageColorReducer, - ChangePasswordState, - SmartCollectionState, remixesPageReducer as RemixesPageReducer, - HistoryPageState, - CollectionsPageState, queueReducer as QueueReducer, - ReachabilityState, remoteConfigReducer as RemoteConfigReducer, stemsUploadReducer as StemsUploadReducer, - RepostsPageState, - NotificationUsersPageState, - FollowingPageState, - FollowersPageState, + ChangePasswordState, + CollectionsPageState, + HistoryPageState, + SmartCollectionState, + ReachabilityState, + CommonState, FavoritesPageState, - CommonState -} from '@audius/common' + FollowersPageState, + FollowingPageState, + NotificationUsersPageState, + RepostsPageState +} from '@audius/common/store' import { RouterState } from 'connected-react-router' import SignOnPageState from 'common/store/pages/signon/types' diff --git a/packages/web/src/utils/route/userRouteParser.ts b/packages/web/src/utils/route/userRouteParser.ts index a3cc909b293..9a5e32f2db6 100644 --- a/packages/web/src/utils/route/userRouteParser.ts +++ b/packages/web/src/utils/route/userRouteParser.ts @@ -1,5 +1,5 @@ -import { ProfilePageTabRoute } from '@audius/common' import { ID } from '@audius/common/models' +import { ProfilePageTabRoute } from '@audius/common/store' import { decodeHashId } from '@audius/common/utils' import { matchPath } from 'react-router-dom' diff --git a/packages/web/src/utils/sagaPollingDaemons.ts b/packages/web/src/utils/sagaPollingDaemons.ts index 0db15fd8d86..1bd83096079 100644 --- a/packages/web/src/utils/sagaPollingDaemons.ts +++ b/packages/web/src/utils/sagaPollingDaemons.ts @@ -1,4 +1,4 @@ -import { getContext } from '@audius/common' +import { getContext } from '@audius/common/store' import { Action } from 'redux' import { eventChannel } from 'redux-saga' import { select, put, take, delay } from 'redux-saga/effects' From 3a95ed974bde6913eaf5c8bf9f6003d752cd14ca Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 17:39:31 -0800 Subject: [PATCH 48/64] web store wip 2 --- packages/web/src/common/hooks/useModalState.ts | 1 - packages/web/src/common/hooks/useSelector.ts | 2 +- packages/web/src/common/store/account/sagas.js | 2 +- .../src/common/store/add-to-collection/sagas.ts | 2 +- packages/web/src/common/store/analytics/sagas.ts | 2 +- packages/web/src/common/store/backend/sagas.ts | 2 +- .../cache/collections/addTrackToPlaylistSaga.ts | 2 +- .../common/store/cache/collections/commonSagas.js | 2 +- .../cache/collections/confirmOrderPlaylist.js | 2 +- .../collections/createPlaylistRequestedSaga.ts | 2 +- .../store/cache/collections/createPlaylistSaga.ts | 2 +- .../common/store/cache/collections/errorSagas.ts | 1 - .../collections/fixInvalidTracksInPlaylist.js | 2 +- .../collections/utils/addUsersFromCollections.ts | 2 +- .../collections/utils/getUnclaimedPlaylistId.ts | 2 +- .../utils/optimisticUpdateCollection.ts | 2 +- .../utils/processAndCacheCollections.ts | 2 +- packages/web/src/common/store/cache/sagas.js | 2 +- packages/web/src/common/store/cache/store.test.js | 2 +- .../src/common/store/cache/tracks/sagaHelpers.ts | 2 +- .../web/src/common/store/cache/tracks/sagas.js | 2 +- .../cache/tracks/utils/fetchAndProcessRemixes.ts | 2 +- .../cache/tracks/utils/fetchAndProcessStems.ts | 2 +- .../src/common/store/cache/tracks/utils/helpers.ts | 2 +- .../cache/tracks/utils/processAndCacheTracks.ts | 2 +- .../store/cache/tracks/utils/retrieveTracks.ts | 2 +- packages/web/src/common/store/cache/users/sagas.js | 2 +- .../web/src/common/store/change-password/sagas.ts | 2 +- packages/web/src/common/store/lineup/sagas.d.ts | 2 +- packages/web/src/common/store/lineup/sagas.js | 2 +- .../notifications/checkForNewNotificationsSaga.ts | 2 +- .../src/common/store/notifications/errorSagas.ts | 2 +- .../store/notifications/fetchNotifications.ts | 2 +- .../store/notifications/fetchNotificationsSaga.ts | 2 +- .../notifications/parseAndProcessNotifications.ts | 2 +- .../notifications/refreshNotificationsSaga.ts | 2 +- .../web/src/common/store/notifications/sagas.ts | 2 +- .../common/store/pages/ai/lineups/tracks/sagas.ts | 2 +- packages/web/src/common/store/pages/ai/sagas.ts | 2 +- .../src/common/store/pages/audio-rewards/sagas.ts | 2 +- .../common/store/pages/audio-rewards/store.test.ts | 2 +- .../common/store/pages/audio-transactions/sagas.ts | 2 +- .../common/store/pages/collection/lineups/sagas.js | 2 +- .../web/src/common/store/pages/collection/sagas.js | 2 +- .../common/store/pages/deactivate-account/sagas.ts | 2 +- .../pages/explore/exploreCollections/sagas.ts | 2 +- .../web/src/common/store/pages/explore/sagas.ts | 2 +- .../src/common/store/pages/feed/lineup/sagas.ts | 2 +- packages/web/src/common/store/pages/feed/sagas.ts | 2 +- .../common/store/pages/history/lineups/sagas.js | 2 +- .../pages/premium-tracks/lineups/tracks/sagas.ts | 2 +- .../profile/lineups/feed/retrieveUserReposts.ts | 2 +- .../store/pages/profile/lineups/feed/sagas.js | 2 +- .../profile/lineups/tracks/retrieveUserTracks.ts | 2 +- .../lineups/tracks/watchUploadTracksSaga.ts | 2 +- .../pages/remixes-page/lineups/tracks/sagas.ts | 2 +- .../src/common/store/pages/remixes-page/sagas.ts | 2 +- .../src/common/store/pages/saved/lineups/sagas.js | 2 +- packages/web/src/common/store/pages/saved/sagas.ts | 2 +- .../pages/search-page/lineups/tracks/sagas.js | 2 +- .../src/common/store/pages/search-page/sagas.js | 2 +- .../src/common/store/pages/settings/errorSagas.ts | 1 - .../web/src/common/store/pages/settings/sagas.ts | 2 +- .../web/src/common/store/pages/signon/actions.ts | 2 +- .../web/src/common/store/pages/signon/sagas.js | 2 +- .../web/src/common/store/pages/signon/selectors.ts | 2 +- .../store/pages/token-dashboard/addWalletToUser.ts | 2 +- .../pages/token-dashboard/associateNewWallet.ts | 2 +- .../pages/token-dashboard/checkIsNewWallet.ts | 2 +- .../pages/token-dashboard/getAccountMetadataCID.ts | 2 +- .../store/pages/token-dashboard/getWalletInfo.ts | 2 +- .../pages/token-dashboard/removeWalletSaga.ts | 2 +- .../common/store/pages/token-dashboard/sagas.ts | 2 +- .../src/common/store/pages/track/lineups/sagas.ts | 2 +- packages/web/src/common/store/pages/track/sagas.js | 2 +- .../pages/trending-playlists/lineups/sagas.ts | 2 +- .../pages/trending-underground/lineups/sagas.ts | 2 +- .../trending/lineups/trending/retrieveTrending.ts | 2 +- .../store/pages/trending/lineups/trending/sagas.js | 2 +- packages/web/src/common/store/player/errorSagas.ts | 1 - packages/web/src/common/store/player/sagas.ts | 2 +- packages/web/src/common/store/player/store.test.js | 2 +- .../web/src/common/store/playlist-library/sagas.ts | 2 +- .../store/playlist-library/watchAddToFolderSaga.ts | 2 +- .../playlist-library/watchReorderLibrarySaga.ts | 2 +- .../playlistUpdatesPollingDaemon.ts | 2 +- .../web/src/common/store/recommendation/sagas.ts | 2 +- .../web/src/common/store/recovery-email/sagas.ts | 2 +- .../web/src/common/store/remix-settings/sagas.ts | 2 +- .../web/src/common/store/search-ai-bar/sagas.ts | 2 +- packages/web/src/common/store/search-bar/sagas.ts | 2 +- .../web/src/common/store/smart-collection/sagas.ts | 2 +- .../common/store/social/collections/errorSagas.ts | 1 - .../src/common/store/social/collections/sagas.ts | 2 +- .../common/store/social/collections/store.test.js | 2 +- .../src/common/store/social/tracks/errorSagas.ts | 1 - .../src/common/store/social/tracks/recordListen.ts | 2 +- .../web/src/common/store/social/tracks/sagas.ts | 2 +- .../src/common/store/social/tracks/store.test.js | 2 +- .../src/common/store/social/users/errorSagas.ts | 1 - .../web/src/common/store/social/users/sagas.ts | 2 +- .../src/common/store/social/users/store.test.js | 2 +- packages/web/src/common/store/tipping/sagas.ts | 2 +- .../web/src/common/store/ui/reactions/sagas.ts | 2 +- packages/web/src/common/store/upload/errorSagas.ts | 2 +- .../web/src/common/store/upload/sagaHelpers.ts | 2 +- packages/web/src/common/store/upload/sagas.js | 2 +- .../common/store/user-list/favorites/errorSagas.ts | 2 +- .../src/common/store/user-list/favorites/sagas.ts | 2 +- .../common/store/user-list/followers/errorSagas.ts | 2 +- .../src/common/store/user-list/followers/sagas.ts | 2 +- .../common/store/user-list/following/errorSagas.ts | 2 +- .../src/common/store/user-list/following/sagas.ts | 2 +- .../common/store/user-list/mutuals/errorSagas.ts | 2 +- .../src/common/store/user-list/mutuals/sagas.ts | 2 +- .../store/user-list/notifications/errorSagas.ts | 2 +- .../common/store/user-list/notifications/sagas.ts | 2 +- .../store/user-list/related-artists/errorSagas.ts | 2 +- .../store/user-list/related-artists/sagas.ts | 2 +- .../common/store/user-list/reposts/errorSagas.ts | 2 +- .../src/common/store/user-list/reposts/sagas.ts | 2 +- .../store/user-list/supporting/errorSagas.ts | 2 +- .../src/common/store/user-list/supporting/sagas.ts | 2 +- .../store/user-list/top-supporters/errorSagas.ts | 2 +- .../common/store/user-list/top-supporters/sagas.ts | 2 +- packages/web/src/common/store/user-list/utils.ts | 2 +- packages/web/src/common/store/wallet/sagas.ts | 2 +- .../components/add-funds-modal/AddFundsModal.tsx | 1 - .../desktop/AddToCollectionModal.tsx | 1 - .../add-to-collection/mobile/AddToCollection.tsx | 1 - .../ai-attribution-modal/AiAttributionDropdown.tsx | 1 - .../ai-attribution-modal/SearchBarResult.jsx | 1 - .../BrowserPushConfirmationModal.tsx | 1 - .../components/card/desktop/CollectionArtCard.tsx | 1 - .../src/components/card/desktop/UserArtCard.tsx | 1 - .../coinflow-onramp-modal/CoinflowOnrampModal.tsx | 1 - .../collectibles/components/CollectibleDetails.tsx | 1 - .../components/CollectibleDetailsModal.tsx | 1 - .../collectibles/components/CollectiblesPage.tsx | 1 - .../src/components/collection/desktop/Artwork.tsx | 1 - .../collection/desktop/CollectionHeader.tsx | 1 - .../components/collection/desktop/EditButton.tsx | 1 - .../collection/desktop/FavoriteButton.tsx | 1 - .../collection/desktop/OverflowMenuButton.tsx | 1 - .../collection/desktop/OwnerActionButtons.tsx | 2 +- .../desktop/PublishConfirmationModal.tsx | 1 - .../components/collection/desktop/RepostButton.tsx | 1 - .../components/collection/desktop/ShareButton.tsx | 1 - .../collection/desktop/ViewerActionButtons.tsx | 2 +- .../collection/mobile/CollectionHeader.jsx | 1 - .../src/components/cookie-banner/CookieBanner.tsx | 1 - .../data-entry/AccessAndSaleTriggerLegacy.tsx | 1 - .../DeletePlaylistConfirmationModal.tsx | 1 - .../download-buttons/DownloadButtons.tsx | 1 - .../DuplicateAddConfirmationModal.tsx | 1 - .../src/components/edit-track/EditTrackModal.tsx | 1 - .../src/components/embed-modal/store/selectors.ts | 2 +- .../FeatureFlagOverrideModal.tsx | 1 - .../first-upload-modal/FirstUploadModal.tsx | 1 - .../leaving-audius-modal/LeavingAudiusModal.tsx | 1 - .../web/src/components/lineup/LineupProvider.tsx | 1 - packages/web/src/components/lineup/hooks.ts | 1 - packages/web/src/components/link/ExternalLink.tsx | 1 - packages/web/src/components/link/UserLink.tsx | 2 +- .../locked-content-modal/LockedContentModal.tsx | 1 - .../AddTrackToPlaylistNotification.tsx | 1 - .../Notification/AnnouncementNotification.tsx | 1 - .../Notification/ChallengeRewardNotification.tsx | 1 - .../Notification/FavoriteNotification.tsx | 1 - .../Notification/FavoriteOfRepostNotification.tsx | 1 - .../Notification/FollowNotification.tsx | 1 - .../Notification/MilestoneNotification.tsx | 1 - .../notification/Notification/Notification.tsx | 1 - .../Notification/RemixCosignNotification.tsx | 1 - .../Notification/RemixCreateNotification.tsx | 1 - .../Notification/RepostNotification.tsx | 1 - .../Notification/RepostOfRepostNotification.tsx | 1 - .../SupporterDethronedNotification.tsx | 1 - .../Notification/TastemakerNotification.tsx | 1 - .../Notification/TierChangeNotification.tsx | 1 - .../Notification/TipReactionNotification.tsx | 1 - .../Notification/TipReceivedNotification.tsx | 1 - .../Notification/TipSentNotification.tsx | 1 - .../Notification/TopSupporterNotification.tsx | 1 - .../Notification/TopSupportingNotification.tsx | 1 - .../Notification/TrendingPlaylistNotification.tsx | 1 - .../Notification/TrendingTrackNotification.tsx | 1 - .../TrendingUndergroundNotification.tsx | 1 - .../Notification/USDCPurchaseBuyerNotification.tsx | 1 - .../USDCPurchaseSellerNotification.tsx | 1 - .../Notification/UserSubscriptionNotification.tsx | 1 - .../Notification/components/EntityLink.tsx | 1 - .../Notification/components/NotificationTile.tsx | 1 - .../Notification/components/Reaction/index.tsx | 2 -- .../Notification/components/TrackContent.tsx | 2 +- .../Notification/components/TwitterShareButton.tsx | 1 - .../Notification/components/UserNameLink.tsx | 1 - .../components/notification/Notification/utils.ts | 1 - .../components/notification/NotificationModal.tsx | 2 +- .../components/notification/NotificationPage.tsx | 1 - .../components/notification/NotificationPanel.tsx | 1 - .../web/src/components/now-playing/NowPlaying.tsx | 1 - .../components/now-playing/NowPlayingDrawer.tsx | 1 - .../src/components/on-ramp-button/OnRampButton.tsx | 2 +- .../password-reset/PasswordResetModal.tsx | 1 - .../src/components/password-reset/store/sagas.tsx | 2 +- .../PinTrackConfirmation.tsx | 1 - .../components/PurchaseContentFormFields.tsx | 1 - .../components/PurchaseContentFormFooter.tsx | 1 - .../hooks/usePurchaseContentFormState.ts | 2 +- .../hooks/usePurchaseSummaryValues.ts | 2 +- .../ConnectedProfileCompletionHeroCard.jsx | 2 +- .../ConnectedProfileCompletionPane.jsx | 1 - .../ConnectedRemixSettingsModal.tsx | 1 - .../reward-claimed-toast/RewardClaimedToast.tsx | 1 - .../components/search-bar/ConnectedSearchBar.jsx | 1 - .../search-users-modal/SearchUsersModal.tsx | 1 - .../web/src/components/share-modal/ShareModal.tsx | 1 - .../web/src/components/share-modal/messages.ts | 1 - packages/web/src/components/share-modal/utils.ts | 2 +- .../stripe-on-ramp-modal/StripeOnRampModal.tsx | 1 - .../components/SuggestedTracks.tsx | 1 - .../tipping/feed-tip-tile/FeedTipTile.tsx | 1 - .../components/tipping/support/SupportingList.tsx | 1 - .../components/tipping/support/SupportingTile.tsx | 1 - .../components/tipping/support/TopSupporters.tsx | 1 - .../tipping/tip-audio/ConfirmSendTip.tsx | 1 - .../src/components/tipping/tip-audio/SendTip.tsx | 1 - .../tipping/tip-audio/TipAudioButton.tsx | 2 +- .../components/tipping/tip-audio/TipAudioModal.tsx | 1 - .../src/components/tipping/tip-audio/TipSent.tsx | 1 - packages/web/src/components/toast/Toast.tsx | 1 - packages/web/src/components/toast/ToastContext.tsx | 1 - .../ConnectedMobileOverflowModal.tsx | 2 +- .../components/MobileOverflowModal.tsx | 1 - .../web/src/components/track/AiTrackSection.tsx | 1 - packages/web/src/components/track/DownloadRow.tsx | 1 - .../web/src/components/track/DownloadSection.tsx | 1 - .../web/src/components/track/GatedTrackSection.tsx | 1 - .../web/src/components/track/GiantTrackTile.tsx | 1 - .../track/GiantTrackTileProgressInfo.tsx | 2 +- .../web/src/components/track/PlayPauseButton.tsx | 2 +- .../web/src/components/track/desktop/BottomRow.tsx | 1 - .../track/desktop/ConnectedPlaylistTile.tsx | 1 - .../track/desktop/ConnectedTrackTile.tsx | 1 - .../src/components/track/desktop/TrackListItem.tsx | 1 - .../web/src/components/track/desktop/TrackTile.tsx | 1 - .../track/desktop/stats/ProfileImage.tsx | 1 - .../src/components/track/desktop/stats/Stats.tsx | 1 - .../track/mobile/ConnectedPlaylistTile.tsx | 1 - .../track/mobile/ConnectedTrackListItem.tsx | 1 - .../components/track/mobile/ConnectedTrackTile.tsx | 1 - .../web/src/components/track/mobile/TrackTile.tsx | 1 - .../TransactionDetailsModal.tsx | 1 - .../components/TransactionDetailsContent.tsx | 2 +- .../components/TransactionPurchaseMetadata.tsx | 2 +- .../TrendingGenreSelectionPage.tsx | 2 +- .../UnfollowConfirmationModal.tsx | 2 +- .../src/components/unload-dialog/UnloadDialog.jsx | 1 - .../UploadConfirmationModal.tsx | 1 - .../USDCPurchaseDetailsModal.tsx | 2 +- .../components/SaleModalContent.tsx | 1 - .../USDCTransactionDetailsModal.tsx | 2 +- .../user-name-and-badges/UserNameAndBadges.tsx | 1 - .../withdraw-usdc-modal/WithdrawUSDCModal.tsx | 1 - .../components/CoinflowWithdrawModal.tsx | 1 - .../components/ConfirmTransferDetails.tsx | 1 - .../components/EnterTransferDetails.tsx | 1 - .../withdraw-usdc-modal/components/ErrorPage.tsx | 1 - .../components/PrepareTransfer.tsx | 1 - .../components/TransferSuccessful.tsx | 1 - .../ai-attributed-tracks-page/AiPageProvider.tsx | 8 +++----- .../pages/audio-rewards-page/AudioRewardsPage.tsx | 4 +--- .../audio-rewards-page/ChallengeRewardsTile.tsx | 14 ++++++-------- .../web/src/pages/audio-rewards-page/Tiers.tsx | 10 ++++------ .../web/src/pages/audio-rewards-page/Tiles.tsx | 2 -- .../audio-rewards-page/TrendingRewardsTile.tsx | 4 +--- .../src/pages/audio-rewards-page/WalletModal.tsx | 10 ++++------ .../components/ConnectWalletsBody.tsx | 2 -- .../components/RemoveWalletBody.tsx | 2 -- .../components/SendInputConfirmation.tsx | 4 +--- .../components/WalletActionsTile.tsx | 3 +-- .../components/WalletManagementTile.tsx | 10 ++++------ .../audio-rewards-page/components/WalletsTable.tsx | 8 +++----- .../components/modals/AudioBreakdownModal.tsx | 3 +-- .../AudioMatchingRewardsModalContent.tsx | 1 - .../ChallengeRewardsModal.tsx | 1 - .../components/modals/HCaptchaModal.tsx | 2 -- .../components/modals/TrendingRewards.tsx | 10 ++++------ .../components/modals/VipDiscordModal.tsx | 1 - packages/web/src/pages/check-page/CheckPage.tsx | 1 - .../CollectiblesPlaylistPageProvider.tsx | 1 - .../web/src/pages/dashboard-page/DashboardPage.tsx | 1 - .../web/src/pages/dashboard-page/store/sagas.ts | 2 +- .../src/pages/dashboard-page/store/selectors.ts | 2 +- .../deleted-page/store/lineups/more-by/reducer.ts | 3 +-- .../deleted-page/store/lineups/more-by/sagas.ts | 1 - packages/web/src/pages/deleted-page/store/slice.ts | 1 - .../web/src/pages/followers-page/FollowersPage.tsx | 2 -- .../src/pages/remixes-page/RemixesPageProvider.tsx | 8 +++----- .../sign-on/components/desktop/SignOnPage.tsx | 8 +++----- .../pages/sign-on/components/mobile/SignOnPage.tsx | 8 +++----- .../src/pages/supporting-page/SupportingPage.tsx | 2 -- .../pages/trending-page/TrendingPageProvider.jsx | 8 +++----- .../trending-page/components/RewardsBanner.tsx | 2 -- .../components/desktop/TrendingPageContent.tsx | 4 +--- .../components/mobile/TrendingPageContent.tsx | 4 +--- .../TrendingUndergroundPage.tsx | 1 - 308 files changed, 192 insertions(+), 380 deletions(-) diff --git a/packages/web/src/common/hooks/useModalState.ts b/packages/web/src/common/hooks/useModalState.ts index bc36e895684..4cd3aa45bb5 100644 --- a/packages/web/src/common/hooks/useModalState.ts +++ b/packages/web/src/common/hooks/useModalState.ts @@ -2,7 +2,6 @@ import { useCallback, useMemo } from 'react' import { modalsSelectors, modalsActions, Modals } from '@audius/common/store' -import {} from '@audius/common' import { useDispatch } from 'react-redux' import { useSelector } from './useSelector' diff --git a/packages/web/src/common/hooks/useSelector.ts b/packages/web/src/common/hooks/useSelector.ts index 6fb617aadba..9fb2ada9c7a 100644 --- a/packages/web/src/common/hooks/useSelector.ts +++ b/packages/web/src/common/hooks/useSelector.ts @@ -1,5 +1,5 @@ import { CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { useSelector as untypedUseSelector, TypedUseSelectorHook diff --git a/packages/web/src/common/store/account/sagas.js b/packages/web/src/common/store/account/sagas.js index 4830341f991..63214a3006f 100644 --- a/packages/web/src/common/store/account/sagas.js +++ b/packages/web/src/common/store/account/sagas.js @@ -7,7 +7,7 @@ import { solanaSelectors, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { ErrorLevel, Kind } from '@audius/common/models' import { FeatureFlags, diff --git a/packages/web/src/common/store/add-to-collection/sagas.ts b/packages/web/src/common/store/add-to-collection/sagas.ts index 966f1a5f660..96371505ff7 100644 --- a/packages/web/src/common/store/add-to-collection/sagas.ts +++ b/packages/web/src/common/store/add-to-collection/sagas.ts @@ -3,7 +3,7 @@ import { addToCollectionUIActions as actions, modalsActions } from '@audius/common/store' -import {} from '@audius/common' + import { takeEvery, put } from 'redux-saga/effects' import { requiresAccount } from 'common/utils/requiresAccount' diff --git a/packages/web/src/common/store/analytics/sagas.ts b/packages/web/src/common/store/analytics/sagas.ts index f3144755e9a..85f06e68863 100644 --- a/packages/web/src/common/store/analytics/sagas.ts +++ b/packages/web/src/common/store/analytics/sagas.ts @@ -1,5 +1,5 @@ import { getContext } from '@audius/common/store' -import {} from '@audius/common' + import { omit } from 'lodash' import { takeEvery, call } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/backend/sagas.ts b/packages/web/src/common/store/backend/sagas.ts index 497cc1aefa2..3968e2c15ef 100644 --- a/packages/web/src/common/store/backend/sagas.ts +++ b/packages/web/src/common/store/backend/sagas.ts @@ -4,7 +4,7 @@ import { reachabilitySelectors, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { put, all, diff --git a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts index 284216187d0..7a211dce54e 100644 --- a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts @@ -11,7 +11,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Kind, Collection, ID } from '@audius/common/models' import { makeUid, diff --git a/packages/web/src/common/store/cache/collections/commonSagas.js b/packages/web/src/common/store/cache/collections/commonSagas.js index 11847f4f04c..6cd9b804eea 100644 --- a/packages/web/src/common/store/cache/collections/commonSagas.js +++ b/packages/web/src/common/store/cache/collections/commonSagas.js @@ -15,7 +15,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, DefaultSizes, Kind } from '@audius/common/models' import { squashNewLines, diff --git a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js index 8e143373508..01f5127fd26 100644 --- a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js +++ b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js @@ -6,7 +6,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { makeKindId } from '@audius/common/utils' import { call, put } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts index 547d4283581..f14b0b0dd9f 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts @@ -3,7 +3,7 @@ import { cacheCollectionsSelectors, toastActions } from '@audius/common/store' -import {} from '@audius/common' + import { push } from 'connected-react-router' import { put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts index 9f16a0ce412..25b9ee56af7 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts @@ -15,7 +15,7 @@ import { EditPlaylistValues, RequestConfirmationError } from '@audius/common/store' -import {} from '@audius/common' + import { Name, DefaultSizes, diff --git a/packages/web/src/common/store/cache/collections/errorSagas.ts b/packages/web/src/common/store/cache/collections/errorSagas.ts index 62bc3f2b70d..3b31dba55b1 100644 --- a/packages/web/src/common/store/cache/collections/errorSagas.ts +++ b/packages/web/src/common/store/cache/collections/errorSagas.ts @@ -1,5 +1,4 @@ import { cacheCollectionsActions } from '@audius/common/store' -import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js b/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js index b421fa40295..291c4fa5bfa 100644 --- a/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js +++ b/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js @@ -3,7 +3,7 @@ import { cacheCollectionsSelectors, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { call, select } from 'redux-saga/effects' import { waitForWrite } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts index b780edb53fa..a2d4e81e169 100644 --- a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts @@ -4,7 +4,7 @@ import { reformatUser, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, UserCollectionMetadata } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { uniqBy } from 'lodash' diff --git a/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts b/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts index b02f1edae6a..a50b197afb7 100644 --- a/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts +++ b/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts @@ -1,5 +1,5 @@ import { getContext } from '@audius/common/store' -import {} from '@audius/common' + import { decodeHashId } from '@audius/common/utils' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts b/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts index f75d7689305..4059e1e9dcd 100644 --- a/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts +++ b/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts @@ -1,5 +1,5 @@ import { cacheActions } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, Collection } from '@audius/common/models' import { put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts index 67a560e28df..8b6bd2e8a46 100644 --- a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts @@ -3,7 +3,7 @@ import { reformatCollection, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, CollectionMetadata, diff --git a/packages/web/src/common/store/cache/sagas.js b/packages/web/src/common/store/cache/sagas.js index adc63704c39..4a99404b287 100644 --- a/packages/web/src/common/store/cache/sagas.js +++ b/packages/web/src/common/store/cache/sagas.js @@ -4,7 +4,7 @@ import { cacheSelectors, confirmerSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { Status } from '@audius/common/models' import { IntKeys, FeatureFlags } from '@audius/common/services' import { makeUids, getIdFromKindId } from '@audius/common/utils' diff --git a/packages/web/src/common/store/cache/store.test.js b/packages/web/src/common/store/cache/store.test.js index 4f4385e7346..6c02f858203 100644 --- a/packages/web/src/common/store/cache/store.test.js +++ b/packages/web/src/common/store/cache/store.test.js @@ -3,7 +3,7 @@ import { cacheConfig as config, cacheReducer } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, Status } from '@audius/common/models' import { makeKindId } from '@audius/common/utils' /* eslint-disable no-import-assign */ diff --git a/packages/web/src/common/store/cache/tracks/sagaHelpers.ts b/packages/web/src/common/store/cache/tracks/sagaHelpers.ts index 7f0f4ab57af..0962427105a 100644 --- a/packages/web/src/common/store/cache/tracks/sagaHelpers.ts +++ b/packages/web/src/common/store/cache/tracks/sagaHelpers.ts @@ -1,5 +1,5 @@ import { accountSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { Name, TrackAccessType, diff --git a/packages/web/src/common/store/cache/tracks/sagas.js b/packages/web/src/common/store/cache/tracks/sagas.js index 716a1518ce4..96c6ac89075 100644 --- a/packages/web/src/common/store/cache/tracks/sagas.js +++ b/packages/web/src/common/store/cache/tracks/sagas.js @@ -8,7 +8,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, DefaultSizes, SquareSizes, Kind } from '@audius/common/models' import { formatUrlName, diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts index 4f8d5834093..447184b223a 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts @@ -4,7 +4,7 @@ import { cacheActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, ID, UserTrackMetadata } from '@audius/common/models' import { removeNullable, waitForValue } from '@audius/common/utils' import { select, call, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts index a8278b5946f..2e9a4b15d7d 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts @@ -3,7 +3,7 @@ import { cacheActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, StemCategory, diff --git a/packages/web/src/common/store/cache/tracks/utils/helpers.ts b/packages/web/src/common/store/cache/tracks/utils/helpers.ts index 0c75eb6a378..c0ab6161269 100644 --- a/packages/web/src/common/store/cache/tracks/utils/helpers.ts +++ b/packages/web/src/common/store/cache/tracks/utils/helpers.ts @@ -4,7 +4,7 @@ import { reformatUser, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, TrackMetadata, User } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { uniqBy } from 'lodash' diff --git a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts index 6d656083964..cd7edca7a74 100644 --- a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts +++ b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts @@ -1,5 +1,5 @@ import { cacheActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, TrackMetadata, Track } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { put, call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts b/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts index 8d7fab8f9ca..c1d22950316 100644 --- a/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts +++ b/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts @@ -8,7 +8,7 @@ import { getContext, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, ID, diff --git a/packages/web/src/common/store/cache/users/sagas.js b/packages/web/src/common/store/cache/users/sagas.js index a2aa186b460..1e79145670c 100644 --- a/packages/web/src/common/store/cache/users/sagas.js +++ b/packages/web/src/common/store/cache/users/sagas.js @@ -6,7 +6,7 @@ import { reformatUser, cacheUsersSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { DefaultSizes, Kind } from '@audius/common/models' import { waitForValue, waitForAccount } from '@audius/common/utils' import { mergeWith } from 'lodash' diff --git a/packages/web/src/common/store/change-password/sagas.ts b/packages/web/src/common/store/change-password/sagas.ts index afe9c2d98f6..465c2d630e3 100644 --- a/packages/web/src/common/store/change-password/sagas.ts +++ b/packages/web/src/common/store/change-password/sagas.ts @@ -1,5 +1,5 @@ import { changePasswordActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Name } from '@audius/common/models' import { call, put, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/lineup/sagas.d.ts b/packages/web/src/common/store/lineup/sagas.d.ts index 68e5506c97b..9f78ec4b180 100644 --- a/packages/web/src/common/store/lineup/sagas.d.ts +++ b/packages/web/src/common/store/lineup/sagas.d.ts @@ -1,5 +1,5 @@ import { LineupBaseActions } from '@audius/common/store' -import {} from '@audius/common' + import { Collection, LineupState, LineupTrack } from '@audius/common/models' export class LineupSagas { diff --git a/packages/web/src/common/store/lineup/sagas.js b/packages/web/src/common/store/lineup/sagas.js index 3588be98638..dade7b18157 100644 --- a/packages/web/src/common/store/lineup/sagas.js +++ b/packages/web/src/common/store/lineup/sagas.js @@ -11,7 +11,7 @@ import { getContext, playerSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Kind, isContentUSDCPurchaseGated } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' import { Uid, makeUids, makeUid } from '@audius/common/utils' diff --git a/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts b/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts index 35a3cdfcdb3..485188afda6 100644 --- a/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts @@ -6,7 +6,7 @@ import { walletActions, Notification } from '@audius/common/store' -import {} from '@audius/common' + import { Dictionary } from '@reduxjs/toolkit' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/errorSagas.ts b/packages/web/src/common/store/notifications/errorSagas.ts index 36623ba7ef8..00fc7f0138e 100644 --- a/packages/web/src/common/store/notifications/errorSagas.ts +++ b/packages/web/src/common/store/notifications/errorSagas.ts @@ -2,7 +2,7 @@ import { notificationsActions, FetchNotificationsFailedAction } from '@audius/common/store' -import {} from '@audius/common' + import { ErrorLevel } from '@audius/common/models' import { put, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/notifications/fetchNotifications.ts b/packages/web/src/common/store/notifications/fetchNotifications.ts index 88368ed645c..84fa4b8cdb6 100644 --- a/packages/web/src/common/store/notifications/fetchNotifications.ts +++ b/packages/web/src/common/store/notifications/fetchNotifications.ts @@ -1,5 +1,5 @@ import { getContext } from '@audius/common/store' -import {} from '@audius/common' + import { IntKeys, FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' import { partition } from 'lodash' diff --git a/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts b/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts index 544001dd18e..a140005bd7f 100644 --- a/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts @@ -3,7 +3,7 @@ import { notificationsSelectors, FetchNotificationsAction } from '@audius/common/store' -import {} from '@audius/common' + import { getErrorMessage } from '@audius/common/utils' import { call, put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts index 2f9f95bc269..dc57e8ddaf4 100644 --- a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts +++ b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts @@ -6,7 +6,7 @@ import { reactionsUIActions, Notification } from '@audius/common/store' -import {} from '@audius/common' + import { ID, Remix, Track } from '@audius/common/models' import { waitForAccount, waitForRead } from '@audius/common/utils' import moment from 'moment' diff --git a/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts b/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts index 286ccb25ea4..340d5c38eab 100644 --- a/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts @@ -1,5 +1,5 @@ import { notificationsActions } from '@audius/common/store' -import {} from '@audius/common' + import { getErrorMessage } from '@audius/common/utils' import { call, put, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/sagas.ts b/packages/web/src/common/store/notifications/sagas.ts index bb4f8a96d88..2c8314e81df 100644 --- a/packages/web/src/common/store/notifications/sagas.ts +++ b/packages/web/src/common/store/notifications/sagas.ts @@ -1,5 +1,5 @@ import { notificationsActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { IntKeys, remoteConfigIntDefaults, diff --git a/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts index 32be1f9101f..50d6aa9ec97 100644 --- a/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts @@ -6,7 +6,7 @@ import { getContext, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { call, put, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/ai/sagas.ts b/packages/web/src/common/store/pages/ai/sagas.ts index 82ff7a03ec0..72806c0185b 100644 --- a/packages/web/src/common/store/pages/ai/sagas.ts +++ b/packages/web/src/common/store/pages/ai/sagas.ts @@ -1,5 +1,5 @@ import { aiPageActions, FetchAiUserAction } from '@audius/common/store' -import {} from '@audius/common' + import { User } from '@audius/common/models' import { Maybe } from '@audius/common/utils' import { takeEvery, call, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/audio-rewards/sagas.ts b/packages/web/src/common/store/pages/audio-rewards/sagas.ts index 46895fc9c87..0d2807f723a 100644 --- a/packages/web/src/common/store/pages/audio-rewards/sagas.ts +++ b/packages/web/src/common/store/pages/audio-rewards/sagas.ts @@ -12,7 +12,7 @@ import { musicConfettiActions, UndisbursedUserChallenge } from '@audius/common/store' -import {} from '@audius/common' + import { FailureReason, UserChallenge, diff --git a/packages/web/src/common/store/pages/audio-rewards/store.test.ts b/packages/web/src/common/store/pages/audio-rewards/store.test.ts index 4abd8dd5a01..befd3da3293 100644 --- a/packages/web/src/common/store/pages/audio-rewards/store.test.ts +++ b/packages/web/src/common/store/pages/audio-rewards/store.test.ts @@ -9,7 +9,7 @@ import { modalsActions, AudioRewardsClaim } from '@audius/common/store' -import {} from '@audius/common' + import { FailureReason, UserChallenge, diff --git a/packages/web/src/common/store/pages/audio-transactions/sagas.ts b/packages/web/src/common/store/pages/audio-transactions/sagas.ts index 6cf5e32b889..e48b211aeb3 100644 --- a/packages/web/src/common/store/pages/audio-transactions/sagas.ts +++ b/packages/web/src/common/store/pages/audio-transactions/sagas.ts @@ -7,7 +7,7 @@ import { InAppAudioPurchaseMetadata, TransactionDetails } from '@audius/common/store' -import {} from '@audius/common' + import type {} from '@audius/common' import { StringAudio } from '@audius/common/models' import { formatDate, Nullable } from '@audius/common/utils' diff --git a/packages/web/src/common/store/pages/collection/lineups/sagas.js b/packages/web/src/common/store/pages/collection/lineups/sagas.js index 3701ac774c8..cce5c7f9521 100644 --- a/packages/web/src/common/store/pages/collection/lineups/sagas.js +++ b/packages/web/src/common/store/pages/collection/lineups/sagas.js @@ -4,7 +4,7 @@ import { collectionPageSelectors, queueSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { removeNullable, Uid, waitForValue } from '@audius/common/utils' import { keyBy } from 'lodash' diff --git a/packages/web/src/common/store/pages/collection/sagas.js b/packages/web/src/common/store/pages/collection/sagas.js index 19a7d8abf42..285109a249f 100644 --- a/packages/web/src/common/store/pages/collection/sagas.js +++ b/packages/web/src/common/store/pages/collection/sagas.js @@ -5,7 +5,7 @@ import { collectionPageActions as collectionActions, reachabilitySelectors } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/common/store/pages/deactivate-account/sagas.ts b/packages/web/src/common/store/pages/deactivate-account/sagas.ts index cc68c3de77f..4ef89137fa1 100644 --- a/packages/web/src/common/store/pages/deactivate-account/sagas.ts +++ b/packages/web/src/common/store/pages/deactivate-account/sagas.ts @@ -7,7 +7,7 @@ import { confirmerSelectors, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Name } from '@audius/common/models' import { waitForValue } from '@audius/common/utils' import { call, delay, put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts b/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts index 8948eeb914b..b397880501e 100644 --- a/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts +++ b/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts @@ -4,7 +4,7 @@ import { ExploreCollectionsVariant, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Collection, UserCollectionMetadata } from '@audius/common/models' import { uniq } from 'lodash' import { takeEvery, call, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/explore/sagas.ts b/packages/web/src/common/store/pages/explore/sagas.ts index 5571fa9687d..d81096585b6 100644 --- a/packages/web/src/common/store/pages/explore/sagas.ts +++ b/packages/web/src/common/store/pages/explore/sagas.ts @@ -3,7 +3,7 @@ import { explorePageActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { ID } from '@audius/common/models' import { call, put, takeEvery, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/feed/lineup/sagas.ts b/packages/web/src/common/store/pages/feed/lineup/sagas.ts index 117567531f1..b9ecc834378 100644 --- a/packages/web/src/common/store/pages/feed/lineup/sagas.ts +++ b/packages/web/src/common/store/pages/feed/lineup/sagas.ts @@ -5,7 +5,7 @@ import { getContext, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { FeedFilter, Kind, diff --git a/packages/web/src/common/store/pages/feed/sagas.ts b/packages/web/src/common/store/pages/feed/sagas.ts index 302d1576c42..3d8318d46dc 100644 --- a/packages/web/src/common/store/pages/feed/sagas.ts +++ b/packages/web/src/common/store/pages/feed/sagas.ts @@ -3,7 +3,7 @@ import { feedPageActions as discoverActions, usersSocialActions as socialActions } from '@audius/common/store' -import {} from '@audius/common' + import { FollowSource, ID } from '@audius/common/models' import { getErrorMessage } from '@audius/common/utils' import { call, put, take, fork, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/history/lineups/sagas.js b/packages/web/src/common/store/pages/history/lineups/sagas.js index 3e378396ad7..2d6e5ad0b4b 100644 --- a/packages/web/src/common/store/pages/history/lineups/sagas.js +++ b/packages/web/src/common/store/pages/history/lineups/sagas.js @@ -2,7 +2,7 @@ import { accountSelectors, historyPageTracksLineupActions as tracksActions } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { keyBy } from 'lodash' import { call, getContext, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts index 3c5284e83d3..9588638fa43 100644 --- a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts @@ -4,7 +4,7 @@ import { premiumTracksPageLineupActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { call, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts index 7a7297839e7..0adb96a41cd 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts +++ b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts @@ -1,5 +1,5 @@ import { getContext } from '@audius/common/store' -import {} from '@audius/common' + import { UserCollection, ID, diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js index 7a932ba30b8..3c10df5af3e 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js +++ b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js @@ -8,7 +8,7 @@ import { tracksSocialActions, confirmerSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { makeUid, diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts index 703edc942b5..0c9ddd19c47 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts @@ -1,5 +1,5 @@ import { getContext } from '@audius/common/store' -import {} from '@audius/common' + import { ID, Track } from '@audius/common/models' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts index 91fc09d00c9..5fcee23bbcf 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts @@ -4,7 +4,7 @@ import { profilePageSelectors, uploadActions } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts index 318b440b575..f98ce1f6681 100644 --- a/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts @@ -6,7 +6,7 @@ import { getContext, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { call, put, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/remixes-page/sagas.ts b/packages/web/src/common/store/pages/remixes-page/sagas.ts index af8a904cbf8..5145e561d1c 100644 --- a/packages/web/src/common/store/pages/remixes-page/sagas.ts +++ b/packages/web/src/common/store/pages/remixes-page/sagas.ts @@ -1,5 +1,5 @@ import { remixesPageActions } from '@audius/common/store' -import {} from '@audius/common' + import { TrackMetadata, Track } from '@audius/common/models' import { takeEvery, call, put } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/saved/lineups/sagas.js b/packages/web/src/common/store/pages/saved/lineups/sagas.js index 536a96880af..aca3a54f0ae 100644 --- a/packages/web/src/common/store/pages/saved/lineups/sagas.js +++ b/packages/web/src/common/store/pages/saved/lineups/sagas.js @@ -14,7 +14,7 @@ import { purchaseContentActions, ContentType } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { uniq } from 'lodash' diff --git a/packages/web/src/common/store/pages/saved/sagas.ts b/packages/web/src/common/store/pages/saved/sagas.ts index 857dd1280f4..aaba2d35402 100644 --- a/packages/web/src/common/store/pages/saved/sagas.ts +++ b/packages/web/src/common/store/pages/saved/sagas.ts @@ -6,7 +6,7 @@ import { getContext, LibraryCategoryType } from '@audius/common/store' -import {} from '@audius/common' + import { FavoriteType, Favorite, diff --git a/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js b/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js index 5943f15c661..f6b011fdd31 100644 --- a/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js +++ b/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js @@ -4,7 +4,7 @@ import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' -import {} from '@audius/common' + import { trimToAlphaNumeric } from '@audius/common/utils' import { select, all, call, getContext } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/search-page/sagas.js b/packages/web/src/common/store/pages/search-page/sagas.js index cbb4b2dd2af..e5c0a097182 100644 --- a/packages/web/src/common/store/pages/search-page/sagas.js +++ b/packages/web/src/common/store/pages/search-page/sagas.js @@ -5,7 +5,7 @@ import { searchResultsPageActions as searchPageActions, SearchKind } from '@audius/common/store' -import {} from '@audius/common' + import { FeatureFlags } from '@audius/common/services' import { trimToAlphaNumeric, removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' diff --git a/packages/web/src/common/store/pages/settings/errorSagas.ts b/packages/web/src/common/store/pages/settings/errorSagas.ts index 2118a8d0ae5..39ff1a34c35 100644 --- a/packages/web/src/common/store/pages/settings/errorSagas.ts +++ b/packages/web/src/common/store/pages/settings/errorSagas.ts @@ -1,5 +1,4 @@ import { settingsPageActions as actions } from '@audius/common/store' -import {} from '@audius/common' import { createErrorSagas } from '../../../../utils/errorSagas' diff --git a/packages/web/src/common/store/pages/settings/sagas.ts b/packages/web/src/common/store/pages/settings/sagas.ts index 469791a4dcf..69b8c6ef2f3 100644 --- a/packages/web/src/common/store/pages/settings/sagas.ts +++ b/packages/web/src/common/store/pages/settings/sagas.ts @@ -4,7 +4,7 @@ import { settingsPageActions as actions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { getErrorMessage } from '@audius/common/utils' import { call, put, takeEvery, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/signon/actions.ts b/packages/web/src/common/store/pages/signon/actions.ts index 763e442f064..d17f9b47aaf 100644 --- a/packages/web/src/common/store/pages/signon/actions.ts +++ b/packages/web/src/common/store/pages/signon/actions.ts @@ -4,7 +4,7 @@ import { TikTokProfile, Image } from '@audius/common/store' -import {} from '@audius/common' + import { ID, User } from '@audius/common/models' import { createCustomAction } from 'typesafe-actions' diff --git a/packages/web/src/common/store/pages/signon/sagas.js b/packages/web/src/common/store/pages/signon/sagas.js index a0e0768e95b..a4a08a6e5d9 100644 --- a/packages/web/src/common/store/pages/signon/sagas.js +++ b/packages/web/src/common/store/pages/signon/sagas.js @@ -12,7 +12,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, FavoriteSource } from '@audius/common/models' import { IntKeys, diff --git a/packages/web/src/common/store/pages/signon/selectors.ts b/packages/web/src/common/store/pages/signon/selectors.ts index b0e58ff32d1..8103b4deee9 100644 --- a/packages/web/src/common/store/pages/signon/selectors.ts +++ b/packages/web/src/common/store/pages/signon/selectors.ts @@ -1,5 +1,5 @@ import { accountSelectors, cacheUsersSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { createSelector } from 'reselect' import { AppState } from 'store/types' diff --git a/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts b/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts index 264d6d3e551..f9aa86442df 100644 --- a/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts +++ b/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts @@ -7,7 +7,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, User } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts index 97ff9f39d2d..f958fe760d9 100644 --- a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts @@ -4,7 +4,7 @@ import { tokenDashboardPageActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Chain } from '@audius/common/models' import { newUserMetadata } from '@audius/common/schemas' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts index 646dcaad2df..cd91f29bcc1 100644 --- a/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts @@ -3,7 +3,7 @@ import { tokenDashboardPageActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Chain } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts b/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts index 30185d49956..a702a0a9fa8 100644 --- a/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts +++ b/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts @@ -1,5 +1,5 @@ import { accountSelectors, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { select, call } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts b/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts index 1b957dd8e40..10ab605bfea 100644 --- a/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts +++ b/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts @@ -1,5 +1,5 @@ import { getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Chain } from '@audius/common/models' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts index 6e6034d6d81..0ecb629d123 100644 --- a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts +++ b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts @@ -8,7 +8,7 @@ import { confirmTransaction, ConfirmRemoveWalletAction } from '@audius/common/store' -import {} from '@audius/common' + import { Chain, Kind } from '@audius/common/models' import { newUserMetadata } from '@audius/common/schemas' import { call, fork, put, select, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/token-dashboard/sagas.ts b/packages/web/src/common/store/pages/token-dashboard/sagas.ts index 6facc04aa3b..866688fb15a 100644 --- a/packages/web/src/common/store/pages/token-dashboard/sagas.ts +++ b/packages/web/src/common/store/pages/token-dashboard/sagas.ts @@ -3,7 +3,7 @@ import { tokenDashboardPageActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Chain, CollectibleState } from '@audius/common/models' import { call, put, select, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/track/lineups/sagas.ts b/packages/web/src/common/store/pages/track/lineups/sagas.ts index 87f1d9ad440..cb417281edd 100644 --- a/packages/web/src/common/store/pages/track/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/track/lineups/sagas.ts @@ -4,7 +4,7 @@ import { trackPageLineupActions, trackPageSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { waitForValue } from '@audius/common/utils' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/track/sagas.js b/packages/web/src/common/store/pages/track/sagas.js index e78d55948a3..c6ee19c0a16 100644 --- a/packages/web/src/common/store/pages/track/sagas.js +++ b/packages/web/src/common/store/pages/track/sagas.js @@ -7,7 +7,7 @@ import { trackPageSelectors, reachabilitySelectors } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { makeUid } from '@audius/common/utils' diff --git a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts index dff1da318c1..f5cf44a46c8 100644 --- a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts @@ -4,7 +4,7 @@ import { trendingPlaylistsPageLineupActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { UserCollectionMetadata } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { keccak_256 } from 'js-sha3' diff --git a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts index 5a41d646dda..f7614267f2c 100644 --- a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts @@ -4,7 +4,7 @@ import { trendingUndergroundPageLineupActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { StringKeys } from '@audius/common/services' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts index f717c7ebb2d..2cb37e84f32 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts +++ b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts @@ -5,7 +5,7 @@ import { trendingPageSelectors, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { TimeRange, ID, Track, UserTrackMetadata } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { Genre, Nullable } from '@audius/common/utils' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js b/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js index 68dc31e75d1..943d35372ec 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js +++ b/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js @@ -3,7 +3,7 @@ import { trendingPageLineupActions, trendingPageSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { TimeRange } from '@audius/common/models' import { select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/player/errorSagas.ts b/packages/web/src/common/store/player/errorSagas.ts index 21042332ca2..d5f34a2cc8f 100644 --- a/packages/web/src/common/store/player/errorSagas.ts +++ b/packages/web/src/common/store/player/errorSagas.ts @@ -1,5 +1,4 @@ import { playerActions } from '@audius/common/store' -import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/player/sagas.ts b/packages/web/src/common/store/player/sagas.ts index 0b889568c14..58514b5b328 100644 --- a/packages/web/src/common/store/player/sagas.ts +++ b/packages/web/src/common/store/player/sagas.ts @@ -12,7 +12,7 @@ import { playbackPositionSelectors, gatedContentSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { FeatureFlags, QueryParams } from '@audius/common/services' import { diff --git a/packages/web/src/common/store/player/store.test.js b/packages/web/src/common/store/player/store.test.js index 3f7e391db0f..598ee5b67ef 100644 --- a/packages/web/src/common/store/player/store.test.js +++ b/packages/web/src/common/store/player/store.test.js @@ -1,5 +1,5 @@ import { playerReducer, playerActions } from '@audius/common/store' -import {} from '@audius/common' + import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import { describe, it, expect, vitest } from 'vitest' diff --git a/packages/web/src/common/store/playlist-library/sagas.ts b/packages/web/src/common/store/playlist-library/sagas.ts index 3baeb67e20b..5f2515145e6 100644 --- a/packages/web/src/common/store/playlist-library/sagas.ts +++ b/packages/web/src/common/store/playlist-library/sagas.ts @@ -5,7 +5,7 @@ import { playlistLibraryHelpers, AccountCollection } from '@audius/common/store' -import {} from '@audius/common' + import { Kind, PlaylistLibraryID, diff --git a/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts b/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts index b56156e3ec0..3245514dae8 100644 --- a/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts +++ b/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts @@ -7,7 +7,7 @@ import { AddToFolderAction, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { Name, FavoriteSource } from '@audius/common/models' import { takeEvery, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts b/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts index a8086865588..ab2b1f8c249 100644 --- a/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts +++ b/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts @@ -6,7 +6,7 @@ import { ReorderAction, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { Name, FavoriteSource } from '@audius/common/models' import { takeEvery, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts index f81ee028fb6..7b117ca48c0 100644 --- a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts +++ b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts @@ -3,7 +3,7 @@ import { getContext, playlistUpdatesActions } from '@audius/common/store' -import {} from '@audius/common' + import { IntKeys, remoteConfigIntDefaults } from '@audius/common/services' import { call, fork, take } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/recommendation/sagas.ts b/packages/web/src/common/store/recommendation/sagas.ts index 61fd53978db..573b5d2bf81 100644 --- a/packages/web/src/common/store/recommendation/sagas.ts +++ b/packages/web/src/common/store/recommendation/sagas.ts @@ -1,5 +1,5 @@ import { getContext } from '@audius/common/store' -import {} from '@audius/common' + import { ID } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/recovery-email/sagas.ts b/packages/web/src/common/store/recovery-email/sagas.ts index cecf918e532..a0482442119 100644 --- a/packages/web/src/common/store/recovery-email/sagas.ts +++ b/packages/web/src/common/store/recovery-email/sagas.ts @@ -1,5 +1,5 @@ import { recoveryEmailActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Name } from '@audius/common/models' import { takeLatest, put, call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/remix-settings/sagas.ts b/packages/web/src/common/store/remix-settings/sagas.ts index 582a1944947..1392184c20a 100644 --- a/packages/web/src/common/store/remix-settings/sagas.ts +++ b/packages/web/src/common/store/remix-settings/sagas.ts @@ -1,5 +1,5 @@ import { getContext, remixSettingsActions } from '@audius/common/store' -import {} from '@audius/common' + import { TrackMetadata, Track } from '@audius/common/models' import { takeLatest, call, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/search-ai-bar/sagas.ts b/packages/web/src/common/store/search-ai-bar/sagas.ts index 5436ff42095..6dd600df455 100644 --- a/packages/web/src/common/store/search-ai-bar/sagas.ts +++ b/packages/web/src/common/store/search-ai-bar/sagas.ts @@ -1,5 +1,5 @@ import { accountSelectors, SearchKind, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Name } from '@audius/common/models' import { removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' diff --git a/packages/web/src/common/store/search-bar/sagas.ts b/packages/web/src/common/store/search-bar/sagas.ts index 103615ed8cb..bf381d32c4f 100644 --- a/packages/web/src/common/store/search-bar/sagas.ts +++ b/packages/web/src/common/store/search-bar/sagas.ts @@ -1,5 +1,5 @@ import { accountSelectors, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Name } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { removeNullable } from '@audius/common/utils' diff --git a/packages/web/src/common/store/smart-collection/sagas.ts b/packages/web/src/common/store/smart-collection/sagas.ts index c533bf0cac8..ba278091467 100644 --- a/packages/web/src/common/store/smart-collection/sagas.ts +++ b/packages/web/src/common/store/smart-collection/sagas.ts @@ -5,7 +5,7 @@ import { collectionPageActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { SmartCollectionVariant, Track, diff --git a/packages/web/src/common/store/social/collections/errorSagas.ts b/packages/web/src/common/store/social/collections/errorSagas.ts index 80e61453cc7..06345ed7987 100644 --- a/packages/web/src/common/store/social/collections/errorSagas.ts +++ b/packages/web/src/common/store/social/collections/errorSagas.ts @@ -1,5 +1,4 @@ import { collectionsSocialActions as socialCollectionActions } from '@audius/common/store' -import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/social/collections/sagas.ts b/packages/web/src/common/store/social/collections/sagas.ts index 50890bf8a06..1545da7929c 100644 --- a/packages/web/src/common/store/social/collections/sagas.ts +++ b/packages/web/src/common/store/social/collections/sagas.ts @@ -14,7 +14,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Kind, diff --git a/packages/web/src/common/store/social/collections/store.test.js b/packages/web/src/common/store/social/collections/store.test.js index 0b00c062e28..c637e29cf27 100644 --- a/packages/web/src/common/store/social/collections/store.test.js +++ b/packages/web/src/common/store/social/collections/store.test.js @@ -2,7 +2,7 @@ import { cacheActions, collectionsSocialActions as actions } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/social/tracks/errorSagas.ts b/packages/web/src/common/store/social/tracks/errorSagas.ts index be757c44296..c21a0b89838 100644 --- a/packages/web/src/common/store/social/tracks/errorSagas.ts +++ b/packages/web/src/common/store/social/tracks/errorSagas.ts @@ -1,5 +1,4 @@ import { tracksSocialActions as socialTrackActions } from '@audius/common/store' -import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/social/tracks/recordListen.ts b/packages/web/src/common/store/social/tracks/recordListen.ts index f0d3460f2ed..ee1bc8fa4b0 100644 --- a/packages/web/src/common/store/social/tracks/recordListen.ts +++ b/packages/web/src/common/store/social/tracks/recordListen.ts @@ -5,7 +5,7 @@ import { tracksSocialActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Name } from '@audius/common/models' import { call, put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/social/tracks/sagas.ts b/packages/web/src/common/store/social/tracks/sagas.ts index f47c4bd46c0..02a15885419 100644 --- a/packages/web/src/common/store/social/tracks/sagas.ts +++ b/packages/web/src/common/store/social/tracks/sagas.ts @@ -9,7 +9,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Kind, ID, Track, User } from '@audius/common/models' import { FeatureFlags, QueryParams } from '@audius/common/services' import { diff --git a/packages/web/src/common/store/social/tracks/store.test.js b/packages/web/src/common/store/social/tracks/store.test.js index aa562c8e006..c075171e205 100644 --- a/packages/web/src/common/store/social/tracks/store.test.js +++ b/packages/web/src/common/store/social/tracks/store.test.js @@ -2,7 +2,7 @@ import { cacheActions, tracksSocialActions as actions } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/social/users/errorSagas.ts b/packages/web/src/common/store/social/users/errorSagas.ts index 184354be06f..ae21f2eb62c 100644 --- a/packages/web/src/common/store/social/users/errorSagas.ts +++ b/packages/web/src/common/store/social/users/errorSagas.ts @@ -1,5 +1,4 @@ import { usersSocialActions as socialUserActions } from '@audius/common/store' -import {} from '@audius/common' import { createErrorSagas } from 'utils/errorSagas' diff --git a/packages/web/src/common/store/social/users/sagas.ts b/packages/web/src/common/store/social/users/sagas.ts index 779ff66b1e4..849f609d057 100644 --- a/packages/web/src/common/store/social/users/sagas.ts +++ b/packages/web/src/common/store/social/users/sagas.ts @@ -8,7 +8,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Kind, ID } from '@audius/common/models' import { makeKindId } from '@audius/common/utils' import { call, select, takeEvery, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/social/users/store.test.js b/packages/web/src/common/store/social/users/store.test.js index 9c178e3e03c..4bb42b5fc39 100644 --- a/packages/web/src/common/store/social/users/store.test.js +++ b/packages/web/src/common/store/social/users/store.test.js @@ -2,7 +2,7 @@ import { cacheActions, usersSocialActions as actions } from '@audius/common/store' -import {} from '@audius/common' + import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' diff --git a/packages/web/src/common/store/tipping/sagas.ts b/packages/web/src/common/store/tipping/sagas.ts index 227238a585c..57a8aeef623 100644 --- a/packages/web/src/common/store/tipping/sagas.ts +++ b/packages/web/src/common/store/tipping/sagas.ts @@ -11,7 +11,7 @@ import { getContext, RefreshSupportPayloadAction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Kind, diff --git a/packages/web/src/common/store/ui/reactions/sagas.ts b/packages/web/src/common/store/ui/reactions/sagas.ts index 058e81669c1..5d1a78792f0 100644 --- a/packages/web/src/common/store/ui/reactions/sagas.ts +++ b/packages/web/src/common/store/ui/reactions/sagas.ts @@ -5,7 +5,7 @@ import { getReactionFromRawValue, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { AudiusBackend } from '@audius/common/services' import { getErrorMessage, removeNullable } from '@audius/common/utils' import { call, takeEvery, all, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/upload/errorSagas.ts b/packages/web/src/common/store/upload/errorSagas.ts index 4cb298e80e0..c56cd82e440 100644 --- a/packages/web/src/common/store/upload/errorSagas.ts +++ b/packages/web/src/common/store/upload/errorSagas.ts @@ -1,5 +1,5 @@ import { uploadActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/upload/sagaHelpers.ts b/packages/web/src/common/store/upload/sagaHelpers.ts index 44d76a9fcf9..c5e3982bfad 100644 --- a/packages/web/src/common/store/upload/sagaHelpers.ts +++ b/packages/web/src/common/store/upload/sagaHelpers.ts @@ -3,7 +3,7 @@ import { getUSDCUserBank, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Name, isContentCollectibleGated, diff --git a/packages/web/src/common/store/upload/sagas.js b/packages/web/src/common/store/upload/sagas.js index 21794a9115b..548610623d8 100644 --- a/packages/web/src/common/store/upload/sagas.js +++ b/packages/web/src/common/store/upload/sagas.js @@ -13,7 +13,7 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Kind } from '@audius/common/models' import { formatUrlName, diff --git a/packages/web/src/common/store/user-list/favorites/errorSagas.ts b/packages/web/src/common/store/user-list/favorites/errorSagas.ts index e1a82ce3252..b000654e2e9 100644 --- a/packages/web/src/common/store/user-list/favorites/errorSagas.ts +++ b/packages/web/src/common/store/user-list/favorites/errorSagas.ts @@ -1,5 +1,5 @@ import { favoritesUserListActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/favorites/sagas.ts b/packages/web/src/common/store/user-list/favorites/sagas.ts index 50817a10147..5cbebdf9dfa 100644 --- a/packages/web/src/common/store/user-list/favorites/sagas.ts +++ b/packages/web/src/common/store/user-list/favorites/sagas.ts @@ -6,7 +6,7 @@ import { favoritesUserListSelectors, FAVORITES_USER_LIST_TAG } from '@audius/common/store' -import {} from '@audius/common' + import { FavoriteType, Collection, ID, Track } from '@audius/common/models' import { select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/followers/errorSagas.ts b/packages/web/src/common/store/user-list/followers/errorSagas.ts index e66b4b3e67f..f37e41df6ef 100644 --- a/packages/web/src/common/store/user-list/followers/errorSagas.ts +++ b/packages/web/src/common/store/user-list/followers/errorSagas.ts @@ -1,5 +1,5 @@ import { followersUserListActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/followers/sagas.ts b/packages/web/src/common/store/user-list/followers/sagas.ts index 41edd1752bc..1e639d8d015 100644 --- a/packages/web/src/common/store/user-list/followers/sagas.ts +++ b/packages/web/src/common/store/user-list/followers/sagas.ts @@ -5,7 +5,7 @@ import { followersUserListSelectors, FOLLOWERS_USER_LIST_TAG as USER_LIST_TAG } from '@audius/common/store' -import {} from '@audius/common' + import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/following/errorSagas.ts b/packages/web/src/common/store/user-list/following/errorSagas.ts index ea84f1054f8..9dee28aea7a 100644 --- a/packages/web/src/common/store/user-list/following/errorSagas.ts +++ b/packages/web/src/common/store/user-list/following/errorSagas.ts @@ -1,5 +1,5 @@ import { followingUserListActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/following/sagas.ts b/packages/web/src/common/store/user-list/following/sagas.ts index 456c582ac11..117a343fb60 100644 --- a/packages/web/src/common/store/user-list/following/sagas.ts +++ b/packages/web/src/common/store/user-list/following/sagas.ts @@ -5,7 +5,7 @@ import { followingUserListSelectors, FOLLOWING_USER_LIST_TAG } from '@audius/common/store' -import {} from '@audius/common' + import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/mutuals/errorSagas.ts b/packages/web/src/common/store/user-list/mutuals/errorSagas.ts index 6bcfaea0b44..c1a1028f8ed 100644 --- a/packages/web/src/common/store/user-list/mutuals/errorSagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/errorSagas.ts @@ -1,5 +1,5 @@ import { mutualsUserListActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/mutuals/sagas.ts b/packages/web/src/common/store/user-list/mutuals/sagas.ts index 35f1e081a3e..944ce0349bb 100644 --- a/packages/web/src/common/store/user-list/mutuals/sagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/sagas.ts @@ -5,7 +5,7 @@ import { mutualsUserListSelectors, MUTUALS_USER_LIST_TAG } from '@audius/common/store' -import {} from '@audius/common' + import { ID, User } from '@audius/common/models' import { AudiusBackend } from '@audius/common/services' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/notifications/errorSagas.ts b/packages/web/src/common/store/user-list/notifications/errorSagas.ts index 73296be7591..6c66560e28a 100644 --- a/packages/web/src/common/store/user-list/notifications/errorSagas.ts +++ b/packages/web/src/common/store/user-list/notifications/errorSagas.ts @@ -1,5 +1,5 @@ import { notificationsUserListActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/notifications/sagas.ts b/packages/web/src/common/store/user-list/notifications/sagas.ts index d98a6cb43c8..e6b475fdca0 100644 --- a/packages/web/src/common/store/user-list/notifications/sagas.ts +++ b/packages/web/src/common/store/user-list/notifications/sagas.ts @@ -5,7 +5,7 @@ import { notificationsUserListSelectors, NOTIFICATIONS_USER_LIST_TAG as USER_LIST_TAG } from '@audius/common/store' -import {} from '@audius/common' + import { call, put, select } from 'typed-redux-saga' import { fetchUsers as retrieveUsers } from 'common/store/cache/users/sagas' diff --git a/packages/web/src/common/store/user-list/related-artists/errorSagas.ts b/packages/web/src/common/store/user-list/related-artists/errorSagas.ts index fe26b189375..a839d22dd59 100644 --- a/packages/web/src/common/store/user-list/related-artists/errorSagas.ts +++ b/packages/web/src/common/store/user-list/related-artists/errorSagas.ts @@ -1,5 +1,5 @@ import { relatedArtistsUserListActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/related-artists/sagas.ts b/packages/web/src/common/store/user-list/related-artists/sagas.ts index 3b5f46da67e..1cb5e1b06f7 100644 --- a/packages/web/src/common/store/user-list/related-artists/sagas.ts +++ b/packages/web/src/common/store/user-list/related-artists/sagas.ts @@ -5,7 +5,7 @@ import { RELATED_ARTISTS_USER_LIST_TAG, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { ID } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/reposts/errorSagas.ts b/packages/web/src/common/store/user-list/reposts/errorSagas.ts index d7d3f7b366f..0c23e8e69e1 100644 --- a/packages/web/src/common/store/user-list/reposts/errorSagas.ts +++ b/packages/web/src/common/store/user-list/reposts/errorSagas.ts @@ -1,5 +1,5 @@ import { repostsUserListActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/reposts/sagas.ts b/packages/web/src/common/store/user-list/reposts/sagas.ts index 288cd09ce2d..dad8468c4da 100644 --- a/packages/web/src/common/store/user-list/reposts/sagas.ts +++ b/packages/web/src/common/store/user-list/reposts/sagas.ts @@ -7,7 +7,7 @@ import { RepostType, REPOSTS_USER_LIST_TAG } from '@audius/common/store' -import {} from '@audius/common' + import { Collection, ID, Track } from '@audius/common/models' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/supporting/errorSagas.ts b/packages/web/src/common/store/user-list/supporting/errorSagas.ts index 88fc15cb3c0..c40bc383156 100644 --- a/packages/web/src/common/store/user-list/supporting/errorSagas.ts +++ b/packages/web/src/common/store/user-list/supporting/errorSagas.ts @@ -1,5 +1,5 @@ import { supportingUserListActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/supporting/sagas.ts b/packages/web/src/common/store/user-list/supporting/sagas.ts index 6855f41ef4f..e2e8a49aa3f 100644 --- a/packages/web/src/common/store/user-list/supporting/sagas.ts +++ b/packages/web/src/common/store/user-list/supporting/sagas.ts @@ -7,7 +7,7 @@ import { SUPPORTING_USER_LIST_TAG, SupportingMapForUser } from '@audius/common/store' -import {} from '@audius/common' + import { ID, UserMetadata, User } from '@audius/common/models' import { responseAdapter as adapter, diff --git a/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts b/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts index 32df929fb97..aa2ffdf75a2 100644 --- a/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts @@ -1,5 +1,5 @@ import { topSupportersUserListActions } from '@audius/common/store' -import {} from '@audius/common' + import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/top-supporters/sagas.ts b/packages/web/src/common/store/user-list/top-supporters/sagas.ts index 271ece7dd41..4aa0c4d84be 100644 --- a/packages/web/src/common/store/user-list/top-supporters/sagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/sagas.ts @@ -7,7 +7,7 @@ import { TOP_SUPPORTERS_USER_LIST_TAG, SupportersMapForUser } from '@audius/common/store' -import {} from '@audius/common' + import { ID, User } from '@audius/common/models' import { responseAdapter as adapter, diff --git a/packages/web/src/common/store/user-list/utils.ts b/packages/web/src/common/store/user-list/utils.ts index 5b950d738d8..006ec76fbf4 100644 --- a/packages/web/src/common/store/user-list/utils.ts +++ b/packages/web/src/common/store/user-list/utils.ts @@ -3,7 +3,7 @@ import { processAndCacheUsers, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { ID, UserMetadata, User } from '@audius/common/models' import { AudiusAPIClient, AudiusBackend } from '@audius/common/services' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/wallet/sagas.ts b/packages/web/src/common/store/wallet/sagas.ts index 11235e98925..4f62a19c6fb 100644 --- a/packages/web/src/common/store/wallet/sagas.ts +++ b/packages/web/src/common/store/wallet/sagas.ts @@ -8,7 +8,7 @@ import { getContext, InputSendDataAction } from '@audius/common/store' -import {} from '@audius/common' + import { Name, Chain, diff --git a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx index a6de1f798de..668dcedffcc 100644 --- a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx +++ b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx @@ -7,7 +7,6 @@ import { import { useCallback, useEffect, useState } from 'react' -import {} from '@audius/common' import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { ModalContent, ModalHeader } from '@audius/stems' diff --git a/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx b/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx index 159d8e94d79..2dfdb96d00d 100644 --- a/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx +++ b/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx @@ -9,7 +9,6 @@ import { import { useMemo, useState } from 'react' -import {} from '@audius/common' import { CreatePlaylistSource, SquareSizes, diff --git a/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx b/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx index d943bb8b501..0374c803fa9 100644 --- a/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx +++ b/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx @@ -7,7 +7,6 @@ import { import { useCallback, useContext } from 'react' -import {} from '@audius/common' import { CreatePlaylistSource, Collection, ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { capitalize } from 'lodash' diff --git a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx index 8860b5f953b..d66d14a84ac 100644 --- a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx +++ b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx @@ -2,7 +2,6 @@ import { getTierForUser } from '@audius/common/store' import { useCallback, useState } from 'react' -import {} from '@audius/common' import { imageProfilePicEmpty } from '@audius/common/assets' import { SquareSizes, Kind } from '@audius/common/models' import { SelectProps } from 'antd' diff --git a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx index df449d8d85a..50693110191 100644 --- a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx +++ b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx @@ -2,7 +2,6 @@ import { cacheUsersActions } from '@audius/common/store' import { useState, useEffect, memo, useCallback } from 'react' -import {} from '@audius/common' import { imageBlank as placeholderArt } from '@audius/common/assets' import { Kind } from '@audius/common/models' import { Tag } from '@audius/stems' diff --git a/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx b/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx index e7e93aff2ee..0faf6fc86a5 100644 --- a/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx +++ b/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx @@ -8,7 +8,6 @@ import { modalsActions } from '@audius/common/store' -import {} from '@audius/common' import { Modal, Anchor, Button, ButtonType, ButtonSize } from '@audius/stems' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/card/desktop/CollectionArtCard.tsx b/packages/web/src/components/card/desktop/CollectionArtCard.tsx index 7ebc32c7805..e5a405d07e2 100644 --- a/packages/web/src/components/card/desktop/CollectionArtCard.tsx +++ b/packages/web/src/components/card/desktop/CollectionArtCard.tsx @@ -6,7 +6,6 @@ import { import { useCallback, useEffect, useState } from 'react' -import {} from '@audius/common' import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' import cn from 'classnames' diff --git a/packages/web/src/components/card/desktop/UserArtCard.tsx b/packages/web/src/components/card/desktop/UserArtCard.tsx index abc45504b68..e926896e735 100644 --- a/packages/web/src/components/card/desktop/UserArtCard.tsx +++ b/packages/web/src/components/card/desktop/UserArtCard.tsx @@ -2,7 +2,6 @@ import { cacheUsersSelectors } from '@audius/common/store' import { useCallback, useEffect } from 'react' -import {} from '@audius/common' import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' import { formatCount } from '@audius/common/utils' diff --git a/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx b/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx index d3ff2869e8f..925a101901e 100644 --- a/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx +++ b/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx @@ -5,7 +5,6 @@ import { import { useCallback, useEffect, useState } from 'react' -import {} from '@audius/common' import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowPurchase } from '@coinflowlabs/react' import { Transaction } from '@solana/web3.js' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx index 95ff70f6eec..0ea0094b723 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx @@ -5,7 +5,6 @@ import { import { useCallback, useEffect, useState } from 'react' -import {} from '@audius/common' import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' import { getHash } from '@audius/common/utils' import { LogoEth, LogoSol } from '@audius/stems' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx index 55d8eff09dd..d2cecfb9aaa 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx @@ -14,7 +14,6 @@ import { useState } from 'react' -import {} from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' import { formatDateWithTimezoneOffset } from '@audius/common/utils' diff --git a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx index 2ce2562677f..76910d8b436 100644 --- a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx +++ b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx @@ -13,7 +13,6 @@ import { useState } from 'react' -import {} from '@audius/common' import { useInstanceVar } from '@audius/common/hooks' import { CollectiblesMetadata, Collectible } from '@audius/common/models' import { getHash } from '@audius/common/utils' diff --git a/packages/web/src/components/collection/desktop/Artwork.tsx b/packages/web/src/components/collection/desktop/Artwork.tsx index 3270c219517..a04da3527ad 100644 --- a/packages/web/src/components/collection/desktop/Artwork.tsx +++ b/packages/web/src/components/collection/desktop/Artwork.tsx @@ -5,7 +5,6 @@ import { import { ComponentType, SVGProps, useCallback, useEffect } from 'react' -import {} from '@audius/common' import { imageBlank } from '@audius/common/assets' import { SquareSizes, CoverArtSizes } from '@audius/common/models' import { Button, ButtonType, IconPencil } from '@audius/stems' diff --git a/packages/web/src/components/collection/desktop/CollectionHeader.tsx b/packages/web/src/components/collection/desktop/CollectionHeader.tsx index ad9519bbe13..1f37d7ec41c 100644 --- a/packages/web/src/components/collection/desktop/CollectionHeader.tsx +++ b/packages/web/src/components/collection/desktop/CollectionHeader.tsx @@ -2,7 +2,6 @@ import { ChangeEvent, useCallback, useState } from 'react' import { useEditPlaylistModal } from '@audius/common/store' -import {} from '@audius/common' import { formatSecondsAsText, formatDate } from '@audius/common/utils' import { IconHidden, IconPencil } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/collection/desktop/EditButton.tsx b/packages/web/src/components/collection/desktop/EditButton.tsx index 8675daf67fc..28a0d432c2b 100644 --- a/packages/web/src/components/collection/desktop/EditButton.tsx +++ b/packages/web/src/components/collection/desktop/EditButton.tsx @@ -2,7 +2,6 @@ import { useCallback } from 'react' import { useEditPlaylistModal } from '@audius/common/store' -import {} from '@audius/common' import { ButtonProps, ButtonType, IconPencil } from '@audius/stems' import { EntityActionButton } from '../../entity-page/EntityActionButton' diff --git a/packages/web/src/components/collection/desktop/FavoriteButton.tsx b/packages/web/src/components/collection/desktop/FavoriteButton.tsx index 42171702758..f22c829c794 100644 --- a/packages/web/src/components/collection/desktop/FavoriteButton.tsx +++ b/packages/web/src/components/collection/desktop/FavoriteButton.tsx @@ -7,7 +7,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { FavoriteSource, Collection, diff --git a/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx b/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx index 4e4bf2bb9bb..77a8104eb97 100644 --- a/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx +++ b/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { FollowSource, Collection, User } from '@audius/common/models' import { Button, ButtonType, IconKebabHorizontal } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx index e0dce4e935b..38e826402d1 100644 --- a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx @@ -1,5 +1,5 @@ import { collectionPageSelectors, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { Collection } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx b/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx index 882a6bcb40f..1e9bc3971ca 100644 --- a/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx +++ b/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Collection } from '@audius/common/models' import { Button, diff --git a/packages/web/src/components/collection/desktop/RepostButton.tsx b/packages/web/src/components/collection/desktop/RepostButton.tsx index 00935ed4b5c..6ce9a4c7dbb 100644 --- a/packages/web/src/components/collection/desktop/RepostButton.tsx +++ b/packages/web/src/components/collection/desktop/RepostButton.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { RepostSource, Collection, ID } from '@audius/common/models' import { ButtonProps, ButtonType, IconRepost } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/ShareButton.tsx b/packages/web/src/components/collection/desktop/ShareButton.tsx index 714f6555055..cddb7efbd9a 100644 --- a/packages/web/src/components/collection/desktop/ShareButton.tsx +++ b/packages/web/src/components/collection/desktop/ShareButton.tsx @@ -2,7 +2,6 @@ import { shareModalUIActions } from '@audius/common/store' import { useCallback } from 'react' -import {} from '@audius/common' import { ShareSource, SmartCollectionVariant, ID } from '@audius/common/models' import { ButtonProps, ButtonType, IconShare } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx b/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx index 7d12b547901..3fef0c0bf58 100644 --- a/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx @@ -1,5 +1,5 @@ import { collectionPageSelectors, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { Collection, ID } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/mobile/CollectionHeader.jsx b/packages/web/src/components/collection/mobile/CollectionHeader.jsx index c16bd12cb39..27025407767 100644 --- a/packages/web/src/components/collection/mobile/CollectionHeader.jsx +++ b/packages/web/src/components/collection/mobile/CollectionHeader.jsx @@ -2,7 +2,6 @@ import { OverflowAction } from '@audius/common/store' import { memo } from 'react' -import {} from '@audius/common' import { Variant, SquareSizes } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { diff --git a/packages/web/src/components/cookie-banner/CookieBanner.tsx b/packages/web/src/components/cookie-banner/CookieBanner.tsx index 42a27e7f5da..f104ec440d8 100644 --- a/packages/web/src/components/cookie-banner/CookieBanner.tsx +++ b/packages/web/src/components/cookie-banner/CookieBanner.tsx @@ -2,7 +2,6 @@ import { memo } from 'react' import { playerSelectors } from '@audius/common/store' -import {} from '@audius/common' import cn from 'classnames' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx index 3fbbfa50bb7..356897cea4e 100644 --- a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx +++ b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx @@ -2,7 +2,6 @@ import { accountSelectors } from '@audius/common/store' import { useMemo } from 'react' -import {} from '@audius/common' import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { isContentCollectibleGated, diff --git a/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx b/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx index d7b673c920e..c4780d72af5 100644 --- a/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx +++ b/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx @@ -5,7 +5,6 @@ import { deletePlaylistConfirmationModalUISelectors } from '@audius/common/store' -import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/download-buttons/DownloadButtons.tsx b/packages/web/src/components/download-buttons/DownloadButtons.tsx index eabea2ac816..c62bc4f5331 100644 --- a/packages/web/src/components/download-buttons/DownloadButtons.tsx +++ b/packages/web/src/components/download-buttons/DownloadButtons.tsx @@ -2,7 +2,6 @@ import { toastActions } from '@audius/common/store' import { memo, useCallback } from 'react' -import {} from '@audius/common' import { ButtonState, ButtonType, diff --git a/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx b/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx index 5faa34d94c5..66b936ee980 100644 --- a/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx +++ b/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx @@ -7,7 +7,6 @@ import { duplicateAddConfirmationModalUISelectors } from '@audius/common/store' -import {} from '@audius/common' import { fillString } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/edit-track/EditTrackModal.tsx b/packages/web/src/components/edit-track/EditTrackModal.tsx index 8ef8cb0b084..cc9c559a9ad 100644 --- a/packages/web/src/components/edit-track/EditTrackModal.tsx +++ b/packages/web/src/components/edit-track/EditTrackModal.tsx @@ -9,7 +9,6 @@ import { import { useEffect, useState } from 'react' -import {} from '@audius/common' import { StemCategory, ID, diff --git a/packages/web/src/components/embed-modal/store/selectors.ts b/packages/web/src/components/embed-modal/store/selectors.ts index f3e221f84c4..1af14d96e4a 100644 --- a/packages/web/src/components/embed-modal/store/selectors.ts +++ b/packages/web/src/components/embed-modal/store/selectors.ts @@ -2,7 +2,7 @@ import { cacheCollectionsSelectors, cacheTracksSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { PlayableType } from '@audius/common/models' import { AppState } from 'store/types' diff --git a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx index 4574934ef1e..29dd08f1fa8 100644 --- a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx +++ b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx @@ -2,7 +2,6 @@ import { accountSelectors } from '@audius/common/store' import { useCallback, useEffect, useRef, useState } from 'react' -import {} from '@audius/common' import { OverrideSetting, FEATURE_FLAG_OVERRIDE_KEY diff --git a/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx b/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx index 3ac3de70d43..96e88b3635d 100644 --- a/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx +++ b/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx @@ -2,7 +2,6 @@ import { accountSelectors, musicConfettiActions } from '@audius/common/store' import { useCallback, useEffect } from 'react' -import {} from '@audius/common' import { Name, SquareSizes } from '@audius/common/models' import { Modal } from '@audius/stems' import { connect, useDispatch } from 'react-redux' diff --git a/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx b/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx index 25df9700e1b..01f57abf1a2 100644 --- a/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx +++ b/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx @@ -2,7 +2,6 @@ import { useCallback } from 'react' import { useLeavingAudiusModal } from '@audius/common/store' -import {} from '@audius/common' import { Button } from '@audius/harmony' import { IconExternalLink, diff --git a/packages/web/src/components/lineup/LineupProvider.tsx b/packages/web/src/components/lineup/LineupProvider.tsx index 69b2e7907a2..3e34465b7c9 100644 --- a/packages/web/src/components/lineup/LineupProvider.tsx +++ b/packages/web/src/components/lineup/LineupProvider.tsx @@ -6,7 +6,6 @@ import { import { ComponentType, createRef, PureComponent } from 'react' -import {} from '@audius/common' import { Name, PlaybackSource, diff --git a/packages/web/src/components/lineup/hooks.ts b/packages/web/src/components/lineup/hooks.ts index 19b9375d404..91c9a7e9e33 100644 --- a/packages/web/src/components/lineup/hooks.ts +++ b/packages/web/src/components/lineup/hooks.ts @@ -6,7 +6,6 @@ import { import { useMemo } from 'react' -import {} from '@audius/common' import { LineupState } from '@audius/common/models' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/link/ExternalLink.tsx b/packages/web/src/components/link/ExternalLink.tsx index afd8b2b7c86..b5a5c1b0232 100644 --- a/packages/web/src/components/link/ExternalLink.tsx +++ b/packages/web/src/components/link/ExternalLink.tsx @@ -2,7 +2,6 @@ import { useLeavingAudiusModal } from '@audius/common/store' import { MouseEvent, useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { isAllowedExternalLink } from '@audius/common/utils' diff --git a/packages/web/src/components/link/UserLink.tsx b/packages/web/src/components/link/UserLink.tsx index 7aa60dd181b..124a101a65b 100644 --- a/packages/web/src/components/link/UserLink.tsx +++ b/packages/web/src/components/link/UserLink.tsx @@ -1,5 +1,5 @@ import { cacheUsersSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { ID } from '@audius/common/models' import cn from 'classnames' diff --git a/packages/web/src/components/locked-content-modal/LockedContentModal.tsx b/packages/web/src/components/locked-content-modal/LockedContentModal.tsx index 64a0320a916..ccfbc4e204c 100644 --- a/packages/web/src/components/locked-content-modal/LockedContentModal.tsx +++ b/packages/web/src/components/locked-content-modal/LockedContentModal.tsx @@ -2,7 +2,6 @@ import { gatedContentActions } from '@audius/common/store' import { useCallback } from 'react' -import {} from '@audius/common' import { useGatedContentAccess, useLockedContent } from '@audius/common/hooks' import { IconLock, ModalContent, ModalHeader, ModalTitle } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx b/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx index 87802a8b77c..00993ba0e23 100644 --- a/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx +++ b/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx @@ -7,7 +7,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name, Track } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx b/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx index 39d0d79d374..6b907101e2c 100644 --- a/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx +++ b/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx @@ -2,7 +2,6 @@ import { AnnouncementNotification as AnnouncementNotificationType } from '@audiu import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { MarkdownViewer } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx b/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx index df9d03ca4a0..750f6e47ac9 100644 --- a/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx +++ b/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx @@ -5,7 +5,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/FavoriteNotification.tsx b/packages/web/src/components/notification/Notification/FavoriteNotification.tsx index a4fb4c0ae63..612ffbf1a2e 100644 --- a/packages/web/src/components/notification/Notification/FavoriteNotification.tsx +++ b/packages/web/src/components/notification/Notification/FavoriteNotification.tsx @@ -6,7 +6,6 @@ import { FavoriteNotification as FavoriteNotificationType } from '@audius/common/store' -import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/FavoriteOfRepostNotification.tsx b/packages/web/src/components/notification/Notification/FavoriteOfRepostNotification.tsx index 0822de515e9..5da9dcb33a0 100644 --- a/packages/web/src/components/notification/Notification/FavoriteOfRepostNotification.tsx +++ b/packages/web/src/components/notification/Notification/FavoriteOfRepostNotification.tsx @@ -3,7 +3,6 @@ import { Entity, FavoriteOfRepostNotification as FavoriteOfRepostNotificationType } from '@audius/common/store' -import {} from '@audius/common' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/FollowNotification.tsx b/packages/web/src/components/notification/Notification/FollowNotification.tsx index 4fbc3a1743d..60152b22bc2 100644 --- a/packages/web/src/components/notification/Notification/FollowNotification.tsx +++ b/packages/web/src/components/notification/Notification/FollowNotification.tsx @@ -5,7 +5,6 @@ import { FollowNotification as FollowNotificationType } from '@audius/common/store' -import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx index aacf6bad9a5..22ca97b1f70 100644 --- a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx +++ b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx @@ -7,7 +7,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name, User } from '@audius/common/models' import { formatCount, Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/Notification.tsx b/packages/web/src/components/notification/Notification/Notification.tsx index 3b294bebbfa..d50fea9242a 100644 --- a/packages/web/src/components/notification/Notification/Notification.tsx +++ b/packages/web/src/components/notification/Notification/Notification.tsx @@ -3,7 +3,6 @@ import { Notification as Notifications, Notifications } from '@audius/common/store' -import {} from '@audius/common' import ErrorWrapper from 'components/error-wrapper/ErrorWrapper' diff --git a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx index 062f23157b7..2dbe230be51 100644 --- a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx +++ b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx b/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx index 7859f5a4895..7f192671698 100644 --- a/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx +++ b/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/RepostNotification.tsx b/packages/web/src/components/notification/Notification/RepostNotification.tsx index 968ab49e030..e58ca11ec21 100644 --- a/packages/web/src/components/notification/Notification/RepostNotification.tsx +++ b/packages/web/src/components/notification/Notification/RepostNotification.tsx @@ -6,7 +6,6 @@ import { RepostNotification as RepostNotificationType } from '@audius/common/store' -import {} from '@audius/common' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/RepostOfRepostNotification.tsx b/packages/web/src/components/notification/Notification/RepostOfRepostNotification.tsx index 596ff1f65d3..566a39d0788 100644 --- a/packages/web/src/components/notification/Notification/RepostOfRepostNotification.tsx +++ b/packages/web/src/components/notification/Notification/RepostOfRepostNotification.tsx @@ -3,7 +3,6 @@ import { Entity, RepostOfRepostNotification as RepostOfRepostNotificationType } from '@audius/common/store' -import {} from '@audius/common' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx index f57329cd2dd..c6803408583 100644 --- a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx +++ b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' diff --git a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx index 54e69021f85..2dd14569c3a 100644 --- a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx +++ b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/TierChangeNotification.tsx b/packages/web/src/components/notification/Notification/TierChangeNotification.tsx index 13647937242..0c9ad58a5da 100644 --- a/packages/web/src/components/notification/Notification/TierChangeNotification.tsx +++ b/packages/web/src/components/notification/Notification/TierChangeNotification.tsx @@ -4,7 +4,6 @@ import { TierChangeNotification as TierChangeNotificationType, BadgeTierInfo } from '@audius/common/store' -import {} from '@audius/common' import { audioTierMapPng } from 'components/user-badges/UserBadges' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx index 736bfbf9538..59616a67d63 100644 --- a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { Name } from '@audius/common/models' diff --git a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx index 1fe27edb7fa..30560e2e06f 100644 --- a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx @@ -9,7 +9,6 @@ import { import { ComponentType, useCallback, useState } from 'react' -import {} from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' diff --git a/packages/web/src/components/notification/Notification/TipSentNotification.tsx b/packages/web/src/components/notification/Notification/TipSentNotification.tsx index 7ae8570ce78..5c8ada32ed8 100644 --- a/packages/web/src/components/notification/Notification/TipSentNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipSentNotification.tsx @@ -5,7 +5,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { Name } from '@audius/common/models' diff --git a/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx b/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx index 487af22efb3..9769d075967 100644 --- a/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx +++ b/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx @@ -5,7 +5,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import IconTrending from 'assets/img/iconTrending.svg' diff --git a/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx b/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx index 8919ec6c86b..0f0fda27f70 100644 --- a/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx +++ b/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx @@ -5,7 +5,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import IconTrending from 'assets/img/iconTrending.svg' diff --git a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx index a6d3bccb0f3..6c5a8f667ca 100644 --- a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx index 3f6c2eb44be..e1fd9c6adc8 100644 --- a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx index df587a2604e..92e363ed3fb 100644 --- a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx index f46dffafd12..90869579793 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx @@ -7,7 +7,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx index cd295ce93d9..0ac2e192b49 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx @@ -7,7 +7,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { StringUSDC } from '@audius/common/models' import { stringUSDCToBN, diff --git a/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx b/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx index cfae6a941cf..a4e2d198837 100644 --- a/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx +++ b/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/EntityLink.tsx b/packages/web/src/components/notification/Notification/components/EntityLink.tsx index 3440c97fe01..1745a366332 100644 --- a/packages/web/src/components/notification/Notification/components/EntityLink.tsx +++ b/packages/web/src/components/notification/Notification/components/EntityLink.tsx @@ -2,7 +2,6 @@ import { Entity } from '@audius/common/store' import { MouseEventHandler, useCallback } from 'react' -import {} from '@audius/common' import { Name, Collection, Track, User } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/components/NotificationTile.tsx b/packages/web/src/components/notification/Notification/components/NotificationTile.tsx index a9217650bf5..4d2dea173e2 100644 --- a/packages/web/src/components/notification/Notification/components/NotificationTile.tsx +++ b/packages/web/src/components/notification/Notification/components/NotificationTile.tsx @@ -7,7 +7,6 @@ import { import { Notification } from '@audius/common/store' -import {} from '@audius/common' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/Reaction/index.tsx b/packages/web/src/components/notification/Notification/components/Reaction/index.tsx index 542f2ef5280..ccbd39fe712 100644 --- a/packages/web/src/components/notification/Notification/components/Reaction/index.tsx +++ b/packages/web/src/components/notification/Notification/components/Reaction/index.tsx @@ -2,8 +2,6 @@ import React, { ComponentType } from 'react' import { ReactionTypes } from '@audius/common/store' -import {} from '@audius/common' - import { Reaction, ReactionProps as BaseReactionProps } from './Reaction' export type ReactionProps = Omit diff --git a/packages/web/src/components/notification/Notification/components/TrackContent.tsx b/packages/web/src/components/notification/Notification/components/TrackContent.tsx index 355117f515f..9ed6f05a396 100644 --- a/packages/web/src/components/notification/Notification/components/TrackContent.tsx +++ b/packages/web/src/components/notification/Notification/components/TrackContent.tsx @@ -1,5 +1,5 @@ import { TrackEntity } from '@audius/common/store' -import {} from '@audius/common' + import { SquareSizes } from '@audius/common/models' import CoSign, { Size } from 'components/co-sign/CoSign' diff --git a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx index d087095b9c4..91faee9a0c0 100644 --- a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx +++ b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx @@ -6,7 +6,6 @@ import { import { MouseEventHandler, useCallback } from 'react' -import {} from '@audius/common' import { useTwitterButtonStatus } from '@audius/common/hooks' import { Nullable } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/notification/Notification/components/UserNameLink.tsx b/packages/web/src/components/notification/Notification/components/UserNameLink.tsx index 223854e3dba..1f345f88a6c 100644 --- a/packages/web/src/components/notification/Notification/components/UserNameLink.tsx +++ b/packages/web/src/components/notification/Notification/components/UserNameLink.tsx @@ -2,7 +2,6 @@ import { Notification } from '@audius/common/store' import { MouseEventHandler, useCallback } from 'react' -import {} from '@audius/common' import { Name, User } from '@audius/common/models' import cn from 'classnames' import { push } from 'connected-react-router' diff --git a/packages/web/src/components/notification/Notification/utils.ts b/packages/web/src/components/notification/Notification/utils.ts index a10b6ddc5e3..5cfad5c31e4 100644 --- a/packages/web/src/components/notification/Notification/utils.ts +++ b/packages/web/src/components/notification/Notification/utils.ts @@ -1,5 +1,4 @@ import { Entity, EntityType } from '@audius/common/store' -import {} from '@audius/common' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' import { UserListEntityType } from 'store/application/ui/userListModal/types' diff --git a/packages/web/src/components/notification/NotificationModal.tsx b/packages/web/src/components/notification/NotificationModal.tsx index 23cfc36f900..dd5ee7098b5 100644 --- a/packages/web/src/components/notification/NotificationModal.tsx +++ b/packages/web/src/components/notification/NotificationModal.tsx @@ -1,5 +1,5 @@ import { AnnouncementNotification } from '@audius/common/store' -import {} from '@audius/common' + import { Modal, Scrollbar, MarkdownViewer } from '@audius/stems' import IconRemove from 'assets/img/iconRemove.svg' diff --git a/packages/web/src/components/notification/NotificationPage.tsx b/packages/web/src/components/notification/NotificationPage.tsx index 18aec2beb91..74344993214 100644 --- a/packages/web/src/components/notification/NotificationPage.tsx +++ b/packages/web/src/components/notification/NotificationPage.tsx @@ -7,7 +7,6 @@ import { import { useEffect, useCallback, useContext } from 'react' -import {} from '@audius/common' import { Status } from '@audius/common/models' import InfiniteScroll from 'react-infinite-scroller' import Lottie from 'react-lottie' diff --git a/packages/web/src/components/notification/NotificationPanel.tsx b/packages/web/src/components/notification/NotificationPanel.tsx index 50c967e783e..62efdd1cba8 100644 --- a/packages/web/src/components/notification/NotificationPanel.tsx +++ b/packages/web/src/components/notification/NotificationPanel.tsx @@ -7,7 +7,6 @@ import { import { useRef, useCallback, useEffect, RefObject } from 'react' -import {} from '@audius/common' import { Status } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { Popup, PopupPosition, Scrollbar } from '@audius/stems' diff --git a/packages/web/src/components/now-playing/NowPlaying.tsx b/packages/web/src/components/now-playing/NowPlaying.tsx index fd956a6364c..76b0d9105f6 100644 --- a/packages/web/src/components/now-playing/NowPlaying.tsx +++ b/packages/web/src/components/now-playing/NowPlaying.tsx @@ -19,7 +19,6 @@ import { import { useCallback, useEffect, useRef, useState } from 'react' -import {} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { Name, diff --git a/packages/web/src/components/now-playing/NowPlayingDrawer.tsx b/packages/web/src/components/now-playing/NowPlayingDrawer.tsx index 81e94886d74..70abc6ab032 100644 --- a/packages/web/src/components/now-playing/NowPlayingDrawer.tsx +++ b/packages/web/src/components/now-playing/NowPlayingDrawer.tsx @@ -2,7 +2,6 @@ import { nowPlayingUIActions } from '@audius/common/store' import { useEffect, useCallback } from 'react' -import {} from '@audius/common' import { useInstanceVar } from '@audius/common/hooks' import { useDispatch } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web diff --git a/packages/web/src/components/on-ramp-button/OnRampButton.tsx b/packages/web/src/components/on-ramp-button/OnRampButton.tsx index 3d4f58b2173..841714ee279 100644 --- a/packages/web/src/components/on-ramp-button/OnRampButton.tsx +++ b/packages/web/src/components/on-ramp-button/OnRampButton.tsx @@ -1,5 +1,5 @@ import { OnRampProvider } from '@audius/common/store' -import {} from '@audius/common' + import { Button, ButtonProps, ButtonType } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/password-reset/PasswordResetModal.tsx b/packages/web/src/components/password-reset/PasswordResetModal.tsx index d60a18abc31..48355227ae7 100644 --- a/packages/web/src/components/password-reset/PasswordResetModal.tsx +++ b/packages/web/src/components/password-reset/PasswordResetModal.tsx @@ -2,7 +2,6 @@ import { accountSelectors } from '@audius/common/store' import { useEffect, useState } from 'react' -import {} from '@audius/common' import { Status } from '@audius/common/models' import { Flex, Text } from '@audius/harmony' import { Modal } from '@audius/stems' diff --git a/packages/web/src/components/password-reset/store/sagas.tsx b/packages/web/src/components/password-reset/store/sagas.tsx index 182c3449d2d..2b1c8659e16 100644 --- a/packages/web/src/components/password-reset/store/sagas.tsx +++ b/packages/web/src/components/password-reset/store/sagas.tsx @@ -1,5 +1,5 @@ import { getContext } from '@audius/common/store' -import {} from '@audius/common' + import { call, put, takeEvery } from 'redux-saga/effects' import * as actions from './actions' diff --git a/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx b/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx index 89eefe03dd5..87029e54ca7 100644 --- a/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx +++ b/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx @@ -2,7 +2,6 @@ import { accountSelectors, tracksSocialActions } from '@audius/common/store' import { memo } from 'react' -import {} from '@audius/common' import { ID } from '@audius/common/models' import { Modal, Button, ButtonSize, ButtonType } from '@audius/stems' import { connect } from 'react-redux' diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx index 14a42cef242..13b7bde8306 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx @@ -2,7 +2,6 @@ import { PurchaseContentStage } from '@audius/common/store' import { useCallback, useEffect } from 'react' -import {} from '@audius/common' import { useFeatureFlag, useRemoteVar, diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx index 58ee5504218..b971e31bdae 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx @@ -5,7 +5,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { PurchaseableTrackMetadata, usePurchaseContentErrorMessage diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts index 0e3a74cba78..b89c7abf2f7 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts @@ -2,7 +2,7 @@ import { purchaseContentSelectors, isContentPurchaseInProgress } from '@audius/common/store' -import {} from '@audius/common' + import { useUSDCBalance } from '@audius/common/hooks' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts index e167293342e..5ca2d0ca323 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts @@ -1,5 +1,5 @@ import { getPurchaseSummaryValues } from '@audius/common/store' -import {} from '@audius/common' + import { useUSDCPurchaseConfig, usePayExtraPresets, diff --git a/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx b/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx index 9986487be37..f22ded5a5dd 100644 --- a/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx +++ b/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx @@ -1,5 +1,5 @@ import { challengesSelectors, profilePageActions } from '@audius/common/store' -import {} from '@audius/common' + import { connect } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx b/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx index 2cfd3279906..1d34cd0ee6a 100644 --- a/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx +++ b/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx @@ -6,7 +6,6 @@ import { musicConfettiActions } from '@audius/common/store' -import {} from '@audius/common' import { connect, useDispatch } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx index 6517b2b7d86..c8a73f01d76 100644 --- a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx +++ b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx @@ -5,7 +5,6 @@ import { import { useEffect } from 'react' -import {} from '@audius/common' import { Status, ID, AccessConditions } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { connect } from 'react-redux' diff --git a/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx b/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx index bc978453845..27b09f2f6e2 100644 --- a/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx +++ b/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx @@ -5,7 +5,6 @@ import { audioRewardsPageActions } from '@audius/common/store' -import {} from '@audius/common' import { useDispatch, useSelector } from 'react-redux' import IconCaretRight from 'assets/img/iconCaretRight.svg' diff --git a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx index eb40de38eeb..7007da57591 100644 --- a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx +++ b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx @@ -2,7 +2,6 @@ import { getTierForUser } from '@audius/common/store' import { Component } from 'react' -import {} from '@audius/common' import { imageBlank as placeholderArt, imageProfilePicEmpty as profilePicEmpty diff --git a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx index 35e5ea77bef..a9bad4d98e6 100644 --- a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx +++ b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx @@ -13,7 +13,6 @@ import { useState } from 'react' -import {} from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { Status, ID, User } from '@audius/common/models' import { diff --git a/packages/web/src/components/share-modal/ShareModal.tsx b/packages/web/src/components/share-modal/ShareModal.tsx index 1349be5a15d..e309126f93b 100644 --- a/packages/web/src/components/share-modal/ShareModal.tsx +++ b/packages/web/src/components/share-modal/ShareModal.tsx @@ -11,7 +11,6 @@ import { import { useCallback, useContext } from 'react' -import {} from '@audius/common' import { Name, PlayableType } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/share-modal/messages.ts b/packages/web/src/components/share-modal/messages.ts index 21fac6948b7..f19831e7177 100644 --- a/packages/web/src/components/share-modal/messages.ts +++ b/packages/web/src/components/share-modal/messages.ts @@ -1,5 +1,4 @@ import { ShareType } from '@audius/common/store' -import {} from '@audius/common' const shareTypeMap: Record = { track: 'Track', diff --git a/packages/web/src/components/share-modal/utils.ts b/packages/web/src/components/share-modal/utils.ts index 047d7a1127e..c30524a6b90 100644 --- a/packages/web/src/components/share-modal/utils.ts +++ b/packages/web/src/components/share-modal/utils.ts @@ -1,5 +1,5 @@ import { ShareContent } from '@audius/common/store' -import {} from '@audius/common' + import { ShareToTwitter } from '@audius/common/models' import { getTwitterHandleByUserHandle } from 'components/notification/Notification/utils' diff --git a/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx b/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx index 3d8b6a4d836..d139f25aeb4 100644 --- a/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx +++ b/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx @@ -5,7 +5,6 @@ import { stripeModalUISelectors } from '@audius/common/store' -import {} from '@audius/common' import { loadStripeOnramp, OnrampSession } from '@stripe/crypto' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx index d868683e009..fcaeddc2d32 100644 --- a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx +++ b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx @@ -2,7 +2,6 @@ import { cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' -import {} from '@audius/common' import { SuggestedTrack } from '@audius/common/api' import { SquareSizes, ID, Track } from '@audius/common/models' import { diff --git a/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx b/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx index 7df46315e26..952dd57008c 100644 --- a/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx +++ b/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx @@ -7,7 +7,6 @@ import { import { useCallback, useEffect, useRef } from 'react' -import {} from '@audius/common' import { Name, User } from '@audius/common/models' import { IconButton, PillButton } from '@audius/stems' import { ResizeObserver } from '@juggle/resize-observer' diff --git a/packages/web/src/components/tipping/support/SupportingList.tsx b/packages/web/src/components/tipping/support/SupportingList.tsx index ab3998af4ff..ad02f821aa0 100644 --- a/packages/web/src/components/tipping/support/SupportingList.tsx +++ b/packages/web/src/components/tipping/support/SupportingList.tsx @@ -2,7 +2,6 @@ import { profilePageSelectors } from '@audius/common/store' import { useCallback } from 'react' -import {} from '@audius/common' import { useRankedSupportingForUser } from '@audius/common/hooks' import { User } from '@audius/common/models' import { formatCount, MAX_PROFILE_SUPPORTING_TILES } from '@audius/common/utils' diff --git a/packages/web/src/components/tipping/support/SupportingTile.tsx b/packages/web/src/components/tipping/support/SupportingTile.tsx index 8e7154acba2..2c52c0e2d54 100644 --- a/packages/web/src/components/tipping/support/SupportingTile.tsx +++ b/packages/web/src/components/tipping/support/SupportingTile.tsx @@ -2,7 +2,6 @@ import { cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' -import {} from '@audius/common' import { imageProfilePicEmpty as profilePicEmpty, imageCoverPhotoBlank diff --git a/packages/web/src/components/tipping/support/TopSupporters.tsx b/packages/web/src/components/tipping/support/TopSupporters.tsx index d15ac0b7aec..0dfd2762410 100644 --- a/packages/web/src/components/tipping/support/TopSupporters.tsx +++ b/packages/web/src/components/tipping/support/TopSupporters.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { ID, User } from '@audius/common/models' import { MAX_PROFILE_TOP_SUPPORTERS } from '@audius/common/utils' import { IconTrophy } from '@audius/stems' diff --git a/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx b/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx index 0940e0ca870..15660d0b7ad 100644 --- a/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx @@ -2,7 +2,6 @@ import { useCallback, useEffect, useState } from 'react' import { tippingSelectors, tippingActions } from '@audius/common/store' -import {} from '@audius/common' import { Button, ButtonType, IconCheck } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/SendTip.tsx b/packages/web/src/components/tipping/tip-audio/SendTip.tsx index e61af5a1814..706b422c159 100644 --- a/packages/web/src/components/tipping/tip-audio/SendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/SendTip.tsx @@ -16,7 +16,6 @@ import { useState } from 'react' -import {} from '@audius/common' import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import { BadgeTier, StringWei, StringAudio, BNWei } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx index 156a8064b12..ccf8e37ccc2 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx @@ -1,5 +1,5 @@ import { profilePageSelectors, tippingActions } from '@audius/common/store' -import {} from '@audius/common' + import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx index 0122cb24fee..0f0045e6f91 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx @@ -8,7 +8,6 @@ import { import { useCallback, useEffect } from 'react' -import {} from '@audius/common' import { StringKeys } from '@audius/common/services' import { Nullable } from '@audius/common/utils' import { Modal, ModalHeader, ModalTitle } from '@audius/stems' diff --git a/packages/web/src/components/tipping/tip-audio/TipSent.tsx b/packages/web/src/components/tipping/tip-audio/TipSent.tsx index ff1176ffa7d..f53ae569142 100644 --- a/packages/web/src/components/tipping/tip-audio/TipSent.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipSent.tsx @@ -2,7 +2,6 @@ import { accountSelectors, tippingSelectors } from '@audius/common/store' import { useCallback } from 'react' -import {} from '@audius/common' import { Name } from '@audius/common/models' import { deriveUserBankAddress } from '@audius/common/services' import { formatNumberCommas } from '@audius/common/utils' diff --git a/packages/web/src/components/toast/Toast.tsx b/packages/web/src/components/toast/Toast.tsx index 116e09ce5cb..d7579591ceb 100644 --- a/packages/web/src/components/toast/Toast.tsx +++ b/packages/web/src/components/toast/Toast.tsx @@ -2,7 +2,6 @@ import { PureComponent } from 'react' import { accountSelectors } from '@audius/common/store' -import {} from '@audius/common' import Tooltip from 'antd/lib/tooltip' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/toast/ToastContext.tsx b/packages/web/src/components/toast/ToastContext.tsx index c27bdb5a150..a8cf33494de 100644 --- a/packages/web/src/components/toast/ToastContext.tsx +++ b/packages/web/src/components/toast/ToastContext.tsx @@ -2,7 +2,6 @@ import { createContext, ReactNode, useCallback } from 'react' import { toastActions, CommonState } from '@audius/common/store' -import {} from '@audius/common' import { useDispatch, useSelector } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useTransition, animated } from 'react-spring' diff --git a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx index 87ae5ba687d..7416e2b1d95 100644 --- a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx +++ b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx @@ -17,7 +17,7 @@ import { useEditPlaylistModal, Notification } from '@audius/common/store' -import {} from '@audius/common' + import { ShareSource, RepostSource, diff --git a/packages/web/src/components/track-overflow-modal/components/MobileOverflowModal.tsx b/packages/web/src/components/track-overflow-modal/components/MobileOverflowModal.tsx index 6ca445583d0..9a8b44c204c 100644 --- a/packages/web/src/components/track-overflow-modal/components/MobileOverflowModal.tsx +++ b/packages/web/src/components/track-overflow-modal/components/MobileOverflowModal.tsx @@ -1,5 +1,4 @@ import { OverflowAction, OverflowActionCallbacks } from '@audius/common/store' -import {} from '@audius/common' import ActionSheetModal from 'components/action-drawer/ActionDrawer' diff --git a/packages/web/src/components/track/AiTrackSection.tsx b/packages/web/src/components/track/AiTrackSection.tsx index 67e901076d2..302290a17d2 100644 --- a/packages/web/src/components/track/AiTrackSection.tsx +++ b/packages/web/src/components/track/AiTrackSection.tsx @@ -2,7 +2,6 @@ import { cacheUsersActions, cacheUsersSelectors } from '@audius/common/store' import { useCallback, useEffect } from 'react' -import {} from '@audius/common' import { ID, User } from '@audius/common/models' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/track/DownloadRow.tsx b/packages/web/src/components/track/DownloadRow.tsx index becb1f57306..59e4dc5d9e9 100644 --- a/packages/web/src/components/track/DownloadRow.tsx +++ b/packages/web/src/components/track/DownloadRow.tsx @@ -6,7 +6,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { useDownloadableContentAccess } from '@audius/common/hooks' import { DownloadQuality, ID } from '@audius/common/models' import { Flex, IconReceive, PlainButton, Text } from '@audius/harmony' diff --git a/packages/web/src/components/track/DownloadSection.tsx b/packages/web/src/components/track/DownloadSection.tsx index 8b1042bc506..ffcb88a380c 100644 --- a/packages/web/src/components/track/DownloadSection.tsx +++ b/packages/web/src/components/track/DownloadSection.tsx @@ -6,7 +6,6 @@ import { import { useCallback, useState } from 'react' -import {} from '@audius/common' import { useCurrentStems, useDownloadableContentAccess diff --git a/packages/web/src/components/track/GatedTrackSection.tsx b/packages/web/src/components/track/GatedTrackSection.tsx index 2bacac4a097..19383f038a3 100644 --- a/packages/web/src/components/track/GatedTrackSection.tsx +++ b/packages/web/src/components/track/GatedTrackSection.tsx @@ -8,7 +8,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { FollowSource, ModalSource, diff --git a/packages/web/src/components/track/GiantTrackTile.tsx b/packages/web/src/components/track/GiantTrackTile.tsx index 87b86a19f81..5f574b5ef97 100644 --- a/packages/web/src/components/track/GiantTrackTile.tsx +++ b/packages/web/src/components/track/GiantTrackTile.tsx @@ -6,7 +6,6 @@ import { import { useCallback, useState } from 'react' -import {} from '@audius/common' import { isContentUSDCPurchaseGated, ID, diff --git a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx index 96ee845bdba..339bc70838d 100644 --- a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx +++ b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx @@ -3,7 +3,7 @@ import { playbackPositionSelectors, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { ID } from '@audius/common/models' import { formatLineupTileDuration } from '@audius/common/utils' import { IconCheck, ProgressBar } from '@audius/stems' diff --git a/packages/web/src/components/track/PlayPauseButton.tsx b/packages/web/src/components/track/PlayPauseButton.tsx index a3be6d64085..33c63047637 100644 --- a/packages/web/src/components/track/PlayPauseButton.tsx +++ b/packages/web/src/components/track/PlayPauseButton.tsx @@ -4,7 +4,7 @@ import { playbackPositionSelectors, CommonState } from '@audius/common/store' -import {} from '@audius/common' + import { ID } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { Button } from '@audius/harmony' diff --git a/packages/web/src/components/track/desktop/BottomRow.tsx b/packages/web/src/components/track/desktop/BottomRow.tsx index 32a65bd8cb4..4c639cc2b45 100644 --- a/packages/web/src/components/track/desktop/BottomRow.tsx +++ b/packages/web/src/components/track/desktop/BottomRow.tsx @@ -2,7 +2,6 @@ import { gatedContentSelectors } from '@audius/common/store' import { MouseEvent, ReactNode, useCallback } from 'react' -import {} from '@audius/common' import { ID, FieldVisibility, AccessConditions } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx index 6fd77113fa6..8a6140550c2 100644 --- a/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx @@ -18,7 +18,6 @@ import { useRef } from 'react' -import {} from '@audius/common' import { Name, ShareSource, diff --git a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx index b62f29e88fd..a36ec919cae 100644 --- a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx @@ -17,7 +17,6 @@ import { useRef } from 'react' -import {} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { ShareSource, diff --git a/packages/web/src/components/track/desktop/TrackListItem.tsx b/packages/web/src/components/track/desktop/TrackListItem.tsx index 7356bcaba30..52ad17077da 100644 --- a/packages/web/src/components/track/desktop/TrackListItem.tsx +++ b/packages/web/src/components/track/desktop/TrackListItem.tsx @@ -2,7 +2,6 @@ import { EnhancedCollectionTrack } from '@audius/common/store' import { memo, MouseEvent, useRef } from 'react' -import {} from '@audius/common' import { ID, UID } from '@audius/common/models' import { Genre, formatSeconds } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/track/desktop/TrackTile.tsx b/packages/web/src/components/track/desktop/TrackTile.tsx index ac1d2d9d718..0cdfea1bea7 100644 --- a/packages/web/src/components/track/desktop/TrackTile.tsx +++ b/packages/web/src/components/track/desktop/TrackTile.tsx @@ -7,7 +7,6 @@ import { import { memo } from 'react' -import {} from '@audius/common' import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { diff --git a/packages/web/src/components/track/desktop/stats/ProfileImage.tsx b/packages/web/src/components/track/desktop/stats/ProfileImage.tsx index ead5778b38c..c6edb8940dd 100644 --- a/packages/web/src/components/track/desktop/stats/ProfileImage.tsx +++ b/packages/web/src/components/track/desktop/stats/ProfileImage.tsx @@ -2,7 +2,6 @@ import { cacheUsersSelectors } from '@audius/common/store' import { memo } from 'react' -import {} from '@audius/common' import { SquareSizes, ID } from '@audius/common/models' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/stats/Stats.tsx b/packages/web/src/components/track/desktop/stats/Stats.tsx index 36b65266961..f878911d287 100644 --- a/packages/web/src/components/track/desktop/stats/Stats.tsx +++ b/packages/web/src/components/track/desktop/stats/Stats.tsx @@ -2,7 +2,6 @@ import { cacheUsersSelectors, CommonState } from '@audius/common/store' import { memo, useMemo, MouseEvent, useCallback } from 'react' -import {} from '@audius/common' import { Favorite, ID, Repost } from '@audius/common/models' import { createShallowSelector } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx index c68b5d97e25..2a8b2014b0d 100644 --- a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx @@ -16,7 +16,6 @@ import { import { memo, useCallback, useMemo, MouseEvent } from 'react' -import {} from '@audius/common' import { Name, ShareSource, diff --git a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx index 242f441dea8..03027c89055 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx @@ -9,7 +9,6 @@ import { import { memo } from 'react' -import {} from '@audius/common' import { RepostSource, FavoriteSource, ID } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx index c08b7345dbd..8e4ea550e10 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx @@ -16,7 +16,6 @@ import { import { memo, MouseEvent } from 'react' -import {} from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { ShareSource, diff --git a/packages/web/src/components/track/mobile/TrackTile.tsx b/packages/web/src/components/track/mobile/TrackTile.tsx index fefc8a2aa67..ece6dd81afe 100644 --- a/packages/web/src/components/track/mobile/TrackTile.tsx +++ b/packages/web/src/components/track/mobile/TrackTile.tsx @@ -6,7 +6,6 @@ import { import { useCallback, useState, useEffect, MouseEvent } from 'react' -import {} from '@audius/common' import { ModalSource, isContentUSDCPurchaseGated, diff --git a/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx b/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx index 55e519f7bad..0334cae0cb7 100644 --- a/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx +++ b/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx @@ -5,7 +5,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { Status } from '@audius/common/models' import { Button, diff --git a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx index 25512393679..93f30016960 100644 --- a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx +++ b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx @@ -4,7 +4,7 @@ import { TransactionMethod, TransactionDetails } from '@audius/common/store' -import {} from '@audius/common' + import { ChallengeRewardID, User } from '@audius/common/models' import { formatAudio, diff --git a/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx b/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx index b630e4ac91a..542a2410b2d 100644 --- a/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx +++ b/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx @@ -1,5 +1,5 @@ import { InAppAudioPurchaseMetadata } from '@audius/common/store' -import {} from '@audius/common' + import { formatNumberString, makeSolanaTransactionLink, diff --git a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx index 50adcfe4336..feddd9fe511 100644 --- a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx +++ b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx @@ -3,7 +3,7 @@ import { trendingPageActions, trendingPageSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { TimeRange } from '@audius/common/models' import { Genre, ELECTRONIC_PREFIX, TRENDING_GENRES } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx b/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx index da19d9c8378..c8012e617c0 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx +++ b/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx @@ -2,7 +2,7 @@ import { profilePageActions, usersSocialActions as socialActions } from '@audius/common/store' -import {} from '@audius/common' + import { FollowSource, ID } from '@audius/common/models' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/unload-dialog/UnloadDialog.jsx b/packages/web/src/components/unload-dialog/UnloadDialog.jsx index 5a1d9524954..16dff98ea07 100644 --- a/packages/web/src/components/unload-dialog/UnloadDialog.jsx +++ b/packages/web/src/components/unload-dialog/UnloadDialog.jsx @@ -2,7 +2,6 @@ import { useState, useEffect, useRef } from 'react' import { confirmerSelectors } from '@audius/common/store' -import {} from '@audius/common' import { Modal } from '@audius/stems' import { connect } from 'react-redux' diff --git a/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx b/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx index 2780e97ceea..388d87b2496 100644 --- a/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx +++ b/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx @@ -2,7 +2,6 @@ import { useCallback } from 'react' import { uploadConfirmationModalUISelectors } from '@audius/common/store' -import {} from '@audius/common' import { Button, ButtonType, diff --git a/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx b/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx index b5e1e2d68d3..a679f79b9aa 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx @@ -1,5 +1,5 @@ import { useUSDCPurchaseDetailsModal } from '@audius/common/store' -import {} from '@audius/common' + import { Modal } from '@audius/stems' import { PurchaseModalContent } from './components/PurchaseModalContent' diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx b/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx index 4e3d05179ec..8ed9ad3f2e8 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx @@ -7,7 +7,6 @@ import { CommonState } from '@audius/common/store' -import {} from '@audius/common' import { makeSolanaTransactionLink } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx b/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx index 1d3f1cf95e1..bc75ad3323c 100644 --- a/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx +++ b/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx @@ -1,5 +1,5 @@ import { useUSDCTransactionDetailsModal } from '@audius/common/store' -import {} from '@audius/common' + import { formatUSDCWeiToUSDString, makeSolanaTransactionLink diff --git a/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx b/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx index 3617f6204b8..c8fe29400ba 100644 --- a/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx +++ b/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx @@ -2,7 +2,6 @@ import { accountSelectors } from '@audius/common/store' import { MouseEventHandler, useCallback } from 'react' -import {} from '@audius/common' import { useGetUserById } from '@audius/common/api' import { UserMetadata } from '@audius/common/models' import cn from 'classnames' diff --git a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx index 8bf7cf6c8d3..e79224c5a43 100644 --- a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx @@ -8,7 +8,6 @@ import { import { useCallback, useEffect, useRef, useState } from 'react' -import {} from '@audius/common' import { useFeatureFlag, useRemoteVar, diff --git a/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx b/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx index 57d0fa1b594..b411aecd6b8 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx @@ -5,7 +5,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowWithdraw } from '@coinflowlabs/react' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx index ddc17a22061..7a42c8a8fbc 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx @@ -6,7 +6,6 @@ import { import { useCallback, useState } from 'react' -import {} from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' import { diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx index 94b6c5ed3a8..0cfa9ada4e6 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx @@ -11,7 +11,6 @@ import { useState } from 'react' -import {} from '@audius/common' import { useFeatureFlag, useUSDCBalance } from '@audius/common/hooks' import { Name, BNUSDC } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx index bf290f5a52b..12b4d8e7ede 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx @@ -5,7 +5,6 @@ import { import { useCallback } from 'react' -import {} from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' import { diff --git a/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx b/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx index 6aff4e30578..5692b77c373 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx @@ -8,7 +8,6 @@ import { CoinflowWithdrawState } from '@audius/common/store' -import {} from '@audius/common' import { Flex, Text } from '@audius/harmony' import { useField } from 'formik' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx index 080e75f345e..e1775ab78e5 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx @@ -2,7 +2,6 @@ import { withdrawUSDCSelectors, WithdrawMethod } from '@audius/common/store' import { useCallback } from 'react' -import {} from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import { Name, Status, BNUSDC } from '@audius/common/models' import { diff --git a/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx b/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx index 91cd40c22d5..7c4bd263306 100644 --- a/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx +++ b/packages/web/src/pages/ai-attributed-tracks-page/AiPageProvider.tsx @@ -1,3 +1,6 @@ +import { useEffect, useCallback, ComponentType, RefObject } from 'react' + +import { ID } from '@audius/common/models' import { lineupSelectors, aiPageLineupActions as tracksActions, @@ -6,11 +9,6 @@ import { queueSelectors, playerSelectors } from '@audius/common/store' - -import { useEffect, useCallback, ComponentType, RefObject } from 'react' - -import {} from '@audius/common' -import { ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { useParams } from 'react-router' diff --git a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx index cdeb02dfc61..0f18f22d244 100644 --- a/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx +++ b/packages/web/src/pages/audio-rewards-page/AudioRewardsPage.tsx @@ -1,9 +1,7 @@ -import { tokenDashboardPageActions, walletActions } from '@audius/common/store' - import { ReactNode, useContext, useEffect } from 'react' -import {} from '@audius/common' import { StringKeys, FeatureFlags } from '@audius/common/services' +import { tokenDashboardPageActions, walletActions } from '@audius/common/store' import { useDispatch } from 'react-redux' import Header from 'components/header/desktop/Header' diff --git a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx index 0517b3edb3a..fd4c19c2d13 100644 --- a/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/ChallengeRewardsTile.tsx @@ -1,13 +1,5 @@ -import { - challengesSelectors, - audioRewardsPageSelectors, - audioRewardsPageActions, - ChallengeRewardsModalType -} from '@audius/common/store' - import { ReactNode, useEffect, useMemo, useState } from 'react' -import {} from '@audius/common' import { Name, ChallengeName, @@ -15,6 +7,12 @@ import { OptimisticUserChallenge } from '@audius/common/models' import { StringKeys } from '@audius/common/services' +import { + challengesSelectors, + audioRewardsPageSelectors, + audioRewardsPageActions, + ChallengeRewardsModalType +} from '@audius/common/store' import { fillString, formatNumberCommas, diff --git a/packages/web/src/pages/audio-rewards-page/Tiers.tsx b/packages/web/src/pages/audio-rewards-page/Tiers.tsx index 26cce92f424..dee87a8a586 100644 --- a/packages/web/src/pages/audio-rewards-page/Tiers.tsx +++ b/packages/web/src/pages/audio-rewards-page/Tiers.tsx @@ -1,3 +1,7 @@ +import { ReactElement, useCallback, useEffect, useMemo } from 'react' + +import { useSelectTierInfo } from '@audius/common/hooks' +import { BadgeTier } from '@audius/common/models' import { accountSelectors, badgeTiers, @@ -5,12 +9,6 @@ import { vipDiscordModalActions, musicConfettiActions } from '@audius/common/store' - -import { ReactElement, useCallback, useEffect, useMemo } from 'react' - -import {} from '@audius/common' -import { useSelectTierInfo } from '@audius/common/hooks' -import { BadgeTier } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { Button, ButtonType, IconDiscord } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/Tiles.tsx b/packages/web/src/pages/audio-rewards-page/Tiles.tsx index 9d3a193b74a..abdcd36800b 100644 --- a/packages/web/src/pages/audio-rewards-page/Tiles.tsx +++ b/packages/web/src/pages/audio-rewards-page/Tiles.tsx @@ -5,8 +5,6 @@ import { tokenDashboardPageActions, walletSelectors } from '@audius/common/store' - -import {} from '@audius/common' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Button, ButtonType, IconInfo } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx index 357e67c9531..c4b32a81e6a 100644 --- a/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/TrendingRewardsTile.tsx @@ -1,13 +1,11 @@ -import { audioRewardsPageActions } from '@audius/common/store' - import { ReactNode } from 'react' -import {} from '@audius/common' import { ChallengeRewardID, OptimisticUserChallenge } from '@audius/common/models' import { StringKeys } from '@audius/common/services' +import { audioRewardsPageActions } from '@audius/common/store' import { ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx index a37310f0ec9..b2bf6bd2f9a 100644 --- a/packages/web/src/pages/audio-rewards-page/WalletModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/WalletModal.tsx @@ -1,3 +1,7 @@ +import { ReactNode, useCallback } from 'react' + +import { Chain, StringWei, BNWei, WalletAddress } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, tokenDashboardPageSelectors, @@ -5,12 +9,6 @@ import { walletSelectors, TokenDashboardPageModalState } from '@audius/common/store' - -import { ReactNode, useCallback } from 'react' - -import {} from '@audius/common' -import { Chain, StringWei, BNWei, WalletAddress } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { stringWeiToBN, weiToString, Nullable } from '@audius/common/utils' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/ConnectWalletsBody.tsx b/packages/web/src/pages/audio-rewards-page/components/ConnectWalletsBody.tsx index 376d45f483d..b2b5433514e 100644 --- a/packages/web/src/pages/audio-rewards-page/components/ConnectWalletsBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/ConnectWalletsBody.tsx @@ -4,8 +4,6 @@ import { tokenDashboardPageSelectors, tokenDashboardPageActions } from '@audius/common/store' - -import {} from '@audius/common' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/RemoveWalletBody.tsx b/packages/web/src/pages/audio-rewards-page/components/RemoveWalletBody.tsx index 7d6cf79ebef..e01fd416ea0 100644 --- a/packages/web/src/pages/audio-rewards-page/components/RemoveWalletBody.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/RemoveWalletBody.tsx @@ -4,8 +4,6 @@ import { tokenDashboardPageSelectors, tokenDashboardPageActions } from '@audius/common/store' - -import {} from '@audius/common' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx b/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx index 8c9f2d34c91..58b44c2afc4 100644 --- a/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/SendInputConfirmation.tsx @@ -1,9 +1,7 @@ -import { tokenDashboardPageSelectors } from '@audius/common/store' - import { useEffect, useState } from 'react' -import {} from '@audius/common' import { StringAudio, BNWei, WalletAddress } from '@audius/common/models' +import { tokenDashboardPageSelectors } from '@audius/common/store' import { weiToAudio, stringAudioToBN } from '@audius/common/utils' import { Button, ButtonType, IconArrow } from '@audius/stems' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx index 860f00d35f2..a441c498209 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletActionsTile.tsx @@ -1,9 +1,8 @@ +import { BNWei } from '@audius/common/models' import { tokenDashboardPageActions, walletSelectors } from '@audius/common/store' -import {} from '@audius/common' -import { BNWei } from '@audius/common/models' import { isNullOrUndefined } from '@audius/common/utils' import { Button, ButtonType } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx index 4103b03d1e7..4fe9b709dd2 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletManagementTile.tsx @@ -1,3 +1,7 @@ +import { useCallback, useContext, useEffect, useMemo } from 'react' + +import { Client, BNWei } from '@audius/common/models' +import { StringKeys, FeatureFlags, Location } from '@audius/common/services' import { tokenDashboardPageSelectors, tokenDashboardPageActions, @@ -5,12 +9,6 @@ import { buyAudioActions, OnRampProvider } from '@audius/common/store' - -import { useCallback, useContext, useEffect, useMemo } from 'react' - -import {} from '@audius/common' -import { Client, BNWei } from '@audius/common/models' -import { StringKeys, FeatureFlags, Location } from '@audius/common/services' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Button, ButtonType, IconInfo } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx b/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx index e700d07bfd6..bd881037faa 100644 --- a/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/WalletsTable.tsx @@ -1,12 +1,10 @@ +import { useCallback, useContext, useEffect, MouseEvent } from 'react' + +import { Chain, BNWei } from '@audius/common/models' import { tokenDashboardPageSelectors, tokenDashboardPageActions } from '@audius/common/store' - -import { useCallback, useContext, useEffect, MouseEvent } from 'react' - -import {} from '@audius/common' -import { Chain, BNWei } from '@audius/common/models' import { shortenSPLAddress, shortenEthAddress } from '@audius/common/utils' import { LogoEth, LogoSol } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx index ac1f90aa759..e6138f90f53 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/AudioBreakdownModal.tsx @@ -1,9 +1,8 @@ +import { BNWei } from '@audius/common/models' import { tokenDashboardPageSelectors, walletSelectors } from '@audius/common/store' -import {} from '@audius/common' -import { BNWei } from '@audius/common/models' import { IconInfo } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx index 4085013d0dc..251bcbd47c4 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx @@ -2,7 +2,6 @@ import { challengesSelectors } from '@audius/common/store' import { ReactNode, useCallback } from 'react' -import {} from '@audius/common' import { useAudioMatchingChallengeCooldownSchedule } from '@audius/common/hooks' import { ChallengeName, OptimisticUserChallenge } from '@audius/common/models' import { diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx index 84170c0157f..dda005deca0 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx @@ -10,7 +10,6 @@ import { ChallengeRewardsModalType } from '@audius/common/store' -import {} from '@audius/common' import { fillString, formatNumberCommas, diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/HCaptchaModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/HCaptchaModal.tsx index 8ad3ba1c466..172d181bac5 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/HCaptchaModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/HCaptchaModal.tsx @@ -1,8 +1,6 @@ import { useCallback } from 'react' import { audioRewardsPageActions, HCaptchaStatus } from '@audius/common/store' - -import {} from '@audius/common' import HCaptcha from '@hcaptcha/react-hcaptcha' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx index 5f369282c01..33852567a8d 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/TrendingRewards.tsx @@ -1,14 +1,12 @@ +import { useCallback, useEffect, useState } from 'react' + +import { Theme } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { audioRewardsPageSelectors, audioRewardsPageActions, TrendingRewardsModalType } from '@audius/common/store' - -import { useCallback, useEffect, useState } from 'react' - -import {} from '@audius/common' -import { Theme } from '@audius/common/models' -import { StringKeys } from '@audius/common/services' import { SegmentedControl, ButtonType, Button, IconArrow } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/VipDiscordModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/VipDiscordModal.tsx index 4348f167090..dbdac04e6b0 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/VipDiscordModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/VipDiscordModal.tsx @@ -1,5 +1,4 @@ import { vipDiscordModalSelectors } from '@audius/common/store' -import {} from '@audius/common' import { Button, ButtonType, IconDiscord } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/pages/check-page/CheckPage.tsx b/packages/web/src/pages/check-page/CheckPage.tsx index e0632f7ecb0..9cdbc90c389 100644 --- a/packages/web/src/pages/check-page/CheckPage.tsx +++ b/packages/web/src/pages/check-page/CheckPage.tsx @@ -2,7 +2,6 @@ import { accountSelectors } from '@audius/common/store' import { useEffect, useState } from 'react' -import {} from '@audius/common' import { Status } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx index bc1ac2e3b1f..131bd3d5ff0 100644 --- a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx +++ b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx @@ -19,7 +19,6 @@ import { ComponentType } from 'react' -import {} from '@audius/common' import { ShareSource, Chain, diff --git a/packages/web/src/pages/dashboard-page/DashboardPage.tsx b/packages/web/src/pages/dashboard-page/DashboardPage.tsx index 27e366603aa..8d1aeb4e532 100644 --- a/packages/web/src/pages/dashboard-page/DashboardPage.tsx +++ b/packages/web/src/pages/dashboard-page/DashboardPage.tsx @@ -2,7 +2,6 @@ import { themeSelectors } from '@audius/common/store' import { useState, Suspense, ReactNode, useEffect, useCallback } from 'react' -import {} from '@audius/common' import { Status, Track } from '@audius/common/models' import { formatCount } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/pages/dashboard-page/store/sagas.ts b/packages/web/src/pages/dashboard-page/store/sagas.ts index 4d04f7b833d..c46566abe59 100644 --- a/packages/web/src/pages/dashboard-page/store/sagas.ts +++ b/packages/web/src/pages/dashboard-page/store/sagas.ts @@ -3,7 +3,7 @@ import { walletActions, getContext } from '@audius/common/store' -import {} from '@audius/common' + import { Collection, ID, Track } from '@audius/common/models' import { IntKeys } from '@audius/common/services' import { waitForValue, doEvery } from '@audius/common/utils' diff --git a/packages/web/src/pages/dashboard-page/store/selectors.ts b/packages/web/src/pages/dashboard-page/store/selectors.ts index 00a86bba20f..dac9117e79b 100644 --- a/packages/web/src/pages/dashboard-page/store/selectors.ts +++ b/packages/web/src/pages/dashboard-page/store/selectors.ts @@ -1,5 +1,5 @@ import { accountSelectors } from '@audius/common/store' -import {} from '@audius/common' + import { createSelector } from 'reselect' import { AppState } from 'store/types' diff --git a/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts b/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts index 912362179bf..12d3ed79650 100644 --- a/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts +++ b/packages/web/src/pages/deleted-page/store/lineups/more-by/reducer.ts @@ -1,6 +1,5 @@ -import { lineupActions, lineupReducer } from '@audius/common/store' -import {} from '@audius/common' import { LineupState, Track } from '@audius/common/models' +import { lineupActions, lineupReducer } from '@audius/common/store' import { PREFIX } from 'pages/deleted-page/store/lineups/more-by/actions' const { initialLineupState } = lineupReducer diff --git a/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts b/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts index fdb86e32ad3..ebd2988e129 100644 --- a/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts +++ b/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts @@ -1,5 +1,4 @@ import { accountSelectors } from '@audius/common/store' -import {} from '@audius/common' import { call, select } from 'typed-redux-saga' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/pages/deleted-page/store/slice.ts b/packages/web/src/pages/deleted-page/store/slice.ts index 4dbce395423..1f167658a0a 100644 --- a/packages/web/src/pages/deleted-page/store/slice.ts +++ b/packages/web/src/pages/deleted-page/store/slice.ts @@ -1,5 +1,4 @@ import { lineupReducer } from '@audius/common/store' -import {} from '@audius/common' import { createSlice } from '@reduxjs/toolkit' import { combineReducers } from 'redux' diff --git a/packages/web/src/pages/followers-page/FollowersPage.tsx b/packages/web/src/pages/followers-page/FollowersPage.tsx index 1c8de2fba68..c63ec18d8d4 100644 --- a/packages/web/src/pages/followers-page/FollowersPage.tsx +++ b/packages/web/src/pages/followers-page/FollowersPage.tsx @@ -5,8 +5,6 @@ import { FOLLOWERS_USER_LIST_TAG } from '@audius/common/store' -import {} from '@audius/common' - import MobilePageContainer from 'components/mobile-page-container/MobilePageContainer' import NavContext, { LeftPreset } from 'components/nav/store/context' import UserList from 'components/user-list/UserList' diff --git a/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx b/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx index fec5fa6a4fc..2c73437810e 100644 --- a/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx +++ b/packages/web/src/pages/remixes-page/RemixesPageProvider.tsx @@ -1,3 +1,6 @@ +import { useEffect, useCallback, ComponentType, RefObject } from 'react' + +import { ID } from '@audius/common/models' import { lineupSelectors, remixesPageLineupActions as tracksActions, @@ -6,11 +9,6 @@ import { queueSelectors, playerSelectors } from '@audius/common/store' - -import { useEffect, useCallback, ComponentType, RefObject } from 'react' - -import {} from '@audius/common' -import { ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { useParams } from 'react-router' diff --git a/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx b/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx index 021ec7e3ec4..d6d640a994f 100644 --- a/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx +++ b/packages/web/src/pages/sign-on/components/desktop/SignOnPage.tsx @@ -1,3 +1,6 @@ +import { Suspense, useEffect } from 'react' + +import { Status, ID, User } from '@audius/common/models' import { accountSelectors, InstagramProfile, @@ -5,11 +8,6 @@ import { TikTokProfile, Image } from '@audius/common/store' - -import { Suspense, useEffect } from 'react' - -import {} from '@audius/common' -import { Status, ID, User } from '@audius/common/models' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx b/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx index 483763d1bac..e5e33c3e302 100644 --- a/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx +++ b/packages/web/src/pages/sign-on/components/mobile/SignOnPage.tsx @@ -1,14 +1,12 @@ +import { useEffect } from 'react' + +import { ID, User } from '@audius/common/models' import { InstagramProfile, TwitterProfile, TikTokProfile, Image } from '@audius/common/store' - -import { useEffect } from 'react' - -import {} from '@audius/common' -import { ID, User } from '@audius/common/models' import cn from 'classnames' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/pages/supporting-page/SupportingPage.tsx b/packages/web/src/pages/supporting-page/SupportingPage.tsx index 8675268a0c0..7a20038daaa 100644 --- a/packages/web/src/pages/supporting-page/SupportingPage.tsx +++ b/packages/web/src/pages/supporting-page/SupportingPage.tsx @@ -5,8 +5,6 @@ import { SUPPORTING_USER_LIST_TAG } from '@audius/common/store' -import {} from '@audius/common' - import MobilePageContainer from 'components/mobile-page-container/MobilePageContainer' import NavContext, { LeftPreset } from 'components/nav/store/context' import UserList from 'components/user-list/UserList' diff --git a/packages/web/src/pages/trending-page/TrendingPageProvider.jsx b/packages/web/src/pages/trending-page/TrendingPageProvider.jsx index 9eb080e2e19..8cef859761c 100644 --- a/packages/web/src/pages/trending-page/TrendingPageProvider.jsx +++ b/packages/web/src/pages/trending-page/TrendingPageProvider.jsx @@ -1,3 +1,6 @@ +import { PureComponent } from 'react' + +import { Name, TimeRange } from '@audius/common/models' import { accountSelectors, lineupSelectors, @@ -7,11 +10,6 @@ import { queueSelectors, playerSelectors } from '@audius/common/store' - -import { PureComponent } from 'react' - -import {} from '@audius/common' -import { Name, TimeRange } from '@audius/common/models' import { GENRES } from '@audius/common/utils' import { push as pushRoute, diff --git a/packages/web/src/pages/trending-page/components/RewardsBanner.tsx b/packages/web/src/pages/trending-page/components/RewardsBanner.tsx index e240d96ebcf..11e222e8aa5 100644 --- a/packages/web/src/pages/trending-page/components/RewardsBanner.tsx +++ b/packages/web/src/pages/trending-page/components/RewardsBanner.tsx @@ -4,8 +4,6 @@ import { audioRewardsPageActions, TrendingRewardsModalType } from '@audius/common/store' - -import {} from '@audius/common' import { IconArrow, IconCrown } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx b/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx index 9c43a2cbd57..82b5f3c209d 100644 --- a/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx +++ b/packages/web/src/pages/trending-page/components/desktop/TrendingPageContent.tsx @@ -1,9 +1,7 @@ -import { trendingPageLineupActions } from '@audius/common/store' - import { useCallback, useRef, useState } from 'react' -import {} from '@audius/common' import { Name, Status, TimeRange } from '@audius/common/models' +import { trendingPageLineupActions } from '@audius/common/store' import { ELECTRONIC_PREFIX, TRENDING_GENRES } from '@audius/common/utils' import { make, useRecord } from 'common/store/analytics/actions' diff --git a/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx b/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx index 1f49f6bc2f0..665ec3d3626 100644 --- a/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx +++ b/packages/web/src/pages/trending-page/components/mobile/TrendingPageContent.tsx @@ -1,9 +1,7 @@ -import { trendingPageLineupActions } from '@audius/common/store' - import { useCallback, useContext, useEffect, useMemo } from 'react' -import {} from '@audius/common' import { Name, TimeRange } from '@audius/common/models' +import { trendingPageLineupActions } from '@audius/common/store' import cn from 'classnames' import IconAllTime from 'assets/img/iconAllTime.svg' diff --git a/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx b/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx index 640403343d2..2056bd86023 100644 --- a/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx +++ b/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx @@ -5,7 +5,6 @@ import { trendingUndergroundPageLineupActions } from '@audius/common/store' -import {} from '@audius/common' import { useDispatch } from 'react-redux' import DesktopHeader from 'components/header/desktop/Header' From 7f846aaea5e636155e2bfe11eac94ab08a81a4d1 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 17:53:46 -0800 Subject: [PATCH 49/64] Migrate web store --- .../web/src/common/hooks/useModalState.ts | 1 - packages/web/src/common/hooks/useSelector.ts | 1 - .../web/src/common/store/account/sagas.js | 13 ++++---- .../common/store/add-to-collection/sagas.ts | 1 - .../web/src/common/store/analytics/sagas.ts | 1 - .../web/src/common/store/backend/sagas.ts | 1 - .../collections/addTrackToPlaylistSaga.ts | 3 +- .../store/cache/collections/commonSagas.js | 3 +- .../cache/collections/confirmOrderPlaylist.js | 3 +- .../createPlaylistRequestedSaga.ts | 1 - .../cache/collections/createPlaylistSaga.ts | 21 ++++++------- .../collections/fixInvalidTracksInPlaylist.js | 1 - .../utils/addUsersFromCollections.ts | 3 +- .../utils/getUnclaimedPlaylistId.ts | 1 - .../utils/optimisticUpdateCollection.ts | 3 +- .../utils/processAndCacheCollections.ts | 11 +++---- packages/web/src/common/store/cache/sagas.js | 5 ++- .../web/src/common/store/cache/store.test.js | 3 +- .../common/store/cache/tracks/sagaHelpers.ts | 3 +- .../src/common/store/cache/tracks/sagas.js | 3 +- .../tracks/utils/fetchAndProcessRemixes.ts | 3 +- .../tracks/utils/fetchAndProcessStems.ts | 11 +++---- .../store/cache/tracks/utils/helpers.ts | 3 +- .../tracks/utils/processAndCacheTracks.ts | 3 +- .../cache/tracks/utils/retrieveTracks.ts | 15 +++++---- .../web/src/common/store/cache/users/sagas.js | 3 +- .../src/common/store/change-password/sagas.ts | 3 +- .../web/src/common/store/lineup/sagas.d.ts | 3 +- packages/web/src/common/store/lineup/sagas.js | 5 ++- .../checkForNewNotificationsSaga.ts | 1 - .../common/store/notifications/errorSagas.ts | 3 +- .../store/notifications/fetchNotifications.ts | 3 +- .../notifications/fetchNotificationsSaga.ts | 1 - .../parseAndProcessNotifications.ts | 3 +- .../notifications/refreshNotificationsSaga.ts | 1 - .../src/common/store/notifications/sagas.ts | 3 +- .../store/pages/ai/lineups/tracks/sagas.ts | 1 - .../web/src/common/store/pages/ai/sagas.ts | 3 +- .../common/store/pages/audio-rewards/sagas.ts | 25 +++++++-------- .../store/pages/audio-rewards/store.test.ts | 15 +++++---- .../store/pages/audio-transactions/sagas.ts | 4 +-- .../store/pages/collection/lineups/sagas.js | 3 +- .../common/store/pages/collection/sagas.js | 3 +- .../store/pages/deactivate-account/sagas.ts | 3 +- .../pages/explore/exploreCollections/sagas.ts | 3 +- .../src/common/store/pages/explore/sagas.ts | 3 +- .../common/store/pages/feed/lineup/sagas.ts | 15 +++++---- .../web/src/common/store/pages/feed/sagas.ts | 3 +- .../store/pages/history/lineups/sagas.js | 3 +- .../premium-tracks/lineups/tracks/sagas.ts | 1 - .../lineups/feed/retrieveUserReposts.ts | 3 +- .../store/pages/profile/lineups/feed/sagas.js | 3 +- .../lineups/tracks/retrieveUserTracks.ts | 3 +- .../pages/profile/lineups/tracks/sagas.js | 3 +- .../lineups/tracks/watchUploadTracksSaga.ts | 3 +- .../remixes-page/lineups/tracks/sagas.ts | 1 - .../common/store/pages/remixes-page/sagas.ts | 3 +- .../common/store/pages/saved/lineups/sagas.js | 3 +- .../web/src/common/store/pages/saved/sagas.ts | 15 +++++---- .../pages/search-page/lineups/tracks/sagas.js | 1 - .../common/store/pages/search-page/sagas.js | 3 +- .../src/common/store/pages/settings/sagas.ts | 3 +- .../src/common/store/pages/signon/actions.ts | 3 +- .../src/common/store/pages/signon/sagas.js | 15 +++++---- .../common/store/pages/signon/selectors.ts | 1 - .../pages/token-dashboard/addWalletToUser.ts | 3 +- .../token-dashboard/associateNewWallet.ts | 5 ++- .../pages/token-dashboard/checkIsNewWallet.ts | 3 +- .../token-dashboard/getAccountMetadataCID.ts | 1 - .../pages/token-dashboard/getWalletInfo.ts | 3 +- .../pages/token-dashboard/removeWalletSaga.ts | 5 ++- .../store/pages/token-dashboard/sagas.ts | 3 +- .../common/store/pages/track/lineups/sagas.ts | 1 - .../web/src/common/store/pages/track/sagas.js | 5 ++- .../pages/trending-playlists/lineups/sagas.ts | 5 ++- .../trending-underground/lineups/sagas.ts | 3 +- .../lineups/trending/retrieveTrending.ts | 5 ++- .../pages/trending/lineups/trending/sagas.js | 3 +- packages/web/src/common/store/player/sagas.ts | 5 ++- .../web/src/common/store/player/store.test.js | 1 - .../common/store/playlist-library/sagas.ts | 11 +++---- .../playlist-library/watchAddToFolderSaga.ts | 3 +- .../watchReorderLibrarySaga.ts | 3 +- .../playlistUpdatesPollingDaemon.ts | 3 +- .../src/common/store/recommendation/sagas.ts | 3 +- .../src/common/store/recovery-email/sagas.ts | 3 +- .../src/common/store/remix-settings/sagas.ts | 3 +- .../src/common/store/search-ai-bar/sagas.ts | 3 +- .../web/src/common/store/search-bar/sagas.ts | 3 +- .../common/store/smart-collection/sagas.ts | 13 ++++---- .../common/store/social/collections/sagas.ts | 17 +++++----- .../store/social/collections/store.test.js | 3 +- .../store/social/tracks/recordListen.ts | 3 +- .../src/common/store/social/tracks/sagas.ts | 5 ++- .../common/store/social/tracks/store.test.js | 3 +- .../src/common/store/social/users/sagas.ts | 3 +- .../common/store/social/users/store.test.js | 3 +- .../web/src/common/store/tipping/sagas.ts | 27 ++++++++-------- .../src/common/store/ui/reactions/sagas.ts | 3 +- .../web/src/common/store/upload/errorSagas.ts | 1 - .../src/common/store/upload/sagaHelpers.ts | 11 +++---- packages/web/src/common/store/upload/sagas.js | 3 +- .../store/user-list/favorites/errorSagas.ts | 1 - .../common/store/user-list/favorites/sagas.ts | 3 +- .../store/user-list/followers/errorSagas.ts | 1 - .../common/store/user-list/followers/sagas.ts | 3 +- .../store/user-list/following/errorSagas.ts | 1 - .../common/store/user-list/following/sagas.ts | 3 +- .../store/user-list/mutuals/errorSagas.ts | 1 - .../common/store/user-list/mutuals/sagas.ts | 5 ++- .../user-list/notifications/errorSagas.ts | 1 - .../store/user-list/notifications/sagas.ts | 1 - .../user-list/related-artists/errorSagas.ts | 1 - .../store/user-list/related-artists/sagas.ts | 3 +- .../store/user-list/reposts/errorSagas.ts | 1 - .../common/store/user-list/reposts/sagas.ts | 3 +- .../store/user-list/supporting/errorSagas.ts | 1 - .../store/user-list/supporting/sagas.ts | 11 +++---- .../user-list/top-supporters/errorSagas.ts | 1 - .../store/user-list/top-supporters/sagas.ts | 11 +++---- .../web/src/common/store/user-list/utils.ts | 5 ++- packages/web/src/common/store/wallet/sagas.ts | 17 +++++----- .../add-funds-modal/AddFundsModal.tsx | 9 +++--- .../desktop/AddToCollectionModal.tsx | 15 +++++---- .../mobile/AddToCollection.tsx | 7 ++--- .../AiAttributionDropdown.tsx | 3 +- .../ai-attribution-modal/SearchBarResult.jsx | 3 +- .../BrowserPushConfirmationModal.tsx | 1 - .../card/desktop/CollectionArtCard.tsx | 9 +++--- .../components/card/desktop/UserArtCard.tsx | 3 +- .../CoinflowOnrampModal.tsx | 7 ++--- .../components/CollectibleDetails.tsx | 7 ++--- .../components/CollectibleDetailsModal.tsx | 13 ++++---- .../components/CollectiblesPage.tsx | 11 +++---- .../components/collection/desktop/Artwork.tsx | 9 +++--- .../collection/desktop/CollectionHeader.tsx | 1 - .../collection/desktop/EditButton.tsx | 1 - .../collection/desktop/FavoriteButton.tsx | 13 ++++---- .../collection/desktop/OverflowMenuButton.tsx | 7 ++--- .../collection/desktop/OwnerActionButtons.tsx | 3 +- .../desktop/PublishConfirmationModal.tsx | 7 ++--- .../collection/desktop/RepostButton.tsx | 7 ++--- .../collection/desktop/ShareButton.tsx | 3 +- .../desktop/ViewerActionButtons.tsx | 3 +- .../collection/mobile/CollectionHeader.jsx | 3 +- .../components/cookie-banner/CookieBanner.tsx | 1 - .../data-entry/AccessAndSaleTriggerLegacy.tsx | 3 +- .../DeletePlaylistConfirmationModal.tsx | 1 - .../download-buttons/DownloadButtons.tsx | 3 +- .../DuplicateAddConfirmationModal.tsx | 1 - .../components/edit-track/EditTrackModal.tsx | 17 +++++----- .../components/embed-modal/store/selectors.ts | 3 +- .../FeatureFlagOverrideModal.tsx | 3 +- .../first-upload-modal/FirstUploadModal.tsx | 3 +- .../LeavingAudiusModal.tsx | 1 - .../src/components/lineup/LineupProvider.tsx | 11 +++---- packages/web/src/components/lineup/hooks.ts | 7 ++--- .../web/src/components/link/ExternalLink.tsx | 3 +- packages/web/src/components/link/UserLink.tsx | 3 +- .../LockedContentModal.tsx | 3 +- .../AddTrackToPlaylistNotification.tsx | 7 ++--- .../Notification/AnnouncementNotification.tsx | 3 +- .../ChallengeRewardNotification.tsx | 7 ++--- .../Notification/FavoriteNotification.tsx | 1 - .../Notification/FollowNotification.tsx | 1 - .../Notification/MilestoneNotification.tsx | 7 ++--- .../Notification/Notification.tsx | 3 +- .../Notification/RemixCosignNotification.tsx | 7 ++--- .../Notification/RemixCreateNotification.tsx | 7 ++--- .../Notification/RepostNotification.tsx | 1 - .../SupporterDethronedNotification.tsx | 7 ++--- .../Notification/TastemakerNotification.tsx | 7 ++--- .../Notification/TipReactionNotification.tsx | 9 +++--- .../Notification/TipReceivedNotification.tsx | 9 +++--- .../Notification/TipSentNotification.tsx | 9 +++--- .../Notification/TopSupporterNotification.tsx | 7 ++--- .../TopSupportingNotification.tsx | 7 ++--- .../TrendingPlaylistNotification.tsx | 7 ++--- .../TrendingTrackNotification.tsx | 7 ++--- .../TrendingUndergroundNotification.tsx | 7 ++--- .../USDCPurchaseBuyerNotification.tsx | 7 ++--- .../USDCPurchaseSellerNotification.tsx | 7 ++--- .../UserSubscriptionNotification.tsx | 7 ++--- .../Notification/components/EntityLink.tsx | 3 +- .../components/NotificationTile.tsx | 1 - .../Notification/components/TrackContent.tsx | 3 +- .../components/TwitterShareButton.tsx | 7 ++--- .../Notification/components/UserNameLink.tsx | 3 +- .../notification/NotificationModal.tsx | 1 - .../notification/NotificationPage.tsx | 10 +++--- .../notification/NotificationPanel.tsx | 10 +++--- .../src/components/now-playing/NowPlaying.tsx | 31 +++++++++---------- .../now-playing/NowPlayingDrawer.tsx | 3 +- .../on-ramp-button/OnRampButton.tsx | 1 - .../password-reset/PasswordResetModal.tsx | 3 +- .../components/password-reset/store/sagas.tsx | 1 - .../PinTrackConfirmation.tsx | 3 +- .../components/PurchaseContentFormFields.tsx | 3 +- .../components/PurchaseContentFormFooter.tsx | 9 +++--- .../hooks/usePurchaseContentFormState.ts | 3 +- .../hooks/usePurchaseSummaryValues.ts | 3 +- .../ConnectedProfileCompletionHeroCard.jsx | 1 - .../ConnectedProfileCompletionPane.jsx | 1 - .../ConnectedRemixSettingsModal.tsx | 7 ++--- .../RewardClaimedToast.tsx | 1 - .../search-bar/ConnectedSearchBar.jsx | 3 +- .../search-users-modal/SearchUsersModal.tsx | 11 +++---- .../src/components/share-modal/ShareModal.tsx | 9 +++--- .../web/src/components/share-modal/utils.ts | 3 +- .../StripeOnRampModal.tsx | 1 - .../components/SuggestedTracks.tsx | 3 +- .../tipping/feed-tip-tile/FeedTipTile.tsx | 7 ++--- .../tipping/support/SupportingList.tsx | 3 +- .../tipping/support/SupportingTile.tsx | 3 +- .../tipping/support/TopSupporters.tsx | 7 ++--- .../tipping/tip-audio/ConfirmSendTip.tsx | 1 - .../components/tipping/tip-audio/SendTip.tsx | 19 ++++++------ .../tipping/tip-audio/TipAudioButton.tsx | 1 - .../tipping/tip-audio/TipAudioModal.tsx | 7 ++--- .../components/tipping/tip-audio/TipSent.tsx | 3 +- packages/web/src/components/toast/Toast.tsx | 1 - .../web/src/components/toast/ToastContext.tsx | 1 - .../ConnectedMobileOverflowModal.tsx | 17 +++++----- .../src/components/track/AiTrackSection.tsx | 3 +- .../web/src/components/track/DownloadRow.tsx | 9 +++--- .../src/components/track/DownloadSection.tsx | 11 +++---- .../components/track/GatedTrackSection.tsx | 15 +++++---- .../src/components/track/GiantTrackTile.tsx | 11 +++---- .../track/GiantTrackTileProgressInfo.tsx | 3 +- .../src/components/track/PlayPauseButton.tsx | 5 ++- .../components/track/desktop/BottomRow.tsx | 3 +- .../track/desktop/ConnectedPlaylistTile.tsx | 17 +++++----- .../track/desktop/ConnectedTrackTile.tsx | 19 ++++++------ .../track/desktop/TrackListItem.tsx | 3 +- .../components/track/desktop/TrackTile.tsx | 9 +++--- .../track/desktop/stats/ProfileImage.tsx | 3 +- .../components/track/desktop/stats/Stats.tsx | 3 +- .../track/mobile/ConnectedPlaylistTile.tsx | 27 ++++++++-------- .../track/mobile/ConnectedTrackListItem.tsx | 9 +++--- .../track/mobile/ConnectedTrackTile.tsx | 23 +++++++------- .../src/components/track/mobile/TrackTile.tsx | 11 +++---- .../TransactionDetailsModal.tsx | 7 ++--- .../components/TransactionDetailsContent.tsx | 3 +- .../TransactionPurchaseMetadata.tsx | 1 - .../TrendingGenreSelectionPage.tsx | 3 +- .../components/twitter-auth/TwitterAuth.tsx | 2 +- .../UnfollowConfirmationModal.tsx | 3 +- .../components/unload-dialog/UnloadDialog.jsx | 1 - .../UploadConfirmationModal.tsx | 1 - .../USDCPurchaseDetailsModal.tsx | 1 - .../components/SaleModalContent.tsx | 1 - .../USDCTransactionDetailsModal.tsx | 1 - .../UserNameAndBadges.tsx | 3 +- .../withdraw-usdc-modal/WithdrawUSDCModal.tsx | 15 +++++---- .../components/CoinflowWithdrawModal.tsx | 7 ++--- .../components/ConfirmTransferDetails.tsx | 9 +++--- .../components/EnterTransferDetails.tsx | 11 +++---- .../components/ErrorPage.tsx | 9 +++--- .../components/PrepareTransfer.tsx | 1 - .../components/TransferSuccessful.tsx | 3 +- .../AudioMatchingRewardsModalContent.tsx | 3 +- .../ChallengeRewardsModal.tsx | 1 - .../web/src/pages/check-page/CheckPage.tsx | 3 +- .../CollectiblesPlaylistPageProvider.tsx | 23 +++++++------- .../pages/dashboard-page/DashboardPage.tsx | 3 +- .../src/pages/dashboard-page/store/sagas.ts | 5 ++- .../pages/dashboard-page/store/selectors.ts | 1 - packages/web/src/pages/modals/Modals.tsx | 2 -- .../pages/saved-page/SavedPageProvider.tsx | 2 +- .../sign-up-page/utils/loginDetailsSchema.ts | 2 +- .../TrendingUndergroundPage.tsx | 1 - 271 files changed, 573 insertions(+), 845 deletions(-) diff --git a/packages/web/src/common/hooks/useModalState.ts b/packages/web/src/common/hooks/useModalState.ts index 4cd3aa45bb5..5d141c4fa24 100644 --- a/packages/web/src/common/hooks/useModalState.ts +++ b/packages/web/src/common/hooks/useModalState.ts @@ -1,7 +1,6 @@ import { useCallback, useMemo } from 'react' import { modalsSelectors, modalsActions, Modals } from '@audius/common/store' - import { useDispatch } from 'react-redux' import { useSelector } from './useSelector' diff --git a/packages/web/src/common/hooks/useSelector.ts b/packages/web/src/common/hooks/useSelector.ts index 9fb2ada9c7a..102d84d18a6 100644 --- a/packages/web/src/common/hooks/useSelector.ts +++ b/packages/web/src/common/hooks/useSelector.ts @@ -1,5 +1,4 @@ import { CommonState } from '@audius/common/store' - import { useSelector as untypedUseSelector, TypedUseSelectorHook diff --git a/packages/web/src/common/store/account/sagas.js b/packages/web/src/common/store/account/sagas.js index 63214a3006f..0bde0eda4e8 100644 --- a/packages/web/src/common/store/account/sagas.js +++ b/packages/web/src/common/store/account/sagas.js @@ -1,3 +1,9 @@ +import { ErrorLevel, Kind } from '@audius/common/models' +import { + FeatureFlags, + recordIP, + createUserBankIfNeeded +} from '@audius/common/services' import { accountActions, accountSelectors, @@ -7,13 +13,6 @@ import { solanaSelectors, getContext } from '@audius/common/store' - -import { ErrorLevel, Kind } from '@audius/common/models' -import { - FeatureFlags, - recordIP, - createUserBankIfNeeded -} from '@audius/common/services' import { call, put, fork, select, takeEvery } from 'redux-saga/effects' import { identify } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/add-to-collection/sagas.ts b/packages/web/src/common/store/add-to-collection/sagas.ts index 96371505ff7..63a8019a696 100644 --- a/packages/web/src/common/store/add-to-collection/sagas.ts +++ b/packages/web/src/common/store/add-to-collection/sagas.ts @@ -3,7 +3,6 @@ import { addToCollectionUIActions as actions, modalsActions } from '@audius/common/store' - import { takeEvery, put } from 'redux-saga/effects' import { requiresAccount } from 'common/utils/requiresAccount' diff --git a/packages/web/src/common/store/analytics/sagas.ts b/packages/web/src/common/store/analytics/sagas.ts index 85f06e68863..b5f2e128384 100644 --- a/packages/web/src/common/store/analytics/sagas.ts +++ b/packages/web/src/common/store/analytics/sagas.ts @@ -1,5 +1,4 @@ import { getContext } from '@audius/common/store' - import { omit } from 'lodash' import { takeEvery, call } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/backend/sagas.ts b/packages/web/src/common/store/backend/sagas.ts index 3968e2c15ef..1350fa60712 100644 --- a/packages/web/src/common/store/backend/sagas.ts +++ b/packages/web/src/common/store/backend/sagas.ts @@ -4,7 +4,6 @@ import { reachabilitySelectors, getContext } from '@audius/common/store' - import { put, all, diff --git a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts index 7a211dce54e..8b0f179234d 100644 --- a/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/addTrackToPlaylistSaga.ts @@ -1,3 +1,4 @@ +import { Name, Kind, Collection, ID } from '@audius/common/models' import { cacheCollectionsActions, cacheCollectionsSelectors, @@ -11,8 +12,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { Name, Kind, Collection, ID } from '@audius/common/models' import { makeUid, makeKindId, diff --git a/packages/web/src/common/store/cache/collections/commonSagas.js b/packages/web/src/common/store/cache/collections/commonSagas.js index 6cd9b804eea..ba912b29f6c 100644 --- a/packages/web/src/common/store/cache/collections/commonSagas.js +++ b/packages/web/src/common/store/cache/collections/commonSagas.js @@ -1,3 +1,4 @@ +import { Name, DefaultSizes, Kind } from '@audius/common/models' import { accountActions, accountSelectors, @@ -15,8 +16,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { Name, DefaultSizes, Kind } from '@audius/common/models' import { squashNewLines, removeNullable, diff --git a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js index 01f5127fd26..02fcfb398a5 100644 --- a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js +++ b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.js @@ -1,3 +1,4 @@ +import { Kind } from '@audius/common/models' import { cacheCollectionsActions as collectionActions, cacheActions, @@ -6,8 +7,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { makeKindId } from '@audius/common/utils' import { call, put } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts index f14b0b0dd9f..cd6d0ab499a 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistRequestedSaga.ts @@ -3,7 +3,6 @@ import { cacheCollectionsSelectors, toastActions } from '@audius/common/store' - import { push } from 'connected-react-router' import { put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts index 25b9ee56af7..f8f53796d61 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts @@ -1,3 +1,13 @@ +import { + Name, + DefaultSizes, + Kind, + CollectionMetadata, + Collection, + ID, + Track +} from '@audius/common/models' +import { newCollectionMetadata } from '@audius/common/schemas' import { accountActions, accountSelectors, @@ -15,17 +25,6 @@ import { EditPlaylistValues, RequestConfirmationError } from '@audius/common/store' - -import { - Name, - DefaultSizes, - Kind, - CollectionMetadata, - Collection, - ID, - Track -} from '@audius/common/models' -import { newCollectionMetadata } from '@audius/common/schemas' import { makeKindId, Nullable } from '@audius/common/utils' import { call, put, select, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js b/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js index 291c4fa5bfa..19b85756522 100644 --- a/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js +++ b/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.js @@ -3,7 +3,6 @@ import { cacheCollectionsSelectors, getContext } from '@audius/common/store' - import { call, select } from 'redux-saga/effects' import { waitForWrite } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts index a2d4e81e169..0f769bc64cd 100644 --- a/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/addUsersFromCollections.ts @@ -1,11 +1,10 @@ +import { Kind, UserCollectionMetadata } from '@audius/common/models' import { accountSelectors, cacheActions, reformatUser, getContext } from '@audius/common/store' - -import { Kind, UserCollectionMetadata } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { uniqBy } from 'lodash' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts b/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts index a50b197afb7..e9009348f15 100644 --- a/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts +++ b/packages/web/src/common/store/cache/collections/utils/getUnclaimedPlaylistId.ts @@ -1,5 +1,4 @@ import { getContext } from '@audius/common/store' - import { decodeHashId } from '@audius/common/utils' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts b/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts index 4059e1e9dcd..2f19ea89689 100644 --- a/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts +++ b/packages/web/src/common/store/cache/collections/utils/optimisticUpdateCollection.ts @@ -1,6 +1,5 @@ -import { cacheActions } from '@audius/common/store' - import { Kind, Collection } from '@audius/common/models' +import { cacheActions } from '@audius/common/store' import { put } from 'typed-redux-saga' export function* optimisticUpdateCollection(collection: Collection) { diff --git a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts index 8b6bd2e8a46..86752493f5f 100644 --- a/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts +++ b/packages/web/src/common/store/cache/collections/utils/processAndCacheCollections.ts @@ -1,15 +1,14 @@ -import { - cacheActions, - reformatCollection, - getContext -} from '@audius/common/store' - import { Kind, CollectionMetadata, UserCollectionMetadata, ID } from '@audius/common/models' +import { + cacheActions, + reformatCollection, + getContext +} from '@audius/common/store' import { makeUid } from '@audius/common/utils' import { put, call } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/cache/sagas.js b/packages/web/src/common/store/cache/sagas.js index 4a99404b287..860aefb8e58 100644 --- a/packages/web/src/common/store/cache/sagas.js +++ b/packages/web/src/common/store/cache/sagas.js @@ -1,12 +1,11 @@ +import { Status } from '@audius/common/models' +import { IntKeys, FeatureFlags } from '@audius/common/services' import { cacheActions, cacheConfig, cacheSelectors, confirmerSelectors } from '@audius/common/store' - -import { Status } from '@audius/common/models' -import { IntKeys, FeatureFlags } from '@audius/common/services' import { makeUids, getIdFromKindId } from '@audius/common/utils' import { pick } from 'lodash' import { diff --git a/packages/web/src/common/store/cache/store.test.js b/packages/web/src/common/store/cache/store.test.js index 6c02f858203..7448cbd73f9 100644 --- a/packages/web/src/common/store/cache/store.test.js +++ b/packages/web/src/common/store/cache/store.test.js @@ -1,10 +1,9 @@ +import { Kind, Status } from '@audius/common/models' import { cacheActions as actions, cacheConfig as config, cacheReducer } from '@audius/common/store' - -import { Kind, Status } from '@audius/common/models' import { makeKindId } from '@audius/common/utils' /* eslint-disable no-import-assign */ import { combineReducers } from 'redux' diff --git a/packages/web/src/common/store/cache/tracks/sagaHelpers.ts b/packages/web/src/common/store/cache/tracks/sagaHelpers.ts index 0962427105a..afde7d21913 100644 --- a/packages/web/src/common/store/cache/tracks/sagaHelpers.ts +++ b/packages/web/src/common/store/cache/tracks/sagaHelpers.ts @@ -1,5 +1,3 @@ -import { accountSelectors } from '@audius/common/store' - import { Name, TrackAccessType, @@ -9,6 +7,7 @@ import { isContentUSDCPurchaseGated, Track } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { put, select } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/cache/tracks/sagas.js b/packages/web/src/common/store/cache/tracks/sagas.js index 96c6ac89075..fd5a11e15b7 100644 --- a/packages/web/src/common/store/cache/tracks/sagas.js +++ b/packages/web/src/common/store/cache/tracks/sagas.js @@ -1,3 +1,4 @@ +import { Name, DefaultSizes, SquareSizes, Kind } from '@audius/common/models' import { accountSelectors, averageColorActions, @@ -8,8 +9,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { Name, DefaultSizes, SquareSizes, Kind } from '@audius/common/models' import { formatUrlName, squashNewLines, diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts index 447184b223a..823915dc6f7 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessRemixes.ts @@ -1,11 +1,10 @@ +import { Kind, ID, UserTrackMetadata } from '@audius/common/models' import { accountSelectors, cacheTracksSelectors, cacheActions, getContext } from '@audius/common/store' - -import { Kind, ID, UserTrackMetadata } from '@audius/common/models' import { removeNullable, waitForValue } from '@audius/common/utils' import { select, call, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts index 2e9a4b15d7d..2eb950e5aa1 100644 --- a/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts +++ b/packages/web/src/common/store/cache/tracks/utils/fetchAndProcessStems.ts @@ -1,9 +1,3 @@ -import { - cacheTracksSelectors, - cacheActions, - getContext -} from '@audius/common/store' - import { Kind, StemCategory, @@ -11,6 +5,11 @@ import { Stem, StemTrackMetadata } from '@audius/common/models' +import { + cacheTracksSelectors, + cacheActions, + getContext +} from '@audius/common/store' import { waitForValue } from '@audius/common/utils' import { call, put } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/cache/tracks/utils/helpers.ts b/packages/web/src/common/store/cache/tracks/utils/helpers.ts index c0ab6161269..21daba5aa11 100644 --- a/packages/web/src/common/store/cache/tracks/utils/helpers.ts +++ b/packages/web/src/common/store/cache/tracks/utils/helpers.ts @@ -1,11 +1,10 @@ +import { Kind, TrackMetadata, User } from '@audius/common/models' import { accountSelectors, cacheActions, reformatUser, getContext } from '@audius/common/store' - -import { Kind, TrackMetadata, User } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { uniqBy } from 'lodash' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts index cd7edca7a74..208eb05ec97 100644 --- a/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts +++ b/packages/web/src/common/store/cache/tracks/utils/processAndCacheTracks.ts @@ -1,6 +1,5 @@ -import { cacheActions, getContext } from '@audius/common/store' - import { Kind, TrackMetadata, Track } from '@audius/common/models' +import { cacheActions, getContext } from '@audius/common/store' import { makeUid } from '@audius/common/utils' import { put, call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts b/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts index c1d22950316..b7c74e99ed2 100644 --- a/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts +++ b/packages/web/src/common/store/cache/tracks/utils/retrieveTracks.ts @@ -1,3 +1,10 @@ +import { + Kind, + ID, + TrackMetadata, + Track, + UserTrackMetadata +} from '@audius/common/models' import { accountSelectors, cacheTracksActions, @@ -8,14 +15,6 @@ import { getContext, CommonState } from '@audius/common/store' - -import { - Kind, - ID, - TrackMetadata, - Track, - UserTrackMetadata -} from '@audius/common/models' import { call, put, select, spawn } from 'typed-redux-saga' import { retrieve } from 'common/store/cache/sagas' diff --git a/packages/web/src/common/store/cache/users/sagas.js b/packages/web/src/common/store/cache/users/sagas.js index 1e79145670c..22a6ca2c418 100644 --- a/packages/web/src/common/store/cache/users/sagas.js +++ b/packages/web/src/common/store/cache/users/sagas.js @@ -1,3 +1,4 @@ +import { DefaultSizes, Kind } from '@audius/common/models' import { accountSelectors, cacheUsersActions as userActions, @@ -6,8 +7,6 @@ import { reformatUser, cacheUsersSelectors } from '@audius/common/store' - -import { DefaultSizes, Kind } from '@audius/common/models' import { waitForValue, waitForAccount } from '@audius/common/utils' import { mergeWith } from 'lodash' import { call, put, select, takeEvery, getContext } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/change-password/sagas.ts b/packages/web/src/common/store/change-password/sagas.ts index 465c2d630e3..d7b7614d7a9 100644 --- a/packages/web/src/common/store/change-password/sagas.ts +++ b/packages/web/src/common/store/change-password/sagas.ts @@ -1,6 +1,5 @@ -import { changePasswordActions, getContext } from '@audius/common/store' - import { Name } from '@audius/common/models' +import { changePasswordActions, getContext } from '@audius/common/store' import { call, put, takeEvery } from 'typed-redux-saga' import { make, TrackEvent } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/lineup/sagas.d.ts b/packages/web/src/common/store/lineup/sagas.d.ts index 9f78ec4b180..90ac65526fc 100644 --- a/packages/web/src/common/store/lineup/sagas.d.ts +++ b/packages/web/src/common/store/lineup/sagas.d.ts @@ -1,6 +1,5 @@ -import { LineupBaseActions } from '@audius/common/store' - import { Collection, LineupState, LineupTrack } from '@audius/common/models' +import { LineupBaseActions } from '@audius/common/store' export class LineupSagas { constructor( diff --git a/packages/web/src/common/store/lineup/sagas.js b/packages/web/src/common/store/lineup/sagas.js index dade7b18157..ce8e8726b11 100644 --- a/packages/web/src/common/store/lineup/sagas.js +++ b/packages/web/src/common/store/lineup/sagas.js @@ -1,3 +1,5 @@ +import { Name, Kind, isContentUSDCPurchaseGated } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/services' import { accountSelectors, cacheCollectionsSelectors, @@ -11,9 +13,6 @@ import { getContext, playerSelectors } from '@audius/common/store' - -import { Name, Kind, isContentUSDCPurchaseGated } from '@audius/common/models' -import { StringKeys, FeatureFlags } from '@audius/common/services' import { Uid, makeUids, makeUid } from '@audius/common/utils' import { all, diff --git a/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts b/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts index 485188afda6..441ef6264c0 100644 --- a/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/checkForNewNotificationsSaga.ts @@ -6,7 +6,6 @@ import { walletActions, Notification } from '@audius/common/store' - import { Dictionary } from '@reduxjs/toolkit' import { call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/errorSagas.ts b/packages/web/src/common/store/notifications/errorSagas.ts index 00fc7f0138e..9d3adcb1528 100644 --- a/packages/web/src/common/store/notifications/errorSagas.ts +++ b/packages/web/src/common/store/notifications/errorSagas.ts @@ -1,9 +1,8 @@ +import { ErrorLevel } from '@audius/common/models' import { notificationsActions, FetchNotificationsFailedAction } from '@audius/common/store' - -import { ErrorLevel } from '@audius/common/models' import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/notifications/fetchNotifications.ts b/packages/web/src/common/store/notifications/fetchNotifications.ts index 84fa4b8cdb6..9dc7dbd50d0 100644 --- a/packages/web/src/common/store/notifications/fetchNotifications.ts +++ b/packages/web/src/common/store/notifications/fetchNotifications.ts @@ -1,6 +1,5 @@ -import { getContext } from '@audius/common/store' - import { IntKeys, FeatureFlags } from '@audius/common/services' +import { getContext } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { partition } from 'lodash' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts b/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts index a140005bd7f..190d9070e14 100644 --- a/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/fetchNotificationsSaga.ts @@ -3,7 +3,6 @@ import { notificationsSelectors, FetchNotificationsAction } from '@audius/common/store' - import { getErrorMessage } from '@audius/common/utils' import { call, put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts index dc57e8ddaf4..860f5820a11 100644 --- a/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts +++ b/packages/web/src/common/store/notifications/parseAndProcessNotifications.ts @@ -1,3 +1,4 @@ +import { ID, Remix, Track } from '@audius/common/models' import { accountSelectors, NotificationType, @@ -6,8 +7,6 @@ import { reactionsUIActions, Notification } from '@audius/common/store' - -import { ID, Remix, Track } from '@audius/common/models' import { waitForAccount, waitForRead } from '@audius/common/utils' import moment from 'moment' import { all, call, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts b/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts index 340d5c38eab..03670978eb1 100644 --- a/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts +++ b/packages/web/src/common/store/notifications/refreshNotificationsSaga.ts @@ -1,5 +1,4 @@ import { notificationsActions } from '@audius/common/store' - import { getErrorMessage } from '@audius/common/utils' import { call, put, takeLatest } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/notifications/sagas.ts b/packages/web/src/common/store/notifications/sagas.ts index 2c8314e81df..084db68ba94 100644 --- a/packages/web/src/common/store/notifications/sagas.ts +++ b/packages/web/src/common/store/notifications/sagas.ts @@ -1,10 +1,9 @@ -import { notificationsActions, getContext } from '@audius/common/store' - import { IntKeys, remoteConfigIntDefaults, RemoteConfigInstance } from '@audius/common/services' +import { notificationsActions, getContext } from '@audius/common/store' import { call, takeEvery } from 'typed-redux-saga' import { waitForWrite } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts index 50d6aa9ec97..4217380af6c 100644 --- a/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts @@ -6,7 +6,6 @@ import { getContext, CommonState } from '@audius/common/store' - import { call, put, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/ai/sagas.ts b/packages/web/src/common/store/pages/ai/sagas.ts index 72806c0185b..594b4c55596 100644 --- a/packages/web/src/common/store/pages/ai/sagas.ts +++ b/packages/web/src/common/store/pages/ai/sagas.ts @@ -1,6 +1,5 @@ -import { aiPageActions, FetchAiUserAction } from '@audius/common/store' - import { User } from '@audius/common/models' +import { aiPageActions, FetchAiUserAction } from '@audius/common/store' import { Maybe } from '@audius/common/utils' import { takeEvery, call, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/audio-rewards/sagas.ts b/packages/web/src/common/store/pages/audio-rewards/sagas.ts index 0d2807f723a..d8f71196592 100644 --- a/packages/web/src/common/store/pages/audio-rewards/sagas.ts +++ b/packages/web/src/common/store/pages/audio-rewards/sagas.ts @@ -1,3 +1,15 @@ +import { + FailureReason, + UserChallenge, + StringAudio +} from '@audius/common/models' +import { + IntKeys, + StringKeys, + createUserBankIfNeeded, + Env, + RemoteConfigInstance +} from '@audius/common/services' import { accountActions, accountSelectors, @@ -12,19 +24,6 @@ import { musicConfettiActions, UndisbursedUserChallenge } from '@audius/common/store' - -import { - FailureReason, - UserChallenge, - StringAudio -} from '@audius/common/models' -import { - IntKeys, - StringKeys, - createUserBankIfNeeded, - Env, - RemoteConfigInstance -} from '@audius/common/services' import { stringAudioToStringWei, waitForValue } from '@audius/common/utils' import { call, diff --git a/packages/web/src/common/store/pages/audio-rewards/store.test.ts b/packages/web/src/common/store/pages/audio-rewards/store.test.ts index befd3da3293..944777214c5 100644 --- a/packages/web/src/common/store/pages/audio-rewards/store.test.ts +++ b/packages/web/src/common/store/pages/audio-rewards/store.test.ts @@ -1,3 +1,10 @@ +import { + FailureReason, + UserChallenge, + ChallengeRewardID, + StringAudio +} from '@audius/common/models' +import { IntKeys, StringKeys } from '@audius/common/services' import { accountSelectors, audioRewardsPageSelectors, @@ -9,14 +16,6 @@ import { modalsActions, AudioRewardsClaim } from '@audius/common/store' - -import { - FailureReason, - UserChallenge, - ChallengeRewardID, - StringAudio -} from '@audius/common/models' -import { IntKeys, StringKeys } from '@audius/common/services' import { stringAudioToStringWei } from '@audius/common/utils' import delayP from '@redux-saga/delay-p' import { all, fork } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/audio-transactions/sagas.ts b/packages/web/src/common/store/pages/audio-transactions/sagas.ts index e48b211aeb3..1179b26028f 100644 --- a/packages/web/src/common/store/pages/audio-transactions/sagas.ts +++ b/packages/web/src/common/store/pages/audio-transactions/sagas.ts @@ -1,3 +1,4 @@ +import { StringAudio } from '@audius/common/models' import { audioTransactionsPageActions, transactionDetailsActions, @@ -7,9 +8,6 @@ import { InAppAudioPurchaseMetadata, TransactionDetails } from '@audius/common/store' - -import type {} from '@audius/common' -import { StringAudio } from '@audius/common/models' import { formatDate, Nullable } from '@audius/common/utils' import { AudiusLibs, full } from '@audius/sdk' import { call, takeLatest, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/collection/lineups/sagas.js b/packages/web/src/common/store/pages/collection/lineups/sagas.js index cce5c7f9521..6e67893e165 100644 --- a/packages/web/src/common/store/pages/collection/lineups/sagas.js +++ b/packages/web/src/common/store/pages/collection/lineups/sagas.js @@ -1,11 +1,10 @@ +import { Kind } from '@audius/common/models' import { smartCollectionPageSelectors, collectionPageLineupActions as tracksActions, collectionPageSelectors, queueSelectors } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { removeNullable, Uid, waitForValue } from '@audius/common/utils' import { keyBy } from 'lodash' import moment from 'moment' diff --git a/packages/web/src/common/store/pages/collection/sagas.js b/packages/web/src/common/store/pages/collection/sagas.js index 285109a249f..e16003ec23c 100644 --- a/packages/web/src/common/store/pages/collection/sagas.js +++ b/packages/web/src/common/store/pages/collection/sagas.js @@ -1,3 +1,4 @@ +import { Kind } from '@audius/common/models' import { cacheActions, collectionPageLineupActions as tracksActions, @@ -5,8 +6,6 @@ import { collectionPageActions as collectionActions, reachabilitySelectors } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { call, put, select, takeLatest, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/deactivate-account/sagas.ts b/packages/web/src/common/store/pages/deactivate-account/sagas.ts index 4ef89137fa1..be1e44fe592 100644 --- a/packages/web/src/common/store/pages/deactivate-account/sagas.ts +++ b/packages/web/src/common/store/pages/deactivate-account/sagas.ts @@ -1,3 +1,4 @@ +import { Name } from '@audius/common/models' import { accountSelectors, deactivateAccountActions, @@ -7,8 +8,6 @@ import { confirmerSelectors, confirmTransaction } from '@audius/common/store' - -import { Name } from '@audius/common/models' import { waitForValue } from '@audius/common/utils' import { call, delay, put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts b/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts index b397880501e..7175d5228d7 100644 --- a/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts +++ b/packages/web/src/common/store/pages/explore/exploreCollections/sagas.ts @@ -1,11 +1,10 @@ +import { Collection, UserCollectionMetadata } from '@audius/common/models' import { accountSelectors, explorePageCollectionsActions, ExploreCollectionsVariant, getContext } from '@audius/common/store' - -import { Collection, UserCollectionMetadata } from '@audius/common/models' import { uniq } from 'lodash' import { takeEvery, call, select, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/explore/sagas.ts b/packages/web/src/common/store/pages/explore/sagas.ts index d81096585b6..ceb01b2dfb7 100644 --- a/packages/web/src/common/store/pages/explore/sagas.ts +++ b/packages/web/src/common/store/pages/explore/sagas.ts @@ -1,10 +1,9 @@ +import { ID } from '@audius/common/models' import { explorePageSelectors, explorePageActions, getContext } from '@audius/common/store' - -import { ID } from '@audius/common/models' import { call, put, takeEvery, select } from 'typed-redux-saga' import { retrieveCollections } from 'common/store/cache/collections/utils' diff --git a/packages/web/src/common/store/pages/feed/lineup/sagas.ts b/packages/web/src/common/store/pages/feed/lineup/sagas.ts index b9ecc834378..196d7a9a81b 100644 --- a/packages/web/src/common/store/pages/feed/lineup/sagas.ts +++ b/packages/web/src/common/store/pages/feed/lineup/sagas.ts @@ -1,11 +1,3 @@ -import { - accountSelectors, - feedPageLineupActions as feedActions, - feedPageSelectors, - getContext, - CommonState -} from '@audius/common/store' - import { FeedFilter, Kind, @@ -17,6 +9,13 @@ import { LineupTrack } from '@audius/common/models' import { GetSocialFeedArgs } from '@audius/common/services' +import { + accountSelectors, + feedPageLineupActions as feedActions, + feedPageSelectors, + getContext, + CommonState +} from '@audius/common/store' import { select, all } from 'redux-saga/effects' import { processAndCacheCollections } from 'common/store/cache/collections/utils' diff --git a/packages/web/src/common/store/pages/feed/sagas.ts b/packages/web/src/common/store/pages/feed/sagas.ts index 3d8318d46dc..30c90f2849c 100644 --- a/packages/web/src/common/store/pages/feed/sagas.ts +++ b/packages/web/src/common/store/pages/feed/sagas.ts @@ -1,10 +1,9 @@ +import { FollowSource, ID } from '@audius/common/models' import { feedPageLineupActions as feedActions, feedPageActions as discoverActions, usersSocialActions as socialActions } from '@audius/common/store' - -import { FollowSource, ID } from '@audius/common/models' import { getErrorMessage } from '@audius/common/utils' import { call, put, take, fork, takeEvery } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/history/lineups/sagas.js b/packages/web/src/common/store/pages/history/lineups/sagas.js index 2d6e5ad0b4b..4808b4f4fc4 100644 --- a/packages/web/src/common/store/pages/history/lineups/sagas.js +++ b/packages/web/src/common/store/pages/history/lineups/sagas.js @@ -1,9 +1,8 @@ +import { Kind } from '@audius/common/models' import { accountSelectors, historyPageTracksLineupActions as tracksActions } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { keyBy } from 'lodash' import { call, getContext, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts index 9588638fa43..ea4e75613f8 100644 --- a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts @@ -4,7 +4,6 @@ import { premiumTracksPageLineupActions, getContext } from '@audius/common/store' - import { call, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts index 0adb96a41cd..72f625dd8bb 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts +++ b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts @@ -1,11 +1,10 @@ -import { getContext } from '@audius/common/store' - import { UserCollection, ID, Track, UserTrackMetadata } from '@audius/common/models' +import { getContext } from '@audius/common/store' import { all } from 'redux-saga/effects' import { processAndCacheCollections } from 'common/store/cache/collections/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js index 3c10df5af3e..7adb9a54c38 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js +++ b/packages/web/src/common/store/pages/profile/lineups/feed/sagas.js @@ -1,3 +1,4 @@ +import { Kind } from '@audius/common/models' import { accountSelectors, cacheCollectionsSelectors, @@ -8,8 +9,6 @@ import { tracksSocialActions, confirmerSelectors } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { makeUid, getIdFromKindId, diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts index 0c9ddd19c47..cff38bed4ae 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts @@ -1,6 +1,5 @@ -import { getContext } from '@audius/common/store' - import { ID, Track } from '@audius/common/models' +import { getContext } from '@audius/common/store' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js b/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js index 9599da57c4d..59988ba0084 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/sagas.js @@ -1,10 +1,9 @@ -import { profilePageTracksLineupActions as tracksActions } from '@audius/common' import { Kind } from '@audius/common/models' import { + profilePageTracksLineupActions as tracksActions, accountSelectors, cacheTracksActions, cacheTracksSelectors, - lineupActions, profilePageTracksLineupActions as lineupActions, profilePageSelectors, TracksSortMode, diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts index 5fcee23bbcf..c8abc1cc10a 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts @@ -1,11 +1,10 @@ +import { Kind } from '@audius/common/models' import { accountSelectors, profilePageTracksLineupActions, profilePageSelectors, uploadActions } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts index f98ce1f6681..01f09ed5f29 100644 --- a/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts @@ -6,7 +6,6 @@ import { getContext, CommonState } from '@audius/common/store' - import { call, put, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/remixes-page/sagas.ts b/packages/web/src/common/store/pages/remixes-page/sagas.ts index 5145e561d1c..434e6ff2672 100644 --- a/packages/web/src/common/store/pages/remixes-page/sagas.ts +++ b/packages/web/src/common/store/pages/remixes-page/sagas.ts @@ -1,6 +1,5 @@ -import { remixesPageActions } from '@audius/common/store' - import { TrackMetadata, Track } from '@audius/common/models' +import { remixesPageActions } from '@audius/common/store' import { takeEvery, call, put } from 'redux-saga/effects' import { diff --git a/packages/web/src/common/store/pages/saved/lineups/sagas.js b/packages/web/src/common/store/pages/saved/lineups/sagas.js index aca3a54f0ae..0e2d5909323 100644 --- a/packages/web/src/common/store/pages/saved/lineups/sagas.js +++ b/packages/web/src/common/store/pages/saved/lineups/sagas.js @@ -1,3 +1,4 @@ +import { Kind } from '@audius/common/models' import { cacheTracksSelectors, savedPageTracksLineupActions as savedTracksActions, @@ -14,8 +15,6 @@ import { purchaseContentActions, ContentType } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { uniq } from 'lodash' import moment from 'moment' diff --git a/packages/web/src/common/store/pages/saved/sagas.ts b/packages/web/src/common/store/pages/saved/sagas.ts index aaba2d35402..56640635a19 100644 --- a/packages/web/src/common/store/pages/saved/sagas.ts +++ b/packages/web/src/common/store/pages/saved/sagas.ts @@ -1,3 +1,10 @@ +import { + FavoriteType, + Favorite, + UserTrackMetadata, + User +} from '@audius/common/models' +import { responseAdapter, APIActivityV2 } from '@audius/common/services' import { accountSelectors, savedPageTracksLineupActions as tracksActions, @@ -6,14 +13,6 @@ import { getContext, LibraryCategoryType } from '@audius/common/store' - -import { - FavoriteType, - Favorite, - UserTrackMetadata, - User -} from '@audius/common/models' -import { responseAdapter, APIActivityV2 } from '@audius/common/services' import { decodeHashId, encodeHashId, diff --git a/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js b/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js index f6b011fdd31..b0ac07fdaa1 100644 --- a/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js +++ b/packages/web/src/common/store/pages/search-page/lineups/tracks/sagas.js @@ -4,7 +4,6 @@ import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' - import { trimToAlphaNumeric } from '@audius/common/utils' import { select, all, call, getContext } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/search-page/sagas.js b/packages/web/src/common/store/pages/search-page/sagas.js index e5c0a097182..16af5940f8f 100644 --- a/packages/web/src/common/store/pages/search-page/sagas.js +++ b/packages/web/src/common/store/pages/search-page/sagas.js @@ -1,3 +1,4 @@ +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, processAndCacheUsers, @@ -5,8 +6,6 @@ import { searchResultsPageActions as searchPageActions, SearchKind } from '@audius/common/store' - -import { FeatureFlags } from '@audius/common/services' import { trimToAlphaNumeric, removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { diff --git a/packages/web/src/common/store/pages/settings/sagas.ts b/packages/web/src/common/store/pages/settings/sagas.ts index 69b8c6ef2f3..bd91208fe85 100644 --- a/packages/web/src/common/store/pages/settings/sagas.ts +++ b/packages/web/src/common/store/pages/settings/sagas.ts @@ -1,11 +1,10 @@ +import { Kind } from '@audius/common/models' import { accountSelectors, cacheActions, settingsPageActions as actions, getContext } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { getErrorMessage } from '@audius/common/utils' import { call, put, takeEvery, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/signon/actions.ts b/packages/web/src/common/store/pages/signon/actions.ts index d17f9b47aaf..0eaf23561c0 100644 --- a/packages/web/src/common/store/pages/signon/actions.ts +++ b/packages/web/src/common/store/pages/signon/actions.ts @@ -1,11 +1,10 @@ +import { ID, User } from '@audius/common/models' import { InstagramProfile, TwitterProfile, TikTokProfile, Image } from '@audius/common/store' - -import { ID, User } from '@audius/common/models' import { createCustomAction } from 'typesafe-actions' import { UiErrorCode } from 'store/errors/actions' diff --git a/packages/web/src/common/store/pages/signon/sagas.js b/packages/web/src/common/store/pages/signon/sagas.js index a4a08a6e5d9..6f2f0b713c4 100644 --- a/packages/web/src/common/store/pages/signon/sagas.js +++ b/packages/web/src/common/store/pages/signon/sagas.js @@ -1,3 +1,10 @@ +import { Name, FavoriteSource } from '@audius/common/models' +import { + IntKeys, + FeatureFlags, + MAX_HANDLE_LENGTH, + getCityAndRegion +} from '@audius/common/services' import { accountActions, accountSelectors, @@ -12,14 +19,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { Name, FavoriteSource } from '@audius/common/models' -import { - IntKeys, - FeatureFlags, - MAX_HANDLE_LENGTH, - getCityAndRegion -} from '@audius/common/services' import { Genre, ELECTRONIC_SUBGENRES, diff --git a/packages/web/src/common/store/pages/signon/selectors.ts b/packages/web/src/common/store/pages/signon/selectors.ts index 8103b4deee9..192fa5c99a9 100644 --- a/packages/web/src/common/store/pages/signon/selectors.ts +++ b/packages/web/src/common/store/pages/signon/selectors.ts @@ -1,5 +1,4 @@ import { accountSelectors, cacheUsersSelectors } from '@audius/common/store' - import { createSelector } from 'reselect' import { AppState } from 'store/types' diff --git a/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts b/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts index f9aa86442df..6a30760b0fd 100644 --- a/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts +++ b/packages/web/src/common/store/pages/token-dashboard/addWalletToUser.ts @@ -1,3 +1,4 @@ +import { Kind, User } from '@audius/common/models' import { accountSelectors, cacheActions, @@ -7,8 +8,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { Kind, User } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' import { getAccountMetadataCID } from './getAccountMetadataCID' diff --git a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts index f958fe760d9..3224b658d8f 100644 --- a/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/associateNewWallet.ts @@ -1,12 +1,11 @@ +import { Name, Chain } from '@audius/common/models' +import { newUserMetadata } from '@audius/common/schemas' import { accountSelectors, tokenDashboardPageSelectors, tokenDashboardPageActions, getContext } from '@audius/common/store' - -import { Name, Chain } from '@audius/common/models' -import { newUserMetadata } from '@audius/common/schemas' import { call, put, select } from 'typed-redux-saga' const { getAccountUser } = accountSelectors diff --git a/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts b/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts index cd91f29bcc1..f2e89759dc5 100644 --- a/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts +++ b/packages/web/src/common/store/pages/token-dashboard/checkIsNewWallet.ts @@ -1,10 +1,9 @@ +import { Name, Chain } from '@audius/common/models' import { tokenDashboardPageSelectors, tokenDashboardPageActions, getContext } from '@audius/common/store' - -import { Name, Chain } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' const { getAssociatedWallets } = tokenDashboardPageSelectors diff --git a/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts b/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts index a702a0a9fa8..10d1f89a5b1 100644 --- a/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts +++ b/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts @@ -1,5 +1,4 @@ import { accountSelectors, getContext } from '@audius/common/store' - import { select, call } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' diff --git a/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts b/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts index 10ab605bfea..20aad9b1d9d 100644 --- a/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts +++ b/packages/web/src/common/store/pages/token-dashboard/getWalletInfo.ts @@ -1,6 +1,5 @@ -import { getContext } from '@audius/common/store' - import { Chain } from '@audius/common/models' +import { getContext } from '@audius/common/store' import { call } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts index 0ecb629d123..ddfaa52107c 100644 --- a/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts +++ b/packages/web/src/common/store/pages/token-dashboard/removeWalletSaga.ts @@ -1,3 +1,5 @@ +import { Chain, Kind } from '@audius/common/models' +import { newUserMetadata } from '@audius/common/schemas' import { accountSelectors, cacheActions, @@ -8,9 +10,6 @@ import { confirmTransaction, ConfirmRemoveWalletAction } from '@audius/common/store' - -import { Chain, Kind } from '@audius/common/models' -import { newUserMetadata } from '@audius/common/schemas' import { call, fork, put, select, takeLatest } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/pages/token-dashboard/sagas.ts b/packages/web/src/common/store/pages/token-dashboard/sagas.ts index 866688fb15a..b555907d475 100644 --- a/packages/web/src/common/store/pages/token-dashboard/sagas.ts +++ b/packages/web/src/common/store/pages/token-dashboard/sagas.ts @@ -1,10 +1,9 @@ +import { Chain, CollectibleState } from '@audius/common/models' import { accountSelectors, tokenDashboardPageActions, getContext } from '@audius/common/store' - -import { Chain, CollectibleState } from '@audius/common/models' import { call, put, select, takeLatest } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/pages/track/lineups/sagas.ts b/packages/web/src/common/store/pages/track/lineups/sagas.ts index cb417281edd..ad4ed5080e1 100644 --- a/packages/web/src/common/store/pages/track/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/track/lineups/sagas.ts @@ -4,7 +4,6 @@ import { trackPageLineupActions, trackPageSelectors } from '@audius/common/store' - import { waitForValue } from '@audius/common/utils' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/track/sagas.js b/packages/web/src/common/store/pages/track/sagas.js index c6ee19c0a16..0c1fb2ee8ab 100644 --- a/packages/web/src/common/store/pages/track/sagas.js +++ b/packages/web/src/common/store/pages/track/sagas.js @@ -1,3 +1,5 @@ +import { Kind } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { cacheTracksActions as trackCacheActions, cacheTracksSelectors, @@ -7,9 +9,6 @@ import { trackPageSelectors, reachabilitySelectors } from '@audius/common/store' - -import { Kind } from '@audius/common/models' -import { StringKeys } from '@audius/common/services' import { makeUid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { keccak_256 } from 'js-sha3' diff --git a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts index f5cf44a46c8..90e385a5815 100644 --- a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts @@ -1,12 +1,11 @@ +import { UserCollectionMetadata } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { accountSelectors, trendingPlaylistsPageLineupSelectors, trendingPlaylistsPageLineupActions, getContext } from '@audius/common/store' - -import { UserCollectionMetadata } from '@audius/common/models' -import { StringKeys } from '@audius/common/services' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts index f7614267f2c..a3eed07d174 100644 --- a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts @@ -1,11 +1,10 @@ +import { StringKeys } from '@audius/common/services' import { accountSelectors, trendingUndergroundPageLineupSelectors, trendingUndergroundPageLineupActions, getContext } from '@audius/common/store' - -import { StringKeys } from '@audius/common/services' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts index 2cb37e84f32..33db220f560 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts +++ b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts @@ -1,3 +1,5 @@ +import { TimeRange, ID, Track, UserTrackMetadata } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { cacheTracksSelectors, trendingPageLineupSelectors, @@ -5,9 +7,6 @@ import { trendingPageSelectors, getContext } from '@audius/common/store' - -import { TimeRange, ID, Track, UserTrackMetadata } from '@audius/common/models' -import { StringKeys } from '@audius/common/services' import { Genre, Nullable } from '@audius/common/utils' import { keccak_256 } from 'js-sha3' import { call, put, select } from 'redux-saga/effects' diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js b/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js index 943d35372ec..5f10073f86e 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js +++ b/packages/web/src/common/store/pages/trending/lineups/trending/sagas.js @@ -1,10 +1,9 @@ +import { TimeRange } from '@audius/common/models' import { accountSelectors, trendingPageLineupActions, trendingPageSelectors } from '@audius/common/store' - -import { TimeRange } from '@audius/common/models' import { select } from 'redux-saga/effects' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/common/store/player/sagas.ts b/packages/web/src/common/store/player/sagas.ts index 58514b5b328..9cf3b5f17c3 100644 --- a/packages/web/src/common/store/player/sagas.ts +++ b/packages/web/src/common/store/player/sagas.ts @@ -1,3 +1,5 @@ +import { Kind } from '@audius/common/models' +import { FeatureFlags, QueryParams } from '@audius/common/services' import { accountSelectors, cacheTracksSelectors, @@ -12,9 +14,6 @@ import { playbackPositionSelectors, gatedContentSelectors } from '@audius/common/store' - -import { Kind } from '@audius/common/models' -import { FeatureFlags, QueryParams } from '@audius/common/services' import { Genre, encodeHashId, diff --git a/packages/web/src/common/store/player/store.test.js b/packages/web/src/common/store/player/store.test.js index 598ee5b67ef..55011142691 100644 --- a/packages/web/src/common/store/player/store.test.js +++ b/packages/web/src/common/store/player/store.test.js @@ -1,5 +1,4 @@ import { playerReducer, playerActions } from '@audius/common/store' - import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import { describe, it, expect, vitest } from 'vitest' diff --git a/packages/web/src/common/store/playlist-library/sagas.ts b/packages/web/src/common/store/playlist-library/sagas.ts index 5f2515145e6..3f8803f3f64 100644 --- a/packages/web/src/common/store/playlist-library/sagas.ts +++ b/packages/web/src/common/store/playlist-library/sagas.ts @@ -1,3 +1,8 @@ +import { + Kind, + PlaylistLibraryID, + PlaylistIdentifier +} from '@audius/common/models' import { accountSelectors, cacheActions, @@ -5,12 +10,6 @@ import { playlistLibraryHelpers, AccountCollection } from '@audius/common/store' - -import { - Kind, - PlaylistLibraryID, - PlaylistIdentifier -} from '@audius/common/models' import { fork, put, select, takeEvery } from 'typed-redux-saga' import { updateProfileAsync } from 'common/store/profile/sagas' diff --git a/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts b/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts index 3245514dae8..39740aac317 100644 --- a/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts +++ b/packages/web/src/common/store/playlist-library/watchAddToFolderSaga.ts @@ -1,3 +1,4 @@ +import { Name, FavoriteSource } from '@audius/common/models' import { accountSelectors, playlistLibraryActions, @@ -7,8 +8,6 @@ import { AddToFolderAction, CommonState } from '@audius/common/store' - -import { Name, FavoriteSource } from '@audius/common/models' import { takeEvery, select, put } from 'typed-redux-saga' import { make } from '../analytics/actions' diff --git a/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts b/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts index ab2b1f8c249..11a20f57bca 100644 --- a/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts +++ b/packages/web/src/common/store/playlist-library/watchReorderLibrarySaga.ts @@ -1,3 +1,4 @@ +import { Name, FavoriteSource } from '@audius/common/models' import { accountSelectors, playlistLibraryActions, @@ -6,8 +7,6 @@ import { ReorderAction, CommonState } from '@audius/common/store' - -import { Name, FavoriteSource } from '@audius/common/models' import { takeEvery, select, put } from 'typed-redux-saga' import { make } from '../analytics/actions' diff --git a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts index 7b117ca48c0..bbef7b1396c 100644 --- a/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts +++ b/packages/web/src/common/store/playlist-updates/playlistUpdatesPollingDaemon.ts @@ -1,10 +1,9 @@ +import { IntKeys, remoteConfigIntDefaults } from '@audius/common/services' import { accountActions, getContext, playlistUpdatesActions } from '@audius/common/store' - -import { IntKeys, remoteConfigIntDefaults } from '@audius/common/services' import { call, fork, take } from 'typed-redux-saga' import { diff --git a/packages/web/src/common/store/recommendation/sagas.ts b/packages/web/src/common/store/recommendation/sagas.ts index 573b5d2bf81..f86c5be6d80 100644 --- a/packages/web/src/common/store/recommendation/sagas.ts +++ b/packages/web/src/common/store/recommendation/sagas.ts @@ -1,6 +1,5 @@ -import { getContext } from '@audius/common/store' - import { ID } from '@audius/common/models' +import { getContext } from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { call } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/recovery-email/sagas.ts b/packages/web/src/common/store/recovery-email/sagas.ts index a0482442119..cd7724809e2 100644 --- a/packages/web/src/common/store/recovery-email/sagas.ts +++ b/packages/web/src/common/store/recovery-email/sagas.ts @@ -1,6 +1,5 @@ -import { recoveryEmailActions, getContext } from '@audius/common/store' - import { Name } from '@audius/common/models' +import { recoveryEmailActions, getContext } from '@audius/common/store' import { takeLatest, put, call } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/remix-settings/sagas.ts b/packages/web/src/common/store/remix-settings/sagas.ts index 1392184c20a..f264c076e88 100644 --- a/packages/web/src/common/store/remix-settings/sagas.ts +++ b/packages/web/src/common/store/remix-settings/sagas.ts @@ -1,6 +1,5 @@ -import { getContext, remixSettingsActions } from '@audius/common/store' - import { TrackMetadata, Track } from '@audius/common/models' +import { getContext, remixSettingsActions } from '@audius/common/store' import { takeLatest, call, put } from 'typed-redux-saga' import { parseTrackRoute } from 'utils/route/trackRouteParser' diff --git a/packages/web/src/common/store/search-ai-bar/sagas.ts b/packages/web/src/common/store/search-ai-bar/sagas.ts index 6dd600df455..a29a6c4a64e 100644 --- a/packages/web/src/common/store/search-ai-bar/sagas.ts +++ b/packages/web/src/common/store/search-ai-bar/sagas.ts @@ -1,6 +1,5 @@ -import { accountSelectors, SearchKind, getContext } from '@audius/common/store' - import { Name } from '@audius/common/models' +import { accountSelectors, SearchKind, getContext } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { diff --git a/packages/web/src/common/store/search-bar/sagas.ts b/packages/web/src/common/store/search-bar/sagas.ts index bf381d32c4f..a24228a9f15 100644 --- a/packages/web/src/common/store/search-bar/sagas.ts +++ b/packages/web/src/common/store/search-bar/sagas.ts @@ -1,7 +1,6 @@ -import { accountSelectors, getContext } from '@audius/common/store' - import { Name } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { accountSelectors, getContext } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { flatMap, zip } from 'lodash' import { diff --git a/packages/web/src/common/store/smart-collection/sagas.ts b/packages/web/src/common/store/smart-collection/sagas.ts index ba278091467..c1afbe04cb0 100644 --- a/packages/web/src/common/store/smart-collection/sagas.ts +++ b/packages/web/src/common/store/smart-collection/sagas.ts @@ -1,3 +1,9 @@ +import { + SmartCollectionVariant, + Track, + UserTrackMetadata, + UserTrack +} from '@audius/common/models' import { accountSelectors, smartCollectionPageActions, @@ -5,13 +11,6 @@ import { collectionPageActions, getContext } from '@audius/common/store' - -import { - SmartCollectionVariant, - Track, - UserTrackMetadata, - UserTrack -} from '@audius/common/models' import { removeNullable } from '@audius/common/utils' import { takeEvery, put, call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/social/collections/sagas.ts b/packages/web/src/common/store/social/collections/sagas.ts index 1545da7929c..ad6b2945847 100644 --- a/packages/web/src/common/store/social/collections/sagas.ts +++ b/packages/web/src/common/store/social/collections/sagas.ts @@ -1,3 +1,11 @@ +import { + Name, + Kind, + SmartCollectionVariant, + ID, + PlaylistLibrary, + User +} from '@audius/common/models' import { accountActions, accountSelectors, @@ -14,15 +22,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { - Name, - Kind, - SmartCollectionVariant, - ID, - PlaylistLibrary, - User -} from '@audius/common/models' import { formatShareText, makeUid, makeKindId } from '@audius/common/utils' import { call, select, takeEvery, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/social/collections/store.test.js b/packages/web/src/common/store/social/collections/store.test.js index c637e29cf27..6c2142e96c7 100644 --- a/packages/web/src/common/store/social/collections/store.test.js +++ b/packages/web/src/common/store/social/collections/store.test.js @@ -1,9 +1,8 @@ +import { Kind } from '@audius/common/models' import { cacheActions, collectionsSocialActions as actions } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import * as matchers from 'redux-saga-test-plan/matchers' diff --git a/packages/web/src/common/store/social/tracks/recordListen.ts b/packages/web/src/common/store/social/tracks/recordListen.ts index ee1bc8fa4b0..aab0ac780a1 100644 --- a/packages/web/src/common/store/social/tracks/recordListen.ts +++ b/packages/web/src/common/store/social/tracks/recordListen.ts @@ -1,3 +1,4 @@ +import { Name } from '@audius/common/models' import { accountSelectors, cacheTracksSelectors, @@ -5,8 +6,6 @@ import { tracksSocialActions, getContext } from '@audius/common/store' - -import { Name } from '@audius/common/models' import { call, put, select, takeEvery } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/social/tracks/sagas.ts b/packages/web/src/common/store/social/tracks/sagas.ts index 02a15885419..97d8e855802 100644 --- a/packages/web/src/common/store/social/tracks/sagas.ts +++ b/packages/web/src/common/store/social/tracks/sagas.ts @@ -1,3 +1,5 @@ +import { Name, Kind, ID, Track, User } from '@audius/common/models' +import { FeatureFlags, QueryParams } from '@audius/common/services' import { accountSelectors, cacheTracksSelectors, @@ -9,9 +11,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { Name, Kind, ID, Track, User } from '@audius/common/models' -import { FeatureFlags, QueryParams } from '@audius/common/services' import { formatShareText, encodeHashId, diff --git a/packages/web/src/common/store/social/tracks/store.test.js b/packages/web/src/common/store/social/tracks/store.test.js index c075171e205..286497f49a0 100644 --- a/packages/web/src/common/store/social/tracks/store.test.js +++ b/packages/web/src/common/store/social/tracks/store.test.js @@ -1,9 +1,8 @@ +import { Kind } from '@audius/common/models' import { cacheActions, tracksSocialActions as actions } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import * as matchers from 'redux-saga-test-plan/matchers' diff --git a/packages/web/src/common/store/social/users/sagas.ts b/packages/web/src/common/store/social/users/sagas.ts index 849f609d057..4dbefe9babc 100644 --- a/packages/web/src/common/store/social/users/sagas.ts +++ b/packages/web/src/common/store/social/users/sagas.ts @@ -1,3 +1,4 @@ +import { Name, Kind, ID } from '@audius/common/models' import { accountSelectors, cacheActions, @@ -8,8 +9,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { Name, Kind, ID } from '@audius/common/models' import { makeKindId } from '@audius/common/utils' import { call, select, takeEvery, put } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/social/users/store.test.js b/packages/web/src/common/store/social/users/store.test.js index 4bb42b5fc39..407ac76240a 100644 --- a/packages/web/src/common/store/social/users/store.test.js +++ b/packages/web/src/common/store/social/users/store.test.js @@ -1,9 +1,8 @@ +import { Kind } from '@audius/common/models' import { cacheActions, usersSocialActions as actions } from '@audius/common/store' - -import { Kind } from '@audius/common/models' import { combineReducers } from 'redux' import { expectSaga } from 'redux-saga-test-plan' import * as matchers from 'redux-saga-test-plan/matchers' diff --git a/packages/web/src/common/store/tipping/sagas.ts b/packages/web/src/common/store/tipping/sagas.ts index 57a8aeef623..998008b2cb4 100644 --- a/packages/web/src/common/store/tipping/sagas.ts +++ b/packages/web/src/common/store/tipping/sagas.ts @@ -1,17 +1,3 @@ -import { - accountSelectors, - cacheActions, - processAndCacheUsers, - chatActions, - solanaSelectors, - tippingSelectors, - tippingActions, - walletSelectors, - walletActions, - getContext, - RefreshSupportPayloadAction -} from '@audius/common/store' - import { Name, Kind, @@ -31,6 +17,19 @@ import { GetSupportersArgs, GetTipsArgs } from '@audius/common/services' +import { + accountSelectors, + cacheActions, + processAndCacheUsers, + chatActions, + solanaSelectors, + tippingSelectors, + tippingActions, + walletSelectors, + walletActions, + getContext, + RefreshSupportPayloadAction +} from '@audius/common/store' import { decodeHashId, isNullOrUndefined, diff --git a/packages/web/src/common/store/ui/reactions/sagas.ts b/packages/web/src/common/store/ui/reactions/sagas.ts index 5d1a78792f0..83e40c9f309 100644 --- a/packages/web/src/common/store/ui/reactions/sagas.ts +++ b/packages/web/src/common/store/ui/reactions/sagas.ts @@ -1,3 +1,4 @@ +import { AudiusBackend } from '@audius/common/services' import { reactionsUIActions, reactionsUISelectors, @@ -5,8 +6,6 @@ import { getReactionFromRawValue, getContext } from '@audius/common/store' - -import { AudiusBackend } from '@audius/common/services' import { getErrorMessage, removeNullable } from '@audius/common/utils' import { call, takeEvery, all, put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/upload/errorSagas.ts b/packages/web/src/common/store/upload/errorSagas.ts index c56cd82e440..0c2e3bc45bc 100644 --- a/packages/web/src/common/store/upload/errorSagas.ts +++ b/packages/web/src/common/store/upload/errorSagas.ts @@ -1,5 +1,4 @@ import { uploadActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/upload/sagaHelpers.ts b/packages/web/src/common/store/upload/sagaHelpers.ts index c5e3982bfad..5bd730bbcc9 100644 --- a/packages/web/src/common/store/upload/sagaHelpers.ts +++ b/packages/web/src/common/store/upload/sagaHelpers.ts @@ -1,9 +1,3 @@ -import { - accountSelectors, - getUSDCUserBank, - getContext -} from '@audius/common/store' - import { Name, isContentCollectibleGated, @@ -13,6 +7,11 @@ import { TrackMetadata } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + getUSDCUserBank, + getContext +} from '@audius/common/store' import { BN_USDC_CENT_WEI } from '@audius/common/utils' import { PublicKey } from '@solana/web3.js' import BN from 'bn.js' diff --git a/packages/web/src/common/store/upload/sagas.js b/packages/web/src/common/store/upload/sagas.js index 548610623d8..4a047591d82 100644 --- a/packages/web/src/common/store/upload/sagas.js +++ b/packages/web/src/common/store/upload/sagas.js @@ -1,3 +1,4 @@ +import { Name, Kind } from '@audius/common/models' import { accountActions, accountSelectors, @@ -13,8 +14,6 @@ import { confirmerActions, confirmTransaction } from '@audius/common/store' - -import { Name, Kind } from '@audius/common/models' import { formatUrlName, makeUid, diff --git a/packages/web/src/common/store/user-list/favorites/errorSagas.ts b/packages/web/src/common/store/user-list/favorites/errorSagas.ts index b000654e2e9..6e1cdc2b48c 100644 --- a/packages/web/src/common/store/user-list/favorites/errorSagas.ts +++ b/packages/web/src/common/store/user-list/favorites/errorSagas.ts @@ -1,5 +1,4 @@ import { favoritesUserListActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/favorites/sagas.ts b/packages/web/src/common/store/user-list/favorites/sagas.ts index 5cbebdf9dfa..9edeecc5a3c 100644 --- a/packages/web/src/common/store/user-list/favorites/sagas.ts +++ b/packages/web/src/common/store/user-list/favorites/sagas.ts @@ -1,3 +1,4 @@ +import { FavoriteType, Collection, ID, Track } from '@audius/common/models' import { cacheCollectionsSelectors, cacheTracksSelectors, @@ -6,8 +7,6 @@ import { favoritesUserListSelectors, FAVORITES_USER_LIST_TAG } from '@audius/common/store' - -import { FavoriteType, Collection, ID, Track } from '@audius/common/models' import { select, put } from 'typed-redux-saga' import { watchFavoriteError } from 'common/store/user-list/favorites/errorSagas' diff --git a/packages/web/src/common/store/user-list/followers/errorSagas.ts b/packages/web/src/common/store/user-list/followers/errorSagas.ts index f37e41df6ef..2ee27f2592e 100644 --- a/packages/web/src/common/store/user-list/followers/errorSagas.ts +++ b/packages/web/src/common/store/user-list/followers/errorSagas.ts @@ -1,5 +1,4 @@ import { followersUserListActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/followers/sagas.ts b/packages/web/src/common/store/user-list/followers/sagas.ts index 1e639d8d015..bcf2099381a 100644 --- a/packages/web/src/common/store/user-list/followers/sagas.ts +++ b/packages/web/src/common/store/user-list/followers/sagas.ts @@ -1,3 +1,4 @@ +import { ID, User } from '@audius/common/models' import { cacheUsersSelectors, UserListSagaFactory, @@ -5,8 +6,6 @@ import { followersUserListSelectors, FOLLOWERS_USER_LIST_TAG as USER_LIST_TAG } from '@audius/common/store' - -import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { watchFollowersError } from 'common/store/user-list/followers/errorSagas' diff --git a/packages/web/src/common/store/user-list/following/errorSagas.ts b/packages/web/src/common/store/user-list/following/errorSagas.ts index 9dee28aea7a..dc3243f9ce7 100644 --- a/packages/web/src/common/store/user-list/following/errorSagas.ts +++ b/packages/web/src/common/store/user-list/following/errorSagas.ts @@ -1,5 +1,4 @@ import { followingUserListActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/following/sagas.ts b/packages/web/src/common/store/user-list/following/sagas.ts index 117a343fb60..e20e871dba1 100644 --- a/packages/web/src/common/store/user-list/following/sagas.ts +++ b/packages/web/src/common/store/user-list/following/sagas.ts @@ -1,3 +1,4 @@ +import { ID, User } from '@audius/common/models' import { cacheUsersSelectors, UserListSagaFactory, @@ -5,8 +6,6 @@ import { followingUserListSelectors, FOLLOWING_USER_LIST_TAG } from '@audius/common/store' - -import { ID, User } from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { watchFollowingError } from 'common/store/user-list/following/errorSagas' diff --git a/packages/web/src/common/store/user-list/mutuals/errorSagas.ts b/packages/web/src/common/store/user-list/mutuals/errorSagas.ts index c1a1028f8ed..ad5218ff575 100644 --- a/packages/web/src/common/store/user-list/mutuals/errorSagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/errorSagas.ts @@ -1,5 +1,4 @@ import { mutualsUserListActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/mutuals/sagas.ts b/packages/web/src/common/store/user-list/mutuals/sagas.ts index 944ce0349bb..782fdc7bf0f 100644 --- a/packages/web/src/common/store/user-list/mutuals/sagas.ts +++ b/packages/web/src/common/store/user-list/mutuals/sagas.ts @@ -1,3 +1,5 @@ +import { ID, User } from '@audius/common/models' +import { AudiusBackend } from '@audius/common/services' import { cacheUsersSelectors, UserListSagaFactory, @@ -5,9 +7,6 @@ import { mutualsUserListSelectors, MUTUALS_USER_LIST_TAG } from '@audius/common/store' - -import { ID, User } from '@audius/common/models' -import { AudiusBackend } from '@audius/common/services' import { put, select } from 'typed-redux-saga' import { watchMutualsError } from 'common/store/user-list/mutuals/errorSagas' diff --git a/packages/web/src/common/store/user-list/notifications/errorSagas.ts b/packages/web/src/common/store/user-list/notifications/errorSagas.ts index 6c66560e28a..e81ebb861f9 100644 --- a/packages/web/src/common/store/user-list/notifications/errorSagas.ts +++ b/packages/web/src/common/store/user-list/notifications/errorSagas.ts @@ -1,5 +1,4 @@ import { notificationsUserListActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/notifications/sagas.ts b/packages/web/src/common/store/user-list/notifications/sagas.ts index e6b475fdca0..84160d406cc 100644 --- a/packages/web/src/common/store/user-list/notifications/sagas.ts +++ b/packages/web/src/common/store/user-list/notifications/sagas.ts @@ -5,7 +5,6 @@ import { notificationsUserListSelectors, NOTIFICATIONS_USER_LIST_TAG as USER_LIST_TAG } from '@audius/common/store' - import { call, put, select } from 'typed-redux-saga' import { fetchUsers as retrieveUsers } from 'common/store/cache/users/sagas' diff --git a/packages/web/src/common/store/user-list/related-artists/errorSagas.ts b/packages/web/src/common/store/user-list/related-artists/errorSagas.ts index a839d22dd59..94967d0105f 100644 --- a/packages/web/src/common/store/user-list/related-artists/errorSagas.ts +++ b/packages/web/src/common/store/user-list/related-artists/errorSagas.ts @@ -1,5 +1,4 @@ import { relatedArtistsUserListActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/related-artists/sagas.ts b/packages/web/src/common/store/user-list/related-artists/sagas.ts index 1cb5e1b06f7..c68e3e67a3e 100644 --- a/packages/web/src/common/store/user-list/related-artists/sagas.ts +++ b/packages/web/src/common/store/user-list/related-artists/sagas.ts @@ -1,3 +1,4 @@ +import { ID } from '@audius/common/models' import { UserListSagaFactory, relatedArtistsUserListActions, @@ -5,8 +6,6 @@ import { RELATED_ARTISTS_USER_LIST_TAG, getContext } from '@audius/common/store' - -import { ID } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' import { watchRelatedArtistsError } from './errorSagas' diff --git a/packages/web/src/common/store/user-list/reposts/errorSagas.ts b/packages/web/src/common/store/user-list/reposts/errorSagas.ts index 0c23e8e69e1..4522f35efd5 100644 --- a/packages/web/src/common/store/user-list/reposts/errorSagas.ts +++ b/packages/web/src/common/store/user-list/reposts/errorSagas.ts @@ -1,5 +1,4 @@ import { repostsUserListActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/reposts/sagas.ts b/packages/web/src/common/store/user-list/reposts/sagas.ts index dad8468c4da..0df2232aeb2 100644 --- a/packages/web/src/common/store/user-list/reposts/sagas.ts +++ b/packages/web/src/common/store/user-list/reposts/sagas.ts @@ -1,3 +1,4 @@ +import { Collection, ID, Track } from '@audius/common/models' import { cacheCollectionsSelectors, cacheTracksSelectors, @@ -7,8 +8,6 @@ import { RepostType, REPOSTS_USER_LIST_TAG } from '@audius/common/store' - -import { Collection, ID, Track } from '@audius/common/models' import { put, select } from 'typed-redux-saga' import { watchRepostsError } from 'common/store/user-list/reposts/errorSagas' diff --git a/packages/web/src/common/store/user-list/supporting/errorSagas.ts b/packages/web/src/common/store/user-list/supporting/errorSagas.ts index c40bc383156..7dd1c8f96ab 100644 --- a/packages/web/src/common/store/user-list/supporting/errorSagas.ts +++ b/packages/web/src/common/store/user-list/supporting/errorSagas.ts @@ -1,5 +1,4 @@ import { supportingUserListActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/supporting/sagas.ts b/packages/web/src/common/store/user-list/supporting/sagas.ts index e2e8a49aa3f..48b04005d1d 100644 --- a/packages/web/src/common/store/user-list/supporting/sagas.ts +++ b/packages/web/src/common/store/user-list/supporting/sagas.ts @@ -1,3 +1,8 @@ +import { ID, UserMetadata, User } from '@audius/common/models' +import { + responseAdapter as adapter, + SupportingResponse +} from '@audius/common/services' import { cacheUsersSelectors, tippingActions, @@ -7,12 +12,6 @@ import { SUPPORTING_USER_LIST_TAG, SupportingMapForUser } from '@audius/common/store' - -import { ID, UserMetadata, User } from '@audius/common/models' -import { - responseAdapter as adapter, - SupportingResponse -} from '@audius/common/services' import { decodeHashId, stringWeiToBN } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts b/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts index aa2ffdf75a2..95a61577738 100644 --- a/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/errorSagas.ts @@ -1,5 +1,4 @@ import { topSupportersUserListActions } from '@audius/common/store' - import { put, takeEvery } from 'redux-saga/effects' import * as errorActions from 'store/errors/actions' diff --git a/packages/web/src/common/store/user-list/top-supporters/sagas.ts b/packages/web/src/common/store/user-list/top-supporters/sagas.ts index 4aa0c4d84be..ac61d936a84 100644 --- a/packages/web/src/common/store/user-list/top-supporters/sagas.ts +++ b/packages/web/src/common/store/user-list/top-supporters/sagas.ts @@ -1,3 +1,8 @@ +import { ID, User } from '@audius/common/models' +import { + responseAdapter as adapter, + SupporterResponse +} from '@audius/common/services' import { cacheUsersSelectors, tippingActions, @@ -7,12 +12,6 @@ import { TOP_SUPPORTERS_USER_LIST_TAG, SupportersMapForUser } from '@audius/common/store' - -import { ID, User } from '@audius/common/models' -import { - responseAdapter as adapter, - SupporterResponse -} from '@audius/common/services' import { decodeHashId, removeNullable } from '@audius/common/utils' import { put, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/user-list/utils.ts b/packages/web/src/common/store/user-list/utils.ts index 006ec76fbf4..02877b71f36 100644 --- a/packages/web/src/common/store/user-list/utils.ts +++ b/packages/web/src/common/store/user-list/utils.ts @@ -1,11 +1,10 @@ +import { ID, UserMetadata, User } from '@audius/common/models' +import { AudiusAPIClient, AudiusBackend } from '@audius/common/services' import { accountSelectors, processAndCacheUsers, getContext } from '@audius/common/store' - -import { ID, UserMetadata, User } from '@audius/common/models' -import { AudiusAPIClient, AudiusBackend } from '@audius/common/services' import { call, select } from 'typed-redux-saga' import { AppState } from 'store/types' diff --git a/packages/web/src/common/store/wallet/sagas.ts b/packages/web/src/common/store/wallet/sagas.ts index 4f62a19c6fb..7cfee438dc2 100644 --- a/packages/web/src/common/store/wallet/sagas.ts +++ b/packages/web/src/common/store/wallet/sagas.ts @@ -1,3 +1,11 @@ +import { + Name, + Chain, + ErrorLevel, + BNWei, + SolanaWalletAddress +} from '@audius/common/models' +import { FeatureFlags, createUserBankIfNeeded } from '@audius/common/services' import { accountActions, accountSelectors, @@ -8,15 +16,6 @@ import { getContext, InputSendDataAction } from '@audius/common/store' - -import { - Name, - Chain, - ErrorLevel, - BNWei, - SolanaWalletAddress -} from '@audius/common/models' -import { FeatureFlags, createUserBankIfNeeded } from '@audius/common/services' import { getErrorMessage, isNullOrUndefined, diff --git a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx index 668dcedffcc..38c63ed6777 100644 --- a/packages/web/src/components/add-funds-modal/AddFundsModal.tsx +++ b/packages/web/src/components/add-funds-modal/AddFundsModal.tsx @@ -1,14 +1,13 @@ +import { useCallback, useEffect, useState } from 'react' + +import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' +import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { buyUSDCActions, buyUSDCSelectors, BuyUSDCStage, useAddFundsModal } from '@audius/common/store' - -import { useCallback, useEffect, useState } from 'react' - -import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' -import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { ModalContent, ModalHeader } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx b/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx index 2dfdb96d00d..bd487caf7c3 100644 --- a/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx +++ b/packages/web/src/components/add-to-collection/desktop/AddToCollectionModal.tsx @@ -1,3 +1,10 @@ +import { useMemo, useState } from 'react' + +import { + CreatePlaylistSource, + SquareSizes, + Collection +} from '@audius/common/models' import { accountSelectors, cacheCollectionsActions, @@ -6,14 +13,6 @@ import { duplicateAddConfirmationModalUIActions, toastActions } from '@audius/common/store' - -import { useMemo, useState } from 'react' - -import { - CreatePlaylistSource, - SquareSizes, - Collection -} from '@audius/common/models' import { Modal, Scrollbar } from '@audius/stems' import cn from 'classnames' import { capitalize } from 'lodash' diff --git a/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx b/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx index 0374c803fa9..c21abd74f01 100644 --- a/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx +++ b/packages/web/src/components/add-to-collection/mobile/AddToCollection.tsx @@ -1,13 +1,12 @@ +import { useCallback, useContext } from 'react' + +import { CreatePlaylistSource, Collection, ID } from '@audius/common/models' import { accountSelectors, cacheCollectionsActions, addToCollectionUISelectors, addToCollectionUIActions } from '@audius/common/store' - -import { useCallback, useContext } from 'react' - -import { CreatePlaylistSource, Collection, ID } from '@audius/common/models' import { push as pushRoute } from 'connected-react-router' import { capitalize } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx index d66d14a84ac..67d1da63573 100644 --- a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx +++ b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx @@ -1,9 +1,8 @@ -import { getTierForUser } from '@audius/common/store' - import { useCallback, useState } from 'react' import { imageProfilePicEmpty } from '@audius/common/assets' import { SquareSizes, Kind } from '@audius/common/models' +import { getTierForUser } from '@audius/common/store' import { SelectProps } from 'antd' import { useDispatch } from 'react-redux' import { createSelector } from 'reselect' diff --git a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx index 50693110191..14197f504e5 100644 --- a/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx +++ b/packages/web/src/components/ai-attribution-modal/SearchBarResult.jsx @@ -1,9 +1,8 @@ -import { cacheUsersActions } from '@audius/common/store' - import { useState, useEffect, memo, useCallback } from 'react' import { imageBlank as placeholderArt } from '@audius/common/assets' import { Kind } from '@audius/common/models' +import { cacheUsersActions } from '@audius/common/store' import { Tag } from '@audius/stems' import cn from 'classnames' import PropTypes from 'prop-types' diff --git a/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx b/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx index 0faf6fc86a5..8c815730f32 100644 --- a/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx +++ b/packages/web/src/components/browser-push-confirmation-modal/BrowserPushConfirmationModal.tsx @@ -7,7 +7,6 @@ import { modalsSelectors, modalsActions } from '@audius/common/store' - import { Modal, Anchor, Button, ButtonType, ButtonSize } from '@audius/stems' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/card/desktop/CollectionArtCard.tsx b/packages/web/src/components/card/desktop/CollectionArtCard.tsx index e5a405d07e2..ed5f06a8840 100644 --- a/packages/web/src/components/card/desktop/CollectionArtCard.tsx +++ b/packages/web/src/components/card/desktop/CollectionArtCard.tsx @@ -1,13 +1,12 @@ +import { useCallback, useEffect, useState } from 'react' + +import { imageBlank as placeholderArt } from '@audius/common/assets' +import { SquareSizes, ID } from '@audius/common/models' import { accountSelectors, cacheCollectionsSelectors, cacheUsersSelectors } from '@audius/common/store' - -import { useCallback, useEffect, useState } from 'react' - -import { imageBlank as placeholderArt } from '@audius/common/assets' -import { SquareSizes, ID } from '@audius/common/models' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/card/desktop/UserArtCard.tsx b/packages/web/src/components/card/desktop/UserArtCard.tsx index e926896e735..185f0e7cbca 100644 --- a/packages/web/src/components/card/desktop/UserArtCard.tsx +++ b/packages/web/src/components/card/desktop/UserArtCard.tsx @@ -1,9 +1,8 @@ -import { cacheUsersSelectors } from '@audius/common/store' - import { useCallback, useEffect } from 'react' import { imageBlank as placeholderArt } from '@audius/common/assets' import { SquareSizes, ID } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx b/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx index 925a101901e..10af5769e8e 100644 --- a/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx +++ b/packages/web/src/components/coinflow-onramp-modal/CoinflowOnrampModal.tsx @@ -1,11 +1,10 @@ +import { useCallback, useEffect, useState } from 'react' + +import { useCoinflowAdapter } from '@audius/common/hooks' import { coinflowModalUIActions, useCoinflowOnrampModal } from '@audius/common/store' - -import { useCallback, useEffect, useState } from 'react' - -import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowPurchase } from '@coinflowlabs/react' import { Transaction } from '@solana/web3.js' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx index 0ea0094b723..750e94bcd46 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetails.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetails.tsx @@ -1,11 +1,10 @@ +import { useCallback, useEffect, useState } from 'react' + +import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' import { profilePageSelectors, collectibleDetailsUIActions } from '@audius/common/store' - -import { useCallback, useEffect, useState } from 'react' - -import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' import { getHash } from '@audius/common/utils' import { LogoEth, LogoSol } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx index d2cecfb9aaa..b5694bae575 100644 --- a/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx +++ b/packages/web/src/components/collectibles/components/CollectibleDetailsModal.tsx @@ -1,10 +1,3 @@ -import { - accountSelectors, - badgeTiers, - collectibleDetailsUISelectors, - collectibleDetailsUIActions -} from '@audius/common/store' - import { Suspense, lazy, @@ -16,6 +9,12 @@ import { import { useSelectTierInfo } from '@audius/common/hooks' import { Chain, CollectibleMediaType, Collectible } from '@audius/common/models' +import { + accountSelectors, + badgeTiers, + collectibleDetailsUISelectors, + collectibleDetailsUIActions +} from '@audius/common/store' import { formatDateWithTimezoneOffset } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx index 76910d8b436..b76a9417cb7 100644 --- a/packages/web/src/components/collectibles/components/CollectiblesPage.tsx +++ b/packages/web/src/components/collectibles/components/CollectiblesPage.tsx @@ -1,9 +1,3 @@ -import { - collectibleDetailsUISelectors, - collectibleDetailsUIActions, - ProfileUser -} from '@audius/common/store' - import { useCallback, useContext, @@ -15,6 +9,11 @@ import { import { useInstanceVar } from '@audius/common/hooks' import { CollectiblesMetadata, Collectible } from '@audius/common/models' +import { + collectibleDetailsUISelectors, + collectibleDetailsUIActions, + ProfileUser +} from '@audius/common/store' import { getHash } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/collection/desktop/Artwork.tsx b/packages/web/src/components/collection/desktop/Artwork.tsx index a04da3527ad..dad502a59c1 100644 --- a/packages/web/src/components/collection/desktop/Artwork.tsx +++ b/packages/web/src/components/collection/desktop/Artwork.tsx @@ -1,12 +1,11 @@ -import { - cacheCollectionsSelectors, - useEditPlaylistModal -} from '@audius/common/store' - import { ComponentType, SVGProps, useCallback, useEffect } from 'react' import { imageBlank } from '@audius/common/assets' import { SquareSizes, CoverArtSizes } from '@audius/common/models' +import { + cacheCollectionsSelectors, + useEditPlaylistModal +} from '@audius/common/store' import { Button, ButtonType, IconPencil } from '@audius/stems' import { useSelector } from 'common/hooks/useSelector' diff --git a/packages/web/src/components/collection/desktop/CollectionHeader.tsx b/packages/web/src/components/collection/desktop/CollectionHeader.tsx index 1f37d7ec41c..f5e4dc8b555 100644 --- a/packages/web/src/components/collection/desktop/CollectionHeader.tsx +++ b/packages/web/src/components/collection/desktop/CollectionHeader.tsx @@ -1,7 +1,6 @@ import { ChangeEvent, useCallback, useState } from 'react' import { useEditPlaylistModal } from '@audius/common/store' - import { formatSecondsAsText, formatDate } from '@audius/common/utils' import { IconHidden, IconPencil } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/collection/desktop/EditButton.tsx b/packages/web/src/components/collection/desktop/EditButton.tsx index 28a0d432c2b..fa36c1a0b8c 100644 --- a/packages/web/src/components/collection/desktop/EditButton.tsx +++ b/packages/web/src/components/collection/desktop/EditButton.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { useEditPlaylistModal } from '@audius/common/store' - import { ButtonProps, ButtonType, IconPencil } from '@audius/stems' import { EntityActionButton } from '../../entity-page/EntityActionButton' diff --git a/packages/web/src/components/collection/desktop/FavoriteButton.tsx b/packages/web/src/components/collection/desktop/FavoriteButton.tsx index f22c829c794..6696034f5a1 100644 --- a/packages/web/src/components/collection/desktop/FavoriteButton.tsx +++ b/packages/web/src/components/collection/desktop/FavoriteButton.tsx @@ -1,10 +1,3 @@ -import { - accountSelectors, - collectionPageSelectors, - collectionsSocialActions, - CommonState -} from '@audius/common/store' - import { useCallback } from 'react' import { @@ -13,6 +6,12 @@ import { SmartCollection, ID } from '@audius/common/models' +import { + accountSelectors, + collectionPageSelectors, + collectionsSocialActions, + CommonState +} from '@audius/common/store' import { ButtonProps, ButtonType, IconHeart } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx b/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx index 77a8104eb97..fbe9258108e 100644 --- a/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx +++ b/packages/web/src/components/collection/desktop/OverflowMenuButton.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { FollowSource, Collection, User } from '@audius/common/models' import { collectionPageSelectors, usersSocialActions, CommonState } from '@audius/common/store' - -import { useCallback } from 'react' - -import { FollowSource, Collection, User } from '@audius/common/models' import { Button, ButtonType, IconKebabHorizontal } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx index 38e826402d1..8c1b73284cb 100644 --- a/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/OwnerActionButtons.tsx @@ -1,6 +1,5 @@ -import { collectionPageSelectors, CommonState } from '@audius/common/store' - import { Collection } from '@audius/common/models' +import { collectionPageSelectors, CommonState } from '@audius/common/store' import { useSelector } from 'react-redux' import { EditButton } from './EditButton' diff --git a/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx b/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx index 1e9bc3971ca..30cda75085b 100644 --- a/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx +++ b/packages/web/src/components/collection/desktop/PublishConfirmationModal.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Collection } from '@audius/common/models' import { cacheCollectionsActions, collectionPageSelectors, CommonState } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Collection } from '@audius/common/models' import { Button, ButtonType, diff --git a/packages/web/src/components/collection/desktop/RepostButton.tsx b/packages/web/src/components/collection/desktop/RepostButton.tsx index 6ce9a4c7dbb..fe261c4fa48 100644 --- a/packages/web/src/components/collection/desktop/RepostButton.tsx +++ b/packages/web/src/components/collection/desktop/RepostButton.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { RepostSource, Collection, ID } from '@audius/common/models' import { collectionPageSelectors, collectionsSocialActions, CommonState } from '@audius/common/store' - -import { useCallback } from 'react' - -import { RepostSource, Collection, ID } from '@audius/common/models' import { ButtonProps, ButtonType, IconRepost } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/ShareButton.tsx b/packages/web/src/components/collection/desktop/ShareButton.tsx index cddb7efbd9a..f14aeb55856 100644 --- a/packages/web/src/components/collection/desktop/ShareButton.tsx +++ b/packages/web/src/components/collection/desktop/ShareButton.tsx @@ -1,8 +1,7 @@ -import { shareModalUIActions } from '@audius/common/store' - import { useCallback } from 'react' import { ShareSource, SmartCollectionVariant, ID } from '@audius/common/models' +import { shareModalUIActions } from '@audius/common/store' import { ButtonProps, ButtonType, IconShare } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx b/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx index 3fef0c0bf58..7191fb658c4 100644 --- a/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx +++ b/packages/web/src/components/collection/desktop/ViewerActionButtons.tsx @@ -1,6 +1,5 @@ -import { collectionPageSelectors, CommonState } from '@audius/common/store' - import { Collection, ID } from '@audius/common/models' +import { collectionPageSelectors, CommonState } from '@audius/common/store' import { useSelector } from 'react-redux' import { FavoriteButton } from './FavoriteButton' diff --git a/packages/web/src/components/collection/mobile/CollectionHeader.jsx b/packages/web/src/components/collection/mobile/CollectionHeader.jsx index 27025407767..4e2e55ab7fe 100644 --- a/packages/web/src/components/collection/mobile/CollectionHeader.jsx +++ b/packages/web/src/components/collection/mobile/CollectionHeader.jsx @@ -1,9 +1,8 @@ -import { OverflowAction } from '@audius/common/store' - import { memo } from 'react' import { Variant, SquareSizes } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { OverflowAction } from '@audius/common/store' import { formatCount, formatSecondsAsText, diff --git a/packages/web/src/components/cookie-banner/CookieBanner.tsx b/packages/web/src/components/cookie-banner/CookieBanner.tsx index f104ec440d8..ae40cfc779d 100644 --- a/packages/web/src/components/cookie-banner/CookieBanner.tsx +++ b/packages/web/src/components/cookie-banner/CookieBanner.tsx @@ -1,7 +1,6 @@ import { memo } from 'react' import { playerSelectors } from '@audius/common/store' - import cn from 'classnames' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx index 356897cea4e..deff6d7e92c 100644 --- a/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx +++ b/packages/web/src/components/data-entry/AccessAndSaleTriggerLegacy.tsx @@ -1,5 +1,3 @@ -import { accountSelectors } from '@audius/common/store' - import { useMemo } from 'react' import { useUSDCPurchaseConfig } from '@audius/common/hooks' @@ -16,6 +14,7 @@ import { AccessConditions, Track } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx b/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx index c4780d72af5..c77d7dfceb6 100644 --- a/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx +++ b/packages/web/src/components/delete-playlist-confirmation-modal/DeletePlaylistConfirmationModal.tsx @@ -4,7 +4,6 @@ import { cacheCollectionsActions, deletePlaylistConfirmationModalUISelectors } from '@audius/common/store' - import { push } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/download-buttons/DownloadButtons.tsx b/packages/web/src/components/download-buttons/DownloadButtons.tsx index c62bc4f5331..249f04a463b 100644 --- a/packages/web/src/components/download-buttons/DownloadButtons.tsx +++ b/packages/web/src/components/download-buttons/DownloadButtons.tsx @@ -1,5 +1,3 @@ -import { toastActions } from '@audius/common/store' - import { memo, useCallback } from 'react' import { @@ -8,6 +6,7 @@ import { useDownloadTrackButtons } from '@audius/common/hooks' import { ID } from '@audius/common/models' +import { toastActions } from '@audius/common/store' import { IconDownload, IconButton } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx b/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx index 66b936ee980..21b4fbe89c9 100644 --- a/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx +++ b/packages/web/src/components/duplicate-add-confirmation-modal/DuplicateAddConfirmationModal.tsx @@ -6,7 +6,6 @@ import { cacheCollectionsSelectors, duplicateAddConfirmationModalUISelectors } from '@audius/common/store' - import { fillString } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/edit-track/EditTrackModal.tsx b/packages/web/src/components/edit-track/EditTrackModal.tsx index cc9c559a9ad..c525698dd1e 100644 --- a/packages/web/src/components/edit-track/EditTrackModal.tsx +++ b/packages/web/src/components/edit-track/EditTrackModal.tsx @@ -1,12 +1,3 @@ -import { - cacheTracksActions as cacheTrackActions, - stemsUploadActions, - stemsUploadSelectors, - publishTrackConfirmationModalUIActions, - editTrackModalSelectors, - useEditTrackModal -} from '@audius/common/store' - import { useEffect, useState } from 'react' import { @@ -15,6 +6,14 @@ import { StemUploadWithFile, Track } from '@audius/common/models' +import { + cacheTracksActions as cacheTrackActions, + stemsUploadActions, + stemsUploadSelectors, + publishTrackConfirmationModalUIActions, + editTrackModalSelectors, + useEditTrackModal +} from '@audius/common/store' import { removeNullable, uuid } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect, useDispatch } from 'react-redux' diff --git a/packages/web/src/components/embed-modal/store/selectors.ts b/packages/web/src/components/embed-modal/store/selectors.ts index 1af14d96e4a..b6141439f6a 100644 --- a/packages/web/src/components/embed-modal/store/selectors.ts +++ b/packages/web/src/components/embed-modal/store/selectors.ts @@ -1,10 +1,9 @@ +import { PlayableType } from '@audius/common/models' import { cacheCollectionsSelectors, cacheTracksSelectors } from '@audius/common/store' -import { PlayableType } from '@audius/common/models' - import { AppState } from 'store/types' const { getTrack } = cacheTracksSelectors const { getCollection } = cacheCollectionsSelectors diff --git a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx index 29dd08f1fa8..29e534b893e 100644 --- a/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx +++ b/packages/web/src/components/feature-flag-override-modal/FeatureFlagOverrideModal.tsx @@ -1,5 +1,3 @@ -import { accountSelectors } from '@audius/common/store' - import { useCallback, useEffect, useRef, useState } from 'react' import { @@ -7,6 +5,7 @@ import { FEATURE_FLAG_OVERRIDE_KEY } from '@audius/common/hooks' import { FeatureFlags } from '@audius/common/services' +import { accountSelectors } from '@audius/common/store' import { Modal, ModalContent, diff --git a/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx b/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx index 96e88b3635d..d2991eb2c44 100644 --- a/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx +++ b/packages/web/src/components/first-upload-modal/FirstUploadModal.tsx @@ -1,8 +1,7 @@ -import { accountSelectors, musicConfettiActions } from '@audius/common/store' - import { useCallback, useEffect } from 'react' import { Name, SquareSizes } from '@audius/common/models' +import { accountSelectors, musicConfettiActions } from '@audius/common/store' import { Modal } from '@audius/stems' import { connect, useDispatch } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx b/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx index 01f57abf1a2..ae16bc96212 100644 --- a/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx +++ b/packages/web/src/components/leaving-audius-modal/LeavingAudiusModal.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { useLeavingAudiusModal } from '@audius/common/store' - import { Button } from '@audius/harmony' import { IconExternalLink, diff --git a/packages/web/src/components/lineup/LineupProvider.tsx b/packages/web/src/components/lineup/LineupProvider.tsx index 3e34465b7c9..ab041963ab8 100644 --- a/packages/web/src/components/lineup/LineupProvider.tsx +++ b/packages/web/src/components/lineup/LineupProvider.tsx @@ -1,9 +1,3 @@ -import { - LineupBaseActions, - tippingSelectors, - playerSelectors -} from '@audius/common/store' - import { ComponentType, createRef, PureComponent } from 'react' import { @@ -15,6 +9,11 @@ import { UID, Lineup } from '@audius/common/models' +import { + LineupBaseActions, + tippingSelectors, + playerSelectors +} from '@audius/common/store' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import InfiniteScroll from 'react-infinite-scroller' diff --git a/packages/web/src/components/lineup/hooks.ts b/packages/web/src/components/lineup/hooks.ts index 91c9a7e9e33..cfc4ba8b8fb 100644 --- a/packages/web/src/components/lineup/hooks.ts +++ b/packages/web/src/components/lineup/hooks.ts @@ -1,12 +1,11 @@ +import { useMemo } from 'react' + +import { LineupState } from '@audius/common/models' import { lineupSelectors, queueSelectors, playerSelectors } from '@audius/common/store' - -import { useMemo } from 'react' - -import { LineupState } from '@audius/common/models' import { useDispatch } from 'react-redux' import { LineupVariant } from 'components/lineup/types' diff --git a/packages/web/src/components/link/ExternalLink.tsx b/packages/web/src/components/link/ExternalLink.tsx index b5a5c1b0232..32dfefc779f 100644 --- a/packages/web/src/components/link/ExternalLink.tsx +++ b/packages/web/src/components/link/ExternalLink.tsx @@ -1,8 +1,7 @@ -import { useLeavingAudiusModal } from '@audius/common/store' - import { MouseEvent, useCallback } from 'react' import { Name } from '@audius/common/models' +import { useLeavingAudiusModal } from '@audius/common/store' import { isAllowedExternalLink } from '@audius/common/utils' import { make, useRecord } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/link/UserLink.tsx b/packages/web/src/components/link/UserLink.tsx index 124a101a65b..f88e6dc544c 100644 --- a/packages/web/src/components/link/UserLink.tsx +++ b/packages/web/src/components/link/UserLink.tsx @@ -1,6 +1,5 @@ -import { cacheUsersSelectors } from '@audius/common/store' - import { ID } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import cn from 'classnames' import { ArtistPopover } from 'components/artist/ArtistPopover' diff --git a/packages/web/src/components/locked-content-modal/LockedContentModal.tsx b/packages/web/src/components/locked-content-modal/LockedContentModal.tsx index ccfbc4e204c..eabbe974623 100644 --- a/packages/web/src/components/locked-content-modal/LockedContentModal.tsx +++ b/packages/web/src/components/locked-content-modal/LockedContentModal.tsx @@ -1,8 +1,7 @@ -import { gatedContentActions } from '@audius/common/store' - import { useCallback } from 'react' import { useGatedContentAccess, useLockedContent } from '@audius/common/hooks' +import { gatedContentActions } from '@audius/common/store' import { IconLock, ModalContent, ModalHeader, ModalTitle } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx b/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx index 00993ba0e23..bde0aedb03e 100644 --- a/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx +++ b/packages/web/src/components/notification/Notification/AddTrackToPlaylistNotification.tsx @@ -1,13 +1,12 @@ +import { useCallback } from 'react' + +import { Name, Track } from '@audius/common/models' import { notificationsSelectors, Entity, CollectionEntity, AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name, Track } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx b/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx index 6b907101e2c..e0bed7cde77 100644 --- a/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx +++ b/packages/web/src/components/notification/Notification/AnnouncementNotification.tsx @@ -1,8 +1,7 @@ -import { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common/store' - import { useCallback } from 'react' import { Name } from '@audius/common/models' +import { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common/store' import { MarkdownViewer } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx b/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx index 750f6e47ac9..79710c50aff 100644 --- a/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx +++ b/packages/web/src/components/notification/Notification/ChallengeRewardNotification.tsx @@ -1,11 +1,10 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { audioRewardsPageSelectors, ChallengeRewardNotification as ChallengeRewardNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/FavoriteNotification.tsx b/packages/web/src/components/notification/Notification/FavoriteNotification.tsx index 612ffbf1a2e..8b179082b77 100644 --- a/packages/web/src/components/notification/Notification/FavoriteNotification.tsx +++ b/packages/web/src/components/notification/Notification/FavoriteNotification.tsx @@ -5,7 +5,6 @@ import { Entity, FavoriteNotification as FavoriteNotificationType } from '@audius/common/store' - import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/FollowNotification.tsx b/packages/web/src/components/notification/Notification/FollowNotification.tsx index 60152b22bc2..0f5ba9a0cff 100644 --- a/packages/web/src/components/notification/Notification/FollowNotification.tsx +++ b/packages/web/src/components/notification/Notification/FollowNotification.tsx @@ -4,7 +4,6 @@ import { notificationsSelectors, FollowNotification as FollowNotificationType } from '@audius/common/store' - import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx index 22ca97b1f70..212db5da8b7 100644 --- a/packages/web/src/components/notification/Notification/MilestoneNotification.tsx +++ b/packages/web/src/components/notification/Notification/MilestoneNotification.tsx @@ -1,13 +1,12 @@ +import { useCallback } from 'react' + +import { Name, User } from '@audius/common/models' import { notificationsSelectors, Achievement, EntityType, MilestoneNotification as MilestoneNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name, User } from '@audius/common/models' import { formatCount, Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/Notification.tsx b/packages/web/src/components/notification/Notification/Notification.tsx index d50fea9242a..856381f7e02 100644 --- a/packages/web/src/components/notification/Notification/Notification.tsx +++ b/packages/web/src/components/notification/Notification/Notification.tsx @@ -1,7 +1,6 @@ import { NotificationType, - Notification as Notifications, - Notifications + Notification as Notifications } from '@audius/common/store' import ErrorWrapper from 'components/error-wrapper/ErrorWrapper' diff --git a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx index 2dbe230be51..89cb7275032 100644 --- a/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx +++ b/packages/web/src/components/notification/Notification/RemixCosignNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, TrackEntity, RemixCosignNotification as RemixCosignNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx b/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx index 7f192671698..629da019620 100644 --- a/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx +++ b/packages/web/src/components/notification/Notification/RemixCreateNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, TrackEntity, RemixCreateNotification as RemixCreateNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/RepostNotification.tsx b/packages/web/src/components/notification/Notification/RepostNotification.tsx index e58ca11ec21..894d543e26b 100644 --- a/packages/web/src/components/notification/Notification/RepostNotification.tsx +++ b/packages/web/src/components/notification/Notification/RepostNotification.tsx @@ -5,7 +5,6 @@ import { Entity, RepostNotification as RepostNotificationType } from '@audius/common/store' - import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx index c6803408583..af38a423090 100644 --- a/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx +++ b/packages/web/src/components/notification/Notification/SupporterDethronedNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { cacheUsersSelectors, notificationsSelectors, SupporterDethronedNotification as SupporterDethroned } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import crown from 'assets/img/crown2x.png' diff --git a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx index 2dd14569c3a..a2c822941b0 100644 --- a/packages/web/src/components/notification/Notification/TastemakerNotification.tsx +++ b/packages/web/src/components/notification/Notification/TastemakerNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, TrackEntity, TastemakerNotification as TastemakerNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx index 59616a67d63..89212896cbb 100644 --- a/packages/web/src/components/notification/Notification/TipReactionNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReactionNotification.tsx @@ -1,14 +1,13 @@ +import { useCallback } from 'react' + +import { useUIAudio } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { notificationsSelectors, getReactionFromRawValue, ReactionNotification } from '@audius/common/store' -import { useCallback } from 'react' - -import { useUIAudio } from '@audius/common/hooks' -import { Name } from '@audius/common/models' - import { make } from 'common/store/analytics/actions' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx index 30560e2e06f..0bacd4b86c8 100644 --- a/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipReceivedNotification.tsx @@ -1,3 +1,7 @@ +import { ComponentType, useCallback, useState } from 'react' + +import { useUIAudio } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { notificationsSelectors, reactionsUIActions, @@ -6,11 +10,6 @@ import { TipReceiveNotification, ReactionTypes } from '@audius/common/store' - -import { ComponentType, useCallback, useState } from 'react' - -import { useUIAudio } from '@audius/common/hooks' -import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TipSentNotification.tsx b/packages/web/src/components/notification/Notification/TipSentNotification.tsx index 5c8ada32ed8..93cd206b4c5 100644 --- a/packages/web/src/components/notification/Notification/TipSentNotification.tsx +++ b/packages/web/src/components/notification/Notification/TipSentNotification.tsx @@ -1,12 +1,11 @@ -import { - notificationsSelectors, - TipSendNotification -} from '@audius/common/store' - import { useCallback } from 'react' import { useUIAudio } from '@audius/common/hooks' import { Name } from '@audius/common/models' +import { + notificationsSelectors, + TipSendNotification +} from '@audius/common/store' import { make } from 'common/store/analytics/actions' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx b/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx index 9769d075967..c0c8cd356ff 100644 --- a/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx +++ b/packages/web/src/components/notification/Notification/TopSupporterNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, SupporterRankUpNotification } from '@audius/common/store' -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' - import IconTrending from 'assets/img/iconTrending.svg' import { make } from 'common/store/analytics/actions' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx b/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx index 0f0fda27f70..9a53bdd3a58 100644 --- a/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx +++ b/packages/web/src/components/notification/Notification/TopSupportingNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, SupportingRankUpNotification } from '@audius/common/store' -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' - import IconTrending from 'assets/img/iconTrending.svg' import { make } from 'common/store/analytics/actions' import { useSelector } from 'utils/reducer' diff --git a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx index 6c5a8f667ca..97c6185fa4f 100644 --- a/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingPlaylistNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, CollectionEntity, TrendingPlaylistNotification as TrendingPlaylistNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx index e1fd9c6adc8..3a33d1bb081 100644 --- a/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingTrackNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, TrackEntity, TrendingTrackNotification as TrendingTrackNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx index 92e363ed3fb..bfdc8398ae4 100644 --- a/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx +++ b/packages/web/src/components/notification/Notification/TrendingUndergroundNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, TrackEntity, TrendingUndergroundNotification as TrendingUndergroundNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx index 90869579793..a8151b3d79e 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseBuyerNotification.tsx @@ -1,13 +1,12 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, Entity, TrackEntity, USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx index 0ac2e192b49..31d73a6377d 100644 --- a/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx +++ b/packages/web/src/components/notification/Notification/USDCPurchaseSellerNotification.tsx @@ -1,13 +1,12 @@ +import { useCallback } from 'react' + +import { StringUSDC } from '@audius/common/models' import { notificationsSelectors, Entity, TrackEntity, USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { StringUSDC } from '@audius/common/models' import { stringUSDCToBN, formatUSDCWeiToUSDString, diff --git a/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx b/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx index a4e2d198837..5e2a5cbbe85 100644 --- a/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx +++ b/packages/web/src/components/notification/Notification/UserSubscriptionNotification.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { Name } from '@audius/common/models' import { notificationsSelectors, Entity, UserSubscriptionNotification as UserSubscriptionNotificationType } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Name } from '@audius/common/models' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/EntityLink.tsx b/packages/web/src/components/notification/Notification/components/EntityLink.tsx index 1745a366332..bbc283e8683 100644 --- a/packages/web/src/components/notification/Notification/components/EntityLink.tsx +++ b/packages/web/src/components/notification/Notification/components/EntityLink.tsx @@ -1,8 +1,7 @@ -import { Entity } from '@audius/common/store' - import { MouseEventHandler, useCallback } from 'react' import { Name, Collection, Track, User } from '@audius/common/models' +import { Entity } from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/NotificationTile.tsx b/packages/web/src/components/notification/Notification/components/NotificationTile.tsx index 4d2dea173e2..b966b5b1805 100644 --- a/packages/web/src/components/notification/Notification/components/NotificationTile.tsx +++ b/packages/web/src/components/notification/Notification/components/NotificationTile.tsx @@ -6,7 +6,6 @@ import { } from 'react' import { Notification } from '@audius/common/store' - import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/TrackContent.tsx b/packages/web/src/components/notification/Notification/components/TrackContent.tsx index 9ed6f05a396..591bd2486df 100644 --- a/packages/web/src/components/notification/Notification/components/TrackContent.tsx +++ b/packages/web/src/components/notification/Notification/components/TrackContent.tsx @@ -1,6 +1,5 @@ -import { TrackEntity } from '@audius/common/store' - import { SquareSizes } from '@audius/common/models' +import { TrackEntity } from '@audius/common/store' import CoSign, { Size } from 'components/co-sign/CoSign' import DynamicImage from 'components/dynamic-image/DynamicImage' diff --git a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx index 91faee9a0c0..a339358fff3 100644 --- a/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx +++ b/packages/web/src/components/notification/Notification/components/TwitterShareButton.tsx @@ -1,12 +1,11 @@ +import { MouseEventHandler, useCallback } from 'react' + +import { useTwitterButtonStatus } from '@audius/common/hooks' import { cacheUsersActions, cacheUsersSelectors, CommonState } from '@audius/common/store' - -import { MouseEventHandler, useCallback } from 'react' - -import { useTwitterButtonStatus } from '@audius/common/hooks' import { Nullable } from '@audius/common/utils' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/notification/Notification/components/UserNameLink.tsx b/packages/web/src/components/notification/Notification/components/UserNameLink.tsx index 1f345f88a6c..63f0f359b09 100644 --- a/packages/web/src/components/notification/Notification/components/UserNameLink.tsx +++ b/packages/web/src/components/notification/Notification/components/UserNameLink.tsx @@ -1,8 +1,7 @@ -import { Notification } from '@audius/common/store' - import { MouseEventHandler, useCallback } from 'react' import { Name, User } from '@audius/common/models' +import { Notification } from '@audius/common/store' import cn from 'classnames' import { push } from 'connected-react-router' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/notification/NotificationModal.tsx b/packages/web/src/components/notification/NotificationModal.tsx index dd5ee7098b5..d09126508bb 100644 --- a/packages/web/src/components/notification/NotificationModal.tsx +++ b/packages/web/src/components/notification/NotificationModal.tsx @@ -1,5 +1,4 @@ import { AnnouncementNotification } from '@audius/common/store' - import { Modal, Scrollbar, MarkdownViewer } from '@audius/stems' import IconRemove from 'assets/img/iconRemove.svg' diff --git a/packages/web/src/components/notification/NotificationPage.tsx b/packages/web/src/components/notification/NotificationPage.tsx index 74344993214..329728d437c 100644 --- a/packages/web/src/components/notification/NotificationPage.tsx +++ b/packages/web/src/components/notification/NotificationPage.tsx @@ -1,13 +1,11 @@ +import { useEffect, useCallback, useContext } from 'react' + +import { Status } from '@audius/common/models' import { notificationsActions, notificationsSelectors, - Notification as Notifications, - Notifications + Notification as Notifications } from '@audius/common/store' - -import { useEffect, useCallback, useContext } from 'react' - -import { Status } from '@audius/common/models' import InfiniteScroll from 'react-infinite-scroller' import Lottie from 'react-lottie' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/notification/NotificationPanel.tsx b/packages/web/src/components/notification/NotificationPanel.tsx index 62efdd1cba8..b360d558d3b 100644 --- a/packages/web/src/components/notification/NotificationPanel.tsx +++ b/packages/web/src/components/notification/NotificationPanel.tsx @@ -1,13 +1,11 @@ +import { useRef, useCallback, useEffect, RefObject } from 'react' + +import { Status } from '@audius/common/models' import { notificationsActions, notificationsSelectors, - Notification as Notifications, - Notifications + Notification as Notifications } from '@audius/common/store' - -import { useRef, useCallback, useEffect, RefObject } from 'react' - -import { Status } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { Popup, PopupPosition, Scrollbar } from '@audius/stems' import InfiniteScroll from 'react-infinite-scroller' diff --git a/packages/web/src/components/now-playing/NowPlaying.tsx b/packages/web/src/components/now-playing/NowPlaying.tsx index 76b0d9105f6..a5dee08a670 100644 --- a/packages/web/src/components/now-playing/NowPlaying.tsx +++ b/packages/web/src/components/now-playing/NowPlaying.tsx @@ -1,3 +1,18 @@ +import { useCallback, useEffect, useRef, useState } from 'react' + +import { useGatedContentAccess } from '@audius/common/hooks' +import { + Name, + ShareSource, + RepostSource, + FavoriteSource, + PlaybackSource, + ModalSource, + DogEarType, + SquareSizes, + ID +} from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, averageColorSelectors, @@ -16,22 +31,6 @@ import { gatedContentSelectors, OverflowActionCallbacks } from '@audius/common/store' - -import { useCallback, useEffect, useRef, useState } from 'react' - -import { useGatedContentAccess } from '@audius/common/hooks' -import { - Name, - ShareSource, - RepostSource, - FavoriteSource, - PlaybackSource, - ModalSource, - DogEarType, - SquareSizes, - ID -} from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { Genre } from '@audius/common/utils' import { Scrubber } from '@audius/stems' import { Location } from 'history' diff --git a/packages/web/src/components/now-playing/NowPlayingDrawer.tsx b/packages/web/src/components/now-playing/NowPlayingDrawer.tsx index 70abc6ab032..5607bf6d418 100644 --- a/packages/web/src/components/now-playing/NowPlayingDrawer.tsx +++ b/packages/web/src/components/now-playing/NowPlayingDrawer.tsx @@ -1,8 +1,7 @@ -import { nowPlayingUIActions } from '@audius/common/store' - import { useEffect, useCallback } from 'react' import { useInstanceVar } from '@audius/common/hooks' +import { nowPlayingUIActions } from '@audius/common/store' import { useDispatch } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useSpring, animated } from 'react-spring' diff --git a/packages/web/src/components/on-ramp-button/OnRampButton.tsx b/packages/web/src/components/on-ramp-button/OnRampButton.tsx index 841714ee279..64d87c99975 100644 --- a/packages/web/src/components/on-ramp-button/OnRampButton.tsx +++ b/packages/web/src/components/on-ramp-button/OnRampButton.tsx @@ -1,5 +1,4 @@ import { OnRampProvider } from '@audius/common/store' - import { Button, ButtonProps, ButtonType } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/password-reset/PasswordResetModal.tsx b/packages/web/src/components/password-reset/PasswordResetModal.tsx index 48355227ae7..ca3891534a3 100644 --- a/packages/web/src/components/password-reset/PasswordResetModal.tsx +++ b/packages/web/src/components/password-reset/PasswordResetModal.tsx @@ -1,8 +1,7 @@ -import { accountSelectors } from '@audius/common/store' - import { useEffect, useState } from 'react' import { Status } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { Flex, Text } from '@audius/harmony' import { Modal } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/password-reset/store/sagas.tsx b/packages/web/src/components/password-reset/store/sagas.tsx index 2b1c8659e16..e27f367a941 100644 --- a/packages/web/src/components/password-reset/store/sagas.tsx +++ b/packages/web/src/components/password-reset/store/sagas.tsx @@ -1,5 +1,4 @@ import { getContext } from '@audius/common/store' - import { call, put, takeEvery } from 'redux-saga/effects' import * as actions from './actions' diff --git a/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx b/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx index 87029e54ca7..2b6f26622d1 100644 --- a/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx +++ b/packages/web/src/components/pin-track-confirmation/PinTrackConfirmation.tsx @@ -1,8 +1,7 @@ -import { accountSelectors, tracksSocialActions } from '@audius/common/store' - import { memo } from 'react' import { ID } from '@audius/common/models' +import { accountSelectors, tracksSocialActions } from '@audius/common/store' import { Modal, Button, ButtonSize, ButtonType } from '@audius/stems' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx index 13b7bde8306..747a321ce03 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFields.tsx @@ -1,5 +1,3 @@ -import { PurchaseContentStage } from '@audius/common/store' - import { useCallback, useEffect } from 'react' import { @@ -13,6 +11,7 @@ import { } from '@audius/common/hooks' import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { IntKeys, FeatureFlags } from '@audius/common/services' +import { PurchaseContentStage } from '@audius/common/store' import { Flex } from '@audius/harmony' import { IconCheck } from '@audius/stems' import { useField } from 'formik' diff --git a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx index b971e31bdae..e8f544c1bca 100644 --- a/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx +++ b/packages/web/src/components/premium-content-purchase-modal/components/PurchaseContentFormFooter.tsx @@ -1,8 +1,3 @@ -import { - PurchaseContentStage, - PurchaseContentError -} from '@audius/common/store' - import { useCallback } from 'react' import { @@ -10,6 +5,10 @@ import { usePurchaseContentErrorMessage } from '@audius/common/hooks' import { Name } from '@audius/common/models' +import { + PurchaseContentStage, + PurchaseContentError +} from '@audius/common/store' import { formatPrice } from '@audius/common/utils' import { Button } from '@audius/harmony' import { diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts index b89c7abf2f7..ba897bf63a8 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseContentFormState.ts @@ -1,9 +1,8 @@ +import { useUSDCBalance } from '@audius/common/hooks' import { purchaseContentSelectors, isContentPurchaseInProgress } from '@audius/common/store' - -import { useUSDCBalance } from '@audius/common/hooks' import { useSelector } from 'react-redux' import { usePurchaseSummaryValues } from './usePurchaseSummaryValues' diff --git a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts index 5ca2d0ca323..af3d5898da3 100644 --- a/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts +++ b/packages/web/src/components/premium-content-purchase-modal/hooks/usePurchaseSummaryValues.ts @@ -1,5 +1,3 @@ -import { getPurchaseSummaryValues } from '@audius/common/store' - import { useUSDCPurchaseConfig, usePayExtraPresets, @@ -9,6 +7,7 @@ import { AMOUNT_PRESET } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' +import { getPurchaseSummaryValues } from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { useField } from 'formik' diff --git a/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx b/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx index f22ded5a5dd..82247045791 100644 --- a/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx +++ b/packages/web/src/components/profile-progress/ConnectedProfileCompletionHeroCard.jsx @@ -1,5 +1,4 @@ import { challengesSelectors, profilePageActions } from '@audius/common/store' - import { connect } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx b/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx index 1d34cd0ee6a..186bd1fa171 100644 --- a/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx +++ b/packages/web/src/components/profile-progress/ConnectedProfileCompletionPane.jsx @@ -5,7 +5,6 @@ import { challengesSelectors, musicConfettiActions } from '@audius/common/store' - import { connect, useDispatch } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { animated } from 'react-spring' diff --git a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx index c8a73f01d76..bca09c3486b 100644 --- a/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx +++ b/packages/web/src/components/remix-settings-modal/ConnectedRemixSettingsModal.tsx @@ -1,11 +1,10 @@ +import { useEffect } from 'react' + +import { Status, ID, AccessConditions } from '@audius/common/models' import { remixSettingsSelectors, remixSettingsActions } from '@audius/common/store' - -import { useEffect } from 'react' - -import { Status, ID, AccessConditions } from '@audius/common/models' import { Nullable } from '@audius/common/utils' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx b/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx index 27b09f2f6e2..2de0acea9ab 100644 --- a/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx +++ b/packages/web/src/components/reward-claimed-toast/RewardClaimedToast.tsx @@ -4,7 +4,6 @@ import { audioRewardsPageSelectors, audioRewardsPageActions } from '@audius/common/store' - import { useDispatch, useSelector } from 'react-redux' import IconCaretRight from 'assets/img/iconCaretRight.svg' diff --git a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx index 7007da57591..deefd0b4fda 100644 --- a/packages/web/src/components/search-bar/ConnectedSearchBar.jsx +++ b/packages/web/src/components/search-bar/ConnectedSearchBar.jsx @@ -1,5 +1,3 @@ -import { getTierForUser } from '@audius/common/store' - import { Component } from 'react' import { @@ -7,6 +5,7 @@ import { imageProfilePicEmpty as profilePicEmpty } from '@audius/common/assets' import { Name, SquareSizes } from '@audius/common/models' +import { getTierForUser } from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { has } from 'lodash' import { connect } from 'react-redux' diff --git a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx index a9bad4d98e6..0296392e951 100644 --- a/packages/web/src/components/search-users-modal/SearchUsersModal.tsx +++ b/packages/web/src/components/search-users-modal/SearchUsersModal.tsx @@ -1,9 +1,3 @@ -import { - cacheUsersSelectors, - searchUsersModalActions, - searchUsersModalSelectors -} from '@audius/common/store' - import { ChangeEvent, ReactNode, @@ -15,6 +9,11 @@ import { import { useProxySelector } from '@audius/common/hooks' import { Status, ID, User } from '@audius/common/models' +import { + cacheUsersSelectors, + searchUsersModalActions, + searchUsersModalSelectors +} from '@audius/common/store' import { IconButton, IconRemove, diff --git a/packages/web/src/components/share-modal/ShareModal.tsx b/packages/web/src/components/share-modal/ShareModal.tsx index e309126f93b..66191efb002 100644 --- a/packages/web/src/components/share-modal/ShareModal.tsx +++ b/packages/web/src/components/share-modal/ShareModal.tsx @@ -1,3 +1,7 @@ +import { useCallback, useContext } from 'react' + +import { Name, PlayableType } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, collectionsSocialActions, @@ -8,11 +12,6 @@ import { modalsActions, useCreateChatModal } from '@audius/common/store' - -import { useCallback, useContext } from 'react' - -import { Name, PlayableType } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' import { make, useRecord } from 'common/store/analytics/actions' diff --git a/packages/web/src/components/share-modal/utils.ts b/packages/web/src/components/share-modal/utils.ts index c30524a6b90..1f5af852a6f 100644 --- a/packages/web/src/components/share-modal/utils.ts +++ b/packages/web/src/components/share-modal/utils.ts @@ -1,6 +1,5 @@ -import { ShareContent } from '@audius/common/store' - import { ShareToTwitter } from '@audius/common/models' +import { ShareContent } from '@audius/common/store' import { getTwitterHandleByUserHandle } from 'components/notification/Notification/utils' import { diff --git a/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx b/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx index d139f25aeb4..b3326ff95bf 100644 --- a/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx +++ b/packages/web/src/components/stripe-on-ramp-modal/StripeOnRampModal.tsx @@ -4,7 +4,6 @@ import { stripeModalUIActions, stripeModalUISelectors } from '@audius/common/store' - import { loadStripeOnramp, OnrampSession } from '@stripe/crypto' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx index fcaeddc2d32..e56c756d41e 100644 --- a/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx +++ b/packages/web/src/components/suggested-tracks/components/SuggestedTracks.tsx @@ -1,9 +1,8 @@ -import { cacheUsersSelectors } from '@audius/common/store' - import { useCallback } from 'react' import { SuggestedTrack } from '@audius/common/api' import { SquareSizes, ID, Track } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import { Button, ButtonSize, diff --git a/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx b/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx index 952dd57008c..02539ee49b2 100644 --- a/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx +++ b/packages/web/src/components/tipping/feed-tip-tile/FeedTipTile.tsx @@ -1,13 +1,12 @@ +import { useCallback, useEffect, useRef } from 'react' + +import { Name, User } from '@audius/common/models' import { accountSelectors, cacheUsersSelectors, tippingSelectors, tippingActions } from '@audius/common/store' - -import { useCallback, useEffect, useRef } from 'react' - -import { Name, User } from '@audius/common/models' import { IconButton, PillButton } from '@audius/stems' import { ResizeObserver } from '@juggle/resize-observer' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/tipping/support/SupportingList.tsx b/packages/web/src/components/tipping/support/SupportingList.tsx index ad02f821aa0..df02d4da8bb 100644 --- a/packages/web/src/components/tipping/support/SupportingList.tsx +++ b/packages/web/src/components/tipping/support/SupportingList.tsx @@ -1,9 +1,8 @@ -import { profilePageSelectors } from '@audius/common/store' - import { useCallback } from 'react' import { useRankedSupportingForUser } from '@audius/common/hooks' import { User } from '@audius/common/models' +import { profilePageSelectors } from '@audius/common/store' import { formatCount, MAX_PROFILE_SUPPORTING_TILES } from '@audius/common/utils' import { IconArrow } from '@audius/stems' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/tipping/support/SupportingTile.tsx b/packages/web/src/components/tipping/support/SupportingTile.tsx index 2c52c0e2d54..e0b38a8fc3a 100644 --- a/packages/web/src/components/tipping/support/SupportingTile.tsx +++ b/packages/web/src/components/tipping/support/SupportingTile.tsx @@ -1,5 +1,3 @@ -import { cacheUsersSelectors } from '@audius/common/store' - import { useCallback } from 'react' import { @@ -12,6 +10,7 @@ import { Supporting, User } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import { Nullable } from '@audius/common/utils' import { IconTrophy } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/tipping/support/TopSupporters.tsx b/packages/web/src/components/tipping/support/TopSupporters.tsx index 0dfd2762410..cff0713203e 100644 --- a/packages/web/src/components/tipping/support/TopSupporters.tsx +++ b/packages/web/src/components/tipping/support/TopSupporters.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import { ID, User } from '@audius/common/models' import { cacheUsersSelectors, profilePageSelectors, tippingSelectors } from '@audius/common/store' - -import { useCallback } from 'react' - -import { ID, User } from '@audius/common/models' import { MAX_PROFILE_TOP_SUPPORTERS } from '@audius/common/utils' import { IconTrophy } from '@audius/stems' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx b/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx index 15660d0b7ad..219ceb6a97b 100644 --- a/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/ConfirmSendTip.tsx @@ -1,7 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { tippingSelectors, tippingActions } from '@audius/common/store' - import { Button, ButtonType, IconCheck } from '@audius/stems' import cn from 'classnames' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/SendTip.tsx b/packages/web/src/components/tipping/tip-audio/SendTip.tsx index 706b422c159..1d26243c75b 100644 --- a/packages/web/src/components/tipping/tip-audio/SendTip.tsx +++ b/packages/web/src/components/tipping/tip-audio/SendTip.tsx @@ -1,13 +1,3 @@ -import { - accountSelectors, - tippingSelectors, - tippingActions, - walletSelectors, - getTierAndNumberForBalance, - buyAudioActions, - OnRampProvider -} from '@audius/common/store' - import { cloneElement, ReactNode, @@ -19,6 +9,15 @@ import { import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import { BadgeTier, StringWei, StringAudio, BNWei } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + tippingSelectors, + tippingActions, + walletSelectors, + getTierAndNumberForBalance, + buyAudioActions, + OnRampProvider +} from '@audius/common/store' import { isNullOrUndefined, stringWeiToBN, diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx index ccf8e37ccc2..5f229e0415b 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioButton.tsx @@ -1,5 +1,4 @@ import { profilePageSelectors, tippingActions } from '@audius/common/store' - import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx index 0f0045e6f91..b82c8334ea3 100644 --- a/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipAudioModal.tsx @@ -1,3 +1,6 @@ +import { useCallback, useEffect } from 'react' + +import { StringKeys } from '@audius/common/services' import { accountSelectors, tippingSelectors, @@ -5,10 +8,6 @@ import { walletActions, TippingSendStatus } from '@audius/common/store' - -import { useCallback, useEffect } from 'react' - -import { StringKeys } from '@audius/common/services' import { Nullable } from '@audius/common/utils' import { Modal, ModalHeader, ModalTitle } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/tipping/tip-audio/TipSent.tsx b/packages/web/src/components/tipping/tip-audio/TipSent.tsx index f53ae569142..14480352150 100644 --- a/packages/web/src/components/tipping/tip-audio/TipSent.tsx +++ b/packages/web/src/components/tipping/tip-audio/TipSent.tsx @@ -1,9 +1,8 @@ -import { accountSelectors, tippingSelectors } from '@audius/common/store' - import { useCallback } from 'react' import { Name } from '@audius/common/models' import { deriveUserBankAddress } from '@audius/common/services' +import { accountSelectors, tippingSelectors } from '@audius/common/store' import { formatNumberCommas } from '@audius/common/utils' import { Button, ButtonType, IconTwitterBird, IconCheck } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/components/toast/Toast.tsx b/packages/web/src/components/toast/Toast.tsx index d7579591ceb..2d669e18d23 100644 --- a/packages/web/src/components/toast/Toast.tsx +++ b/packages/web/src/components/toast/Toast.tsx @@ -1,7 +1,6 @@ import { PureComponent } from 'react' import { accountSelectors } from '@audius/common/store' - import Tooltip from 'antd/lib/tooltip' import cn from 'classnames' import { connect } from 'react-redux' diff --git a/packages/web/src/components/toast/ToastContext.tsx b/packages/web/src/components/toast/ToastContext.tsx index a8cf33494de..a27e9db6e3e 100644 --- a/packages/web/src/components/toast/ToastContext.tsx +++ b/packages/web/src/components/toast/ToastContext.tsx @@ -1,7 +1,6 @@ import { createContext, ReactNode, useCallback } from 'react' import { toastActions, CommonState } from '@audius/common/store' - import { useDispatch, useSelector } from 'react-redux' // eslint-disable-next-line no-restricted-imports -- TODO: migrate to @react-spring/web import { useTransition, animated } from 'react-spring' diff --git a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx index 7416e2b1d95..f04d2ff5119 100644 --- a/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx +++ b/packages/web/src/components/track-overflow-modal/ConnectedMobileOverflowModal.tsx @@ -1,3 +1,11 @@ +import { + ShareSource, + RepostSource, + FavoriteSource, + FollowSource, + ID +} from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { cacheCollectionsActions, cacheCollectionsSelectors, @@ -17,15 +25,6 @@ import { useEditPlaylistModal, Notification } from '@audius/common/store' - -import { - ShareSource, - RepostSource, - FavoriteSource, - FollowSource, - ID -} from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/AiTrackSection.tsx b/packages/web/src/components/track/AiTrackSection.tsx index 302290a17d2..3e1eebed897 100644 --- a/packages/web/src/components/track/AiTrackSection.tsx +++ b/packages/web/src/components/track/AiTrackSection.tsx @@ -1,8 +1,7 @@ -import { cacheUsersActions, cacheUsersSelectors } from '@audius/common/store' - import { useCallback, useEffect } from 'react' import { ID, User } from '@audius/common/models' +import { cacheUsersActions, cacheUsersSelectors } from '@audius/common/store' import { Button, ButtonType } from '@audius/stems' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' diff --git a/packages/web/src/components/track/DownloadRow.tsx b/packages/web/src/components/track/DownloadRow.tsx index 59e4dc5d9e9..1a571d6f59f 100644 --- a/packages/web/src/components/track/DownloadRow.tsx +++ b/packages/web/src/components/track/DownloadRow.tsx @@ -1,13 +1,12 @@ +import { useCallback } from 'react' + +import { useDownloadableContentAccess } from '@audius/common/hooks' +import { DownloadQuality, ID } from '@audius/common/models' import { cacheTracksSelectors, toastActions, CommonState } from '@audius/common/store' - -import { useCallback } from 'react' - -import { useDownloadableContentAccess } from '@audius/common/hooks' -import { DownloadQuality, ID } from '@audius/common/models' import { Flex, IconReceive, PlainButton, Text } from '@audius/harmony' import { useDispatch, shallowEqual, useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/DownloadSection.tsx b/packages/web/src/components/track/DownloadSection.tsx index ffcb88a380c..c3d197ed4de 100644 --- a/packages/web/src/components/track/DownloadSection.tsx +++ b/packages/web/src/components/track/DownloadSection.tsx @@ -1,9 +1,3 @@ -import { - cacheTracksSelectors, - usePremiumContentPurchaseModal, - CommonState -} from '@audius/common/store' - import { useCallback, useState } from 'react' import { @@ -11,6 +5,11 @@ import { useDownloadableContentAccess } from '@audius/common/hooks' import { ModalSource, DownloadQuality, ID } from '@audius/common/models' +import { + cacheTracksSelectors, + usePremiumContentPurchaseModal, + CommonState +} from '@audius/common/store' import { USDC } from '@audius/fixed-decimal' import { Flex, diff --git a/packages/web/src/components/track/GatedTrackSection.tsx b/packages/web/src/components/track/GatedTrackSection.tsx index 19383f038a3..bc62fbe6d13 100644 --- a/packages/web/src/components/track/GatedTrackSection.tsx +++ b/packages/web/src/components/track/GatedTrackSection.tsx @@ -1,11 +1,3 @@ -import { - cacheUsersSelectors, - usersSocialActions as socialActions, - tippingActions, - usePremiumContentPurchaseModal, - gatedContentSelectors -} from '@audius/common/store' - import { useCallback } from 'react' import { @@ -20,6 +12,13 @@ import { AccessConditions, User } from '@audius/common/models' +import { + cacheUsersSelectors, + usersSocialActions as socialActions, + tippingActions, + usePremiumContentPurchaseModal, + gatedContentSelectors +} from '@audius/common/store' import { formatPrice, removeNullable, Nullable } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/track/GiantTrackTile.tsx b/packages/web/src/components/track/GiantTrackTile.tsx index 5f574b5ef97..3d91dd3b19f 100644 --- a/packages/web/src/components/track/GiantTrackTile.tsx +++ b/packages/web/src/components/track/GiantTrackTile.tsx @@ -1,9 +1,3 @@ -import { - cacheTracksSelectors, - publishTrackConfirmationModalUIActions, - CommonState -} from '@audius/common/store' - import { useCallback, useState } from 'react' import { @@ -15,6 +9,11 @@ import { AccessConditions } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + cacheTracksSelectors, + publishTrackConfirmationModalUIActions, + CommonState +} from '@audius/common/store' import { Genre, getCanonicalName, diff --git a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx index 339bc70838d..b891f20e177 100644 --- a/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx +++ b/packages/web/src/components/track/GiantTrackTileProgressInfo.tsx @@ -1,10 +1,9 @@ +import { ID } from '@audius/common/models' import { accountSelectors, playbackPositionSelectors, CommonState } from '@audius/common/store' - -import { ID } from '@audius/common/models' import { formatLineupTileDuration } from '@audius/common/utils' import { IconCheck, ProgressBar } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/PlayPauseButton.tsx b/packages/web/src/components/track/PlayPauseButton.tsx index 33c63047637..f2bbf91782a 100644 --- a/packages/web/src/components/track/PlayPauseButton.tsx +++ b/packages/web/src/components/track/PlayPauseButton.tsx @@ -1,12 +1,11 @@ +import { ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, playerSelectors, playbackPositionSelectors, CommonState } from '@audius/common/store' - -import { ID } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { Button } from '@audius/harmony' import { IconPause, IconPlay } from '@audius/stems' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/BottomRow.tsx b/packages/web/src/components/track/desktop/BottomRow.tsx index 4c639cc2b45..0348d8d1428 100644 --- a/packages/web/src/components/track/desktop/BottomRow.tsx +++ b/packages/web/src/components/track/desktop/BottomRow.tsx @@ -1,8 +1,7 @@ -import { gatedContentSelectors } from '@audius/common/store' - import { MouseEvent, ReactNode, useCallback } from 'react' import { ID, FieldVisibility, AccessConditions } from '@audius/common/models' +import { gatedContentSelectors } from '@audius/common/store' import { Nullable } from '@audius/common/utils' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx index 8a6140550c2..61b35b2d287 100644 --- a/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedPlaylistTile.tsx @@ -1,12 +1,3 @@ -import { - accountSelectors, - cacheCollectionsSelectors, - cacheUsersSelectors, - collectionsSocialActions, - shareModalUIActions, - playerSelectors -} from '@audius/common/store' - import { MouseEvent, memo, @@ -28,6 +19,14 @@ import { UID, Track } from '@audius/common/models' +import { + accountSelectors, + cacheCollectionsSelectors, + cacheUsersSelectors, + collectionsSocialActions, + shareModalUIActions, + playerSelectors +} from '@audius/common/store' import cn from 'classnames' import { push as pushRoute } from 'connected-react-router' import { range } from 'lodash' diff --git a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx index a36ec919cae..4e34403fd58 100644 --- a/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/desktop/ConnectedTrackTile.tsx @@ -1,13 +1,3 @@ -import { - accountSelectors, - cacheTracksSelectors, - cacheUsersSelectors, - tracksSocialActions, - shareModalUIActions, - playerSelectors, - gatedContentActions -} from '@audius/common/store' - import { memo, useState, @@ -25,6 +15,15 @@ import { ID, UID } from '@audius/common/models' +import { + accountSelectors, + cacheTracksSelectors, + cacheUsersSelectors, + tracksSocialActions, + shareModalUIActions, + playerSelectors, + gatedContentActions +} from '@audius/common/store' import { Genre } from '@audius/common/utils' import cn from 'classnames' import { connect, useDispatch } from 'react-redux' diff --git a/packages/web/src/components/track/desktop/TrackListItem.tsx b/packages/web/src/components/track/desktop/TrackListItem.tsx index 52ad17077da..b9b81752be1 100644 --- a/packages/web/src/components/track/desktop/TrackListItem.tsx +++ b/packages/web/src/components/track/desktop/TrackListItem.tsx @@ -1,8 +1,7 @@ -import { EnhancedCollectionTrack } from '@audius/common/store' - import { memo, MouseEvent, useRef } from 'react' import { ID, UID } from '@audius/common/models' +import { EnhancedCollectionTrack } from '@audius/common/store' import { Genre, formatSeconds } from '@audius/common/utils' import cn from 'classnames' diff --git a/packages/web/src/components/track/desktop/TrackTile.tsx b/packages/web/src/components/track/desktop/TrackTile.tsx index 0cdfea1bea7..0cc3c24b187 100644 --- a/packages/web/src/components/track/desktop/TrackTile.tsx +++ b/packages/web/src/components/track/desktop/TrackTile.tsx @@ -1,14 +1,13 @@ +import { memo } from 'react' + +import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, usePremiumContentPurchaseModal, playbackPositionSelectors, CommonState } from '@audius/common/store' - -import { memo } from 'react' - -import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { formatCount, Genre, diff --git a/packages/web/src/components/track/desktop/stats/ProfileImage.tsx b/packages/web/src/components/track/desktop/stats/ProfileImage.tsx index c6edb8940dd..65e4b8ff66d 100644 --- a/packages/web/src/components/track/desktop/stats/ProfileImage.tsx +++ b/packages/web/src/components/track/desktop/stats/ProfileImage.tsx @@ -1,8 +1,7 @@ -import { cacheUsersSelectors } from '@audius/common/store' - import { memo } from 'react' import { SquareSizes, ID } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import cn from 'classnames' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/desktop/stats/Stats.tsx b/packages/web/src/components/track/desktop/stats/Stats.tsx index f878911d287..573044e2ed1 100644 --- a/packages/web/src/components/track/desktop/stats/Stats.tsx +++ b/packages/web/src/components/track/desktop/stats/Stats.tsx @@ -1,8 +1,7 @@ -import { cacheUsersSelectors, CommonState } from '@audius/common/store' - import { memo, useMemo, MouseEvent, useCallback } from 'react' import { Favorite, ID, Repost } from '@audius/common/models' +import { cacheUsersSelectors, CommonState } from '@audius/common/store' import { createShallowSelector } from '@audius/common/utils' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx index 2a8b2014b0d..f625d3666ee 100644 --- a/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedPlaylistTile.tsx @@ -1,3 +1,16 @@ +import { memo, useCallback, useMemo, MouseEvent } from 'react' + +import { + Name, + ShareSource, + RepostSource, + FavoriteSource, + PlaybackSource, + FavoriteType, + ID, + Track +} from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, cacheCollectionsSelectors, @@ -13,20 +26,6 @@ import { RepostType, playerSelectors } from '@audius/common/store' - -import { memo, useCallback, useMemo, MouseEvent } from 'react' - -import { - Name, - ShareSource, - RepostSource, - FavoriteSource, - PlaybackSource, - FavoriteType, - ID, - Track -} from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx index 03027c89055..d8ac1aa75ba 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackListItem.tsx @@ -1,3 +1,7 @@ +import { memo } from 'react' + +import { RepostSource, FavoriteSource, ID } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, cacheUsersSelectors, @@ -6,11 +10,6 @@ import { OverflowAction, OverflowSource } from '@audius/common/store' - -import { memo } from 'react' - -import { RepostSource, FavoriteSource, ID } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx index 8e4ea550e10..d8332caa9c4 100644 --- a/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx +++ b/packages/web/src/components/track/mobile/ConnectedTrackTile.tsx @@ -1,3 +1,14 @@ +import { memo, MouseEvent } from 'react' + +import { useGatedContentAccess } from '@audius/common/hooks' +import { + ShareSource, + RepostSource, + FavoriteSource, + FavoriteType, + ID +} from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, cacheTracksSelectors, @@ -13,18 +24,6 @@ import { RepostType, playerSelectors } from '@audius/common/store' - -import { memo, MouseEvent } from 'react' - -import { useGatedContentAccess } from '@audius/common/hooks' -import { - ShareSource, - RepostSource, - FavoriteSource, - FavoriteType, - ID -} from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { Genre } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/track/mobile/TrackTile.tsx b/packages/web/src/components/track/mobile/TrackTile.tsx index ece6dd81afe..5b8c0a0ee3d 100644 --- a/packages/web/src/components/track/mobile/TrackTile.tsx +++ b/packages/web/src/components/track/mobile/TrackTile.tsx @@ -1,9 +1,3 @@ -import { - usePremiumContentPurchaseModal, - gatedContentActions, - gatedContentSelectors -} from '@audius/common/store' - import { useCallback, useState, useEffect, MouseEvent } from 'react' import { @@ -12,6 +6,11 @@ import { ID, AccessConditions } from '@audius/common/models' +import { + usePremiumContentPurchaseModal, + gatedContentActions, + gatedContentSelectors +} from '@audius/common/store' import { formatCount, Genre, diff --git a/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx b/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx index 0334cae0cb7..18f31e90cdf 100644 --- a/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx +++ b/packages/web/src/components/transaction-details-modal/TransactionDetailsModal.tsx @@ -1,11 +1,10 @@ +import { useCallback } from 'react' + +import { Status } from '@audius/common/models' import { transactionDetailsActions, transactionDetailsSelectors } from '@audius/common/store' - -import { useCallback } from 'react' - -import { Status } from '@audius/common/models' import { Button, ButtonType, diff --git a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx index 93f30016960..5dd6f133ed8 100644 --- a/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx +++ b/packages/web/src/components/transaction-details-modal/components/TransactionDetailsContent.tsx @@ -1,11 +1,10 @@ +import { ChallengeRewardID, User } from '@audius/common/models' import { cacheUsersSelectors, TransactionType, TransactionMethod, TransactionDetails } from '@audius/common/store' - -import { ChallengeRewardID, User } from '@audius/common/models' import { formatAudio, formatCapitalizeString, diff --git a/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx b/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx index 542a2410b2d..494c9135510 100644 --- a/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx +++ b/packages/web/src/components/transaction-details-modal/components/TransactionPurchaseMetadata.tsx @@ -1,5 +1,4 @@ import { InAppAudioPurchaseMetadata } from '@audius/common/store' - import { formatNumberString, makeSolanaTransactionLink, diff --git a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx index feddd9fe511..6aa821c1473 100644 --- a/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx +++ b/packages/web/src/components/trending-genre-selection/TrendingGenreSelectionPage.tsx @@ -1,10 +1,9 @@ +import { TimeRange } from '@audius/common/models' import { trendingPageLineupActions, trendingPageActions, trendingPageSelectors } from '@audius/common/store' - -import { TimeRange } from '@audius/common/models' import { Genre, ELECTRONIC_PREFIX, TRENDING_GENRES } from '@audius/common/utils' import { push as pushRoute } from 'connected-react-router' import { connect } from 'react-redux' diff --git a/packages/web/src/components/twitter-auth/TwitterAuth.tsx b/packages/web/src/components/twitter-auth/TwitterAuth.tsx index 2e48a17aa57..77062493e5b 100644 --- a/packages/web/src/components/twitter-auth/TwitterAuth.tsx +++ b/packages/web/src/components/twitter-auth/TwitterAuth.tsx @@ -1,9 +1,9 @@ import { CSSProperties, MouseEventHandler, ReactNode } from 'react' -import { TwitterProfile } from '@audius/common/store' import 'whatwg-fetch' import 'url-search-params-polyfill' +import { TwitterProfile } from '@audius/common/store' import { captureException } from '@sentry/browser' import { audiusBackendInstance } from 'services/audius-backend/audius-backend-instance' diff --git a/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx b/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx index c8012e617c0..624805b18b7 100644 --- a/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx +++ b/packages/web/src/components/unfollow-confirmation-modal/UnfollowConfirmationModal.tsx @@ -1,9 +1,8 @@ +import { FollowSource, ID } from '@audius/common/models' import { profilePageActions, usersSocialActions as socialActions } from '@audius/common/store' - -import { FollowSource, ID } from '@audius/common/models' import { connect } from 'react-redux' import { Dispatch } from 'redux' diff --git a/packages/web/src/components/unload-dialog/UnloadDialog.jsx b/packages/web/src/components/unload-dialog/UnloadDialog.jsx index 16dff98ea07..56c6590f023 100644 --- a/packages/web/src/components/unload-dialog/UnloadDialog.jsx +++ b/packages/web/src/components/unload-dialog/UnloadDialog.jsx @@ -1,7 +1,6 @@ import { useState, useEffect, useRef } from 'react' import { confirmerSelectors } from '@audius/common/store' - import { Modal } from '@audius/stems' import { connect } from 'react-redux' diff --git a/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx b/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx index 388d87b2496..75c0bcc63e7 100644 --- a/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx +++ b/packages/web/src/components/upload-confirmation-modal/UploadConfirmationModal.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import { uploadConfirmationModalUISelectors } from '@audius/common/store' - import { Button, ButtonType, diff --git a/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx b/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx index a679f79b9aa..8390ea4675f 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/USDCPurchaseDetailsModal.tsx @@ -1,5 +1,4 @@ import { useUSDCPurchaseDetailsModal } from '@audius/common/store' - import { Modal } from '@audius/stems' import { PurchaseModalContent } from './components/PurchaseModalContent' diff --git a/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx b/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx index 8ed9ad3f2e8..dd02dfbaa79 100644 --- a/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx +++ b/packages/web/src/components/usdc-purchase-details-modal/components/SaleModalContent.tsx @@ -6,7 +6,6 @@ import { useInboxUnavailableModal, CommonState } from '@audius/common/store' - import { makeSolanaTransactionLink } from '@audius/common/utils' import { Button, diff --git a/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx b/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx index bc75ad3323c..1dba681aa84 100644 --- a/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx +++ b/packages/web/src/components/usdc-transaction-details-modal/USDCTransactionDetailsModal.tsx @@ -1,5 +1,4 @@ import { useUSDCTransactionDetailsModal } from '@audius/common/store' - import { formatUSDCWeiToUSDString, makeSolanaTransactionLink diff --git a/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx b/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx index c8fe29400ba..7914ae811f4 100644 --- a/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx +++ b/packages/web/src/components/user-name-and-badges/UserNameAndBadges.tsx @@ -1,9 +1,8 @@ -import { accountSelectors } from '@audius/common/store' - import { MouseEventHandler, useCallback } from 'react' import { useGetUserById } from '@audius/common/api' import { UserMetadata } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import cn from 'classnames' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx index e79224c5a43..3b08cbe1e5a 100644 --- a/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/WithdrawUSDCModal.tsx @@ -1,11 +1,3 @@ -import { - withdrawUSDCActions, - withdrawUSDCSelectors, - WithdrawUSDCModalPages, - useWithdrawUSDCModal, - WithdrawMethod -} from '@audius/common/store' - import { useCallback, useEffect, useRef, useState } from 'react' import { @@ -20,6 +12,13 @@ import { SolanaWalletAddress } from '@audius/common/models' import { IntKeys, FeatureFlags } from '@audius/common/services' +import { + withdrawUSDCActions, + withdrawUSDCSelectors, + WithdrawUSDCModalPages, + useWithdrawUSDCModal, + WithdrawMethod +} from '@audius/common/store' import { formatUSDCWeiToFloorCentsNumber, Nullable } from '@audius/common/utils' import { Modal, ModalContent, ModalHeader } from '@audius/stems' import BN from 'bn.js' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx b/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx index b411aecd6b8..065bbacb8d7 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/CoinflowWithdrawModal.tsx @@ -1,11 +1,10 @@ +import { useCallback } from 'react' + +import { useCoinflowAdapter } from '@audius/common/hooks' import { withdrawUSDCActions, useCoinflowWithdrawModal } from '@audius/common/store' - -import { useCallback } from 'react' - -import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowWithdraw } from '@coinflowlabs/react' import { useDispatch } from 'react-redux' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx index 7a42c8a8fbc..a09256a6980 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ConfirmTransferDetails.tsx @@ -1,13 +1,12 @@ +import { useCallback, useState } from 'react' + +import { useUSDCBalance } from '@audius/common/hooks' +import { BNUSDC } from '@audius/common/models' import { WithdrawUSDCModalPages, useWithdrawUSDCModal, WithdrawMethod } from '@audius/common/store' - -import { useCallback, useState } from 'react' - -import { useUSDCBalance } from '@audius/common/hooks' -import { BNUSDC } from '@audius/common/models' import { decimalIntegerToHumanReadable, formatUSDCWeiToFloorCentsNumber diff --git a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx index 0cfa9ada4e6..7af9126eeca 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/EnterTransferDetails.tsx @@ -1,9 +1,3 @@ -import { - WithdrawUSDCModalPages, - useWithdrawUSDCModal, - WithdrawMethod -} from '@audius/common/store' - import { ChangeEventHandler, FocusEventHandler, @@ -14,6 +8,11 @@ import { import { useFeatureFlag, useUSDCBalance } from '@audius/common/hooks' import { Name, BNUSDC } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + WithdrawUSDCModalPages, + useWithdrawUSDCModal, + WithdrawMethod +} from '@audius/common/store' import { filterDecimalString, padDecimalValue, diff --git a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx index 12b4d8e7ede..597fd4421e9 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/ErrorPage.tsx @@ -1,12 +1,11 @@ -import { - WithdrawUSDCModalPages, - useWithdrawUSDCModal -} from '@audius/common/store' - import { useCallback } from 'react' import { useUSDCBalance } from '@audius/common/hooks' import { BNUSDC } from '@audius/common/models' +import { + WithdrawUSDCModalPages, + useWithdrawUSDCModal +} from '@audius/common/store' import { decimalIntegerToHumanReadable, formatCurrencyBalance, diff --git a/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx b/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx index 5692b77c373..51f1f07eb20 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/PrepareTransfer.tsx @@ -7,7 +7,6 @@ import { useWithdrawUSDCModal, CoinflowWithdrawState } from '@audius/common/store' - import { Flex, Text } from '@audius/harmony' import { useField } from 'formik' import { useSelector } from 'react-redux' diff --git a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx index e1775ab78e5..c9090c0d724 100644 --- a/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx +++ b/packages/web/src/components/withdraw-usdc-modal/components/TransferSuccessful.tsx @@ -1,9 +1,8 @@ -import { withdrawUSDCSelectors, WithdrawMethod } from '@audius/common/store' - import { useCallback } from 'react' import { useUSDCBalance } from '@audius/common/hooks' import { Name, Status, BNUSDC } from '@audius/common/models' +import { withdrawUSDCSelectors, WithdrawMethod } from '@audius/common/store' import { decimalIntegerToHumanReadable, formatUSDCWeiToFloorCentsNumber, diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx index 251bcbd47c4..bdf87b9adce 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/AudioMatchingRewardsModalContent.tsx @@ -1,9 +1,8 @@ -import { challengesSelectors } from '@audius/common/store' - import { ReactNode, useCallback } from 'react' import { useAudioMatchingChallengeCooldownSchedule } from '@audius/common/hooks' import { ChallengeName, OptimisticUserChallenge } from '@audius/common/models' +import { challengesSelectors } from '@audius/common/store' import { formatNumberCommas, challengeRewardsConfig diff --git a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx index dda005deca0..6ebc543997b 100644 --- a/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx +++ b/packages/web/src/pages/audio-rewards-page/components/modals/ChallengeRewardsModal/ChallengeRewardsModal.tsx @@ -9,7 +9,6 @@ import { musicConfettiActions, ChallengeRewardsModalType } from '@audius/common/store' - import { fillString, formatNumberCommas, diff --git a/packages/web/src/pages/check-page/CheckPage.tsx b/packages/web/src/pages/check-page/CheckPage.tsx index 9cdbc90c389..b6d4348bb7c 100644 --- a/packages/web/src/pages/check-page/CheckPage.tsx +++ b/packages/web/src/pages/check-page/CheckPage.tsx @@ -1,8 +1,7 @@ -import { accountSelectors } from '@audius/common/store' - import { useEffect, useState } from 'react' import { Status } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { push as pushRoute } from 'connected-react-router' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx index 131bd3d5ff0..9d4f7cf70b9 100644 --- a/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx +++ b/packages/web/src/pages/collectibles-playlist-page/CollectiblesPlaylistPageProvider.tsx @@ -1,15 +1,3 @@ -import { - cacheUsersSelectors, - profilePageActions, - queueActions, - QueueSource, - collectibleDetailsUIActions, - shareModalUIActions, - playerSelectors, - CollectionTrack, - CollectionPageTrackRecord -} from '@audius/common/store' - import { useCallback, useEffect, @@ -29,6 +17,17 @@ import { SmartCollection, User } from '@audius/common/models' +import { + cacheUsersSelectors, + profilePageActions, + queueActions, + QueueSource, + collectibleDetailsUIActions, + shareModalUIActions, + playerSelectors, + CollectionTrack, + CollectionPageTrackRecord +} from '@audius/common/store' import { getHash, formatSeconds } from '@audius/common/utils' import cn from 'classnames' import { push } from 'connected-react-router' diff --git a/packages/web/src/pages/dashboard-page/DashboardPage.tsx b/packages/web/src/pages/dashboard-page/DashboardPage.tsx index 8d1aeb4e532..3e5713fd060 100644 --- a/packages/web/src/pages/dashboard-page/DashboardPage.tsx +++ b/packages/web/src/pages/dashboard-page/DashboardPage.tsx @@ -1,8 +1,7 @@ -import { themeSelectors } from '@audius/common/store' - import { useState, Suspense, ReactNode, useEffect, useCallback } from 'react' import { Status, Track } from '@audius/common/models' +import { themeSelectors } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import cn from 'classnames' import { each } from 'lodash' diff --git a/packages/web/src/pages/dashboard-page/store/sagas.ts b/packages/web/src/pages/dashboard-page/store/sagas.ts index c46566abe59..a59dec45c0c 100644 --- a/packages/web/src/pages/dashboard-page/store/sagas.ts +++ b/packages/web/src/pages/dashboard-page/store/sagas.ts @@ -1,11 +1,10 @@ +import { Collection, ID, Track } from '@audius/common/models' +import { IntKeys } from '@audius/common/services' import { accountSelectors, walletActions, getContext } from '@audius/common/store' - -import { Collection, ID, Track } from '@audius/common/models' -import { IntKeys } from '@audius/common/services' import { waitForValue, doEvery } from '@audius/common/utils' import { each } from 'lodash' import moment from 'moment' diff --git a/packages/web/src/pages/dashboard-page/store/selectors.ts b/packages/web/src/pages/dashboard-page/store/selectors.ts index dac9117e79b..189529b0289 100644 --- a/packages/web/src/pages/dashboard-page/store/selectors.ts +++ b/packages/web/src/pages/dashboard-page/store/selectors.ts @@ -1,5 +1,4 @@ import { accountSelectors } from '@audius/common/store' - import { createSelector } from 'reselect' import { AppState } from 'store/types' diff --git a/packages/web/src/pages/modals/Modals.tsx b/packages/web/src/pages/modals/Modals.tsx index 2b635501b48..d31ddd2603e 100644 --- a/packages/web/src/pages/modals/Modals.tsx +++ b/packages/web/src/pages/modals/Modals.tsx @@ -2,8 +2,6 @@ import { ComponentType, lazy } from 'react' import { Modals as ModalTypes } from '@audius/common/store' -import type {} from '@audius/common' - import { AddFundsModal } from 'components/add-funds-modal/AddFundsModal' import AddToCollectionModal from 'components/add-to-collection/desktop/AddToCollectionModal' import { AiAttributionSettingsModal } from 'components/ai-attribution-settings-modal' diff --git a/packages/web/src/pages/saved-page/SavedPageProvider.tsx b/packages/web/src/pages/saved-page/SavedPageProvider.tsx index 91d59b5ef08..bbe3bb2cf1d 100644 --- a/packages/web/src/pages/saved-page/SavedPageProvider.tsx +++ b/packages/web/src/pages/saved-page/SavedPageProvider.tsx @@ -1,6 +1,5 @@ import { ComponentType, PureComponent } from 'react' -import { SavedPageTabs as ProfileTabs } from '@audius/common' import { Name, RepostSource, @@ -11,6 +10,7 @@ import { LineupTrack } from '@audius/common/models' import { + SavedPageTabs as ProfileTabs, accountActions, accountSelectors, lineupSelectors, diff --git a/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts b/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts index 2f521bc30df..52cd205d5ba 100644 --- a/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts +++ b/packages/web/src/pages/sign-up-page/utils/loginDetailsSchema.ts @@ -1,4 +1,4 @@ -import { AudiusQueryContextType } from '@audius/common' +import { AudiusQueryContextType } from '@audius/common/audius-query' import { emailSchema } from '@audius/common/schemas' import { isNotCommonPassword } from '@audius/common/utils' import { z } from 'zod' diff --git a/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx b/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx index 2056bd86023..69817bbb765 100644 --- a/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx +++ b/packages/web/src/pages/trending-underground/TrendingUndergroundPage.tsx @@ -4,7 +4,6 @@ import { trendingUndergroundPageLineupSelectors, trendingUndergroundPageLineupActions } from '@audius/common/store' - import { useDispatch } from 'react-redux' import DesktopHeader from 'components/header/desktop/Header' From d8585fe4b813e10cdcc31ffa50c46f9270014310 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 17:57:47 -0800 Subject: [PATCH 50/64] Migrate mobile store --- packages/convert-exports.js | 2 +- packages/mobile/src/app/Drawers.tsx | 5 +- packages/mobile/src/app/ThemeProvider.tsx | 2 +- packages/mobile/src/app/TrpcProvider.tsx | 2 +- .../components/action-drawer/ActionDrawer.tsx | 5 +- .../add-funds-drawer/AddFundsDrawer.tsx | 10 +-- .../AddToCollectionDrawer.tsx | 10 +-- .../audio-balance-pill/AUDIOBalancePill.tsx | 3 +- .../AudioBreakdownDrawer.tsx | 9 ++- .../audio-rewards/RewardsBanner.tsx | 2 +- .../audio-rewards/TiersExplainerDrawer.tsx | 9 ++- .../mobile/src/components/audio/Airplay.tsx | 2 +- .../src/components/audio/AudioPlayer.tsx | 29 +++++---- .../src/components/audio/GoogleCast.tsx | 10 +-- .../src/components/audio/RepeatListener.tsx | 3 +- .../audio/useSavePodcastProgress.ts | 10 +-- .../BlockMessagesDrawer.tsx | 6 +- .../NotificationsButton.tsx | 3 +- .../src/components/card/CollectionDogEar.tsx | 3 +- .../AudioMatchingChallengeDrawerContent.tsx | 2 +- .../ChallengeRewardsDrawerContent.tsx | 2 +- .../ChallengeRewardsDrawerProvider.tsx | 12 ++-- .../ProfileCompletionChecks.tsx | 2 +- .../ReferralRewardContents.tsx | 2 +- .../chat-actions-drawer/ChatActionsDrawer.tsx | 2 +- .../CoinflowOnrampDrawer.tsx | 5 +- .../CollectibleDetailsDrawer.tsx | 6 +- .../collection-list/AddCollectionCard.tsx | 2 +- .../collection-list/CollectionCard.tsx | 11 ++-- .../mobile/src/components/core/Hyperlink.tsx | 2 +- .../src/components/core/PlayBarChin.tsx | 3 +- .../src/components/core/ProfilePicture.tsx | 3 +- .../components/core/Screen/ScreenContent.tsx | 2 +- .../src/components/core/UserDisplayName.tsx | 3 +- .../CreateChatActionsDrawer.tsx | 2 +- .../DeactivateAccountConfirmationDrawer.tsx | 6 +- .../delete-chat-drawer/DeleteChatDrawer.tsx | 2 +- .../DeletePlaylistConfirmationDrawer.tsx | 2 +- .../details-tile/DetailsProgressInfo.tsx | 6 +- .../components/details-tile/DetailsTile.tsx | 12 ++-- .../details-tile/DetailsTileActionButtons.tsx | 5 +- .../details-tile/DetailsTileAiAttribution.tsx | 2 +- .../details-tile/DetailsTileNoAccess.tsx | 12 ++-- .../src/components/drawer/AppDrawer.tsx | 4 +- .../components/drawers/ConfirmationDrawer.tsx | 5 +- .../drawers/DeleteTrackConfirmationDrawer.tsx | 2 +- .../drawers/ReleaseNowConfirmationDrawer.tsx | 2 +- .../RemoveDownloadedCollectionDrawer.tsx | 2 +- .../UnfavoriteDownloadedCollectionDrawer.tsx | 5 +- .../DuplicateAddConfirmationDrawer.tsx | 6 +- .../EnablePushNotificationsDrawer.tsx | 5 +- .../feed-filter-drawer/FeedFilterDrawer.tsx | 6 +- .../components/feed-tip-tile/FeedTipTile.tsx | 6 +- .../feed-tip-tile/SendTipButton.tsx | 2 +- .../src/components/hcaptcha/HCaptcha.tsx | 12 ++-- .../src/components/image/CollectionImage.tsx | 3 +- .../src/components/image/CoverPhoto.tsx | 3 +- .../src/components/image/TrackImage.tsx | 3 +- .../mobile/src/components/image/UserImage.tsx | 3 +- .../InboxUnavailableDrawer.tsx | 20 +++--- .../LeavingAudiusDrawer.tsx | 2 +- .../components/lineup-tile/CollectionTile.tsx | 19 +++--- .../lineup-tile/CollectionTileTrackList.tsx | 5 +- .../src/components/lineup-tile/LineupTile.tsx | 2 +- .../lineup-tile/LineupTileAccessStatus.tsx | 10 +-- .../lineup-tile/LineupTileMetadata.tsx | 2 +- .../lineup-tile/LineupTileStats.tsx | 12 ++-- .../lineup-tile/LineupTileTopRight.tsx | 6 +- .../src/components/lineup-tile/TrackTile.tsx | 18 +++--- .../src/components/lineup-tile/types.ts | 5 +- .../mobile/src/components/lineup/types.ts | 5 +- .../LockedContentDrawer.tsx | 2 +- .../NavigationContainer.tsx | 2 +- .../now-playing-drawer/ActionsBar.tsx | 16 ++--- .../components/now-playing-drawer/Artwork.tsx | 9 ++- .../now-playing-drawer/AudioControls.tsx | 10 +-- .../now-playing-drawer/NowPlayingDrawer.tsx | 12 ++-- .../components/now-playing-drawer/PlayBar.tsx | 6 +- .../now-playing-drawer/PlayButton.tsx | 2 +- .../now-playing-drawer/PlaybackRateButton.tsx | 5 +- .../now-playing-drawer/TrackInfo.tsx | 3 +- .../now-playing-drawer/TrackingBar.tsx | 2 +- .../useCurrentTrackDuration.ts | 3 +- .../CollectionDownloadStatusIndicator.tsx | 3 +- .../DownloadStatusIndicator.tsx | 3 +- .../offline-placeholder/OnlineOnly.tsx | 2 +- .../CollectionOverflowMenuDrawer.tsx | 14 +++-- .../OverflowMenuDrawer.tsx | 7 ++- .../ProfileOverflowMenuDrawer.tsx | 11 ++-- .../TrackOverflowMenuDrawer.tsx | 21 ++++--- .../payment-method/CardSelectionButton.tsx | 2 +- .../PlaybackRateDrawer.tsx | 5 +- .../PremiumTrackPurchaseDrawer.tsx | 18 +++--- .../hooks/usePurchaseContentFormState.ts | 7 ++- .../hooks/usePurchaseSummaryValues.ts | 3 +- .../ProfileActionsDrawer.tsx | 10 +-- .../PublishPlaylistDrawer.tsx | 6 +- .../src/components/scrubber/Scrubber.tsx | 2 +- .../mobile/src/components/scrubber/Slider.tsx | 2 +- .../src/components/scrubber/usePosition.ts | 2 +- .../components/share-drawer/ShareDrawer.tsx | 12 ++-- .../src/components/share-drawer/messages.ts | 3 +- .../share-drawer/useShareToStory.tsx | 5 +- .../src/components/share-drawer/utils.ts | 3 +- .../ShareToTikTokDrawer.tsx | 10 +-- .../SignOutConfirmationDrawer.tsx | 2 +- .../StripeOnrampDrawer.tsx | 5 +- .../StripeOnrampEmbed.tsx | 9 ++- .../SuggestedArtistsList.tsx | 5 +- .../components/SuggestedTracks.tsx | 2 +- .../mobile/src/components/toasts/Toast.tsx | 8 ++- .../mobile/src/components/toasts/Toasts.tsx | 3 +- .../track-details-tile/TrackDetailsTile.tsx | 2 +- .../components/track-list/TrackListItem.tsx | 20 +++--- .../mobile/src/components/track-list/types.ts | 3 +- .../TrendingRewardsDrawer.tsx | 13 ++-- .../twitter-button/TwitterButton.tsx | 2 +- .../USDCManualTransferDrawer.tsx | 2 +- .../src/components/user/FollowButton.tsx | 2 +- .../src/components/user/FollowsYouChip.tsx | 3 +- .../vip-discord-drawer/VipDiscordDrawer.tsx | 3 +- .../components/TextLink/ExternalLink.tsx | 2 +- .../foundations/color/Color.stories.tsx | 3 +- packages/mobile/src/hooks/useManualToast.ts | 7 ++- .../src/hooks/useNotificationNavigation.ts | 63 ++++++++++--------- .../mobile/src/hooks/useOfflineTrackStatus.ts | 2 +- .../mobile/src/hooks/useReachabilityEffect.ts | 2 +- packages/mobile/src/hooks/useRemoteConfig.ts | 2 +- packages/mobile/src/hooks/useToast.ts | 7 ++- .../AiGeneratedTracksScreen.tsx | 6 +- .../left-nav-drawer/AccountDetails.tsx | 2 +- .../left-nav-drawer/LeftNavDrawer.tsx | 3 +- .../left-nav-drawer/VanityMetrics.tsx | 10 +-- .../app-screen/AccountPictureHeader.tsx | 3 +- .../src/screens/app-screen/AppTabScreen.tsx | 11 ++-- .../src/screens/app-screen/AppTabsScreen.tsx | 2 +- .../src/screens/audio-screen/AudioScreen.tsx | 16 ++--- .../screens/audio-screen/ChallengeRewards.tsx | 15 +++-- .../screens/audio-screen/TrendingRewards.tsx | 10 ++- .../ChangePasswordScreen.tsx | 10 +-- .../ConfirmCredentials.tsx | 5 +- .../src/screens/chat-screen/ChatListItem.tsx | 2 +- .../screens/chat-screen/ChatListScreen.tsx | 2 +- .../chat-screen/ChatMessageListItem.tsx | 9 ++- .../chat-screen/ChatMessagePlaylist.tsx | 10 ++- .../screens/chat-screen/ChatMessageTrack.tsx | 9 ++- .../src/screens/chat-screen/ChatScreen.tsx | 6 +- .../src/screens/chat-screen/ChatTextInput.tsx | 2 +- .../screens/chat-screen/ChatUnavailable.tsx | 2 +- .../screens/chat-screen/ChatUserListItem.tsx | 10 +-- .../chat-screen/ChatUserListScreen.tsx | 20 +++--- .../src/screens/chat-screen/LinkPreview.tsx | 2 +- .../src/screens/chat-screen/ReactionPopup.tsx | 9 ++- .../chat-screen/ResendMessageButton.tsx | 2 +- .../collection-screen/CollectionHeader.tsx | 10 +-- .../collection-screen/CollectionScreen.tsx | 18 +++--- .../CollectionScreenDetailsTile.tsx | 12 ++-- .../useFetchCollectionLineup.ts | 8 +-- .../edit-playlist-screen/EditPlaylistForm.tsx | 7 ++- .../EditPlaylistModalScreen.tsx | 12 ++-- .../EditPlaylistNavigator.tsx | 3 +- .../src/screens/edit-playlist-screen/types.ts | 3 +- .../edit-profile-screen/EditProfileScreen.tsx | 2 +- .../edit-track-screen/EditTrackForm.tsx | 5 +- .../EditTrackModalScreen.tsx | 9 ++- .../edit-track-screen/EditTrackScreen.tsx | 5 +- .../CollectibleGatedAvailability.tsx | 2 +- .../components/SpecialAccessAvailability.tsx | 2 +- .../fields/RemixSettingsField.tsx | 3 +- .../screens/NFTCollectionsScreen.tsx | 2 +- .../screens/ReleaseDateScreen.tsx | 2 +- .../screens/RemixSettingsScreen.tsx | 5 +- .../src/screens/edit-track-screen/types.ts | 3 +- .../screens/explore-screen/ExploreScreen.tsx | 3 +- .../explore-screen/tabs/ArtistsTab.tsx | 2 +- .../tabs/ForYouTab/ForYouTab.tsx | 2 +- .../tabs/ForYouTab/LetThemDJScreen.tsx | 10 +-- .../tabs/ForYouTab/PremiumTracksScreen.tsx | 10 +-- .../tabs/ForYouTab/TopAlbumsScreen.tsx | 10 +-- .../ForYouTab/TrendingPlaylistsScreen.tsx | 3 +- .../ForYouTab/TrendingUndergroundScreen.tsx | 7 ++- .../explore-screen/tabs/PlaylistsTab.tsx | 2 +- .../screens/favorites-screen/AlbumsTab.tsx | 14 +++-- .../DownloadFavoritesSwitch.tsx | 2 +- .../favorites-screen/DownloadProgress.tsx | 3 +- .../LibraryCategorySelectionMenu.tsx | 10 +-- .../favorites-screen/OfflineContentBanner.tsx | 3 +- .../screens/favorites-screen/PlaylistsTab.tsx | 14 +++-- .../screens/favorites-screen/TracksTab.tsx | 14 ++--- .../src/screens/favorites-screen/selectors.ts | 3 +- .../useCollectionsScreenData.ts | 11 ++-- .../favorites-screen/useFavoritesLineup.ts | 8 +-- .../feed-screen/EmptyFeedSuggestedFollows.tsx | 6 +- .../screens/feed-screen/FeedFilterButton.tsx | 2 +- .../src/screens/feed-screen/FeedScreen.tsx | 6 +- .../MoodCollectionScreen.tsx | 10 +-- .../Notification/NotificationTile.tsx | 5 +- .../Notification/utils.ts | 3 +- .../notifications-screen/NotificationList.tsx | 9 ++- .../NotificationListItem.tsx | 4 +- .../AddTrackToPlaylistNotification.tsx | 7 ++- .../AnnouncementNotification.tsx | 3 +- .../ChallengeRewardNotification.tsx | 5 +- .../Notifications/FavoriteNotification.tsx | 7 ++- .../FavoriteOfRepostNotification.tsx | 7 ++- .../Notifications/FollowNotification.tsx | 7 ++- .../Notifications/MilestoneNotification.tsx | 11 ++-- .../Notifications/RemixCosignNotification.tsx | 12 ++-- .../Notifications/RemixCreateNotification.tsx | 7 ++- .../Notifications/RepostNotification.tsx | 7 ++- .../RepostOfRepostNotification.tsx | 7 ++- .../SupporterDethronedNotification.tsx | 8 ++- .../Notifications/TastemakerNotification.tsx | 12 ++-- .../Notifications/TierChangeNotification.tsx | 7 ++- .../Notifications/TipReactionNotification.tsx | 9 ++- .../Notifications/TipReceivedNotification.tsx | 12 ++-- .../Notifications/TipSentNotification.tsx | 8 ++- .../TopSupporterNotification.tsx | 8 ++- .../TopSupportingNotification.tsx | 8 ++- .../TrendingPlaylistNotification.tsx | 11 ++-- .../TrendingTrackNotification.tsx | 11 ++-- .../TrendingUndergroundNotification.tsx | 11 ++-- .../USDCPurchaseBuyerNotification.tsx | 12 ++-- .../USDCPurchaseSellerNotification.tsx | 11 ++-- .../UserSubscriptionNotification.tsx | 7 ++- .../Notifications/useSocialActionHandler.ts | 14 +++-- .../NotificationsScreen.tsx | 5 +- .../Reaction/Reaction.tsx | 5 +- .../Reaction/ReactionList.tsx | 4 +- .../Reaction/reactions.tsx | 5 +- .../screens/pay-and-earn-screen/USDCCard.tsx | 2 +- .../ArtistRecommendations.tsx | 12 ++-- .../profile-screen/CollectiblesCard.tsx | 8 +-- .../profile-screen/EmptyProfileTile.tsx | 3 +- .../screens/profile-screen/MessageButton.tsx | 2 +- .../profile-screen/MessageLockedButton.tsx | 2 +- .../ProfileHeader/ProfileHeader.tsx | 2 +- .../ProfileHeader/ProfileInfoTiles.tsx | 5 +- .../ProfileHeader/ProfileSocials.tsx | 2 +- .../ProfileHeader/ProfileTierTile.tsx | 2 +- .../ProfileHeader/SupportingList.tsx | 2 +- .../ProfileHeader/SupportingTile.tsx | 2 +- .../ProfileHeader/TopSupporters.tsx | 6 +- .../ProfileHeader/ViewAllSupportingTile.tsx | 2 +- .../screens/profile-screen/ProfileInfo.tsx | 10 +-- .../screens/profile-screen/ProfileMetrics.tsx | 8 +-- .../screens/profile-screen/ProfileScreen.tsx | 12 ++-- .../profile-screen/ProfileTabs/AlbumsTab.tsx | 2 +- .../ProfileTabs/CollectiblesTab.tsx | 2 +- .../ProfileTabs/PlaylistsTab.tsx | 2 +- .../profile-screen/ProfileTabs/RepostsTab.tsx | 8 +-- .../profile-screen/ProfileTabs/TracksTab.tsx | 8 +-- .../profile-screen/SubscribeButton.tsx | 2 +- .../screens/profile-screen/TipAudioButton.tsx | 2 +- .../src/screens/profile-screen/selectors.ts | 9 ++- .../src/screens/profile-screen/useIsArtist.ts | 2 +- .../src/screens/profile-screen/utils.ts | 5 +- .../ResetPasswordScreen.tsx | 2 +- .../src/screens/root-screen/RootScreen.tsx | 6 +- .../src/screens/root-screen/StatusBar.tsx | 3 +- .../search-results-screen/tabs/AlbumsTab.tsx | 9 ++- .../tabs/PlaylistsTab.tsx | 9 ++- .../tabs/ProfilesTab.tsx | 9 ++- .../tabs/SearchResultsTab.tsx | 2 +- .../search-results-screen/tabs/TracksTab.tsx | 10 +-- .../tabs/useFetchTabResultsEffect.tsx | 10 +-- .../settings-screen/AccountSettingsRow.tsx | 2 +- .../settings-screen/AccountSettingsScreen.tsx | 6 +- .../AccountVerificationScreen.tsx | 2 +- .../settings-screen/AppearanceSettingsRow.tsx | 6 +- .../settings-screen/CastSettingsRow.tsx | 10 ++- .../EmailFrequencyControlRow.tsx | 8 +-- .../ListeningHistoryScreen.tsx | 6 +- .../settings-screen/NotificationRow.tsx | 8 +-- .../NotificationSettingsScreen.tsx | 6 +- .../components/WelcomeDrawer.tsx | 2 +- .../screens/FinishProfileScreen.tsx | 5 +- .../src/screens/signon/ProfileImage.tsx | 5 +- .../src/screens/signon/ProfileManual.tsx | 5 +- packages/mobile/src/screens/signon/SignOn.tsx | 2 +- .../SmartCollectionScreen.tsx | 10 +-- .../tip-artist-screen/AvailableAudio.tsx | 3 +- .../ConfirmSendTipScreen.tsx | 2 +- .../tip-artist-screen/ReceiverDetails.tsx | 2 +- .../tip-artist-screen/SendTipScreen.tsx | 6 +- .../tip-artist-screen/SendTipStatusText.tsx | 3 +- .../TipArtistModalScreen.tsx | 2 +- .../screens/tip-artist-screen/TipHeader.tsx | 3 +- .../tip-artist-screen/TipSentScreen.tsx | 2 +- .../src/screens/track-screen/DownloadRow.tsx | 9 ++- .../screens/track-screen/DownloadSection.tsx | 11 ++-- .../track-screen/TrackRemixesScreen.tsx | 10 +-- .../src/screens/track-screen/TrackScreen.tsx | 6 +- .../track-screen/TrackScreenDetailsTile.tsx | 20 +++--- .../TrackScreenDownloadButtons.tsx | 2 +- .../screens/track-screen/TrackScreenRemix.tsx | 2 +- .../trending-screen/TrendingFilterButton.tsx | 2 +- .../trending-screen/TrendingFilterDrawer.tsx | 10 +-- .../trending-screen/TrendingLineup.tsx | 6 +- .../trending-screen/TrendingScreen.tsx | 3 +- .../components/UploadingTrackTile.tsx | 5 +- .../screens/CompleteTrackScreen.tsx | 5 +- .../screens/UploadCompleteScreen.tsx | 16 ++--- .../screens/UploadingTracksScreen.tsx | 10 ++- .../upload-screen/utils/processTrackFile.ts | 3 +- .../user-list-screen/FavoritedScreen.tsx | 6 +- .../user-list-screen/FollowersScreen.tsx | 8 +-- .../user-list-screen/FollowingScreen.tsx | 6 +- .../user-list-screen/MutualsScreen.tsx | 6 +- .../NotificationUsersScreen.tsx | 6 +- .../user-list-screen/RelatedArtistsScreen.tsx | 6 +- .../user-list-screen/RepostsScreen.tsx | 6 +- .../user-list-screen/SupporterInfo.tsx | 3 +- .../user-list-screen/SupportingInfo.tsx | 6 +- .../SupportingUsersScreen.tsx | 6 +- .../user-list-screen/TopSupportersScreen.tsx | 10 +-- .../src/screens/user-list-screen/UserList.tsx | 13 ++-- .../screens/user-list-screen/UserListItem.tsx | 2 +- .../wallet-connect/ConnectNewWalletButton.tsx | 2 +- .../wallet-connect/WalletConnectScreen.tsx | 3 +- .../components/ConfirmRemoveWalletDrawer.tsx | 8 +-- .../components/LinkedWallet.tsx | 2 +- .../components/LinkedWallets.tsx | 8 ++- .../components/SolanaPhoneOption.tsx | 5 +- .../components/WalletConnectDrawer.tsx | 2 +- .../wallet-connect/useCanConnectNewWallet.ts | 3 +- .../wallet-connect/usePhantomConnect.ts | 2 +- .../wallet-connect/useWalletConnect.ts | 10 +-- .../wallet-connect/useWalletStatusToasts.ts | 8 +-- .../audio-player/NativeMobileAudio.ts | 3 +- .../mobile/src/services/eagerLoadUtils.ts | 2 - packages/mobile/src/store/account/sagas.ts | 2 +- .../createPlaylistRequestedSaga.ts | 2 +- packages/mobile/src/store/chat/sagas.ts | 2 +- .../mobile/src/store/notifications/sagas.ts | 6 +- packages/mobile/src/store/oauth/actions.ts | 13 ++-- packages/mobile/src/store/oauth/reducer.ts | 3 +- packages/mobile/src/store/oauth/sagas.ts | 2 +- .../sagas/getIsOfflineEnabled.ts | 2 +- .../offlineQueueSagas/watchNetworkType.ts | 5 +- .../offlineQueueSagas/watchReachability.ts | 2 +- .../workers/downloadCollectionWorker.ts | 2 +- .../workers/downloadTrackWorker.ts | 10 +-- .../workers/playCounterWorker.ts | 2 +- .../workers/staleTrackWorker.ts | 8 +-- .../workers/syncCollectionWorker.ts | 6 +- .../sagas/rehydrateOfflineDataSaga.ts | 2 +- .../sagas/requestDownloadAllFavoritesSaga.ts | 6 +- .../sagas/requestDownloadCollectionSaga.ts | 4 +- .../requestDownloadFavoritedCollectionSaga.ts | 2 +- .../sagas/syncOfflineDataSaga.ts | 3 +- .../sagas/utils/shouldCancelJob.ts | 5 +- .../sagas/watchAddTrackToPlaylistSaga.ts | 2 +- .../sagas/watchSaveCollectionSaga.ts | 2 +- .../sagas/watchSaveTrackSaga.ts | 2 +- .../sagas/watchUnsaveCollectionSaga.ts | 2 +- .../sagas/watchUnsaveTrackSaga.ts | 2 +- .../src/store/offline-downloads/selectors.ts | 2 +- packages/mobile/src/store/sagas.ts | 30 ++++----- packages/mobile/src/store/settings/sagas.ts | 15 ++--- packages/mobile/src/store/sign-out/sagas.ts | 10 +-- packages/mobile/src/store/store.ts | 12 ++-- packages/mobile/src/store/storeContext.ts | 4 +- packages/mobile/src/store/theme/sagas.ts | 6 +- .../sagas/connectNewWalletSaga.ts | 10 +-- .../wallet-connect/sagas/signMessageSaga.ts | 6 +- .../src/utils/launchSelectImageActionSheet.ts | 3 +- packages/mobile/src/utils/reachability.ts | 3 +- packages/mobile/src/utils/theme.ts | 5 +- 369 files changed, 1315 insertions(+), 960 deletions(-) diff --git a/packages/convert-exports.js b/packages/convert-exports.js index cd9eeb4d1aa..6d7b2b191f8 100644 --- a/packages/convert-exports.js +++ b/packages/convert-exports.js @@ -2,7 +2,7 @@ const glob = require('glob') const fs = require('fs') var getDirectories = function (callback) { - glob('./web/src/**/*', callback) + glob('./mobile/src/**/*', callback) } const DIRECTORY = 'store' diff --git a/packages/mobile/src/app/Drawers.tsx b/packages/mobile/src/app/Drawers.tsx index 1a1198b7df8..76e4176e621 100644 --- a/packages/mobile/src/app/Drawers.tsx +++ b/packages/mobile/src/app/Drawers.tsx @@ -1,6 +1,7 @@ -import type { ComponentType } from 'react' +import { Modals } from '@audius/common/store' + import type { ComponentType } from 'react' -import type { Modals } from '@audius/common' +import type { } from '@audius/common' import { AddFundsDrawer } from 'app/components/add-funds-drawer/AddFundsDrawer' import { AddToCollectionDrawer } from 'app/components/add-to-collection-drawer' diff --git a/packages/mobile/src/app/ThemeProvider.tsx b/packages/mobile/src/app/ThemeProvider.tsx index 9d603cca61c..75963ec90ab 100644 --- a/packages/mobile/src/app/ThemeProvider.tsx +++ b/packages/mobile/src/app/ThemeProvider.tsx @@ -1,7 +1,7 @@ +import { themeActions, themeSelectors } from '@audius/common/store' import type { ReactNode } from 'react' import { useEffect } from 'react' -import { themeActions, themeSelectors } from '@audius/common' import { Theme, SystemAppearance } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import AsyncStorage from '@react-native-async-storage/async-storage' diff --git a/packages/mobile/src/app/TrpcProvider.tsx b/packages/mobile/src/app/TrpcProvider.tsx index 06a5f0ff25d..b6e2b1bae77 100644 --- a/packages/mobile/src/app/TrpcProvider.tsx +++ b/packages/mobile/src/app/TrpcProvider.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import React, { useMemo, useState } from 'react' -import { accountSelectors } from '@audius/common' import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/action-drawer/ActionDrawer.tsx b/packages/mobile/src/components/action-drawer/ActionDrawer.tsx index 7302a593408..94c960efd24 100644 --- a/packages/mobile/src/components/action-drawer/ActionDrawer.tsx +++ b/packages/mobile/src/components/action-drawer/ActionDrawer.tsx @@ -1,7 +1,8 @@ -import type { ReactNode } from 'react' +import { Modals } from '@audius/common/store' + import type { ReactNode } from 'react' import { useCallback } from 'react' -import type { Modals } from '@audius/common' +import type { } from '@audius/common' import type { TextStyle, ViewStyle } from 'react-native' import { TouchableHighlight, View } from 'react-native' import type { SetOptional } from 'type-fest' diff --git a/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx b/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx index 6e3049e9f08..37e5262a82b 100644 --- a/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx +++ b/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx @@ -1,10 +1,10 @@ -import { useCallback, useState } from 'react' - import { - useAddFundsModal, + buyUSDCActions, useUSDCManualTransferModal, - buyUSDCActions -} from '@audius/common' + useAddFundsModal +} from '@audius/common/store' +import { useCallback, useState } from 'react' + import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { View } from 'react-native' diff --git a/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx b/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx index f887aefb6ca..38a98723f7e 100644 --- a/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx +++ b/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx @@ -1,12 +1,12 @@ -import { useCallback, useMemo } from 'react' - import { - duplicateAddConfirmationModalUIActions, accountSelectors, cacheCollectionsActions, + collectionPageSelectors, addToCollectionUISelectors, - collectionPageSelectors -} from '@audius/common' + duplicateAddConfirmationModalUIActions +} from '@audius/common/store' +import { useCallback, useMemo } from 'react' + import type { Collection } from '@audius/common/models' import { CreatePlaylistSource, SquareSizes } from '@audius/common/models' import { fetchAccountCollections } from 'common/store/saved-collections/actions' diff --git a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx index 846c920672f..c5977c1c3ca 100644 --- a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx +++ b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx @@ -1,4 +1,5 @@ -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' + import { useSelectTierInfo, useTotalBalanceWithFallback diff --git a/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx b/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx index e06bfb6ea5f..5f6ea85897d 100644 --- a/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx +++ b/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx @@ -1,5 +1,10 @@ -import type { AssociatedWallet } from '@audius/common' -import { tokenDashboardPageSelectors, walletSelectors } from '@audius/common' +import { + tokenDashboardPageSelectors, + walletSelectors, + AssociatedWallet +} from '@audius/common/store' +import type {} from '@audius/common' + import type { BNWei } from '@audius/common/models' import { Chain } from '@audius/common/models' import { formatWei } from '@audius/common/utils' diff --git a/packages/mobile/src/components/audio-rewards/RewardsBanner.tsx b/packages/mobile/src/components/audio-rewards/RewardsBanner.tsx index bbfc2c1313c..55fe015fa97 100644 --- a/packages/mobile/src/components/audio-rewards/RewardsBanner.tsx +++ b/packages/mobile/src/components/audio-rewards/RewardsBanner.tsx @@ -1,6 +1,6 @@ +import { audioRewardsPageActions, modalsActions } from '@audius/common/store' import { useCallback } from 'react' -import { audioRewardsPageActions, modalsActions } from '@audius/common' import { Text, View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx b/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx index 35d25d80484..27d65f51b71 100644 --- a/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx +++ b/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx @@ -1,5 +1,10 @@ -import { profilePageSelectors, badgeTiers } from '@audius/common' -import type { BadgeTierInfo } from '@audius/common' +import { + profilePageSelectors, + badgeTiers, + BadgeTierInfo +} from '@audius/common/store' + +import type {} from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { Text, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/audio/Airplay.tsx b/packages/mobile/src/components/audio/Airplay.tsx index 49b3f339bac..2e4fa3b06f3 100644 --- a/packages/mobile/src/components/audio/Airplay.tsx +++ b/packages/mobile/src/components/audio/Airplay.tsx @@ -1,6 +1,6 @@ +import { castActions } from '@audius/common/store' import { useCallback, useEffect, useRef } from 'react' -import { castActions } from '@audius/common' import { requireNativeComponent, NativeEventEmitter, diff --git a/packages/mobile/src/components/audio/AudioPlayer.tsx b/packages/mobile/src/components/audio/AudioPlayer.tsx index c0fdc56d90a..033c4bcb878 100644 --- a/packages/mobile/src/components/audio/AudioPlayer.tsx +++ b/packages/mobile/src/components/audio/AudioPlayer.tsx @@ -1,23 +1,26 @@ -import { useRef, useEffect, useCallback, useState } from 'react' - -import type { CommonState, Queueable } from '@audius/common' import { - playbackRateValueMap, accountSelectors, - cacheUsersSelectors, cacheTracksSelectors, - playerSelectors, - playerActions, - playbackPositionActions, - playbackPositionSelectors, + cacheUsersSelectors, + savedPageTracksLineupActions, queueActions, queueSelectors, - reachabilitySelectors, - gatedContentSelectors, RepeatMode, + reachabilitySelectors, tracksSocialActions, - savedPageTracksLineupActions -} from '@audius/common' + playerActions, + playerSelectors, + playbackRateValueMap, + playbackPositionActions, + playbackPositionSelectors, + gatedContentSelectors, + Queueable, + CommonState +} from '@audius/common/store' +import { useRef, useEffect, useCallback, useState } from 'react' + +import type {} from '@audius/common' + import { useAppContext } from '@audius/common/context' import { SquareSizes } from '@audius/common/models' import type { ID, Track } from '@audius/common/models' diff --git a/packages/mobile/src/components/audio/GoogleCast.tsx b/packages/mobile/src/components/audio/GoogleCast.tsx index a41df6c6d21..88887773401 100644 --- a/packages/mobile/src/components/audio/GoogleCast.tsx +++ b/packages/mobile/src/components/audio/GoogleCast.tsx @@ -1,10 +1,10 @@ -import { useCallback, useEffect, useMemo, useState } from 'react' - import { + cacheUsersSelectors, castActions, - playerSelectors, - cacheUsersSelectors -} from '@audius/common' + playerSelectors +} from '@audius/common/store' +import { useCallback, useEffect, useMemo, useState } from 'react' + import { SquareSizes } from '@audius/common/models' import { encodeHashId } from '@audius/common/utils' import { diff --git a/packages/mobile/src/components/audio/RepeatListener.tsx b/packages/mobile/src/components/audio/RepeatListener.tsx index 3413f0004ca..46480c3add4 100644 --- a/packages/mobile/src/components/audio/RepeatListener.tsx +++ b/packages/mobile/src/components/audio/RepeatListener.tsx @@ -1,4 +1,5 @@ -import { playerActions } from '@audius/common' +import { playerActions } from '@audius/common/store' + import TrackPlayer, { RepeatMode, useProgress } from 'react-native-track-player' import { useDispatch } from 'react-redux' import { useAsync, usePrevious } from 'react-use' diff --git a/packages/mobile/src/components/audio/useSavePodcastProgress.ts b/packages/mobile/src/components/audio/useSavePodcastProgress.ts index e33e513ac4f..a7a048abd65 100644 --- a/packages/mobile/src/components/audio/useSavePodcastProgress.ts +++ b/packages/mobile/src/components/audio/useSavePodcastProgress.ts @@ -1,11 +1,11 @@ -import { useEffect } from 'react' - import { accountSelectors, cacheTracksSelectors, - playbackPositionActions, - playerSelectors -} from '@audius/common' + playerSelectors, + playbackPositionActions +} from '@audius/common/store' +import { useEffect } from 'react' + import { Genre } from '@audius/common/utils' import { useProgress } from 'react-native-track-player' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx b/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx index 5572d01ede8..5a456836eac 100644 --- a/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx +++ b/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx @@ -1,6 +1,10 @@ +import { + cacheUsersSelectors, + chatActions, + chatSelectors +} from '@audius/common/store' import { useCallback } from 'react' -import { cacheUsersSelectors, chatActions, chatSelectors } from '@audius/common' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/NotificationsButton.tsx b/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/NotificationsButton.tsx index f402547be31..acf98e0f087 100644 --- a/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/NotificationsButton.tsx +++ b/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/NotificationsButton.tsx @@ -1,4 +1,5 @@ -import { notificationsSelectors } from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { View, Text } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/card/CollectionDogEar.tsx b/packages/mobile/src/components/card/CollectionDogEar.tsx index 619462b231c..a426aef61e2 100644 --- a/packages/mobile/src/components/card/CollectionDogEar.tsx +++ b/packages/mobile/src/components/card/CollectionDogEar.tsx @@ -1,4 +1,5 @@ -import { cacheCollectionsSelectors } from '@audius/common' +import { cacheCollectionsSelectors } from '@audius/common/store' + import type { ID } from '@audius/common/models' import { DogEarType } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx b/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx index e8778d6182a..915391c94c8 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx @@ -1,6 +1,6 @@ +import { ClaimStatus } from '@audius/common/store' import React from 'react' -import { ClaimStatus } from '@audius/common' import type { OptimisticUserChallenge } from '@audius/common/models' import { ChallengeName } from '@audius/common/models' import { formatNumberCommas } from '@audius/common/utils' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx index 8ddf254d334..77074096f38 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx @@ -1,6 +1,6 @@ +import { ClaimStatus } from '@audius/common/store' import React from 'react' -import { ClaimStatus } from '@audius/common' import type { UserChallengeState } from '@audius/common/models' import { fillString, formatNumberCommas } from '@audius/common/utils' import { View } from 'react-native' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx index 765bf268539..909f341e9b9 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx @@ -1,12 +1,14 @@ -import { useCallback, useEffect } from 'react' - -import type { CommonState } from '@audius/common' import { challengesSelectors, + audioRewardsPageSelectors, audioRewardsPageActions, ClaimStatus, - audioRewardsPageSelectors -} from '@audius/common' + CommonState +} from '@audius/common/store' +import { useCallback, useEffect } from 'react' + +import type {} from '@audius/common' + import { IntKeys, StringKeys } from '@audius/common/services' import { isAudioMatchingChallenge, diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ProfileCompletionChecks.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ProfileCompletionChecks.tsx index d1eec64facc..a9c045b10a9 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ProfileCompletionChecks.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ProfileCompletionChecks.tsx @@ -1,6 +1,6 @@ +import { accountSelectors, challengesSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { accountSelectors, challengesSelectors } from '@audius/common' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ReferralRewardContents.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ReferralRewardContents.tsx index 19d7c388449..eb20e846379 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ReferralRewardContents.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ReferralRewardContents.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import React from 'react' -import { accountSelectors } from '@audius/common' import { useSelector } from 'react-redux' import { ReferralLinkCopyButton } from './ReferralLinkCopyButton' diff --git a/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx b/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx index b2fa9668986..aad37c07ef4 100644 --- a/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx +++ b/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx @@ -1,6 +1,6 @@ +import { chatSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { chatSelectors } from '@audius/common' import { View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx b/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx index c7c989daac6..29fe0ef948f 100644 --- a/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx +++ b/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx @@ -1,6 +1,9 @@ +import { + coinflowModalUIActions, + useCoinflowOnrampModal +} from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' -import { useCoinflowOnrampModal, coinflowModalUIActions } from '@audius/common' import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowPurchase } from '@coinflowlabs/react-native' import { Transaction } from '@solana/web3.js' diff --git a/packages/mobile/src/components/collectible-details-drawer/CollectibleDetailsDrawer.tsx b/packages/mobile/src/components/collectible-details-drawer/CollectibleDetailsDrawer.tsx index 333fbfb289e..238d017719d 100644 --- a/packages/mobile/src/components/collectible-details-drawer/CollectibleDetailsDrawer.tsx +++ b/packages/mobile/src/components/collectible-details-drawer/CollectibleDetailsDrawer.tsx @@ -1,9 +1,9 @@ -import { useCallback, useMemo } from 'react' - import { cacheUsersSelectors, collectibleDetailsUISelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useMemo } from 'react' + import { ScrollView, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/collection-list/AddCollectionCard.tsx b/packages/mobile/src/components/collection-list/AddCollectionCard.tsx index bcc1c702ff4..a40f5daf47e 100644 --- a/packages/mobile/src/components/collection-list/AddCollectionCard.tsx +++ b/packages/mobile/src/components/collection-list/AddCollectionCard.tsx @@ -1,8 +1,8 @@ import { useCallback } from 'react' -import { cacheCollectionsActions } from '@audius/common' import type { ID } from '@audius/common/models' import { CreatePlaylistSource } from '@audius/common/models' +import { cacheCollectionsActions } from '@audius/common/store' import { capitalize } from 'lodash' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/collection-list/CollectionCard.tsx b/packages/mobile/src/components/collection-list/CollectionCard.tsx index efd8f2f4cde..6924625ee36 100644 --- a/packages/mobile/src/components/collection-list/CollectionCard.tsx +++ b/packages/mobile/src/components/collection-list/CollectionCard.tsx @@ -1,10 +1,13 @@ -import { createElement, useCallback, useMemo } from 'react' - -import type { CommonState } from '@audius/common' +import type { CommonState } from '@audius/common/store' import { cacheCollectionsSelectors, reachabilitySelectors -} from '@audius/common' +} from '@audius/common/store' + +import { createElement, useCallback, useMemo } from 'react' + +import type {} from '@audius/common' + import { SquareSizes } from '@audius/common/models' import type { Collection, ID } from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' diff --git a/packages/mobile/src/components/core/Hyperlink.tsx b/packages/mobile/src/components/core/Hyperlink.tsx index 0d9291d0bc4..ee113d7a3bd 100644 --- a/packages/mobile/src/components/core/Hyperlink.tsx +++ b/packages/mobile/src/components/core/Hyperlink.tsx @@ -1,7 +1,7 @@ +import { useLeavingAudiusModal } from '@audius/common/store' import type { ComponentProps } from 'react' import { useCallback, useEffect, useRef, useState } from 'react' -import { useLeavingAudiusModal } from '@audius/common' import { isInteralAudiusUrl, getPathFromAudiusUrl, diff --git a/packages/mobile/src/components/core/PlayBarChin.tsx b/packages/mobile/src/components/core/PlayBarChin.tsx index 0f73d8b3924..0ae134adeae 100644 --- a/packages/mobile/src/components/core/PlayBarChin.tsx +++ b/packages/mobile/src/components/core/PlayBarChin.tsx @@ -1,4 +1,5 @@ -import { playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common/store' + import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/core/ProfilePicture.tsx b/packages/mobile/src/components/core/ProfilePicture.tsx index 3f1fd503724..5b0fd852377 100644 --- a/packages/mobile/src/components/core/ProfilePicture.tsx +++ b/packages/mobile/src/components/core/ProfilePicture.tsx @@ -1,4 +1,5 @@ -import { cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common/store' + import type { ID } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/core/Screen/ScreenContent.tsx b/packages/mobile/src/components/core/Screen/ScreenContent.tsx index 13db0a2e202..5530d69669b 100644 --- a/packages/mobile/src/components/core/Screen/ScreenContent.tsx +++ b/packages/mobile/src/components/core/Screen/ScreenContent.tsx @@ -1,6 +1,6 @@ +import { reachabilitySelectors } from '@audius/common/store' import type { ReactNode } from 'react' -import { reachabilitySelectors } from '@audius/common' import Animated, { FadeIn } from 'react-native-reanimated' import { useSelector } from 'react-redux' import { usePrevious } from 'react-use' diff --git a/packages/mobile/src/components/core/UserDisplayName.tsx b/packages/mobile/src/components/core/UserDisplayName.tsx index 8e815b09d89..fc7afeac261 100644 --- a/packages/mobile/src/components/core/UserDisplayName.tsx +++ b/packages/mobile/src/components/core/UserDisplayName.tsx @@ -1,4 +1,5 @@ -import { cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common/store' + import { useSelectTierInfo } from '@audius/common/hooks' import type { ID } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx b/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx index 6ca6020a1c4..5470ef545be 100644 --- a/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx +++ b/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx @@ -1,6 +1,6 @@ +import { chatSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { chatSelectors } from '@audius/common' import { View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx b/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx index c203719ee3d..c0069190705 100644 --- a/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx +++ b/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx @@ -1,9 +1,9 @@ -import { useCallback, useEffect } from 'react' - import { deactivateAccountActions, deactivateAccountSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useEffect } from 'react' + import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx b/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx index c644c1d1ed8..111e101fb27 100644 --- a/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx +++ b/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx @@ -1,6 +1,6 @@ +import { chatActions } from '@audius/common/store' import { useCallback } from 'react' -import { chatActions } from '@audius/common' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/delete-playlist-confirmation-drawer/DeletePlaylistConfirmationDrawer.tsx b/packages/mobile/src/components/delete-playlist-confirmation-drawer/DeletePlaylistConfirmationDrawer.tsx index 86f10a53573..721f6561ddd 100644 --- a/packages/mobile/src/components/delete-playlist-confirmation-drawer/DeletePlaylistConfirmationDrawer.tsx +++ b/packages/mobile/src/components/delete-playlist-confirmation-drawer/DeletePlaylistConfirmationDrawer.tsx @@ -4,7 +4,7 @@ import { cacheCollectionsActions, cacheCollectionsSelectors, deletePlaylistConfirmationModalUISelectors -} from '@audius/common' +} from '@audius/common/store' import { fillString } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx b/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx index d375438cc0b..65839463d9a 100644 --- a/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx +++ b/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx @@ -1,4 +1,8 @@ -import { accountSelectors, playbackPositionSelectors } from '@audius/common' +import { + accountSelectors, + playbackPositionSelectors +} from '@audius/common/store' + import type { SearchTrack, Track } from '@audius/common/models' import { formatLineupTileDuration } from '@audius/common/utils' import { View } from 'react-native' diff --git a/packages/mobile/src/components/details-tile/DetailsTile.tsx b/packages/mobile/src/components/details-tile/DetailsTile.tsx index ad4ffa94515..7128f4059ca 100644 --- a/packages/mobile/src/components/details-tile/DetailsTile.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTile.tsx @@ -1,11 +1,13 @@ -import { useCallback } from 'react' - -import type { CommonState } from '@audius/common' import { accountSelectors, playerSelectors, - playbackPositionSelectors -} from '@audius/common' + playbackPositionSelectors, + CommonState +} from '@audius/common/store' +import { useCallback } from 'react' + +import type {} from '@audius/common' + import { useGatedContentAccess } from '@audius/common/hooks' import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { Track } from '@audius/common/models' diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index 9f5ba4dd39a..3bdb9a860ce 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -1,5 +1,6 @@ -import type { CommonState } from '@audius/common' -import { cacheCollectionsSelectors } from '@audius/common' +import { cacheCollectionsSelectors, CommonState } from '@audius/common/store' +import type {} from '@audius/common' + import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import { useFeatureFlag } from '@audius/common/hooks' import type { ID } from '@audius/common/models' diff --git a/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx b/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx index 52f8bd58627..07f7d4121fa 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx @@ -1,6 +1,6 @@ +import { aiPageActions, aiPageSelectors } from '@audius/common/store' import { useEffect } from 'react' -import { aiPageActions, aiPageSelectors } from '@audius/common' import type { ID } from '@audius/common/models' import { View } from 'react-native' import { TouchableWithoutFeedback } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx index 22d51c8a852..99ba5d476ce 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx @@ -1,12 +1,12 @@ -import type { ReactNode } from 'react' -import { useCallback } from 'react' - import { - gatedContentSelectors, + usersSocialActions, tippingActions, usePremiumContentPurchaseModal, - usersSocialActions -} from '@audius/common' + gatedContentSelectors +} from '@audius/common/store' +import type { ReactNode } from 'react' +import { useCallback } from 'react' + import { useStreamConditionsEntity } from '@audius/common/hooks' import { FollowSource, diff --git a/packages/mobile/src/components/drawer/AppDrawer.tsx b/packages/mobile/src/components/drawer/AppDrawer.tsx index 4c6fd302a86..5f9d5b30c32 100644 --- a/packages/mobile/src/components/drawer/AppDrawer.tsx +++ b/packages/mobile/src/components/drawer/AppDrawer.tsx @@ -1,7 +1,7 @@ +import { modalsSelectors, modalsActions, Modals } from '@audius/common/store' import { useCallback } from 'react' -import { modalsActions, modalsSelectors } from '@audius/common' -import type { Modals } from '@audius/common' +import type {} from '@audius/common' import { useDispatch, useSelector } from 'react-redux' import type { SetOptional } from 'type-fest' diff --git a/packages/mobile/src/components/drawers/ConfirmationDrawer.tsx b/packages/mobile/src/components/drawers/ConfirmationDrawer.tsx index cf3318a9d3a..27273e23e98 100644 --- a/packages/mobile/src/components/drawers/ConfirmationDrawer.tsx +++ b/packages/mobile/src/components/drawers/ConfirmationDrawer.tsx @@ -1,6 +1,7 @@ -import { useCallback } from 'react' +import { Modals } from '@audius/common/store' + import { useCallback } from 'react' -import type { Modals } from '@audius/common' +import type { } from '@audius/common' import { View } from 'react-native' import IconInfo from 'app/assets/images/iconInfo.svg' diff --git a/packages/mobile/src/components/drawers/DeleteTrackConfirmationDrawer.tsx b/packages/mobile/src/components/drawers/DeleteTrackConfirmationDrawer.tsx index dfb770c8986..bfcf0704825 100644 --- a/packages/mobile/src/components/drawers/DeleteTrackConfirmationDrawer.tsx +++ b/packages/mobile/src/components/drawers/DeleteTrackConfirmationDrawer.tsx @@ -1,6 +1,6 @@ +import { cacheTracksActions } from '@audius/common/store' import { useCallback } from 'react' -import { cacheTracksActions } from '@audius/common' import { useDispatch } from 'react-redux' import { useDrawer } from 'app/hooks/useDrawer' diff --git a/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx b/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx index 35abcbcbf33..f970856f513 100644 --- a/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx +++ b/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx @@ -1,6 +1,6 @@ +import { cacheTracksActions } from '@audius/common/store' import { useCallback } from 'react' -import { cacheTracksActions } from '@audius/common' import { useGetTrackById } from '@audius/common/api' import moment from 'moment' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx b/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx index 0ec4f645f80..4e7b7409479 100644 --- a/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx +++ b/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx @@ -1,6 +1,6 @@ +import { cacheCollectionsSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { cacheCollectionsSelectors } from '@audius/common' import { useDispatch, useSelector } from 'react-redux' import { useDrawer } from 'app/hooks/useDrawer' diff --git a/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx b/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx index 039489e1f15..9e7b5c95a8d 100644 --- a/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx +++ b/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx @@ -1,7 +1,8 @@ +import { collectionsSocialActions, CommonState } from '@audius/common/store' import { useCallback } from 'react' -import type { CommonState } from '@audius/common' -import { collectionsSocialActions } from '@audius/common' +import type {} from '@audius/common' + import { FavoriteSource } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx b/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx index 3c16fad5572..74635ea5a0f 100644 --- a/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx +++ b/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { cacheCollectionsActions, cacheCollectionsSelectors, duplicateAddConfirmationModalUISelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { fillString } from '@audius/common/utils' import { capitalize } from 'lodash' import { View } from 'react-native' diff --git a/packages/mobile/src/components/enable-push-notifications-drawer/EnablePushNotificationsDrawer.tsx b/packages/mobile/src/components/enable-push-notifications-drawer/EnablePushNotificationsDrawer.tsx index 9499c74ff4e..b7f2ac15896 100644 --- a/packages/mobile/src/components/enable-push-notifications-drawer/EnablePushNotificationsDrawer.tsx +++ b/packages/mobile/src/components/enable-push-notifications-drawer/EnablePushNotificationsDrawer.tsx @@ -1,6 +1,9 @@ +import { + settingsPageActions, + PushNotificationSetting +} from '@audius/common/store' import { useCallback } from 'react' -import { settingsPageActions, PushNotificationSetting } from '@audius/common' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx b/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx index e4d8ddbd259..45bf82161fb 100644 --- a/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx +++ b/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx @@ -1,9 +1,9 @@ -import { useCallback, useMemo } from 'react' - import { feedPageLineupActions as feedActions, feedPageActions -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useMemo } from 'react' + import { Name, FeedFilter } from '@audius/common/models' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx b/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx index 3d4f96c0cda..1ba987b98b7 100644 --- a/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx +++ b/packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx @@ -1,13 +1,13 @@ import { useCallback, useEffect } from 'react' +import { useProxySelector } from '@audius/common/hooks' +import type { User } from '@audius/common/models' import { accountSelectors, cacheUsersSelectors, tippingSelectors, tippingActions -} from '@audius/common' -import { useProxySelector } from '@audius/common/hooks' -import type { User } from '@audius/common/models' +} from '@audius/common/store' import { storeDismissedTipInfo } from 'common/store/tipping/sagas' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/feed-tip-tile/SendTipButton.tsx b/packages/mobile/src/components/feed-tip-tile/SendTipButton.tsx index e7267f88aca..4e8fcbd500d 100644 --- a/packages/mobile/src/components/feed-tip-tile/SendTipButton.tsx +++ b/packages/mobile/src/components/feed-tip-tile/SendTipButton.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' -import { tippingActions } from '@audius/common' import type { User } from '@audius/common/models' +import { tippingActions } from '@audius/common/store' import { View, Platform } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/hcaptcha/HCaptcha.tsx b/packages/mobile/src/components/hcaptcha/HCaptcha.tsx index 2b01852841c..9763979637c 100644 --- a/packages/mobile/src/components/hcaptcha/HCaptcha.tsx +++ b/packages/mobile/src/components/hcaptcha/HCaptcha.tsx @@ -1,12 +1,12 @@ -import { useCallback, useEffect, useRef, useState } from 'react' - import { - HCaptchaStatus, audioRewardsPageSelectors, audioRewardsPageActions, - modalsActions, - modalsSelectors -} from '@audius/common' + HCaptchaStatus, + modalsSelectors, + modalsActions +} from '@audius/common/store' +import { useCallback, useEffect, useRef, useState } from 'react' + import ConfirmHcaptcha from '@hcaptcha/react-native-hcaptcha' import type { NativeSyntheticEvent } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/image/CollectionImage.tsx b/packages/mobile/src/components/image/CollectionImage.tsx index 5e419319d0b..e2852b5a24a 100644 --- a/packages/mobile/src/components/image/CollectionImage.tsx +++ b/packages/mobile/src/components/image/CollectionImage.tsx @@ -1,4 +1,5 @@ -import { reachabilitySelectors } from '@audius/common' +import { reachabilitySelectors } from '@audius/common/store' + import type { SquareSizes, Collection, diff --git a/packages/mobile/src/components/image/CoverPhoto.tsx b/packages/mobile/src/components/image/CoverPhoto.tsx index 824c8ae4a91..370e3f90abf 100644 --- a/packages/mobile/src/components/image/CoverPhoto.tsx +++ b/packages/mobile/src/components/image/CoverPhoto.tsx @@ -1,4 +1,5 @@ -import { cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common/store' + import type { ID } from '@audius/common/models' import { SquareSizes, WidthSizes } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/components/image/TrackImage.tsx b/packages/mobile/src/components/image/TrackImage.tsx index 79d844b2dab..a3a5c631a73 100644 --- a/packages/mobile/src/components/image/TrackImage.tsx +++ b/packages/mobile/src/components/image/TrackImage.tsx @@ -1,4 +1,5 @@ -import { reachabilitySelectors } from '@audius/common' +import { reachabilitySelectors } from '@audius/common/store' + import type { SquareSizes, ID, SearchTrack, Track } from '@audius/common/models' import type { Nullable, Maybe } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/image/UserImage.tsx b/packages/mobile/src/components/image/UserImage.tsx index 47b3966cf26..6385c62ce39 100644 --- a/packages/mobile/src/components/image/UserImage.tsx +++ b/packages/mobile/src/components/image/UserImage.tsx @@ -1,4 +1,5 @@ -import { cacheUsersSelectors } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common/store' + import type { SquareSizes, ID } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx b/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx index 97703f0127a..a399dac4c66 100644 --- a/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx +++ b/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx @@ -1,16 +1,16 @@ -import type { ReactNode } from 'react' -import { useCallback } from 'react' - import { - chatSelectors, - chatActions, - tippingActions, - ChatPermissionAction, accountSelectors, + cacheUsersSelectors, + chatActions, + chatSelectors, makeChatId, - useInboxUnavailableModal, - cacheUsersSelectors -} from '@audius/common' + ChatPermissionAction, + tippingActions, + useInboxUnavailableModal +} from '@audius/common/store' +import type { ReactNode } from 'react' +import { useCallback } from 'react' + import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/leaving-audius-drawer/LeavingAudiusDrawer.tsx b/packages/mobile/src/components/leaving-audius-drawer/LeavingAudiusDrawer.tsx index a13d8e2a37e..66c4de0a5e6 100644 --- a/packages/mobile/src/components/leaving-audius-drawer/LeavingAudiusDrawer.tsx +++ b/packages/mobile/src/components/leaving-audius-drawer/LeavingAudiusDrawer.tsx @@ -1,6 +1,6 @@ +import { useLeavingAudiusModal } from '@audius/common/store' import React from 'react' -import { useLeavingAudiusModal } from '@audius/common' import { View } from 'react-native' import IconExternalLink from 'app/assets/images/iconExternalLink.svg' diff --git a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx index 6238e2b0180..33c54e27bc3 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx @@ -1,18 +1,21 @@ -import { useCallback, useMemo } from 'react' - -import type { EnhancedCollectionTrack, CommonState } from '@audius/common' import { - playerSelectors, accountSelectors, cacheCollectionsSelectors, cacheUsersSelectors, collectionsSocialActions, - OverflowAction, - OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, - RepostType -} from '@audius/common' + OverflowAction, + OverflowSource, + RepostType, + playerSelectors, + EnhancedCollectionTrack, + CommonState +} from '@audius/common/store' +import { useCallback, useMemo } from 'react' + +import type {} from '@audius/common' + import { useProxySelector } from '@audius/common/hooks' import { ShareSource, diff --git a/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx b/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx index 18fccf77a3b..8096704c6c5 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx @@ -1,5 +1,6 @@ -import type { CommonState } from '@audius/common' -import { playerSelectors } from '@audius/common' +import { playerSelectors, CommonState } from '@audius/common/store' +import type {} from '@audius/common' + import type { UID, LineupTrack } from '@audius/common/models' import { range } from 'lodash' import { Pressable, Text, View } from 'react-native' diff --git a/packages/mobile/src/components/lineup-tile/LineupTile.tsx b/packages/mobile/src/components/lineup-tile/LineupTile.tsx index c2ce7fecaf1..e127cbf06c5 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTile.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTile.tsx @@ -1,6 +1,6 @@ +import { accountSelectors, gatedContentActions } from '@audius/common/store' import { useCallback } from 'react' -import { accountSelectors, gatedContentActions } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { Genre, getDogEarType } from '@audius/common/utils' import moment from 'moment' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx b/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx index 987eef07547..858cd967556 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { + usePremiumContentPurchaseModal, gatedContentActions, - gatedContentSelectors, - usePremiumContentPurchaseModal -} from '@audius/common' + gatedContentSelectors +} from '@audius/common/store' +import { useCallback } from 'react' + import type { ID, AccessConditions } from '@audius/common/models' import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' import { formatPrice } from '@audius/common/utils' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx b/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx index 28b7200af56..b9d6ab6167b 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx @@ -1,6 +1,6 @@ +import { playerSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { playerSelectors } from '@audius/common' import type { Remix, User } from '@audius/common/models' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx index 2cbf590e923..7d86e332242 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - -import type { RepostType } from '@audius/common' import { repostsUserListActions, - favoritesUserListActions -} from '@audius/common' + favoritesUserListActions, + RepostType +} from '@audius/common/store' +import { useCallback } from 'react' + +import type {} from '@audius/common' + import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { FavoriteType, ID, AccessConditions } from '@audius/common/models' import { dayjs, formatCount } from '@audius/common/utils' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx b/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx index a561b26d887..298199652b2 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx @@ -1,4 +1,8 @@ -import { accountSelectors, playbackPositionSelectors } from '@audius/common' +import { + accountSelectors, + playbackPositionSelectors +} from '@audius/common/store' + import { FeatureFlags } from '@audius/common/services' import { formatLineupTileDuration } from '@audius/common/utils' import type { ViewStyle } from 'react-native' diff --git a/packages/mobile/src/components/lineup-tile/TrackTile.tsx b/packages/mobile/src/components/lineup-tile/TrackTile.tsx index 23ad580241c..94506059b1c 100644 --- a/packages/mobile/src/components/lineup-tile/TrackTile.tsx +++ b/packages/mobile/src/components/lineup-tile/TrackTile.tsx @@ -1,19 +1,21 @@ -import { useCallback } from 'react' - -import type { CommonState } from '@audius/common' import { - playbackPositionSelectors, accountSelectors, cacheTracksSelectors, cacheUsersSelectors, tracksSocialActions, - OverflowAction, - OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, + OverflowAction, + OverflowSource, RepostType, - playerSelectors -} from '@audius/common' + playerSelectors, + playbackPositionSelectors, + CommonState +} from '@audius/common/store' +import { useCallback } from 'react' + +import type {} from '@audius/common' + import { ShareSource, RepostSource, diff --git a/packages/mobile/src/components/lineup-tile/types.ts b/packages/mobile/src/components/lineup-tile/types.ts index 5e40c83d8c0..aea64432612 100644 --- a/packages/mobile/src/components/lineup-tile/types.ts +++ b/packages/mobile/src/components/lineup-tile/types.ts @@ -1,6 +1,7 @@ -import type { ReactNode } from 'react' +import { RepostType, EnhancedCollectionTrack } from '@audius/common/store' + import type { ReactNode } from 'react' -import type { RepostType, EnhancedCollectionTrack } from '@audius/common' +import type { } from '@audius/common' import type { PlaybackSource, FavoriteType, diff --git a/packages/mobile/src/components/lineup/types.ts b/packages/mobile/src/components/lineup/types.ts index 191fe3b4707..74ace878b5e 100644 --- a/packages/mobile/src/components/lineup/types.ts +++ b/packages/mobile/src/components/lineup/types.ts @@ -1,6 +1,7 @@ -import type { ComponentType, ReactElement } from 'react' +import { LineupBaseActions, CommonState } from '@audius/common/store' + import type { ComponentType, ReactElement } from 'react' -import type { LineupBaseActions, CommonState } from '@audius/common' +import type { } from '@audius/common' import type { Kind, ID, UID, Lineup as LineupData } from '@audius/common/models' import type { Maybe } from '@audius/common/utils' import type { SectionListProps } from 'react-native' diff --git a/packages/mobile/src/components/locked-content-drawer/LockedContentDrawer.tsx b/packages/mobile/src/components/locked-content-drawer/LockedContentDrawer.tsx index 3d9cf7be8da..001bdb5c81e 100644 --- a/packages/mobile/src/components/locked-content-drawer/LockedContentDrawer.tsx +++ b/packages/mobile/src/components/locked-content-drawer/LockedContentDrawer.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' -import { gatedContentActions } from '@audius/common' import { useGatedContentAccess, useLockedContent } from '@audius/common/hooks' +import { gatedContentActions } from '@audius/common/store' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/navigation-container/NavigationContainer.tsx b/packages/mobile/src/components/navigation-container/NavigationContainer.tsx index 7665d436ea4..285f02e9cff 100644 --- a/packages/mobile/src/components/navigation-container/NavigationContainer.tsx +++ b/packages/mobile/src/components/navigation-container/NavigationContainer.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react' import { useRef } from 'react' -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { decodeHashId } from '@audius/common/utils' import type { LinkingOptions, diff --git a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx index 37634598312..e0aaefc9235 100644 --- a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx @@ -1,18 +1,18 @@ -import { useCallback, useLayoutEffect } from 'react' - import { - playbackPositionSelectors, - reachabilitySelectors, accountSelectors, castSelectors, castActions, + reachabilitySelectors, tracksSocialActions, - OverflowAction, - OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, - usePremiumContentPurchaseModal -} from '@audius/common' + OverflowAction, + OverflowSource, + usePremiumContentPurchaseModal, + playbackPositionSelectors +} from '@audius/common/store' +import { useCallback, useLayoutEffect } from 'react' + import { useGatedContentAccess } from '@audius/common/hooks' import { ShareSource, diff --git a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx index c7391ec66e4..fbd4440a76e 100644 --- a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx +++ b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx @@ -1,5 +1,10 @@ -import type { CommonState } from '@audius/common' -import { averageColorSelectors, playerSelectors } from '@audius/common' +import { + averageColorSelectors, + playerSelectors, + CommonState +} from '@audius/common/store' +import type {} from '@audius/common' + import { useGatedContentAccess } from '@audius/common/hooks' import { DogEarType, SquareSizes } from '@audius/common/models' import type { Track } from '@audius/common/models' diff --git a/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx b/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx index b7f7e541c4e..27d3651d9c5 100644 --- a/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx +++ b/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx @@ -1,11 +1,11 @@ -import { useCallback } from 'react' - import { - modalsActions, queueActions, queueSelectors, - RepeatMode -} from '@audius/common' + RepeatMode, + modalsActions +} from '@audius/common/store' +import { useCallback } from 'react' + import { FeatureFlags } from '@audius/common/services' import { Animated, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx b/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx index 7042a70d17d..fdd7df15905 100644 --- a/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx +++ b/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx @@ -1,3 +1,9 @@ +import { + cacheUsersSelectors, + queueActions, + playerActions, + playerSelectors +} from '@audius/common/store' import { memo, useCallback, @@ -7,12 +13,6 @@ import { useState } from 'react' -import { - cacheUsersSelectors, - queueActions, - playerSelectors, - playerActions -} from '@audius/common' import { Genre } from '@audius/common/utils' import { useNavigationState } from '@react-navigation/native' import type { diff --git a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx index afeebb34f00..56e1004ff64 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { accountSelectors, tracksSocialActions, playerSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useGatedContentAccess } from '@audius/common/hooks' import { FavoriteSource, SquareSizes } from '@audius/common/models' import type { Track, User } from '@audius/common/models' diff --git a/packages/mobile/src/components/now-playing-drawer/PlayButton.tsx b/packages/mobile/src/components/now-playing-drawer/PlayButton.tsx index d16e1fc0b6f..be7cc2b51ec 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlayButton.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlayButton.tsx @@ -1,6 +1,6 @@ +import { playerActions, playerSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { playerActions, playerSelectors } from '@audius/common' import { useDispatch, useSelector } from 'react-redux' import IconPause from 'app/assets/animations/iconPause.json' diff --git a/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx b/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx index a99fb66f347..be7702039f1 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx @@ -1,5 +1,6 @@ -import type { PlaybackRate } from '@audius/common' -import { playerSelectors } from '@audius/common' +import { playerSelectors, PlaybackRate } from '@audius/common/store' +import type {} from '@audius/common' + import { useSelector } from 'react-redux' import Icon0_5x from 'app/assets/images/iconPlaybackRate0_5x.svg' diff --git a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx index a4923c3db38..e06fd9670f0 100644 --- a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx +++ b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx @@ -1,4 +1,5 @@ -import { playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common/store' + import { useGatedContentAccess } from '@audius/common/hooks' import type { Track, User } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/components/now-playing-drawer/TrackingBar.tsx b/packages/mobile/src/components/now-playing-drawer/TrackingBar.tsx index c2a9b657fd9..d81b4689590 100644 --- a/packages/mobile/src/components/now-playing-drawer/TrackingBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/TrackingBar.tsx @@ -1,6 +1,6 @@ +import { playerSelectors } from '@audius/common/store' import { useCallback, useEffect, useRef } from 'react' -import { playerSelectors } from '@audius/common' import { Animated, Dimensions, Easing } from 'react-native' import LinearGradient from 'react-native-linear-gradient' import TrackPlayer from 'react-native-track-player' diff --git a/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts b/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts index 3a8daf6c595..20458d09419 100644 --- a/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts +++ b/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts @@ -1,4 +1,5 @@ -import { playerSelectors } from '@audius/common' +import { playerSelectors } from '@audius/common/store' + import { getTrackPreviewDuration } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx b/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx index 1ceed34f07c..9f3ab00f1a6 100644 --- a/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx +++ b/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx @@ -1,4 +1,5 @@ -import { cacheCollectionsSelectors } from '@audius/common' +import { cacheCollectionsSelectors } from '@audius/common/store' + import type { ID } from '@audius/common/models' import { removeNullable } from '@audius/common/utils' diff --git a/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx b/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx index 87f71fdab91..d438da7a854 100644 --- a/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx +++ b/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx @@ -1,4 +1,5 @@ -import { reachabilitySelectors } from '@audius/common' +import { reachabilitySelectors } from '@audius/common/store' + import type { Nullable } from '@audius/common/utils' import type { StyleProp, ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/offline-placeholder/OnlineOnly.tsx b/packages/mobile/src/components/offline-placeholder/OnlineOnly.tsx index f4a9b50ef08..28cb1844a75 100644 --- a/packages/mobile/src/components/offline-placeholder/OnlineOnly.tsx +++ b/packages/mobile/src/components/offline-placeholder/OnlineOnly.tsx @@ -1,6 +1,6 @@ +import { reachabilitySelectors } from '@audius/common/store' import type { ReactNode } from 'react' -import { reachabilitySelectors } from '@audius/common' import { useSelector } from 'react-redux' const { getIsReachable } = reachabilitySelectors diff --git a/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx index 65db3c5caec..68492073ff5 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx @@ -1,15 +1,17 @@ -import { useContext } from 'react' - -import type { OverflowActionCallbacks } from '@audius/common' import { - publishPlaylistConfirmationModalUIActions, cacheCollectionsSelectors, cacheUsersSelectors, collectionsSocialActions, deletePlaylistConfirmationModalUIActions, + mobileOverflowMenuUISelectors, + publishPlaylistConfirmationModalUIActions, OverflowAction, - mobileOverflowMenuUISelectors -} from '@audius/common' + OverflowActionCallbacks +} from '@audius/common/store' +import { useContext } from 'react' + +import type {} from '@audius/common' + import { ShareSource, RepostSource, diff --git a/packages/mobile/src/components/overflow-menu-drawer/OverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/OverflowMenuDrawer.tsx index 7fd7e8539f9..4bfed4c1263 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/OverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/OverflowMenuDrawer.tsx @@ -1,8 +1,9 @@ import { + mobileOverflowMenuUISelectors, OverflowAction, - OverflowSource, - mobileOverflowMenuUISelectors -} from '@audius/common' + OverflowSource +} from '@audius/common/store' + import { useSelector } from 'react-redux' import ActionDrawer from 'app/components/action-drawer' diff --git a/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx index 19d2709148d..36bee3b0843 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx @@ -1,11 +1,14 @@ -import type { OverflowActionCallbacks, CommonState } from '@audius/common' import { - shareModalUIActions, cacheUsersSelectors, usersSocialActions, + mobileOverflowMenuUISelectors, + shareModalUIActions, OverflowAction, - mobileOverflowMenuUISelectors -} from '@audius/common' + CommonState, + OverflowActionCallbacks +} from '@audius/common/store' +import type {} from '@audius/common' + import type { ID } from '@audius/common/models' import { ShareSource, FollowSource } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx index 2401a53b30d..1712b3de975 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx @@ -1,21 +1,24 @@ -import { useContext } from 'react' - -import type { OverflowActionCallbacks, CommonState } from '@audius/common' import { + accountSelectors, cacheCollectionsActions, cacheCollectionsSelectors, - collectionPageLineupActions as tracksActions, - shareModalUIActions, - playbackPositionActions, - accountSelectors, cacheTracksSelectors, cacheUsersSelectors, + collectionPageLineupActions as tracksActions, tracksSocialActions, usersSocialActions, addToCollectionUIActions, + mobileOverflowMenuUISelectors, + shareModalUIActions, OverflowAction, - mobileOverflowMenuUISelectors -} from '@audius/common' + playbackPositionActions, + CommonState, + OverflowActionCallbacks +} from '@audius/common/store' +import { useContext } from 'react' + +import type {} from '@audius/common' + import { ShareSource, RepostSource, diff --git a/packages/mobile/src/components/payment-method/CardSelectionButton.tsx b/packages/mobile/src/components/payment-method/CardSelectionButton.tsx index 42b37d2de45..afd34422550 100644 --- a/packages/mobile/src/components/payment-method/CardSelectionButton.tsx +++ b/packages/mobile/src/components/payment-method/CardSelectionButton.tsx @@ -1,6 +1,6 @@ +import { modalsActions } from '@audius/common/store' import { useCallback } from 'react' -import { modalsActions } from '@audius/common' import type { PurchaseVendor } from '@audius/common/models' import { TouchableOpacity } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/playback-rate-drawer/PlaybackRateDrawer.tsx b/packages/mobile/src/components/playback-rate-drawer/PlaybackRateDrawer.tsx index 1a92a5d8b32..8bc5dc22a34 100644 --- a/packages/mobile/src/components/playback-rate-drawer/PlaybackRateDrawer.tsx +++ b/packages/mobile/src/components/playback-rate-drawer/PlaybackRateDrawer.tsx @@ -1,7 +1,8 @@ +import { playerActions, PlaybackRate } from '@audius/common/store' import { useCallback, useMemo } from 'react' -import type { PlaybackRate } from '@audius/common' -import { playerActions } from '@audius/common' +import type {} from '@audius/common' + import { useDispatch } from 'react-redux' import ActionDrawer from '../action-drawer' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx index 45980763ee3..38d00bedded 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx @@ -1,14 +1,16 @@ -import { useCallback, type ReactNode, useEffect } from 'react' - -import type { PurchaseContentError } from '@audius/common' import { - PurchaseContentPage, - PurchaseContentStage, - isContentPurchaseInProgress, + usePremiumContentPurchaseModal, purchaseContentActions, purchaseContentSelectors, - usePremiumContentPurchaseModal -} from '@audius/common' + PurchaseContentStage, + PurchaseContentPage, + PurchaseContentError, + isContentPurchaseInProgress +} from '@audius/common/store' +import { useCallback, type ReactNode, useEffect } from 'react' + +import type {} from '@audius/common' + import { useGetTrackById } from '@audius/common/api' import { useRemoteVar, diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts index 57212404650..b89c7abf2f7 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts +++ b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts @@ -1,7 +1,8 @@ import { - isContentPurchaseInProgress, - purchaseContentSelectors -} from '@audius/common' + purchaseContentSelectors, + isContentPurchaseInProgress +} from '@audius/common/store' + import { useUSDCBalance } from '@audius/common/hooks' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts index 55aaf2f110d..fc6cc5cc955 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts +++ b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts @@ -1,4 +1,5 @@ -import { getPurchaseSummaryValues } from '@audius/common' +import { getPurchaseSummaryValues } from '@audius/common/store' + import { useUSDCPurchaseConfig, usePayExtraPresets, diff --git a/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx b/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx index 24e4db9341a..313ac26cdd7 100644 --- a/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx +++ b/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx @@ -1,11 +1,11 @@ -import { useCallback, useEffect, useMemo } from 'react' - import { - shareModalUIActions, profilePageSelectors, + chatActions, chatSelectors, - chatActions -} from '@audius/common' + shareModalUIActions +} from '@audius/common/store' +import { useCallback, useEffect, useMemo } from 'react' + import { ShareSource } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/publish-playlist-drawer/PublishPlaylistDrawer.tsx b/packages/mobile/src/components/publish-playlist-drawer/PublishPlaylistDrawer.tsx index cf75f3993b2..4980c2a5060 100644 --- a/packages/mobile/src/components/publish-playlist-drawer/PublishPlaylistDrawer.tsx +++ b/packages/mobile/src/components/publish-playlist-drawer/PublishPlaylistDrawer.tsx @@ -1,9 +1,9 @@ -import { useCallback } from 'react' - import { cacheCollectionsActions, publishPlaylistConfirmationModalUISelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/scrubber/Scrubber.tsx b/packages/mobile/src/components/scrubber/Scrubber.tsx index 814b85bcc8f..46884b92bfe 100644 --- a/packages/mobile/src/components/scrubber/Scrubber.tsx +++ b/packages/mobile/src/components/scrubber/Scrubber.tsx @@ -1,6 +1,6 @@ +import { playerActions } from '@audius/common/store' import { useCallback, useState } from 'react' -import { playerActions } from '@audius/common' import { formatSeconds } from '@audius/common/utils' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/scrubber/Slider.tsx b/packages/mobile/src/components/scrubber/Slider.tsx index 946d1f69b1e..6a71ba61e60 100644 --- a/packages/mobile/src/components/scrubber/Slider.tsx +++ b/packages/mobile/src/components/scrubber/Slider.tsx @@ -1,6 +1,6 @@ +import { playerSelectors, playbackRateValueMap } from '@audius/common/store' import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' -import { playbackRateValueMap, playerSelectors } from '@audius/common' import { useAppState } from '@react-native-community/hooks' import type { GestureResponderEvent } from 'react-native' import { Easing, View, Animated, PanResponder } from 'react-native' diff --git a/packages/mobile/src/components/scrubber/usePosition.ts b/packages/mobile/src/components/scrubber/usePosition.ts index 4d360f7d502..031af89699d 100644 --- a/packages/mobile/src/components/scrubber/usePosition.ts +++ b/packages/mobile/src/components/scrubber/usePosition.ts @@ -1,6 +1,6 @@ +import { playerSelectors, playbackRateValueMap } from '@audius/common/store' import { useCallback, useEffect, useRef } from 'react' -import { playerSelectors, playbackRateValueMap } from '@audius/common' import { formatSeconds } from '@audius/common/utils' import { useAppState } from '@react-native-community/hooks' import type { TextInput } from 'react-native' diff --git a/packages/mobile/src/components/share-drawer/ShareDrawer.tsx b/packages/mobile/src/components/share-drawer/ShareDrawer.tsx index b540cbdf9b8..2801e5acc70 100644 --- a/packages/mobile/src/components/share-drawer/ShareDrawer.tsx +++ b/packages/mobile/src/components/share-drawer/ShareDrawer.tsx @@ -1,13 +1,13 @@ -import React, { useCallback, useRef } from 'react' - import { accountSelectors, collectionsSocialActions, - shareModalUISelectors, - shareSoundToTiktokModalActions, tracksSocialActions, - usersSocialActions -} from '@audius/common' + usersSocialActions, + shareModalUISelectors, + shareSoundToTiktokModalActions +} from '@audius/common/store' +import React, { useCallback, useRef } from 'react' + import { Name, ShareSource } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import Clipboard from '@react-native-clipboard/clipboard' diff --git a/packages/mobile/src/components/share-drawer/messages.ts b/packages/mobile/src/components/share-drawer/messages.ts index bc308ff40ea..7216821596f 100644 --- a/packages/mobile/src/components/share-drawer/messages.ts +++ b/packages/mobile/src/components/share-drawer/messages.ts @@ -1,4 +1,5 @@ -import type { ShareType } from '@audius/common' +import { ShareType } from '@audius/common/store' + import type { } from '@audius/common' const shareTypeMap: Record = { track: 'Track', diff --git a/packages/mobile/src/components/share-drawer/useShareToStory.tsx b/packages/mobile/src/components/share-drawer/useShareToStory.tsx index e90240c0afb..b5b5b8a3d5a 100644 --- a/packages/mobile/src/components/share-drawer/useShareToStory.tsx +++ b/packages/mobile/src/components/share-drawer/useShareToStory.tsx @@ -1,10 +1,11 @@ +import { modalsActions, ShareContent } from '@audius/common/store' import { useCallback, useMemo, useRef, useState } from 'react' import EventEmitter from 'events' import path from 'path' -import type { ShareContent } from '@audius/common' -import { modalsActions } from '@audius/common' +import type {} from '@audius/common' + import { ErrorLevel, SquareSizes } from '@audius/common/models' import type { Color } from '@audius/common/models' import { encodeHashId, uuid } from '@audius/common/utils' diff --git a/packages/mobile/src/components/share-drawer/utils.ts b/packages/mobile/src/components/share-drawer/utils.ts index 1f45c2892a6..86b806e3e63 100644 --- a/packages/mobile/src/components/share-drawer/utils.ts +++ b/packages/mobile/src/components/share-drawer/utils.ts @@ -1,4 +1,5 @@ -import type { ShareContent } from '@audius/common' +import { ShareContent } from '@audius/common/store' + import type { } from '@audius/common' import { makeTwitterShareUrl } from '@audius/common/utils' import { audiusBackendInstance } from 'app/services/audius-backend-instance' diff --git a/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx b/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx index 3f0a980b279..ee5a798394c 100644 --- a/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx +++ b/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx @@ -1,10 +1,10 @@ -import { useMemo } from 'react' - import { shareSoundToTiktokModalActions, - ShareSoundToTiktokModalStatus, - shareSoundToTiktokModalSelectors -} from '@audius/common' + shareSoundToTiktokModalSelectors, + ShareSoundToTiktokModalStatus +} from '@audius/common/store' +import { useMemo } from 'react' + import type { Nullable } from '@audius/common/utils' import { View } from 'react-native' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/sign-out-confirmation-drawer/SignOutConfirmationDrawer.tsx b/packages/mobile/src/components/sign-out-confirmation-drawer/SignOutConfirmationDrawer.tsx index 0b2d637d363..49cee5e90df 100644 --- a/packages/mobile/src/components/sign-out-confirmation-drawer/SignOutConfirmationDrawer.tsx +++ b/packages/mobile/src/components/sign-out-confirmation-drawer/SignOutConfirmationDrawer.tsx @@ -1,6 +1,6 @@ +import { signOutActions } from '@audius/common/store' import { useCallback } from 'react' -import { signOutActions } from '@audius/common' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampDrawer.tsx b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampDrawer.tsx index e6514bc1025..1647dc10fe2 100644 --- a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampDrawer.tsx +++ b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampDrawer.tsx @@ -1,6 +1,9 @@ +import { + stripeModalUIActions, + stripeModalUISelectors +} from '@audius/common/store' import { useCallback } from 'react' -import { stripeModalUIActions, stripeModalUISelectors } from '@audius/common' import { TouchableOpacity, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx index e15c8ca08f4..912c292579b 100644 --- a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx +++ b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx @@ -1,7 +1,12 @@ +import { + stripeModalUIActions, + stripeModalUISelectors, + StripeSessionData +} from '@audius/common/store' import { useCallback } from 'react' -import type { StripeSessionData } from '@audius/common' -import { stripeModalUISelectors, stripeModalUIActions } from '@audius/common' +import type {} from '@audius/common' + import { View } from 'react-native' import { WebView } from 'react-native-webview' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx index 093d1514492..c3e34a065d3 100644 --- a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx +++ b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx @@ -1,6 +1,7 @@ -import { useCallback } from 'react' +import { CommonState } from '@audius/common/store' + import { useCallback } from 'react' -import type { CommonState } from '@audius/common' +import type { } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import type { ID } from '@audius/common/models' import { removeNullable } from '@audius/common/utils' diff --git a/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx b/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx index c0729c5e194..705d8729320 100644 --- a/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx +++ b/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx @@ -1,6 +1,6 @@ +import { cacheUsersSelectors } from '@audius/common/store' import { Fragment, useCallback, useEffect, useRef } from 'react' -import { cacheUsersSelectors } from '@audius/common' import type { SuggestedTrack } from '@audius/common/api' import { SquareSizes } from '@audius/common/models' import type { ID, Track } from '@audius/common/models' diff --git a/packages/mobile/src/components/toasts/Toast.tsx b/packages/mobile/src/components/toasts/Toast.tsx index 7e1c0c152e7..afce2e84a15 100644 --- a/packages/mobile/src/components/toasts/Toast.tsx +++ b/packages/mobile/src/components/toasts/Toast.tsx @@ -1,7 +1,11 @@ +import { + toastActions, + ToastType, + Toast as ToastType +} from '@audius/common/store' import { useRef, useCallback, useEffect } from 'react' -import { toastActions } from '@audius/common' -import type { Toast as ToastType } from '@audius/common' +import type { as } from '@audius/common' import { Link } from '@react-navigation/native' import type { To } from '@react-navigation/native/lib/typescript/src/useLinkTo' import { Animated, View } from 'react-native' diff --git a/packages/mobile/src/components/toasts/Toasts.tsx b/packages/mobile/src/components/toasts/Toasts.tsx index f7b0fc95015..4ce795b3909 100644 --- a/packages/mobile/src/components/toasts/Toasts.tsx +++ b/packages/mobile/src/components/toasts/Toasts.tsx @@ -1,4 +1,5 @@ -import { toastSelectors } from '@audius/common' +import { toastSelectors } from '@audius/common/store' + import { useSelector } from 'react-redux' import { Toast } from './Toast' diff --git a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx index 4243ff72a63..0fbf2707aad 100644 --- a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx +++ b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx @@ -1,7 +1,7 @@ +import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common/store' import type { ComponentType } from 'react' import { useMemo } from 'react' -import { cacheUsersSelectors, cacheTracksSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { SquareSizes, diff --git a/packages/mobile/src/components/track-list/TrackListItem.tsx b/packages/mobile/src/components/track-list/TrackListItem.tsx index 871b2dc80d6..c5d17bce002 100644 --- a/packages/mobile/src/components/track-list/TrackListItem.tsx +++ b/packages/mobile/src/components/track-list/TrackListItem.tsx @@ -1,17 +1,17 @@ -import type { ComponentType } from 'react' -import { memo, useCallback, useMemo, useState } from 'react' - import { + accountSelectors, cacheCollectionsSelectors, - playbackPositionSelectors, + cacheTracksSelectors, + cacheUsersSelectors, + mobileOverflowMenuUIActions, OverflowAction, OverflowSource, - mobileOverflowMenuUIActions, - accountSelectors, - cacheUsersSelectors, - cacheTracksSelectors, - playerSelectors -} from '@audius/common' + playerSelectors, + playbackPositionSelectors +} from '@audius/common/store' +import type { ComponentType } from 'react' +import { memo, useCallback, useMemo, useState } from 'react' + import { useGatedContentAccess } from '@audius/common/hooks' import type { Collection, ID, UID, Track, User } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' diff --git a/packages/mobile/src/components/track-list/types.ts b/packages/mobile/src/components/track-list/types.ts index cba1c7dc3a1..d1010def7a0 100644 --- a/packages/mobile/src/components/track-list/types.ts +++ b/packages/mobile/src/components/track-list/types.ts @@ -1,4 +1,5 @@ -import type { CommonState, lineupSelectors } from '@audius/common' +import { lineupSelectors , CommonState } from '@audius/common/store' + import type { } from '@audius/common' import type { LineupTrack } from '@audius/common/models' import type { SetOptional } from 'type-fest' diff --git a/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx b/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx index b0bf2d2a0d4..30ede0e15fa 100644 --- a/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx +++ b/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx @@ -1,10 +1,13 @@ +import type { TrendingRewardsModalType } from '@audius/common/store' +import { + audioRewardsPageSelectors, + audioRewardsPageActions +} from '@audius/common/store' + import { useCallback } from 'react' -import type { TrendingRewardsModalType } from '@audius/common' -import { - audioRewardsPageActions, - audioRewardsPageSelectors -} from '@audius/common' +import type {} from '@audius/common' + import { Theme } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import type { ImageStyle } from 'react-native' diff --git a/packages/mobile/src/components/twitter-button/TwitterButton.tsx b/packages/mobile/src/components/twitter-button/TwitterButton.tsx index abfa3dede21..3458ec3acb8 100644 --- a/packages/mobile/src/components/twitter-button/TwitterButton.tsx +++ b/packages/mobile/src/components/twitter-button/TwitterButton.tsx @@ -1,6 +1,6 @@ +import { cacheUsersActions, cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { cacheUsersActions, cacheUsersSelectors } from '@audius/common' import { useTwitterButtonStatus } from '@audius/common/hooks' import { makeTwitterShareUrl } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/components/usdc-manual-transfer-drawer/USDCManualTransferDrawer.tsx b/packages/mobile/src/components/usdc-manual-transfer-drawer/USDCManualTransferDrawer.tsx index fbf63dfef73..c8820abd78a 100644 --- a/packages/mobile/src/components/usdc-manual-transfer-drawer/USDCManualTransferDrawer.tsx +++ b/packages/mobile/src/components/usdc-manual-transfer-drawer/USDCManualTransferDrawer.tsx @@ -1,4 +1,4 @@ -import { useUSDCManualTransferModal } from '@audius/common' +import { useUSDCManualTransferModal } from '@audius/common/store' import { View } from 'react-native' import { Text } from 'app/components/core' diff --git a/packages/mobile/src/components/user/FollowButton.tsx b/packages/mobile/src/components/user/FollowButton.tsx index bcfedf8ebf8..95541f599eb 100644 --- a/packages/mobile/src/components/user/FollowButton.tsx +++ b/packages/mobile/src/components/user/FollowButton.tsx @@ -1,6 +1,6 @@ +import { cacheUsersSelectors, usersSocialActions } from '@audius/common/store' import { useCallback } from 'react' -import { cacheUsersSelectors, usersSocialActions } from '@audius/common' import type { FollowSource, ID } from '@audius/common/models' import type { GestureResponderEvent, StyleProp, ViewStyle } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/user/FollowsYouChip.tsx b/packages/mobile/src/components/user/FollowsYouChip.tsx index e22fb6c0c33..e62a4aa0824 100644 --- a/packages/mobile/src/components/user/FollowsYouChip.tsx +++ b/packages/mobile/src/components/user/FollowsYouChip.tsx @@ -1,4 +1,5 @@ -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' + import type { ID } from '@audius/common/models' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/vip-discord-drawer/VipDiscordDrawer.tsx b/packages/mobile/src/components/vip-discord-drawer/VipDiscordDrawer.tsx index d2888572483..10b770bee85 100644 --- a/packages/mobile/src/components/vip-discord-drawer/VipDiscordDrawer.tsx +++ b/packages/mobile/src/components/vip-discord-drawer/VipDiscordDrawer.tsx @@ -1,4 +1,5 @@ -import { vipDiscordModalSelectors } from '@audius/common' +import { vipDiscordModalSelectors } from '@audius/common/store' + import { AUDIUS_DISCORD_LINK } from 'audius-client/src/utils/route' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx b/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx index db0ae50e859..1b74e7a7654 100644 --- a/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx +++ b/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx @@ -1,6 +1,6 @@ +import { useLeavingAudiusModal } from '@audius/common/store' import { useCallback } from 'react' -import { useLeavingAudiusModal } from '@audius/common' import { isAllowedExternalLink } from '@audius/common/utils' import type { GestureResponderEvent, diff --git a/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx b/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx index a6dc783fe89..038e7264d03 100644 --- a/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx +++ b/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx @@ -1,4 +1,5 @@ -import { themeActions, themeSelectors } from '@audius/common' +import { themeActions, themeSelectors } from '@audius/common/store' + import { Theme } from '@audius/common/models' import { SectionList, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/hooks/useManualToast.ts b/packages/mobile/src/hooks/useManualToast.ts index b474e55ccff..13c766caf8b 100644 --- a/packages/mobile/src/hooks/useManualToast.ts +++ b/packages/mobile/src/hooks/useManualToast.ts @@ -1,7 +1,10 @@ import { useCallback } from 'react' -import type { Toast } from '@audius/common' -import { toastActions } from '@audius/common' +import type { Toast } from '@audius/common/store' +import { toastActions } from '@audius/common/store' + +import type {} from '@audius/common' + import { uuid } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/hooks/useNotificationNavigation.ts b/packages/mobile/src/hooks/useNotificationNavigation.ts index b844f2e4b0a..7f765b616e0 100644 --- a/packages/mobile/src/hooks/useNotificationNavigation.ts +++ b/packages/mobile/src/hooks/useNotificationNavigation.ts @@ -1,53 +1,56 @@ import { useCallback, useMemo } from 'react' import type { - AddTrackToPlaylistNotification, - AddTrackToPlaylistPushNotification, AnnouncementNotification, - ChallengeRewardNotification, - FavoriteNotification, - FavoriteOfRepostNotification, - FavoritePushNotification, + UserSubscriptionNotification, FollowNotification, FollowPushNotification, - MilestoneFavoritePushNotification, + RepostNotification, + RepostPushNotification, + RepostOfRepostNotification, + RepostOfRepostPushNotification, + FavoriteOfRepostNotification, + FavoriteNotification, + FavoritePushNotification, + MilestoneNotification, MilestoneFollowPushNotification, MilestoneListenPushNotification, - MilestoneNotification, MilestoneRepostPushNotification, - ReactionNotification, - ReactionPushNotification, - RemixCosignNotification, - RemixCosignPushNotification, + MilestoneFavoritePushNotification, RemixCreateNotification, RemixCreatePushNotification, - RepostNotification, - RepostOfRepostNotification, - RepostOfRepostPushNotification, - RepostPushNotification, - SupporterDethronedNotification, - SupporterRankUpNotification, - SupporterRankUpPushNotification, - SupportingRankUpNotification, - SupportingRankUpPushNotification, + RemixCosignNotification, + RemixCosignPushNotification, + TrendingTrackNotification, + ChallengeRewardNotification, TierChangeNotification, + ReactionNotification, + ReactionPushNotification, TipReceiveNotification, TipReceivePushNotification, TipSendNotification, TipSendPushNotification, - TrendingTrackNotification, - UserSubscriptionNotification, + SupporterRankUpNotification, + SupporterRankUpPushNotification, + SupportingRankUpNotification, + SupportingRankUpPushNotification, + SupporterDethronedNotification, + AddTrackToPlaylistNotification, + AddTrackToPlaylistPushNotification, MessagePushNotification, MessageReactionPushNotification -} from '@audius/common' +} from '@audius/common/store' import { - notificationsUserListActions, - tippingActions, - Achievement, - Entity, NotificationType, - PushNotificationType -} from '@audius/common' + PushNotificationType, + Entity, + Achievement, + tippingActions, + notificationsUserListActions +} from '@audius/common/store' + +import type {} from '@audius/common' + import type { AppState } from 'audius-client/src/store/types' import { useDispatch, useStore } from 'react-redux' diff --git a/packages/mobile/src/hooks/useOfflineTrackStatus.ts b/packages/mobile/src/hooks/useOfflineTrackStatus.ts index 338f7078503..3c59290b6d0 100644 --- a/packages/mobile/src/hooks/useOfflineTrackStatus.ts +++ b/packages/mobile/src/hooks/useOfflineTrackStatus.ts @@ -1,5 +1,5 @@ -import { reachabilitySelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { reachabilitySelectors } from '@audius/common/store' import type { AppState } from 'app/store' import { diff --git a/packages/mobile/src/hooks/useReachabilityEffect.ts b/packages/mobile/src/hooks/useReachabilityEffect.ts index c0941e24224..3504496b8eb 100644 --- a/packages/mobile/src/hooks/useReachabilityEffect.ts +++ b/packages/mobile/src/hooks/useReachabilityEffect.ts @@ -1,6 +1,6 @@ import { useEffect, useCallback } from 'react' -import { reachabilitySelectors } from '@audius/common' +import { reachabilitySelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import { usePrevious } from 'react-use' diff --git a/packages/mobile/src/hooks/useRemoteConfig.ts b/packages/mobile/src/hooks/useRemoteConfig.ts index 1b1c3c5836c..74c2cd9afae 100644 --- a/packages/mobile/src/hooks/useRemoteConfig.ts +++ b/packages/mobile/src/hooks/useRemoteConfig.ts @@ -1,8 +1,8 @@ -import { accountSelectors, remoteConfigSelectors } from '@audius/common' import { createUseFeatureFlagHook, createUseRemoteVarHook } from '@audius/common/hooks' +import { accountSelectors, remoteConfigSelectors } from '@audius/common/store' import AsyncStorage from '@react-native-async-storage/async-storage' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/hooks/useToast.ts b/packages/mobile/src/hooks/useToast.ts index 5e36a38a123..e8100d9522b 100644 --- a/packages/mobile/src/hooks/useToast.ts +++ b/packages/mobile/src/hooks/useToast.ts @@ -1,7 +1,10 @@ import { useCallback } from 'react' -import type { Toast } from '@audius/common' -import { toastActions } from '@audius/common' +import type { Toast } from '@audius/common/store' +import { toastActions } from '@audius/common/store' + +import type {} from '@audius/common' + import { uuid } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/ai-generated-tracks-screen/AiGeneratedTracksScreen.tsx b/packages/mobile/src/screens/ai-generated-tracks-screen/AiGeneratedTracksScreen.tsx index 06cf68fd8ec..907cbf438ce 100644 --- a/packages/mobile/src/screens/ai-generated-tracks-screen/AiGeneratedTracksScreen.tsx +++ b/packages/mobile/src/screens/ai-generated-tracks-screen/AiGeneratedTracksScreen.tsx @@ -1,11 +1,11 @@ -import { useCallback, useEffect } from 'react' - import { lineupSelectors, aiPageLineupActions as tracksActions, aiPageActions, aiPageSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useEffect } from 'react' + import { TouchableOpacity, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx index 21b8614ff9b..36bccd84748 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import { useCallback, useContext } from 'react' -import { accountSelectors } from '@audius/common' import type { User } from '@audius/common/models' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx index b927498241b..8720be49eaa 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx @@ -1,4 +1,5 @@ -import { accountSelectors, chatSelectors } from '@audius/common' +import { accountSelectors, chatSelectors } from '@audius/common/store' + import { useAccountHasClaimableRewards } from '@audius/common/hooks' import type { User } from '@audius/common/models' import { Name } from '@audius/common/models' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx index c4f3bae2bb4..a90bb599433 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx @@ -1,11 +1,11 @@ +import { + accountSelectors, + followingUserListActions, + followersUserListActions +} from '@audius/common/store' import type { ComponentType } from 'react' import { useCallback, useContext } from 'react' -import { - accountSelectors, - followersUserListActions, - followingUserListActions -} from '@audius/common' import type { User } from '@audius/common/models' import { formatCount } from '@audius/common/utils' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx b/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx index 050af924eca..4fb7932ac93 100644 --- a/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx +++ b/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx @@ -1,4 +1,5 @@ -import { accountSelectors, chatSelectors } from '@audius/common' +import { accountSelectors, chatSelectors } from '@audius/common/store' + import { useAccountHasClaimableRewards } from '@audius/common/hooks' import { StringKeys, FeatureFlags } from '@audius/common/services' import { useDrawerProgress } from '@react-navigation/drawer' diff --git a/packages/mobile/src/screens/app-screen/AppTabScreen.tsx b/packages/mobile/src/screens/app-screen/AppTabScreen.tsx index d530ae9b600..5bb6a84503c 100644 --- a/packages/mobile/src/screens/app-screen/AppTabScreen.tsx +++ b/packages/mobile/src/screens/app-screen/AppTabScreen.tsx @@ -1,10 +1,11 @@ -import { useCallback, useContext, useEffect } from 'react' +import { NotificationType, RepostType, CreateChatModalState + } from '@audius/common/store' + import { useCallback, useContext, useEffect } from 'react' import type { - NotificationType, - RepostType, - CreateChatModalState -} from '@audius/common' + + + } from '@audius/common' import type { FavoriteType, TipSource, diff --git a/packages/mobile/src/screens/app-screen/AppTabsScreen.tsx b/packages/mobile/src/screens/app-screen/AppTabsScreen.tsx index 3de5a7d5e27..774b33d8b9e 100644 --- a/packages/mobile/src/screens/app-screen/AppTabsScreen.tsx +++ b/packages/mobile/src/screens/app-screen/AppTabsScreen.tsx @@ -1,6 +1,6 @@ +import { walletActions } from '@audius/common/store' import { useEffect } from 'react' -import { walletActions } from '@audius/common' import { useAppState } from '@react-native-community/hooks' import type { BottomTabBarProps } from '@react-navigation/bottom-tabs' import { createBottomTabNavigator } from '@react-navigation/bottom-tabs' diff --git a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx index aaa6648ac37..d65a026ddcc 100644 --- a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx +++ b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx @@ -1,15 +1,17 @@ -import { useCallback, useEffect } from 'react' - -import type { CommonState } from '@audius/common' import { - tokenDashboardPageActions, - vipDiscordModalActions, tokenDashboardPageSelectors, + tokenDashboardPageActions, walletSelectors, walletActions, getTierAndNumberForBalance, - modalsActions -} from '@audius/common' + vipDiscordModalActions, + modalsActions, + CommonState +} from '@audius/common/store' +import { useCallback, useEffect } from 'react' + +import type {} from '@audius/common' + import type { StringWei } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { isNullOrUndefined, formatWei } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx index 8e6e7479487..4479c1ea197 100644 --- a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx @@ -1,12 +1,15 @@ -import { useCallback, useEffect, useState } from 'react' - -import type { ChallengeRewardsModalType, CommonState } from '@audius/common' import { challengesSelectors, - audioRewardsPageActions, audioRewardsPageSelectors, - modalsActions -} from '@audius/common' + audioRewardsPageActions, + modalsActions, + ChallengeRewardsModalType, + CommonState +} from '@audius/common/store' +import { useCallback, useEffect, useState } from 'react' + +import type {} from '@audius/common' + import { Name, ChallengeName } from '@audius/common/models' import type { ChallengeRewardID } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' diff --git a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx index 20579e991ad..39ea5e667cc 100644 --- a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx @@ -1,5 +1,11 @@ -import { audioRewardsPageActions, modalsActions } from '@audius/common' -import type { TrendingRewardsModalType, Modals } from '@audius/common' +import { + audioRewardsPageActions, + modalsActions, + TrendingRewardsModalType, + Modals +} from '@audius/common/store' + +import type {} from '@audius/common' import type { ChallengeRewardID } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx b/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx index a677432a7ac..1cdecc1e8ba 100644 --- a/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx +++ b/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx @@ -1,10 +1,10 @@ -import { useCallback, useEffect, useState } from 'react' - import { - ChangePasswordPageStep, changePasswordSelectors, - changePasswordActions -} from '@audius/common' + changePasswordActions, + ChangePasswordPageStep +} from '@audius/common/store' +import { useCallback, useEffect, useState } from 'react' + import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx b/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx index 753be2651ef..44a4f79cc43 100644 --- a/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx +++ b/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx @@ -1,6 +1,9 @@ +import { + changePasswordSelectors, + changePasswordActions +} from '@audius/common/store' import { useEffect, useState } from 'react' -import { changePasswordSelectors, changePasswordActions } from '@audius/common' import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatListItem.tsx index 44bf5e5ed94..d4d0ce25748 100644 --- a/packages/mobile/src/screens/chat-screen/ChatListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatListItem.tsx @@ -1,6 +1,6 @@ +import { chatSelectors } from '@audius/common/store' import { useCallback, useMemo } from 'react' -import { chatSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { View, TouchableHighlight } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx index 62a3ab658d3..7dc2824466f 100644 --- a/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx @@ -1,6 +1,6 @@ +import { chatActions, chatSelectors } from '@audius/common/store' import { useCallback, useEffect } from 'react' -import { chatActions, chatSelectors } from '@audius/common' import { Status } from '@audius/common/models' import { View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx index 73d4c52c246..b6ee3da957c 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx @@ -1,7 +1,12 @@ +import { + accountSelectors, + chatSelectors, + ReactionTypes +} from '@audius/common/store' import { memo, useCallback, useState } from 'react' -import type { ReactionTypes } from '@audius/common' -import { accountSelectors, chatSelectors } from '@audius/common' +import type {} from '@audius/common' + import { Status } from '@audius/common/models' import { formatMessageDate, diff --git a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx index ec233538724..d0f02ae715c 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx @@ -1,7 +1,13 @@ +import { + accountSelectors, + QueueSource, + playerSelectors, + ChatMessageTileProps +} from '@audius/common/store' import { useCallback, useMemo, useEffect } from 'react' -import type { ChatMessageTileProps } from '@audius/common' -import { QueueSource, accountSelectors, playerSelectors } from '@audius/common' +import type {} from '@audius/common' + import { useGetTracksByIds, useGetPlaylistByPermalink diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx index ae8670221c6..5af07a34523 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx @@ -1,7 +1,12 @@ +import { + accountSelectors, + QueueSource, + ChatMessageTileProps +} from '@audius/common/store' import { useCallback, useEffect, useMemo } from 'react' -import type { ChatMessageTileProps } from '@audius/common' -import { QueueSource, accountSelectors } from '@audius/common' +import type {} from '@audius/common' + import { useGetTrackByPermalink } from '@audius/common/api' import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' diff --git a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx index d498c1c7554..39abfbccfbf 100644 --- a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx @@ -1,11 +1,11 @@ -import { useCallback, useEffect, useMemo, useRef } from 'react' - import { accountSelectors, chatActions, chatSelectors, playerSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useEffect, useMemo, useRef } from 'react' + import { useCanSendMessage } from '@audius/common/hooks' import { Status } from '@audius/common/models' import type { ChatMessageWithExtras } from '@audius/common/models' diff --git a/packages/mobile/src/screens/chat-screen/ChatTextInput.tsx b/packages/mobile/src/screens/chat-screen/ChatTextInput.tsx index a68d3288cbb..49e87ec4d91 100644 --- a/packages/mobile/src/screens/chat-screen/ChatTextInput.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatTextInput.tsx @@ -1,6 +1,6 @@ +import { chatActions, playerSelectors } from '@audius/common/store' import { useCallback, useState } from 'react' -import { chatActions, playerSelectors } from '@audius/common' import { Platform, Pressable } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx b/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx index 037701b2601..87ec84d0ad7 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx @@ -1,6 +1,6 @@ +import { ChatPermissionAction } from '@audius/common/store' import { useCallback, useMemo } from 'react' -import { ChatPermissionAction } from '@audius/common' import { useCanSendMessage } from '@audius/common/hooks' import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx index 468498e5d5b..dfccd4458ed 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx @@ -1,13 +1,13 @@ -import { useCallback } from 'react' - import { - chatActions, accountSelectors, + cacheUsersSelectors, + chatActions, chatSelectors, ChatPermissionAction, - cacheUsersSelectors, useInboxUnavailableModal -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { formatCount } from '@audius/common/utils' import { useSelector } from 'audius-client/src/common/hooks/useSelector' import { View, TouchableOpacity, Keyboard } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx index d9692804637..7b2dcb84b41 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx @@ -1,18 +1,20 @@ -import { useCallback, useEffect, useState } from 'react' - -import type { CreateChatModalState } from '@audius/common' import { - FOLLOWERS_USER_LIST_TAG, accountSelectors, cacheUsersSelectors, chatActions, - followersUserListActions, - followersUserListSelectors, + chatSelectors, searchUsersModalActions, searchUsersModalSelectors, - chatSelectors, - userListActions -} from '@audius/common' + userListActions, + followersUserListActions, + followersUserListSelectors, + FOLLOWERS_USER_LIST_TAG, + CreateChatModalState +} from '@audius/common/store' +import { useCallback, useEffect, useState } from 'react' + +import type {} from '@audius/common' + import { useProxySelector } from '@audius/common/hooks' import { Status, statusIsNotFinalized } from '@audius/common/models' import type { User } from '@audius/common/models' diff --git a/packages/mobile/src/screens/chat-screen/LinkPreview.tsx b/packages/mobile/src/screens/chat-screen/LinkPreview.tsx index 4f1511928e8..ab0acfec6f9 100644 --- a/packages/mobile/src/screens/chat-screen/LinkPreview.tsx +++ b/packages/mobile/src/screens/chat-screen/LinkPreview.tsx @@ -1,6 +1,6 @@ +import { useLeavingAudiusModal } from '@audius/common/store' import { useCallback, useEffect } from 'react' -import { useLeavingAudiusModal } from '@audius/common' import { useLinkUnfurlMetadata } from '@audius/common/hooks' import { isAudiusUrl, isAllowedExternalLink } from '@audius/common/utils' import type { GestureResponderEvent, ViewStyle } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx index 44bd58233ab..126bb6d80e3 100644 --- a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx +++ b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx @@ -1,7 +1,12 @@ +import { + accountSelectors, + chatActions, + ReactionTypes +} from '@audius/common/store' import { useCallback, useRef } from 'react' -import type { ReactionTypes } from '@audius/common' -import { chatActions, accountSelectors } from '@audius/common' +import type {} from '@audius/common' + import type { ChatMessageWithExtras } from '@audius/common/models' import { encodeHashId } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/chat-screen/ResendMessageButton.tsx b/packages/mobile/src/screens/chat-screen/ResendMessageButton.tsx index 89690f69c63..f0e76de75ed 100644 --- a/packages/mobile/src/screens/chat-screen/ResendMessageButton.tsx +++ b/packages/mobile/src/screens/chat-screen/ResendMessageButton.tsx @@ -1,6 +1,6 @@ +import { chatActions, chatSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { chatActions, chatSelectors } from '@audius/common' import { View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx b/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx index 9d891ea5d46..22a3332d63e 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx @@ -1,10 +1,10 @@ -import { useLayoutEffect, useState } from 'react' - import { accountSelectors, - reachabilitySelectors, - collectionPageSelectors -} from '@audius/common' + collectionPageSelectors, + reachabilitySelectors +} from '@audius/common/store' +import { useLayoutEffect, useState } from 'react' + import { useThrottledCallback } from '@audius/common/hooks' import { Variant } from '@audius/common/models' import type { SmartCollectionVariant, Collection } from '@audius/common/models' diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx index aac56217aef..c6209e02681 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx @@ -1,19 +1,19 @@ -import { useCallback, useMemo } from 'react' - import { - collectionPageActions, accountSelectors, collectionPageSelectors, + collectionPageActions, collectionsSocialActions, - OverflowAction, - OverflowSource, - publishPlaylistConfirmationModalUIActions, mobileOverflowMenuUIActions, + publishPlaylistConfirmationModalUIActions, shareModalUIActions, - RepostType, + OverflowAction, + OverflowSource, repostsUserListActions, - favoritesUserListActions -} from '@audius/common' + favoritesUserListActions, + RepostType +} from '@audius/common/store' +import { useCallback, useMemo } from 'react' + import { useFeatureFlag } from '@audius/common/hooks' import { ShareSource, diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx index 4a2cb68f851..b26cbb8d33b 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx @@ -1,12 +1,12 @@ -import { useCallback, useEffect, useMemo } from 'react' - import { - collectionPageSelectors, - playerSelectors, + cacheCollectionsSelectors, collectionPageLineupActions as tracksActions, + collectionPageSelectors, reachabilitySelectors, - cacheCollectionsSelectors -} from '@audius/common' + playerSelectors +} from '@audius/common/store' +import { useCallback, useEffect, useMemo } from 'react' + import { Name, PlaybackSource, Status } from '@audius/common/models' import type { SmartCollectionVariant, ID, UID } from '@audius/common/models' import { formatSecondsAsText, removeNullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts b/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts index 31854d6e830..3d1bff74de0 100644 --- a/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts +++ b/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts @@ -1,12 +1,12 @@ -import { useCallback } from 'react' - import { - cacheActions, cacheCollectionsSelectors, + cacheActions, collectionPageLineupActions, collectionPageSelectors, queueSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import type { SmartCollectionVariant } from '@audius/common/models' import { Kind } from '@audius/common/models' import { areSetsEqual, Uid, makeUid } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx index 904a5f5f13f..d237ca16bcf 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx @@ -1,7 +1,10 @@ +import { + deletePlaylistConfirmationModalUIActions, + EditPlaylistValues +} from '@audius/common/store' import { useCallback } from 'react' -import { deletePlaylistConfirmationModalUIActions } from '@audius/common' -import type { EditPlaylistValues } from '@audius/common' +import type {} from '@audius/common' import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import type { FormikProps } from 'formik' import { capitalize } from 'lodash' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx index b277aa74e06..8a4ce526bd9 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx @@ -1,10 +1,12 @@ -import { useCallback } from 'react' - -import type { EditPlaylistValues } from '@audius/common' import { cacheCollectionsActions, - cacheCollectionsSelectors -} from '@audius/common' + cacheCollectionsSelectors, + EditPlaylistValues +} from '@audius/common/store' +import { useCallback } from 'react' + +import type {} from '@audius/common' + import { SquareSizes } from '@audius/common/models' import { Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx index 31834b1bcc1..f83f38d1aed 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx @@ -1,4 +1,5 @@ -import type { EditPlaylistValues } from '@audius/common' +import { EditPlaylistValues } from '@audius/common/store' + import type { } from '@audius/common' import { createNativeStackNavigator } from '@react-navigation/native-stack' import type { FormikProps } from 'formik' diff --git a/packages/mobile/src/screens/edit-playlist-screen/types.ts b/packages/mobile/src/screens/edit-playlist-screen/types.ts index 1d76b3db4f9..51f119452cc 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/types.ts +++ b/packages/mobile/src/screens/edit-playlist-screen/types.ts @@ -1,4 +1,5 @@ -import type { Image, EditPlaylistValues } from '@audius/common' +import { Image, EditPlaylistValues } from '@audius/common/store' + import type { } from '@audius/common' export type UpdatedPlaylist = Omit & { updatedCoverArt?: Image diff --git a/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx b/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx index 2376dbb2cb4..c251af8f435 100644 --- a/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx +++ b/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx @@ -1,6 +1,6 @@ +import { accountSelectors, profilePageActions } from '@audius/common/store' import { useCallback } from 'react' -import { accountSelectors, profilePageActions } from '@audius/common' import type { UserMetadata } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' import type { FormikProps } from 'formik' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx index 1f22a094fb1..308c51b3538 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx @@ -1,6 +1,7 @@ -import { useCallback } from 'react' +import { UploadTrack } from '@audius/common/store' + import { useCallback } from 'react' -import { type UploadTrack } from '@audius/common' +import { type } from '@audius/common' import { FeatureFlags } from '@audius/common/services' import { Keyboard } from 'react-native' import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx index d3c29f07dc4..2fe218cb4cb 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx @@ -1,7 +1,12 @@ +import { + cacheTracksActions, + cacheTracksSelectors, + ExtendedTrackMetadata +} from '@audius/common/store' import { useCallback } from 'react' -import type { ExtendedTrackMetadata } from '@audius/common' -import { cacheTracksActions, cacheTracksSelectors } from '@audius/common' +import type {} from '@audius/common' + import { SquareSizes } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx index cf70c106fa0..46a9a969971 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx @@ -1,6 +1,7 @@ -import { useCallback, useMemo } from 'react' +import { UploadTrack } from '@audius/common/store' + import { useCallback, useMemo } from 'react' -import type { UploadTrack } from '@audius/common' +import type { } from '@audius/common' import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { isContentUSDCPurchaseGated } from '@audius/common/models' import { creativeCommons, formatPrice } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx b/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx index 140086e6fe7..9c31cc9e030 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx +++ b/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx @@ -1,6 +1,6 @@ +import { collectiblesSelectors } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' -import { collectiblesSelectors } from '@audius/common' import { isContentCollectibleGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx b/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx index 2aa452595b8..d2c3ff32b45 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx +++ b/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' import { isContentFollowGated, isContentTipGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/RemixSettingsField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/RemixSettingsField.tsx index 3281e9cee1b..2aa642a2f81 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/RemixSettingsField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/RemixSettingsField.tsx @@ -1,4 +1,5 @@ -import { cacheUsersSelectors, cacheTracksSelectors } from '@audius/common' +import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common/store' + import { useField } from 'formik' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx index 464fc038af8..cc824d24a88 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx @@ -1,6 +1,6 @@ +import { collectiblesSelectors } from '@audius/common/store' import { useCallback, useMemo } from 'react' -import { collectiblesSelectors } from '@audius/common' import { Chain, isContentCollectibleGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx index 06985a51b7d..22ced702563 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx @@ -1,6 +1,6 @@ +import { remixSettingsActions } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' -import { remixSettingsActions } from '@audius/common' import { Theme } from '@audius/common/models' import { dayjs, removeNullable } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx index 74cbb61eefc..a739eb771a5 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx @@ -1,6 +1,9 @@ +import { + remixSettingsSelectors, + remixSettingsActions +} from '@audius/common/store' import { useCallback, useEffect, useMemo, useState } from 'react' -import { remixSettingsActions, remixSettingsSelectors } from '@audius/common' import { useGatedContentAccess } from '@audius/common/hooks' import { Status, diff --git a/packages/mobile/src/screens/edit-track-screen/types.ts b/packages/mobile/src/screens/edit-track-screen/types.ts index 92ad9670779..dc5155b4b19 100644 --- a/packages/mobile/src/screens/edit-track-screen/types.ts +++ b/packages/mobile/src/screens/edit-track-screen/types.ts @@ -1,4 +1,5 @@ -import type { ExtendedTrackMetadata } from '@audius/common' +import { ExtendedTrackMetadata } from '@audius/common/store' + import type { } from '@audius/common' import type { Nullable } from '@audius/common/utils' import type { FormikProps } from 'formik' diff --git a/packages/mobile/src/screens/explore-screen/ExploreScreen.tsx b/packages/mobile/src/screens/explore-screen/ExploreScreen.tsx index 6cec2bfb9e6..6a414fb60ed 100644 --- a/packages/mobile/src/screens/explore-screen/ExploreScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/ExploreScreen.tsx @@ -1,4 +1,5 @@ -import { explorePageActions } from '@audius/common' +import { explorePageActions } from '@audius/common/store' + import { useDispatch } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx index 041ecafa559..8a667f1dbe8 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx @@ -1,6 +1,6 @@ +import { explorePageSelectors, explorePageActions } from '@audius/common/store' import { useEffect } from 'react' -import { explorePageActions, explorePageSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/ForYouTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/ForYouTab.tsx index 1834738062a..be7ed10c076 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/ForYouTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/ForYouTab.tsx @@ -1,6 +1,6 @@ +import { ExploreCollectionsVariant } from '@audius/common/store' import { useRef } from 'react' -import { ExploreCollectionsVariant } from '@audius/common' import { View } from 'react-native' import type { ScrollViewElement } from 'app/components/core' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx index 27a3e8469ee..59f40c4e70a 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx @@ -1,10 +1,10 @@ -import { useEffect } from 'react' - import { explorePageCollectionsSelectors, - ExploreCollectionsVariant, - explorePageCollectionsActions -} from '@audius/common' + explorePageCollectionsActions, + ExploreCollectionsVariant +} from '@audius/common/store' +import { useEffect } from 'react' + import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/PremiumTracksScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/PremiumTracksScreen.tsx index e6e5dd86e74..496049cd4fa 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/PremiumTracksScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/PremiumTracksScreen.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { - premiumTracksPageLineupActions, + lineupSelectors, premiumTracksPageLineupSelectors, - lineupSelectors -} from '@audius/common' + premiumTracksPageLineupActions +} from '@audius/common/store' +import { useCallback } from 'react' + import { useDispatch } from 'react-redux' import { Screen, ScreenContent, ScreenHeader } from 'app/components/core' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx index 0fdc6dfe59f..8f0f0f78eb3 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx @@ -1,10 +1,10 @@ -import { useEffect } from 'react' - import { - ExploreCollectionsVariant, explorePageCollectionsSelectors, - explorePageCollectionsActions -} from '@audius/common' + explorePageCollectionsActions, + ExploreCollectionsVariant +} from '@audius/common/store' +import { useEffect } from 'react' + import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingPlaylistsScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingPlaylistsScreen.tsx index 26a74df7608..572e41e58fe 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingPlaylistsScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingPlaylistsScreen.tsx @@ -2,7 +2,8 @@ import { lineupSelectors, trendingPlaylistsPageLineupSelectors, trendingPlaylistsPageLineupActions -} from '@audius/common' +} from '@audius/common/store' + import { useSelector } from 'react-redux' import { RewardsBanner } from 'app/components/audio-rewards' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingUndergroundScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingUndergroundScreen.tsx index 5e355ef0220..e17ac4500e8 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingUndergroundScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingUndergroundScreen.tsx @@ -1,8 +1,9 @@ import { - trendingUndergroundPageLineupActions, + lineupSelectors, trendingUndergroundPageLineupSelectors, - lineupSelectors -} from '@audius/common' + trendingUndergroundPageLineupActions +} from '@audius/common/store' + import { useSelector } from 'react-redux' import { RewardsBanner } from 'app/components/audio-rewards' diff --git a/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx index 86fdedf2a1b..fce1ce7db0a 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx @@ -1,6 +1,6 @@ +import { explorePageSelectors, explorePageActions } from '@audius/common/store' import { useEffect } from 'react' -import { explorePageSelectors, explorePageActions } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx b/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx index 0d5854d1494..dbe6b47cf4c 100644 --- a/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx @@ -1,12 +1,14 @@ -import { useCallback, useState } from 'react' - -import type { CommonState } from '@audius/common' import { + savedPageSelectors, + LibraryCategory, SavedPageTabs, reachabilitySelectors, - savedPageSelectors, - LibraryCategory -} from '@audius/common' + CommonState +} from '@audius/common/store' +import { useCallback, useState } from 'react' + +import type {} from '@audius/common' + import { statusIsNotFinalized } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx b/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx index e8c65710baf..cc7847482b3 100644 --- a/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx +++ b/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx @@ -1,6 +1,6 @@ +import { reachabilitySelectors } from '@audius/common/store' import { useEffect, useLayoutEffect, useState } from 'react' -import { reachabilitySelectors } from '@audius/common' import { useThrottledCallback } from '@audius/common/hooks' import type { SwitchProps } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/DownloadProgress.tsx b/packages/mobile/src/screens/favorites-screen/DownloadProgress.tsx index 4e96cdde267..cffec127d26 100644 --- a/packages/mobile/src/screens/favorites-screen/DownloadProgress.tsx +++ b/packages/mobile/src/screens/favorites-screen/DownloadProgress.tsx @@ -1,4 +1,5 @@ -import { reachabilitySelectors } from '@audius/common' +import { reachabilitySelectors } from '@audius/common/store' + import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx b/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx index 59f580b5b59..37da5aacd41 100644 --- a/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx +++ b/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx @@ -1,10 +1,12 @@ -import type { LibraryCategoryType } from '@audius/common' import { - LibraryCategory, savedPageActions, savedPageSelectors, - SavedPageTabs -} from '@audius/common' + LibraryCategory, + SavedPageTabs, + LibraryCategoryType +} from '@audius/common/store' +import type {} from '@audius/common' + import { useNavigationState } from '@react-navigation/native' import { ScrollView, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/OfflineContentBanner.tsx b/packages/mobile/src/screens/favorites-screen/OfflineContentBanner.tsx index 52a7d5c455b..63b34e9219d 100644 --- a/packages/mobile/src/screens/favorites-screen/OfflineContentBanner.tsx +++ b/packages/mobile/src/screens/favorites-screen/OfflineContentBanner.tsx @@ -1,4 +1,5 @@ -import { reachabilitySelectors } from '@audius/common' +import { reachabilitySelectors } from '@audius/common/store' + import { View } from 'react-native' import Animated, { SlideOutUp } from 'react-native-reanimated' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx b/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx index 036a1f35340..010d71ce885 100644 --- a/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx @@ -1,12 +1,14 @@ -import { useCallback, useState } from 'react' - -import type { CommonState } from '@audius/common' import { - SavedPageTabs, + savedPageSelectors, LibraryCategory, + SavedPageTabs, reachabilitySelectors, - savedPageSelectors -} from '@audius/common' + CommonState +} from '@audius/common/store' +import { useCallback, useState } from 'react' + +import type {} from '@audius/common' + import { CreatePlaylistSource, statusIsNotFinalized diff --git a/packages/mobile/src/screens/favorites-screen/TracksTab.tsx b/packages/mobile/src/screens/favorites-screen/TracksTab.tsx index bc6f396dc9e..faa8a149c98 100644 --- a/packages/mobile/src/screens/favorites-screen/TracksTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/TracksTab.tsx @@ -1,15 +1,15 @@ -import { useCallback, useEffect, useMemo, useState } from 'react' - import { - LibraryCategory, - SavedPageTabs, cacheTracksSelectors, cacheUsersSelectors, - reachabilitySelectors, + savedPageTracksLineupActions as tracksActions, savedPageActions, savedPageSelectors, - savedPageTracksLineupActions as tracksActions -} from '@audius/common' + LibraryCategory, + SavedPageTabs, + reachabilitySelectors +} from '@audius/common/store' +import { useCallback, useEffect, useMemo, useState } from 'react' + import { PlaybackSource, Status } from '@audius/common/models' import type { ID, UID, Track, User } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/favorites-screen/selectors.ts b/packages/mobile/src/screens/favorites-screen/selectors.ts index ea547383a0b..1fff6e0e17c 100644 --- a/packages/mobile/src/screens/favorites-screen/selectors.ts +++ b/packages/mobile/src/screens/favorites-screen/selectors.ts @@ -1,4 +1,5 @@ -import type { CommonState } from '@audius/common' +import { CommonState } from '@audius/common/store' + import type { } from '@audius/common' import type { Cacheable, Collection, ID, User } from '@audius/common/models' const matchesFilter = ( diff --git a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts index fa362bc0db8..ba8f382af77 100644 --- a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts +++ b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts @@ -1,11 +1,14 @@ -import type { CollectionType, CommonState } from '@audius/common' import { - SavedPageTabs, accountSelectors, cacheCollectionsSelectors, + savedPageSelectors, + SavedPageTabs, reachabilitySelectors, - savedPageSelectors -} from '@audius/common' + CommonState, + CollectionType +} from '@audius/common/store' +import type {} from '@audius/common' + import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' import { useAllPaginatedQuery } from '@audius/common/audius-query' import { useProxySelector } from '@audius/common/hooks' diff --git a/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts b/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts index 7ad491775d8..ad526522527 100644 --- a/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts +++ b/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { - savedPageTracksLineupActions, cacheActions, + savedPageTracksLineupActions, savedPageSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { orderBy } from 'lodash' diff --git a/packages/mobile/src/screens/feed-screen/EmptyFeedSuggestedFollows.tsx b/packages/mobile/src/screens/feed-screen/EmptyFeedSuggestedFollows.tsx index d8ee0ecfd20..48bd5e9d42c 100644 --- a/packages/mobile/src/screens/feed-screen/EmptyFeedSuggestedFollows.tsx +++ b/packages/mobile/src/screens/feed-screen/EmptyFeedSuggestedFollows.tsx @@ -1,9 +1,9 @@ -import { useCallback } from 'react' - import { feedPageLineupActions as feedActions, feedPageActions -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import * as signOnActions from 'common/store/pages/signon/actions' import { Dimensions } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx b/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx index 7652074f9c6..e527736de03 100644 --- a/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx +++ b/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx @@ -1,6 +1,6 @@ +import { feedPageSelectors, modalsActions } from '@audius/common/store' import { useCallback } from 'react' -import { feedPageSelectors, modalsActions } from '@audius/common' import { FeedFilter } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx index 5f3e7a71d72..a4a6ed5e3c6 100644 --- a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx +++ b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { lineupSelectors, feedPageLineupActions as feedActions, feedPageSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useFeatureFlag } from '@audius/common/hooks' import { Name } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' diff --git a/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx b/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx index eb8ba99e7b4..2603474cee9 100644 --- a/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx +++ b/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx @@ -1,10 +1,10 @@ -import { useEffect } from 'react' - import { explorePageCollectionsSelectors, - ExploreCollectionsVariant, - explorePageCollectionsActions -} from '@audius/common' + explorePageCollectionsActions, + ExploreCollectionsVariant +} from '@audius/common/store' +import { useEffect } from 'react' + import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx b/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx index 4db935c5f5e..712f58c93fa 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx @@ -1,6 +1,7 @@ -import type { ReactNode } from 'react' +import { Notification } from '@audius/common/store' + import type { ReactNode } from 'react' -import type { Notification } from '@audius/common' +import type { } from '@audius/common' import { View } from 'react-native' import { Tile, Text } from 'app/components/core' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/utils.ts b/packages/mobile/src/screens/notifications-screen/Notification/utils.ts index cbb03f87c8e..40f7af7828c 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/utils.ts +++ b/packages/mobile/src/screens/notifications-screen/Notification/utils.ts @@ -1,4 +1,5 @@ -import type { EntityType } from '@audius/common' +import { EntityType } from '@audius/common/store' + import type { } from '@audius/common' import { getCollectionRoute, getTrackRoute } from 'app/utils/routes' diff --git a/packages/mobile/src/screens/notifications-screen/NotificationList.tsx b/packages/mobile/src/screens/notifications-screen/NotificationList.tsx index 86c37470def..5361339baa5 100644 --- a/packages/mobile/src/screens/notifications-screen/NotificationList.tsx +++ b/packages/mobile/src/screens/notifications-screen/NotificationList.tsx @@ -1,7 +1,12 @@ +import { + notificationsActions, + notificationsSelectors, + Notification +} from '@audius/common/store' import { useCallback, useContext, useEffect, useState } from 'react' -import type { Notification } from '@audius/common' -import { notificationsActions, notificationsSelectors } from '@audius/common' +import type {} from '@audius/common' + import { Status } from '@audius/common/models' import { useIsFocused } from '@react-navigation/native' import type { ViewToken } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/NotificationListItem.tsx b/packages/mobile/src/screens/notifications-screen/NotificationListItem.tsx index cf907039d10..ebab9184d1d 100644 --- a/packages/mobile/src/screens/notifications-screen/NotificationListItem.tsx +++ b/packages/mobile/src/screens/notifications-screen/NotificationListItem.tsx @@ -1,5 +1,5 @@ -import type { Notification } from '@audius/common' -import { NotificationType } from '@audius/common' +import { NotificationType, Notification } from '@audius/common/store' +import type {} from '@audius/common' import { NotificationErrorBoundary } from './NotificationErrorBoundary' import { diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx index bdaa056eb73..9e21bac8986 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx @@ -1,7 +1,8 @@ -import { useCallback } from 'react' +import { notificationsSelectors , AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType } from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import type { AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common' +import type { } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx index bca0237c617..cc9775c59cd 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx @@ -1,4 +1,5 @@ -import type { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common' +import { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common/store' + import type { } from '@audius/common' import { View } from 'react-native' import Markdown from 'react-native-markdown-display' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx index c56a22d840b..15ab5abff39 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx @@ -1,6 +1,7 @@ -import { useCallback } from 'react' +import { ChallengeRewardNotification as ChallengeRewardNotificationType } from '@audius/common/store' + import { useCallback } from 'react' -import type { ChallengeRewardNotification as ChallengeRewardNotificationType } from '@audius/common' +import type { } from '@audius/common' import type { ChallengeRewardID } from '@audius/common/models' import { Platform } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx index 44d8599b10c..f3ad85b049f 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx @@ -1,7 +1,8 @@ -import { useCallback } from 'react' +import { notificationsSelectors, Entity , FavoriteNotification as FavoriteNotificationType } from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import type { FavoriteNotification as FavoriteNotificationType } from '@audius/common' -import { notificationsSelectors, Entity } from '@audius/common' +import type { } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { formatCount } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx index 2a1fd43cb25..5248a58a2c0 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx @@ -1,7 +1,8 @@ -import { useCallback } from 'react' +import { notificationsSelectors, Entity , FavoriteOfRepostNotification as FavoriteOfRepostNotificationType } from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import type { FavoriteOfRepostNotification as FavoriteOfRepostNotificationType } from '@audius/common' -import { notificationsSelectors, Entity } from '@audius/common' +import type { } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { formatCount } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx index f949e72a202..f4cda564754 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx @@ -1,7 +1,8 @@ -import { useCallback } from 'react' +import { notificationsSelectors , FollowNotification as FollowNotificationType } from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import type { FollowNotification as FollowNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common' +import type { } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { formatCount } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx index 723eb891f82..aec9b0c41b6 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx @@ -1,10 +1,11 @@ -import { useCallback } from 'react' +import { notificationsSelectors, Achievement , EntityType, MilestoneNotification as MilestoneNotificationType +} from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' import type { - EntityType, - MilestoneNotification as MilestoneNotificationType -} from '@audius/common' -import { notificationsSelectors, Achievement } from '@audius/common' + + } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import type { User } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx index 5fa19969742..db41591ae2c 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx @@ -1,10 +1,12 @@ +import { + notificationsSelectors, + TrackEntity, + RemixCosignNotification as RemixCosignNotificationType +} from '@audius/common/store' import { useCallback } from 'react' -import type { - RemixCosignNotification as RemixCosignNotificationType, - TrackEntity -} from '@audius/common' -import { notificationsSelectors } from '@audius/common' +import type {} from '@audius/common' + import { useProxySelector } from '@audius/common/hooks' import type { Nullable } from '@audius/common/utils' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx index f9f58f09d09..e60956694a6 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx @@ -1,7 +1,8 @@ -import { useCallback } from 'react' +import { cacheTracksSelectors, notificationsSelectors , RemixCreateNotification as RemixCreateNotificationType } from '@audius/common' +import { cacheTracksSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import type { RemixCreateNotification as RemixCreateNotificationType } from '@audius/common' -import { cacheTracksSelectors, notificationsSelectors } from '@audius/common' +import type { } from '@audius/common' import { useSelector } from 'react-redux' import IconRemix from 'app/assets/images/iconRemix.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx index ca3c489bd87..1ad4d722f08 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx @@ -1,7 +1,8 @@ -import { useCallback } from 'react' +import { notificationsSelectors, Entity , RepostNotification as RepostNotificationType } from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import type { RepostNotification as RepostNotificationType } from '@audius/common' -import { notificationsSelectors, Entity } from '@audius/common' +import type { } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { formatCount } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx index fabeb091eb4..b05042f7726 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx @@ -1,7 +1,8 @@ -import { useCallback } from 'react' +import { notificationsSelectors, Entity , RepostOfRepostNotification as RepostOfRepostNotificationType } from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import type { RepostOfRepostNotification as RepostOfRepostNotificationType } from '@audius/common' -import { notificationsSelectors, Entity } from '@audius/common' +import type { } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { formatCount } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx index 96f46a561c7..4851605b2fb 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx @@ -1,7 +1,11 @@ +import { + cacheUsersSelectors, + notificationsSelectors, + SupporterDethronedNotification as SupporterDethroned +} from '@audius/common/store' import { useCallback } from 'react' -import { cacheUsersSelectors, notificationsSelectors } from '@audius/common' -import type { SupporterDethronedNotification as SupporterDethroned } from '@audius/common' +import type {} from '@audius/common' import type { Nullable } from '@audius/common/utils' import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx index 6b31245971a..5020b464897 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx @@ -1,10 +1,12 @@ +import { + notificationsSelectors, + TrackEntity, + TastemakerNotification as TastemakerNotificationType +} from '@audius/common/store' import { useCallback } from 'react' -import type { - TastemakerNotification as TastemakerNotificationType, - TrackEntity -} from '@audius/common' -import { notificationsSelectors } from '@audius/common' +import type {} from '@audius/common' + import { Name } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { make } from 'common/store/analytics/actions' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx index 838bd40ba1e..8311097a2c4 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx @@ -1,7 +1,8 @@ -import { useCallback } from 'react' +import { cacheUsersSelectors , TierChangeNotification as TierChangeNotificationType } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import type { TierChangeNotification as TierChangeNotificationType } from '@audius/common' -import { cacheUsersSelectors } from '@audius/common' +import type { } from '@audius/common' import { fullProfilePage } from 'audius-client/src/utils/route' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx index d1e05108e45..94657c12fe0 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx @@ -1,7 +1,12 @@ +import { + notificationsSelectors, + getReactionFromRawValue, + ReactionNotification +} from '@audius/common/store' import { useCallback } from 'react' -import type { ReactionNotification } from '@audius/common' -import { notificationsSelectors, getReactionFromRawValue } from '@audius/common' +import type {} from '@audius/common' + import { useUIAudio } from '@audius/common/hooks' import { Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx index 9a2052ad760..7221047ad44 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx @@ -1,11 +1,13 @@ -import { useCallback } from 'react' - import { notificationsSelectors, reactionsUIActions, - reactionsUISelectors -} from '@audius/common' -import type { TipReceiveNotification, ReactionTypes } from '@audius/common' + reactionsUISelectors, + TipReceiveNotification, + ReactionTypes +} from '@audius/common/store' +import { useCallback } from 'react' + +import type {} from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { formatNumberCommas } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx index 45763f12cac..43ef1fa5bc9 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx @@ -1,7 +1,11 @@ +import { + notificationsSelectors, + TipSendNotification +} from '@audius/common/store' import { useCallback } from 'react' -import type { TipSendNotification } from '@audius/common' -import { notificationsSelectors } from '@audius/common' +import type {} from '@audius/common' + import { useUIAudio } from '@audius/common/hooks' import { Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx index f95bacf69a2..ed2edd93e33 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx @@ -1,7 +1,11 @@ +import { + notificationsSelectors, + SupporterRankUpNotification +} from '@audius/common/store' import { useCallback } from 'react' -import type { SupporterRankUpNotification } from '@audius/common' -import { notificationsSelectors } from '@audius/common' +import type {} from '@audius/common' + import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx index db525e8ab8d..ae4f1a4786a 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx @@ -1,7 +1,11 @@ +import { + notificationsSelectors, + SupportingRankUpNotification +} from '@audius/common/store' import { useCallback } from 'react' -import type { SupportingRankUpNotification } from '@audius/common' -import { notificationsSelectors } from '@audius/common' +import type {} from '@audius/common' + import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx index b20f8ef1144..f9f37bbb33c 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx @@ -1,10 +1,11 @@ -import { useCallback } from 'react' +import { notificationsSelectors , CollectionEntity, TrendingPlaylistNotification as TrendingPlaylistNotificationType +} from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' import type { - CollectionEntity, - TrendingPlaylistNotification as TrendingPlaylistNotificationType -} from '@audius/common' -import { notificationsSelectors } from '@audius/common' + + } from '@audius/common' import { Name } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx index 30b98fd79bd..73fcb84a50f 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx @@ -1,10 +1,11 @@ -import { useCallback } from 'react' +import { notificationsSelectors , TrackEntity, TrendingTrackNotification as TrendingTrackNotificationType +} from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' import type { - TrackEntity, - TrendingTrackNotification as TrendingTrackNotificationType -} from '@audius/common' -import { notificationsSelectors } from '@audius/common' + + } from '@audius/common' import { Name } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx index 1053824130a..96ef629bdd1 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx @@ -1,10 +1,11 @@ -import { useCallback } from 'react' +import { notificationsSelectors , TrackEntity, TrendingUndergroundNotification as TrendingUndergroundNotificationType +} from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' import type { - TrackEntity, - TrendingUndergroundNotification as TrendingUndergroundNotificationType -} from '@audius/common' -import { notificationsSelectors } from '@audius/common' + + } from '@audius/common' import { Name } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx index 61e936df33c..12f3c7adb26 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx @@ -1,10 +1,12 @@ +import { + notificationsSelectors, + TrackEntity, + USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType +} from '@audius/common/store' import { useCallback } from 'react' -import type { - USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType, - TrackEntity -} from '@audius/common' -import { notificationsSelectors } from '@audius/common' +import type {} from '@audius/common' + import { Name } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { make } from 'audius-client/src/common/store/analytics/actions' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx index 6dc48c8a4c1..be1e3df0ea7 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx @@ -1,10 +1,11 @@ -import { useCallback } from 'react' +import { notificationsSelectors , TrackEntity, USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType +} from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' import type { - TrackEntity, - USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType -} from '@audius/common' -import { notificationsSelectors } from '@audius/common' + + } from '@audius/common' import type { StringUSDC } from '@audius/common/models' import { stringUSDCToBN, formatUSDCWeiToUSDString } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx index 665f75d2b45..77e16098f18 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx @@ -1,7 +1,8 @@ -import { useCallback } from 'react' +import { notificationsSelectors , UserSubscriptionNotification as UserSubscriptionNotificationType } from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' + import { useCallback } from 'react' -import type { UserSubscriptionNotification as UserSubscriptionNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common' +import type { } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts index 528c3c9bfe0..7c4839a80ab 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts +++ b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts @@ -1,11 +1,13 @@ +import { + notificationsUserListActions, + FollowNotification, + RepostNotification, + FavoriteNotification +} from '@audius/common/store' import { useCallback } from 'react' -import type { - FavoriteNotification, - FollowNotification, - RepostNotification -} from '@audius/common' -import { notificationsUserListActions } from '@audius/common' +import type {} from '@audius/common' + import type { User } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/NotificationsScreen.tsx b/packages/mobile/src/screens/notifications-screen/NotificationsScreen.tsx index 0d614f4f6ba..ceee9dd24e8 100644 --- a/packages/mobile/src/screens/notifications-screen/NotificationsScreen.tsx +++ b/packages/mobile/src/screens/notifications-screen/NotificationsScreen.tsx @@ -1,6 +1,9 @@ +import { + notificationsActions, + notificationsSelectors +} from '@audius/common/store' import { useCallback } from 'react' -import { notificationsActions, notificationsSelectors } from '@audius/common' import { useFocusEffect } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx index 420a25158e2..4b207bd28da 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx @@ -1,6 +1,7 @@ -import { useEffect, useCallback, useRef, useState } from 'react' +import { ReactionTypes } from '@audius/common/store' + import { useEffect, useCallback, useRef, useState } from 'react' -import type { ReactionTypes } from '@audius/common' +import type { } from '@audius/common' import type { LottieViewProps } from 'lottie-react-native' import LottieView from 'lottie-react-native' import type { diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx index 7c7954e41ca..cbe8d2e9123 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx @@ -1,7 +1,7 @@ +import { reactionOrder, ReactionTypes } from '@audius/common/store' import { useCallback, useContext, useRef, useState } from 'react' -import { reactionOrder } from '@audius/common' -import type { ReactionTypes } from '@audius/common' +import type {} from '@audius/common' import type { Nullable } from '@audius/common/utils' import type { ViewStyle, diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx index 81f94a22741..b6387b14efa 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx @@ -1,6 +1,7 @@ -import type { ComponentType } from 'react' +import { ReactionTypes } from '@audius/common/store' + import type { ComponentType } from 'react' -import type { ReactionTypes } from '@audius/common' +import type { } from '@audius/common' import type { SetOptional } from 'type-fest' import type { ReactionProps as BaseReactionProps } from './Reaction' diff --git a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx index 732ef426fe0..097226e3439 100644 --- a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx +++ b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx @@ -1,6 +1,6 @@ +import { useAddFundsModal } from '@audius/common/store' import React, { useCallback } from 'react' -import { useAddFundsModal } from '@audius/common' import { useUSDCBalance } from '@audius/common/hooks' import type { BNUSDC } from '@audius/common/models' import { diff --git a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx index 9b77b9c6751..ef49a49f200 100644 --- a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx +++ b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx @@ -1,12 +1,14 @@ -import { Fragment, useCallback, useEffect, useState } from 'react' - -import type { CommonState } from '@audius/common' import { + cacheUsersSelectors, usersSocialActions, relatedArtistsUISelectors, relatedArtistsUIActions, - cacheUsersSelectors -} from '@audius/common' + CommonState +} from '@audius/common/store' +import { Fragment, useCallback, useEffect, useState } from 'react' + +import type {} from '@audius/common' + import { FollowSource } from '@audius/common/models' import type { ID, User } from '@audius/common/models' import { isEmpty } from 'lodash' diff --git a/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx b/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx index 025729d3e46..73d1dbdea49 100644 --- a/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx +++ b/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx @@ -1,11 +1,11 @@ -import type { ReactNode } from 'react' -import { useState, useCallback } from 'react' - import { accountSelectors, collectibleDetailsUIActions, modalsActions -} from '@audius/common' +} from '@audius/common/store' +import type { ReactNode } from 'react' +import { useState, useCallback } from 'react' + import type { Collectible, ID } from '@audius/common/models' import type { ImageStyle, StyleProp, ViewStyle } from 'react-native' import { ImageBackground, Text, View } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/EmptyProfileTile.tsx b/packages/mobile/src/screens/profile-screen/EmptyProfileTile.tsx index 1eb3c46040f..23969205558 100644 --- a/packages/mobile/src/screens/profile-screen/EmptyProfileTile.tsx +++ b/packages/mobile/src/screens/profile-screen/EmptyProfileTile.tsx @@ -1,4 +1,5 @@ -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' + import type { StyleProp, ViewStyle } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/MessageButton.tsx b/packages/mobile/src/screens/profile-screen/MessageButton.tsx index 233876b07cc..8ea9a962617 100644 --- a/packages/mobile/src/screens/profile-screen/MessageButton.tsx +++ b/packages/mobile/src/screens/profile-screen/MessageButton.tsx @@ -1,6 +1,6 @@ +import { chatActions } from '@audius/common/store' import { useCallback } from 'react' -import { chatActions } from '@audius/common' import type { User } from '@audius/common/models' import { Name } from '@audius/common/models' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx b/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx index 00b7a8afe94..ce42489457c 100644 --- a/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx +++ b/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx @@ -1,6 +1,6 @@ +import { useInboxUnavailableModal } from '@audius/common/store' import { useCallback } from 'react' -import { useInboxUnavailableModal } from '@audius/common' import type { ID } from '@audius/common/models' import IconMessageLocked from 'app/assets/images/iconMessageLocked.svg' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx index eeaeee5a8bd..fc3b11868ee 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import { memo, useCallback, useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import type { Animated } from 'react-native' import { LayoutAnimation, View } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx index 7b098c5c39b..22e8377ff10 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx @@ -1,7 +1,10 @@ +import { + accountSelectors, + relatedArtistsUISelectors +} from '@audius/common/store' import type { ComponentType } from 'react' import { useCallback } from 'react' -import { accountSelectors, relatedArtistsUISelectors } from '@audius/common' import { FeatureFlags } from '@audius/common/services' import type { ViewStyle } from 'react-native' import { View, ScrollView } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx index 09929611465..3a4b0a64275 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx @@ -1,6 +1,6 @@ +import { cacheUsersActions } from '@audius/common/store' import { Fragment, useEffect, useLayoutEffect, useMemo, useRef } from 'react' -import { cacheUsersActions } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { View, Animated } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx index 1e47722b8b9..09f8dba9f75 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx @@ -1,6 +1,6 @@ +import { modalsActions } from '@audius/common/store' import { useCallback } from 'react' -import { modalsActions } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import type { ViewStyle, StyleProp } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx index 37bb97bc96a..006dca86fe8 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx @@ -1,6 +1,6 @@ +import { tippingActions } from '@audius/common/store' import { useEffect, useMemo } from 'react' -import { tippingActions } from '@audius/common' import { useRankedSupportingForUser } from '@audius/common/hooks' import type { Supporting } from '@audius/common/models' import { MAX_PROFILE_SUPPORTING_TILES } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx index 3845ce7196f..420b69cd275 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx @@ -1,6 +1,6 @@ +import { cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { cacheUsersSelectors } from '@audius/common' import type { Supporting } from '@audius/common/models' import { TIPPING_TOP_RANK_THRESHOLD } from 'audius-client/src/utils/constants' import type { StyleProp, ViewStyle } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx index 822c7102053..f095a60ae53 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx @@ -1,10 +1,10 @@ -import { useCallback, useEffect } from 'react' - import { cacheUsersSelectors, tippingSelectors, tippingActions -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useEffect } from 'react' + import { useProxySelector } from '@audius/common/hooks' import { removeNullable } from '@audius/common/utils' import { Text, View } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx index a5242c750eb..6aa26dfe2d3 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx @@ -1,6 +1,6 @@ +import { cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { cacheUsersSelectors } from '@audius/common' import { useRankedSupportingForUser, useProxySelector diff --git a/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx b/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx index 9f46cdb7813..e5443c8293a 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx @@ -1,12 +1,12 @@ -import { useEffect } from 'react' - import { accountSelectors, - chatSelectors, - chatActions, profilePageSelectors, + chatActions, + chatSelectors, reachabilitySelectors -} from '@audius/common' +} from '@audius/common/store' +import { useEffect } from 'react' + import { FollowSource } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { View, Text } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileMetrics.tsx b/packages/mobile/src/screens/profile-screen/ProfileMetrics.tsx index 0b923519e44..c100c83bcab 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileMetrics.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileMetrics.tsx @@ -1,9 +1,9 @@ +import { + followingUserListActions, + followersUserListActions +} from '@audius/common/store' import { useCallback } from 'react' -import { - followersUserListActions, - followingUserListActions -} from '@audius/common' import { Pressable, Text, View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx index f734ab2746d..f735507f9d5 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx @@ -1,13 +1,13 @@ -import { useCallback, useEffect, useRef, useState } from 'react' - import { - profilePageSelectors, profilePageActions, + profilePageSelectors, reachabilitySelectors, + relatedArtistsUIActions, shareModalUIActions, - modalsActions, - relatedArtistsUIActions -} from '@audius/common' + modalsActions +} from '@audius/common/store' +import { useCallback, useEffect, useRef, useState } from 'react' + import { ShareSource, Status } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { encodeUrlName } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx index e8e553421b0..693d40ca51d 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx @@ -1,6 +1,6 @@ +import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { useEffect } from 'react' -import { profilePageActions, profilePageSelectors } from '@audius/common' import { Status } from '@audius/common/models' import { useIsFocused } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx index 988712d9e1b..24fec2f70d9 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import { useCallback, useMemo, useRef } from 'react' -import { accountSelectors } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import type { Collectible } from '@audius/common/models' import Clipboard from '@react-native-clipboard/clipboard' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx index 34141ee0e5d..2150197881a 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx @@ -1,6 +1,6 @@ +import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { useEffect } from 'react' -import { profilePageActions, profilePageSelectors } from '@audius/common' import { CreatePlaylistSource, Status } from '@audius/common/models' import { useIsFocused } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx index 9fa550a766d..e7023bfefd2 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx @@ -1,9 +1,9 @@ +import { + profilePageFeedLineupActions as feedActions, + profilePageSelectors +} from '@audius/common/store' import { useMemo } from 'react' -import { - profilePageSelectors, - profilePageFeedLineupActions as feedActions -} from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' import { useRoute } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx index 438b7b2856f..b23a224b02b 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx @@ -1,9 +1,9 @@ +import { + profilePageTracksLineupActions as tracksActions, + profilePageSelectors +} from '@audius/common/store' import { useMemo } from 'react' -import { - profilePageSelectors, - profilePageTracksLineupActions as tracksActions -} from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import { Lineup } from 'app/components/lineup' diff --git a/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx b/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx index e7cf11ff975..f46dd07c164 100644 --- a/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx +++ b/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx @@ -1,6 +1,6 @@ +import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { profilePageSelectors, profilePageActions } from '@audius/common' import type { User } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/TipAudioButton.tsx b/packages/mobile/src/screens/profile-screen/TipAudioButton.tsx index aa474825760..d878f9ad2cf 100644 --- a/packages/mobile/src/screens/profile-screen/TipAudioButton.tsx +++ b/packages/mobile/src/screens/profile-screen/TipAudioButton.tsx @@ -1,6 +1,6 @@ +import { cacheUsersSelectors, tippingActions } from '@audius/common/store' import { useCallback } from 'react' -import { tippingActions, cacheUsersSelectors } from '@audius/common' import { Platform } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/selectors.ts b/packages/mobile/src/screens/profile-screen/selectors.ts index 7af21905c47..038ff81e112 100644 --- a/packages/mobile/src/screens/profile-screen/selectors.ts +++ b/packages/mobile/src/screens/profile-screen/selectors.ts @@ -1,7 +1,12 @@ +import { + accountSelectors, + profilePageSelectors, + CommonState +} from '@audius/common/store' import { useContext } from 'react' -import type { CommonState } from '@audius/common' -import { accountSelectors, profilePageSelectors } from '@audius/common' +import type {} from '@audius/common' + import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' import type { User } from '@audius/common/models' diff --git a/packages/mobile/src/screens/profile-screen/useIsArtist.ts b/packages/mobile/src/screens/profile-screen/useIsArtist.ts index 643a51148a9..50e041b3837 100644 --- a/packages/mobile/src/screens/profile-screen/useIsArtist.ts +++ b/packages/mobile/src/screens/profile-screen/useIsArtist.ts @@ -1,6 +1,6 @@ +import { accountActions, accountSelectors } from '@audius/common/store' import { useEffect } from 'react' -import { accountActions, accountSelectors } from '@audius/common' import { useDispatch, useSelector } from 'react-redux' import { useSelectProfile } from './selectors' diff --git a/packages/mobile/src/screens/profile-screen/utils.ts b/packages/mobile/src/screens/profile-screen/utils.ts index fde2f83c4a4..ff13db8776d 100644 --- a/packages/mobile/src/screens/profile-screen/utils.ts +++ b/packages/mobile/src/screens/profile-screen/utils.ts @@ -1,5 +1,6 @@ -import type { CommonState } from '@audius/common' -import { badgeTiers } from '@audius/common' +import { badgeTiers, CommonState } from '@audius/common/store' +import type {} from '@audius/common' + import { useSelectTierInfo } from '@audius/common/hooks' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx b/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx index 4047250abf1..8c99dad4945 100644 --- a/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx +++ b/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' import { useResetPassword } from '@audius/common/api' import { Status } from '@audius/common/models' import AsyncStorage from '@react-native-async-storage/async-storage' diff --git a/packages/mobile/src/screens/root-screen/RootScreen.tsx b/packages/mobile/src/screens/root-screen/RootScreen.tsx index e6e54835b00..87c0035a4ac 100644 --- a/packages/mobile/src/screens/root-screen/RootScreen.tsx +++ b/packages/mobile/src/screens/root-screen/RootScreen.tsx @@ -1,6 +1,10 @@ +import { + accountSelectors, + chatActions, + playerActions +} from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' -import { accountSelectors, chatActions, playerActions } from '@audius/common' import { Status } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' import { createNativeStackNavigator } from '@react-navigation/native-stack' diff --git a/packages/mobile/src/screens/root-screen/StatusBar.tsx b/packages/mobile/src/screens/root-screen/StatusBar.tsx index 63f7bab2cf7..6712d90dbe4 100644 --- a/packages/mobile/src/screens/root-screen/StatusBar.tsx +++ b/packages/mobile/src/screens/root-screen/StatusBar.tsx @@ -1,4 +1,5 @@ -import { accountSelectors } from '@audius/common' +import { accountSelectors } from '@audius/common/store' + import { Status } from '@audius/common/models' import { NavigationBar, StatusBar as RNStatusBar } from 'react-native-bars' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx index ba3e66acd2b..8244f32993e 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx @@ -1,5 +1,10 @@ -import type { CommonState } from '@audius/common' -import { searchResultsPageSelectors, SearchKind } from '@audius/common' +import { + searchResultsPageSelectors, + SearchKind, + CommonState +} from '@audius/common/store' +import type {} from '@audius/common' + import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx index 41289042eb5..ce11aaf6d57 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx @@ -1,5 +1,10 @@ -import type { CommonState } from '@audius/common' -import { searchResultsPageSelectors, SearchKind } from '@audius/common' +import { + searchResultsPageSelectors, + SearchKind, + CommonState +} from '@audius/common/store' +import type {} from '@audius/common' + import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx index f109d896863..ad51e2bdf9d 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx @@ -1,5 +1,10 @@ -import type { CommonState } from '@audius/common' -import { searchResultsPageSelectors, SearchKind } from '@audius/common' +import { + searchResultsPageSelectors, + SearchKind, + CommonState +} from '@audius/common/store' +import type {} from '@audius/common' + import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx index 1958d531350..ab9f450f8bf 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx @@ -1,6 +1,6 @@ +import { searchResultsPageSelectors } from '@audius/common/store' import type { ReactNode } from 'react' -import { searchResultsPageSelectors } from '@audius/common' import { Status } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/TracksTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/TracksTab.tsx index 7fad98e3a3b..32a86c787ef 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/TracksTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/TracksTab.tsx @@ -1,11 +1,11 @@ -import { useCallback, useContext } from 'react' - import { lineupSelectors, - SearchKind, + searchResultsPageTracksLineupActions as tracksActions, searchResultsPageSelectors, - searchResultsPageTracksLineupActions as tracksActions -} from '@audius/common' + SearchKind +} from '@audius/common/store' +import { useCallback, useContext } from 'react' + import { useDispatch, useSelector } from 'react-redux' import { Lineup } from 'app/components/lineup' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/useFetchTabResultsEffect.tsx b/packages/mobile/src/screens/search-results-screen/tabs/useFetchTabResultsEffect.tsx index e4fa01182ce..5cbf069fcee 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/useFetchTabResultsEffect.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/useFetchTabResultsEffect.tsx @@ -1,10 +1,10 @@ -import { useCallback, useContext } from 'react' - import { - SearchKind, searchResultsPageActions, - searchResultsPageSelectors -} from '@audius/common' + searchResultsPageSelectors, + SearchKind +} from '@audius/common/store' +import { useCallback, useContext } from 'react' + import { useFocusEffect } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/AccountSettingsRow.tsx b/packages/mobile/src/screens/settings-screen/AccountSettingsRow.tsx index 57ffa1dda0d..d9d74f2ed3d 100644 --- a/packages/mobile/src/screens/settings-screen/AccountSettingsRow.tsx +++ b/packages/mobile/src/screens/settings-screen/AccountSettingsRow.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { accountSelectors } from '@audius/common' import { Text, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx b/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx index 8145a232349..96f6b3b5d26 100644 --- a/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx @@ -1,11 +1,11 @@ -import { useCallback, useEffect } from 'react' - import { accountSelectors, recoveryEmailActions, recoveryEmailSelectors, modalsActions -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useEffect } from 'react' + import { Status } from '@audius/common/models' import { Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx b/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx index 495e9f9046a..04b0c0cc8d5 100644 --- a/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' -import { accountSelectors } from '@audius/common' import { Status } from '@audius/common/models' import { BooleanKeys } from '@audius/common/services' import * as signOnActions from 'common/store/pages/signon/actions' diff --git a/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx b/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx index 5e73cbf1838..4bbd3c74b62 100644 --- a/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx +++ b/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx @@ -1,6 +1,10 @@ +import { + accountSelectors, + themeActions, + themeSelectors +} from '@audius/common/store' import { useCallback } from 'react' -import { accountSelectors, themeActions, themeSelectors } from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' import { Name } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx b/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx index 98d8b40ed9a..e3b38fb50a0 100644 --- a/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx +++ b/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx @@ -1,7 +1,13 @@ +import { + accountSelectors, + castSelectors, + castActions, + CastMethod +} from '@audius/common/store' import { useCallback } from 'react' -import type { CastMethod } from '@audius/common' -import { accountSelectors, castSelectors, castActions } from '@audius/common' +import type {} from '@audius/common' + import { useDispatch, useSelector } from 'react-redux' import IconVolume2 from 'app/assets/images/iconVolume2.svg' diff --git a/packages/mobile/src/screens/settings-screen/EmailFrequencyControlRow.tsx b/packages/mobile/src/screens/settings-screen/EmailFrequencyControlRow.tsx index 244d3a05687..d65c8e0bae5 100644 --- a/packages/mobile/src/screens/settings-screen/EmailFrequencyControlRow.tsx +++ b/packages/mobile/src/screens/settings-screen/EmailFrequencyControlRow.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { - settingsPageActions, settingsPageSelectors, + settingsPageActions, EmailFrequency -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useDispatch, useSelector } from 'react-redux' import { SegmentedControl } from 'app/components/core' diff --git a/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx b/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx index c29cf6bc2e1..beb99a245b7 100644 --- a/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx @@ -1,9 +1,9 @@ -import { useCallback, useMemo } from 'react' - import { historyPageTracksLineupActions as tracksActions, historyPageSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useMemo } from 'react' + import { useProxySelector } from '@audius/common/hooks' import { PlaybackSource, Status } from '@audius/common/models' import type { ID, UID } from '@audius/common/models' diff --git a/packages/mobile/src/screens/settings-screen/NotificationRow.tsx b/packages/mobile/src/screens/settings-screen/NotificationRow.tsx index 96af0ca8024..46133cbcdab 100644 --- a/packages/mobile/src/screens/settings-screen/NotificationRow.tsx +++ b/packages/mobile/src/screens/settings-screen/NotificationRow.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { - settingsPageActions, settingsPageSelectors, + settingsPageActions, PushNotificationSetting -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx b/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx index 205968e22c9..0ea896d0479 100644 --- a/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx @@ -1,4 +1,8 @@ -import { PushNotificationSetting, settingsPageActions } from '@audius/common' +import { + settingsPageActions, + PushNotificationSetting +} from '@audius/common/store' + import { FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx b/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx index f7777386d90..79005ab96e2 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx @@ -1,6 +1,6 @@ +import { settingsPageActions } from '@audius/common/store' import { useCallback } from 'react' -import { settingsPageActions } from '@audius/common' import { welcomeModalMessages } from '@audius/common/messages' import { fillString } from '@audius/common/utils' import { css } from '@emotion/native' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx index 388cd435f2e..307c21a8b0f 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx @@ -1,6 +1,7 @@ -import { useCallback } from 'react' +import { Image } from '@audius/common/store' + import { useCallback } from 'react' -import type { Image } from '@audius/common' +import type { } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' import { finishProfileSchema } from '@audius/common/schemas' import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common/services' diff --git a/packages/mobile/src/screens/signon/ProfileImage.tsx b/packages/mobile/src/screens/signon/ProfileImage.tsx index aea8b0b4cdb..66220f2fcb1 100644 --- a/packages/mobile/src/screens/signon/ProfileImage.tsx +++ b/packages/mobile/src/screens/signon/ProfileImage.tsx @@ -1,6 +1,7 @@ -import { useEffect, useRef, useState } from 'react' +import { Image as ImageType } from '@audius/common/store' + import { useEffect, useRef, useState } from 'react' -import type { Image as ImageType } from '@audius/common' +import type { } from '@audius/common' import { Animated, TouchableOpacity, diff --git a/packages/mobile/src/screens/signon/ProfileManual.tsx b/packages/mobile/src/screens/signon/ProfileManual.tsx index 0d4853662e8..ab803c2c01e 100644 --- a/packages/mobile/src/screens/signon/ProfileManual.tsx +++ b/packages/mobile/src/screens/signon/ProfileManual.tsx @@ -1,6 +1,7 @@ -import { useState, useEffect, useCallback } from 'react' +import { Image } from '@audius/common/store' + import { useState, useEffect, useCallback } from 'react' -import type { Image } from '@audius/common' +import type { } from '@audius/common' import type { NativeStackScreenProps } from '@react-navigation/native-stack' import * as signOnActions from 'common/store/pages/signon/actions' import { diff --git a/packages/mobile/src/screens/signon/SignOn.tsx b/packages/mobile/src/screens/signon/SignOn.tsx index f4e0529cb3e..ef4289f6489 100644 --- a/packages/mobile/src/screens/signon/SignOn.tsx +++ b/packages/mobile/src/screens/signon/SignOn.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import { useState, useRef, useEffect, useCallback } from 'react' -import { accountSelectors } from '@audius/common' import Clipboard from '@react-native-clipboard/clipboard' import type { NativeStackScreenProps } from '@react-navigation/native-stack' import * as signOnActions from 'common/store/pages/signon/actions' diff --git a/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx b/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx index 7e81a54da37..800cb26b452 100644 --- a/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx +++ b/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx @@ -1,13 +1,13 @@ -import { useCallback } from 'react' - import { accountSelectors, smartCollectionPageSelectors, - collectionsSocialActions, smartCollectionPageActions, + collectionPageActions, playlistLibraryHelpers, - collectionPageActions -} from '@audius/common' + collectionsSocialActions +} from '@audius/common/store' +import { useCallback } from 'react' + import { FavoriteSource } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx b/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx index 78b025d230a..908885985c1 100644 --- a/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx @@ -1,4 +1,5 @@ -import { walletSelectors } from '@audius/common' +import { walletSelectors } from '@audius/common/store' + import type { BNWei } from '@audius/common/models' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Image, Platform, View } from 'react-native' diff --git a/packages/mobile/src/screens/tip-artist-screen/ConfirmSendTipScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/ConfirmSendTipScreen.tsx index 64752ec3617..f0d602b973c 100644 --- a/packages/mobile/src/screens/tip-artist-screen/ConfirmSendTipScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/ConfirmSendTipScreen.tsx @@ -1,6 +1,6 @@ +import { tippingSelectors, tippingActions } from '@audius/common/store' import { useCallback, useEffect } from 'react' -import { tippingSelectors, tippingActions } from '@audius/common' import type { NativeStackScreenProps } from '@react-navigation/native-stack' import { useKeepAwake } from '@sayem314/react-native-keep-awake' import { Platform } from 'react-native' diff --git a/packages/mobile/src/screens/tip-artist-screen/ReceiverDetails.tsx b/packages/mobile/src/screens/tip-artist-screen/ReceiverDetails.tsx index 65958a762a7..08aa377a80e 100644 --- a/packages/mobile/src/screens/tip-artist-screen/ReceiverDetails.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/ReceiverDetails.tsx @@ -1,6 +1,6 @@ +import { tippingSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { tippingSelectors } from '@audius/common' import { Pressable, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx index 9bc8e002407..f2940fa1b4c 100644 --- a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx @@ -1,12 +1,12 @@ -import { useCallback, useEffect, useState } from 'react' - import { accountSelectors, tippingSelectors, tippingActions, walletSelectors, walletActions -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useEffect, useState } from 'react' + import { useGetFirstOrTopSupporter } from '@audius/common/hooks' import type { StringWei, BNWei } from '@audius/common/models' import { stringWeiToBN } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/tip-artist-screen/SendTipStatusText.tsx b/packages/mobile/src/screens/tip-artist-screen/SendTipStatusText.tsx index 20fd1873459..d4953b3b538 100644 --- a/packages/mobile/src/screens/tip-artist-screen/SendTipStatusText.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/SendTipStatusText.tsx @@ -1,4 +1,5 @@ -import { tippingSelectors } from '@audius/common' +import { tippingSelectors } from '@audius/common/store' + import { Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipArtistModalScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/TipArtistModalScreen.tsx index a1163849894..f38b301a57c 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipArtistModalScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipArtistModalScreen.tsx @@ -1,6 +1,6 @@ +import { tippingActions } from '@audius/common/store' import { useEffect } from 'react' -import { tippingActions } from '@audius/common' import { createNativeStackNavigator } from '@react-navigation/native-stack' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx b/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx index 80cc19f88b4..b1e557d0a7e 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx @@ -1,4 +1,5 @@ -import { tippingSelectors } from '@audius/common' +import { tippingSelectors } from '@audius/common/store' + import { formatNumberCommas } from '@audius/common/utils' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx index a121c08ed2a..44bad4d4d59 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx @@ -1,6 +1,6 @@ +import { accountSelectors, tippingSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { accountSelectors, tippingSelectors } from '@audius/common' import type { SolanaWalletAddress } from '@audius/common/models' import { formatNumberCommas } from '@audius/common/utils' import { useNavigation } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/track-screen/DownloadRow.tsx b/packages/mobile/src/screens/track-screen/DownloadRow.tsx index 42a25c2d8f6..27714cbe84a 100644 --- a/packages/mobile/src/screens/track-screen/DownloadRow.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadRow.tsx @@ -1,7 +1,12 @@ +import { + cacheTracksSelectors, + tracksSocialActions, + CommonState +} from '@audius/common/store' import { useCallback } from 'react' -import type { CommonState } from '@audius/common' -import { cacheTracksSelectors, tracksSocialActions } from '@audius/common' +import type {} from '@audius/common' + import { useDownloadableContentAccess } from '@audius/common/hooks' import { Name, DownloadQuality } from '@audius/common/models' import type { ID } from '@audius/common/models' diff --git a/packages/mobile/src/screens/track-screen/DownloadSection.tsx b/packages/mobile/src/screens/track-screen/DownloadSection.tsx index ecdf2f6018e..052e019c188 100644 --- a/packages/mobile/src/screens/track-screen/DownloadSection.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadSection.tsx @@ -1,10 +1,11 @@ -import { useCallback, useState } from 'react' - import { cacheTracksSelectors, - usePremiumContentPurchaseModal -} from '@audius/common' -import type { CommonState } from '@audius/common' + usePremiumContentPurchaseModal, + CommonState +} from '@audius/common/store' +import { useCallback, useState } from 'react' + +import type {} from '@audius/common' import { useCurrentStems, useDownloadableContentAccess diff --git a/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx b/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx index 9e0ccd2b0d8..f0f74a477a4 100644 --- a/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx +++ b/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx @@ -1,11 +1,11 @@ -import { useCallback, useEffect } from 'react' - import { lineupSelectors, remixesPageLineupActions as tracksActions, - remixesPageSelectors, - remixesPageActions -} from '@audius/common' + remixesPageActions, + remixesPageSelectors +} from '@audius/common/store' +import { useCallback, useEffect } from 'react' + import { pluralize } from '@audius/common/utils' import { Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/TrackScreen.tsx b/packages/mobile/src/screens/track-screen/TrackScreen.tsx index 71fbdba8ced..e7d28908156 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreen.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreen.tsx @@ -1,11 +1,11 @@ -import { useCallback } from 'react' - import { trackPageLineupActions, trackPageActions, trackPageSelectors, reachabilitySelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useProxySelector } from '@audius/common/hooks' import { useFocusEffect } from '@react-navigation/native' import { Text, View } from 'react-native' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx index c7bb0457a44..4090fb86c83 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx @@ -1,21 +1,21 @@ -import { useCallback } from 'react' - import { - playerSelectors, accountSelectors, trackPageLineupActions, + queueSelectors, + reachabilitySelectors, tracksSocialActions, - OverflowAction, - OverflowSource, mobileOverflowMenuUIActions, shareModalUIActions, - RepostType, + OverflowAction, + OverflowSource, repostsUserListActions, favoritesUserListActions, - reachabilitySelectors, - playbackPositionSelectors, - queueSelectors -} from '@audius/common' + RepostType, + playerSelectors, + playbackPositionSelectors +} from '@audius/common/store' +import { useCallback } from 'react' + import { useGatedContentAccess } from '@audius/common/hooks' import { Name, diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx index 3ba899d3116..88c20be4299 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx @@ -1,6 +1,6 @@ +import { tracksSocialActions } from '@audius/common/store' import { useCallback } from 'react' -import { tracksSocialActions } from '@audius/common' import type { ButtonType as DownloadButtonType } from '@audius/common/hooks' import { ButtonState, useDownloadTrackButtons } from '@audius/common/hooks' import { Name } from '@audius/common/models' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx b/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx index de54aa29630..a59a611a497 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx @@ -1,6 +1,6 @@ +import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common' import type { ID, Track, User } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' import type { StyleProp, ViewStyle } from 'react-native' diff --git a/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx b/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx index 738b3c3fe8b..61d89dabfb5 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx @@ -1,6 +1,6 @@ +import { trendingPageSelectors, modalsActions } from '@audius/common/store' import { useCallback } from 'react' -import { trendingPageSelectors, modalsActions } from '@audius/common' import { Genre } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx b/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx index 629e4692ffb..9112310e2bf 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx @@ -1,10 +1,10 @@ -import { useCallback, useMemo, useState } from 'react' - import { trendingPageLineupActions, - trendingPageSelectors, - trendingPageActions -} from '@audius/common' + trendingPageActions, + trendingPageSelectors +} from '@audius/common/store' +import { useCallback, useMemo, useState } from 'react' + import { Genre, ELECTRONIC_PREFIX, diff --git a/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx b/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx index 72c7cab3247..8a2fa627fbd 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx @@ -1,11 +1,11 @@ -import { useCallback, useEffect } from 'react' - import { lineupSelectors, trendingPageLineupActions, trendingPageActions, trendingPageSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback, useEffect } from 'react' + import { Name, TimeRange } from '@audius/common/models' import { useNavigation } from '@react-navigation/native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx b/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx index 5062c497e14..9d8d957802e 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx @@ -1,4 +1,5 @@ -import { trendingPageSelectors } from '@audius/common' +import { trendingPageSelectors } from '@audius/common/store' + import { TimeRange } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx b/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx index d44078a6e62..23e9a22c687 100644 --- a/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx +++ b/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx @@ -1,6 +1,7 @@ -import { useMemo } from 'react' +import { UploadTrack } from '@audius/common/store' + import { useMemo } from 'react' -import type { UploadTrack } from '@audius/common' +import type { } from '@audius/common' import { View } from 'react-native' import IconImage from 'app/assets/images/iconImage.svg' diff --git a/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx index 437641039e1..79b0f547233 100644 --- a/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx @@ -1,6 +1,7 @@ -import { useCallback } from 'react' +import { UploadTrack , ExtendedTrackMetadata } from '@audius/common/store' + import { useCallback } from 'react' -import type { ExtendedTrackMetadata, UploadTrack } from '@audius/common' +import type { } from '@audius/common' import { useRoute } from '@react-navigation/native' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx index f300823a1c8..3143a5a58f4 100644 --- a/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx @@ -1,13 +1,15 @@ -import { useCallback, useState } from 'react' - -import type { CommonState } from '@audius/common' import { - uploadActions, - cacheTracksSelectors, accountSelectors, + cacheTracksSelectors, trackPageActions, - uploadSelectors -} from '@audius/common' + uploadActions, + uploadSelectors, + CommonState +} from '@audius/common/store' +import { useCallback, useState } from 'react' + +import type {} from '@audius/common' + import Clipboard from '@react-native-clipboard/clipboard' import { View, Image } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx index a8267d9d158..29bc0bd299f 100644 --- a/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx @@ -1,7 +1,13 @@ +import { + uploadActions, + uploadSelectors, + UploadType, + UploadTrack +} from '@audius/common/store' import { useEffect } from 'react' -import type { UploadTrack } from '@audius/common' -import { uploadSelectors, UploadType, uploadActions } from '@audius/common' +import type {} from '@audius/common' + import { useRoute } from '@react-navigation/native' import { useKeepAwake } from '@sayem314/react-native-keep-awake' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts index ab33543fde2..6752dcbc031 100644 --- a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts +++ b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts @@ -1,4 +1,5 @@ -import type { UploadTrack } from '@audius/common' +import { UploadTrack } from '@audius/common/store' + import type { } from '@audius/common' import { newTrackMetadata } from '@audius/common/schemas' import { ALLOWED_MAX_AUDIO_SIZE_BYTES, diff --git a/packages/mobile/src/screens/user-list-screen/FavoritedScreen.tsx b/packages/mobile/src/screens/user-list-screen/FavoritedScreen.tsx index d66ea38a510..7f23beaf808 100644 --- a/packages/mobile/src/screens/user-list-screen/FavoritedScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/FavoritedScreen.tsx @@ -1,9 +1,9 @@ -import { useCallback } from 'react' - import { favoritesUserListActions, favoritesUserListSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useDispatch } from 'react-redux' import IconHeart from 'app/assets/images/iconHeart.svg' diff --git a/packages/mobile/src/screens/user-list-screen/FollowersScreen.tsx b/packages/mobile/src/screens/user-list-screen/FollowersScreen.tsx index 9d174dc219a..da48e6a1e24 100644 --- a/packages/mobile/src/screens/user-list-screen/FollowersScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/FollowersScreen.tsx @@ -1,9 +1,9 @@ +import { + followersUserListActions, + followersUserListSelectors +} from '@audius/common/store' import { useCallback } from 'react' -import { - followersUserListSelectors, - followersUserListActions -} from '@audius/common' import { useDispatch } from 'react-redux' import IconUserFollowers from 'app/assets/images/iconUserFollowers.svg' diff --git a/packages/mobile/src/screens/user-list-screen/FollowingScreen.tsx b/packages/mobile/src/screens/user-list-screen/FollowingScreen.tsx index 38ecb935cce..0fdee05ef83 100644 --- a/packages/mobile/src/screens/user-list-screen/FollowingScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/FollowingScreen.tsx @@ -1,9 +1,9 @@ -import { useCallback } from 'react' - import { followingUserListActions, followingUserListSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useDispatch } from 'react-redux' import IconUserList from 'app/assets/images/iconUserList.svg' diff --git a/packages/mobile/src/screens/user-list-screen/MutualsScreen.tsx b/packages/mobile/src/screens/user-list-screen/MutualsScreen.tsx index 0082fbdfe9b..2dd2c197214 100644 --- a/packages/mobile/src/screens/user-list-screen/MutualsScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/MutualsScreen.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { mutualsUserListActions, mutualsUserListSelectors, MUTUALS_USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useDispatch } from 'react-redux' import IconFollowing from 'app/assets/images/iconFollowing.svg' diff --git a/packages/mobile/src/screens/user-list-screen/NotificationUsersScreen.tsx b/packages/mobile/src/screens/user-list-screen/NotificationUsersScreen.tsx index 1dfb591fb8f..6804963a8cd 100644 --- a/packages/mobile/src/screens/user-list-screen/NotificationUsersScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/NotificationUsersScreen.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { NotificationType, notificationsUserListActions, notificationsUserListSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useDispatch } from 'react-redux' import { useRoute } from 'app/hooks/useRoute' diff --git a/packages/mobile/src/screens/user-list-screen/RelatedArtistsScreen.tsx b/packages/mobile/src/screens/user-list-screen/RelatedArtistsScreen.tsx index 51e9914d5c2..5151d78dbe7 100644 --- a/packages/mobile/src/screens/user-list-screen/RelatedArtistsScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/RelatedArtistsScreen.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { relatedArtistsUserListActions, relatedArtistsUserListSelectors, RELATED_ARTISTS_USER_LIST_TAG -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useDispatch } from 'react-redux' import IconUserGroup from 'app/assets/images/iconUserGroup.svg' diff --git a/packages/mobile/src/screens/user-list-screen/RepostsScreen.tsx b/packages/mobile/src/screens/user-list-screen/RepostsScreen.tsx index a4b106732f2..ea4d790141d 100644 --- a/packages/mobile/src/screens/user-list-screen/RepostsScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/RepostsScreen.tsx @@ -1,9 +1,9 @@ -import { useCallback } from 'react' - import { repostsUserListActions, repostsUserListSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useDispatch } from 'react-redux' import IconRepost from 'app/assets/images/iconRepost.svg' diff --git a/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx b/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx index 1a06d7056dd..d0b2e6d4aec 100644 --- a/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx +++ b/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx @@ -1,7 +1,8 @@ import { tippingSelectors, topSupportersUserListSelectors -} from '@audius/common' +} from '@audius/common/store' + import type { User } from '@audius/common/models' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx b/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx index 6938a7c69b7..2e844bba770 100644 --- a/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx +++ b/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx @@ -1,4 +1,8 @@ -import { tippingSelectors, supportingUserListSelectors } from '@audius/common' +import { + tippingSelectors, + supportingUserListSelectors +} from '@audius/common/store' + import type { User } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/user-list-screen/SupportingUsersScreen.tsx b/packages/mobile/src/screens/user-list-screen/SupportingUsersScreen.tsx index f9d8f34c71d..1888abc7a16 100644 --- a/packages/mobile/src/screens/user-list-screen/SupportingUsersScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/SupportingUsersScreen.tsx @@ -1,9 +1,9 @@ -import { useCallback } from 'react' - import { supportingUserListActions, supportingUserListSelectors -} from '@audius/common' +} from '@audius/common/store' +import { useCallback } from 'react' + import { useDispatch } from 'react-redux' import IconTip from 'app/assets/images/iconTip.svg' diff --git a/packages/mobile/src/screens/user-list-screen/TopSupportersScreen.tsx b/packages/mobile/src/screens/user-list-screen/TopSupportersScreen.tsx index ad93c9c98fa..e1319f1bbec 100644 --- a/packages/mobile/src/screens/user-list-screen/TopSupportersScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/TopSupportersScreen.tsx @@ -1,10 +1,10 @@ -import { useCallback } from 'react' - import { cacheUsersSelectors, - topSupportersUserListSelectors, - topSupportersUserListActions -} from '@audius/common' + topSupportersUserListActions, + topSupportersUserListSelectors +} from '@audius/common/store' +import { useCallback } from 'react' + import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/user-list-screen/UserList.tsx b/packages/mobile/src/screens/user-list-screen/UserList.tsx index 013e4c81a1b..191407a2b84 100644 --- a/packages/mobile/src/screens/user-list-screen/UserList.tsx +++ b/packages/mobile/src/screens/user-list-screen/UserList.tsx @@ -1,11 +1,14 @@ -import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' - -import type { UserListStoreState, CommonState } from '@audius/common' import { cacheUsersSelectors, userListActions, - userListSelectors -} from '@audius/common' + userListSelectors, + CommonState, + UserListStoreState +} from '@audius/common/store' +import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' + +import type {} from '@audius/common' + import type { ID, User } from '@audius/common/models' import { useFocusEffect, useIsFocused } from '@react-navigation/native' import { range } from 'lodash' diff --git a/packages/mobile/src/screens/user-list-screen/UserListItem.tsx b/packages/mobile/src/screens/user-list-screen/UserListItem.tsx index d28a116ec7c..b6c8083a20b 100644 --- a/packages/mobile/src/screens/user-list-screen/UserListItem.tsx +++ b/packages/mobile/src/screens/user-list-screen/UserListItem.tsx @@ -1,6 +1,6 @@ +import { accountSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { accountSelectors } from '@audius/common' import type { User } from '@audius/common/models' import { FollowSource } from '@audius/common/models' import { Pressable, View, Animated } from 'react-native' diff --git a/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx b/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx index f7e9b932df0..5a3aaec3dfa 100644 --- a/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx +++ b/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx @@ -1,6 +1,6 @@ +import { tokenDashboardPageSelectors } from '@audius/common/store' import { useCallback } from 'react' -import { tokenDashboardPageSelectors } from '@audius/common' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/wallet-connect/WalletConnectScreen.tsx b/packages/mobile/src/screens/wallet-connect/WalletConnectScreen.tsx index 628d0f07f75..423817adb0e 100644 --- a/packages/mobile/src/screens/wallet-connect/WalletConnectScreen.tsx +++ b/packages/mobile/src/screens/wallet-connect/WalletConnectScreen.tsx @@ -1,4 +1,5 @@ -import { tokenDashboardPageActions } from '@audius/common' +import { tokenDashboardPageActions } from '@audius/common/store' + import { View } from 'react-native' import { useDispatch } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/wallet-connect/components/ConfirmRemoveWalletDrawer.tsx b/packages/mobile/src/screens/wallet-connect/components/ConfirmRemoveWalletDrawer.tsx index 85cb44b9693..b4e6b0fa81f 100644 --- a/packages/mobile/src/screens/wallet-connect/components/ConfirmRemoveWalletDrawer.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/ConfirmRemoveWalletDrawer.tsx @@ -1,9 +1,9 @@ +import { + tokenDashboardPageSelectors, + tokenDashboardPageActions +} from '@audius/common/store' import { useCallback } from 'react' -import { - tokenDashboardPageActions, - tokenDashboardPageSelectors -} from '@audius/common' import { useDispatch, useSelector } from 'react-redux' import { ConfirmationDrawer } from 'app/components/drawers' diff --git a/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx b/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx index 23a19d118e7..4feaf248653 100644 --- a/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx @@ -1,6 +1,6 @@ +import { tokenDashboardPageActions } from '@audius/common/store' import { useCallback } from 'react' -import { tokenDashboardPageActions } from '@audius/common' import type { Chain, BNWei } from '@audius/common/models' import { formatWei } from '@audius/common/utils' import Clipboard from '@react-native-clipboard/clipboard' diff --git a/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx b/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx index 0615ba70af5..e18d14dff2a 100644 --- a/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx @@ -1,5 +1,9 @@ -import type { AssociatedWallet } from '@audius/common' -import { tokenDashboardPageSelectors } from '@audius/common' +import { + tokenDashboardPageSelectors, + AssociatedWallet +} from '@audius/common/store' +import type {} from '@audius/common' + import { Chain } from '@audius/common/models' import { FlatList, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx b/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx index 8bb654e52de..288cc8f49af 100644 --- a/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx @@ -1,6 +1,9 @@ +import { + accountSelectors, + tokenDashboardPageActions +} from '@audius/common/store' import { useCallback } from 'react' -import { accountSelectors, tokenDashboardPageActions } from '@audius/common' import { Theme } from '@audius/common/models' import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/wallet-connect/components/WalletConnectDrawer.tsx b/packages/mobile/src/screens/wallet-connect/components/WalletConnectDrawer.tsx index 72b3bbad378..91b636091a2 100644 --- a/packages/mobile/src/screens/wallet-connect/components/WalletConnectDrawer.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/WalletConnectDrawer.tsx @@ -1,6 +1,6 @@ +import { tokenDashboardPageSelectors } from '@audius/common/store' import { useEffect, useState } from 'react' -import { tokenDashboardPageSelectors } from '@audius/common' import type { RenderQrcodeModalProps, WalletService diff --git a/packages/mobile/src/screens/wallet-connect/useCanConnectNewWallet.ts b/packages/mobile/src/screens/wallet-connect/useCanConnectNewWallet.ts index 574661cf9dc..7f653483299 100644 --- a/packages/mobile/src/screens/wallet-connect/useCanConnectNewWallet.ts +++ b/packages/mobile/src/screens/wallet-connect/useCanConnectNewWallet.ts @@ -1,4 +1,5 @@ -import { tokenDashboardPageSelectors } from '@audius/common' +import { tokenDashboardPageSelectors } from '@audius/common/store' + import { useSelector } from 'react-redux' const { getConfirmingWalletStatus, getRemoveWallet } = diff --git a/packages/mobile/src/screens/wallet-connect/usePhantomConnect.ts b/packages/mobile/src/screens/wallet-connect/usePhantomConnect.ts index 438a1ac4d43..cb46a5d6cd3 100644 --- a/packages/mobile/src/screens/wallet-connect/usePhantomConnect.ts +++ b/packages/mobile/src/screens/wallet-connect/usePhantomConnect.ts @@ -1,6 +1,6 @@ +import { tokenDashboardPageActions } from '@audius/common/store' import { useEffect } from 'react' -import { tokenDashboardPageActions } from '@audius/common' import { useRoute } from '@react-navigation/native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/wallet-connect/useWalletConnect.ts b/packages/mobile/src/screens/wallet-connect/useWalletConnect.ts index 250a20eef98..ba80922bfe4 100644 --- a/packages/mobile/src/screens/wallet-connect/useWalletConnect.ts +++ b/packages/mobile/src/screens/wallet-connect/useWalletConnect.ts @@ -1,10 +1,10 @@ -import { useEffect } from 'react' - import { accountSelectors, - tokenDashboardPageActions, - tokenDashboardPageSelectors -} from '@audius/common' + tokenDashboardPageSelectors, + tokenDashboardPageActions +} from '@audius/common/store' +import { useEffect } from 'react' + import { useWalletConnect as useWalletConnectBase } from '@walletconnect/react-native-dapp' import { useDispatch, useSelector } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/wallet-connect/useWalletStatusToasts.ts b/packages/mobile/src/screens/wallet-connect/useWalletStatusToasts.ts index 278f0d4b51a..7c892af3201 100644 --- a/packages/mobile/src/screens/wallet-connect/useWalletStatusToasts.ts +++ b/packages/mobile/src/screens/wallet-connect/useWalletStatusToasts.ts @@ -1,9 +1,9 @@ +import { + tokenDashboardPageSelectors, + tokenDashboardPageActions +} from '@audius/common/store' import { useEffect } from 'react' -import { - tokenDashboardPageActions, - tokenDashboardPageSelectors -} from '@audius/common' import { useDispatch, useSelector } from 'react-redux' import { useToast } from 'app/hooks/useToast' diff --git a/packages/mobile/src/services/audio-player/NativeMobileAudio.ts b/packages/mobile/src/services/audio-player/NativeMobileAudio.ts index 61b6812a383..474f5979eb4 100644 --- a/packages/mobile/src/services/audio-player/NativeMobileAudio.ts +++ b/packages/mobile/src/services/audio-player/NativeMobileAudio.ts @@ -1,4 +1,5 @@ -import type { PlaybackRate } from '@audius/common' +import { PlaybackRate } from '@audius/common/store' + import type { } from '@audius/common' import type { Nullable } from '@audius/common/utils' import TrackPlayer from 'react-native-track-player' diff --git a/packages/mobile/src/services/eagerLoadUtils.ts b/packages/mobile/src/services/eagerLoadUtils.ts index b9d2c4c2798..4730a73f24f 100644 --- a/packages/mobile/src/services/eagerLoadUtils.ts +++ b/packages/mobile/src/services/eagerLoadUtils.ts @@ -4,8 +4,6 @@ import { getEagerDiscprov, makeEagerRequest } from '@audius/common/services' * protocol before libs has initialized. */ -import {} from '@audius/common' - import { env } from 'app/env' import { audiusLibs, waitForLibsInit } from './libs' diff --git a/packages/mobile/src/store/account/sagas.ts b/packages/mobile/src/store/account/sagas.ts index 9336a6a5f11..faa91635959 100644 --- a/packages/mobile/src/store/account/sagas.ts +++ b/packages/mobile/src/store/account/sagas.ts @@ -1,6 +1,6 @@ -import { accountActions, getContext, accountSagas } from '@audius/common' import type { User } from '@audius/common/models' import { SquareSizes, WidthSizes } from '@audius/common/models' +import { accountActions, accountSagas, getContext } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import webAccountSagas from 'common/store/account/sagas' import { updateProfileAsync } from 'common/store/profile/sagas' diff --git a/packages/mobile/src/store/cache/collections/createPlaylistRequestedSaga.ts b/packages/mobile/src/store/cache/collections/createPlaylistRequestedSaga.ts index 2f41c0989f0..3ec45f642e6 100644 --- a/packages/mobile/src/store/cache/collections/createPlaylistRequestedSaga.ts +++ b/packages/mobile/src/store/cache/collections/createPlaylistRequestedSaga.ts @@ -1,4 +1,4 @@ -import { cacheCollectionsActions, toastActions } from '@audius/common' +import { cacheCollectionsActions, toastActions } from '@audius/common/store' import { uuid } from '@audius/common/utils' import { put, takeEvery } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/chat/sagas.ts b/packages/mobile/src/store/chat/sagas.ts index b59744d80e1..dc6e5208112 100644 --- a/packages/mobile/src/store/chat/sagas.ts +++ b/packages/mobile/src/store/chat/sagas.ts @@ -1,4 +1,4 @@ -import { chatActions } from '@audius/common' +import { chatActions } from '@audius/common/store' import { StackActions } from '@react-navigation/native' import { takeLatest } from 'redux-saga/effects' diff --git a/packages/mobile/src/store/notifications/sagas.ts b/packages/mobile/src/store/notifications/sagas.ts index 3139dce1b07..804b10a9f73 100644 --- a/packages/mobile/src/store/notifications/sagas.ts +++ b/packages/mobile/src/store/notifications/sagas.ts @@ -1,8 +1,8 @@ import { accountSelectors, - getContext, - notificationsActions -} from '@audius/common' + notificationsActions, + getContext +} from '@audius/common/store' import commonNotificationsSagas, { getPollingIntervalMs } from 'audius-client/src/common/store/notifications/sagas' diff --git a/packages/mobile/src/store/oauth/actions.ts b/packages/mobile/src/store/oauth/actions.ts index be950fe4c65..55705b37a18 100644 --- a/packages/mobile/src/store/oauth/actions.ts +++ b/packages/mobile/src/store/oauth/actions.ts @@ -1,9 +1,10 @@ -import type { - InstagramAccountPayload, - TwitterProfile, - TikTokProfile, - Image -} from '@audius/common' +import { InstagramAccountPayload, TwitterProfile, TikTokProfile, Image + } from '@audius/common/store' + import type { + + + + } from '@audius/common' import type { Provider } from './reducer' import type { Credentials } from './types' diff --git a/packages/mobile/src/store/oauth/reducer.ts b/packages/mobile/src/store/oauth/reducer.ts index e103b327dd3..0c0e2e7d3c2 100644 --- a/packages/mobile/src/store/oauth/reducer.ts +++ b/packages/mobile/src/store/oauth/reducer.ts @@ -1,4 +1,5 @@ -import type { Image, TikTokProfile } from '@audius/common' +import { TikTokProfile , Image } from '@audius/common/store' + import type { } from '@audius/common' import type { OAuthActions } from './actions' import { diff --git a/packages/mobile/src/store/oauth/sagas.ts b/packages/mobile/src/store/oauth/sagas.ts index 6d9127eea9c..d6fd9a1384f 100644 --- a/packages/mobile/src/store/oauth/sagas.ts +++ b/packages/mobile/src/store/oauth/sagas.ts @@ -1,9 +1,9 @@ -import { getContext } from '@audius/common' import type { RemoteConfigInstance } from '@audius/common/services' import { formatTwitterProfile, formatInstagramProfile } from '@audius/common/services' +import { getContext } from '@audius/common/store' import * as Sentry from '@sentry/react-native' import { takeEvery, put, takeLatest, call } from 'redux-saga/effects' diff --git a/packages/mobile/src/store/offline-downloads/sagas/getIsOfflineEnabled.ts b/packages/mobile/src/store/offline-downloads/sagas/getIsOfflineEnabled.ts index fd932bfbc4d..0636f01e087 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/getIsOfflineEnabled.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/getIsOfflineEnabled.ts @@ -1,5 +1,5 @@ -import { getContext } from '@audius/common' import { FeatureFlags } from '@audius/common/services' +import { getContext } from '@audius/common/store' import { call } from 'typed-redux-saga' import { OFFLINE_OVERRIDE_STORAGE_KEY } from 'app/constants/storage-keys' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/watchNetworkType.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/watchNetworkType.ts index 59d868bd0ce..43fcb115bc5 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/watchNetworkType.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/watchNetworkType.ts @@ -1,4 +1,7 @@ -import { reachabilityActions, reachabilitySelectors } from '@audius/common' +import { + reachabilityActions, + reachabilitySelectors +} from '@audius/common/store' import { NetInfoStateType } from '@react-native-community/netinfo' import { put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/watchReachability.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/watchReachability.ts index 6121aa8093f..d1d5d949ace 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/watchReachability.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/watchReachability.ts @@ -1,4 +1,4 @@ -import { reachabilityActions } from '@audius/common' +import { reachabilityActions } from '@audius/common/store' import { takeEvery, put, select } from 'typed-redux-saga' import { getOfflineQueue, getQueueStatus } from '../../selectors' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts index 2bb99bec890..f90af20ed30 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts @@ -1,9 +1,9 @@ -import { accountSelectors, getContext } from '@audius/common' import type { CollectionMetadata, UserCollectionMetadata } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' +import { accountSelectors, getContext } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import RNFetchBlob from 'rn-fetch-blob' import { select, call, put, take, race, all } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts index 292d96db157..0d46f7d8fd8 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts @@ -1,8 +1,3 @@ -import { - accountSelectors, - getContext, - gatedContentSelectors -} from '@audius/common' import type { ID, TrackMetadata, @@ -11,6 +6,11 @@ import type { } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' import type { QueryParams } from '@audius/common/services' +import { + accountSelectors, + getContext, + gatedContentSelectors +} from '@audius/common/store' import { encodeHashId, removeNullable, diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/playCounterWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/playCounterWorker.ts index 156255895e6..e72f670a092 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/playCounterWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/playCounterWorker.ts @@ -1,5 +1,5 @@ -import { tracksSocialActions } from '@audius/common' import type { ID } from '@audius/common/models' +import { tracksSocialActions } from '@audius/common/store' import { put } from 'typed-redux-saga' import { make, track } from 'app/services/analytics' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts index 49b51c43339..3140f6c51d6 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts @@ -1,9 +1,9 @@ +import type { ID } from '@audius/common/models' import { - getContext, accountSelectors, - cacheTracksSelectors -} from '@audius/common' -import type { ID } from '@audius/common/models' + cacheTracksSelectors, + getContext +} from '@audius/common/store' import moment from 'moment' import { put, select, call, take, race } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/syncCollectionWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/syncCollectionWorker.ts index 8a173278419..9e0bae11f07 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/syncCollectionWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/syncCollectionWorker.ts @@ -1,9 +1,9 @@ +import type { ID, DownloadReason } from '@audius/common/models' import { - cacheCollectionsSelectors, accountSelectors, + cacheCollectionsSelectors, getContext -} from '@audius/common' -import type { ID, DownloadReason } from '@audius/common/models' +} from '@audius/common/store' import { difference } from 'lodash' import moment from 'moment' import { call, put, race, select, take } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts index 61a7bfb5076..9669aaad972 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/rehydrateOfflineDataSaga.ts @@ -1,4 +1,3 @@ -import { cacheActions } from '@audius/common' import type { CollectionMetadata, ID, @@ -7,6 +6,7 @@ import type { UserMetadata } from '@audius/common/models' import { Kind } from '@audius/common/models' +import { cacheActions } from '@audius/common/store' import { makeUid } from '@audius/common/utils' import { call, select, put } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadAllFavoritesSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadAllFavoritesSaga.ts index d4e43405e22..aff931146e2 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadAllFavoritesSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadAllFavoritesSaga.ts @@ -1,8 +1,8 @@ import { accountSelectors, - getContext, - savedPageSelectors -} from '@audius/common' + savedPageSelectors, + getContext +} from '@audius/common/store' import { fetchAllAccountCollections } from 'common/store/saved-collections/sagas' import moment from 'moment' import { takeEvery, select, call, put } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts index cbe17c64ae4..95db8ba9270 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts @@ -1,9 +1,9 @@ +import { FavoriteSource } from '@audius/common/models' import { accountSelectors, collectionsSocialActions, getContext -} from '@audius/common' -import { FavoriteSource } from '@audius/common/models' +} from '@audius/common/store' import { takeEvery, select, put, call } from 'typed-redux-saga' import { make, track } from 'app/services/analytics' diff --git a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadFavoritedCollectionSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadFavoritedCollectionSaga.ts index 7d994359093..932f123aaca 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadFavoritedCollectionSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadFavoritedCollectionSaga.ts @@ -1,4 +1,4 @@ -import { accountSelectors, getContext } from '@audius/common' +import { accountSelectors, getContext } from '@audius/common/store' import { takeEvery, select, put, call } from 'typed-redux-saga' import type { CollectionAction, OfflineEntry } from '../slice' diff --git a/packages/mobile/src/store/offline-downloads/sagas/syncOfflineDataSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/syncOfflineDataSaga.ts index 9247f9281c4..f88cf60655c 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/syncOfflineDataSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/syncOfflineDataSaga.ts @@ -1,4 +1,5 @@ -import type { CommonState } from '@audius/common' +import { CommonState } from '@audius/common/store' + import type { } from '@audius/common' import { waitForBackendSetup } from 'audius-client/src/common/store/backend/sagas' import { waitForRead } from 'audius-client/src/utils/sagaHelpers' import { difference, intersection } from 'lodash' diff --git a/packages/mobile/src/store/offline-downloads/sagas/utils/shouldCancelJob.ts b/packages/mobile/src/store/offline-downloads/sagas/utils/shouldCancelJob.ts index a1ef70511f3..5140f1ba888 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/utils/shouldCancelJob.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/utils/shouldCancelJob.ts @@ -1,4 +1,7 @@ -import { reachabilityActions, reachabilitySelectors } from '@audius/common' +import { + reachabilityActions, + reachabilitySelectors +} from '@audius/common/store' import { NetInfoStateType } from '@react-native-community/netinfo' import { select, take } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/watchAddTrackToPlaylistSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/watchAddTrackToPlaylistSaga.ts index 7d09d0509a4..6175334ec9d 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/watchAddTrackToPlaylistSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/watchAddTrackToPlaylistSaga.ts @@ -1,4 +1,4 @@ -import { cacheCollectionsActions } from '@audius/common' +import { cacheCollectionsActions } from '@audius/common/store' import { put, select, takeEvery } from 'typed-redux-saga' import { getCollectionDownloadStatus } from 'app/components/offline-downloads/CollectionDownloadStatusIndicator' diff --git a/packages/mobile/src/store/offline-downloads/sagas/watchSaveCollectionSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/watchSaveCollectionSaga.ts index 431471aa9a6..a877e7b21ee 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/watchSaveCollectionSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/watchSaveCollectionSaga.ts @@ -1,5 +1,5 @@ -import { collectionsSocialActions } from '@audius/common' import { FavoriteSource } from '@audius/common/models' +import { collectionsSocialActions } from '@audius/common/store' import { takeEvery, select, put } from 'typed-redux-saga' import { make, track } from 'app/services/analytics' diff --git a/packages/mobile/src/store/offline-downloads/sagas/watchSaveTrackSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/watchSaveTrackSaga.ts index 592066748bc..2794deb341e 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/watchSaveTrackSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/watchSaveTrackSaga.ts @@ -1,4 +1,4 @@ -import { tracksSocialActions } from '@audius/common' +import { tracksSocialActions } from '@audius/common/store' import moment from 'moment' import { put, takeEvery, select } from 'typed-redux-saga' diff --git a/packages/mobile/src/store/offline-downloads/sagas/watchUnsaveCollectionSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/watchUnsaveCollectionSaga.ts index 6e31aaa3011..10848e6936a 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/watchUnsaveCollectionSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/watchUnsaveCollectionSaga.ts @@ -1,4 +1,4 @@ -import { collectionsSocialActions } from '@audius/common' +import { collectionsSocialActions } from '@audius/common/store' import { put, select, takeEvery } from 'typed-redux-saga' import { diff --git a/packages/mobile/src/store/offline-downloads/sagas/watchUnsaveTrackSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/watchUnsaveTrackSaga.ts index 0d4bd78699f..e2a90f74933 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/watchUnsaveTrackSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/watchUnsaveTrackSaga.ts @@ -1,4 +1,4 @@ -import { tracksSocialActions } from '@audius/common' +import { tracksSocialActions } from '@audius/common/store' import { put, takeEvery } from 'typed-redux-saga' import { DOWNLOAD_REASON_FAVORITES } from 'app/store/offline-downloads/constants' diff --git a/packages/mobile/src/store/offline-downloads/selectors.ts b/packages/mobile/src/store/offline-downloads/selectors.ts index 8217b05ce8c..7096a69fd08 100644 --- a/packages/mobile/src/store/offline-downloads/selectors.ts +++ b/packages/mobile/src/store/offline-downloads/selectors.ts @@ -1,5 +1,5 @@ -import { cacheTracksSelectors } from '@audius/common' import type { ID, TrackMetadata } from '@audius/common/models' +import { cacheTracksSelectors } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import type { AppState } from 'app/store' diff --git a/packages/mobile/src/store/sagas.ts b/packages/mobile/src/store/sagas.ts index f0115871417..e6ccb78a81b 100644 --- a/packages/mobile/src/store/sagas.ts +++ b/packages/mobile/src/store/sagas.ts @@ -1,29 +1,29 @@ import { + buyCryptoSagas, + buyUSDCSagas, castSagas, chatSagas, - playerSagas as commonPlayerSagas, - playbackPositionSagas, - gatedContentSagas, + reachabilitySagas, remoteConfigSagas, + solanaSagas, + relatedArtistsSagas, deletePlaylistConfirmationModalUISagas as deletePlaylistConfirmationModalSagas, duplicateAddConfirmationModalUISagas as duplicateAddConfirmationModalSagas, - publishPlaylistConfirmationModalUISagas as publishPlaylistConfirmationModalSagas, - publishTrackConfirmationModalUISagas as publishTrackConfirmationModalSagas, mobileOverflowMenuUISagas as overflowMenuSagas, + publishPlaylistConfirmationModalUISagas as publishPlaylistConfirmationModalSagas, shareModalUISagas as shareModalSagas, + stripeModalUISagas, vipDiscordModalSagas, - reachabilitySagas, - relatedArtistsSagas, - searchUsersModalSagas, - solanaSagas, toastSagas, - confirmerSagas, + publishTrackConfirmationModalUISagas as publishTrackConfirmationModalSagas, + searchUsersModalSagas, + modalsSagas, + playerSagas as commonPlayerSagas, + playbackPositionSagas, + gatedContentSagas, purchaseContentSagas, - buyUSDCSagas, - buyCryptoSagas, - stripeModalUISagas, - modalsSagas -} from '@audius/common' + confirmerSagas +} from '@audius/common/store' import addToCollectionSagas from 'common/store/add-to-collection/sagas' import analyticsSagas from 'common/store/analytics/sagas' import backendSagas from 'common/store/backend/sagas' diff --git a/packages/mobile/src/store/settings/sagas.ts b/packages/mobile/src/store/settings/sagas.ts index e652805c1d7..64055f7d03a 100644 --- a/packages/mobile/src/store/settings/sagas.ts +++ b/packages/mobile/src/store/settings/sagas.ts @@ -1,13 +1,10 @@ -import type { PushNotifications as TPushNotifications } from '@audius/common' +import { accountSelectors, settingsPageSelectors, settingsPageInitialState as initialState, settingsPageActions +, PushNotificationSetting, getContext, PushNotifications as TPushNotifications } from '@audius/common' import { - accountSelectors, - settingsPageInitialState as initialState, - settingsPageSelectors, - PushNotificationSetting, - settingsPageActions as actions, - getContext, - settingsPageActions -} from '@audius/common' + accountSelectors } from '@audius/common/store' + import type { + + } from '@audius/common' import { getErrorMessage, waitForValue, diff --git a/packages/mobile/src/store/sign-out/sagas.ts b/packages/mobile/src/store/sign-out/sagas.ts index 9bfa08cb332..96ccb98add2 100644 --- a/packages/mobile/src/store/sign-out/sagas.ts +++ b/packages/mobile/src/store/sign-out/sagas.ts @@ -1,11 +1,11 @@ +import { Name, Theme } from '@audius/common/models' import { - signOutActions, accountActions, + tokenDashboardPageActions, feedPageLineupActions, - themeActions, - tokenDashboardPageActions -} from '@audius/common' -import { Name, Theme } from '@audius/common/models' + signOutActions, + themeActions +} from '@audius/common/store' import { waitForValue } from '@audius/common/utils' import { setupBackend } from 'audius-client/src/common/store/backend/actions' import { getIsSettingUp } from 'audius-client/src/common/store/backend/selectors' diff --git a/packages/mobile/src/store/store.ts b/packages/mobile/src/store/store.ts index 300cb58fc73..83c50e7703c 100644 --- a/packages/mobile/src/store/store.ts +++ b/packages/mobile/src/store/store.ts @@ -1,10 +1,12 @@ -import type { CommonState, RemoteConfigState } from '@audius/common' +import type { CommonState, RemoteConfigState } from '@audius/common/store' import { - toastActions, + chatMiddleware, remoteConfigReducer as remoteConfig, - reducers as commonReducers, - chatMiddleware -} from '@audius/common' + toastActions, + reducers as commonReducers +} from '@audius/common/store' +import type {} from '@audius/common' + import { ErrorLevel } from '@audius/common/models' import AsyncStorage from '@react-native-async-storage/async-storage' import backend from 'audius-client/src/common/store/backend/reducer' diff --git a/packages/mobile/src/store/storeContext.ts b/packages/mobile/src/store/storeContext.ts index 975bb0462eb..77985566e23 100644 --- a/packages/mobile/src/store/storeContext.ts +++ b/packages/mobile/src/store/storeContext.ts @@ -1,6 +1,6 @@ -import type { CommonStoreContext } from '@audius/common' +import type { CommonStoreContext } from '@audius/common/store' +import type {} from '@audius/common' import { OpenSeaClient, SolanaClient } from '@audius/common/services' -import {} from '@audius/common' import AsyncStorage from '@react-native-async-storage/async-storage' import * as Sentry from '@sentry/react-native' diff --git a/packages/mobile/src/store/theme/sagas.ts b/packages/mobile/src/store/theme/sagas.ts index 35ff6f85dea..6b69c963964 100644 --- a/packages/mobile/src/store/theme/sagas.ts +++ b/packages/mobile/src/store/theme/sagas.ts @@ -1,5 +1,7 @@ -import type { SetThemeAction } from '@audius/common' -import { themeActions } from '@audius/common' +import type { SetThemeAction } from '@audius/common/store' +import { themeActions } from '@audius/common/store' +import type {} from '@audius/common' + import { takeEvery, call } from 'typed-redux-saga' import { THEME_STORAGE_KEY } from 'app/constants/storage-keys' diff --git a/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts b/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts index 629433fa724..213670be787 100644 --- a/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts +++ b/packages/mobile/src/store/wallet-connect/sagas/connectNewWalletSaga.ts @@ -1,10 +1,10 @@ -import { - accountSelectors, - getContext, - tokenDashboardPageActions -} from '@audius/common' import type { WalletAddress } from '@audius/common/models' import { Name, Chain } from '@audius/common/models' +import { + accountSelectors, + tokenDashboardPageActions, + getContext +} from '@audius/common/store' import { getErrorMessage } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import bs58 from 'bs58' diff --git a/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts b/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts index 032cabd502a..a3f8105c87c 100644 --- a/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts +++ b/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts @@ -1,5 +1,7 @@ -import type { CommonState } from '@audius/common' -import { tokenDashboardPageSelectors, getContext } from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { tokenDashboardPageSelectors, getContext } from '@audius/common/store' +import type {} from '@audius/common' + import { Name } from '@audius/common/models' import { getErrorMessage, waitForValue } from '@audius/common/utils' import bs58 from 'bs58' diff --git a/packages/mobile/src/utils/launchSelectImageActionSheet.ts b/packages/mobile/src/utils/launchSelectImageActionSheet.ts index 1ecbcee155f..de1bbcd013c 100644 --- a/packages/mobile/src/utils/launchSelectImageActionSheet.ts +++ b/packages/mobile/src/utils/launchSelectImageActionSheet.ts @@ -1,4 +1,5 @@ -import type { Image } from '@audius/common' +import { Image } from '@audius/common/store' + import type { } from '@audius/common' import { ActionSheetIOS, Alert, Platform } from 'react-native' import type { Image as CropPickerImage, diff --git a/packages/mobile/src/utils/reachability.ts b/packages/mobile/src/utils/reachability.ts index ea069845b7c..6740c012a6f 100644 --- a/packages/mobile/src/utils/reachability.ts +++ b/packages/mobile/src/utils/reachability.ts @@ -1,4 +1,5 @@ -import { reachabilityActions } from '@audius/common' +import { reachabilityActions } from '@audius/common/store' + import type { NetInfoState } from '@react-native-community/netinfo' import NetInfo from '@react-native-community/netinfo' import { debounce } from 'lodash' diff --git a/packages/mobile/src/utils/theme.ts b/packages/mobile/src/utils/theme.ts index 6c70bc99201..dbefdd830a9 100644 --- a/packages/mobile/src/utils/theme.ts +++ b/packages/mobile/src/utils/theme.ts @@ -1,5 +1,6 @@ -import type { CommonState } from '@audius/common' -import { themeSelectors } from '@audius/common' +import { themeSelectors, CommonState } from '@audius/common/store' +import type {} from '@audius/common' + import { useSelector } from 'react-redux' const { getTheme, getSystemAppearance } = themeSelectors From c42a49ae9bcf41a4b2b4675013afccf2ce71bc30 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 17:59:13 -0800 Subject: [PATCH 51/64] Migrate mobile store types --- packages/mobile/src/app/Drawers.tsx | 5 ++- packages/mobile/src/app/ThemeProvider.tsx | 2 +- packages/mobile/src/app/TrpcProvider.tsx | 2 +- .../components/action-drawer/ActionDrawer.tsx | 5 ++- .../add-funds-drawer/AddFundsDrawer.tsx | 8 ++--- .../AddToCollectionDrawer.tsx | 8 ++--- .../audio-balance-pill/AUDIOBalancePill.tsx | 3 +- .../AudioBreakdownDrawer.tsx | 10 +++--- .../audio-rewards/RewardsBanner.tsx | 2 +- .../audio-rewards/TiersExplainerDrawer.tsx | 9 ++---- .../mobile/src/components/audio/Airplay.tsx | 2 +- .../src/components/audio/AudioPlayer.tsx | 21 ++++++------ .../src/components/audio/GoogleCast.tsx | 6 ++-- .../src/components/audio/RepeatListener.tsx | 1 - .../audio/useSavePodcastProgress.ts | 4 +-- .../BlockMessagesDrawer.tsx | 4 +-- .../NotificationsButton.tsx | 1 - .../src/components/card/CollectionDogEar.tsx | 3 +- .../AudioMatchingChallengeDrawerContent.tsx | 2 +- .../ChallengeRewardsDrawerContent.tsx | 2 +- .../ChallengeRewardsDrawerProvider.tsx | 9 +++--- .../ProfileCompletionChecks.tsx | 2 +- .../ReferralRewardContents.tsx | 2 +- .../chat-actions-drawer/ChatActionsDrawer.tsx | 2 +- .../CoinflowOnrampDrawer.tsx | 6 ++-- .../CollectibleDetailsDrawer.tsx | 4 +-- .../collection-list/CollectionCard.tsx | 13 +++----- .../mobile/src/components/core/Hyperlink.tsx | 2 +- .../src/components/core/PlayBarChin.tsx | 1 - .../src/components/core/ProfilePicture.tsx | 3 +- .../components/core/Screen/ScreenContent.tsx | 2 +- .../src/components/core/UserDisplayName.tsx | 3 +- .../CreateChatActionsDrawer.tsx | 2 +- .../DeactivateAccountConfirmationDrawer.tsx | 6 ++-- .../delete-chat-drawer/DeleteChatDrawer.tsx | 2 +- .../details-tile/DetailsProgressInfo.tsx | 3 +- .../components/details-tile/DetailsTile.tsx | 7 ++-- .../details-tile/DetailsTileActionButtons.tsx | 4 +-- .../details-tile/DetailsTileAiAttribution.tsx | 2 +- .../details-tile/DetailsTileNoAccess.tsx | 12 +++---- .../src/components/drawer/AppDrawer.tsx | 4 +-- .../components/drawers/ConfirmationDrawer.tsx | 5 ++- .../drawers/DeleteTrackConfirmationDrawer.tsx | 2 +- .../drawers/ReleaseNowConfirmationDrawer.tsx | 2 +- .../RemoveDownloadedCollectionDrawer.tsx | 2 +- .../UnfavoriteDownloadedCollectionDrawer.tsx | 5 ++- .../DuplicateAddConfirmationDrawer.tsx | 4 +-- .../EnablePushNotificationsDrawer.tsx | 4 +-- .../feed-filter-drawer/FeedFilterDrawer.tsx | 6 ++-- .../src/components/hcaptcha/HCaptcha.tsx | 4 +-- .../src/components/image/CollectionImage.tsx | 3 +- .../src/components/image/CoverPhoto.tsx | 3 +- .../src/components/image/TrackImage.tsx | 3 +- .../mobile/src/components/image/UserImage.tsx | 3 +- .../InboxUnavailableDrawer.tsx | 6 ++-- .../LeavingAudiusDrawer.tsx | 2 +- .../components/lineup-tile/CollectionTile.tsx | 8 ++--- .../lineup-tile/CollectionTileTrackList.tsx | 4 +-- .../src/components/lineup-tile/LineupTile.tsx | 2 +- .../lineup-tile/LineupTileAccessStatus.tsx | 8 ++--- .../lineup-tile/LineupTileMetadata.tsx | 2 +- .../lineup-tile/LineupTileStats.tsx | 7 ++-- .../lineup-tile/LineupTileTopRight.tsx | 3 +- .../src/components/lineup-tile/TrackTile.tsx | 7 ++-- .../src/components/lineup-tile/types.ts | 6 ++-- .../mobile/src/components/lineup/types.ts | 6 ++-- .../now-playing-drawer/ActionsBar.tsx | 22 ++++++------- .../components/now-playing-drawer/Artwork.tsx | 8 ++--- .../now-playing-drawer/AudioControls.tsx | 6 ++-- .../now-playing-drawer/NowPlayingDrawer.tsx | 12 +++---- .../components/now-playing-drawer/PlayBar.tsx | 10 +++--- .../now-playing-drawer/PlayButton.tsx | 2 +- .../now-playing-drawer/PlaybackRateButton.tsx | 4 +-- .../now-playing-drawer/TrackInfo.tsx | 3 +- .../now-playing-drawer/TrackingBar.tsx | 2 +- .../useCurrentTrackDuration.ts | 1 - .../CollectionDownloadStatusIndicator.tsx | 3 +- .../DownloadStatusIndicator.tsx | 1 - .../offline-placeholder/OnlineOnly.tsx | 2 +- .../CollectionOverflowMenuDrawer.tsx | 7 ++-- .../OverflowMenuDrawer.tsx | 1 - .../ProfileOverflowMenuDrawer.tsx | 6 ++-- .../TrackOverflowMenuDrawer.tsx | 8 ++--- .../payment-method/CardSelectionButton.tsx | 2 +- .../PlaybackRateDrawer.tsx | 5 ++- .../PremiumTrackPurchaseDrawer.tsx | 5 ++- .../hooks/usePurchaseContentFormState.ts | 3 +- .../hooks/usePurchaseSummaryValues.ts | 3 +- .../ProfileActionsDrawer.tsx | 6 ++-- .../PublishPlaylistDrawer.tsx | 4 +-- .../src/components/scrubber/Scrubber.tsx | 2 +- .../mobile/src/components/scrubber/Slider.tsx | 2 +- .../src/components/scrubber/usePosition.ts | 2 +- .../components/share-drawer/ShareDrawer.tsx | 8 ++--- .../src/components/share-drawer/messages.ts | 3 +- .../share-drawer/useShareToStory.tsx | 5 ++- .../src/components/share-drawer/utils.ts | 3 +- .../ShareToTikTokDrawer.tsx | 4 +-- .../SignOutConfirmationDrawer.tsx | 2 +- .../StripeOnrampDrawer.tsx | 4 +-- .../StripeOnrampEmbed.tsx | 9 +++--- .../SuggestedArtistsList.tsx | 6 ++-- .../components/SuggestedTracks.tsx | 2 +- .../mobile/src/components/toasts/Toast.tsx | 7 ++-- .../mobile/src/components/toasts/Toasts.tsx | 1 - .../track-details-tile/TrackDetailsTile.tsx | 2 +- .../components/track-list/TrackListItem.tsx | 12 +++---- .../mobile/src/components/track-list/types.ts | 3 +- .../TrendingRewardsDrawer.tsx | 13 +++----- .../twitter-button/TwitterButton.tsx | 2 +- .../src/components/user/FollowButton.tsx | 2 +- .../src/components/user/FollowsYouChip.tsx | 3 +- .../vip-discord-drawer/VipDiscordDrawer.tsx | 1 - .../components/TextLink/ExternalLink.tsx | 2 +- .../foundations/color/Color.stories.tsx | 3 +- packages/mobile/src/hooks/useManualToast.ts | 2 -- .../src/hooks/useNotificationNavigation.ts | 2 -- packages/mobile/src/hooks/useToast.ts | 2 -- .../AiGeneratedTracksScreen.tsx | 4 +-- .../left-nav-drawer/AccountDetails.tsx | 2 +- .../left-nav-drawer/LeftNavDrawer.tsx | 3 +- .../left-nav-drawer/VanityMetrics.tsx | 8 ++--- .../app-screen/AccountPictureHeader.tsx | 3 +- .../src/screens/app-screen/AppTabScreen.tsx | 14 ++++---- .../src/screens/app-screen/AppTabsScreen.tsx | 2 +- .../src/screens/audio-screen/AudioScreen.tsx | 7 ++-- .../screens/audio-screen/ChallengeRewards.tsx | 11 ++++--- .../screens/audio-screen/TrendingRewards.tsx | 9 ++---- .../ChangePasswordScreen.tsx | 6 ++-- .../ConfirmCredentials.tsx | 6 ++-- .../src/screens/chat-screen/ChatListItem.tsx | 2 +- .../screens/chat-screen/ChatListScreen.tsx | 2 +- .../chat-screen/ChatMessageListItem.tsx | 8 ++--- .../chat-screen/ChatMessagePlaylist.tsx | 7 ++-- .../screens/chat-screen/ChatMessageTrack.tsx | 10 ++---- .../src/screens/chat-screen/ChatScreen.tsx | 10 +++--- .../src/screens/chat-screen/ChatTextInput.tsx | 2 +- .../screens/chat-screen/ChatUnavailable.tsx | 2 +- .../screens/chat-screen/ChatUserListItem.tsx | 4 +-- .../chat-screen/ChatUserListScreen.tsx | 7 ++-- .../src/screens/chat-screen/LinkPreview.tsx | 2 +- .../src/screens/chat-screen/ReactionPopup.tsx | 8 ++--- .../chat-screen/ResendMessageButton.tsx | 2 +- .../collection-screen/CollectionHeader.tsx | 10 +++--- .../collection-screen/CollectionScreen.tsx | 28 ++++++++-------- .../CollectionScreenDetailsTile.tsx | 8 ++--- .../useFetchCollectionLineup.ts | 8 ++--- .../edit-playlist-screen/EditPlaylistForm.tsx | 8 ++--- .../EditPlaylistModalScreen.tsx | 9 +++--- .../EditPlaylistNavigator.tsx | 4 +-- .../src/screens/edit-playlist-screen/types.ts | 3 +- .../edit-profile-screen/EditProfileScreen.tsx | 2 +- .../edit-track-screen/EditTrackForm.tsx | 4 +-- .../EditTrackModalScreen.tsx | 8 ++--- .../edit-track-screen/EditTrackScreen.tsx | 6 ++-- .../CollectibleGatedAvailability.tsx | 2 +- .../components/SpecialAccessAvailability.tsx | 2 +- .../fields/RemixSettingsField.tsx | 1 - .../screens/NFTCollectionsScreen.tsx | 2 +- .../screens/ReleaseDateScreen.tsx | 2 +- .../screens/RemixSettingsScreen.tsx | 8 ++--- .../src/screens/edit-track-screen/types.ts | 4 +-- .../screens/explore-screen/ExploreScreen.tsx | 1 - .../explore-screen/tabs/ArtistsTab.tsx | 2 +- .../tabs/ForYouTab/ForYouTab.tsx | 2 +- .../tabs/ForYouTab/LetThemDJScreen.tsx | 6 ++-- .../tabs/ForYouTab/PremiumTracksScreen.tsx | 4 +-- .../tabs/ForYouTab/TopAlbumsScreen.tsx | 6 ++-- .../ForYouTab/TrendingPlaylistsScreen.tsx | 1 - .../ForYouTab/TrendingUndergroundScreen.tsx | 1 - .../explore-screen/tabs/PlaylistsTab.tsx | 2 +- .../screens/favorites-screen/AlbumsTab.tsx | 9 +++--- .../DownloadFavoritesSwitch.tsx | 2 +- .../favorites-screen/DownloadProgress.tsx | 1 - .../LibraryCategorySelectionMenu.tsx | 5 ++- .../favorites-screen/OfflineContentBanner.tsx | 1 - .../screens/favorites-screen/PlaylistsTab.tsx | 9 +++--- .../screens/favorites-screen/TracksTab.tsx | 8 ++--- .../src/screens/favorites-screen/selectors.ts | 4 +-- .../useCollectionsScreenData.ts | 6 ++-- .../favorites-screen/useFavoritesLineup.ts | 6 ++-- .../feed-screen/EmptyFeedSuggestedFollows.tsx | 4 +-- .../screens/feed-screen/FeedFilterButton.tsx | 2 +- .../src/screens/feed-screen/FeedScreen.tsx | 10 +++--- .../MoodCollectionScreen.tsx | 8 ++--- .../Notification/NotificationTile.tsx | 6 ++-- .../Notification/utils.ts | 3 +- .../notifications-screen/NotificationList.tsx | 9 +++--- .../NotificationListItem.tsx | 4 +-- .../AddTrackToPlaylistNotification.tsx | 8 ++--- .../AnnouncementNotification.tsx | 4 +-- .../ChallengeRewardNotification.tsx | 6 ++-- .../Notifications/FavoriteNotification.tsx | 8 ++--- .../FavoriteOfRepostNotification.tsx | 8 ++--- .../Notifications/FollowNotification.tsx | 8 ++--- .../Notifications/MilestoneNotification.tsx | 12 +++---- .../Notifications/RemixCosignNotification.tsx | 9 +++--- .../Notifications/RemixCreateNotification.tsx | 8 ++--- .../Notifications/RepostNotification.tsx | 8 ++--- .../RepostOfRepostNotification.tsx | 8 ++--- .../SupporterDethronedNotification.tsx | 8 ++--- .../Notifications/TastemakerNotification.tsx | 9 +++--- .../Notifications/TierChangeNotification.tsx | 8 ++--- .../Notifications/TipReactionNotification.tsx | 9 +++--- .../Notifications/TipReceivedNotification.tsx | 12 ++++--- .../Notifications/TipSentNotification.tsx | 7 ++-- .../TopSupporterNotification.tsx | 7 ++-- .../TopSupportingNotification.tsx | 7 ++-- .../TrendingPlaylistNotification.tsx | 12 +++---- .../TrendingTrackNotification.tsx | 12 +++---- .../TrendingUndergroundNotification.tsx | 12 +++---- .../USDCPurchaseBuyerNotification.tsx | 9 +++--- .../USDCPurchaseSellerNotification.tsx | 12 +++---- .../UserSubscriptionNotification.tsx | 8 ++--- .../Notifications/useSocialActionHandler.ts | 9 +++--- .../NotificationsScreen.tsx | 4 +-- .../Reaction/Reaction.tsx | 6 ++-- .../Reaction/ReactionList.tsx | 5 +-- .../Reaction/reactions.tsx | 6 ++-- .../screens/pay-and-earn-screen/USDCCard.tsx | 2 +- .../ArtistRecommendations.tsx | 7 ++-- .../profile-screen/CollectiblesCard.tsx | 8 ++--- .../profile-screen/EmptyProfileTile.tsx | 1 - .../screens/profile-screen/MessageButton.tsx | 2 +- .../profile-screen/MessageLockedButton.tsx | 2 +- .../ProfileHeader/ProfileHeader.tsx | 2 +- .../ProfileHeader/ProfileInfoTiles.tsx | 8 ++--- .../ProfileHeader/ProfileSocials.tsx | 2 +- .../ProfileHeader/ProfileTierTile.tsx | 2 +- .../ProfileHeader/SupportingList.tsx | 2 +- .../ProfileHeader/SupportingTile.tsx | 2 +- .../ProfileHeader/TopSupporters.tsx | 6 ++-- .../ProfileHeader/ViewAllSupportingTile.tsx | 2 +- .../screens/profile-screen/ProfileInfo.tsx | 8 ++--- .../screens/profile-screen/ProfileMetrics.tsx | 4 +-- .../screens/profile-screen/ProfileScreen.tsx | 8 ++--- .../profile-screen/ProfileTabs/AlbumsTab.tsx | 2 +- .../ProfileTabs/CollectiblesTab.tsx | 2 +- .../ProfileTabs/PlaylistsTab.tsx | 2 +- .../profile-screen/ProfileTabs/RepostsTab.tsx | 8 ++--- .../profile-screen/ProfileTabs/TracksTab.tsx | 6 ++-- .../profile-screen/SubscribeButton.tsx | 2 +- .../screens/profile-screen/TipAudioButton.tsx | 2 +- .../src/screens/profile-screen/selectors.ts | 10 ++---- .../src/screens/profile-screen/useIsArtist.ts | 2 +- .../src/screens/profile-screen/utils.ts | 4 +-- .../ResetPasswordScreen.tsx | 2 +- .../src/screens/root-screen/RootScreen.tsx | 8 ++--- .../src/screens/root-screen/StatusBar.tsx | 3 +- .../search-results-screen/tabs/AlbumsTab.tsx | 8 ++--- .../tabs/PlaylistsTab.tsx | 8 ++--- .../tabs/ProfilesTab.tsx | 8 ++--- .../tabs/SearchResultsTab.tsx | 2 +- .../search-results-screen/tabs/TracksTab.tsx | 4 +-- .../tabs/useFetchTabResultsEffect.tsx | 4 +-- .../settings-screen/AccountSettingsRow.tsx | 2 +- .../settings-screen/AccountSettingsScreen.tsx | 6 ++-- .../AccountVerificationScreen.tsx | 2 +- .../settings-screen/AppearanceSettingsRow.tsx | 8 ++--- .../settings-screen/CastSettingsRow.tsx | 9 +++--- .../EmailFrequencyControlRow.tsx | 4 +-- .../ListeningHistoryScreen.tsx | 8 ++--- .../settings-screen/NotificationRow.tsx | 4 +-- .../NotificationSettingsScreen.tsx | 3 +- .../components/WelcomeDrawer.tsx | 2 +- .../screens/FinishProfileScreen.tsx | 6 ++-- .../src/screens/signon/ProfileImage.tsx | 6 ++-- .../src/screens/signon/ProfileManual.tsx | 6 ++-- packages/mobile/src/screens/signon/SignOn.tsx | 2 +- .../SmartCollectionScreen.tsx | 6 ++-- .../tip-artist-screen/AvailableAudio.tsx | 3 +- .../ConfirmSendTipScreen.tsx | 2 +- .../tip-artist-screen/ReceiverDetails.tsx | 2 +- .../tip-artist-screen/SendTipScreen.tsx | 8 ++--- .../tip-artist-screen/SendTipStatusText.tsx | 1 - .../TipArtistModalScreen.tsx | 2 +- .../screens/tip-artist-screen/TipHeader.tsx | 1 - .../tip-artist-screen/TipSentScreen.tsx | 2 +- .../src/screens/track-screen/DownloadRow.tsx | 10 ++---- .../screens/track-screen/DownloadSection.tsx | 6 ++-- .../track-screen/TrackRemixesScreen.tsx | 4 +-- .../src/screens/track-screen/TrackScreen.tsx | 6 ++-- .../track-screen/TrackScreenDetailsTile.tsx | 32 +++++++++---------- .../TrackScreenDownloadButtons.tsx | 2 +- .../screens/track-screen/TrackScreenRemix.tsx | 2 +- .../trending-screen/TrendingFilterButton.tsx | 2 +- .../trending-screen/TrendingFilterDrawer.tsx | 4 +-- .../trending-screen/TrendingLineup.tsx | 6 ++-- .../trending-screen/TrendingScreen.tsx | 3 +- .../components/UploadingTrackTile.tsx | 6 ++-- .../screens/CompleteTrackScreen.tsx | 6 ++-- .../screens/UploadCompleteScreen.tsx | 9 +++--- .../screens/UploadingTracksScreen.tsx | 9 +++--- .../upload-screen/utils/processTrackFile.ts | 4 +-- .../user-list-screen/FavoritedScreen.tsx | 4 +-- .../user-list-screen/FollowersScreen.tsx | 4 +-- .../user-list-screen/FollowingScreen.tsx | 4 +-- .../user-list-screen/MutualsScreen.tsx | 4 +-- .../NotificationUsersScreen.tsx | 4 +-- .../user-list-screen/RelatedArtistsScreen.tsx | 4 +-- .../user-list-screen/RepostsScreen.tsx | 4 +-- .../user-list-screen/SupporterInfo.tsx | 3 +- .../user-list-screen/SupportingInfo.tsx | 3 +- .../SupportingUsersScreen.tsx | 4 +-- .../user-list-screen/TopSupportersScreen.tsx | 4 +-- .../src/screens/user-list-screen/UserList.tsx | 10 +++--- .../screens/user-list-screen/UserListItem.tsx | 2 +- .../wallet-connect/ConnectNewWalletButton.tsx | 2 +- .../wallet-connect/WalletConnectScreen.tsx | 1 - .../components/ConfirmRemoveWalletDrawer.tsx | 4 +-- .../components/LinkedWallet.tsx | 2 +- .../components/LinkedWallets.tsx | 7 ++-- .../components/SolanaPhoneOption.tsx | 6 ++-- .../components/WalletConnectDrawer.tsx | 2 +- .../wallet-connect/useCanConnectNewWallet.ts | 1 - .../wallet-connect/usePhantomConnect.ts | 2 +- .../wallet-connect/useWalletConnect.ts | 4 +-- .../wallet-connect/useWalletStatusToasts.ts | 4 +-- .../audio-player/NativeMobileAudio.ts | 4 +-- packages/mobile/src/store/oauth/actions.ts | 13 ++++---- packages/mobile/src/store/oauth/reducer.ts | 3 +- .../sagas/syncOfflineDataSaga.ts | 3 +- packages/mobile/src/store/settings/sagas.ts | 15 +++++---- packages/mobile/src/store/store.ts | 4 +-- packages/mobile/src/store/storeContext.ts | 3 +- packages/mobile/src/store/theme/sagas.ts | 2 -- .../wallet-connect/sagas/signMessageSaga.ts | 4 +-- .../src/utils/launchSelectImageActionSheet.ts | 4 +-- packages/mobile/src/utils/reachability.ts | 1 - packages/mobile/src/utils/theme.ts | 4 +-- 330 files changed, 749 insertions(+), 925 deletions(-) diff --git a/packages/mobile/src/app/Drawers.tsx b/packages/mobile/src/app/Drawers.tsx index 76e4176e621..e4aca3d1104 100644 --- a/packages/mobile/src/app/Drawers.tsx +++ b/packages/mobile/src/app/Drawers.tsx @@ -1,7 +1,6 @@ -import { Modals } from '@audius/common/store' - import type { ComponentType } from 'react' +import type { ComponentType } from 'react' -import type { } from '@audius/common' +import type { Modals } from '@audius/common/store' import { AddFundsDrawer } from 'app/components/add-funds-drawer/AddFundsDrawer' import { AddToCollectionDrawer } from 'app/components/add-to-collection-drawer' diff --git a/packages/mobile/src/app/ThemeProvider.tsx b/packages/mobile/src/app/ThemeProvider.tsx index 75963ec90ab..8bc5b85ff48 100644 --- a/packages/mobile/src/app/ThemeProvider.tsx +++ b/packages/mobile/src/app/ThemeProvider.tsx @@ -1,8 +1,8 @@ -import { themeActions, themeSelectors } from '@audius/common/store' import type { ReactNode } from 'react' import { useEffect } from 'react' import { Theme, SystemAppearance } from '@audius/common/models' +import { themeActions, themeSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import AsyncStorage from '@react-native-async-storage/async-storage' import { useAppState } from '@react-native-community/hooks' diff --git a/packages/mobile/src/app/TrpcProvider.tsx b/packages/mobile/src/app/TrpcProvider.tsx index b6e2b1bae77..386c963cf50 100644 --- a/packages/mobile/src/app/TrpcProvider.tsx +++ b/packages/mobile/src/app/TrpcProvider.tsx @@ -1,6 +1,6 @@ -import { accountSelectors } from '@audius/common/store' import React, { useMemo, useState } from 'react' +import { accountSelectors } from '@audius/common/store' import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/action-drawer/ActionDrawer.tsx b/packages/mobile/src/components/action-drawer/ActionDrawer.tsx index 94c960efd24..736bf07a984 100644 --- a/packages/mobile/src/components/action-drawer/ActionDrawer.tsx +++ b/packages/mobile/src/components/action-drawer/ActionDrawer.tsx @@ -1,8 +1,7 @@ -import { Modals } from '@audius/common/store' - import type { ReactNode } from 'react' +import type { ReactNode } from 'react' import { useCallback } from 'react' -import type { } from '@audius/common' +import type { Modals } from '@audius/common/store' import type { TextStyle, ViewStyle } from 'react-native' import { TouchableHighlight, View } from 'react-native' import type { SetOptional } from 'type-fest' diff --git a/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx b/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx index 37e5262a82b..cb02f1152ad 100644 --- a/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx +++ b/packages/mobile/src/components/add-funds-drawer/AddFundsDrawer.tsx @@ -1,12 +1,12 @@ +import { useCallback, useState } from 'react' + +import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' +import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { buyUSDCActions, useUSDCManualTransferModal, useAddFundsModal } from '@audius/common/store' -import { useCallback, useState } from 'react' - -import { DEFAULT_PURCHASE_AMOUNT_CENTS } from '@audius/common/hooks' -import { PurchaseMethod, PurchaseVendor } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx b/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx index 38a98723f7e..0954fb26748 100644 --- a/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx +++ b/packages/mobile/src/components/add-to-collection-drawer/AddToCollectionDrawer.tsx @@ -1,3 +1,7 @@ +import { useCallback, useMemo } from 'react' + +import type { Collection } from '@audius/common/models' +import { CreatePlaylistSource, SquareSizes } from '@audius/common/models' import { accountSelectors, cacheCollectionsActions, @@ -5,10 +9,6 @@ import { addToCollectionUISelectors, duplicateAddConfirmationModalUIActions } from '@audius/common/store' -import { useCallback, useMemo } from 'react' - -import type { Collection } from '@audius/common/models' -import { CreatePlaylistSource, SquareSizes } from '@audius/common/models' import { fetchAccountCollections } from 'common/store/saved-collections/actions' import { capitalize } from 'lodash' import { View } from 'react-native' diff --git a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx index c5977c1c3ca..ac6bd8bc447 100644 --- a/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx +++ b/packages/mobile/src/components/audio-balance-pill/AUDIOBalancePill.tsx @@ -1,10 +1,9 @@ -import { accountSelectors } from '@audius/common/store' - import { useSelectTierInfo, useTotalBalanceWithFallback } from '@audius/common/hooks' import type { User } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx b/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx index 5f6ea85897d..27353f51b80 100644 --- a/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx +++ b/packages/mobile/src/components/audio-breakdown-drawer/AudioBreakdownDrawer.tsx @@ -1,12 +1,10 @@ +import type { BNWei } from '@audius/common/models' +import { Chain } from '@audius/common/models' +import type { AssociatedWallet } from '@audius/common/store' import { tokenDashboardPageSelectors, - walletSelectors, - AssociatedWallet + walletSelectors } from '@audius/common/store' -import type {} from '@audius/common' - -import type { BNWei } from '@audius/common/models' -import { Chain } from '@audius/common/models' import { formatWei } from '@audius/common/utils' import BN from 'bn.js' import { View } from 'react-native' diff --git a/packages/mobile/src/components/audio-rewards/RewardsBanner.tsx b/packages/mobile/src/components/audio-rewards/RewardsBanner.tsx index 55fe015fa97..50fc642353e 100644 --- a/packages/mobile/src/components/audio-rewards/RewardsBanner.tsx +++ b/packages/mobile/src/components/audio-rewards/RewardsBanner.tsx @@ -1,6 +1,6 @@ -import { audioRewardsPageActions, modalsActions } from '@audius/common/store' import { useCallback } from 'react' +import { audioRewardsPageActions, modalsActions } from '@audius/common/store' import { Text, View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx b/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx index 27d65f51b71..57e75c0f94e 100644 --- a/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx +++ b/packages/mobile/src/components/audio-rewards/TiersExplainerDrawer.tsx @@ -1,11 +1,6 @@ -import { - profilePageSelectors, - badgeTiers, - BadgeTierInfo -} from '@audius/common/store' - -import type {} from '@audius/common' import { useSelectTierInfo } from '@audius/common/hooks' +import type { BadgeTierInfo } from '@audius/common/store' +import { profilePageSelectors, badgeTiers } from '@audius/common/store' import { Text, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/audio/Airplay.tsx b/packages/mobile/src/components/audio/Airplay.tsx index 2e4fa3b06f3..b7db6c873ad 100644 --- a/packages/mobile/src/components/audio/Airplay.tsx +++ b/packages/mobile/src/components/audio/Airplay.tsx @@ -1,6 +1,6 @@ -import { castActions } from '@audius/common/store' import { useCallback, useEffect, useRef } from 'react' +import { castActions } from '@audius/common/store' import { requireNativeComponent, NativeEventEmitter, diff --git a/packages/mobile/src/components/audio/AudioPlayer.tsx b/packages/mobile/src/components/audio/AudioPlayer.tsx index 033c4bcb878..bf6943ff385 100644 --- a/packages/mobile/src/components/audio/AudioPlayer.tsx +++ b/packages/mobile/src/components/audio/AudioPlayer.tsx @@ -1,3 +1,10 @@ +import { useRef, useEffect, useCallback, useState } from 'react' + +import { useAppContext } from '@audius/common/context' +import { SquareSizes } from '@audius/common/models' +import type { ID, Track } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' +import type { QueryParams } from '@audius/common/services' import { accountSelectors, cacheTracksSelectors, @@ -13,19 +20,9 @@ import { playbackRateValueMap, playbackPositionActions, playbackPositionSelectors, - gatedContentSelectors, - Queueable, - CommonState + gatedContentSelectors } from '@audius/common/store' -import { useRef, useEffect, useCallback, useState } from 'react' - -import type {} from '@audius/common' - -import { useAppContext } from '@audius/common/context' -import { SquareSizes } from '@audius/common/models' -import type { ID, Track } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' -import type { QueryParams } from '@audius/common/services' +import type { Queueable, CommonState } from '@audius/common/store' import { Genre, encodeHashId, diff --git a/packages/mobile/src/components/audio/GoogleCast.tsx b/packages/mobile/src/components/audio/GoogleCast.tsx index 88887773401..11d565f1e0b 100644 --- a/packages/mobile/src/components/audio/GoogleCast.tsx +++ b/packages/mobile/src/components/audio/GoogleCast.tsx @@ -1,11 +1,11 @@ +import { useCallback, useEffect, useMemo, useState } from 'react' + +import { SquareSizes } from '@audius/common/models' import { cacheUsersSelectors, castActions, playerSelectors } from '@audius/common/store' -import { useCallback, useEffect, useMemo, useState } from 'react' - -import { SquareSizes } from '@audius/common/models' import { encodeHashId } from '@audius/common/utils' import { CastState, diff --git a/packages/mobile/src/components/audio/RepeatListener.tsx b/packages/mobile/src/components/audio/RepeatListener.tsx index 46480c3add4..a2c54d07115 100644 --- a/packages/mobile/src/components/audio/RepeatListener.tsx +++ b/packages/mobile/src/components/audio/RepeatListener.tsx @@ -1,5 +1,4 @@ import { playerActions } from '@audius/common/store' - import TrackPlayer, { RepeatMode, useProgress } from 'react-native-track-player' import { useDispatch } from 'react-redux' import { useAsync, usePrevious } from 'react-use' diff --git a/packages/mobile/src/components/audio/useSavePodcastProgress.ts b/packages/mobile/src/components/audio/useSavePodcastProgress.ts index a7a048abd65..70cd18201be 100644 --- a/packages/mobile/src/components/audio/useSavePodcastProgress.ts +++ b/packages/mobile/src/components/audio/useSavePodcastProgress.ts @@ -1,11 +1,11 @@ +import { useEffect } from 'react' + import { accountSelectors, cacheTracksSelectors, playerSelectors, playbackPositionActions } from '@audius/common/store' -import { useEffect } from 'react' - import { Genre } from '@audius/common/utils' import { useProgress } from 'react-native-track-player' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx b/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx index 5a456836eac..5443ee206dd 100644 --- a/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx +++ b/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + import { cacheUsersSelectors, chatActions, chatSelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/NotificationsButton.tsx b/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/NotificationsButton.tsx index acf98e0f087..fd7bbb738c8 100644 --- a/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/NotificationsButton.tsx +++ b/packages/mobile/src/components/bottom-tab-bar/bottom-tab-bar-buttons/NotificationsButton.tsx @@ -1,5 +1,4 @@ import { notificationsSelectors } from '@audius/common/store' - import { View, Text } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/card/CollectionDogEar.tsx b/packages/mobile/src/components/card/CollectionDogEar.tsx index a426aef61e2..ec8b02aab11 100644 --- a/packages/mobile/src/components/card/CollectionDogEar.tsx +++ b/packages/mobile/src/components/card/CollectionDogEar.tsx @@ -1,7 +1,6 @@ -import { cacheCollectionsSelectors } from '@audius/common/store' - import type { ID } from '@audius/common/models' import { DogEarType } from '@audius/common/models' +import { cacheCollectionsSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import { DogEar } from '../core' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx b/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx index 915391c94c8..ecfcab6dce3 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/AudioMatchingChallengeDrawerContent.tsx @@ -1,8 +1,8 @@ -import { ClaimStatus } from '@audius/common/store' import React from 'react' import type { OptimisticUserChallenge } from '@audius/common/models' import { ChallengeName } from '@audius/common/models' +import { ClaimStatus } from '@audius/common/store' import { formatNumberCommas } from '@audius/common/utils' import { ScrollView, View } from 'react-native' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx index 77074096f38..04bc25cf76e 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerContent.tsx @@ -1,7 +1,7 @@ -import { ClaimStatus } from '@audius/common/store' import React from 'react' import type { UserChallengeState } from '@audius/common/models' +import { ClaimStatus } from '@audius/common/store' import { fillString, formatNumberCommas } from '@audius/common/utils' import { View } from 'react-native' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx index 909f341e9b9..0e3400bce0f 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx @@ -1,13 +1,12 @@ +import { useCallback, useEffect } from 'react' + +import type { CommonState } from '@audius/common/store' import { challengesSelectors, audioRewardsPageSelectors, audioRewardsPageActions, - ClaimStatus, - CommonState + ClaimStatus } from '@audius/common/store' -import { useCallback, useEffect } from 'react' - -import type {} from '@audius/common' import { IntKeys, StringKeys } from '@audius/common/services' import { diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ProfileCompletionChecks.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ProfileCompletionChecks.tsx index a9c045b10a9..65a58c48b41 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ProfileCompletionChecks.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ProfileCompletionChecks.tsx @@ -1,6 +1,6 @@ -import { accountSelectors, challengesSelectors } from '@audius/common/store' import { useCallback } from 'react' +import { accountSelectors, challengesSelectors } from '@audius/common/store' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ReferralRewardContents.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ReferralRewardContents.tsx index eb20e846379..e679ad61beb 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ReferralRewardContents.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ReferralRewardContents.tsx @@ -1,6 +1,6 @@ -import { accountSelectors } from '@audius/common/store' import React from 'react' +import { accountSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import { ReferralLinkCopyButton } from './ReferralLinkCopyButton' diff --git a/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx b/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx index aad37c07ef4..58977ce673f 100644 --- a/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx +++ b/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx @@ -1,6 +1,6 @@ -import { chatSelectors } from '@audius/common/store' import { useCallback } from 'react' +import { chatSelectors } from '@audius/common/store' import { View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx b/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx index 29fe0ef948f..44b6ac5d9e0 100644 --- a/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx +++ b/packages/mobile/src/components/coinflow-onramp-drawer/CoinflowOnrampDrawer.tsx @@ -1,10 +1,10 @@ +import { useCallback, useEffect, useState } from 'react' + +import { useCoinflowAdapter } from '@audius/common/hooks' import { coinflowModalUIActions, useCoinflowOnrampModal } from '@audius/common/store' -import { useCallback, useEffect, useState } from 'react' - -import { useCoinflowAdapter } from '@audius/common/hooks' import { CoinflowPurchase } from '@coinflowlabs/react-native' import { Transaction } from '@solana/web3.js' import { TouchableOpacity, View } from 'react-native' diff --git a/packages/mobile/src/components/collectible-details-drawer/CollectibleDetailsDrawer.tsx b/packages/mobile/src/components/collectible-details-drawer/CollectibleDetailsDrawer.tsx index 238d017719d..3fddf1ae920 100644 --- a/packages/mobile/src/components/collectible-details-drawer/CollectibleDetailsDrawer.tsx +++ b/packages/mobile/src/components/collectible-details-drawer/CollectibleDetailsDrawer.tsx @@ -1,9 +1,9 @@ +import { useCallback, useMemo } from 'react' + import { cacheUsersSelectors, collectibleDetailsUISelectors } from '@audius/common/store' -import { useCallback, useMemo } from 'react' - import { ScrollView, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/collection-list/CollectionCard.tsx b/packages/mobile/src/components/collection-list/CollectionCard.tsx index 6924625ee36..f5797f0d04c 100644 --- a/packages/mobile/src/components/collection-list/CollectionCard.tsx +++ b/packages/mobile/src/components/collection-list/CollectionCard.tsx @@ -1,15 +1,12 @@ -import type { CommonState } from '@audius/common/store' -import { - cacheCollectionsSelectors, - reachabilitySelectors -} from '@audius/common/store' - import { createElement, useCallback, useMemo } from 'react' -import type {} from '@audius/common' - import { SquareSizes } from '@audius/common/models' import type { Collection, ID } from '@audius/common/models' +import { + cacheCollectionsSelectors, + reachabilitySelectors +} from '@audius/common/store' +import type { CommonState } from '@audius/common/store' import type { StyleProp, ViewStyle } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/core/Hyperlink.tsx b/packages/mobile/src/components/core/Hyperlink.tsx index ee113d7a3bd..d685cbafa48 100644 --- a/packages/mobile/src/components/core/Hyperlink.tsx +++ b/packages/mobile/src/components/core/Hyperlink.tsx @@ -1,7 +1,7 @@ -import { useLeavingAudiusModal } from '@audius/common/store' import type { ComponentProps } from 'react' import { useCallback, useEffect, useRef, useState } from 'react' +import { useLeavingAudiusModal } from '@audius/common/store' import { isInteralAudiusUrl, getPathFromAudiusUrl, diff --git a/packages/mobile/src/components/core/PlayBarChin.tsx b/packages/mobile/src/components/core/PlayBarChin.tsx index 0ae134adeae..775f483c32e 100644 --- a/packages/mobile/src/components/core/PlayBarChin.tsx +++ b/packages/mobile/src/components/core/PlayBarChin.tsx @@ -1,5 +1,4 @@ import { playerSelectors } from '@audius/common/store' - import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/core/ProfilePicture.tsx b/packages/mobile/src/components/core/ProfilePicture.tsx index 5b0fd852377..efaee08772a 100644 --- a/packages/mobile/src/components/core/ProfilePicture.tsx +++ b/packages/mobile/src/components/core/ProfilePicture.tsx @@ -1,7 +1,6 @@ -import { cacheUsersSelectors } from '@audius/common/store' - import type { ID } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import type { AvatarProps } from '@audius/harmony-native' diff --git a/packages/mobile/src/components/core/Screen/ScreenContent.tsx b/packages/mobile/src/components/core/Screen/ScreenContent.tsx index 5530d69669b..fd7bf57b023 100644 --- a/packages/mobile/src/components/core/Screen/ScreenContent.tsx +++ b/packages/mobile/src/components/core/Screen/ScreenContent.tsx @@ -1,6 +1,6 @@ -import { reachabilitySelectors } from '@audius/common/store' import type { ReactNode } from 'react' +import { reachabilitySelectors } from '@audius/common/store' import Animated, { FadeIn } from 'react-native-reanimated' import { useSelector } from 'react-redux' import { usePrevious } from 'react-use' diff --git a/packages/mobile/src/components/core/UserDisplayName.tsx b/packages/mobile/src/components/core/UserDisplayName.tsx index fc7afeac261..c43abeb6199 100644 --- a/packages/mobile/src/components/core/UserDisplayName.tsx +++ b/packages/mobile/src/components/core/UserDisplayName.tsx @@ -1,7 +1,6 @@ -import { cacheUsersSelectors } from '@audius/common/store' - import { useSelectTierInfo } from '@audius/common/hooks' import type { ID } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import type { TextProps } from '@audius/harmony-native' diff --git a/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx b/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx index 5470ef545be..8efa177c09c 100644 --- a/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx +++ b/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx @@ -1,6 +1,6 @@ -import { chatSelectors } from '@audius/common/store' import { useCallback } from 'react' +import { chatSelectors } from '@audius/common/store' import { View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx b/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx index c0069190705..6de398ee4a0 100644 --- a/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx +++ b/packages/mobile/src/components/deactivate-account-confirmation-drawer/DeactivateAccountConfirmationDrawer.tsx @@ -1,10 +1,10 @@ +import { useCallback, useEffect } from 'react' + +import { Status } from '@audius/common/models' import { deactivateAccountActions, deactivateAccountSelectors } from '@audius/common/store' -import { useCallback, useEffect } from 'react' - -import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx b/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx index 111e101fb27..24ff5ca8f21 100644 --- a/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx +++ b/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx @@ -1,6 +1,6 @@ -import { chatActions } from '@audius/common/store' import { useCallback } from 'react' +import { chatActions } from '@audius/common/store' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx b/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx index 65839463d9a..a8b70969147 100644 --- a/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx +++ b/packages/mobile/src/components/details-tile/DetailsProgressInfo.tsx @@ -1,9 +1,8 @@ +import type { SearchTrack, Track } from '@audius/common/models' import { accountSelectors, playbackPositionSelectors } from '@audius/common/store' - -import type { SearchTrack, Track } from '@audius/common/models' import { formatLineupTileDuration } from '@audius/common/utils' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTile.tsx b/packages/mobile/src/components/details-tile/DetailsTile.tsx index 7128f4059ca..c8f372a78f5 100644 --- a/packages/mobile/src/components/details-tile/DetailsTile.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTile.tsx @@ -1,12 +1,11 @@ +import type { CommonState } from '@audius/common/store' import { accountSelectors, playerSelectors, - playbackPositionSelectors, - CommonState + playbackPositionSelectors } from '@audius/common/store' -import { useCallback } from 'react' -import type {} from '@audius/common' +import { useCallback } from 'react' import { useGatedContentAccess } from '@audius/common/hooks' import { isContentUSDCPurchaseGated } from '@audius/common/models' diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index 3bdb9a860ce..88629d50b16 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -1,5 +1,5 @@ -import { cacheCollectionsSelectors, CommonState } from '@audius/common/store' -import type {} from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { cacheCollectionsSelectors } from '@audius/common/store' import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import { useFeatureFlag } from '@audius/common/hooks' diff --git a/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx b/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx index 07f7d4121fa..d1ddaf21ecb 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileAiAttribution.tsx @@ -1,7 +1,7 @@ -import { aiPageActions, aiPageSelectors } from '@audius/common/store' import { useEffect } from 'react' import type { ID } from '@audius/common/models' +import { aiPageActions, aiPageSelectors } from '@audius/common/store' import { View } from 'react-native' import { TouchableWithoutFeedback } from 'react-native-gesture-handler' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx index 99ba5d476ce..7994fddfe1e 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileNoAccess.tsx @@ -1,9 +1,3 @@ -import { - usersSocialActions, - tippingActions, - usePremiumContentPurchaseModal, - gatedContentSelectors -} from '@audius/common/store' import type { ReactNode } from 'react' import { useCallback } from 'react' @@ -18,6 +12,12 @@ import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { ID, AccessConditions, User } from '@audius/common/models' +import { + usersSocialActions, + tippingActions, + usePremiumContentPurchaseModal, + gatedContentSelectors +} from '@audius/common/store' import { formatPrice } from '@audius/common/utils' import type { ViewStyle } from 'react-native' import { Image, Text, View } from 'react-native' diff --git a/packages/mobile/src/components/drawer/AppDrawer.tsx b/packages/mobile/src/components/drawer/AppDrawer.tsx index 5f9d5b30c32..88af9dd6d1a 100644 --- a/packages/mobile/src/components/drawer/AppDrawer.tsx +++ b/packages/mobile/src/components/drawer/AppDrawer.tsx @@ -1,7 +1,7 @@ -import { modalsSelectors, modalsActions, Modals } from '@audius/common/store' import { useCallback } from 'react' -import type {} from '@audius/common' +import type { Modals } from '@audius/common/store' +import { modalsSelectors, modalsActions } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import type { SetOptional } from 'type-fest' diff --git a/packages/mobile/src/components/drawers/ConfirmationDrawer.tsx b/packages/mobile/src/components/drawers/ConfirmationDrawer.tsx index 27273e23e98..5232246798b 100644 --- a/packages/mobile/src/components/drawers/ConfirmationDrawer.tsx +++ b/packages/mobile/src/components/drawers/ConfirmationDrawer.tsx @@ -1,7 +1,6 @@ -import { Modals } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import type { Modals } from '@audius/common/store' import { View } from 'react-native' import IconInfo from 'app/assets/images/iconInfo.svg' diff --git a/packages/mobile/src/components/drawers/DeleteTrackConfirmationDrawer.tsx b/packages/mobile/src/components/drawers/DeleteTrackConfirmationDrawer.tsx index bfcf0704825..9eadbee93be 100644 --- a/packages/mobile/src/components/drawers/DeleteTrackConfirmationDrawer.tsx +++ b/packages/mobile/src/components/drawers/DeleteTrackConfirmationDrawer.tsx @@ -1,6 +1,6 @@ -import { cacheTracksActions } from '@audius/common/store' import { useCallback } from 'react' +import { cacheTracksActions } from '@audius/common/store' import { useDispatch } from 'react-redux' import { useDrawer } from 'app/hooks/useDrawer' diff --git a/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx b/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx index f970856f513..fec3d3bf2db 100644 --- a/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx +++ b/packages/mobile/src/components/drawers/ReleaseNowConfirmationDrawer.tsx @@ -1,7 +1,7 @@ -import { cacheTracksActions } from '@audius/common/store' import { useCallback } from 'react' import { useGetTrackById } from '@audius/common/api' +import { cacheTracksActions } from '@audius/common/store' import moment from 'moment' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx b/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx index 4e7b7409479..5d22c14ba0c 100644 --- a/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx +++ b/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx @@ -1,6 +1,6 @@ -import { cacheCollectionsSelectors } from '@audius/common/store' import { useCallback } from 'react' +import { cacheCollectionsSelectors } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { useDrawer } from 'app/hooks/useDrawer' diff --git a/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx b/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx index 9e7b5c95a8d..4037c8b629e 100644 --- a/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx +++ b/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx @@ -1,9 +1,8 @@ -import { collectionsSocialActions, CommonState } from '@audius/common/store' import { useCallback } from 'react' -import type {} from '@audius/common' - import { FavoriteSource } from '@audius/common/models' +import type { CommonState } from '@audius/common/store' +import { collectionsSocialActions } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { useDrawer } from 'app/hooks/useDrawer' diff --git a/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx b/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx index 74635ea5a0f..bcf9b003050 100644 --- a/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx +++ b/packages/mobile/src/components/duplicate-add-confirmation-drawer/DuplicateAddConfirmationDrawer.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + import { cacheCollectionsActions, cacheCollectionsSelectors, duplicateAddConfirmationModalUISelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { fillString } from '@audius/common/utils' import { capitalize } from 'lodash' import { View } from 'react-native' diff --git a/packages/mobile/src/components/enable-push-notifications-drawer/EnablePushNotificationsDrawer.tsx b/packages/mobile/src/components/enable-push-notifications-drawer/EnablePushNotificationsDrawer.tsx index b7f2ac15896..8219ef2b0c6 100644 --- a/packages/mobile/src/components/enable-push-notifications-drawer/EnablePushNotificationsDrawer.tsx +++ b/packages/mobile/src/components/enable-push-notifications-drawer/EnablePushNotificationsDrawer.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { settingsPageActions, PushNotificationSetting } from '@audius/common/store' -import { useCallback } from 'react' - import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx b/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx index 45bf82161fb..ba49b115e9c 100644 --- a/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx +++ b/packages/mobile/src/components/feed-filter-drawer/FeedFilterDrawer.tsx @@ -1,10 +1,10 @@ +import { useCallback, useMemo } from 'react' + +import { Name, FeedFilter } from '@audius/common/models' import { feedPageLineupActions as feedActions, feedPageActions } from '@audius/common/store' -import { useCallback, useMemo } from 'react' - -import { Name, FeedFilter } from '@audius/common/models' import { useDispatch } from 'react-redux' import ActionDrawer from 'app/components/action-drawer' diff --git a/packages/mobile/src/components/hcaptcha/HCaptcha.tsx b/packages/mobile/src/components/hcaptcha/HCaptcha.tsx index 9763979637c..1fe12db58cb 100644 --- a/packages/mobile/src/components/hcaptcha/HCaptcha.tsx +++ b/packages/mobile/src/components/hcaptcha/HCaptcha.tsx @@ -1,3 +1,5 @@ +import { useCallback, useEffect, useRef, useState } from 'react' + import { audioRewardsPageSelectors, audioRewardsPageActions, @@ -5,8 +7,6 @@ import { modalsSelectors, modalsActions } from '@audius/common/store' -import { useCallback, useEffect, useRef, useState } from 'react' - import ConfirmHcaptcha from '@hcaptcha/react-native-hcaptcha' import type { NativeSyntheticEvent } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/image/CollectionImage.tsx b/packages/mobile/src/components/image/CollectionImage.tsx index e2852b5a24a..3b94e842e5f 100644 --- a/packages/mobile/src/components/image/CollectionImage.tsx +++ b/packages/mobile/src/components/image/CollectionImage.tsx @@ -1,11 +1,10 @@ -import { reachabilitySelectors } from '@audius/common/store' - import type { SquareSizes, Collection, ID, SearchPlaylist } from '@audius/common/models' +import { reachabilitySelectors } from '@audius/common/store' import type { Nullable, Maybe } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/image/CoverPhoto.tsx b/packages/mobile/src/components/image/CoverPhoto.tsx index 370e3f90abf..8fd4fc56a59 100644 --- a/packages/mobile/src/components/image/CoverPhoto.tsx +++ b/packages/mobile/src/components/image/CoverPhoto.tsx @@ -1,7 +1,6 @@ -import { cacheUsersSelectors } from '@audius/common/store' - import type { ID } from '@audius/common/models' import { SquareSizes, WidthSizes } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { BlurView } from '@react-native-community/blur' import { Animated, StyleSheet } from 'react-native' diff --git a/packages/mobile/src/components/image/TrackImage.tsx b/packages/mobile/src/components/image/TrackImage.tsx index a3a5c631a73..29c055f9d60 100644 --- a/packages/mobile/src/components/image/TrackImage.tsx +++ b/packages/mobile/src/components/image/TrackImage.tsx @@ -1,6 +1,5 @@ -import { reachabilitySelectors } from '@audius/common/store' - import type { SquareSizes, ID, SearchTrack, Track } from '@audius/common/models' +import { reachabilitySelectors } from '@audius/common/store' import type { Nullable, Maybe } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/image/UserImage.tsx b/packages/mobile/src/components/image/UserImage.tsx index 6385c62ce39..b0fc08dd854 100644 --- a/packages/mobile/src/components/image/UserImage.tsx +++ b/packages/mobile/src/components/image/UserImage.tsx @@ -1,6 +1,5 @@ -import { cacheUsersSelectors } from '@audius/common/store' - import type { SquareSizes, ID } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx b/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx index a399dac4c66..79bdd3a1048 100644 --- a/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx +++ b/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx @@ -1,3 +1,6 @@ +import type { ReactNode } from 'react' +import { useCallback } from 'react' + import { accountSelectors, cacheUsersSelectors, @@ -8,9 +11,6 @@ import { tippingActions, useInboxUnavailableModal } from '@audius/common/store' -import type { ReactNode } from 'react' -import { useCallback } from 'react' - import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/leaving-audius-drawer/LeavingAudiusDrawer.tsx b/packages/mobile/src/components/leaving-audius-drawer/LeavingAudiusDrawer.tsx index 66c4de0a5e6..250f58b0d01 100644 --- a/packages/mobile/src/components/leaving-audius-drawer/LeavingAudiusDrawer.tsx +++ b/packages/mobile/src/components/leaving-audius-drawer/LeavingAudiusDrawer.tsx @@ -1,6 +1,6 @@ -import { useLeavingAudiusModal } from '@audius/common/store' import React from 'react' +import { useLeavingAudiusModal } from '@audius/common/store' import { View } from 'react-native' import IconExternalLink from 'app/assets/images/iconExternalLink.svg' diff --git a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx index 33c54e27bc3..1d530d90647 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx @@ -1,3 +1,4 @@ +import type { EnhancedCollectionTrack, CommonState } from '@audius/common/store' import { accountSelectors, cacheCollectionsSelectors, @@ -8,13 +9,10 @@ import { OverflowAction, OverflowSource, RepostType, - playerSelectors, - EnhancedCollectionTrack, - CommonState + playerSelectors } from '@audius/common/store' -import { useCallback, useMemo } from 'react' -import type {} from '@audius/common' +import { useCallback, useMemo } from 'react' import { useProxySelector } from '@audius/common/hooks' import { diff --git a/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx b/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx index 8096704c6c5..c049f0b293c 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx @@ -1,5 +1,5 @@ -import { playerSelectors, CommonState } from '@audius/common/store' -import type {} from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { playerSelectors } from '@audius/common/store' import type { UID, LineupTrack } from '@audius/common/models' import { range } from 'lodash' diff --git a/packages/mobile/src/components/lineup-tile/LineupTile.tsx b/packages/mobile/src/components/lineup-tile/LineupTile.tsx index e127cbf06c5..fd3e3107039 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTile.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTile.tsx @@ -1,7 +1,7 @@ -import { accountSelectors, gatedContentActions } from '@audius/common/store' import { useCallback } from 'react' import { useGatedContentAccess } from '@audius/common/hooks' +import { accountSelectors, gatedContentActions } from '@audius/common/store' import { Genre, getDogEarType } from '@audius/common/utils' import moment from 'moment' import { View } from 'react-native' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx b/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx index 858cd967556..f33c8f1a530 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileAccessStatus.tsx @@ -1,12 +1,12 @@ +import { useCallback } from 'react' + +import type { ID, AccessConditions } from '@audius/common/models' +import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' import { usePremiumContentPurchaseModal, gatedContentActions, gatedContentSelectors } from '@audius/common/store' -import { useCallback } from 'react' - -import type { ID, AccessConditions } from '@audius/common/models' -import { ModalSource, isContentUSDCPurchaseGated } from '@audius/common/models' import { formatPrice } from '@audius/common/utils' import { TouchableOpacity, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx b/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx index b9d6ab6167b..ef13219031e 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileMetadata.tsx @@ -1,7 +1,7 @@ -import { playerSelectors } from '@audius/common/store' import { useCallback } from 'react' import type { Remix, User } from '@audius/common/models' +import { playerSelectors } from '@audius/common/store' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx index 7d86e332242..eff7f243898 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx @@ -1,11 +1,10 @@ +import type { RepostType } from '@audius/common/store' import { repostsUserListActions, - favoritesUserListActions, - RepostType + favoritesUserListActions } from '@audius/common/store' -import { useCallback } from 'react' -import type {} from '@audius/common' +import { useCallback } from 'react' import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { FavoriteType, ID, AccessConditions } from '@audius/common/models' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx b/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx index 298199652b2..e13855823ae 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileTopRight.tsx @@ -1,9 +1,8 @@ +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, playbackPositionSelectors } from '@audius/common/store' - -import { FeatureFlags } from '@audius/common/services' import { formatLineupTileDuration } from '@audius/common/utils' import type { ViewStyle } from 'react-native' import { StyleSheet, View } from 'react-native' diff --git a/packages/mobile/src/components/lineup-tile/TrackTile.tsx b/packages/mobile/src/components/lineup-tile/TrackTile.tsx index 94506059b1c..f13a804a098 100644 --- a/packages/mobile/src/components/lineup-tile/TrackTile.tsx +++ b/packages/mobile/src/components/lineup-tile/TrackTile.tsx @@ -1,3 +1,4 @@ +import type { CommonState } from '@audius/common/store' import { accountSelectors, cacheTracksSelectors, @@ -9,12 +10,10 @@ import { OverflowSource, RepostType, playerSelectors, - playbackPositionSelectors, - CommonState + playbackPositionSelectors } from '@audius/common/store' -import { useCallback } from 'react' -import type {} from '@audius/common' +import { useCallback } from 'react' import { ShareSource, diff --git a/packages/mobile/src/components/lineup-tile/types.ts b/packages/mobile/src/components/lineup-tile/types.ts index aea64432612..7e56f4405dd 100644 --- a/packages/mobile/src/components/lineup-tile/types.ts +++ b/packages/mobile/src/components/lineup-tile/types.ts @@ -1,7 +1,7 @@ -import { RepostType, EnhancedCollectionTrack } from '@audius/common/store' - import type { ReactNode } from 'react' +import type { RepostType, EnhancedCollectionTrack } from '@audius/common/store' + +import type { ReactNode } from 'react' -import type { } from '@audius/common' import type { PlaybackSource, FavoriteType, diff --git a/packages/mobile/src/components/lineup/types.ts b/packages/mobile/src/components/lineup/types.ts index 74ace878b5e..e19773d129e 100644 --- a/packages/mobile/src/components/lineup/types.ts +++ b/packages/mobile/src/components/lineup/types.ts @@ -1,7 +1,7 @@ -import { LineupBaseActions, CommonState } from '@audius/common/store' - import type { ComponentType, ReactElement } from 'react' +import type { LineupBaseActions, CommonState } from '@audius/common/store' + +import type { ComponentType, ReactElement } from 'react' -import type { } from '@audius/common' import type { Kind, ID, UID, Lineup as LineupData } from '@audius/common/models' import type { Maybe } from '@audius/common/utils' import type { SectionListProps } from 'react-native' diff --git a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx index e0aaefc9235..bb1cfb1ff61 100644 --- a/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/ActionsBar.tsx @@ -1,3 +1,14 @@ +import { useCallback, useLayoutEffect } from 'react' + +import { useGatedContentAccess } from '@audius/common/hooks' +import { + ShareSource, + RepostSource, + FavoriteSource, + ModalSource +} from '@audius/common/models' +import type { Track } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, castSelectors, @@ -11,17 +22,6 @@ import { usePremiumContentPurchaseModal, playbackPositionSelectors } from '@audius/common/store' -import { useCallback, useLayoutEffect } from 'react' - -import { useGatedContentAccess } from '@audius/common/hooks' -import { - ShareSource, - RepostSource, - FavoriteSource, - ModalSource -} from '@audius/common/models' -import type { Track } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { formatPrice, Genre, removeNullable } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { View, Platform } from 'react-native' diff --git a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx index fbd4440a76e..8ac6b625ca1 100644 --- a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx +++ b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx @@ -1,9 +1,5 @@ -import { - averageColorSelectors, - playerSelectors, - CommonState -} from '@audius/common/store' -import type {} from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { averageColorSelectors, playerSelectors } from '@audius/common/store' import { useGatedContentAccess } from '@audius/common/hooks' import { DogEarType, SquareSizes } from '@audius/common/models' diff --git a/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx b/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx index 27d3651d9c5..a187a9ac8b8 100644 --- a/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx +++ b/packages/mobile/src/components/now-playing-drawer/AudioControls.tsx @@ -1,12 +1,12 @@ +import { useCallback } from 'react' + +import { FeatureFlags } from '@audius/common/services' import { queueActions, queueSelectors, RepeatMode, modalsActions } from '@audius/common/store' -import { useCallback } from 'react' - -import { FeatureFlags } from '@audius/common/services' import { Animated, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx b/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx index fdd7df15905..bf64f3f6c81 100644 --- a/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx +++ b/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx @@ -1,9 +1,3 @@ -import { - cacheUsersSelectors, - queueActions, - playerActions, - playerSelectors -} from '@audius/common/store' import { memo, useCallback, @@ -13,6 +7,12 @@ import { useState } from 'react' +import { + cacheUsersSelectors, + queueActions, + playerActions, + playerSelectors +} from '@audius/common/store' import { Genre } from '@audius/common/utils' import { useNavigationState } from '@react-navigation/native' import type { diff --git a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx index 56e1004ff64..080a046d209 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlayBar.tsx @@ -1,13 +1,13 @@ -import { - accountSelectors, - tracksSocialActions, - playerSelectors -} from '@audius/common/store' import { useCallback } from 'react' import { useGatedContentAccess } from '@audius/common/hooks' import { FavoriteSource, SquareSizes } from '@audius/common/models' import type { Track, User } from '@audius/common/models' +import { + accountSelectors, + tracksSocialActions, + playerSelectors +} from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { TouchableOpacity, Animated, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/PlayButton.tsx b/packages/mobile/src/components/now-playing-drawer/PlayButton.tsx index be7cc2b51ec..9ff4b234b34 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlayButton.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlayButton.tsx @@ -1,6 +1,6 @@ -import { playerActions, playerSelectors } from '@audius/common/store' import { useCallback } from 'react' +import { playerActions, playerSelectors } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import IconPause from 'app/assets/animations/iconPause.json' diff --git a/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx b/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx index be7702039f1..9601c2b68d0 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx @@ -1,5 +1,5 @@ -import { playerSelectors, PlaybackRate } from '@audius/common/store' -import type {} from '@audius/common' +import type { PlaybackRate } from '@audius/common/store' +import { playerSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx index e06fd9670f0..0bed67ff1ad 100644 --- a/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx +++ b/packages/mobile/src/components/now-playing-drawer/TrackInfo.tsx @@ -1,7 +1,6 @@ -import { playerSelectors } from '@audius/common/store' - import { useGatedContentAccess } from '@audius/common/hooks' import type { Track, User } from '@audius/common/models' +import { playerSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/TrackingBar.tsx b/packages/mobile/src/components/now-playing-drawer/TrackingBar.tsx index d81b4689590..3e98525cf5c 100644 --- a/packages/mobile/src/components/now-playing-drawer/TrackingBar.tsx +++ b/packages/mobile/src/components/now-playing-drawer/TrackingBar.tsx @@ -1,6 +1,6 @@ -import { playerSelectors } from '@audius/common/store' import { useCallback, useEffect, useRef } from 'react' +import { playerSelectors } from '@audius/common/store' import { Animated, Dimensions, Easing } from 'react-native' import LinearGradient from 'react-native-linear-gradient' import TrackPlayer from 'react-native-track-player' diff --git a/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts b/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts index 20458d09419..2de76a12880 100644 --- a/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts +++ b/packages/mobile/src/components/now-playing-drawer/useCurrentTrackDuration.ts @@ -1,5 +1,4 @@ import { playerSelectors } from '@audius/common/store' - import { getTrackPreviewDuration } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx b/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx index 9f3ab00f1a6..61f7b0f8eca 100644 --- a/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx +++ b/packages/mobile/src/components/offline-downloads/CollectionDownloadStatusIndicator.tsx @@ -1,6 +1,5 @@ -import { cacheCollectionsSelectors } from '@audius/common/store' - import type { ID } from '@audius/common/models' +import { cacheCollectionsSelectors } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { useIsOfflineModeEnabled } from 'app/hooks/useIsOfflineModeEnabled' diff --git a/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx b/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx index d438da7a854..45ffc396e6a 100644 --- a/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx +++ b/packages/mobile/src/components/offline-downloads/DownloadStatusIndicator.tsx @@ -1,5 +1,4 @@ import { reachabilitySelectors } from '@audius/common/store' - import type { Nullable } from '@audius/common/utils' import type { StyleProp, ViewStyle } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/offline-placeholder/OnlineOnly.tsx b/packages/mobile/src/components/offline-placeholder/OnlineOnly.tsx index 28cb1844a75..154654365d9 100644 --- a/packages/mobile/src/components/offline-placeholder/OnlineOnly.tsx +++ b/packages/mobile/src/components/offline-placeholder/OnlineOnly.tsx @@ -1,6 +1,6 @@ -import { reachabilitySelectors } from '@audius/common/store' import type { ReactNode } from 'react' +import { reachabilitySelectors } from '@audius/common/store' import { useSelector } from 'react-redux' const { getIsReachable } = reachabilitySelectors diff --git a/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx index 68492073ff5..6c7a2fa746c 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx @@ -1,3 +1,4 @@ +import type { OverflowActionCallbacks } from '@audius/common/store' import { cacheCollectionsSelectors, cacheUsersSelectors, @@ -5,12 +6,10 @@ import { deletePlaylistConfirmationModalUIActions, mobileOverflowMenuUISelectors, publishPlaylistConfirmationModalUIActions, - OverflowAction, - OverflowActionCallbacks + OverflowAction } from '@audius/common/store' -import { useContext } from 'react' -import type {} from '@audius/common' +import { useContext } from 'react' import { ShareSource, diff --git a/packages/mobile/src/components/overflow-menu-drawer/OverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/OverflowMenuDrawer.tsx index 4bfed4c1263..de73ba6f6b9 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/OverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/OverflowMenuDrawer.tsx @@ -3,7 +3,6 @@ import { OverflowAction, OverflowSource } from '@audius/common/store' - import { useSelector } from 'react-redux' import ActionDrawer from 'app/components/action-drawer' diff --git a/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx index 36bee3b0843..10c2ffbb579 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx @@ -1,13 +1,11 @@ +import type { CommonState, OverflowActionCallbacks } from '@audius/common/store' import { cacheUsersSelectors, usersSocialActions, mobileOverflowMenuUISelectors, shareModalUIActions, - OverflowAction, - CommonState, - OverflowActionCallbacks + OverflowAction } from '@audius/common/store' -import type {} from '@audius/common' import type { ID } from '@audius/common/models' import { ShareSource, FollowSource } from '@audius/common/models' diff --git a/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx index 1712b3de975..1e67c6d9930 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx @@ -1,3 +1,4 @@ +import type { CommonState, OverflowActionCallbacks } from '@audius/common/store' import { accountSelectors, cacheCollectionsActions, @@ -11,13 +12,10 @@ import { mobileOverflowMenuUISelectors, shareModalUIActions, OverflowAction, - playbackPositionActions, - CommonState, - OverflowActionCallbacks + playbackPositionActions } from '@audius/common/store' -import { useContext } from 'react' -import type {} from '@audius/common' +import { useContext } from 'react' import { ShareSource, diff --git a/packages/mobile/src/components/payment-method/CardSelectionButton.tsx b/packages/mobile/src/components/payment-method/CardSelectionButton.tsx index afd34422550..d61f2e7b553 100644 --- a/packages/mobile/src/components/payment-method/CardSelectionButton.tsx +++ b/packages/mobile/src/components/payment-method/CardSelectionButton.tsx @@ -1,7 +1,7 @@ -import { modalsActions } from '@audius/common/store' import { useCallback } from 'react' import type { PurchaseVendor } from '@audius/common/models' +import { modalsActions } from '@audius/common/store' import { TouchableOpacity } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/playback-rate-drawer/PlaybackRateDrawer.tsx b/packages/mobile/src/components/playback-rate-drawer/PlaybackRateDrawer.tsx index 8bc5dc22a34..e659240e409 100644 --- a/packages/mobile/src/components/playback-rate-drawer/PlaybackRateDrawer.tsx +++ b/packages/mobile/src/components/playback-rate-drawer/PlaybackRateDrawer.tsx @@ -1,8 +1,7 @@ -import { playerActions, PlaybackRate } from '@audius/common/store' import { useCallback, useMemo } from 'react' -import type {} from '@audius/common' - +import type { PlaybackRate } from '@audius/common/store' +import { playerActions } from '@audius/common/store' import { useDispatch } from 'react-redux' import ActionDrawer from '../action-drawer' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx index 38d00bedded..3edf6f3965f 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx @@ -1,15 +1,14 @@ +import type { PurchaseContentError } from '@audius/common/store' import { usePremiumContentPurchaseModal, purchaseContentActions, purchaseContentSelectors, PurchaseContentStage, PurchaseContentPage, - PurchaseContentError, isContentPurchaseInProgress } from '@audius/common/store' -import { useCallback, type ReactNode, useEffect } from 'react' -import type {} from '@audius/common' +import { useCallback, type ReactNode, useEffect } from 'react' import { useGetTrackById } from '@audius/common/api' import { diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts index b89c7abf2f7..ba897bf63a8 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts +++ b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseContentFormState.ts @@ -1,9 +1,8 @@ +import { useUSDCBalance } from '@audius/common/hooks' import { purchaseContentSelectors, isContentPurchaseInProgress } from '@audius/common/store' - -import { useUSDCBalance } from '@audius/common/hooks' import { useSelector } from 'react-redux' import { usePurchaseSummaryValues } from './usePurchaseSummaryValues' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts index fc6cc5cc955..79e22b1e85b 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts +++ b/packages/mobile/src/components/premium-track-purchase-drawer/hooks/usePurchaseSummaryValues.ts @@ -1,5 +1,3 @@ -import { getPurchaseSummaryValues } from '@audius/common/store' - import { useUSDCPurchaseConfig, usePayExtraPresets, @@ -9,6 +7,7 @@ import { AMOUNT_PRESET } from '@audius/common/hooks' import type { BNUSDC } from '@audius/common/models' +import { getPurchaseSummaryValues } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' diff --git a/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx b/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx index 313ac26cdd7..e12e4ff4697 100644 --- a/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx +++ b/packages/mobile/src/components/profile-actions-drawer/ProfileActionsDrawer.tsx @@ -1,12 +1,12 @@ +import { useCallback, useEffect, useMemo } from 'react' + +import { ShareSource } from '@audius/common/models' import { profilePageSelectors, chatActions, chatSelectors, shareModalUIActions } from '@audius/common/store' -import { useCallback, useEffect, useMemo } from 'react' - -import { ShareSource } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import ActionDrawer from 'app/components/action-drawer' diff --git a/packages/mobile/src/components/publish-playlist-drawer/PublishPlaylistDrawer.tsx b/packages/mobile/src/components/publish-playlist-drawer/PublishPlaylistDrawer.tsx index 4980c2a5060..b38f77ae800 100644 --- a/packages/mobile/src/components/publish-playlist-drawer/PublishPlaylistDrawer.tsx +++ b/packages/mobile/src/components/publish-playlist-drawer/PublishPlaylistDrawer.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { cacheCollectionsActions, publishPlaylistConfirmationModalUISelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/scrubber/Scrubber.tsx b/packages/mobile/src/components/scrubber/Scrubber.tsx index 46884b92bfe..aea70a21d0c 100644 --- a/packages/mobile/src/components/scrubber/Scrubber.tsx +++ b/packages/mobile/src/components/scrubber/Scrubber.tsx @@ -1,6 +1,6 @@ -import { playerActions } from '@audius/common/store' import { useCallback, useState } from 'react' +import { playerActions } from '@audius/common/store' import { formatSeconds } from '@audius/common/utils' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/scrubber/Slider.tsx b/packages/mobile/src/components/scrubber/Slider.tsx index 6a71ba61e60..8ce0bf8cdb4 100644 --- a/packages/mobile/src/components/scrubber/Slider.tsx +++ b/packages/mobile/src/components/scrubber/Slider.tsx @@ -1,6 +1,6 @@ -import { playerSelectors, playbackRateValueMap } from '@audius/common/store' import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' +import { playerSelectors, playbackRateValueMap } from '@audius/common/store' import { useAppState } from '@react-native-community/hooks' import type { GestureResponderEvent } from 'react-native' import { Easing, View, Animated, PanResponder } from 'react-native' diff --git a/packages/mobile/src/components/scrubber/usePosition.ts b/packages/mobile/src/components/scrubber/usePosition.ts index 031af89699d..0021ae700b6 100644 --- a/packages/mobile/src/components/scrubber/usePosition.ts +++ b/packages/mobile/src/components/scrubber/usePosition.ts @@ -1,6 +1,6 @@ -import { playerSelectors, playbackRateValueMap } from '@audius/common/store' import { useCallback, useEffect, useRef } from 'react' +import { playerSelectors, playbackRateValueMap } from '@audius/common/store' import { formatSeconds } from '@audius/common/utils' import { useAppState } from '@react-native-community/hooks' import type { TextInput } from 'react-native' diff --git a/packages/mobile/src/components/share-drawer/ShareDrawer.tsx b/packages/mobile/src/components/share-drawer/ShareDrawer.tsx index 2801e5acc70..aed0a7130c0 100644 --- a/packages/mobile/src/components/share-drawer/ShareDrawer.tsx +++ b/packages/mobile/src/components/share-drawer/ShareDrawer.tsx @@ -1,3 +1,7 @@ +import React, { useCallback, useRef } from 'react' + +import { Name, ShareSource } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, collectionsSocialActions, @@ -6,10 +10,6 @@ import { shareModalUISelectors, shareSoundToTiktokModalActions } from '@audius/common/store' -import React, { useCallback, useRef } from 'react' - -import { Name, ShareSource } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import Clipboard from '@react-native-clipboard/clipboard' import { Linking } from 'react-native' import ViewShot from 'react-native-view-shot' diff --git a/packages/mobile/src/components/share-drawer/messages.ts b/packages/mobile/src/components/share-drawer/messages.ts index 7216821596f..66b1f084bab 100644 --- a/packages/mobile/src/components/share-drawer/messages.ts +++ b/packages/mobile/src/components/share-drawer/messages.ts @@ -1,5 +1,4 @@ -import { ShareType } from '@audius/common/store' - import type { } from '@audius/common' +import type { ShareType } from '@audius/common/store' const shareTypeMap: Record = { track: 'Track', diff --git a/packages/mobile/src/components/share-drawer/useShareToStory.tsx b/packages/mobile/src/components/share-drawer/useShareToStory.tsx index b5b5b8a3d5a..65e82ac0bc4 100644 --- a/packages/mobile/src/components/share-drawer/useShareToStory.tsx +++ b/packages/mobile/src/components/share-drawer/useShareToStory.tsx @@ -1,13 +1,12 @@ -import { modalsActions, ShareContent } from '@audius/common/store' import { useCallback, useMemo, useRef, useState } from 'react' import EventEmitter from 'events' import path from 'path' -import type {} from '@audius/common' - import { ErrorLevel, SquareSizes } from '@audius/common/models' import type { Color } from '@audius/common/models' +import { modalsActions } from '@audius/common/store' +import type { ShareContent } from '@audius/common/store' import { encodeHashId, uuid } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { diff --git a/packages/mobile/src/components/share-drawer/utils.ts b/packages/mobile/src/components/share-drawer/utils.ts index 86b806e3e63..f44c082e4ce 100644 --- a/packages/mobile/src/components/share-drawer/utils.ts +++ b/packages/mobile/src/components/share-drawer/utils.ts @@ -1,5 +1,4 @@ -import { ShareContent } from '@audius/common/store' - import type { } from '@audius/common' +import type { ShareContent } from '@audius/common/store' import { makeTwitterShareUrl } from '@audius/common/utils' import { audiusBackendInstance } from 'app/services/audius-backend-instance' diff --git a/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx b/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx index ee5a798394c..72e0c5b99e6 100644 --- a/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx +++ b/packages/mobile/src/components/share-to-tiktok-drawer/ShareToTikTokDrawer.tsx @@ -1,10 +1,10 @@ +import { useMemo } from 'react' + import { shareSoundToTiktokModalActions, shareSoundToTiktokModalSelectors, ShareSoundToTiktokModalStatus } from '@audius/common/store' -import { useMemo } from 'react' - import type { Nullable } from '@audius/common/utils' import { View } from 'react-native' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/sign-out-confirmation-drawer/SignOutConfirmationDrawer.tsx b/packages/mobile/src/components/sign-out-confirmation-drawer/SignOutConfirmationDrawer.tsx index 49cee5e90df..a0e6f0a81ae 100644 --- a/packages/mobile/src/components/sign-out-confirmation-drawer/SignOutConfirmationDrawer.tsx +++ b/packages/mobile/src/components/sign-out-confirmation-drawer/SignOutConfirmationDrawer.tsx @@ -1,6 +1,6 @@ -import { signOutActions } from '@audius/common/store' import { useCallback } from 'react' +import { signOutActions } from '@audius/common/store' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampDrawer.tsx b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampDrawer.tsx index 1647dc10fe2..295420e751e 100644 --- a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampDrawer.tsx +++ b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampDrawer.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { stripeModalUIActions, stripeModalUISelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { TouchableOpacity, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx index 912c292579b..827e7df12db 100644 --- a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx +++ b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx @@ -1,11 +1,10 @@ +import { useCallback } from 'react' + +import type { StripeSessionData } from '@audius/common/store' import { stripeModalUIActions, - stripeModalUISelectors, - StripeSessionData + stripeModalUISelectors } from '@audius/common/store' -import { useCallback } from 'react' - -import type {} from '@audius/common' import { View } from 'react-native' import { WebView } from 'react-native-webview' diff --git a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx index c3e34a065d3..a24a2dccc73 100644 --- a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx +++ b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx @@ -1,7 +1,7 @@ -import { CommonState } from '@audius/common/store' - import { useCallback } from 'react' +import type { CommonState } from '@audius/common/store' + +import { useCallback } from 'react' -import type { } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import type { ID } from '@audius/common/models' import { removeNullable } from '@audius/common/utils' diff --git a/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx b/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx index 705d8729320..1de7804eacd 100644 --- a/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx +++ b/packages/mobile/src/components/suggested-tracks/components/SuggestedTracks.tsx @@ -1,9 +1,9 @@ -import { cacheUsersSelectors } from '@audius/common/store' import { Fragment, useCallback, useEffect, useRef } from 'react' import type { SuggestedTrack } from '@audius/common/api' import { SquareSizes } from '@audius/common/models' import type { ID, Track } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import { Animated, LayoutAnimation, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/toasts/Toast.tsx b/packages/mobile/src/components/toasts/Toast.tsx index afce2e84a15..bcdf0a96faa 100644 --- a/packages/mobile/src/components/toasts/Toast.tsx +++ b/packages/mobile/src/components/toasts/Toast.tsx @@ -1,11 +1,8 @@ -import { - toastActions, - ToastType, - Toast as ToastType -} from '@audius/common/store' import { useRef, useCallback, useEffect } from 'react' import type { as } from '@audius/common' +import type { ToastType, Toast as ToastType } from '@audius/common/store' +import { toastActions } from '@audius/common/store' import { Link } from '@react-navigation/native' import type { To } from '@react-navigation/native/lib/typescript/src/useLinkTo' import { Animated, View } from 'react-native' diff --git a/packages/mobile/src/components/toasts/Toasts.tsx b/packages/mobile/src/components/toasts/Toasts.tsx index 4ce795b3909..ee786c38dc0 100644 --- a/packages/mobile/src/components/toasts/Toasts.tsx +++ b/packages/mobile/src/components/toasts/Toasts.tsx @@ -1,5 +1,4 @@ import { toastSelectors } from '@audius/common/store' - import { useSelector } from 'react-redux' import { Toast } from './Toast' diff --git a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx index 0fbf2707aad..9d43278bb7d 100644 --- a/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx +++ b/packages/mobile/src/components/track-details-tile/TrackDetailsTile.tsx @@ -1,4 +1,3 @@ -import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common/store' import type { ComponentType } from 'react' import { useMemo } from 'react' @@ -10,6 +9,7 @@ import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { ID } from '@audius/common/models' +import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common/store' import { getDogEarType } from '@audius/common/utils' import type { ColorValue } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/components/track-list/TrackListItem.tsx b/packages/mobile/src/components/track-list/TrackListItem.tsx index c5d17bce002..7e7ae73a9c4 100644 --- a/packages/mobile/src/components/track-list/TrackListItem.tsx +++ b/packages/mobile/src/components/track-list/TrackListItem.tsx @@ -1,3 +1,9 @@ +import type { ComponentType } from 'react' +import { memo, useCallback, useMemo, useState } from 'react' + +import { useGatedContentAccess } from '@audius/common/hooks' +import type { Collection, ID, UID, Track, User } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, cacheCollectionsSelectors, @@ -9,12 +15,6 @@ import { playerSelectors, playbackPositionSelectors } from '@audius/common/store' -import type { ComponentType } from 'react' -import { memo, useCallback, useMemo, useState } from 'react' - -import { useGatedContentAccess } from '@audius/common/hooks' -import type { Collection, ID, UID, Track, User } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { Genre, removeNullable } from '@audius/common/utils' import type { NativeSyntheticEvent, diff --git a/packages/mobile/src/components/track-list/types.ts b/packages/mobile/src/components/track-list/types.ts index d1010def7a0..eae25ffe4f0 100644 --- a/packages/mobile/src/components/track-list/types.ts +++ b/packages/mobile/src/components/track-list/types.ts @@ -1,6 +1,5 @@ -import { lineupSelectors , CommonState } from '@audius/common/store' - import type { } from '@audius/common' import type { LineupTrack } from '@audius/common/models' +import type { lineupSelectors, CommonState } from '@audius/common/store' import type { SetOptional } from 'type-fest' export type TrackMetadata = SetOptional< diff --git a/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx b/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx index 30ede0e15fa..7f27638c2bf 100644 --- a/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx +++ b/packages/mobile/src/components/trending-rewards-drawer/TrendingRewardsDrawer.tsx @@ -1,15 +1,12 @@ -import type { TrendingRewardsModalType } from '@audius/common/store' -import { - audioRewardsPageSelectors, - audioRewardsPageActions -} from '@audius/common/store' - import { useCallback } from 'react' -import type {} from '@audius/common' - import { Theme } from '@audius/common/models' import { StringKeys } from '@audius/common/services' +import { + audioRewardsPageSelectors, + audioRewardsPageActions +} from '@audius/common/store' +import type { TrendingRewardsModalType } from '@audius/common/store' import type { ImageStyle } from 'react-native' import { Image, ScrollView, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/twitter-button/TwitterButton.tsx b/packages/mobile/src/components/twitter-button/TwitterButton.tsx index 3458ec3acb8..31d80690877 100644 --- a/packages/mobile/src/components/twitter-button/TwitterButton.tsx +++ b/packages/mobile/src/components/twitter-button/TwitterButton.tsx @@ -1,7 +1,7 @@ -import { cacheUsersActions, cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' import { useTwitterButtonStatus } from '@audius/common/hooks' +import { cacheUsersActions, cacheUsersSelectors } from '@audius/common/store' import { makeTwitterShareUrl } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/user/FollowButton.tsx b/packages/mobile/src/components/user/FollowButton.tsx index 95541f599eb..dd42e351eb2 100644 --- a/packages/mobile/src/components/user/FollowButton.tsx +++ b/packages/mobile/src/components/user/FollowButton.tsx @@ -1,7 +1,7 @@ -import { cacheUsersSelectors, usersSocialActions } from '@audius/common/store' import { useCallback } from 'react' import type { FollowSource, ID } from '@audius/common/models' +import { cacheUsersSelectors, usersSocialActions } from '@audius/common/store' import type { GestureResponderEvent, StyleProp, ViewStyle } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/user/FollowsYouChip.tsx b/packages/mobile/src/components/user/FollowsYouChip.tsx index e62a4aa0824..1b49760c7a7 100644 --- a/packages/mobile/src/components/user/FollowsYouChip.tsx +++ b/packages/mobile/src/components/user/FollowsYouChip.tsx @@ -1,6 +1,5 @@ -import { accountSelectors } from '@audius/common/store' - import type { ID } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/vip-discord-drawer/VipDiscordDrawer.tsx b/packages/mobile/src/components/vip-discord-drawer/VipDiscordDrawer.tsx index 10b770bee85..4cfcbc9d52f 100644 --- a/packages/mobile/src/components/vip-discord-drawer/VipDiscordDrawer.tsx +++ b/packages/mobile/src/components/vip-discord-drawer/VipDiscordDrawer.tsx @@ -1,5 +1,4 @@ import { vipDiscordModalSelectors } from '@audius/common/store' - import { AUDIUS_DISCORD_LINK } from 'audius-client/src/utils/route' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx b/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx index 1b74e7a7654..c2be99a3238 100644 --- a/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx +++ b/packages/mobile/src/harmony-native/components/TextLink/ExternalLink.tsx @@ -1,6 +1,6 @@ -import { useLeavingAudiusModal } from '@audius/common/store' import { useCallback } from 'react' +import { useLeavingAudiusModal } from '@audius/common/store' import { isAllowedExternalLink } from '@audius/common/utils' import type { GestureResponderEvent, diff --git a/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx b/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx index 038e7264d03..a0110746da8 100644 --- a/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx +++ b/packages/mobile/src/harmony-native/foundations/color/Color.stories.tsx @@ -1,6 +1,5 @@ -import { themeActions, themeSelectors } from '@audius/common/store' - import { Theme } from '@audius/common/models' +import { themeActions, themeSelectors } from '@audius/common/store' import { SectionList, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/hooks/useManualToast.ts b/packages/mobile/src/hooks/useManualToast.ts index 13c766caf8b..2d4bdb07cc7 100644 --- a/packages/mobile/src/hooks/useManualToast.ts +++ b/packages/mobile/src/hooks/useManualToast.ts @@ -3,8 +3,6 @@ import { useCallback } from 'react' import type { Toast } from '@audius/common/store' import { toastActions } from '@audius/common/store' -import type {} from '@audius/common' - import { uuid } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/hooks/useNotificationNavigation.ts b/packages/mobile/src/hooks/useNotificationNavigation.ts index 7f765b616e0..4564dd0d8a7 100644 --- a/packages/mobile/src/hooks/useNotificationNavigation.ts +++ b/packages/mobile/src/hooks/useNotificationNavigation.ts @@ -49,8 +49,6 @@ import { notificationsUserListActions } from '@audius/common/store' -import type {} from '@audius/common' - import type { AppState } from 'audius-client/src/store/types' import { useDispatch, useStore } from 'react-redux' diff --git a/packages/mobile/src/hooks/useToast.ts b/packages/mobile/src/hooks/useToast.ts index e8100d9522b..e5966e1bbbb 100644 --- a/packages/mobile/src/hooks/useToast.ts +++ b/packages/mobile/src/hooks/useToast.ts @@ -3,8 +3,6 @@ import { useCallback } from 'react' import type { Toast } from '@audius/common/store' import { toastActions } from '@audius/common/store' -import type {} from '@audius/common' - import { uuid } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/ai-generated-tracks-screen/AiGeneratedTracksScreen.tsx b/packages/mobile/src/screens/ai-generated-tracks-screen/AiGeneratedTracksScreen.tsx index 907cbf438ce..6b8cf26b9d0 100644 --- a/packages/mobile/src/screens/ai-generated-tracks-screen/AiGeneratedTracksScreen.tsx +++ b/packages/mobile/src/screens/ai-generated-tracks-screen/AiGeneratedTracksScreen.tsx @@ -1,11 +1,11 @@ +import { useCallback, useEffect } from 'react' + import { lineupSelectors, aiPageLineupActions as tracksActions, aiPageActions, aiPageSelectors } from '@audius/common/store' -import { useCallback, useEffect } from 'react' - import { TouchableOpacity, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx index 36bccd84748..29e91dee4e7 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/AccountDetails.tsx @@ -1,7 +1,7 @@ -import { accountSelectors } from '@audius/common/store' import { useCallback, useContext } from 'react' import type { User } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { TouchableOpacity, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx index 8720be49eaa..b62c248665f 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/LeftNavDrawer.tsx @@ -1,9 +1,8 @@ -import { accountSelectors, chatSelectors } from '@audius/common/store' - import { useAccountHasClaimableRewards } from '@audius/common/hooks' import type { User } from '@audius/common/models' import { Name } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' +import { accountSelectors, chatSelectors } from '@audius/common/store' import type { DrawerContentComponentProps } from '@react-navigation/drawer' import { DrawerContentScrollView } from '@react-navigation/drawer' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx index a90bb599433..d2a507d85fe 100644 --- a/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx +++ b/packages/mobile/src/screens/app-drawer-screen/left-nav-drawer/VanityMetrics.tsx @@ -1,12 +1,12 @@ +import type { ComponentType } from 'react' +import { useCallback, useContext } from 'react' + +import type { User } from '@audius/common/models' import { accountSelectors, followingUserListActions, followersUserListActions } from '@audius/common/store' -import type { ComponentType } from 'react' -import { useCallback, useContext } from 'react' - -import type { User } from '@audius/common/models' import { formatCount } from '@audius/common/utils' import { View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx b/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx index 4fb7932ac93..0522edb7244 100644 --- a/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx +++ b/packages/mobile/src/screens/app-screen/AccountPictureHeader.tsx @@ -1,7 +1,6 @@ -import { accountSelectors, chatSelectors } from '@audius/common/store' - import { useAccountHasClaimableRewards } from '@audius/common/hooks' import { StringKeys, FeatureFlags } from '@audius/common/services' +import { accountSelectors, chatSelectors } from '@audius/common/store' import { useDrawerProgress } from '@react-navigation/drawer' import { View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/app-screen/AppTabScreen.tsx b/packages/mobile/src/screens/app-screen/AppTabScreen.tsx index 5bb6a84503c..a497cb761ab 100644 --- a/packages/mobile/src/screens/app-screen/AppTabScreen.tsx +++ b/packages/mobile/src/screens/app-screen/AppTabScreen.tsx @@ -1,11 +1,11 @@ -import { NotificationType, RepostType, CreateChatModalState - } from '@audius/common/store' - import { useCallback, useContext, useEffect } from 'react' - import type { - - - } from '@audius/common' + NotificationType, + RepostType, + CreateChatModalState +} from '@audius/common/store' + +import { useCallback, useContext, useEffect } from 'react' + import type { FavoriteType, TipSource, diff --git a/packages/mobile/src/screens/app-screen/AppTabsScreen.tsx b/packages/mobile/src/screens/app-screen/AppTabsScreen.tsx index 774b33d8b9e..a9f34d505dd 100644 --- a/packages/mobile/src/screens/app-screen/AppTabsScreen.tsx +++ b/packages/mobile/src/screens/app-screen/AppTabsScreen.tsx @@ -1,6 +1,6 @@ -import { walletActions } from '@audius/common/store' import { useEffect } from 'react' +import { walletActions } from '@audius/common/store' import { useAppState } from '@react-native-community/hooks' import type { BottomTabBarProps } from '@react-navigation/bottom-tabs' import { createBottomTabNavigator } from '@react-navigation/bottom-tabs' diff --git a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx index d65a026ddcc..dc354c6352f 100644 --- a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx +++ b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx @@ -1,3 +1,4 @@ +import type { CommonState } from '@audius/common/store' import { tokenDashboardPageSelectors, tokenDashboardPageActions, @@ -5,12 +6,10 @@ import { walletActions, getTierAndNumberForBalance, vipDiscordModalActions, - modalsActions, - CommonState + modalsActions } from '@audius/common/store' -import { useCallback, useEffect } from 'react' -import type {} from '@audius/common' +import { useCallback, useEffect } from 'react' import type { StringWei } from '@audius/common/models' import { StringKeys } from '@audius/common/services' diff --git a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx index 4479c1ea197..1e3f2b3a36b 100644 --- a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx @@ -1,14 +1,15 @@ +import type { + ChallengeRewardsModalType, + CommonState +} from '@audius/common/store' import { challengesSelectors, audioRewardsPageSelectors, audioRewardsPageActions, - modalsActions, - ChallengeRewardsModalType, - CommonState + modalsActions } from '@audius/common/store' -import { useCallback, useEffect, useState } from 'react' -import type {} from '@audius/common' +import { useCallback, useEffect, useState } from 'react' import { Name, ChallengeName } from '@audius/common/models' import type { ChallengeRewardID } from '@audius/common/models' diff --git a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx index 39ea5e667cc..843ab65da70 100644 --- a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx @@ -1,11 +1,6 @@ -import { - audioRewardsPageActions, - modalsActions, - TrendingRewardsModalType, - Modals -} from '@audius/common/store' +import type { TrendingRewardsModalType, Modals } from '@audius/common/store' +import { audioRewardsPageActions, modalsActions } from '@audius/common/store' -import type {} from '@audius/common' import type { ChallengeRewardID } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx b/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx index 1cdecc1e8ba..32b27e7a718 100644 --- a/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx +++ b/packages/mobile/src/screens/change-password-screen/ChangePasswordScreen.tsx @@ -1,11 +1,11 @@ +import { useCallback, useEffect, useState } from 'react' + +import { Status } from '@audius/common/models' import { changePasswordSelectors, changePasswordActions, ChangePasswordPageStep } from '@audius/common/store' -import { useCallback, useEffect, useState } from 'react' - -import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx b/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx index 44a4f79cc43..756308e979c 100644 --- a/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx +++ b/packages/mobile/src/screens/change-password-screen/ConfirmCredentials.tsx @@ -1,10 +1,10 @@ +import { useEffect, useState } from 'react' + +import { Status } from '@audius/common/models' import { changePasswordSelectors, changePasswordActions } from '@audius/common/store' -import { useEffect, useState } from 'react' - -import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatListItem.tsx index d4d0ce25748..a5c2d57c898 100644 --- a/packages/mobile/src/screens/chat-screen/ChatListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatListItem.tsx @@ -1,7 +1,7 @@ -import { chatSelectors } from '@audius/common/store' import { useCallback, useMemo } from 'react' import { useProxySelector } from '@audius/common/hooks' +import { chatSelectors } from '@audius/common/store' import { View, TouchableHighlight } from 'react-native' import { Text } from 'app/components/core' diff --git a/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx index 7dc2824466f..85363600780 100644 --- a/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatListScreen.tsx @@ -1,7 +1,7 @@ -import { chatActions, chatSelectors } from '@audius/common/store' import { useCallback, useEffect } from 'react' import { Status } from '@audius/common/models' +import { chatActions, chatSelectors } from '@audius/common/store' import { View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx index b6ee3da957c..faace2c3785 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx @@ -1,11 +1,7 @@ -import { - accountSelectors, - chatSelectors, - ReactionTypes -} from '@audius/common/store' import { memo, useCallback, useState } from 'react' -import type {} from '@audius/common' +import type { ReactionTypes } from '@audius/common/store' +import { accountSelectors, chatSelectors } from '@audius/common/store' import { Status } from '@audius/common/models' import { diff --git a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx index d0f02ae715c..2885a4fdd53 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx @@ -1,12 +1,11 @@ +import type { ChatMessageTileProps } from '@audius/common/store' import { accountSelectors, QueueSource, - playerSelectors, - ChatMessageTileProps + playerSelectors } from '@audius/common/store' -import { useCallback, useMemo, useEffect } from 'react' -import type {} from '@audius/common' +import { useCallback, useMemo, useEffect } from 'react' import { useGetTracksByIds, diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx index 5af07a34523..5cf789053ee 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx @@ -1,11 +1,7 @@ -import { - accountSelectors, - QueueSource, - ChatMessageTileProps -} from '@audius/common/store' -import { useCallback, useEffect, useMemo } from 'react' +import type { ChatMessageTileProps } from '@audius/common/store' +import { accountSelectors, QueueSource } from '@audius/common/store' -import type {} from '@audius/common' +import { useCallback, useEffect, useMemo } from 'react' import { useGetTrackByPermalink } from '@audius/common/api' import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' diff --git a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx index 39abfbccfbf..58c251a92bd 100644 --- a/packages/mobile/src/screens/chat-screen/ChatScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatScreen.tsx @@ -1,14 +1,14 @@ +import { useCallback, useEffect, useMemo, useRef } from 'react' + +import { useCanSendMessage } from '@audius/common/hooks' +import { Status } from '@audius/common/models' +import type { ChatMessageWithExtras } from '@audius/common/models' import { accountSelectors, chatActions, chatSelectors, playerSelectors } from '@audius/common/store' -import { useCallback, useEffect, useMemo, useRef } from 'react' - -import { useCanSendMessage } from '@audius/common/hooks' -import { Status } from '@audius/common/models' -import type { ChatMessageWithExtras } from '@audius/common/models' import { encodeUrlName, decodeHashId, diff --git a/packages/mobile/src/screens/chat-screen/ChatTextInput.tsx b/packages/mobile/src/screens/chat-screen/ChatTextInput.tsx index 49e87ec4d91..3c1671e533a 100644 --- a/packages/mobile/src/screens/chat-screen/ChatTextInput.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatTextInput.tsx @@ -1,6 +1,6 @@ -import { chatActions, playerSelectors } from '@audius/common/store' import { useCallback, useState } from 'react' +import { chatActions, playerSelectors } from '@audius/common/store' import { Platform, Pressable } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx b/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx index 87ec84d0ad7..754e5b9477e 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUnavailable.tsx @@ -1,7 +1,7 @@ -import { ChatPermissionAction } from '@audius/common/store' import { useCallback, useMemo } from 'react' import { useCanSendMessage } from '@audius/common/hooks' +import { ChatPermissionAction } from '@audius/common/store' import { CHAT_BLOG_POST_URL } from '@audius/common/utils' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx index dfccd4458ed..4baf1fbe356 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx @@ -1,3 +1,5 @@ +import { useCallback } from 'react' + import { accountSelectors, cacheUsersSelectors, @@ -6,8 +8,6 @@ import { ChatPermissionAction, useInboxUnavailableModal } from '@audius/common/store' -import { useCallback } from 'react' - import { formatCount } from '@audius/common/utils' import { useSelector } from 'audius-client/src/common/hooks/useSelector' import { View, TouchableOpacity, Keyboard } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx index 7b2dcb84b41..eddbdbcbd88 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx @@ -1,3 +1,4 @@ +import type { CreateChatModalState } from '@audius/common/store' import { accountSelectors, cacheUsersSelectors, @@ -8,12 +9,10 @@ import { userListActions, followersUserListActions, followersUserListSelectors, - FOLLOWERS_USER_LIST_TAG, - CreateChatModalState + FOLLOWERS_USER_LIST_TAG } from '@audius/common/store' -import { useCallback, useEffect, useState } from 'react' -import type {} from '@audius/common' +import { useCallback, useEffect, useState } from 'react' import { useProxySelector } from '@audius/common/hooks' import { Status, statusIsNotFinalized } from '@audius/common/models' diff --git a/packages/mobile/src/screens/chat-screen/LinkPreview.tsx b/packages/mobile/src/screens/chat-screen/LinkPreview.tsx index ab0acfec6f9..5737374edcb 100644 --- a/packages/mobile/src/screens/chat-screen/LinkPreview.tsx +++ b/packages/mobile/src/screens/chat-screen/LinkPreview.tsx @@ -1,7 +1,7 @@ -import { useLeavingAudiusModal } from '@audius/common/store' import { useCallback, useEffect } from 'react' import { useLinkUnfurlMetadata } from '@audius/common/hooks' +import { useLeavingAudiusModal } from '@audius/common/store' import { isAudiusUrl, isAllowedExternalLink } from '@audius/common/utils' import type { GestureResponderEvent, ViewStyle } from 'react-native' import { View, Image, Pressable } from 'react-native' diff --git a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx index 126bb6d80e3..a613c3706a9 100644 --- a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx +++ b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx @@ -1,11 +1,7 @@ -import { - accountSelectors, - chatActions, - ReactionTypes -} from '@audius/common/store' import { useCallback, useRef } from 'react' -import type {} from '@audius/common' +import type { ReactionTypes } from '@audius/common/store' +import { accountSelectors, chatActions } from '@audius/common/store' import type { ChatMessageWithExtras } from '@audius/common/models' import { encodeHashId } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/chat-screen/ResendMessageButton.tsx b/packages/mobile/src/screens/chat-screen/ResendMessageButton.tsx index f0e76de75ed..1dbd259fb89 100644 --- a/packages/mobile/src/screens/chat-screen/ResendMessageButton.tsx +++ b/packages/mobile/src/screens/chat-screen/ResendMessageButton.tsx @@ -1,6 +1,6 @@ -import { chatActions, chatSelectors } from '@audius/common/store' import { useCallback } from 'react' +import { chatActions, chatSelectors } from '@audius/common/store' import { View, TouchableOpacity } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx b/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx index 22a3332d63e..51c9d8b9808 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionHeader.tsx @@ -1,13 +1,13 @@ -import { - accountSelectors, - collectionPageSelectors, - reachabilitySelectors -} from '@audius/common/store' import { useLayoutEffect, useState } from 'react' import { useThrottledCallback } from '@audius/common/hooks' import { Variant } from '@audius/common/models' import type { SmartCollectionVariant, Collection } from '@audius/common/models' +import { + accountSelectors, + collectionPageSelectors, + reachabilitySelectors +} from '@audius/common/store' import { View } from 'react-native' import { useSelector, useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx index c6209e02681..e13f65808f9 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreen.tsx @@ -1,17 +1,3 @@ -import { - accountSelectors, - collectionPageSelectors, - collectionPageActions, - collectionsSocialActions, - mobileOverflowMenuUIActions, - publishPlaylistConfirmationModalUIActions, - shareModalUIActions, - OverflowAction, - OverflowSource, - repostsUserListActions, - favoritesUserListActions, - RepostType -} from '@audius/common/store' import { useCallback, useMemo } from 'react' import { useFeatureFlag } from '@audius/common/hooks' @@ -29,6 +15,20 @@ import type { User } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + collectionPageSelectors, + collectionPageActions, + collectionsSocialActions, + mobileOverflowMenuUIActions, + publishPlaylistConfirmationModalUIActions, + shareModalUIActions, + OverflowAction, + OverflowSource, + repostsUserListActions, + favoritesUserListActions, + RepostType +} from '@audius/common/store' import { encodeUrlName, formatDate, removeNullable } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx b/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx index b26cbb8d33b..bf75f782ef4 100644 --- a/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/collection-screen/CollectionScreenDetailsTile.tsx @@ -1,3 +1,7 @@ +import { useCallback, useEffect, useMemo } from 'react' + +import { Name, PlaybackSource, Status } from '@audius/common/models' +import type { SmartCollectionVariant, ID, UID } from '@audius/common/models' import { cacheCollectionsSelectors, collectionPageLineupActions as tracksActions, @@ -5,10 +9,6 @@ import { reachabilitySelectors, playerSelectors } from '@audius/common/store' -import { useCallback, useEffect, useMemo } from 'react' - -import { Name, PlaybackSource, Status } from '@audius/common/models' -import type { SmartCollectionVariant, ID, UID } from '@audius/common/models' import { formatSecondsAsText, removeNullable } from '@audius/common/utils' import type { Maybe } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts b/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts index 3d1bff74de0..d0c4245635f 100644 --- a/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts +++ b/packages/mobile/src/screens/collection-screen/useFetchCollectionLineup.ts @@ -1,3 +1,7 @@ +import { useCallback } from 'react' + +import type { SmartCollectionVariant } from '@audius/common/models' +import { Kind } from '@audius/common/models' import { cacheCollectionsSelectors, cacheActions, @@ -5,10 +9,6 @@ import { collectionPageSelectors, queueSelectors } from '@audius/common/store' -import { useCallback } from 'react' - -import type { SmartCollectionVariant } from '@audius/common/models' -import { Kind } from '@audius/common/models' import { areSetsEqual, Uid, makeUid } from '@audius/common/utils' import moment from 'moment' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx index d237ca16bcf..ad07d165d4b 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx @@ -1,10 +1,8 @@ -import { - deletePlaylistConfirmationModalUIActions, - EditPlaylistValues -} from '@audius/common/store' import { useCallback } from 'react' -import type {} from '@audius/common' +import type { EditPlaylistValues } from '@audius/common/store' +import { deletePlaylistConfirmationModalUIActions } from '@audius/common/store' + import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import type { FormikProps } from 'formik' import { capitalize } from 'lodash' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx index 8a4ce526bd9..5ed6e63f599 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx @@ -1,11 +1,10 @@ +import { useCallback } from 'react' + +import type { EditPlaylistValues } from '@audius/common/store' import { cacheCollectionsActions, - cacheCollectionsSelectors, - EditPlaylistValues + cacheCollectionsSelectors } from '@audius/common/store' -import { useCallback } from 'react' - -import type {} from '@audius/common' import { SquareSizes } from '@audius/common/models' import { Formik } from 'formik' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx index f83f38d1aed..49fc3917c98 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx @@ -1,5 +1,5 @@ -import { EditPlaylistValues } from '@audius/common/store' - import type { } from '@audius/common' +import type { EditPlaylistValues } from '@audius/common/store' + import { createNativeStackNavigator } from '@react-navigation/native-stack' import type { FormikProps } from 'formik' diff --git a/packages/mobile/src/screens/edit-playlist-screen/types.ts b/packages/mobile/src/screens/edit-playlist-screen/types.ts index 51f119452cc..521b722236f 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/types.ts +++ b/packages/mobile/src/screens/edit-playlist-screen/types.ts @@ -1,5 +1,4 @@ -import { Image, EditPlaylistValues } from '@audius/common/store' - import type { } from '@audius/common' +import type { Image, EditPlaylistValues } from '@audius/common/store' export type UpdatedPlaylist = Omit & { updatedCoverArt?: Image diff --git a/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx b/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx index c251af8f435..e24d41593f0 100644 --- a/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx +++ b/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx @@ -1,8 +1,8 @@ -import { accountSelectors, profilePageActions } from '@audius/common/store' import { useCallback } from 'react' import type { UserMetadata } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' +import { accountSelectors, profilePageActions } from '@audius/common/store' import type { FormikProps } from 'formik' import { Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx index 308c51b3538..6061e6038dc 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx @@ -1,8 +1,8 @@ -import { UploadTrack } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' import { type } from '@audius/common' import { FeatureFlags } from '@audius/common/services' +import type { UploadTrack } from '@audius/common/store' import { Keyboard } from 'react-native' import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx index 2fe218cb4cb..340b61296ab 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx @@ -1,11 +1,7 @@ -import { - cacheTracksActions, - cacheTracksSelectors, - ExtendedTrackMetadata -} from '@audius/common/store' import { useCallback } from 'react' -import type {} from '@audius/common' +import type { ExtendedTrackMetadata } from '@audius/common/store' +import { cacheTracksActions, cacheTracksSelectors } from '@audius/common/store' import { SquareSizes } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx index 46a9a969971..f6cb8623db7 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx @@ -1,7 +1,7 @@ -import { UploadTrack } from '@audius/common/store' - import { useCallback, useMemo } from 'react' +import type { UploadTrack } from '@audius/common/store' + +import { useCallback, useMemo } from 'react' -import type { } from '@audius/common' import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { isContentUSDCPurchaseGated } from '@audius/common/models' import { creativeCommons, formatPrice } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx b/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx index 9c31cc9e030..bffcbc253e5 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx +++ b/packages/mobile/src/screens/edit-track-screen/components/CollectibleGatedAvailability.tsx @@ -1,8 +1,8 @@ -import { collectiblesSelectors } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' import { isContentCollectibleGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import { collectiblesSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import { View, Image, Dimensions } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx b/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx index d2c3ff32b45..50304ba5246 100644 --- a/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx +++ b/packages/mobile/src/screens/edit-track-screen/components/SpecialAccessAvailability.tsx @@ -1,8 +1,8 @@ -import { accountSelectors } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' import { isContentFollowGated, isContentTipGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import { Dimensions, View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/fields/RemixSettingsField.tsx b/packages/mobile/src/screens/edit-track-screen/fields/RemixSettingsField.tsx index 2aa642a2f81..4f1c27b3c37 100644 --- a/packages/mobile/src/screens/edit-track-screen/fields/RemixSettingsField.tsx +++ b/packages/mobile/src/screens/edit-track-screen/fields/RemixSettingsField.tsx @@ -1,5 +1,4 @@ import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common/store' - import { useField } from 'formik' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx index cc824d24a88..014e3b4574d 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/NFTCollectionsScreen.tsx @@ -1,8 +1,8 @@ -import { collectiblesSelectors } from '@audius/common/store' import { useCallback, useMemo } from 'react' import { Chain, isContentCollectibleGated } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' +import { collectiblesSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' import { View, Image } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx index 22ced702563..77b5596a767 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/ReleaseDateScreen.tsx @@ -1,7 +1,7 @@ -import { remixSettingsActions } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' import { Theme } from '@audius/common/models' +import { remixSettingsActions } from '@audius/common/store' import { dayjs, removeNullable } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { useField } from 'formik' diff --git a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx index a739eb771a5..78c965f56e7 100644 --- a/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/screens/RemixSettingsScreen.tsx @@ -1,7 +1,3 @@ -import { - remixSettingsSelectors, - remixSettingsActions -} from '@audius/common/store' import { useCallback, useEffect, useMemo, useState } from 'react' import { useGatedContentAccess } from '@audius/common/hooks' @@ -12,6 +8,10 @@ import { } from '@audius/common/models' import type { AccessConditions } from '@audius/common/models' import { createRemixOfMetadata } from '@audius/common/schemas' +import { + remixSettingsSelectors, + remixSettingsActions +} from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useFocusEffect } from '@react-navigation/native' import { useField } from 'formik' diff --git a/packages/mobile/src/screens/edit-track-screen/types.ts b/packages/mobile/src/screens/edit-track-screen/types.ts index dc5155b4b19..71fa814bbc4 100644 --- a/packages/mobile/src/screens/edit-track-screen/types.ts +++ b/packages/mobile/src/screens/edit-track-screen/types.ts @@ -1,5 +1,5 @@ -import { ExtendedTrackMetadata } from '@audius/common/store' - import type { } from '@audius/common' +import type { ExtendedTrackMetadata } from '@audius/common/store' + import type { Nullable } from '@audius/common/utils' import type { FormikProps } from 'formik' diff --git a/packages/mobile/src/screens/explore-screen/ExploreScreen.tsx b/packages/mobile/src/screens/explore-screen/ExploreScreen.tsx index 6a414fb60ed..666fc959ebb 100644 --- a/packages/mobile/src/screens/explore-screen/ExploreScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/ExploreScreen.tsx @@ -1,5 +1,4 @@ import { explorePageActions } from '@audius/common/store' - import { useDispatch } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx index 8a667f1dbe8..1b0650ac85e 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ArtistsTab.tsx @@ -1,8 +1,8 @@ -import { explorePageSelectors, explorePageActions } from '@audius/common/store' import { useEffect } from 'react' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' +import { explorePageSelectors, explorePageActions } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { ProfileList } from 'app/components/profile-list' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/ForYouTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/ForYouTab.tsx index be7ed10c076..900bce2ab4c 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/ForYouTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/ForYouTab.tsx @@ -1,6 +1,6 @@ -import { ExploreCollectionsVariant } from '@audius/common/store' import { useRef } from 'react' +import { ExploreCollectionsVariant } from '@audius/common/store' import { View } from 'react-native' import type { ScrollViewElement } from 'app/components/core' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx index 59f40c4e70a..b1fa91bf3ed 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/LetThemDJScreen.tsx @@ -1,11 +1,11 @@ +import { useEffect } from 'react' + +import { Status } from '@audius/common/models' import { explorePageCollectionsSelectors, explorePageCollectionsActions, ExploreCollectionsVariant } from '@audius/common/store' -import { useEffect } from 'react' - -import { Status } from '@audius/common/models' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/PremiumTracksScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/PremiumTracksScreen.tsx index 496049cd4fa..72ceefd7a85 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/PremiumTracksScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/PremiumTracksScreen.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + import { lineupSelectors, premiumTracksPageLineupSelectors, premiumTracksPageLineupActions } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch } from 'react-redux' import { Screen, ScreenContent, ScreenHeader } from 'app/components/core' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx index 8f0f0f78eb3..e03dd10f0cc 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TopAlbumsScreen.tsx @@ -1,11 +1,11 @@ +import { useEffect } from 'react' + +import { Status } from '@audius/common/models' import { explorePageCollectionsSelectors, explorePageCollectionsActions, ExploreCollectionsVariant } from '@audius/common/store' -import { useEffect } from 'react' - -import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingPlaylistsScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingPlaylistsScreen.tsx index 572e41e58fe..ab90c8607e8 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingPlaylistsScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingPlaylistsScreen.tsx @@ -3,7 +3,6 @@ import { trendingPlaylistsPageLineupSelectors, trendingPlaylistsPageLineupActions } from '@audius/common/store' - import { useSelector } from 'react-redux' import { RewardsBanner } from 'app/components/audio-rewards' diff --git a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingUndergroundScreen.tsx b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingUndergroundScreen.tsx index e17ac4500e8..80678484737 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingUndergroundScreen.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/ForYouTab/TrendingUndergroundScreen.tsx @@ -3,7 +3,6 @@ import { trendingUndergroundPageLineupSelectors, trendingUndergroundPageLineupActions } from '@audius/common/store' - import { useSelector } from 'react-redux' import { RewardsBanner } from 'app/components/audio-rewards' diff --git a/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx b/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx index fce1ce7db0a..b3141c660e1 100644 --- a/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/explore-screen/tabs/PlaylistsTab.tsx @@ -1,8 +1,8 @@ -import { explorePageSelectors, explorePageActions } from '@audius/common/store' import { useEffect } from 'react' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' +import { explorePageSelectors, explorePageActions } from '@audius/common/store' import { useSelector, useDispatch } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx b/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx index dbe6b47cf4c..bda672f7d0b 100644 --- a/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx @@ -1,13 +1,12 @@ +import { useCallback, useState } from 'react' + +import type { CommonState } from '@audius/common/store' import { savedPageSelectors, LibraryCategory, SavedPageTabs, - reachabilitySelectors, - CommonState + reachabilitySelectors } from '@audius/common/store' -import { useCallback, useState } from 'react' - -import type {} from '@audius/common' import { statusIsNotFinalized } from '@audius/common/models' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx b/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx index cc7847482b3..aa0424ac738 100644 --- a/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx +++ b/packages/mobile/src/screens/favorites-screen/DownloadFavoritesSwitch.tsx @@ -1,7 +1,7 @@ -import { reachabilitySelectors } from '@audius/common/store' import { useEffect, useLayoutEffect, useState } from 'react' import { useThrottledCallback } from '@audius/common/hooks' +import { reachabilitySelectors } from '@audius/common/store' import type { SwitchProps } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/DownloadProgress.tsx b/packages/mobile/src/screens/favorites-screen/DownloadProgress.tsx index cffec127d26..2cbc14a5eb3 100644 --- a/packages/mobile/src/screens/favorites-screen/DownloadProgress.tsx +++ b/packages/mobile/src/screens/favorites-screen/DownloadProgress.tsx @@ -1,5 +1,4 @@ import { reachabilitySelectors } from '@audius/common/store' - import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx b/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx index 37da5aacd41..bf49b150ab0 100644 --- a/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx +++ b/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx @@ -1,11 +1,10 @@ +import type { LibraryCategoryType } from '@audius/common/store' import { savedPageActions, savedPageSelectors, LibraryCategory, - SavedPageTabs, - LibraryCategoryType + SavedPageTabs } from '@audius/common/store' -import type {} from '@audius/common' import { useNavigationState } from '@react-navigation/native' import { ScrollView, View } from 'react-native' diff --git a/packages/mobile/src/screens/favorites-screen/OfflineContentBanner.tsx b/packages/mobile/src/screens/favorites-screen/OfflineContentBanner.tsx index 63b34e9219d..e3900d382c7 100644 --- a/packages/mobile/src/screens/favorites-screen/OfflineContentBanner.tsx +++ b/packages/mobile/src/screens/favorites-screen/OfflineContentBanner.tsx @@ -1,5 +1,4 @@ import { reachabilitySelectors } from '@audius/common/store' - import { View } from 'react-native' import Animated, { SlideOutUp } from 'react-native-reanimated' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx b/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx index 010d71ce885..007f8af1218 100644 --- a/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx @@ -1,13 +1,12 @@ +import { useCallback, useState } from 'react' + +import type { CommonState } from '@audius/common/store' import { savedPageSelectors, LibraryCategory, SavedPageTabs, - reachabilitySelectors, - CommonState + reachabilitySelectors } from '@audius/common/store' -import { useCallback, useState } from 'react' - -import type {} from '@audius/common' import { CreatePlaylistSource, diff --git a/packages/mobile/src/screens/favorites-screen/TracksTab.tsx b/packages/mobile/src/screens/favorites-screen/TracksTab.tsx index faa8a149c98..f3fab9df7e3 100644 --- a/packages/mobile/src/screens/favorites-screen/TracksTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/TracksTab.tsx @@ -1,3 +1,7 @@ +import { useCallback, useEffect, useMemo, useState } from 'react' + +import { PlaybackSource, Status } from '@audius/common/models' +import type { ID, UID, Track, User } from '@audius/common/models' import { cacheTracksSelectors, cacheUsersSelectors, @@ -8,10 +12,6 @@ import { SavedPageTabs, reachabilitySelectors } from '@audius/common/store' -import { useCallback, useEffect, useMemo, useState } from 'react' - -import { PlaybackSource, Status } from '@audius/common/models' -import type { ID, UID, Track, User } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { debounce, isEqual } from 'lodash' import Animated, { Layout } from 'react-native-reanimated' diff --git a/packages/mobile/src/screens/favorites-screen/selectors.ts b/packages/mobile/src/screens/favorites-screen/selectors.ts index 1fff6e0e17c..5f51731394b 100644 --- a/packages/mobile/src/screens/favorites-screen/selectors.ts +++ b/packages/mobile/src/screens/favorites-screen/selectors.ts @@ -1,5 +1,5 @@ -import { CommonState } from '@audius/common/store' - import type { } from '@audius/common' +import type { CommonState } from '@audius/common/store' + import type { Cacheable, Collection, ID, User } from '@audius/common/models' const matchesFilter = ( diff --git a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts index ba8f382af77..3fe95e72380 100644 --- a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts +++ b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts @@ -1,13 +1,11 @@ +import type { CommonState, CollectionType } from '@audius/common/store' import { accountSelectors, cacheCollectionsSelectors, savedPageSelectors, SavedPageTabs, - reachabilitySelectors, - CommonState, - CollectionType + reachabilitySelectors } from '@audius/common/store' -import type {} from '@audius/common' import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' import { useAllPaginatedQuery } from '@audius/common/audius-query' diff --git a/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts b/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts index ad526522527..aa4664b8dd1 100644 --- a/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts +++ b/packages/mobile/src/screens/favorites-screen/useFavoritesLineup.ts @@ -1,11 +1,11 @@ +import { useCallback } from 'react' + +import { Kind } from '@audius/common/models' import { cacheActions, savedPageTracksLineupActions, savedPageSelectors } from '@audius/common/store' -import { useCallback } from 'react' - -import { Kind } from '@audius/common/models' import { makeUid } from '@audius/common/utils' import { orderBy } from 'lodash' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/feed-screen/EmptyFeedSuggestedFollows.tsx b/packages/mobile/src/screens/feed-screen/EmptyFeedSuggestedFollows.tsx index 48bd5e9d42c..13684c0cf6e 100644 --- a/packages/mobile/src/screens/feed-screen/EmptyFeedSuggestedFollows.tsx +++ b/packages/mobile/src/screens/feed-screen/EmptyFeedSuggestedFollows.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { feedPageLineupActions as feedActions, feedPageActions } from '@audius/common/store' -import { useCallback } from 'react' - import * as signOnActions from 'common/store/pages/signon/actions' import { Dimensions } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx b/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx index e527736de03..465dc6b7b3c 100644 --- a/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx +++ b/packages/mobile/src/screens/feed-screen/FeedFilterButton.tsx @@ -1,7 +1,7 @@ -import { feedPageSelectors, modalsActions } from '@audius/common/store' import { useCallback } from 'react' import { FeedFilter } from '@audius/common/models' +import { feedPageSelectors, modalsActions } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { ScreenHeaderButton } from 'app/components/core' diff --git a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx index a4a6ed5e3c6..af95f8efe02 100644 --- a/packages/mobile/src/screens/feed-screen/FeedScreen.tsx +++ b/packages/mobile/src/screens/feed-screen/FeedScreen.tsx @@ -1,13 +1,13 @@ -import { - lineupSelectors, - feedPageLineupActions as feedActions, - feedPageSelectors -} from '@audius/common/store' import { useCallback } from 'react' import { useFeatureFlag } from '@audius/common/hooks' import { Name } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + lineupSelectors, + feedPageLineupActions as feedActions, + feedPageSelectors +} from '@audius/common/store' import { useDispatch } from 'react-redux' import IconFeed from 'app/assets/images/iconFeed.svg' diff --git a/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx b/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx index 2603474cee9..38a7b68b773 100644 --- a/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx +++ b/packages/mobile/src/screens/mood-collection-screen/MoodCollectionScreen.tsx @@ -1,12 +1,12 @@ +import { useEffect } from 'react' + +import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { explorePageCollectionsSelectors, explorePageCollectionsActions, ExploreCollectionsVariant } from '@audius/common/store' -import { useEffect } from 'react' - -import { useProxySelector } from '@audius/common/hooks' -import { Status } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx b/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx index 712f58c93fa..bd682e500bd 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx @@ -1,7 +1,7 @@ -import { Notification } from '@audius/common/store' - import type { ReactNode } from 'react' +import type { ReactNode } from 'react' + +import type { Notification } from '@audius/common/store' -import type { } from '@audius/common' import { View } from 'react-native' import { Tile, Text } from 'app/components/core' diff --git a/packages/mobile/src/screens/notifications-screen/Notification/utils.ts b/packages/mobile/src/screens/notifications-screen/Notification/utils.ts index 40f7af7828c..fe6ba89cc76 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/utils.ts +++ b/packages/mobile/src/screens/notifications-screen/Notification/utils.ts @@ -1,5 +1,4 @@ -import { EntityType } from '@audius/common/store' - import type { } from '@audius/common' +import type { EntityType } from '@audius/common/store' import { getCollectionRoute, getTrackRoute } from 'app/utils/routes' diff --git a/packages/mobile/src/screens/notifications-screen/NotificationList.tsx b/packages/mobile/src/screens/notifications-screen/NotificationList.tsx index 5361339baa5..5c9eada6cf8 100644 --- a/packages/mobile/src/screens/notifications-screen/NotificationList.tsx +++ b/packages/mobile/src/screens/notifications-screen/NotificationList.tsx @@ -1,11 +1,10 @@ +import { useCallback, useContext, useEffect, useState } from 'react' + +import type { Notification } from '@audius/common/store' import { notificationsActions, - notificationsSelectors, - Notification + notificationsSelectors } from '@audius/common/store' -import { useCallback, useContext, useEffect, useState } from 'react' - -import type {} from '@audius/common' import { Status } from '@audius/common/models' import { useIsFocused } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/notifications-screen/NotificationListItem.tsx b/packages/mobile/src/screens/notifications-screen/NotificationListItem.tsx index ebab9184d1d..d3a916af424 100644 --- a/packages/mobile/src/screens/notifications-screen/NotificationListItem.tsx +++ b/packages/mobile/src/screens/notifications-screen/NotificationListItem.tsx @@ -1,5 +1,5 @@ -import { NotificationType, Notification } from '@audius/common/store' -import type {} from '@audius/common' +import type { Notification } from '@audius/common/store' +import { NotificationType } from '@audius/common/store' import { NotificationErrorBoundary } from './NotificationErrorBoundary' import { diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx index 9e21bac8986..b35388cdc7f 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx @@ -1,9 +1,9 @@ -import { notificationsSelectors , AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import type { AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { notificationsSelectors } from '@audius/common/store' import { View } from 'react-native' import IconPlaylists from 'app/assets/images/iconPlaylists.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx index cc9775c59cd..d7617c7b719 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx @@ -1,5 +1,5 @@ -import { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common/store' - import type { } from '@audius/common' +import type { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common/store' + import { View } from 'react-native' import Markdown from 'react-native-markdown-display' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx index 15ab5abff39..1a77701f11b 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx @@ -1,7 +1,7 @@ -import { ChallengeRewardNotification as ChallengeRewardNotificationType } from '@audius/common/store' - import { useCallback } from 'react' +import type { ChallengeRewardNotification as ChallengeRewardNotificationType } from '@audius/common/store' + +import { useCallback } from 'react' -import type { } from '@audius/common' import type { ChallengeRewardID } from '@audius/common/models' import { Platform } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx index f3ad85b049f..cf47c7b467a 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx @@ -1,9 +1,9 @@ -import { notificationsSelectors, Entity , FavoriteNotification as FavoriteNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import { notificationsSelectors, Entity } from '@audius/common' +import type { FavoriteNotification as FavoriteNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { notificationsSelectors } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import IconHeart from 'app/assets/images/iconHeart.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx index 5248a58a2c0..63af5a74583 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx @@ -1,9 +1,9 @@ -import { notificationsSelectors, Entity , FavoriteOfRepostNotification as FavoriteOfRepostNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import { notificationsSelectors, Entity } from '@audius/common' +import type { FavoriteOfRepostNotification as FavoriteOfRepostNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { notificationsSelectors } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import IconHeart from 'app/assets/images/iconHeart.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx index f4cda564754..6bef44579c4 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx @@ -1,9 +1,9 @@ -import { notificationsSelectors , FollowNotification as FollowNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import type { FollowNotification as FollowNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { notificationsSelectors } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import IconUser from 'app/assets/images/iconUser.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx index aec9b0c41b6..2b9e070ac96 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx @@ -1,13 +1,13 @@ -import { notificationsSelectors, Achievement , EntityType, MilestoneNotification as MilestoneNotificationType -} from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' +import { notificationsSelectors, Achievement } from '@audius/common' import type { - - } from '@audius/common' + EntityType, + MilestoneNotification as MilestoneNotificationType +} from '@audius/common' import { useProxySelector } from '@audius/common/hooks' import type { User } from '@audius/common/models' +import { notificationsSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { fullProfilePage } from 'audius-client/src/utils/route' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx index db41591ae2c..8c9c48fbf45 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx @@ -1,11 +1,10 @@ -import { - notificationsSelectors, +import { useCallback } from 'react' + +import type { TrackEntity, RemixCosignNotification as RemixCosignNotificationType } from '@audius/common/store' -import { useCallback } from 'react' - -import type {} from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' import { useProxySelector } from '@audius/common/hooks' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx index e60956694a6..9b0570ae6b7 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx @@ -1,8 +1,8 @@ -import { cacheTracksSelectors, notificationsSelectors , RemixCreateNotification as RemixCreateNotificationType } from '@audius/common' -import { cacheTracksSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import { cacheTracksSelectors, notificationsSelectors } from '@audius/common' +import type { RemixCreateNotification as RemixCreateNotificationType } from '@audius/common' +import { cacheTracksSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import IconRemix from 'app/assets/images/iconRemix.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx index 1ad4d722f08..481bcfc0d09 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx @@ -1,9 +1,9 @@ -import { notificationsSelectors, Entity , RepostNotification as RepostNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import { notificationsSelectors, Entity } from '@audius/common' +import type { RepostNotification as RepostNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { notificationsSelectors } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import IconRepost from 'app/assets/images/iconRepost.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx index b05042f7726..abed4ad6ed0 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx @@ -1,9 +1,9 @@ -import { notificationsSelectors, Entity , RepostOfRepostNotification as RepostOfRepostNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import { notificationsSelectors, Entity } from '@audius/common' +import type { RepostOfRepostNotification as RepostOfRepostNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { notificationsSelectors } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import IconRepost from 'app/assets/images/iconRepost.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx index 4851605b2fb..99a55b358fd 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx @@ -1,11 +1,11 @@ +import { useCallback } from 'react' + +import type { SupporterDethronedNotification as SupporterDethroned } from '@audius/common/store' import { cacheUsersSelectors, - notificationsSelectors, - SupporterDethronedNotification as SupporterDethroned + notificationsSelectors } from '@audius/common/store' -import { useCallback } from 'react' -import type {} from '@audius/common' import type { Nullable } from '@audius/common/utils' import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx index 5020b464897..c5a545bb745 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx @@ -1,11 +1,10 @@ -import { - notificationsSelectors, +import { useCallback } from 'react' + +import type { TrackEntity, TastemakerNotification as TastemakerNotificationType } from '@audius/common/store' -import { useCallback } from 'react' - -import type {} from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' import { Name } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx index 8311097a2c4..34ea491fdc7 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx @@ -1,8 +1,8 @@ -import { cacheUsersSelectors , TierChangeNotification as TierChangeNotificationType } from '@audius/common' -import { cacheUsersSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common' +import type { TierChangeNotification as TierChangeNotificationType } from '@audius/common' +import { cacheUsersSelectors } from '@audius/common/store' import { fullProfilePage } from 'audius-client/src/utils/route' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx index 94657c12fe0..25a20c7170d 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx @@ -1,11 +1,10 @@ +import { useCallback } from 'react' + +import type { ReactionNotification } from '@audius/common/store' import { notificationsSelectors, - getReactionFromRawValue, - ReactionNotification + getReactionFromRawValue } from '@audius/common/store' -import { useCallback } from 'react' - -import type {} from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { Platform, View } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx index 7221047ad44..6aa92095526 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx @@ -1,13 +1,15 @@ +import { useCallback } from 'react' + +import type { + TipReceiveNotification, + ReactionTypes +} from '@audius/common/store' import { notificationsSelectors, reactionsUIActions, - reactionsUISelectors, - TipReceiveNotification, - ReactionTypes + reactionsUISelectors } from '@audius/common/store' -import { useCallback } from 'react' -import type {} from '@audius/common' import { useUIAudio } from '@audius/common/hooks' import { formatNumberCommas } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx index 43ef1fa5bc9..9aca1801e22 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx @@ -1,10 +1,7 @@ -import { - notificationsSelectors, - TipSendNotification -} from '@audius/common/store' import { useCallback } from 'react' -import type {} from '@audius/common' +import type { TipSendNotification } from '@audius/common/store' +import { notificationsSelectors } from '@audius/common/store' import { useUIAudio } from '@audius/common/hooks' import { Platform, View } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx index ed2edd93e33..a5d4aed684e 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx @@ -1,10 +1,7 @@ -import { - notificationsSelectors, - SupporterRankUpNotification -} from '@audius/common/store' import { useCallback } from 'react' -import type {} from '@audius/common' +import type { SupporterRankUpNotification } from '@audius/common/store' +import { notificationsSelectors } from '@audius/common/store' import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx index ae4f1a4786a..ccee5285e07 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx @@ -1,10 +1,7 @@ -import { - notificationsSelectors, - SupportingRankUpNotification -} from '@audius/common/store' import { useCallback } from 'react' -import type {} from '@audius/common' +import type { SupportingRankUpNotification } from '@audius/common/store' +import { notificationsSelectors } from '@audius/common/store' import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx index f9f37bbb33c..c2c17469208 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx @@ -1,12 +1,12 @@ -import { notificationsSelectors , CollectionEntity, TrendingPlaylistNotification as TrendingPlaylistNotificationType -} from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' +import { notificationsSelectors } from '@audius/common' import type { - - } from '@audius/common' + CollectionEntity, + TrendingPlaylistNotification as TrendingPlaylistNotificationType +} from '@audius/common' import { Name } from '@audius/common/models' +import { notificationsSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx index 73fcb84a50f..e8d2681f34a 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx @@ -1,12 +1,12 @@ -import { notificationsSelectors , TrackEntity, TrendingTrackNotification as TrendingTrackNotificationType -} from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' +import { notificationsSelectors } from '@audius/common' import type { - - } from '@audius/common' + TrackEntity, + TrendingTrackNotification as TrendingTrackNotificationType +} from '@audius/common' import { Name } from '@audius/common/models' +import { notificationsSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx index 96ef629bdd1..988238f86c2 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx @@ -1,12 +1,12 @@ -import { notificationsSelectors , TrackEntity, TrendingUndergroundNotification as TrendingUndergroundNotificationType -} from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' +import { notificationsSelectors } from '@audius/common' import type { - - } from '@audius/common' + TrackEntity, + TrendingUndergroundNotification as TrendingUndergroundNotificationType +} from '@audius/common' import { Name } from '@audius/common/models' +import { notificationsSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx index 12f3c7adb26..ced46e3ec73 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx @@ -1,11 +1,10 @@ -import { - notificationsSelectors, +import { useCallback } from 'react' + +import type { TrackEntity, USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType } from '@audius/common/store' -import { useCallback } from 'react' - -import type {} from '@audius/common' +import { notificationsSelectors } from '@audius/common/store' import { Name } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx index be1e3df0ea7..d69a662a1c2 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx @@ -1,12 +1,12 @@ -import { notificationsSelectors , TrackEntity, USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType -} from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' +import { notificationsSelectors } from '@audius/common' import type { - - } from '@audius/common' + TrackEntity, + USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType +} from '@audius/common' import type { StringUSDC } from '@audius/common/models' +import { notificationsSelectors } from '@audius/common/store' import { stringUSDCToBN, formatUSDCWeiToUSDString } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx index 77e16098f18..840ad103380 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx @@ -1,9 +1,9 @@ -import { notificationsSelectors , UserSubscriptionNotification as UserSubscriptionNotificationType } from '@audius/common' -import { notificationsSelectors } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' -import type { } from '@audius/common' +import { notificationsSelectors } from '@audius/common' +import type { UserSubscriptionNotification as UserSubscriptionNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import { notificationsSelectors } from '@audius/common/store' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts index 7c4839a80ab..dcd6e1070e0 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts +++ b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts @@ -1,12 +1,11 @@ -import { - notificationsUserListActions, +import { useCallback } from 'react' + +import type { FollowNotification, RepostNotification, FavoriteNotification } from '@audius/common/store' -import { useCallback } from 'react' - -import type {} from '@audius/common' +import { notificationsUserListActions } from '@audius/common/store' import type { User } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/NotificationsScreen.tsx b/packages/mobile/src/screens/notifications-screen/NotificationsScreen.tsx index ceee9dd24e8..91ac10b67f4 100644 --- a/packages/mobile/src/screens/notifications-screen/NotificationsScreen.tsx +++ b/packages/mobile/src/screens/notifications-screen/NotificationsScreen.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { notificationsActions, notificationsSelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { useFocusEffect } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx index 4b207bd28da..065ee8b5546 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx @@ -1,7 +1,7 @@ -import { ReactionTypes } from '@audius/common/store' - import { useEffect, useCallback, useRef, useState } from 'react' +import { useEffect, useCallback, useRef, useState } from 'react' + +import type { ReactionTypes } from '@audius/common/store' -import type { } from '@audius/common' import type { LottieViewProps } from 'lottie-react-native' import LottieView from 'lottie-react-native' import type { diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx index cbe8d2e9123..776bed319cc 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx @@ -1,7 +1,8 @@ -import { reactionOrder, ReactionTypes } from '@audius/common/store' import { useCallback, useContext, useRef, useState } from 'react' -import type {} from '@audius/common' +import type { ReactionTypes } from '@audius/common/store' +import { reactionOrder } from '@audius/common/store' + import type { Nullable } from '@audius/common/utils' import type { ViewStyle, diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx index b6387b14efa..83841e04feb 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx @@ -1,7 +1,7 @@ -import { ReactionTypes } from '@audius/common/store' - import type { ComponentType } from 'react' +import type { ComponentType } from 'react' + +import type { ReactionTypes } from '@audius/common/store' -import type { } from '@audius/common' import type { SetOptional } from 'type-fest' import type { ReactionProps as BaseReactionProps } from './Reaction' diff --git a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx index 097226e3439..8fae7205951 100644 --- a/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx +++ b/packages/mobile/src/screens/pay-and-earn-screen/USDCCard.tsx @@ -1,8 +1,8 @@ -import { useAddFundsModal } from '@audius/common/store' import React, { useCallback } from 'react' import { useUSDCBalance } from '@audius/common/hooks' import type { BNUSDC } from '@audius/common/models' +import { useAddFundsModal } from '@audius/common/store' import { formatCurrencyBalance, formatUSDCWeiToFloorCentsNumber diff --git a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx index ef49a49f200..b6b39bcd97a 100644 --- a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx +++ b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx @@ -1,13 +1,12 @@ +import type { CommonState } from '@audius/common/store' import { cacheUsersSelectors, usersSocialActions, relatedArtistsUISelectors, - relatedArtistsUIActions, - CommonState + relatedArtistsUIActions } from '@audius/common/store' -import { Fragment, useCallback, useEffect, useState } from 'react' -import type {} from '@audius/common' +import { Fragment, useCallback, useEffect, useState } from 'react' import { FollowSource } from '@audius/common/models' import type { ID, User } from '@audius/common/models' diff --git a/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx b/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx index 73d1dbdea49..a3240b4df56 100644 --- a/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx +++ b/packages/mobile/src/screens/profile-screen/CollectiblesCard.tsx @@ -1,12 +1,12 @@ +import type { ReactNode } from 'react' +import { useState, useCallback } from 'react' + +import type { Collectible, ID } from '@audius/common/models' import { accountSelectors, collectibleDetailsUIActions, modalsActions } from '@audius/common/store' -import type { ReactNode } from 'react' -import { useState, useCallback } from 'react' - -import type { Collectible, ID } from '@audius/common/models' import type { ImageStyle, StyleProp, ViewStyle } from 'react-native' import { ImageBackground, Text, View } from 'react-native' import { SvgUri } from 'react-native-svg' diff --git a/packages/mobile/src/screens/profile-screen/EmptyProfileTile.tsx b/packages/mobile/src/screens/profile-screen/EmptyProfileTile.tsx index 23969205558..6b6e0ce1e88 100644 --- a/packages/mobile/src/screens/profile-screen/EmptyProfileTile.tsx +++ b/packages/mobile/src/screens/profile-screen/EmptyProfileTile.tsx @@ -1,5 +1,4 @@ import { accountSelectors } from '@audius/common/store' - import type { StyleProp, ViewStyle } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/MessageButton.tsx b/packages/mobile/src/screens/profile-screen/MessageButton.tsx index 8ea9a962617..eff23a6de96 100644 --- a/packages/mobile/src/screens/profile-screen/MessageButton.tsx +++ b/packages/mobile/src/screens/profile-screen/MessageButton.tsx @@ -1,8 +1,8 @@ -import { chatActions } from '@audius/common/store' import { useCallback } from 'react' import type { User } from '@audius/common/models' import { Name } from '@audius/common/models' +import { chatActions } from '@audius/common/store' import { useDispatch } from 'react-redux' import IconMessage from 'app/assets/images/iconMessage.svg' diff --git a/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx b/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx index ce42489457c..71868bd26d8 100644 --- a/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx +++ b/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx @@ -1,7 +1,7 @@ -import { useInboxUnavailableModal } from '@audius/common/store' import { useCallback } from 'react' import type { ID } from '@audius/common/models' +import { useInboxUnavailableModal } from '@audius/common/store' import IconMessageLocked from 'app/assets/images/iconMessageLocked.svg' import { Button } from 'app/components/core' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx index fc3b11868ee..eeb7b13eda1 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileHeader.tsx @@ -1,7 +1,7 @@ -import { accountSelectors } from '@audius/common/store' import { memo, useCallback, useEffect, useState } from 'react' import { useSelectTierInfo } from '@audius/common/hooks' +import { accountSelectors } from '@audius/common/store' import type { Animated } from 'react-native' import { LayoutAnimation, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx index 22e8377ff10..27e34f6f1d6 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileInfoTiles.tsx @@ -1,11 +1,11 @@ -import { - accountSelectors, - relatedArtistsUISelectors -} from '@audius/common/store' import type { ComponentType } from 'react' import { useCallback } from 'react' import { FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + relatedArtistsUISelectors +} from '@audius/common/store' import type { ViewStyle } from 'react-native' import { View, ScrollView } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx index 3a4b0a64275..c7b2000def4 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileSocials.tsx @@ -1,7 +1,7 @@ -import { cacheUsersActions } from '@audius/common/store' import { Fragment, useEffect, useLayoutEffect, useMemo, useRef } from 'react' import { useSelectTierInfo } from '@audius/common/hooks' +import { cacheUsersActions } from '@audius/common/store' import { View, Animated } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx index 09f8dba9f75..11b6324e24a 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ProfileTierTile.tsx @@ -1,7 +1,7 @@ -import { modalsActions } from '@audius/common/store' import { useCallback } from 'react' import { useSelectTierInfo } from '@audius/common/hooks' +import { modalsActions } from '@audius/common/store' import type { ViewStyle, StyleProp } from 'react-native' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx index 006dca86fe8..09a07117a7b 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingList.tsx @@ -1,8 +1,8 @@ -import { tippingActions } from '@audius/common/store' import { useEffect, useMemo } from 'react' import { useRankedSupportingForUser } from '@audius/common/hooks' import type { Supporting } from '@audius/common/models' +import { tippingActions } from '@audius/common/store' import { MAX_PROFILE_SUPPORTING_TILES } from '@audius/common/utils' import { FlatList } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx index 420b69cd275..22b3f6143e5 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/SupportingTile.tsx @@ -1,7 +1,7 @@ -import { cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' import type { Supporting } from '@audius/common/models' +import { cacheUsersSelectors } from '@audius/common/store' import { TIPPING_TOP_RANK_THRESHOLD } from 'audius-client/src/utils/constants' import type { StyleProp, ViewStyle } from 'react-native' import { ImageBackground, View } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx index f095a60ae53..d74182fe7a3 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/TopSupporters.tsx @@ -1,11 +1,11 @@ +import { useCallback, useEffect } from 'react' + +import { useProxySelector } from '@audius/common/hooks' import { cacheUsersSelectors, tippingSelectors, tippingActions } from '@audius/common/store' -import { useCallback, useEffect } from 'react' - -import { useProxySelector } from '@audius/common/hooks' import { removeNullable } from '@audius/common/utils' import { Text, View } from 'react-native' import { TouchableOpacity } from 'react-native-gesture-handler' diff --git a/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx b/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx index 6aa26dfe2d3..01419282b30 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileHeader/ViewAllSupportingTile.tsx @@ -1,10 +1,10 @@ -import { cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' import { useRankedSupportingForUser, useProxySelector } from '@audius/common/hooks' +import { cacheUsersSelectors } from '@audius/common/store' import { formatCount, MAX_PROFILE_SUPPORTING_TILES } from '@audius/common/utils' import IconArrow from 'app/assets/images/iconArrow.svg' diff --git a/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx b/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx index e5443c8293a..399964c5e14 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileInfo.tsx @@ -1,3 +1,7 @@ +import { useEffect } from 'react' + +import { FollowSource } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, profilePageSelectors, @@ -5,10 +9,6 @@ import { chatSelectors, reachabilitySelectors } from '@audius/common/store' -import { useEffect } from 'react' - -import { FollowSource } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { View, Text } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileMetrics.tsx b/packages/mobile/src/screens/profile-screen/ProfileMetrics.tsx index c100c83bcab..0fb2d3f3d6d 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileMetrics.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileMetrics.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { followingUserListActions, followersUserListActions } from '@audius/common/store' -import { useCallback } from 'react' - import { Pressable, Text, View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx index f735507f9d5..b351609397e 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileScreen.tsx @@ -1,3 +1,7 @@ +import { useCallback, useEffect, useRef, useState } from 'react' + +import { ShareSource, Status } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { profilePageActions, profilePageSelectors, @@ -6,10 +10,6 @@ import { shareModalUIActions, modalsActions } from '@audius/common/store' -import { useCallback, useEffect, useRef, useState } from 'react' - -import { ShareSource, Status } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { encodeUrlName } from '@audius/common/utils' import { PortalHost } from '@gorhom/portal' import { useFocusEffect } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx index 693d40ca51d..d42e63337f5 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/AlbumsTab.tsx @@ -1,7 +1,7 @@ -import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { useEffect } from 'react' import { Status } from '@audius/common/models' +import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { useIsFocused } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx index 24fec2f70d9..c68303b1fe8 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/CollectiblesTab.tsx @@ -1,8 +1,8 @@ -import { accountSelectors } from '@audius/common/store' import { useCallback, useMemo, useRef } from 'react' import { useProxySelector } from '@audius/common/hooks' import type { Collectible } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import Clipboard from '@react-native-clipboard/clipboard' import type { FlatList as RNFlatList } from 'react-native' import { View, Text } from 'react-native' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx index 2150197881a..9256683e1e8 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/PlaylistsTab.tsx @@ -1,7 +1,7 @@ -import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { useEffect } from 'react' import { CreatePlaylistSource, Status } from '@audius/common/models' +import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { useIsFocused } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx index e7023bfefd2..e4b7e535aa9 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/RepostsTab.tsx @@ -1,11 +1,11 @@ -import { - profilePageFeedLineupActions as feedActions, - profilePageSelectors -} from '@audius/common/store' import { useMemo } from 'react' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' +import { + profilePageFeedLineupActions as feedActions, + profilePageSelectors +} from '@audius/common/store' import { useRoute } from '@react-navigation/native' import { Lineup } from 'app/components/lineup' diff --git a/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx b/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx index b23a224b02b..c8fbef029da 100644 --- a/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx +++ b/packages/mobile/src/screens/profile-screen/ProfileTabs/TracksTab.tsx @@ -1,10 +1,10 @@ +import { useMemo } from 'react' + +import { useProxySelector } from '@audius/common/hooks' import { profilePageTracksLineupActions as tracksActions, profilePageSelectors } from '@audius/common/store' -import { useMemo } from 'react' - -import { useProxySelector } from '@audius/common/hooks' import { Lineup } from 'app/components/lineup' diff --git a/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx b/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx index f46dd07c164..aa6474d2284 100644 --- a/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx +++ b/packages/mobile/src/screens/profile-screen/SubscribeButton.tsx @@ -1,7 +1,7 @@ -import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { useCallback } from 'react' import type { User } from '@audius/common/models' +import { profilePageActions, profilePageSelectors } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import IconNotification from 'app/assets/images/iconNotification.svg' diff --git a/packages/mobile/src/screens/profile-screen/TipAudioButton.tsx b/packages/mobile/src/screens/profile-screen/TipAudioButton.tsx index d878f9ad2cf..83a310dc1cf 100644 --- a/packages/mobile/src/screens/profile-screen/TipAudioButton.tsx +++ b/packages/mobile/src/screens/profile-screen/TipAudioButton.tsx @@ -1,6 +1,6 @@ -import { cacheUsersSelectors, tippingActions } from '@audius/common/store' import { useCallback } from 'react' +import { cacheUsersSelectors, tippingActions } from '@audius/common/store' import { Platform } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/selectors.ts b/packages/mobile/src/screens/profile-screen/selectors.ts index 038ff81e112..dcddc021f44 100644 --- a/packages/mobile/src/screens/profile-screen/selectors.ts +++ b/packages/mobile/src/screens/profile-screen/selectors.ts @@ -1,11 +1,7 @@ -import { - accountSelectors, - profilePageSelectors, - CommonState -} from '@audius/common/store' -import { useContext } from 'react' +import type { CommonState } from '@audius/common/store' +import { accountSelectors, profilePageSelectors } from '@audius/common/store' -import type {} from '@audius/common' +import { useContext } from 'react' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' diff --git a/packages/mobile/src/screens/profile-screen/useIsArtist.ts b/packages/mobile/src/screens/profile-screen/useIsArtist.ts index 50e041b3837..d9638d51971 100644 --- a/packages/mobile/src/screens/profile-screen/useIsArtist.ts +++ b/packages/mobile/src/screens/profile-screen/useIsArtist.ts @@ -1,6 +1,6 @@ -import { accountActions, accountSelectors } from '@audius/common/store' import { useEffect } from 'react' +import { accountActions, accountSelectors } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { useSelectProfile } from './selectors' diff --git a/packages/mobile/src/screens/profile-screen/utils.ts b/packages/mobile/src/screens/profile-screen/utils.ts index ff13db8776d..84244bddf03 100644 --- a/packages/mobile/src/screens/profile-screen/utils.ts +++ b/packages/mobile/src/screens/profile-screen/utils.ts @@ -1,5 +1,5 @@ -import { badgeTiers, CommonState } from '@audius/common/store' -import type {} from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { badgeTiers } from '@audius/common/store' import { useSelectTierInfo } from '@audius/common/hooks' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx b/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx index 8c99dad4945..1326438f892 100644 --- a/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx +++ b/packages/mobile/src/screens/reset-password-screen/ResetPasswordScreen.tsx @@ -1,8 +1,8 @@ -import { accountSelectors } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' import { useResetPassword } from '@audius/common/api' import { Status } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import AsyncStorage from '@react-native-async-storage/async-storage' import type { NavigationProp, RouteProp } from '@react-navigation/native' import { useNavigation, useRoute } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/root-screen/RootScreen.tsx b/packages/mobile/src/screens/root-screen/RootScreen.tsx index 87c0035a4ac..4f95b2d5b60 100644 --- a/packages/mobile/src/screens/root-screen/RootScreen.tsx +++ b/packages/mobile/src/screens/root-screen/RootScreen.tsx @@ -1,12 +1,12 @@ +import { useCallback, useEffect, useState } from 'react' + +import { Status } from '@audius/common/models' +import { FeatureFlags } from '@audius/common/services' import { accountSelectors, chatActions, playerActions } from '@audius/common/store' -import { useCallback, useEffect, useState } from 'react' - -import { Status } from '@audius/common/models' -import { FeatureFlags } from '@audius/common/services' import { createNativeStackNavigator } from '@react-navigation/native-stack' import { getHasCompletedAccount, diff --git a/packages/mobile/src/screens/root-screen/StatusBar.tsx b/packages/mobile/src/screens/root-screen/StatusBar.tsx index 6712d90dbe4..701e1b57bde 100644 --- a/packages/mobile/src/screens/root-screen/StatusBar.tsx +++ b/packages/mobile/src/screens/root-screen/StatusBar.tsx @@ -1,6 +1,5 @@ -import { accountSelectors } from '@audius/common/store' - import { Status } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { NavigationBar, StatusBar as RNStatusBar } from 'react-native-bars' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx index 8244f32993e..cf862f66130 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx @@ -1,9 +1,5 @@ -import { - searchResultsPageSelectors, - SearchKind, - CommonState -} from '@audius/common/store' -import type {} from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx index ce11aaf6d57..ff41d7ccc73 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx @@ -1,9 +1,5 @@ -import { - searchResultsPageSelectors, - SearchKind, - CommonState -} from '@audius/common/store' -import type {} from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx index ad51e2bdf9d..ca323cb6681 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx @@ -1,9 +1,5 @@ -import { - searchResultsPageSelectors, - SearchKind, - CommonState -} from '@audius/common/store' -import type {} from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx index ab9f450f8bf..ec5a3b31456 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/SearchResultsTab.tsx @@ -1,7 +1,7 @@ -import { searchResultsPageSelectors } from '@audius/common/store' import type { ReactNode } from 'react' import { Status } from '@audius/common/models' +import { searchResultsPageSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import { WithLoader } from 'app/components/with-loader/WithLoader' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/TracksTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/TracksTab.tsx index 32a86c787ef..3d6c44624aa 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/TracksTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/TracksTab.tsx @@ -1,11 +1,11 @@ +import { useCallback, useContext } from 'react' + import { lineupSelectors, searchResultsPageTracksLineupActions as tracksActions, searchResultsPageSelectors, SearchKind } from '@audius/common/store' -import { useCallback, useContext } from 'react' - import { useDispatch, useSelector } from 'react-redux' import { Lineup } from 'app/components/lineup' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/useFetchTabResultsEffect.tsx b/packages/mobile/src/screens/search-results-screen/tabs/useFetchTabResultsEffect.tsx index 5cbf069fcee..f49132c0a11 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/useFetchTabResultsEffect.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/useFetchTabResultsEffect.tsx @@ -1,10 +1,10 @@ +import { useCallback, useContext } from 'react' + import { searchResultsPageActions, searchResultsPageSelectors, SearchKind } from '@audius/common/store' -import { useCallback, useContext } from 'react' - import { useFocusEffect } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/AccountSettingsRow.tsx b/packages/mobile/src/screens/settings-screen/AccountSettingsRow.tsx index d9d74f2ed3d..21460cc8543 100644 --- a/packages/mobile/src/screens/settings-screen/AccountSettingsRow.tsx +++ b/packages/mobile/src/screens/settings-screen/AccountSettingsRow.tsx @@ -1,6 +1,6 @@ -import { accountSelectors } from '@audius/common/store' import { useCallback } from 'react' +import { accountSelectors } from '@audius/common/store' import { Text, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx b/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx index 96f6b3b5d26..36cf256c818 100644 --- a/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/AccountSettingsScreen.tsx @@ -1,12 +1,12 @@ +import { useCallback, useEffect } from 'react' + +import { Status } from '@audius/common/models' import { accountSelectors, recoveryEmailActions, recoveryEmailSelectors, modalsActions } from '@audius/common/store' -import { useCallback, useEffect } from 'react' - -import { Status } from '@audius/common/models' import { Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx b/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx index 04b0c0cc8d5..0ff2e04d954 100644 --- a/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/AccountVerificationScreen.tsx @@ -1,8 +1,8 @@ -import { accountSelectors } from '@audius/common/store' import { useCallback, useEffect, useState } from 'react' import { Status } from '@audius/common/models' import { BooleanKeys } from '@audius/common/services' +import { accountSelectors } from '@audius/common/store' import * as signOnActions from 'common/store/pages/signon/actions' import { getHandleField } from 'common/store/pages/signon/selectors' import type { EditableField } from 'common/store/pages/signon/types' diff --git a/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx b/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx index 4bbd3c74b62..ba5a27b69f6 100644 --- a/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx +++ b/packages/mobile/src/screens/settings-screen/AppearanceSettingsRow.tsx @@ -1,12 +1,12 @@ +import { useCallback } from 'react' + +import { useSelectTierInfo } from '@audius/common/hooks' +import { Name } from '@audius/common/models' import { accountSelectors, themeActions, themeSelectors } from '@audius/common/store' -import { useCallback } from 'react' - -import { useSelectTierInfo } from '@audius/common/hooks' -import { Name } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import IconAppearance from 'app/assets/images/iconAppearance.svg' diff --git a/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx b/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx index e3b38fb50a0..d9c269a734f 100644 --- a/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx +++ b/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx @@ -1,12 +1,11 @@ +import { useCallback } from 'react' + +import type { CastMethod } from '@audius/common/store' import { accountSelectors, castSelectors, - castActions, - CastMethod + castActions } from '@audius/common/store' -import { useCallback } from 'react' - -import type {} from '@audius/common' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/EmailFrequencyControlRow.tsx b/packages/mobile/src/screens/settings-screen/EmailFrequencyControlRow.tsx index d65c8e0bae5..5df625ed273 100644 --- a/packages/mobile/src/screens/settings-screen/EmailFrequencyControlRow.tsx +++ b/packages/mobile/src/screens/settings-screen/EmailFrequencyControlRow.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + import { settingsPageSelectors, settingsPageActions, EmailFrequency } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch, useSelector } from 'react-redux' import { SegmentedControl } from 'app/components/core' diff --git a/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx b/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx index beb99a245b7..ce7905a6e1b 100644 --- a/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/ListeningHistoryScreen.tsx @@ -1,12 +1,12 @@ -import { - historyPageTracksLineupActions as tracksActions, - historyPageSelectors -} from '@audius/common/store' import { useCallback, useMemo } from 'react' import { useProxySelector } from '@audius/common/hooks' import { PlaybackSource, Status } from '@audius/common/models' import type { ID, UID } from '@audius/common/models' +import { + historyPageTracksLineupActions as tracksActions, + historyPageSelectors +} from '@audius/common/store' import { useFocusEffect } from '@react-navigation/native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/NotificationRow.tsx b/packages/mobile/src/screens/settings-screen/NotificationRow.tsx index 46133cbcdab..34ca35b768c 100644 --- a/packages/mobile/src/screens/settings-screen/NotificationRow.tsx +++ b/packages/mobile/src/screens/settings-screen/NotificationRow.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + import { settingsPageSelectors, settingsPageActions, PushNotificationSetting } from '@audius/common/store' -import { useCallback } from 'react' - import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx b/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx index 0ea896d0479..4a51e779063 100644 --- a/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx +++ b/packages/mobile/src/screens/settings-screen/NotificationSettingsScreen.tsx @@ -1,9 +1,8 @@ +import { FeatureFlags } from '@audius/common/services' import { settingsPageActions, PushNotificationSetting } from '@audius/common/store' - -import { FeatureFlags } from '@audius/common/services' import { useDispatch } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx b/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx index 79005ab96e2..5759af26422 100644 --- a/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx +++ b/packages/mobile/src/screens/sign-on-screen/components/WelcomeDrawer.tsx @@ -1,7 +1,7 @@ -import { settingsPageActions } from '@audius/common/store' import { useCallback } from 'react' import { welcomeModalMessages } from '@audius/common/messages' +import { settingsPageActions } from '@audius/common/store' import { fillString } from '@audius/common/utils' import { css } from '@emotion/native' import { getNameField } from 'audius-client/src/common/store/pages/signon/selectors' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx index 307c21a8b0f..250273aee4a 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx @@ -1,7 +1,7 @@ -import { Image } from '@audius/common/store' - import { useCallback } from 'react' +import type { Image } from '@audius/common/store' + +import { useCallback } from 'react' -import type { } from '@audius/common' import { finishProfilePageMessages } from '@audius/common/messages' import { finishProfileSchema } from '@audius/common/schemas' import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common/services' diff --git a/packages/mobile/src/screens/signon/ProfileImage.tsx b/packages/mobile/src/screens/signon/ProfileImage.tsx index 66220f2fcb1..e57cb5f530e 100644 --- a/packages/mobile/src/screens/signon/ProfileImage.tsx +++ b/packages/mobile/src/screens/signon/ProfileImage.tsx @@ -1,7 +1,7 @@ -import { Image as ImageType } from '@audius/common/store' - import { useEffect, useRef, useState } from 'react' +import { useEffect, useRef, useState } from 'react' + +import type { Image as ImageType } from '@audius/common/store' -import type { } from '@audius/common' import { Animated, TouchableOpacity, diff --git a/packages/mobile/src/screens/signon/ProfileManual.tsx b/packages/mobile/src/screens/signon/ProfileManual.tsx index ab803c2c01e..1f431c3d01f 100644 --- a/packages/mobile/src/screens/signon/ProfileManual.tsx +++ b/packages/mobile/src/screens/signon/ProfileManual.tsx @@ -1,7 +1,7 @@ -import { Image } from '@audius/common/store' - import { useState, useEffect, useCallback } from 'react' +import { useState, useEffect, useCallback } from 'react' + +import type { Image } from '@audius/common/store' -import type { } from '@audius/common' import type { NativeStackScreenProps } from '@react-navigation/native-stack' import * as signOnActions from 'common/store/pages/signon/actions' import { diff --git a/packages/mobile/src/screens/signon/SignOn.tsx b/packages/mobile/src/screens/signon/SignOn.tsx index ef4289f6489..5d0c9c8dac6 100644 --- a/packages/mobile/src/screens/signon/SignOn.tsx +++ b/packages/mobile/src/screens/signon/SignOn.tsx @@ -1,6 +1,6 @@ -import { accountSelectors } from '@audius/common/store' import { useState, useRef, useEffect, useCallback } from 'react' +import { accountSelectors } from '@audius/common/store' import Clipboard from '@react-native-clipboard/clipboard' import type { NativeStackScreenProps } from '@react-navigation/native-stack' import * as signOnActions from 'common/store/pages/signon/actions' diff --git a/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx b/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx index 800cb26b452..e63351100f3 100644 --- a/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx +++ b/packages/mobile/src/screens/smart-collection-screen/SmartCollectionScreen.tsx @@ -1,3 +1,6 @@ +import { useCallback } from 'react' + +import { FavoriteSource } from '@audius/common/models' import { accountSelectors, smartCollectionPageSelectors, @@ -6,9 +9,6 @@ import { playlistLibraryHelpers, collectionsSocialActions } from '@audius/common/store' -import { useCallback } from 'react' - -import { FavoriteSource } from '@audius/common/models' import { useFocusEffect } from '@react-navigation/native' import { View } from 'react-native' import LinearGradient from 'react-native-linear-gradient' diff --git a/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx b/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx index 908885985c1..30e071b6355 100644 --- a/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/AvailableAudio.tsx @@ -1,6 +1,5 @@ -import { walletSelectors } from '@audius/common/store' - import type { BNWei } from '@audius/common/models' +import { walletSelectors } from '@audius/common/store' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { Image, Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/ConfirmSendTipScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/ConfirmSendTipScreen.tsx index f0d602b973c..bf409e5c4d6 100644 --- a/packages/mobile/src/screens/tip-artist-screen/ConfirmSendTipScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/ConfirmSendTipScreen.tsx @@ -1,6 +1,6 @@ -import { tippingSelectors, tippingActions } from '@audius/common/store' import { useCallback, useEffect } from 'react' +import { tippingSelectors, tippingActions } from '@audius/common/store' import type { NativeStackScreenProps } from '@react-navigation/native-stack' import { useKeepAwake } from '@sayem314/react-native-keep-awake' import { Platform } from 'react-native' diff --git a/packages/mobile/src/screens/tip-artist-screen/ReceiverDetails.tsx b/packages/mobile/src/screens/tip-artist-screen/ReceiverDetails.tsx index 08aa377a80e..571f2564b3b 100644 --- a/packages/mobile/src/screens/tip-artist-screen/ReceiverDetails.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/ReceiverDetails.tsx @@ -1,6 +1,6 @@ -import { tippingSelectors } from '@audius/common/store' import { useCallback } from 'react' +import { tippingSelectors } from '@audius/common/store' import { Pressable, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx index f2940fa1b4c..07c847102bb 100644 --- a/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/SendTipScreen.tsx @@ -1,3 +1,7 @@ +import { useCallback, useEffect, useState } from 'react' + +import { useGetFirstOrTopSupporter } from '@audius/common/hooks' +import type { StringWei, BNWei } from '@audius/common/models' import { accountSelectors, tippingSelectors, @@ -5,10 +9,6 @@ import { walletSelectors, walletActions } from '@audius/common/store' -import { useCallback, useEffect, useState } from 'react' - -import { useGetFirstOrTopSupporter } from '@audius/common/hooks' -import type { StringWei, BNWei } from '@audius/common/models' import { stringWeiToBN } from '@audius/common/utils' import { useFocusEffect } from '@react-navigation/native' import BN from 'bn.js' diff --git a/packages/mobile/src/screens/tip-artist-screen/SendTipStatusText.tsx b/packages/mobile/src/screens/tip-artist-screen/SendTipStatusText.tsx index d4953b3b538..a02fa52ce5d 100644 --- a/packages/mobile/src/screens/tip-artist-screen/SendTipStatusText.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/SendTipStatusText.tsx @@ -1,5 +1,4 @@ import { tippingSelectors } from '@audius/common/store' - import { Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipArtistModalScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/TipArtistModalScreen.tsx index f38b301a57c..7ca69f43232 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipArtistModalScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipArtistModalScreen.tsx @@ -1,6 +1,6 @@ -import { tippingActions } from '@audius/common/store' import { useEffect } from 'react' +import { tippingActions } from '@audius/common/store' import { createNativeStackNavigator } from '@react-navigation/native-stack' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx b/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx index b1e557d0a7e..b5eb3a20a16 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipHeader.tsx @@ -1,5 +1,4 @@ import { tippingSelectors } from '@audius/common/store' - import { formatNumberCommas } from '@audius/common/utils' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx b/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx index 44bad4d4d59..7d05a5218c1 100644 --- a/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx +++ b/packages/mobile/src/screens/tip-artist-screen/TipSentScreen.tsx @@ -1,7 +1,7 @@ -import { accountSelectors, tippingSelectors } from '@audius/common/store' import { useCallback } from 'react' import type { SolanaWalletAddress } from '@audius/common/models' +import { accountSelectors, tippingSelectors } from '@audius/common/store' import { formatNumberCommas } from '@audius/common/utils' import { useNavigation } from '@react-navigation/native' import { Platform } from 'react-native' diff --git a/packages/mobile/src/screens/track-screen/DownloadRow.tsx b/packages/mobile/src/screens/track-screen/DownloadRow.tsx index 27714cbe84a..ffdde3b252c 100644 --- a/packages/mobile/src/screens/track-screen/DownloadRow.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadRow.tsx @@ -1,11 +1,7 @@ -import { - cacheTracksSelectors, - tracksSocialActions, - CommonState -} from '@audius/common/store' -import { useCallback } from 'react' +import type { CommonState } from '@audius/common/store' +import { cacheTracksSelectors, tracksSocialActions } from '@audius/common/store' -import type {} from '@audius/common' +import { useCallback } from 'react' import { useDownloadableContentAccess } from '@audius/common/hooks' import { Name, DownloadQuality } from '@audius/common/models' diff --git a/packages/mobile/src/screens/track-screen/DownloadSection.tsx b/packages/mobile/src/screens/track-screen/DownloadSection.tsx index 052e019c188..9aaae84c6ab 100644 --- a/packages/mobile/src/screens/track-screen/DownloadSection.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadSection.tsx @@ -1,11 +1,11 @@ +import type { CommonState } from '@audius/common/store' import { cacheTracksSelectors, - usePremiumContentPurchaseModal, - CommonState + usePremiumContentPurchaseModal } from '@audius/common/store' + import { useCallback, useState } from 'react' -import type {} from '@audius/common' import { useCurrentStems, useDownloadableContentAccess diff --git a/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx b/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx index f0f74a477a4..3eab7b41e7f 100644 --- a/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx +++ b/packages/mobile/src/screens/track-screen/TrackRemixesScreen.tsx @@ -1,11 +1,11 @@ +import { useCallback, useEffect } from 'react' + import { lineupSelectors, remixesPageLineupActions as tracksActions, remixesPageActions, remixesPageSelectors } from '@audius/common/store' -import { useCallback, useEffect } from 'react' - import { pluralize } from '@audius/common/utils' import { Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/TrackScreen.tsx b/packages/mobile/src/screens/track-screen/TrackScreen.tsx index e7d28908156..b0c1d540c4d 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreen.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreen.tsx @@ -1,12 +1,12 @@ +import { useCallback } from 'react' + +import { useProxySelector } from '@audius/common/hooks' import { trackPageLineupActions, trackPageActions, trackPageSelectors, reachabilitySelectors } from '@audius/common/store' -import { useCallback } from 'react' - -import { useProxySelector } from '@audius/common/hooks' import { useFocusEffect } from '@react-navigation/native' import { Text, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx index 4090fb86c83..939299f8dfc 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDetailsTile.tsx @@ -1,19 +1,3 @@ -import { - accountSelectors, - trackPageLineupActions, - queueSelectors, - reachabilitySelectors, - tracksSocialActions, - mobileOverflowMenuUIActions, - shareModalUIActions, - OverflowAction, - OverflowSource, - repostsUserListActions, - favoritesUserListActions, - RepostType, - playerSelectors, - playbackPositionSelectors -} from '@audius/common/store' import { useCallback } from 'react' import { useGatedContentAccess } from '@audius/common/hooks' @@ -36,6 +20,22 @@ import type { User } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + trackPageLineupActions, + queueSelectors, + reachabilitySelectors, + tracksSocialActions, + mobileOverflowMenuUIActions, + shareModalUIActions, + OverflowAction, + OverflowSource, + repostsUserListActions, + favoritesUserListActions, + RepostType, + playerSelectors, + playbackPositionSelectors +} from '@audius/common/store' import { Genre, getCanonicalName, diff --git a/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx b/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx index 88c20be4299..b26ad48a29a 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenDownloadButtons.tsx @@ -1,10 +1,10 @@ -import { tracksSocialActions } from '@audius/common/store' import { useCallback } from 'react' import type { ButtonType as DownloadButtonType } from '@audius/common/hooks' import { ButtonState, useDownloadTrackButtons } from '@audius/common/hooks' import { Name } from '@audius/common/models' import type { ID } from '@audius/common/models' +import { tracksSocialActions } from '@audius/common/store' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx b/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx index a59a611a497..792f2de261e 100644 --- a/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx +++ b/packages/mobile/src/screens/track-screen/TrackScreenRemix.tsx @@ -1,8 +1,8 @@ -import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common/store' import { useCallback } from 'react' import type { ID, Track, User } from '@audius/common/models' import { SquareSizes } from '@audius/common/models' +import { cacheTracksSelectors, cacheUsersSelectors } from '@audius/common/store' import type { StyleProp, ViewStyle } from 'react-native' import { Pressable, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx b/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx index 61d89dabfb5..a3659a4dc60 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingFilterButton.tsx @@ -1,6 +1,6 @@ -import { trendingPageSelectors, modalsActions } from '@audius/common/store' import { useCallback } from 'react' +import { trendingPageSelectors, modalsActions } from '@audius/common/store' import { Genre } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx b/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx index 9112310e2bf..3cc26041ff6 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingFilterDrawer.tsx @@ -1,10 +1,10 @@ +import { useCallback, useMemo, useState } from 'react' + import { trendingPageLineupActions, trendingPageActions, trendingPageSelectors } from '@audius/common/store' -import { useCallback, useMemo, useState } from 'react' - import { Genre, ELECTRONIC_PREFIX, diff --git a/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx b/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx index 8a2fa627fbd..8a3bac04fd1 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingLineup.tsx @@ -1,12 +1,12 @@ +import { useCallback, useEffect } from 'react' + +import { Name, TimeRange } from '@audius/common/models' import { lineupSelectors, trendingPageLineupActions, trendingPageActions, trendingPageSelectors } from '@audius/common/store' -import { useCallback, useEffect } from 'react' - -import { Name, TimeRange } from '@audius/common/models' import { useNavigation } from '@react-navigation/native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx b/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx index 9d8d957802e..45735ca5bd1 100644 --- a/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx +++ b/packages/mobile/src/screens/trending-screen/TrendingScreen.tsx @@ -1,6 +1,5 @@ -import { trendingPageSelectors } from '@audius/common/store' - import { TimeRange } from '@audius/common/models' +import { trendingPageSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' import IconAllTime from 'app/assets/images/iconAllTime.svg' diff --git a/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx b/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx index 23e9a22c687..98ce88a4500 100644 --- a/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx +++ b/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx @@ -1,7 +1,7 @@ -import { UploadTrack } from '@audius/common/store' - import { useMemo } from 'react' +import { useMemo } from 'react' + +import type { UploadTrack } from '@audius/common/store' -import type { } from '@audius/common' import { View } from 'react-native' import IconImage from 'app/assets/images/iconImage.svg' diff --git a/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx index 79b0f547233..41bf64380a3 100644 --- a/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx @@ -1,7 +1,7 @@ -import { UploadTrack , ExtendedTrackMetadata } from '@audius/common/store' - import { useCallback } from 'react' +import { useCallback } from 'react' + +import type { UploadTrack, ExtendedTrackMetadata } from '@audius/common/store' -import type { } from '@audius/common' import { useRoute } from '@react-navigation/native' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx index 3143a5a58f4..345fde8386e 100644 --- a/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx @@ -1,14 +1,13 @@ +import { useCallback, useState } from 'react' + +import type { CommonState } from '@audius/common/store' import { accountSelectors, cacheTracksSelectors, trackPageActions, uploadActions, - uploadSelectors, - CommonState + uploadSelectors } from '@audius/common/store' -import { useCallback, useState } from 'react' - -import type {} from '@audius/common' import Clipboard from '@react-native-clipboard/clipboard' import { View, Image } from 'react-native' diff --git a/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx index 29bc0bd299f..4aa6767612c 100644 --- a/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx @@ -1,12 +1,11 @@ +import { useEffect } from 'react' + +import type { UploadTrack } from '@audius/common/store' import { uploadActions, uploadSelectors, - UploadType, - UploadTrack + UploadType } from '@audius/common/store' -import { useEffect } from 'react' - -import type {} from '@audius/common' import { useRoute } from '@react-navigation/native' import { useKeepAwake } from '@sayem314/react-native-keep-awake' diff --git a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts index 6752dcbc031..fb25ed784a7 100644 --- a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts +++ b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts @@ -1,5 +1,5 @@ -import { UploadTrack } from '@audius/common/store' - import type { } from '@audius/common' +import type { UploadTrack } from '@audius/common/store' + import { newTrackMetadata } from '@audius/common/schemas' import { ALLOWED_MAX_AUDIO_SIZE_BYTES, diff --git a/packages/mobile/src/screens/user-list-screen/FavoritedScreen.tsx b/packages/mobile/src/screens/user-list-screen/FavoritedScreen.tsx index 7f23beaf808..3532a436708 100644 --- a/packages/mobile/src/screens/user-list-screen/FavoritedScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/FavoritedScreen.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { favoritesUserListActions, favoritesUserListSelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch } from 'react-redux' import IconHeart from 'app/assets/images/iconHeart.svg' diff --git a/packages/mobile/src/screens/user-list-screen/FollowersScreen.tsx b/packages/mobile/src/screens/user-list-screen/FollowersScreen.tsx index da48e6a1e24..3468f1d44ff 100644 --- a/packages/mobile/src/screens/user-list-screen/FollowersScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/FollowersScreen.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { followersUserListActions, followersUserListSelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch } from 'react-redux' import IconUserFollowers from 'app/assets/images/iconUserFollowers.svg' diff --git a/packages/mobile/src/screens/user-list-screen/FollowingScreen.tsx b/packages/mobile/src/screens/user-list-screen/FollowingScreen.tsx index 0fdee05ef83..cccba331d83 100644 --- a/packages/mobile/src/screens/user-list-screen/FollowingScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/FollowingScreen.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { followingUserListActions, followingUserListSelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch } from 'react-redux' import IconUserList from 'app/assets/images/iconUserList.svg' diff --git a/packages/mobile/src/screens/user-list-screen/MutualsScreen.tsx b/packages/mobile/src/screens/user-list-screen/MutualsScreen.tsx index 2dd2c197214..2273335dd1f 100644 --- a/packages/mobile/src/screens/user-list-screen/MutualsScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/MutualsScreen.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + import { mutualsUserListActions, mutualsUserListSelectors, MUTUALS_USER_LIST_TAG } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch } from 'react-redux' import IconFollowing from 'app/assets/images/iconFollowing.svg' diff --git a/packages/mobile/src/screens/user-list-screen/NotificationUsersScreen.tsx b/packages/mobile/src/screens/user-list-screen/NotificationUsersScreen.tsx index 6804963a8cd..5cd5e0104c7 100644 --- a/packages/mobile/src/screens/user-list-screen/NotificationUsersScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/NotificationUsersScreen.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + import { NotificationType, notificationsUserListActions, notificationsUserListSelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch } from 'react-redux' import { useRoute } from 'app/hooks/useRoute' diff --git a/packages/mobile/src/screens/user-list-screen/RelatedArtistsScreen.tsx b/packages/mobile/src/screens/user-list-screen/RelatedArtistsScreen.tsx index 5151d78dbe7..b7a62d8461d 100644 --- a/packages/mobile/src/screens/user-list-screen/RelatedArtistsScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/RelatedArtistsScreen.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + import { relatedArtistsUserListActions, relatedArtistsUserListSelectors, RELATED_ARTISTS_USER_LIST_TAG } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch } from 'react-redux' import IconUserGroup from 'app/assets/images/iconUserGroup.svg' diff --git a/packages/mobile/src/screens/user-list-screen/RepostsScreen.tsx b/packages/mobile/src/screens/user-list-screen/RepostsScreen.tsx index ea4d790141d..1e25e474536 100644 --- a/packages/mobile/src/screens/user-list-screen/RepostsScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/RepostsScreen.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { repostsUserListActions, repostsUserListSelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch } from 'react-redux' import IconRepost from 'app/assets/images/iconRepost.svg' diff --git a/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx b/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx index d0b2e6d4aec..638d2063c0e 100644 --- a/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx +++ b/packages/mobile/src/screens/user-list-screen/SupporterInfo.tsx @@ -1,9 +1,8 @@ +import type { User } from '@audius/common/models' import { tippingSelectors, topSupportersUserListSelectors } from '@audius/common/store' - -import type { User } from '@audius/common/models' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx b/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx index 2e844bba770..52cff932687 100644 --- a/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx +++ b/packages/mobile/src/screens/user-list-screen/SupportingInfo.tsx @@ -1,9 +1,8 @@ +import type { User } from '@audius/common/models' import { tippingSelectors, supportingUserListSelectors } from '@audius/common/store' - -import type { User } from '@audius/common/models' import { useSelector } from 'react-redux' import { Tip } from './Tip' diff --git a/packages/mobile/src/screens/user-list-screen/SupportingUsersScreen.tsx b/packages/mobile/src/screens/user-list-screen/SupportingUsersScreen.tsx index 1888abc7a16..b7604affda1 100644 --- a/packages/mobile/src/screens/user-list-screen/SupportingUsersScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/SupportingUsersScreen.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { supportingUserListActions, supportingUserListSelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch } from 'react-redux' import IconTip from 'app/assets/images/iconTip.svg' diff --git a/packages/mobile/src/screens/user-list-screen/TopSupportersScreen.tsx b/packages/mobile/src/screens/user-list-screen/TopSupportersScreen.tsx index e1319f1bbec..eb5eb3a37e8 100644 --- a/packages/mobile/src/screens/user-list-screen/TopSupportersScreen.tsx +++ b/packages/mobile/src/screens/user-list-screen/TopSupportersScreen.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + import { cacheUsersSelectors, topSupportersUserListActions, topSupportersUserListSelectors } from '@audius/common/store' -import { useCallback } from 'react' - import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/user-list-screen/UserList.tsx b/packages/mobile/src/screens/user-list-screen/UserList.tsx index 191407a2b84..51799e8bdad 100644 --- a/packages/mobile/src/screens/user-list-screen/UserList.tsx +++ b/packages/mobile/src/screens/user-list-screen/UserList.tsx @@ -1,13 +1,11 @@ +import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' + +import type { CommonState, UserListStoreState } from '@audius/common/store' import { cacheUsersSelectors, userListActions, - userListSelectors, - CommonState, - UserListStoreState + userListSelectors } from '@audius/common/store' -import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' - -import type {} from '@audius/common' import type { ID, User } from '@audius/common/models' import { useFocusEffect, useIsFocused } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/user-list-screen/UserListItem.tsx b/packages/mobile/src/screens/user-list-screen/UserListItem.tsx index b6c8083a20b..54e337e24b0 100644 --- a/packages/mobile/src/screens/user-list-screen/UserListItem.tsx +++ b/packages/mobile/src/screens/user-list-screen/UserListItem.tsx @@ -1,8 +1,8 @@ -import { accountSelectors } from '@audius/common/store' import { useCallback } from 'react' import type { User } from '@audius/common/models' import { FollowSource } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { Pressable, View, Animated } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx b/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx index 5a3aaec3dfa..c5d4ef9bc17 100644 --- a/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx +++ b/packages/mobile/src/screens/wallet-connect/ConnectNewWalletButton.tsx @@ -1,6 +1,6 @@ -import { tokenDashboardPageSelectors } from '@audius/common/store' import { useCallback } from 'react' +import { tokenDashboardPageSelectors } from '@audius/common/store' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/wallet-connect/WalletConnectScreen.tsx b/packages/mobile/src/screens/wallet-connect/WalletConnectScreen.tsx index 423817adb0e..11a64017c71 100644 --- a/packages/mobile/src/screens/wallet-connect/WalletConnectScreen.tsx +++ b/packages/mobile/src/screens/wallet-connect/WalletConnectScreen.tsx @@ -1,5 +1,4 @@ import { tokenDashboardPageActions } from '@audius/common/store' - import { View } from 'react-native' import { useDispatch } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/wallet-connect/components/ConfirmRemoveWalletDrawer.tsx b/packages/mobile/src/screens/wallet-connect/components/ConfirmRemoveWalletDrawer.tsx index b4e6b0fa81f..e0ff12d3f2d 100644 --- a/packages/mobile/src/screens/wallet-connect/components/ConfirmRemoveWalletDrawer.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/ConfirmRemoveWalletDrawer.tsx @@ -1,9 +1,9 @@ +import { useCallback } from 'react' + import { tokenDashboardPageSelectors, tokenDashboardPageActions } from '@audius/common/store' -import { useCallback } from 'react' - import { useDispatch, useSelector } from 'react-redux' import { ConfirmationDrawer } from 'app/components/drawers' diff --git a/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx b/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx index 4feaf248653..a8308d1510f 100644 --- a/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/LinkedWallet.tsx @@ -1,7 +1,7 @@ -import { tokenDashboardPageActions } from '@audius/common/store' import { useCallback } from 'react' import type { Chain, BNWei } from '@audius/common/models' +import { tokenDashboardPageActions } from '@audius/common/store' import { formatWei } from '@audius/common/utils' import Clipboard from '@react-native-clipboard/clipboard' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx b/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx index e18d14dff2a..15bab5cd174 100644 --- a/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx @@ -1,8 +1,5 @@ -import { - tokenDashboardPageSelectors, - AssociatedWallet -} from '@audius/common/store' -import type {} from '@audius/common' +import type { AssociatedWallet } from '@audius/common/store' +import { tokenDashboardPageSelectors } from '@audius/common/store' import { Chain } from '@audius/common/models' import { FlatList, View } from 'react-native' diff --git a/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx b/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx index 288cc8f49af..a464d1ca2cd 100644 --- a/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/SolanaPhoneOption.tsx @@ -1,10 +1,10 @@ +import { useCallback } from 'react' + +import { Theme } from '@audius/common/models' import { accountSelectors, tokenDashboardPageActions } from '@audius/common/store' -import { useCallback } from 'react' - -import { Theme } from '@audius/common/models' import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol' import { View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/wallet-connect/components/WalletConnectDrawer.tsx b/packages/mobile/src/screens/wallet-connect/components/WalletConnectDrawer.tsx index 91b636091a2..e7fbe6a423e 100644 --- a/packages/mobile/src/screens/wallet-connect/components/WalletConnectDrawer.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/WalletConnectDrawer.tsx @@ -1,6 +1,6 @@ -import { tokenDashboardPageSelectors } from '@audius/common/store' import { useEffect, useState } from 'react' +import { tokenDashboardPageSelectors } from '@audius/common/store' import type { RenderQrcodeModalProps, WalletService diff --git a/packages/mobile/src/screens/wallet-connect/useCanConnectNewWallet.ts b/packages/mobile/src/screens/wallet-connect/useCanConnectNewWallet.ts index 7f653483299..79c68439a44 100644 --- a/packages/mobile/src/screens/wallet-connect/useCanConnectNewWallet.ts +++ b/packages/mobile/src/screens/wallet-connect/useCanConnectNewWallet.ts @@ -1,5 +1,4 @@ import { tokenDashboardPageSelectors } from '@audius/common/store' - import { useSelector } from 'react-redux' const { getConfirmingWalletStatus, getRemoveWallet } = diff --git a/packages/mobile/src/screens/wallet-connect/usePhantomConnect.ts b/packages/mobile/src/screens/wallet-connect/usePhantomConnect.ts index cb46a5d6cd3..ac650f54ec0 100644 --- a/packages/mobile/src/screens/wallet-connect/usePhantomConnect.ts +++ b/packages/mobile/src/screens/wallet-connect/usePhantomConnect.ts @@ -1,6 +1,6 @@ -import { tokenDashboardPageActions } from '@audius/common/store' import { useEffect } from 'react' +import { tokenDashboardPageActions } from '@audius/common/store' import { useRoute } from '@react-navigation/native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/wallet-connect/useWalletConnect.ts b/packages/mobile/src/screens/wallet-connect/useWalletConnect.ts index ba80922bfe4..6ffaa6223fd 100644 --- a/packages/mobile/src/screens/wallet-connect/useWalletConnect.ts +++ b/packages/mobile/src/screens/wallet-connect/useWalletConnect.ts @@ -1,10 +1,10 @@ +import { useEffect } from 'react' + import { accountSelectors, tokenDashboardPageSelectors, tokenDashboardPageActions } from '@audius/common/store' -import { useEffect } from 'react' - import { useWalletConnect as useWalletConnectBase } from '@walletconnect/react-native-dapp' import { useDispatch, useSelector } from 'react-redux' import { useEffectOnce } from 'react-use' diff --git a/packages/mobile/src/screens/wallet-connect/useWalletStatusToasts.ts b/packages/mobile/src/screens/wallet-connect/useWalletStatusToasts.ts index 7c892af3201..eddca8e85b7 100644 --- a/packages/mobile/src/screens/wallet-connect/useWalletStatusToasts.ts +++ b/packages/mobile/src/screens/wallet-connect/useWalletStatusToasts.ts @@ -1,9 +1,9 @@ +import { useEffect } from 'react' + import { tokenDashboardPageSelectors, tokenDashboardPageActions } from '@audius/common/store' -import { useEffect } from 'react' - import { useDispatch, useSelector } from 'react-redux' import { useToast } from 'app/hooks/useToast' diff --git a/packages/mobile/src/services/audio-player/NativeMobileAudio.ts b/packages/mobile/src/services/audio-player/NativeMobileAudio.ts index 474f5979eb4..71eaa152e2b 100644 --- a/packages/mobile/src/services/audio-player/NativeMobileAudio.ts +++ b/packages/mobile/src/services/audio-player/NativeMobileAudio.ts @@ -1,5 +1,5 @@ -import { PlaybackRate } from '@audius/common/store' - import type { } from '@audius/common' +import type { PlaybackRate } from '@audius/common/store' + import type { Nullable } from '@audius/common/utils' import TrackPlayer from 'react-native-track-player' diff --git a/packages/mobile/src/store/oauth/actions.ts b/packages/mobile/src/store/oauth/actions.ts index 55705b37a18..bf741943f27 100644 --- a/packages/mobile/src/store/oauth/actions.ts +++ b/packages/mobile/src/store/oauth/actions.ts @@ -1,10 +1,9 @@ -import { InstagramAccountPayload, TwitterProfile, TikTokProfile, Image - } from '@audius/common/store' - import type { - - - - } from '@audius/common' +import type { + InstagramAccountPayload, + TwitterProfile, + TikTokProfile, + Image +} from '@audius/common/store' import type { Provider } from './reducer' import type { Credentials } from './types' diff --git a/packages/mobile/src/store/oauth/reducer.ts b/packages/mobile/src/store/oauth/reducer.ts index 0c0e2e7d3c2..c7739c19a9b 100644 --- a/packages/mobile/src/store/oauth/reducer.ts +++ b/packages/mobile/src/store/oauth/reducer.ts @@ -1,5 +1,4 @@ -import { TikTokProfile , Image } from '@audius/common/store' - import type { } from '@audius/common' +import type { TikTokProfile, Image } from '@audius/common/store' import type { OAuthActions } from './actions' import { diff --git a/packages/mobile/src/store/offline-downloads/sagas/syncOfflineDataSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/syncOfflineDataSaga.ts index f88cf60655c..3343a7b64b1 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/syncOfflineDataSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/syncOfflineDataSaga.ts @@ -1,5 +1,4 @@ -import { CommonState } from '@audius/common/store' - import type { } from '@audius/common' +import type { CommonState } from '@audius/common/store' import { waitForBackendSetup } from 'audius-client/src/common/store/backend/sagas' import { waitForRead } from 'audius-client/src/utils/sagaHelpers' import { difference, intersection } from 'lodash' diff --git a/packages/mobile/src/store/settings/sagas.ts b/packages/mobile/src/store/settings/sagas.ts index 64055f7d03a..e15f9e4d078 100644 --- a/packages/mobile/src/store/settings/sagas.ts +++ b/packages/mobile/src/store/settings/sagas.ts @@ -1,10 +1,13 @@ -import { accountSelectors, settingsPageSelectors, settingsPageInitialState as initialState, settingsPageActions -, PushNotificationSetting, getContext, PushNotifications as TPushNotifications } from '@audius/common' import { - accountSelectors } from '@audius/common/store' - import type { - - } from '@audius/common' + accountSelectors, + settingsPageSelectors, + settingsPageInitialState as initialState, + settingsPageActions, + PushNotificationSetting, + getContext +} from '@audius/common' +import type { PushNotifications as TPushNotifications } from '@audius/common' +import { accountSelectors } from '@audius/common/store' import { getErrorMessage, waitForValue, diff --git a/packages/mobile/src/store/store.ts b/packages/mobile/src/store/store.ts index 83c50e7703c..8fe41a8f10d 100644 --- a/packages/mobile/src/store/store.ts +++ b/packages/mobile/src/store/store.ts @@ -1,3 +1,4 @@ +import { ErrorLevel } from '@audius/common/models' import type { CommonState, RemoteConfigState } from '@audius/common/store' import { chatMiddleware, @@ -5,9 +6,6 @@ import { toastActions, reducers as commonReducers } from '@audius/common/store' -import type {} from '@audius/common' - -import { ErrorLevel } from '@audius/common/models' import AsyncStorage from '@react-native-async-storage/async-storage' import backend from 'audius-client/src/common/store/backend/reducer' import type { BackendState } from 'audius-client/src/common/store/backend/types' diff --git a/packages/mobile/src/store/storeContext.ts b/packages/mobile/src/store/storeContext.ts index 77985566e23..8af12ca5593 100644 --- a/packages/mobile/src/store/storeContext.ts +++ b/packages/mobile/src/store/storeContext.ts @@ -1,6 +1,5 @@ -import type { CommonStoreContext } from '@audius/common/store' -import type {} from '@audius/common' import { OpenSeaClient, SolanaClient } from '@audius/common/services' +import type { CommonStoreContext } from '@audius/common/store' import AsyncStorage from '@react-native-async-storage/async-storage' import * as Sentry from '@sentry/react-native' diff --git a/packages/mobile/src/store/theme/sagas.ts b/packages/mobile/src/store/theme/sagas.ts index 6b69c963964..5ecd0190e4d 100644 --- a/packages/mobile/src/store/theme/sagas.ts +++ b/packages/mobile/src/store/theme/sagas.ts @@ -1,7 +1,5 @@ import type { SetThemeAction } from '@audius/common/store' import { themeActions } from '@audius/common/store' -import type {} from '@audius/common' - import { takeEvery, call } from 'typed-redux-saga' import { THEME_STORAGE_KEY } from 'app/constants/storage-keys' diff --git a/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts b/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts index a3f8105c87c..d7caeb795f4 100644 --- a/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts +++ b/packages/mobile/src/store/wallet-connect/sagas/signMessageSaga.ts @@ -1,8 +1,6 @@ +import { Name } from '@audius/common/models' import type { CommonState } from '@audius/common/store' import { tokenDashboardPageSelectors, getContext } from '@audius/common/store' -import type {} from '@audius/common' - -import { Name } from '@audius/common/models' import { getErrorMessage, waitForValue } from '@audius/common/utils' import bs58 from 'bs58' import { addWalletToUser } from 'common/store/pages/token-dashboard/addWalletToUser' diff --git a/packages/mobile/src/utils/launchSelectImageActionSheet.ts b/packages/mobile/src/utils/launchSelectImageActionSheet.ts index de1bbcd013c..9dd63a5b729 100644 --- a/packages/mobile/src/utils/launchSelectImageActionSheet.ts +++ b/packages/mobile/src/utils/launchSelectImageActionSheet.ts @@ -1,5 +1,5 @@ -import { Image } from '@audius/common/store' - import type { } from '@audius/common' +import type { Image } from '@audius/common/store' + import { ActionSheetIOS, Alert, Platform } from 'react-native' import type { Image as CropPickerImage, diff --git a/packages/mobile/src/utils/reachability.ts b/packages/mobile/src/utils/reachability.ts index 6740c012a6f..85a6886a952 100644 --- a/packages/mobile/src/utils/reachability.ts +++ b/packages/mobile/src/utils/reachability.ts @@ -1,5 +1,4 @@ import { reachabilityActions } from '@audius/common/store' - import type { NetInfoState } from '@react-native-community/netinfo' import NetInfo from '@react-native-community/netinfo' import { debounce } from 'lodash' diff --git a/packages/mobile/src/utils/theme.ts b/packages/mobile/src/utils/theme.ts index dbefdd830a9..7addb5016ac 100644 --- a/packages/mobile/src/utils/theme.ts +++ b/packages/mobile/src/utils/theme.ts @@ -1,5 +1,5 @@ -import { themeSelectors, CommonState } from '@audius/common/store' -import type {} from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { themeSelectors } from '@audius/common/store' import { useSelector } from 'react-redux' From 0aeec076131edcae4adb1c3092f85f04aea3df05 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 18:09:41 -0800 Subject: [PATCH 52/64] Convert mobile common store --- packages/mobile/babel.config.js | 3 +- .../ChallengeRewardsDrawerProvider.tsx | 3 +- .../components/details-tile/DetailsTile.tsx | 13 +-- .../details-tile/DetailsTileActionButtons.tsx | 5 +- .../components/lineup-tile/CollectionTile.tsx | 27 +++-- .../lineup-tile/CollectionTileTrackList.tsx | 3 +- .../lineup-tile/LineupTileStats.tsx | 11 +- .../src/components/lineup-tile/TrackTile.tsx | 29 +++-- .../src/components/lineup-tile/types.ts | 3 +- .../mobile/src/components/lineup/types.ts | 3 +- .../components/now-playing-drawer/Artwork.tsx | 5 +- .../now-playing-drawer/PlaybackRateButton.tsx | 1 - .../CollectionOverflowMenuDrawer.tsx | 19 ++- .../ProfileOverflowMenuDrawer.tsx | 5 +- .../TrackOverflowMenuDrawer.tsx | 21 ++-- .../PremiumTrackPurchaseDrawer.tsx | 19 ++- .../StripeOnrampEmbed.tsx | 1 - .../SuggestedArtistsList.tsx | 3 +- .../mobile/src/components/toasts/Toast.tsx | 3 +- packages/mobile/src/hooks/useManualToast.ts | 1 - .../src/hooks/useNotificationNavigation.ts | 1 - packages/mobile/src/hooks/useToast.ts | 1 - .../src/screens/app-screen/AppTabScreen.tsx | 11 +- .../src/screens/audio-screen/AudioScreen.tsx | 11 +- .../screens/audio-screen/ChallengeRewards.tsx | 19 ++- .../screens/audio-screen/TrendingRewards.tsx | 5 +- .../chat-screen/ChatMessageListItem.tsx | 3 +- .../chat-screen/ChatMessagePlaylist.tsx | 13 +-- .../screens/chat-screen/ChatMessageTrack.tsx | 5 +- .../chat-screen/ChatUserListScreen.tsx | 13 +-- .../src/screens/chat-screen/ReactionPopup.tsx | 3 +- .../edit-playlist-screen/EditPlaylistForm.tsx | 3 +- .../EditPlaylistModalScreen.tsx | 3 +- .../EditPlaylistNavigator.tsx | 1 - .../edit-track-screen/EditTrackForm.tsx | 1 - .../EditTrackModalScreen.tsx | 3 +- .../edit-track-screen/EditTrackScreen.tsx | 3 +- .../src/screens/edit-track-screen/types.ts | 1 - .../screens/favorites-screen/AlbumsTab.tsx | 3 +- .../LibraryCategorySelectionMenu.tsx | 1 - .../screens/favorites-screen/PlaylistsTab.tsx | 9 +- .../src/screens/favorites-screen/selectors.ts | 3 +- .../useCollectionsScreenData.ts | 11 +- .../Notification/NotificationTile.tsx | 1 - .../notifications-screen/NotificationList.tsx | 3 +- .../AddTrackToPlaylistNotification.tsx | 3 +- .../AnnouncementNotification.tsx | 1 - .../ChallengeRewardNotification.tsx | 3 +- .../Notifications/FavoriteNotification.tsx | 5 +- .../FavoriteOfRepostNotification.tsx | 5 +- .../Notifications/FollowNotification.tsx | 3 +- .../Notifications/MilestoneNotification.tsx | 9 +- .../Notifications/RemixCosignNotification.tsx | 3 +- .../Notifications/RemixCreateNotification.tsx | 8 +- .../Notifications/RepostNotification.tsx | 5 +- .../RepostOfRepostNotification.tsx | 5 +- .../SupporterDethronedNotification.tsx | 1 - .../Notifications/TastemakerNotification.tsx | 3 +- .../Notifications/TierChangeNotification.tsx | 3 +- .../Notifications/TipReactionNotification.tsx | 3 +- .../Notifications/TipReceivedNotification.tsx | 3 +- .../Notifications/TipSentNotification.tsx | 3 +- .../TopSupporterNotification.tsx | 1 - .../TopSupportingNotification.tsx | 1 - .../TrendingPlaylistNotification.tsx | 5 +- .../TrendingTrackNotification.tsx | 5 +- .../TrendingUndergroundNotification.tsx | 5 +- .../USDCPurchaseBuyerNotification.tsx | 3 +- .../USDCPurchaseSellerNotification.tsx | 5 +- .../UserSubscriptionNotification.tsx | 3 +- .../Notifications/useSocialActionHandler.ts | 3 +- .../Reaction/Reaction.tsx | 1 - .../Reaction/ReactionList.tsx | 1 - .../Reaction/reactions.tsx | 1 - .../ArtistRecommendations.tsx | 11 +- .../src/screens/profile-screen/selectors.ts | 5 +- .../src/screens/profile-screen/utils.ts | 3 +- .../search-results-screen/tabs/AlbumsTab.tsx | 5 +- .../tabs/PlaylistsTab.tsx | 5 +- .../tabs/ProfilesTab.tsx | 5 +- .../settings-screen/CastSettingsRow.tsx | 1 - .../screens/FinishProfileScreen.tsx | 3 +- .../SelectArtistScreen/TopArtistsCardList.tsx | 2 +- .../src/screens/signon/ProfileImage.tsx | 1 - .../src/screens/signon/ProfileManual.tsx | 1 - .../src/screens/track-screen/DownloadRow.tsx | 5 +- .../screens/track-screen/DownloadSection.tsx | 11 +- .../components/UploadingTrackTile.tsx | 1 - .../screens/CompleteTrackScreen.tsx | 1 - .../screens/UploadCompleteScreen.tsx | 1 - .../screens/UploadingTracksScreen.tsx | 1 - .../upload-screen/utils/processTrackFile.ts | 3 +- .../src/screens/user-list-screen/UserList.tsx | 3 +- .../components/LinkedWallets.tsx | 3 +- .../audio-player/NativeMobileAudio.ts | 1 - packages/mobile/src/store/settings/sagas.ts | 109 ++++++++++-------- .../src/utils/launchSelectImageActionSheet.ts | 1 - packages/mobile/src/utils/theme.ts | 1 - 98 files changed, 256 insertions(+), 336 deletions(-) diff --git a/packages/mobile/babel.config.js b/packages/mobile/babel.config.js index cbee15b9ba2..9b68ff5d6f2 100644 --- a/packages/mobile/babel.config.js +++ b/packages/mobile/babel.config.js @@ -17,7 +17,8 @@ module.exports = (api) => { '@audius/common/utils': '../common/src/utils', '@audius/common/schemas': '../common/src/schemas', '@audius/common/services': '../common/src/services', - '@audius/common/audius-query': '../common/src/audius-query' + '@audius/common/audius-query': '../common/src/audius-query', + '@audius/common/store': '../common/src/store' } } ] diff --git a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx index 0e3400bce0f..222d7777864 100644 --- a/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx +++ b/packages/mobile/src/components/challenge-rewards-drawer/ChallengeRewardsDrawerProvider.tsx @@ -1,5 +1,6 @@ import { useCallback, useEffect } from 'react' +import { IntKeys, StringKeys } from '@audius/common/services' import type { CommonState } from '@audius/common/store' import { challengesSelectors, @@ -7,8 +8,6 @@ import { audioRewardsPageActions, ClaimStatus } from '@audius/common/store' - -import { IntKeys, StringKeys } from '@audius/common/services' import { isAudioMatchingChallenge, getClaimableChallengeSpecifiers diff --git a/packages/mobile/src/components/details-tile/DetailsTile.tsx b/packages/mobile/src/components/details-tile/DetailsTile.tsx index c8f372a78f5..8567580883c 100644 --- a/packages/mobile/src/components/details-tile/DetailsTile.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTile.tsx @@ -1,16 +1,15 @@ -import type { CommonState } from '@audius/common/store' -import { - accountSelectors, - playerSelectors, - playbackPositionSelectors -} from '@audius/common/store' - import { useCallback } from 'react' import { useGatedContentAccess } from '@audius/common/hooks' import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { Track } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + playerSelectors, + playbackPositionSelectors +} from '@audius/common/store' +import type { CommonState } from '@audius/common/store' import { dayjs, squashNewLines, diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index 88629d50b16..e164dc06b8c 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -1,10 +1,9 @@ -import type { CommonState } from '@audius/common/store' -import { cacheCollectionsSelectors } from '@audius/common/store' - import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import { useFeatureFlag } from '@audius/common/hooks' import type { ID } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { cacheCollectionsSelectors } from '@audius/common/store' +import type { CommonState } from '@audius/common/store' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx index 1d530d90647..16e2d9e3e98 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTile.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTile.tsx @@ -1,17 +1,3 @@ -import type { EnhancedCollectionTrack, CommonState } from '@audius/common/store' -import { - accountSelectors, - cacheCollectionsSelectors, - cacheUsersSelectors, - collectionsSocialActions, - mobileOverflowMenuUIActions, - shareModalUIActions, - OverflowAction, - OverflowSource, - RepostType, - playerSelectors -} from '@audius/common/store' - import { useCallback, useMemo } from 'react' import { useProxySelector } from '@audius/common/hooks' @@ -25,6 +11,19 @@ import { } from '@audius/common/models' import type { Collection, Track, User } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + cacheCollectionsSelectors, + cacheUsersSelectors, + collectionsSocialActions, + mobileOverflowMenuUIActions, + shareModalUIActions, + OverflowAction, + OverflowSource, + RepostType, + playerSelectors +} from '@audius/common/store' +import type { EnhancedCollectionTrack, CommonState } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx b/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx index c049f0b293c..8cca9427de6 100644 --- a/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx +++ b/packages/mobile/src/components/lineup-tile/CollectionTileTrackList.tsx @@ -1,7 +1,6 @@ +import type { UID, LineupTrack } from '@audius/common/models' import type { CommonState } from '@audius/common/store' import { playerSelectors } from '@audius/common/store' - -import type { UID, LineupTrack } from '@audius/common/models' import { range } from 'lodash' import { Pressable, Text, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx index eff7f243898..7cbde51e86a 100644 --- a/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx +++ b/packages/mobile/src/components/lineup-tile/LineupTileStats.tsx @@ -1,13 +1,12 @@ -import type { RepostType } from '@audius/common/store' -import { - repostsUserListActions, - favoritesUserListActions -} from '@audius/common/store' - import { useCallback } from 'react' import { isContentUSDCPurchaseGated } from '@audius/common/models' import type { FavoriteType, ID, AccessConditions } from '@audius/common/models' +import { + repostsUserListActions, + favoritesUserListActions +} from '@audius/common/store' +import type { RepostType } from '@audius/common/store' import { dayjs, formatCount } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import moment from 'moment' diff --git a/packages/mobile/src/components/lineup-tile/TrackTile.tsx b/packages/mobile/src/components/lineup-tile/TrackTile.tsx index f13a804a098..15a2a7aaaa2 100644 --- a/packages/mobile/src/components/lineup-tile/TrackTile.tsx +++ b/packages/mobile/src/components/lineup-tile/TrackTile.tsx @@ -1,18 +1,3 @@ -import type { CommonState } from '@audius/common/store' -import { - accountSelectors, - cacheTracksSelectors, - cacheUsersSelectors, - tracksSocialActions, - mobileOverflowMenuUIActions, - shareModalUIActions, - OverflowAction, - OverflowSource, - RepostType, - playerSelectors, - playbackPositionSelectors -} from '@audius/common/store' - import { useCallback } from 'react' import { @@ -26,6 +11,20 @@ import { } from '@audius/common/models' import type { Track, User } from '@audius/common/models' import { FeatureFlags } from '@audius/common/services' +import { + accountSelectors, + cacheTracksSelectors, + cacheUsersSelectors, + tracksSocialActions, + mobileOverflowMenuUIActions, + shareModalUIActions, + OverflowAction, + OverflowSource, + RepostType, + playerSelectors, + playbackPositionSelectors +} from '@audius/common/store' +import type { CommonState } from '@audius/common/store' import { Genre, removeNullable } from '@audius/common/utils' import { useNavigationState } from '@react-navigation/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/lineup-tile/types.ts b/packages/mobile/src/components/lineup-tile/types.ts index 7e56f4405dd..146642669cd 100644 --- a/packages/mobile/src/components/lineup-tile/types.ts +++ b/packages/mobile/src/components/lineup-tile/types.ts @@ -1,5 +1,3 @@ -import type { RepostType, EnhancedCollectionTrack } from '@audius/common/store' - import type { ReactNode } from 'react' import type { @@ -11,6 +9,7 @@ import type { Track, User } from '@audius/common/models' +import type { RepostType, EnhancedCollectionTrack } from '@audius/common/store' import type { StyleProp, ViewStyle } from 'react-native' import type { GestureResponderHandler } from 'app/types/gesture' diff --git a/packages/mobile/src/components/lineup/types.ts b/packages/mobile/src/components/lineup/types.ts index e19773d129e..ca21e2aef43 100644 --- a/packages/mobile/src/components/lineup/types.ts +++ b/packages/mobile/src/components/lineup/types.ts @@ -1,8 +1,7 @@ -import type { LineupBaseActions, CommonState } from '@audius/common/store' - import type { ComponentType, ReactElement } from 'react' import type { Kind, ID, UID, Lineup as LineupData } from '@audius/common/models' +import type { LineupBaseActions, CommonState } from '@audius/common/store' import type { Maybe } from '@audius/common/utils' import type { SectionListProps } from 'react-native' diff --git a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx index 8ac6b625ca1..df624962bcd 100644 --- a/packages/mobile/src/components/now-playing-drawer/Artwork.tsx +++ b/packages/mobile/src/components/now-playing-drawer/Artwork.tsx @@ -1,9 +1,8 @@ -import type { CommonState } from '@audius/common/store' -import { averageColorSelectors, playerSelectors } from '@audius/common/store' - import { useGatedContentAccess } from '@audius/common/hooks' import { DogEarType, SquareSizes } from '@audius/common/models' import type { Track } from '@audius/common/models' +import { averageColorSelectors, playerSelectors } from '@audius/common/store' +import type { CommonState } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { Dimensions } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx b/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx index 9601c2b68d0..a822ad9658e 100644 --- a/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx +++ b/packages/mobile/src/components/now-playing-drawer/PlaybackRateButton.tsx @@ -1,6 +1,5 @@ import type { PlaybackRate } from '@audius/common/store' import { playerSelectors } from '@audius/common/store' - import { useSelector } from 'react-redux' import Icon0_5x from 'app/assets/images/iconPlaybackRate0_5x.svg' diff --git a/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx index 6c7a2fa746c..01d95b552c0 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/CollectionOverflowMenuDrawer.tsx @@ -1,4 +1,11 @@ -import type { OverflowActionCallbacks } from '@audius/common/store' +import { useContext } from 'react' + +import { + ShareSource, + RepostSource, + FavoriteSource +} from '@audius/common/models' +import type { ID } from '@audius/common/models' import { cacheCollectionsSelectors, cacheUsersSelectors, @@ -8,15 +15,7 @@ import { publishPlaylistConfirmationModalUIActions, OverflowAction } from '@audius/common/store' - -import { useContext } from 'react' - -import { - ShareSource, - RepostSource, - FavoriteSource -} from '@audius/common/models' -import type { ID } from '@audius/common/models' +import type { OverflowActionCallbacks } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx index 10c2ffbb579..0a476ce21d1 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/ProfileOverflowMenuDrawer.tsx @@ -1,3 +1,5 @@ +import type { ID } from '@audius/common/models' +import { ShareSource, FollowSource } from '@audius/common/models' import type { CommonState, OverflowActionCallbacks } from '@audius/common/store' import { cacheUsersSelectors, @@ -6,9 +8,6 @@ import { shareModalUIActions, OverflowAction } from '@audius/common/store' - -import type { ID } from '@audius/common/models' -import { ShareSource, FollowSource } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' const { getMobileOverflowModal } = mobileOverflowMenuUISelectors diff --git a/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx b/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx index 1e67c6d9930..3f29f791492 100644 --- a/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx +++ b/packages/mobile/src/components/overflow-menu-drawer/TrackOverflowMenuDrawer.tsx @@ -1,4 +1,12 @@ -import type { CommonState, OverflowActionCallbacks } from '@audius/common/store' +import { useContext } from 'react' + +import { + ShareSource, + RepostSource, + FavoriteSource, + FollowSource +} from '@audius/common/models' +import type { ID } from '@audius/common/models' import { accountSelectors, cacheCollectionsActions, @@ -14,16 +22,7 @@ import { OverflowAction, playbackPositionActions } from '@audius/common/store' - -import { useContext } from 'react' - -import { - ShareSource, - RepostSource, - FavoriteSource, - FollowSource -} from '@audius/common/models' -import type { ID } from '@audius/common/models' +import type { CommonState, OverflowActionCallbacks } from '@audius/common/store' import { useDispatch, useSelector } from 'react-redux' import { trpc } from 'utils/trpcClientWeb' diff --git a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx index 3edf6f3965f..dbdcf655885 100644 --- a/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx +++ b/packages/mobile/src/components/premium-track-purchase-drawer/PremiumTrackPurchaseDrawer.tsx @@ -1,13 +1,3 @@ -import type { PurchaseContentError } from '@audius/common/store' -import { - usePremiumContentPurchaseModal, - purchaseContentActions, - purchaseContentSelectors, - PurchaseContentStage, - PurchaseContentPage, - isContentPurchaseInProgress -} from '@audius/common/store' - import { useCallback, type ReactNode, useEffect } from 'react' import { useGetTrackById } from '@audius/common/api' @@ -29,6 +19,15 @@ import { statusIsNotFinalized } from '@audius/common/models' import { IntKeys, FeatureFlags } from '@audius/common/services' +import { + usePremiumContentPurchaseModal, + purchaseContentActions, + purchaseContentSelectors, + PurchaseContentStage, + PurchaseContentPage, + isContentPurchaseInProgress +} from '@audius/common/store' +import type { PurchaseContentError } from '@audius/common/store' import { formatPrice } from '@audius/common/utils' import { Formik, useField, useFormikContext } from 'formik' import { diff --git a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx index 827e7df12db..da5ab08b6f3 100644 --- a/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx +++ b/packages/mobile/src/components/stripe-onramp-drawer/StripeOnrampEmbed.tsx @@ -5,7 +5,6 @@ import { stripeModalUIActions, stripeModalUISelectors } from '@audius/common/store' - import { View } from 'react-native' import { WebView } from 'react-native-webview' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx index a24a2dccc73..3adeb3b02e8 100644 --- a/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx +++ b/packages/mobile/src/components/suggested-follows/SuggestedArtistsList.tsx @@ -1,9 +1,8 @@ -import type { CommonState } from '@audius/common/store' - import { useCallback } from 'react' import { useProxySelector } from '@audius/common/hooks' import type { ID } from '@audius/common/models' +import type { CommonState } from '@audius/common/store' import { removeNullable } from '@audius/common/utils' import type { Maybe } from '@audius/common/utils' import { diff --git a/packages/mobile/src/components/toasts/Toast.tsx b/packages/mobile/src/components/toasts/Toast.tsx index bcdf0a96faa..d20590fe270 100644 --- a/packages/mobile/src/components/toasts/Toast.tsx +++ b/packages/mobile/src/components/toasts/Toast.tsx @@ -1,7 +1,6 @@ import { useRef, useCallback, useEffect } from 'react' -import type { as } from '@audius/common' -import type { ToastType, Toast as ToastType } from '@audius/common/store' +import type { Toast as ToastType } from '@audius/common/store' import { toastActions } from '@audius/common/store' import { Link } from '@react-navigation/native' import type { To } from '@react-navigation/native/lib/typescript/src/useLinkTo' diff --git a/packages/mobile/src/hooks/useManualToast.ts b/packages/mobile/src/hooks/useManualToast.ts index 2d4bdb07cc7..bee70b72419 100644 --- a/packages/mobile/src/hooks/useManualToast.ts +++ b/packages/mobile/src/hooks/useManualToast.ts @@ -2,7 +2,6 @@ import { useCallback } from 'react' import type { Toast } from '@audius/common/store' import { toastActions } from '@audius/common/store' - import { uuid } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/hooks/useNotificationNavigation.ts b/packages/mobile/src/hooks/useNotificationNavigation.ts index 4564dd0d8a7..b084b8f83fb 100644 --- a/packages/mobile/src/hooks/useNotificationNavigation.ts +++ b/packages/mobile/src/hooks/useNotificationNavigation.ts @@ -48,7 +48,6 @@ import { tippingActions, notificationsUserListActions } from '@audius/common/store' - import type { AppState } from 'audius-client/src/store/types' import { useDispatch, useStore } from 'react-redux' diff --git a/packages/mobile/src/hooks/useToast.ts b/packages/mobile/src/hooks/useToast.ts index e5966e1bbbb..b5a3458d89f 100644 --- a/packages/mobile/src/hooks/useToast.ts +++ b/packages/mobile/src/hooks/useToast.ts @@ -2,7 +2,6 @@ import { useCallback } from 'react' import type { Toast } from '@audius/common/store' import { toastActions } from '@audius/common/store' - import { uuid } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/app-screen/AppTabScreen.tsx b/packages/mobile/src/screens/app-screen/AppTabScreen.tsx index a497cb761ab..2d1033ea205 100644 --- a/packages/mobile/src/screens/app-screen/AppTabScreen.tsx +++ b/packages/mobile/src/screens/app-screen/AppTabScreen.tsx @@ -1,9 +1,3 @@ -import type { - NotificationType, - RepostType, - CreateChatModalState -} from '@audius/common/store' - import { useCallback, useContext, useEffect } from 'react' import type { @@ -13,6 +7,11 @@ import type { SearchTrack, SearchPlaylist } from '@audius/common/models' +import type { + NotificationType, + RepostType, + CreateChatModalState +} from '@audius/common/store' import type { EventArg, NavigationState } from '@react-navigation/native' import type { createNativeStackNavigator } from '@react-navigation/native-stack' diff --git a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx index dc354c6352f..7fc72db9e5a 100644 --- a/packages/mobile/src/screens/audio-screen/AudioScreen.tsx +++ b/packages/mobile/src/screens/audio-screen/AudioScreen.tsx @@ -1,4 +1,7 @@ -import type { CommonState } from '@audius/common/store' +import { useCallback, useEffect } from 'react' + +import type { StringWei } from '@audius/common/models' +import { StringKeys } from '@audius/common/services' import { tokenDashboardPageSelectors, tokenDashboardPageActions, @@ -8,11 +11,7 @@ import { vipDiscordModalActions, modalsActions } from '@audius/common/store' - -import { useCallback, useEffect } from 'react' - -import type { StringWei } from '@audius/common/models' -import { StringKeys } from '@audius/common/services' +import type { CommonState } from '@audius/common/store' import { isNullOrUndefined, formatWei } from '@audius/common/utils' import { useFocusEffect } from '@react-navigation/native' import { Image, Linking, View } from 'react-native' diff --git a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx index 1e3f2b3a36b..ea178e2c8f9 100644 --- a/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/ChallengeRewards.tsx @@ -1,19 +1,18 @@ -import type { - ChallengeRewardsModalType, - CommonState -} from '@audius/common/store' +import { useCallback, useEffect, useState } from 'react' + +import { Name, ChallengeName } from '@audius/common/models' +import type { ChallengeRewardID } from '@audius/common/models' +import { StringKeys, FeatureFlags } from '@audius/common/services' import { challengesSelectors, audioRewardsPageSelectors, audioRewardsPageActions, modalsActions } from '@audius/common/store' - -import { useCallback, useEffect, useState } from 'react' - -import { Name, ChallengeName } from '@audius/common/models' -import type { ChallengeRewardID } from '@audius/common/models' -import { StringKeys, FeatureFlags } from '@audius/common/services' +import type { + ChallengeRewardsModalType, + CommonState +} from '@audius/common/store' import { removeNullable, makeOptimisticChallengeSortComparator diff --git a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx index 843ab65da70..6d82bbb9790 100644 --- a/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx +++ b/packages/mobile/src/screens/audio-screen/TrendingRewards.tsx @@ -1,8 +1,7 @@ -import type { TrendingRewardsModalType, Modals } from '@audius/common/store' -import { audioRewardsPageActions, modalsActions } from '@audius/common/store' - import type { ChallengeRewardID } from '@audius/common/models' import { StringKeys } from '@audius/common/services' +import type { TrendingRewardsModalType, Modals } from '@audius/common/store' +import { audioRewardsPageActions, modalsActions } from '@audius/common/store' import { View } from 'react-native' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx index faace2c3785..b44e60c03e4 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageListItem.tsx @@ -1,9 +1,8 @@ import { memo, useCallback, useState } from 'react' +import { Status } from '@audius/common/models' import type { ReactionTypes } from '@audius/common/store' import { accountSelectors, chatSelectors } from '@audius/common/store' - -import { Status } from '@audius/common/models' import { formatMessageDate, decodeHashId, diff --git a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx index 2885a4fdd53..18ddcd98fa2 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx @@ -1,10 +1,3 @@ -import type { ChatMessageTileProps } from '@audius/common/store' -import { - accountSelectors, - QueueSource, - playerSelectors -} from '@audius/common/store' - import { useCallback, useMemo, useEffect } from 'react' import { @@ -15,6 +8,12 @@ import { usePlayTrack, usePauseTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' import { Name, PlaybackSource, Kind } from '@audius/common/models' import type { ID } from '@audius/common/models' +import { + accountSelectors, + QueueSource, + playerSelectors +} from '@audius/common/store' +import type { ChatMessageTileProps } from '@audius/common/store' import { getPathFromPlaylistUrl, makeUid } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx index 5cf789053ee..eb6691f04b7 100644 --- a/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatMessageTrack.tsx @@ -1,6 +1,3 @@ -import type { ChatMessageTileProps } from '@audius/common/store' -import { accountSelectors, QueueSource } from '@audius/common/store' - import { useCallback, useEffect, useMemo } from 'react' import { useGetTrackByPermalink } from '@audius/common/api' @@ -8,6 +5,8 @@ import { useGatedContentAccess, useToggleTrack } from '@audius/common/hooks' import type { TrackPlayback } from '@audius/common/hooks' import { Name, PlaybackSource, Kind } from '@audius/common/models' import type { ID } from '@audius/common/models' +import { accountSelectors, QueueSource } from '@audius/common/store' +import type { ChatMessageTileProps } from '@audius/common/store' import { getPathFromTrackUrl, makeUid } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx index eddbdbcbd88..da9d27e46b6 100644 --- a/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx +++ b/packages/mobile/src/screens/chat-screen/ChatUserListScreen.tsx @@ -1,4 +1,8 @@ -import type { CreateChatModalState } from '@audius/common/store' +import { useCallback, useEffect, useState } from 'react' + +import { useProxySelector } from '@audius/common/hooks' +import { Status, statusIsNotFinalized } from '@audius/common/models' +import type { User } from '@audius/common/models' import { accountSelectors, cacheUsersSelectors, @@ -11,12 +15,7 @@ import { followersUserListSelectors, FOLLOWERS_USER_LIST_TAG } from '@audius/common/store' - -import { useCallback, useEffect, useState } from 'react' - -import { useProxySelector } from '@audius/common/hooks' -import { Status, statusIsNotFinalized } from '@audius/common/models' -import type { User } from '@audius/common/models' +import type { CreateChatModalState } from '@audius/common/store' import { View, Image } from 'react-native' import { KeyboardAwareFlatList } from 'react-native-keyboard-aware-scroll-view' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx index a613c3706a9..d851a5f2ce7 100644 --- a/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx +++ b/packages/mobile/src/screens/chat-screen/ReactionPopup.tsx @@ -1,9 +1,8 @@ import { useCallback, useRef } from 'react' +import type { ChatMessageWithExtras } from '@audius/common/models' import type { ReactionTypes } from '@audius/common/store' import { accountSelectors, chatActions } from '@audius/common/store' - -import type { ChatMessageWithExtras } from '@audius/common/models' import { encodeHashId } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import Clipboard from '@react-native-clipboard/clipboard' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx index ad07d165d4b..6c0f2c0fa7a 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistForm.tsx @@ -1,9 +1,8 @@ import { useCallback } from 'react' +import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import type { EditPlaylistValues } from '@audius/common/store' import { deletePlaylistConfirmationModalUIActions } from '@audius/common/store' - -import { useGetPlaylistById, useGetCurrentUserId } from '@audius/common/api' import type { FormikProps } from 'formik' import { capitalize } from 'lodash' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx index 5ed6e63f599..b6da0b3385c 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistModalScreen.tsx @@ -1,12 +1,11 @@ import { useCallback } from 'react' +import { SquareSizes } from '@audius/common/models' import type { EditPlaylistValues } from '@audius/common/store' import { cacheCollectionsActions, cacheCollectionsSelectors } from '@audius/common/store' - -import { SquareSizes } from '@audius/common/models' import { Formik } from 'formik' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx index 49fc3917c98..821ea52a855 100644 --- a/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx +++ b/packages/mobile/src/screens/edit-playlist-screen/EditPlaylistNavigator.tsx @@ -1,5 +1,4 @@ import type { EditPlaylistValues } from '@audius/common/store' - import { createNativeStackNavigator } from '@react-navigation/native-stack' import type { FormikProps } from 'formik' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx index 6061e6038dc..2d649c8255a 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackForm.tsx @@ -1,6 +1,5 @@ import { useCallback } from 'react' -import { type } from '@audius/common' import { FeatureFlags } from '@audius/common/services' import type { UploadTrack } from '@audius/common/store' import { Keyboard } from 'react-native' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx index 340b61296ab..68eb40cc1ca 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackModalScreen.tsx @@ -1,9 +1,8 @@ import { useCallback } from 'react' +import { SquareSizes } from '@audius/common/models' import type { ExtendedTrackMetadata } from '@audius/common/store' import { cacheTracksActions, cacheTracksSelectors } from '@audius/common/store' - -import { SquareSizes } from '@audius/common/models' import { useDispatch, useSelector } from 'react-redux' import { ModalScreen } from 'app/components/core' diff --git a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx index f6cb8623db7..2966e9eb61d 100644 --- a/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx +++ b/packages/mobile/src/screens/edit-track-screen/EditTrackScreen.tsx @@ -1,9 +1,8 @@ -import type { UploadTrack } from '@audius/common/store' - import { useCallback, useMemo } from 'react' import { useUSDCPurchaseConfig } from '@audius/common/hooks' import { isContentUSDCPurchaseGated } from '@audius/common/models' +import type { UploadTrack } from '@audius/common/store' import { creativeCommons, formatPrice } from '@audius/common/utils' import { Formik } from 'formik' import { z } from 'zod' diff --git a/packages/mobile/src/screens/edit-track-screen/types.ts b/packages/mobile/src/screens/edit-track-screen/types.ts index 71fa814bbc4..011efcd018e 100644 --- a/packages/mobile/src/screens/edit-track-screen/types.ts +++ b/packages/mobile/src/screens/edit-track-screen/types.ts @@ -1,5 +1,4 @@ import type { ExtendedTrackMetadata } from '@audius/common/store' - import type { Nullable } from '@audius/common/utils' import type { FormikProps } from 'formik' diff --git a/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx b/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx index bda672f7d0b..693222d5769 100644 --- a/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/AlbumsTab.tsx @@ -1,5 +1,6 @@ import { useCallback, useState } from 'react' +import { statusIsNotFinalized } from '@audius/common/models' import type { CommonState } from '@audius/common/store' import { savedPageSelectors, @@ -7,8 +8,6 @@ import { SavedPageTabs, reachabilitySelectors } from '@audius/common/store' - -import { statusIsNotFinalized } from '@audius/common/models' import { useSelector } from 'react-redux' import { CollectionList } from 'app/components/collection-list' diff --git a/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx b/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx index bf49b150ab0..feef89f7cfb 100644 --- a/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx +++ b/packages/mobile/src/screens/favorites-screen/LibraryCategorySelectionMenu.tsx @@ -5,7 +5,6 @@ import { LibraryCategory, SavedPageTabs } from '@audius/common/store' - import { useNavigationState } from '@react-navigation/native' import { ScrollView, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx b/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx index 007f8af1218..2c9625c3973 100644 --- a/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/favorites-screen/PlaylistsTab.tsx @@ -1,5 +1,9 @@ import { useCallback, useState } from 'react' +import { + CreatePlaylistSource, + statusIsNotFinalized +} from '@audius/common/models' import type { CommonState } from '@audius/common/store' import { savedPageSelectors, @@ -7,11 +11,6 @@ import { SavedPageTabs, reachabilitySelectors } from '@audius/common/store' - -import { - CreatePlaylistSource, - statusIsNotFinalized -} from '@audius/common/models' import Animated, { Layout } from 'react-native-reanimated' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/favorites-screen/selectors.ts b/packages/mobile/src/screens/favorites-screen/selectors.ts index 5f51731394b..71e736477e6 100644 --- a/packages/mobile/src/screens/favorites-screen/selectors.ts +++ b/packages/mobile/src/screens/favorites-screen/selectors.ts @@ -1,6 +1,5 @@ -import type { CommonState } from '@audius/common/store' - import type { Cacheable, Collection, ID, User } from '@audius/common/models' +import type { CommonState } from '@audius/common/store' const matchesFilter = ( playlist: Collection, diff --git a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts index 3fe95e72380..ba24ee99bc4 100644 --- a/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts +++ b/packages/mobile/src/screens/favorites-screen/useCollectionsScreenData.ts @@ -1,4 +1,7 @@ -import type { CommonState, CollectionType } from '@audius/common/store' +import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' +import { useAllPaginatedQuery } from '@audius/common/audius-query' +import { useProxySelector } from '@audius/common/hooks' +import { Status } from '@audius/common/models' import { accountSelectors, cacheCollectionsSelectors, @@ -6,11 +9,7 @@ import { SavedPageTabs, reachabilitySelectors } from '@audius/common/store' - -import { useGetLibraryAlbums, useGetLibraryPlaylists } from '@audius/common/api' -import { useAllPaginatedQuery } from '@audius/common/audius-query' -import { useProxySelector } from '@audius/common/hooks' -import { Status } from '@audius/common/models' +import type { CommonState, CollectionType } from '@audius/common/store' import { filterCollections, shallowCompare, diff --git a/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx b/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx index bd682e500bd..f54ef32a63d 100644 --- a/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notification/NotificationTile.tsx @@ -1,7 +1,6 @@ import type { ReactNode } from 'react' import type { Notification } from '@audius/common/store' - import { View } from 'react-native' import { Tile, Text } from 'app/components/core' diff --git a/packages/mobile/src/screens/notifications-screen/NotificationList.tsx b/packages/mobile/src/screens/notifications-screen/NotificationList.tsx index 5c9eada6cf8..2268d3560e2 100644 --- a/packages/mobile/src/screens/notifications-screen/NotificationList.tsx +++ b/packages/mobile/src/screens/notifications-screen/NotificationList.tsx @@ -1,12 +1,11 @@ import { useCallback, useContext, useEffect, useState } from 'react' +import { Status } from '@audius/common/models' import type { Notification } from '@audius/common/store' import { notificationsActions, notificationsSelectors } from '@audius/common/store' - -import { Status } from '@audius/common/models' import { useIsFocused } from '@react-navigation/native' import type { ViewToken } from 'react-native' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx index b35388cdc7f..e735e9523fc 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/AddTrackToPlaylistNotification.tsx @@ -1,8 +1,7 @@ import { useCallback } from 'react' -import { notificationsSelectors } from '@audius/common' -import type { AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import type { AddTrackToPlaylistNotification as AddTrackToPlaylistNotificationType } from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx index d7617c7b719..62bf9e27404 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/AnnouncementNotification.tsx @@ -1,5 +1,4 @@ import type { AnnouncementNotification as AnnouncementNotificationType } from '@audius/common/store' - import { View } from 'react-native' import Markdown from 'react-native-markdown-display' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx index 1a77701f11b..234431fb2b6 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/ChallengeRewardNotification.tsx @@ -1,8 +1,7 @@ -import type { ChallengeRewardNotification as ChallengeRewardNotificationType } from '@audius/common/store' - import { useCallback } from 'react' import type { ChallengeRewardID } from '@audius/common/models' +import type { ChallengeRewardNotification as ChallengeRewardNotificationType } from '@audius/common/store' import { Platform } from 'react-native' import IconAudius from 'app/assets/images/iconAudius.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx index cf47c7b467a..fc0e5e006aa 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteNotification.tsx @@ -1,9 +1,8 @@ import { useCallback } from 'react' -import { notificationsSelectors, Entity } from '@audius/common' -import type { FavoriteNotification as FavoriteNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' -import { notificationsSelectors } from '@audius/common/store' +import type { FavoriteNotification as FavoriteNotificationType } from '@audius/common/store' +import { notificationsSelectors, Entity } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import IconHeart from 'app/assets/images/iconHeart.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx index 63af5a74583..53983edfa4b 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FavoriteOfRepostNotification.tsx @@ -1,9 +1,8 @@ import { useCallback } from 'react' -import { notificationsSelectors, Entity } from '@audius/common' -import type { FavoriteOfRepostNotification as FavoriteOfRepostNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' -import { notificationsSelectors } from '@audius/common/store' +import type { FavoriteOfRepostNotification as FavoriteOfRepostNotificationType } from '@audius/common/store' +import { notificationsSelectors, Entity } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import IconHeart from 'app/assets/images/iconHeart.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx index 6bef44579c4..2dd3d0d33e0 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/FollowNotification.tsx @@ -1,8 +1,7 @@ import { useCallback } from 'react' -import { notificationsSelectors } from '@audius/common' -import type { FollowNotification as FollowNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import type { FollowNotification as FollowNotificationType } from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' import { formatCount } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx index 2b9e070ac96..f99b5428d3d 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/MilestoneNotification.tsx @@ -1,13 +1,12 @@ import { useCallback } from 'react' -import { notificationsSelectors, Achievement } from '@audius/common' +import { useProxySelector } from '@audius/common/hooks' +import type { User } from '@audius/common/models' import type { EntityType, MilestoneNotification as MilestoneNotificationType -} from '@audius/common' -import { useProxySelector } from '@audius/common/hooks' -import type { User } from '@audius/common/models' -import { notificationsSelectors } from '@audius/common/store' +} from '@audius/common/store' +import { notificationsSelectors, Achievement } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { fullProfilePage } from 'audius-client/src/utils/route' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx index 8c9c48fbf45..5508bc2e6fa 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCosignNotification.tsx @@ -1,12 +1,11 @@ import { useCallback } from 'react' +import { useProxySelector } from '@audius/common/hooks' import type { TrackEntity, RemixCosignNotification as RemixCosignNotificationType } from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' - -import { useProxySelector } from '@audius/common/hooks' import type { Nullable } from '@audius/common/utils' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx index 9b0570ae6b7..dd361f3a166 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RemixCreateNotification.tsx @@ -1,8 +1,10 @@ import { useCallback } from 'react' -import { cacheTracksSelectors, notificationsSelectors } from '@audius/common' -import type { RemixCreateNotification as RemixCreateNotificationType } from '@audius/common' -import { cacheTracksSelectors } from '@audius/common/store' +import type { RemixCreateNotification as RemixCreateNotificationType } from '@audius/common/store' +import { + cacheTracksSelectors, + notificationsSelectors +} from '@audius/common/store' import { useSelector } from 'react-redux' import IconRemix from 'app/assets/images/iconRemix.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx index 481bcfc0d09..51447096666 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostNotification.tsx @@ -1,9 +1,8 @@ import { useCallback } from 'react' -import { notificationsSelectors, Entity } from '@audius/common' -import type { RepostNotification as RepostNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' -import { notificationsSelectors } from '@audius/common/store' +import type { RepostNotification as RepostNotificationType } from '@audius/common/store' +import { notificationsSelectors, Entity } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import IconRepost from 'app/assets/images/iconRepost.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx index abed4ad6ed0..c8f550b9fba 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/RepostOfRepostNotification.tsx @@ -1,9 +1,8 @@ import { useCallback } from 'react' -import { notificationsSelectors, Entity } from '@audius/common' -import type { RepostOfRepostNotification as RepostOfRepostNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' -import { notificationsSelectors } from '@audius/common/store' +import type { RepostOfRepostNotification as RepostOfRepostNotificationType } from '@audius/common/store' +import { notificationsSelectors, Entity } from '@audius/common/store' import { formatCount } from '@audius/common/utils' import IconRepost from 'app/assets/images/iconRepost.svg' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx index 99a55b358fd..7ba1c095e58 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/SupporterDethronedNotification.tsx @@ -5,7 +5,6 @@ import { cacheUsersSelectors, notificationsSelectors } from '@audius/common/store' - import type { Nullable } from '@audius/common/utils' import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx index c5a545bb745..829cb299d25 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TastemakerNotification.tsx @@ -1,12 +1,11 @@ import { useCallback } from 'react' +import { Name } from '@audius/common/models' import type { TrackEntity, TastemakerNotification as TastemakerNotificationType } from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' - -import { Name } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { make } from 'common/store/analytics/actions' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx index 34ea491fdc7..9820503563f 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TierChangeNotification.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' -import { cacheUsersSelectors } from '@audius/common' -import type { TierChangeNotification as TierChangeNotificationType } from '@audius/common' +import type { TierChangeNotification as TierChangeNotificationType } from '@audius/common/store' import { cacheUsersSelectors } from '@audius/common/store' import { fullProfilePage } from 'audius-client/src/utils/route' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx index 25a20c7170d..592344ef1f1 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipReactionNotification.tsx @@ -1,12 +1,11 @@ import { useCallback } from 'react' +import { useUIAudio } from '@audius/common/hooks' import type { ReactionNotification } from '@audius/common/store' import { notificationsSelectors, getReactionFromRawValue } from '@audius/common/store' - -import { useUIAudio } from '@audius/common/hooks' import { Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx index 6aa92095526..2793f36a2be 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipReceivedNotification.tsx @@ -1,5 +1,6 @@ import { useCallback } from 'react' +import { useUIAudio } from '@audius/common/hooks' import type { TipReceiveNotification, ReactionTypes @@ -9,8 +10,6 @@ import { reactionsUIActions, reactionsUISelectors } from '@audius/common/store' - -import { useUIAudio } from '@audius/common/hooks' import { formatNumberCommas } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' import { Image, Platform, View } from 'react-native' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx index 9aca1801e22..4dc0e654b1b 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TipSentNotification.tsx @@ -1,9 +1,8 @@ import { useCallback } from 'react' +import { useUIAudio } from '@audius/common/hooks' import type { TipSendNotification } from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' - -import { useUIAudio } from '@audius/common/hooks' import { Platform, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx index a5d4aed684e..ab01fab5a10 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupporterNotification.tsx @@ -2,7 +2,6 @@ import { useCallback } from 'react' import type { SupporterRankUpNotification } from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' - import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx index ccee5285e07..73e00b2a2b2 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TopSupportingNotification.tsx @@ -2,7 +2,6 @@ import { useCallback } from 'react' import type { SupportingRankUpNotification } from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' - import { Platform } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx index c2c17469208..de29d94a457 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingPlaylistNotification.tsx @@ -1,11 +1,10 @@ import { useCallback } from 'react' -import { notificationsSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import type { CollectionEntity, TrendingPlaylistNotification as TrendingPlaylistNotificationType -} from '@audius/common' -import { Name } from '@audius/common/models' +} from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx index e8d2681f34a..0737695bf39 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingTrackNotification.tsx @@ -1,11 +1,10 @@ import { useCallback } from 'react' -import { notificationsSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import type { TrackEntity, TrendingTrackNotification as TrendingTrackNotificationType -} from '@audius/common' -import { Name } from '@audius/common/models' +} from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx index 988238f86c2..3aeb8d829e4 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/TrendingUndergroundNotification.tsx @@ -1,11 +1,10 @@ import { useCallback } from 'react' -import { notificationsSelectors } from '@audius/common' +import { Name } from '@audius/common/models' import type { TrackEntity, TrendingUndergroundNotification as TrendingUndergroundNotificationType -} from '@audius/common' -import { Name } from '@audius/common/models' +} from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx index ced46e3ec73..d9e9d157587 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseBuyerNotification.tsx @@ -1,12 +1,11 @@ import { useCallback } from 'react' +import { Name } from '@audius/common/models' import type { TrackEntity, USDCPurchaseBuyerNotification as USDCPurchaseBuyerNotificationType } from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' - -import { Name } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { make } from 'audius-client/src/common/store/analytics/actions' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx index d69a662a1c2..f61911b2281 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/USDCPurchaseSellerNotification.tsx @@ -1,11 +1,10 @@ import { useCallback } from 'react' -import { notificationsSelectors } from '@audius/common' +import type { StringUSDC } from '@audius/common/models' import type { TrackEntity, USDCPurchaseSellerNotification as USDCPurchaseSellerNotificationType -} from '@audius/common' -import type { StringUSDC } from '@audius/common/models' +} from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' import { stringUSDCToBN, formatUSDCWeiToUSDString } from '@audius/common/utils' import type { Nullable } from '@audius/common/utils' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx b/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx index 840ad103380..0bb7cd46c42 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx +++ b/packages/mobile/src/screens/notifications-screen/Notifications/UserSubscriptionNotification.tsx @@ -1,8 +1,7 @@ import { useCallback } from 'react' -import { notificationsSelectors } from '@audius/common' -import type { UserSubscriptionNotification as UserSubscriptionNotificationType } from '@audius/common' import { useProxySelector } from '@audius/common/hooks' +import type { UserSubscriptionNotification as UserSubscriptionNotificationType } from '@audius/common/store' import { notificationsSelectors } from '@audius/common/store' import { View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts index dcd6e1070e0..5c3dc62161b 100644 --- a/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts +++ b/packages/mobile/src/screens/notifications-screen/Notifications/useSocialActionHandler.ts @@ -1,13 +1,12 @@ import { useCallback } from 'react' +import type { User } from '@audius/common/models' import type { FollowNotification, RepostNotification, FavoriteNotification } from '@audius/common/store' import { notificationsUserListActions } from '@audius/common/store' - -import type { User } from '@audius/common/models' import type { Nullable } from '@audius/common/utils' import { useDispatch } from 'react-redux' diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx index 065ee8b5546..a08934f56c5 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/Reaction.tsx @@ -1,7 +1,6 @@ import { useEffect, useCallback, useRef, useState } from 'react' import type { ReactionTypes } from '@audius/common/store' - import type { LottieViewProps } from 'lottie-react-native' import LottieView from 'lottie-react-native' import type { diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx index 776bed319cc..dde8caad528 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/ReactionList.tsx @@ -2,7 +2,6 @@ import { useCallback, useContext, useRef, useState } from 'react' import type { ReactionTypes } from '@audius/common/store' import { reactionOrder } from '@audius/common/store' - import type { Nullable } from '@audius/common/utils' import type { ViewStyle, diff --git a/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx b/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx index 83841e04feb..b0d0019785b 100644 --- a/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx +++ b/packages/mobile/src/screens/notifications-screen/Reaction/reactions.tsx @@ -1,7 +1,6 @@ import type { ComponentType } from 'react' import type { ReactionTypes } from '@audius/common/store' - import type { SetOptional } from 'type-fest' import type { ReactionProps as BaseReactionProps } from './Reaction' diff --git a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx index b6b39bcd97a..8843a8ad573 100644 --- a/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx +++ b/packages/mobile/src/screens/profile-screen/ArtistRecommendations/ArtistRecommendations.tsx @@ -1,15 +1,14 @@ -import type { CommonState } from '@audius/common/store' +import { Fragment, useCallback, useEffect, useState } from 'react' + +import { FollowSource } from '@audius/common/models' +import type { ID, User } from '@audius/common/models' import { cacheUsersSelectors, usersSocialActions, relatedArtistsUISelectors, relatedArtistsUIActions } from '@audius/common/store' - -import { Fragment, useCallback, useEffect, useState } from 'react' - -import { FollowSource } from '@audius/common/models' -import type { ID, User } from '@audius/common/models' +import type { CommonState } from '@audius/common/store' import { isEmpty } from 'lodash' import { TouchableOpacity, View } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/profile-screen/selectors.ts b/packages/mobile/src/screens/profile-screen/selectors.ts index dcddc021f44..b43328cba73 100644 --- a/packages/mobile/src/screens/profile-screen/selectors.ts +++ b/packages/mobile/src/screens/profile-screen/selectors.ts @@ -1,11 +1,10 @@ -import type { CommonState } from '@audius/common/store' -import { accountSelectors, profilePageSelectors } from '@audius/common/store' - import { useContext } from 'react' import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' import type { User } from '@audius/common/models' +import { accountSelectors, profilePageSelectors } from '@audius/common/store' +import type { CommonState } from '@audius/common/store' import type { Nullable } from '@audius/common/utils' import { useSelector } from 'react-redux' import { createSelector } from 'reselect' diff --git a/packages/mobile/src/screens/profile-screen/utils.ts b/packages/mobile/src/screens/profile-screen/utils.ts index 84244bddf03..b1b46771f2c 100644 --- a/packages/mobile/src/screens/profile-screen/utils.ts +++ b/packages/mobile/src/screens/profile-screen/utils.ts @@ -1,7 +1,6 @@ +import { useSelectTierInfo } from '@audius/common/hooks' import type { CommonState } from '@audius/common/store' import { badgeTiers } from '@audius/common/store' - -import { useSelectTierInfo } from '@audius/common/hooks' import { useSelector } from 'react-redux' import { MIN_COLLECTIBLES_TIER } from './constants' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx index cf862f66130..caedc0d3225 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/AlbumsTab.tsx @@ -1,8 +1,7 @@ -import type { CommonState } from '@audius/common/store' -import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' - import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' +import type { CommonState } from '@audius/common/store' +import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' import { CollectionList } from 'app/components/collection-list/CollectionList' import { spacing } from 'app/styles/spacing' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx index ff41d7ccc73..a4b3fb1e4f6 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/PlaylistsTab.tsx @@ -1,8 +1,7 @@ -import type { CommonState } from '@audius/common/store' -import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' - import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' +import type { CommonState } from '@audius/common/store' +import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' import { CollectionList } from 'app/components/collection-list/CollectionList' import { spacing } from 'app/styles/spacing' diff --git a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx index ca323cb6681..5d1fe545b30 100644 --- a/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx +++ b/packages/mobile/src/screens/search-results-screen/tabs/ProfilesTab.tsx @@ -1,8 +1,7 @@ -import type { CommonState } from '@audius/common/store' -import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' - import { useProxySelector } from '@audius/common/hooks' import { Status } from '@audius/common/models' +import type { CommonState } from '@audius/common/store' +import { searchResultsPageSelectors, SearchKind } from '@audius/common/store' import { ProfileList } from 'app/components/profile-list' import { spacing } from 'app/styles/spacing' diff --git a/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx b/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx index d9c269a734f..3fa238a7804 100644 --- a/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx +++ b/packages/mobile/src/screens/settings-screen/CastSettingsRow.tsx @@ -6,7 +6,6 @@ import { castSelectors, castActions } from '@audius/common/store' - import { useDispatch, useSelector } from 'react-redux' import IconVolume2 from 'app/assets/images/iconVolume2.svg' diff --git a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx index 250273aee4a..16f69e65124 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/FinishProfileScreen.tsx @@ -1,10 +1,9 @@ -import type { Image } from '@audius/common/store' - import { useCallback } from 'react' import { finishProfilePageMessages } from '@audius/common/messages' import { finishProfileSchema } from '@audius/common/schemas' import { MAX_DISPLAY_NAME_LENGTH } from '@audius/common/services' +import type { Image } from '@audius/common/store' import { css } from '@emotion/native' import { getHandleField, diff --git a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx index 6df0b014d13..17c9b7821a8 100644 --- a/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx +++ b/packages/mobile/src/screens/sign-on-screen/screens/SelectArtistScreen/TopArtistsCardList.tsx @@ -1,8 +1,8 @@ -import type { QueryHookOptions } from '@audius/common' import { useGetTopArtistsInGenre, useGetFeaturedArtists } from '@audius/common/api' +import type { QueryHookOptions } from '@audius/common/audius-query' import { css } from '@emotion/native' import { useIsFocused, type RouteProp } from '@react-navigation/native' diff --git a/packages/mobile/src/screens/signon/ProfileImage.tsx b/packages/mobile/src/screens/signon/ProfileImage.tsx index e57cb5f530e..d36751e7280 100644 --- a/packages/mobile/src/screens/signon/ProfileImage.tsx +++ b/packages/mobile/src/screens/signon/ProfileImage.tsx @@ -1,7 +1,6 @@ import { useEffect, useRef, useState } from 'react' import type { Image as ImageType } from '@audius/common/store' - import { Animated, TouchableOpacity, diff --git a/packages/mobile/src/screens/signon/ProfileManual.tsx b/packages/mobile/src/screens/signon/ProfileManual.tsx index 1f431c3d01f..3aff3bcf03c 100644 --- a/packages/mobile/src/screens/signon/ProfileManual.tsx +++ b/packages/mobile/src/screens/signon/ProfileManual.tsx @@ -1,7 +1,6 @@ import { useState, useEffect, useCallback } from 'react' import type { Image } from '@audius/common/store' - import type { NativeStackScreenProps } from '@react-navigation/native-stack' import * as signOnActions from 'common/store/pages/signon/actions' import { diff --git a/packages/mobile/src/screens/track-screen/DownloadRow.tsx b/packages/mobile/src/screens/track-screen/DownloadRow.tsx index ffdde3b252c..8867450d270 100644 --- a/packages/mobile/src/screens/track-screen/DownloadRow.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadRow.tsx @@ -1,11 +1,10 @@ -import type { CommonState } from '@audius/common/store' -import { cacheTracksSelectors, tracksSocialActions } from '@audius/common/store' - import { useCallback } from 'react' import { useDownloadableContentAccess } from '@audius/common/hooks' import { Name, DownloadQuality } from '@audius/common/models' import type { ID } from '@audius/common/models' +import { cacheTracksSelectors, tracksSocialActions } from '@audius/common/store' +import type { CommonState } from '@audius/common/store' import { css } from '@emotion/native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/DownloadSection.tsx b/packages/mobile/src/screens/track-screen/DownloadSection.tsx index 9aaae84c6ab..22fd20f4b19 100644 --- a/packages/mobile/src/screens/track-screen/DownloadSection.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadSection.tsx @@ -1,9 +1,3 @@ -import type { CommonState } from '@audius/common/store' -import { - cacheTracksSelectors, - usePremiumContentPurchaseModal -} from '@audius/common/store' - import { useCallback, useState } from 'react' import { @@ -12,6 +6,11 @@ import { } from '@audius/common/hooks' import { ModalSource, DownloadQuality } from '@audius/common/models' import type { ID } from '@audius/common/models' +import { + cacheTracksSelectors, + usePremiumContentPurchaseModal +} from '@audius/common/store' +import type { CommonState } from '@audius/common/store' import { USDC } from '@audius/fixed-decimal' import { css } from '@emotion/native' import { LayoutAnimation } from 'react-native' diff --git a/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx b/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx index 98ce88a4500..78ed1ffd4ea 100644 --- a/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx +++ b/packages/mobile/src/screens/upload-screen/components/UploadingTrackTile.tsx @@ -1,7 +1,6 @@ import { useMemo } from 'react' import type { UploadTrack } from '@audius/common/store' - import { View } from 'react-native' import IconImage from 'app/assets/images/iconImage.svg' diff --git a/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx index 41bf64380a3..c2b967cfba2 100644 --- a/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/CompleteTrackScreen.tsx @@ -1,7 +1,6 @@ import { useCallback } from 'react' import type { UploadTrack, ExtendedTrackMetadata } from '@audius/common/store' - import { useRoute } from '@react-navigation/native' import { useNavigation } from 'app/hooks/useNavigation' diff --git a/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx index 345fde8386e..47be9424974 100644 --- a/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/UploadCompleteScreen.tsx @@ -8,7 +8,6 @@ import { uploadActions, uploadSelectors } from '@audius/common/store' - import Clipboard from '@react-native-clipboard/clipboard' import { View, Image } from 'react-native' import { useDispatch, useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx b/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx index 4aa6767612c..abbd857ac5d 100644 --- a/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx +++ b/packages/mobile/src/screens/upload-screen/screens/UploadingTracksScreen.tsx @@ -6,7 +6,6 @@ import { uploadSelectors, UploadType } from '@audius/common/store' - import { useRoute } from '@react-navigation/native' import { useKeepAwake } from '@sayem314/react-native-keep-awake' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts index fb25ed784a7..b086b1938ee 100644 --- a/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts +++ b/packages/mobile/src/screens/upload-screen/utils/processTrackFile.ts @@ -1,6 +1,5 @@ -import type { UploadTrack } from '@audius/common/store' - import { newTrackMetadata } from '@audius/common/schemas' +import type { UploadTrack } from '@audius/common/store' import { ALLOWED_MAX_AUDIO_SIZE_BYTES, ALLOWED_AUDIO_FILE_EXTENSIONS, diff --git a/packages/mobile/src/screens/user-list-screen/UserList.tsx b/packages/mobile/src/screens/user-list-screen/UserList.tsx index 51799e8bdad..9116f01c542 100644 --- a/packages/mobile/src/screens/user-list-screen/UserList.tsx +++ b/packages/mobile/src/screens/user-list-screen/UserList.tsx @@ -1,13 +1,12 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' +import type { ID, User } from '@audius/common/models' import type { CommonState, UserListStoreState } from '@audius/common/store' import { cacheUsersSelectors, userListActions, userListSelectors } from '@audius/common/store' - -import type { ID, User } from '@audius/common/models' import { useFocusEffect, useIsFocused } from '@react-navigation/native' import { range } from 'lodash' import { View } from 'react-native' diff --git a/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx b/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx index 15bab5cd174..cb47c74ca6d 100644 --- a/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx +++ b/packages/mobile/src/screens/wallet-connect/components/LinkedWallets.tsx @@ -1,7 +1,6 @@ +import { Chain } from '@audius/common/models' import type { AssociatedWallet } from '@audius/common/store' import { tokenDashboardPageSelectors } from '@audius/common/store' - -import { Chain } from '@audius/common/models' import { FlatList, View } from 'react-native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/services/audio-player/NativeMobileAudio.ts b/packages/mobile/src/services/audio-player/NativeMobileAudio.ts index 71eaa152e2b..dff74f2cd1c 100644 --- a/packages/mobile/src/services/audio-player/NativeMobileAudio.ts +++ b/packages/mobile/src/services/audio-player/NativeMobileAudio.ts @@ -1,5 +1,4 @@ import type { PlaybackRate } from '@audius/common/store' - import type { Nullable } from '@audius/common/utils' import TrackPlayer from 'react-native-track-player' diff --git a/packages/mobile/src/store/settings/sagas.ts b/packages/mobile/src/store/settings/sagas.ts index e15f9e4d078..c8cbfa6efcb 100644 --- a/packages/mobile/src/store/settings/sagas.ts +++ b/packages/mobile/src/store/settings/sagas.ts @@ -1,3 +1,4 @@ +import type { PushNotifications as TPushNotifications } from '@audius/common/store' import { accountSelectors, settingsPageSelectors, @@ -5,9 +6,7 @@ import { settingsPageActions, PushNotificationSetting, getContext -} from '@audius/common' -import type { PushNotifications as TPushNotifications } from '@audius/common' -import { accountSelectors } from '@audius/common/store' +} from '@audius/common/store' import { getErrorMessage, waitForValue, @@ -79,7 +78,7 @@ function* enablePushNotifications() { // Enabling push notifications should enable all of the notification types const newSettings = { ...initialState.pushNotifications } - yield* put(actions.setPushNotificationSettings(newSettings)) + yield* put(settingsPageActions.setPushNotificationSettings(newSettings)) // We need a user for this to work (and in the case of sign up, we might not // have one right away when this function is called) @@ -95,7 +94,7 @@ function* disablePushNotifications() { return false } ) - yield* put(actions.setPushNotificationSettings(newSettings)) + yield* put(settingsPageActions.setPushNotificationSettings(newSettings)) yield* call(waitForValue, getAccountUser) yield* call(audiusBackendInstance.updatePushNotificationSettings, newSettings) yield* call(deregisterPushNotifications) @@ -111,42 +110,51 @@ function pushNotificationsEnabled(settings: TPushNotifications): boolean { function* watchGetPushNotificationSettings() { const audiusBackendInstance = yield* getContext('audiusBackendInstance') - yield* takeEvery(actions.GET_PUSH_NOTIFICATION_SETTINGS, function* () { - yield* call(waitForRead) - try { - const settings = yield* call( - audiusBackendInstance.getPushNotificationSettings - ) - let pushNotificationSettings = mapValues( - initialState.pushNotifications, - function (_val: boolean) { - return false + yield* takeEvery( + settingsPageActions.GET_PUSH_NOTIFICATION_SETTINGS, + function* () { + yield* call(waitForRead) + try { + const settings = yield* call( + audiusBackendInstance.getPushNotificationSettings + ) + let pushNotificationSettings = mapValues( + initialState.pushNotifications, + function (_val: boolean) { + return false + } + ) + + if (settings) { + pushNotificationSettings = { + ...settings, + [PushNotificationSetting.MobilePush]: yield* call( + pushNotificationsEnabled, + settings + ) + } } - ) - - if (settings) { - pushNotificationSettings = { - ...settings, - [PushNotificationSetting.MobilePush]: yield* call( - pushNotificationsEnabled, - settings + yield* put( + settingsPageActions.setPushNotificationSettings( + pushNotificationSettings ) - } + ) + } catch (error) { + const errorMessage = getErrorMessage(error) + console.error(errorMessage) + yield* put( + settingsPageActions.getPushNotificationSettingsFailed(errorMessage) + ) } - yield* put(actions.setPushNotificationSettings(pushNotificationSettings)) - } catch (error) { - const errorMessage = getErrorMessage(error) - console.error(errorMessage) - yield* put(actions.getPushNotificationSettingsFailed(errorMessage)) } - }) + ) } function* watchUpdatePushNotificationSettings() { const audiusBackendInstance = yield* getContext('audiusBackendInstance') yield* takeEvery( - actions.TOGGLE_PUSH_NOTIFICATION_SETTING, - function* (action: actions.TogglePushNotificationSetting) { + settingsPageActions.TOGGLE_PUSH_NOTIFICATION_SETTING, + function* (action: settingsPageActions.TogglePushNotificationSetting) { let isOn = action.isOn try { @@ -169,7 +177,7 @@ function* watchUpdatePushNotificationSettings() { } } catch (e) { yield* put( - actions.togglePushNotificationSettingFailed( + settingsPageActions.togglePushNotificationSettingFailed( action.notificationType, action.isOn ) @@ -180,23 +188,26 @@ function* watchUpdatePushNotificationSettings() { } function* watchRequestPushNotificationPermissions() { - yield* takeEvery(actions.REQUEST_PUSH_NOTIFICATION_PERMISSIONS, function* () { - const { status } = yield* call(checkNotifications) - const isMobilePushEnabled = yield* call(getIsMobilePushEnabled) - - if ( - (status === RESULTS.GRANTED || status === RESULTS.LIMITED) && - isMobilePushEnabled - ) { - yield* call(registerDeviceToken) - } else if (status === RESULTS.BLOCKED || status === RESULTS.UNAVAILABLE) { - // do nothing - } else { - yield* put( - setVisibility({ drawer: 'EnablePushNotifications', visible: true }) - ) + yield* takeEvery( + settingsPageActions.REQUEST_PUSH_NOTIFICATION_PERMISSIONS, + function* () { + const { status } = yield* call(checkNotifications) + const isMobilePushEnabled = yield* call(getIsMobilePushEnabled) + + if ( + (status === RESULTS.GRANTED || status === RESULTS.LIMITED) && + isMobilePushEnabled + ) { + yield* call(registerDeviceToken) + } else if (status === RESULTS.BLOCKED || status === RESULTS.UNAVAILABLE) { + // do nothing + } else { + yield* put( + setVisibility({ drawer: 'EnablePushNotifications', visible: true }) + ) + } } - }) + ) } export default function sagas() { diff --git a/packages/mobile/src/utils/launchSelectImageActionSheet.ts b/packages/mobile/src/utils/launchSelectImageActionSheet.ts index 9dd63a5b729..127b1a47977 100644 --- a/packages/mobile/src/utils/launchSelectImageActionSheet.ts +++ b/packages/mobile/src/utils/launchSelectImageActionSheet.ts @@ -1,5 +1,4 @@ import type { Image } from '@audius/common/store' - import { ActionSheetIOS, Alert, Platform } from 'react-native' import type { Image as CropPickerImage, diff --git a/packages/mobile/src/utils/theme.ts b/packages/mobile/src/utils/theme.ts index 7addb5016ac..7aa514c8255 100644 --- a/packages/mobile/src/utils/theme.ts +++ b/packages/mobile/src/utils/theme.ts @@ -1,6 +1,5 @@ import type { CommonState } from '@audius/common/store' import { themeSelectors } from '@audius/common/store' - import { useSelector } from 'react-redux' const { getTheme, getSystemAppearance } = themeSelectors From 206c375d619655447dea3db7cd24e26f10567243 Mon Sep 17 00:00:00 2001 From: sliptype Date: Wed, 31 Jan 2024 11:11:55 -0800 Subject: [PATCH 53/64] Fix web lint --- package-lock.json | 2 +- packages/common/src/store/cache/types.ts | 4 +-- .../src/store/pages/collection/reducer.ts | 2 +- .../common/src/store/pages/feed/actions.ts | 4 +-- .../common/src/store/pages/track/actions.ts | 4 +-- .../modals/wait-for-download-modal/index.ts | 2 +- .../store/cache/collections/commonSagas.ts | 13 ++++++-- .../cache/collections/confirmOrderPlaylist.ts | 5 ++-- .../collections/fixInvalidTracksInPlaylist.ts | 3 +- packages/web/src/common/store/cache/sagas.ts | 11 ++----- .../src/common/store/cache/tracks/sagas.ts | 30 +++++++++++-------- packages/web/src/common/store/lineup/sagas.ts | 12 ++++---- .../store/pages/ai/lineups/tracks/sagas.ts | 2 +- .../premium-tracks/lineups/tracks/sagas.ts | 2 +- .../lineups/tracks/watchUploadTracksSaga.ts | 3 +- .../remixes-page/lineups/tracks/sagas.ts | 3 +- .../common/store/pages/track/lineups/sagas.ts | 2 +- .../pages/trending-playlists/lineups/sagas.ts | 3 +- .../trending-underground/lineups/sagas.ts | 2 +- packages/web/src/common/store/queue/sagas.ts | 2 -- .../src/common/store/social/tracks/sagas.ts | 6 ++-- .../web/src/components/track/DownloadRow.tsx | 2 -- .../src/components/track/DownloadSection.tsx | 3 +- .../WaitForDownloadModal.tsx | 2 +- .../store/lineups/more-by/sagas.ts | 2 +- .../components/desktop/ProfilePage.tsx | 1 + 26 files changed, 62 insertions(+), 65 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd6685fb49a..b06b8dcd49e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -138162,7 +138162,7 @@ "react-native-video": "5.2.1", "react-native-view-shot": "3.8.0", "react-native-webview": "13.6.3", - "react-native-zip-archive": "^6.1.0", + "react-native-zip-archive": "6.1.0", "react-qr-code": "2.0.12", "react-redux": "8.0.5", "react-use": "17.3.2", diff --git a/packages/common/src/store/cache/types.ts b/packages/common/src/store/cache/types.ts index 2fa3e605be7..6ce4c38dbd9 100644 --- a/packages/common/src/store/cache/types.ts +++ b/packages/common/src/store/cache/types.ts @@ -1,5 +1,5 @@ -import { ID, UID } from 'models/Identifiers' -import { Kind } from 'models/Kind' +import { ID, UID } from '~/models/Identifiers' +import { Kind } from '~/models/Kind' export type CacheType = 'normal' | 'fast' | 'safe-fast' diff --git a/packages/common/src/store/pages/collection/reducer.ts b/packages/common/src/store/pages/collection/reducer.ts index b5e32b068c5..8d9e211d5f6 100644 --- a/packages/common/src/store/pages/collection/reducer.ts +++ b/packages/common/src/store/pages/collection/reducer.ts @@ -1,4 +1,4 @@ -import { Collection } from 'models/Collection' +import { Collection } from '~/models/Collection' import tracksReducer, { initialState as initialLineupState } from '~/store/pages/collection/lineup/reducer' diff --git a/packages/common/src/store/pages/feed/actions.ts b/packages/common/src/store/pages/feed/actions.ts index 114447429fc..81ac0f12926 100644 --- a/packages/common/src/store/pages/feed/actions.ts +++ b/packages/common/src/store/pages/feed/actions.ts @@ -1,5 +1,5 @@ -import { FeedFilter } from 'models/FeedFilter' -import { ID } from 'models/Identifiers' +import { FeedFilter } from '~/models/FeedFilter' +import { ID } from '~/models/Identifiers' export const FETCH_SUGGESTED_FOLLOW_USERS = 'FEED/FETCH_SUGGESTED_FOLLOW_USERS' export const FOLLOW_USERS = 'FEED/FOLLOW_USERS' diff --git a/packages/common/src/store/pages/track/actions.ts b/packages/common/src/store/pages/track/actions.ts index ecde8825a07..7ee8bcdc800 100644 --- a/packages/common/src/store/pages/track/actions.ts +++ b/packages/common/src/store/pages/track/actions.ts @@ -1,5 +1,5 @@ -import { ID } from 'models/Identifiers' -import { TrendingRange } from 'store/notifications' +import { ID } from '~/models/Identifiers' +import { TrendingRange } from '~/store/notifications' export const SET_TRACK_RANK = 'TRACK_PAGE/SET_TRACK_RANK' export const GET_TRACK_RANKS = 'TRACK_PAGE/GET_TRACK_RANKS' diff --git a/packages/common/src/store/ui/modals/wait-for-download-modal/index.ts b/packages/common/src/store/ui/modals/wait-for-download-modal/index.ts index aa24bf0a0d9..fae78fd45ed 100644 --- a/packages/common/src/store/ui/modals/wait-for-download-modal/index.ts +++ b/packages/common/src/store/ui/modals/wait-for-download-modal/index.ts @@ -1,4 +1,4 @@ -import { ID } from 'models/Identifiers' +import { ID } from '~/models/Identifiers' import { createModal } from '../createModal' diff --git a/packages/web/src/common/store/cache/collections/commonSagas.ts b/packages/web/src/common/store/cache/collections/commonSagas.ts index 5345e8505c2..ffdc0936180 100644 --- a/packages/web/src/common/store/cache/collections/commonSagas.ts +++ b/packages/web/src/common/store/cache/collections/commonSagas.ts @@ -4,8 +4,15 @@ import { Kind, PlaylistContents, ID, - Collection + Collection, + PlaylistTrackId, + UserCollectionMetadata, + User, + UserFollowees, + FolloweeRepost, + UID } from '@audius/common/models' +import { TransactionReceipt } from '@audius/common/services' import { accountActions, accountSelectors, @@ -21,7 +28,9 @@ import { toastActions, getContext, confirmerActions, - confirmTransaction + confirmTransaction, + SubscriptionInfo, + Entry } from '@audius/common/store' import { squashNewLines, diff --git a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.ts b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.ts index 6ab340eda85..a8a024e9711 100644 --- a/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.ts +++ b/packages/web/src/common/store/cache/collections/confirmOrderPlaylist.ts @@ -1,4 +1,4 @@ -import { Kind } from '@audius/common/models' +import { Kind, Collection, ID } from '@audius/common/models' import { cacheCollectionsActions as collectionActions, cacheActions, @@ -8,8 +8,7 @@ import { confirmTransaction } from '@audius/common/store' import { makeKindId } from '@audius/common/utils' -import { call, put } from 'redux-saga/effects' -import { Collection, ID } from '@audius/common/models' +import { call, put } from 'typed-redux-saga' import { fixInvalidTracksInPlaylist } from './fixInvalidTracksInPlaylist' import { retrieveCollection } from './utils/retrieveCollections' diff --git a/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.ts b/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.ts index f8340f32cb1..12ad1f1c950 100644 --- a/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.ts +++ b/packages/web/src/common/store/cache/collections/fixInvalidTracksInPlaylist.ts @@ -1,6 +1,5 @@ +import { ID, UserCollectionMetadata } from '@audius/common/models' import { - ID, - UserCollectionMetadata, accountSelectors, cacheCollectionsSelectors, getContext diff --git a/packages/web/src/common/store/cache/sagas.ts b/packages/web/src/common/store/cache/sagas.ts index 752a293ecf2..d731207b4f2 100644 --- a/packages/web/src/common/store/cache/sagas.ts +++ b/packages/web/src/common/store/cache/sagas.ts @@ -1,25 +1,20 @@ import { Status } from '@audius/common/models' +import type { ID, Kind, Cache } from '@audius/common/models' import { IntKeys, FeatureFlags } from '@audius/common/services' import { cacheActions, cacheConfig, cacheSelectors, - confirmerSelectors -} from '@audius/common/store' -import { makeUids, getIdFromKindId } from '@audius/common/utils' -import { - FeatureFlags, confirmerSelectors, - IntKeys, getContext -} from '@audius/common' -import type { ID, Kind, Cache } from '@audius/common/models' +} from '@audius/common/store' import type { Metadata, Entry, SubscriberInfo, CacheType } from '@audius/common/store' +import { makeUids, getIdFromKindId } from '@audius/common/utils' import { pick } from 'lodash' import { all, call, put, select, takeEvery } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/cache/tracks/sagas.ts b/packages/web/src/common/store/cache/tracks/sagas.ts index 940c2264ee4..bcc5d221ed0 100644 --- a/packages/web/src/common/store/cache/tracks/sagas.ts +++ b/packages/web/src/common/store/cache/tracks/sagas.ts @@ -3,26 +3,30 @@ import { DefaultSizes, SquareSizes, Kind, - makeKindId, - squashNewLines, - formatUrlName, + Track, + Collection, + ID +} from '@audius/common/models' +import { + Entry, + ExtendedTrackMetadata, + getContext, accountSelectors, averageColorActions, cacheTracksSelectors, cacheTracksActions as trackActions, cacheUsersSelectors, cacheActions, - waitForAccount, - waitForValue, confirmerActions, - confirmTransaction, - Track, - Entry, - Collection, - ID, - ExtendedTrackMetadata, - getContext -} from '@audius/common' + confirmTransaction +} from '@audius/common/store' +import { + makeKindId, + squashNewLines, + formatUrlName, + waitForAccount, + waitForValue +} from '@audius/common/utils' import { call, fork, put, select, takeEvery } from 'typed-redux-saga' import { make } from 'common/store/analytics/actions' diff --git a/packages/web/src/common/store/lineup/sagas.ts b/packages/web/src/common/store/lineup/sagas.ts index a97c43eab9a..2d5e2933414 100644 --- a/packages/web/src/common/store/lineup/sagas.ts +++ b/packages/web/src/common/store/lineup/sagas.ts @@ -5,11 +5,9 @@ import { LineupEntry, Track, Collection, - LineupEntry, - LineupEntry, - Track, UID, - LineupState + LineupState, + CollectionMetadata } from '@audius/common/models' import { StringKeys, FeatureFlags } from '@audius/common/services' import { @@ -26,12 +24,12 @@ import { playerSelectors, SubscriberInfo, SubscriptionInfo, - CollectionMetadata, Entry, LineupBaseActions, - QueueSource + QueueSource, + UnsubscribeInfo } from '@audius/common/store' -import { Uid, makeUids, makeUid } from '@audius/common/utils' +import { Uid, makeUids, makeUid, removeNullable } from '@audius/common/utils' import { all, call, diff --git a/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts index 40512b54108..c36f5477c9f 100644 --- a/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/ai/lineups/tracks/sagas.ts @@ -1,3 +1,4 @@ +import { Track } from '@audius/common/models' import { accountSelectors, aiPageLineupActions as tracksActions, @@ -6,7 +7,6 @@ import { getContext, CommonState } from '@audius/common/store' -import { Track } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts index 40f5d65e74b..ee642a3bf92 100644 --- a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts @@ -1,10 +1,10 @@ +import { Track } from '@audius/common/models' import { accountSelectors, premiumTracksPageLineupSelectors, premiumTracksPageLineupActions, getContext } from '@audius/common/store' -import { Track } from '@audius/common/models' import { call, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts index f10b8f15e65..584753dcb43 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/watchUploadTracksSaga.ts @@ -1,4 +1,4 @@ -import { Kind } from '@audius/common/models' +import { Kind, Track } from '@audius/common/models' import { accountSelectors, profilePageTracksLineupActions, @@ -6,7 +6,6 @@ import { uploadActions } from '@audius/common/store' import { makeUid } from '@audius/common/utils' -import { Track } from '@audius/common/models' import { put, select, takeEvery } from 'typed-redux-saga' const { UPLOAD_TRACKS_SUCCEEDED, uploadTracksSucceeded } = uploadActions diff --git a/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts index 0559ac4f4f3..07b7d8502f1 100644 --- a/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/remixes-page/lineups/tracks/sagas.ts @@ -1,3 +1,4 @@ +import { Track } from '@audius/common/models' import { accountSelectors, remixesPageLineupActions as tracksActions, @@ -6,8 +7,6 @@ import { getContext, CommonState } from '@audius/common/store' - -import { Track } from '@audius/common/models' import { call, put, select } from 'typed-redux-saga' import { processAndCacheTracks } from 'common/store/cache/tracks/utils' diff --git a/packages/web/src/common/store/pages/track/lineups/sagas.ts b/packages/web/src/common/store/pages/track/lineups/sagas.ts index 5947f4be446..2f78a29fb8d 100644 --- a/packages/web/src/common/store/pages/track/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/track/lineups/sagas.ts @@ -1,5 +1,5 @@ +import { Track } from '@audius/common/models' import { - Track, accountSelectors, cacheTracksSelectors, trackPageLineupActions, diff --git a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts index dce6f7f2e32..fab23cee10e 100644 --- a/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-playlists/lineups/sagas.ts @@ -1,4 +1,4 @@ -import { UserCollectionMetadata } from '@audius/common/models' +import { UserCollectionMetadata, Collection } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { accountSelectors, @@ -6,7 +6,6 @@ import { trendingPlaylistsPageLineupActions, getContext } from '@audius/common/store' -import { Collection } from '@audius/common/models' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts index ef45c18ba43..6ef70fe80f2 100644 --- a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts @@ -1,3 +1,4 @@ +import { Track } from '@audius/common/models' import { StringKeys } from '@audius/common/services' import { accountSelectors, @@ -5,7 +6,6 @@ import { trendingUndergroundPageLineupActions, getContext } from '@audius/common/store' -import { Track } from '@audius/common/models' import { keccak_256 } from 'js-sha3' import { call, select } from 'typed-redux-saga' diff --git a/packages/web/src/common/store/queue/sagas.ts b/packages/web/src/common/store/queue/sagas.ts index ba35c946dcd..0a94fba87b4 100644 --- a/packages/web/src/common/store/queue/sagas.ts +++ b/packages/web/src/common/store/queue/sagas.ts @@ -1,6 +1,4 @@ import { - Name, - PlaybackSource, Kind, ID, Name, diff --git a/packages/web/src/common/store/social/tracks/sagas.ts b/packages/web/src/common/store/social/tracks/sagas.ts index 2666b3184a5..84abb657ea5 100644 --- a/packages/web/src/common/store/social/tracks/sagas.ts +++ b/packages/web/src/common/store/social/tracks/sagas.ts @@ -10,15 +10,15 @@ import { gatedContentSelectors, confirmerActions, confirmTransaction, - modalsActions, - removeNullable + modalsActions } from '@audius/common/store' import { formatShareText, encodeHashId, makeKindId, waitForValue, - getQueryParams + getQueryParams, + removeNullable } from '@audius/common/utils' import { capitalize } from 'lodash' import { call, select, takeEvery, put, fork } from 'typed-redux-saga' diff --git a/packages/web/src/components/track/DownloadRow.tsx b/packages/web/src/components/track/DownloadRow.tsx index 040b567d7f7..ef4d00433ff 100644 --- a/packages/web/src/components/track/DownloadRow.tsx +++ b/packages/web/src/components/track/DownloadRow.tsx @@ -1,5 +1,3 @@ -import { useCallback } from 'react' - import { useDownloadableContentAccess } from '@audius/common/hooks' import { ID } from '@audius/common/models' import { cacheTracksSelectors, CommonState } from '@audius/common/store' diff --git a/packages/web/src/components/track/DownloadSection.tsx b/packages/web/src/components/track/DownloadSection.tsx index b4f222e4db6..fda4b7cce65 100644 --- a/packages/web/src/components/track/DownloadSection.tsx +++ b/packages/web/src/components/track/DownloadSection.tsx @@ -4,9 +4,8 @@ import { useCurrentStems, useDownloadableContentAccess } from '@audius/common/hooks' -import { ModalSource, DownloadQuality, ID } from '@audius/common/models' +import { Name, ModalSource, DownloadQuality, ID } from '@audius/common/models' import { - Name, cacheTracksSelectors, usePremiumContentPurchaseModal, CommonState, diff --git a/packages/web/src/components/wait-for-download-modal/WaitForDownloadModal.tsx b/packages/web/src/components/wait-for-download-modal/WaitForDownloadModal.tsx index c2be502bb60..5e3018f016c 100644 --- a/packages/web/src/components/wait-for-download-modal/WaitForDownloadModal.tsx +++ b/packages/web/src/components/wait-for-download-modal/WaitForDownloadModal.tsx @@ -2,7 +2,7 @@ import { CommonState, useWaitForDownloadModal, cacheTracksSelectors -} from '@audius/common' +} from '@audius/common/store' import { Flex, IconReceive, Text } from '@audius/harmony' import { ModalHeader } from '@audius/stems' import cn from 'classnames' diff --git a/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts b/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts index 378eb9fd9e6..ead0e60369c 100644 --- a/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts +++ b/packages/web/src/pages/deleted-page/store/lineups/more-by/sagas.ts @@ -1,5 +1,5 @@ -import { accountSelectors } from '@audius/common/store' import { Track } from '@audius/common/models' +import { accountSelectors } from '@audius/common/store' import { call, select } from 'typed-redux-saga' import { LineupSagas } from 'common/store/lineup/sagas' diff --git a/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx b/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx index cb15b6f7b93..38fa3549f3d 100644 --- a/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx +++ b/packages/web/src/pages/profile-page/components/desktop/ProfilePage.tsx @@ -19,6 +19,7 @@ import { badgeTiers, ProfileUser } from '@audius/common/store' +import { IconAlbum } from '@audius/harmony' import IconCollectibles from 'assets/img/iconCollectibles.svg' import IconNote from 'assets/img/iconNote.svg' From 7eccbbcb6984c3e9b5ab3b93bda8dcea030509b2 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 18:26:12 -0800 Subject: [PATCH 54/64] Fix protocol dashboard --- .../src/components/UserInfo/AudiusProfileBadges.tsx | 4 +++- protocol-dashboard/tsconfig.json | 1 + protocol-dashboard/vite.config.ts | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/protocol-dashboard/src/components/UserInfo/AudiusProfileBadges.tsx b/protocol-dashboard/src/components/UserInfo/AudiusProfileBadges.tsx index b40a9b17f43..160dde42fc5 100644 --- a/protocol-dashboard/src/components/UserInfo/AudiusProfileBadges.tsx +++ b/protocol-dashboard/src/components/UserInfo/AudiusProfileBadges.tsx @@ -1,6 +1,5 @@ import { cloneElement, ReactElement } from 'react' -import { BadgeTier, badgeTiers, Nullable } from '@audius/common' import { User } from '@audius/sdk' import IconBronzeBadgeSVG from 'assets/img/iconBronzeBadge.svg?react' @@ -8,6 +7,9 @@ import IconGoldBadgeSVG from 'assets/img/iconGoldBadge.svg?react' import IconPlatinumBadgeSVG from 'assets/img/iconPlatinumBadge.svg?react' import IconSilverBadgeSVG from 'assets/img/iconSilverBadge.svg?react' import IconVerifiedSVG from 'assets/img/iconVerified.svg?react' +import { BadgeTier } from '@audius/common/models' +import { Nullable } from '@audius/common/utils' +import { badgeTiers } from '@audius/common/store' import cn from 'classnames' diff --git a/protocol-dashboard/tsconfig.json b/protocol-dashboard/tsconfig.json index 5b2d451fdfd..3fa8b1f5d4e 100644 --- a/protocol-dashboard/tsconfig.json +++ b/protocol-dashboard/tsconfig.json @@ -32,6 +32,7 @@ "models/*": ["./src/models/*"], "types": ["./src/types"], "assets/*": ["./src/assets/*"], + "~/*": ["../packages/common/src/*"] } }, "include": ["src"], diff --git a/protocol-dashboard/vite.config.ts b/protocol-dashboard/vite.config.ts index be2c21b1595..a952a97cfc6 100644 --- a/protocol-dashboard/vite.config.ts +++ b/protocol-dashboard/vite.config.ts @@ -1,4 +1,5 @@ import { defineConfig } from 'vite' +import path from 'path' import react from '@vitejs/plugin-react-swc' import svgr from 'vite-plugin-svgr' import { nodePolyfills } from 'vite-plugin-node-polyfills' @@ -31,7 +32,8 @@ export default defineConfig({ hooks: '/src/hooks', models: '/src/models', types: '/src/types', - assets: '/src/assets' + assets: '/src/assets', + '~': path.resolve(__dirname, '../packages/common/src') } }, From 7de7f11d015ca91027e0503c73afcb692507796e Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 30 Jan 2024 18:31:50 -0800 Subject: [PATCH 55/64] Remove common build --- .circleci/src/jobs/@common-jobs.yml | 1 - .circleci/src/jobs/@mobile-jobs.yml | 1 - .circleci/src/jobs/@web-jobs.yml | 1 - package-lock.json | 191 ---------------------------- packages/common/package.json | 8 -- packages/common/rollup.config.js | 40 ------ packages/common/src/index.ts | 1 - 7 files changed, 243 deletions(-) delete mode 100644 packages/common/rollup.config.js delete mode 100644 packages/common/src/index.ts diff --git a/.circleci/src/jobs/@common-jobs.yml b/.circleci/src/jobs/@common-jobs.yml index 88c8478862b..b51ca4e30e1 100644 --- a/.circleci/src/jobs/@common-jobs.yml +++ b/.circleci/src/jobs/@common-jobs.yml @@ -23,7 +23,6 @@ common-init: paths: - node_modules - packages/common/node_modules - - packages/common/dist common-test: working_directory: ~/audius-protocol diff --git a/.circleci/src/jobs/@mobile-jobs.yml b/.circleci/src/jobs/@mobile-jobs.yml index 63b9483a9fc..9447456c1c0 100644 --- a/.circleci/src/jobs/@mobile-jobs.yml +++ b/.circleci/src/jobs/@mobile-jobs.yml @@ -36,7 +36,6 @@ mobile-init: - packages/stems/node_modules - packages/stems/dist - packages/common/node_modules - - packages/common/dist - packages/libs/node_modules - packages/libs/dist - packages/mobile/.env.stage diff --git a/.circleci/src/jobs/@web-jobs.yml b/.circleci/src/jobs/@web-jobs.yml index 372a1b706d6..4d4ba15b64d 100644 --- a/.circleci/src/jobs/@web-jobs.yml +++ b/.circleci/src/jobs/@web-jobs.yml @@ -35,7 +35,6 @@ web-init: - packages/harmony/node_modules - packages/harmony/dist - packages/common/node_modules - - packages/common/dist - packages/libs/node_modules - packages/libs/dist diff --git a/package-lock.json b/package-lock.json index b06b8dcd49e..afcd392a9f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16805,21 +16805,6 @@ "rollup": "^2.38.3" } }, - "node_modules/@rollup/plugin-image": { - "version": "2.1.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "mini-svg-data-uri": "^1.2.3" - }, - "engines": { - "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0 || ^2.0.0" - } - }, "node_modules/@rollup/plugin-inject": { "version": "4.0.4", "dev": true, @@ -72369,14 +72354,6 @@ "version": "1.2.0", "license": "MIT" }, - "node_modules/mini-svg-data-uri": { - "version": "1.4.4", - "dev": true, - "license": "MIT", - "bin": { - "mini-svg-data-uri": "cli.js" - } - }, "node_modules/minimalistic-assert": { "version": "1.0.1", "license": "ISC" @@ -94038,20 +94015,6 @@ "node": ">=8.0" } }, - "node_modules/rollup": { - "version": "2.76.0", - "dev": true, - "license": "MIT", - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=10.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, "node_modules/rollup-plugin-babel": { "version": "4.4.0", "dev": true, @@ -94147,38 +94110,6 @@ "node": ">=8" } }, - "node_modules/rollup-plugin-dts": { - "version": "4.2.2", - "dev": true, - "license": "LGPL-3.0", - "dependencies": { - "magic-string": "^0.26.1" - }, - "engines": { - "node": ">=v12.22.11" - }, - "funding": { - "url": "https://github.com/sponsors/Swatinem" - }, - "optionalDependencies": { - "@babel/code-frame": "^7.16.7" - }, - "peerDependencies": { - "rollup": "^2.55", - "typescript": "^4.1" - } - }, - "node_modules/rollup-plugin-dts/node_modules/magic-string": { - "version": "0.26.7", - "dev": true, - "license": "MIT", - "dependencies": { - "sourcemap-codec": "^1.4.8" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/rollup-plugin-ignore": { "version": "1.0.10", "dev": true, @@ -94949,112 +94880,6 @@ "node": ">=10" } }, - "node_modules/rollup-plugin-typescript2": { - "version": "0.32.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@rollup/pluginutils": "^4.1.2", - "find-cache-dir": "^3.3.2", - "fs-extra": "^10.0.0", - "resolve": "^1.20.0", - "tslib": "^2.4.0" - }, - "peerDependencies": { - "rollup": ">=1.26.3", - "typescript": ">=2.4.0" - } - }, - "node_modules/rollup-plugin-typescript2/node_modules/@rollup/pluginutils": { - "version": "4.2.1", - "dev": true, - "license": "MIT", - "dependencies": { - "estree-walker": "^2.0.1", - "picomatch": "^2.2.2" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/rollup-plugin-typescript2/node_modules/find-cache-dir": { - "version": "3.3.2", - "dev": true, - "license": "MIT", - "dependencies": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/avajs/find-cache-dir?sponsor=1" - } - }, - "node_modules/rollup-plugin-typescript2/node_modules/fs-extra": { - "version": "10.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/rollup-plugin-typescript2/node_modules/jsonfile": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/rollup-plugin-typescript2/node_modules/make-dir": { - "version": "3.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/rollup-plugin-typescript2/node_modules/pkg-dir": { - "version": "4.2.0", - "dev": true, - "license": "MIT", - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/rollup-plugin-typescript2/node_modules/tslib": { - "version": "2.6.2", - "dev": true, - "license": "0BSD" - }, - "node_modules/rollup-plugin-typescript2/node_modules/universalify": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/rollup-plugin-url": { "version": "2.2.4", "dev": true, @@ -95138,18 +94963,6 @@ "dev": true, "license": "MIT" }, - "node_modules/rollup/node_modules/fsevents": { - "version": "2.3.3", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/rotating-file-stream": { "version": "2.1.6", "dev": true, @@ -112644,7 +112457,6 @@ }, "devDependencies": { "@reduxjs/toolkit": "1.6.1", - "@rollup/plugin-image": "^2.1.1", "@stripe/crypto": "0.0.4", "@types/bn.js": "5.1.0", "@types/jest": "29.5.7", @@ -112656,9 +112468,6 @@ "eslint": "8.56.0", "jest": "29.7.0", "react": "18.2.0", - "rollup": "2.76.0", - "rollup-plugin-dts": "4.2.2", - "rollup-plugin-typescript2": "0.32.1", "ts-patch": "3.1.1", "typescript-transform-paths": "3.4.4" }, diff --git a/packages/common/package.json b/packages/common/package.json index a4c2993b3a6..50d23ca2aaa 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -6,9 +6,7 @@ "author": "Audius", "homepage": "https://github.com/AudiusProject/audius-client#readme", "license": "", - "main": "./dist/index.js", "exports": { - ".": "./dist/index.js", "./messages": "./src/messages/index.ts", "./hooks": "./src/hooks/index.ts", "./context": "./src/context/index.ts", @@ -26,10 +24,8 @@ "url": "git+https://github.com/AudiusProject/audius-client.git" }, "scripts": { - "build": "rollup -c", "lint": "eslint --cache src", "lint:fix": "npm run lint -- --fix", - "start": "rollup -c -w", "test": "jest", "typecheck": "tsc --noEmit", "verify": "concurrently \"npm:lint:fix\"" @@ -72,7 +68,6 @@ }, "devDependencies": { "@reduxjs/toolkit": "1.6.1", - "@rollup/plugin-image": "^2.1.1", "@types/bn.js": "5.1.0", "@types/jest": "29.5.7", "@types/lodash": "4.14.149", @@ -83,9 +78,6 @@ "eslint": "8.56.0", "jest": "29.7.0", "react": "18.2.0", - "rollup": "2.76.0", - "rollup-plugin-dts": "4.2.2", - "rollup-plugin-typescript2": "0.32.1", "@stripe/crypto": "0.0.4", "ts-patch": "3.1.1", "typescript-transform-paths": "3.4.4" diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js deleted file mode 100644 index 667e7dee11c..00000000000 --- a/packages/common/rollup.config.js +++ /dev/null @@ -1,40 +0,0 @@ -import { createRequire } from 'node:module' - -import image from '@rollup/plugin-image' -import rollupTypescript from 'rollup-plugin-typescript2' - -import pkg from './package.json' - -const cjsRequire = createRequire(import.meta.url) -const tspCompiler = cjsRequire('ts-patch/compiler') - -export default [ - { - input: 'src/index.ts', - output: [ - { - dir: 'dist', - format: 'es', - exports: 'named', - sourcemap: true - } - ], - plugins: [ - rollupTypescript({ - typescript: tspCompiler - }), - image() - ], - - external: [ - ...Object.keys(pkg.dependencies), - ...Object.keys(pkg.devDependencies), - ...Object.keys(pkg.peerDependencies), - 'redux-saga/effects', - 'events', - '@audius/sdk/dist/core', - 'dayjs/plugin/timezone', - 'dayjs/plugin/utc' - ] - } -] diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts deleted file mode 100644 index 336ce12bb91..00000000000 --- a/packages/common/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {} From 930350d7277f95aaaa428c88d6ff92f9d33d4ee4 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Wed, 31 Jan 2024 10:30:07 -0800 Subject: [PATCH 56/64] Finalize --- packages/common/src/audius-query/createApi.ts | 2 +- packages/common/src/hooks/chats/useSetInboxPermissions.ts | 2 +- packages/common/src/hooks/useCoinflowAdapter.ts | 2 +- packages/common/src/hooks/useCreateUserbankIfNeeded.ts | 5 ++++- packages/common/src/hooks/useGatedContent.ts | 2 +- packages/common/src/hooks/useGeneratePlaylistArtwork.ts | 2 +- packages/common/src/hooks/useProxySelector.ts | 2 +- packages/common/src/hooks/useUSDCBalance.ts | 2 +- packages/common/src/models/Analytics.ts | 6 +++++- packages/common/src/schemas/sign-on/emailSchema.ts | 2 +- packages/common/src/schemas/sign-on/pickHandleSchema.ts | 2 +- packages/common/src/services/audius-api-client/helper.ts | 6 +++++- .../src/services/opensea-client/ethCollectibleHelpers.ts | 1 + packages/common/src/store/pages/chat/sagas.ts | 2 +- packages/common/src/utils/allSettled.ts | 1 + 15 files changed, 26 insertions(+), 13 deletions(-) diff --git a/packages/common/src/audius-query/createApi.ts b/packages/common/src/audius-query/createApi.ts index b8eb738d83c..fae4d068168 100644 --- a/packages/common/src/audius-query/createApi.ts +++ b/packages/common/src/audius-query/createApi.ts @@ -27,6 +27,7 @@ import { CommonState } from '~/store/reducers' import { getErrorMessage } from '~/utils/error' import { Nullable, removeNullable } from '~/utils/typeUtils' +import { Track } from '../models/Track' import * as cacheActions from '../store/cache/actions' import * as cacheSelectors from '../store/cache/selectors' @@ -53,7 +54,6 @@ import { MutationHookResults } from './types' import { capitalize, getKeyFromFetchArgs, selectCommonEntityMap } from './utils' -import { Track } from '../models/Track' type Entity = Collection | Track | User diff --git a/packages/common/src/hooks/chats/useSetInboxPermissions.ts b/packages/common/src/hooks/chats/useSetInboxPermissions.ts index 33bbc2e826b..a16413612ae 100644 --- a/packages/common/src/hooks/chats/useSetInboxPermissions.ts +++ b/packages/common/src/hooks/chats/useSetInboxPermissions.ts @@ -4,9 +4,9 @@ import type { AudiusSdk } from '@audius/sdk' import { ChatPermission } from '@audius/sdk' import { useDispatch, useSelector } from 'react-redux' +import { useAppContext } from '~/context/appContext' import { Name } from '~/models/Analytics' import { Status } from '~/models/Status' -import { useAppContext } from '~/context/appContext' import { accountSelectors } from '~/store/account' import { chatActions, chatSelectors } from '~/store/pages' diff --git a/packages/common/src/hooks/useCoinflowAdapter.ts b/packages/common/src/hooks/useCoinflowAdapter.ts index a07dceff1ad..b40ece36b5d 100644 --- a/packages/common/src/hooks/useCoinflowAdapter.ts +++ b/packages/common/src/hooks/useCoinflowAdapter.ts @@ -3,8 +3,8 @@ import { useEffect, useState } from 'react' import { TransactionHandler } from '@audius/sdk/dist/core' import { Connection, PublicKey, Transaction } from '@solana/web3.js' -import { getRootSolanaAccount } from '~/services/audius-backend' import { useAppContext } from '~/context' +import { getRootSolanaAccount } from '~/services/audius-backend' type CoinflowAdapter = { wallet: { diff --git a/packages/common/src/hooks/useCreateUserbankIfNeeded.ts b/packages/common/src/hooks/useCreateUserbankIfNeeded.ts index 5090eff2a92..743bf597091 100644 --- a/packages/common/src/hooks/useCreateUserbankIfNeeded.ts +++ b/packages/common/src/hooks/useCreateUserbankIfNeeded.ts @@ -3,7 +3,10 @@ import { useEffect } from 'react' import { useSelector } from 'react-redux' import { AnalyticsEvent } from '~/models/Analytics' -import { AudiusBackend, createUserBankIfNeeded } from '~/services/audius-backend' +import { + AudiusBackend, + createUserBankIfNeeded +} from '~/services/audius-backend' import { solanaSelectors } from '~/store/solana' const { getFeePayer } = solanaSelectors diff --git a/packages/common/src/hooks/useGatedContent.ts b/packages/common/src/hooks/useGatedContent.ts index 645cfd370de..1e6a25e784f 100644 --- a/packages/common/src/hooks/useGatedContent.ts +++ b/packages/common/src/hooks/useGatedContent.ts @@ -2,6 +2,7 @@ import { useMemo } from 'react' import { useSelector } from 'react-redux' +import { useGetCurrentUserId } from '~/api' import { Chain } from '~/models/Chain' import { ID } from '~/models/Identifiers' import { @@ -12,7 +13,6 @@ import { isContentTipGated, isContentUSDCPurchaseGated } from '~/models/Track' -import { useGetCurrentUserId } from '~/api' import { getAccountUser } from '~/store/account/selectors' import { cacheTracksSelectors, cacheUsersSelectors } from '~/store/cache' import { gatedContentSelectors } from '~/store/gated-content' diff --git a/packages/common/src/hooks/useGeneratePlaylistArtwork.ts b/packages/common/src/hooks/useGeneratePlaylistArtwork.ts index 893067d0fe3..7bcd19e2def 100644 --- a/packages/common/src/hooks/useGeneratePlaylistArtwork.ts +++ b/packages/common/src/hooks/useGeneratePlaylistArtwork.ts @@ -2,8 +2,8 @@ import { useCallback } from 'react' import { useSelector } from 'react-redux' -import { ID } from '~/models/Identifiers' import { useAppContext } from '~/context' +import { ID } from '~/models/Identifiers' import { getCollection, getCollectionTracks diff --git a/packages/common/src/hooks/useProxySelector.ts b/packages/common/src/hooks/useProxySelector.ts index 7aacaac0796..0f9acbbd6f5 100644 --- a/packages/common/src/hooks/useProxySelector.ts +++ b/packages/common/src/hooks/useProxySelector.ts @@ -12,8 +12,8 @@ export const createProxySelectorHook = () => { deps: DependencyList, equalityFn?: Parameters[1] ): TReturnType => { - // eslint-disable-next-line react-hooks/exhaustive-deps // @ts-ignore + // eslint-disable-next-line react-hooks/exhaustive-deps return useSelector(useCallback(memoize(fn), deps), equalityFn) } return useProxySelector diff --git a/packages/common/src/hooks/useUSDCBalance.ts b/packages/common/src/hooks/useUSDCBalance.ts index 72540c6bdce..73231128aca 100644 --- a/packages/common/src/hooks/useUSDCBalance.ts +++ b/packages/common/src/hooks/useUSDCBalance.ts @@ -3,10 +3,10 @@ import { useCallback, useEffect, useState } from 'react' import BN from 'bn.js' import { useDispatch, useSelector } from 'react-redux' +import { useAppContext } from '~/context/appContext' import { Status } from '~/models/Status' import { BNUSDC, StringUSDC } from '~/models/Wallet' import { getUserbankAccountInfo } from '~/services/index' -import { useAppContext } from '~/context/appContext' import { getRecoveryStatus } from '~/store/buy-usdc/selectors' import { getUSDCBalance } from '~/store/wallet/selectors' import { setUSDCBalance } from '~/store/wallet/slice' diff --git a/packages/common/src/models/Analytics.ts b/packages/common/src/models/Analytics.ts index bc9ae7ba03e..6506dc31be1 100644 --- a/packages/common/src/models/Analytics.ts +++ b/packages/common/src/models/Analytics.ts @@ -4,7 +4,11 @@ import { FeedFilter } from '~/models/FeedFilter' import { ID, PlayableType } from '~/models/Identifiers' import { MonitorPayload, ServiceMonitorType } from '~/models/Services' import { TimeRange } from '~/models/TimeRange' -import { SolanaWalletAddress, StringAudio, WalletAddress } from '~/models/Wallet' +import { + SolanaWalletAddress, + StringAudio, + WalletAddress +} from '~/models/Wallet' import { MintName } from '~/services/index' import { Prettify } from '~/utils/typeUtils' diff --git a/packages/common/src/schemas/sign-on/emailSchema.ts b/packages/common/src/schemas/sign-on/emailSchema.ts index 27858707013..0df5b389a25 100644 --- a/packages/common/src/schemas/sign-on/emailSchema.ts +++ b/packages/common/src/schemas/sign-on/emailSchema.ts @@ -1,7 +1,7 @@ import { z } from 'zod' -import { AudiusQueryContextType } from '~/audius-query' import { signUpFetch } from '~/api' +import { AudiusQueryContextType } from '~/audius-query' import { EMAIL_REGEX } from '~/utils/email' export const emailSchemaMessages = { diff --git a/packages/common/src/schemas/sign-on/pickHandleSchema.ts b/packages/common/src/schemas/sign-on/pickHandleSchema.ts index 8c8f43775c8..55a36dd7243 100644 --- a/packages/common/src/schemas/sign-on/pickHandleSchema.ts +++ b/packages/common/src/schemas/sign-on/pickHandleSchema.ts @@ -1,8 +1,8 @@ import { z } from 'zod' +import { signUpFetch } from '~/api' import { AudiusQueryContextType } from '~/audius-query' import { MAX_HANDLE_LENGTH } from '~/services/oauth' -import { signUpFetch } from '~/api' import { restrictedHandles as commonRestrictedHandles } from '~/utils/restrictedHandles' export const pickHandleErrorMessages = { diff --git a/packages/common/src/services/audius-api-client/helper.ts b/packages/common/src/services/audius-api-client/helper.ts index 66ad62afcc5..75695dda3be 100644 --- a/packages/common/src/services/audius-api-client/helper.ts +++ b/packages/common/src/services/audius-api-client/helper.ts @@ -1,4 +1,8 @@ -import { UserCollectionMetadata, UserTrackMetadata, UserMetadata } from '~/models' +import { + UserCollectionMetadata, + UserTrackMetadata, + UserMetadata +} from '~/models' import { removeNullable } from '~/utils' import * as adapter from './ResponseAdapter' diff --git a/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts b/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts index 662aa2b42d9..40942305eab 100644 --- a/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts +++ b/packages/common/src/services/opensea-client/ethCollectibleHelpers.ts @@ -1,4 +1,5 @@ import { Nullable } from '~/utils' + import { Chain, Collectible, diff --git a/packages/common/src/store/pages/chat/sagas.ts b/packages/common/src/store/pages/chat/sagas.ts index 16ac4dc789a..22167e3651a 100644 --- a/packages/common/src/store/pages/chat/sagas.ts +++ b/packages/common/src/store/pages/chat/sagas.ts @@ -18,8 +18,8 @@ import { Name } from '~/models/Analytics' import { ErrorLevel } from '~/models/ErrorReporting' import { ID } from '~/models/Identifiers' import { Status } from '~/models/Status' -import * as toastActions from '~/store/ui/toast/slice' import { getAccountUser, getUserId } from '~/store/account/selectors' +import * as toastActions from '~/store/ui/toast/slice' import dayjs from '~/utils/dayjs' import { decodeHashId, encodeHashId, removeNullable } from '../../../utils' diff --git a/packages/common/src/utils/allSettled.ts b/packages/common/src/utils/allSettled.ts index 440ad25a4b5..880cd08dabe 100644 --- a/packages/common/src/utils/allSettled.ts +++ b/packages/common/src/utils/allSettled.ts @@ -1,3 +1,4 @@ +/* eslint-disable no-restricted-properties */ export const allSettled = Promise.allSettled ? Promise.allSettled.bind(Promise) : (promises: any[]) => From 8462c185f68e7dd3169871f911b7b1e8c8ca7e0e Mon Sep 17 00:00:00 2001 From: sliptype Date: Wed, 31 Jan 2024 11:16:21 -0800 Subject: [PATCH 57/64] Fix mobile lint --- .../wait-for-download-drawer/WaitForDownloadDrawer.tsx | 7 +++++-- packages/mobile/src/screens/track-screen/DownloadRow.tsx | 3 +-- .../mobile/src/screens/track-screen/DownloadSection.tsx | 4 ++-- packages/mobile/src/services/track-download.ts | 5 +++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/mobile/src/components/wait-for-download-drawer/WaitForDownloadDrawer.tsx b/packages/mobile/src/components/wait-for-download-drawer/WaitForDownloadDrawer.tsx index 160a7b2af43..bfb0ad3a839 100644 --- a/packages/mobile/src/components/wait-for-download-drawer/WaitForDownloadDrawer.tsx +++ b/packages/mobile/src/components/wait-for-download-drawer/WaitForDownloadDrawer.tsx @@ -1,5 +1,8 @@ -import type { CommonState } from '@audius/common' -import { cacheTracksSelectors, useWaitForDownloadModal } from '@audius/common' +import type { CommonState } from '@audius/common/store' +import { + cacheTracksSelectors, + useWaitForDownloadModal +} from '@audius/common/store' import { css } from '@emotion/native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/DownloadRow.tsx b/packages/mobile/src/screens/track-screen/DownloadRow.tsx index 74bc1e0f948..e7a7266cb88 100644 --- a/packages/mobile/src/screens/track-screen/DownloadRow.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadRow.tsx @@ -1,7 +1,6 @@ +import type { ID, DownloadQuality } from '@audius/common/models' import type { CommonState } from '@audius/common/store' import { cacheTracksSelectors } from '@audius/common/store' -import type { ID } from '@audius/common/models' -import { DownloadQuality } from '@audius/common/models' import { css } from '@emotion/native' import { useSelector } from 'react-redux' diff --git a/packages/mobile/src/screens/track-screen/DownloadSection.tsx b/packages/mobile/src/screens/track-screen/DownloadSection.tsx index adb29d990a6..dc810461974 100644 --- a/packages/mobile/src/screens/track-screen/DownloadSection.tsx +++ b/packages/mobile/src/screens/track-screen/DownloadSection.tsx @@ -9,10 +9,10 @@ import type { ID } from '@audius/common/models' import { cacheTracksSelectors, usePremiumContentPurchaseModal, - useWaitForDownloadModal + useWaitForDownloadModal, + tracksSocialActions as socialTracksActions } from '@audius/common/store' import type { CommonState } from '@audius/common/store' - import { USDC } from '@audius/fixed-decimal' import { css } from '@emotion/native' import { LayoutAnimation } from 'react-native' diff --git a/packages/mobile/src/services/track-download.ts b/packages/mobile/src/services/track-download.ts index cea7791ac73..5c4e45a61d3 100644 --- a/packages/mobile/src/services/track-download.ts +++ b/packages/mobile/src/services/track-download.ts @@ -1,6 +1,7 @@ -import { tracksSocialActions } from '@audius/common/store' +import type { DownloadTrackArgs } from '@audius/common/services' import { TrackDownload as TrackDownloadBase } from '@audius/common/services' -import type { DownloadTrackArgs, Nullable } from '@audius/common/utils' +import { tracksSocialActions } from '@audius/common/store' +import type { Nullable } from '@audius/common/utils' import { Platform, Share } from 'react-native' import { zip } from 'react-native-zip-archive' import type { From 796defea4ee6b42ee61eb69d0ad7b7392dfc89a4 Mon Sep 17 00:00:00 2001 From: sliptype Date: Wed, 31 Jan 2024 11:19:30 -0800 Subject: [PATCH 58/64] Move fxa type declaration --- packages/common/package.json | 14 +++++++------- packages/common/src/hooks/index.ts | 1 - .../common/src/utils/passwordListLazyLoader.ts | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/common/package.json b/packages/common/package.json index 50d23ca2aaa..a39afca4728 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -7,17 +7,17 @@ "homepage": "https://github.com/AudiusProject/audius-client#readme", "license": "", "exports": { - "./messages": "./src/messages/index.ts", - "./hooks": "./src/hooks/index.ts", - "./context": "./src/context/index.ts", "./api": "./src/api/index.ts", + "./assets": "./src/assets/index.ts", + "./audius-query": "./src/audius-query/index.ts", + "./context": "./src/context/index.ts", + "./hooks": "./src/hooks/index.ts", + "./messages": "./src/messages/index.ts", "./models": "./src/models/index.ts", - "./utils": "./src/utils/index.ts", "./schemas": "./src/schemas/index.ts", "./services": "./src/services/index.ts", - "./audius-query": "./src/audius-query/index.ts", - "./assets": "./src/assets/index.ts", - "./store": "./src/store/index.ts" + "./store": "./src/store/index.ts", + "./utils": "./src/utils/index.ts" }, "repository": { "type": "git", diff --git a/packages/common/src/hooks/index.ts b/packages/common/src/hooks/index.ts index a3e1a7380e0..55ce293e403 100644 --- a/packages/common/src/hooks/index.ts +++ b/packages/common/src/hooks/index.ts @@ -1,4 +1,3 @@ -import '../types/fxa-common-password-list/index.d.ts' export * from './useBooleanOnce' export * from './useFeatureFlag' export * from './useRemoteVar' diff --git a/packages/common/src/utils/passwordListLazyLoader.ts b/packages/common/src/utils/passwordListLazyLoader.ts index 003a694bd83..379f8eae1cf 100644 --- a/packages/common/src/utils/passwordListLazyLoader.ts +++ b/packages/common/src/utils/passwordListLazyLoader.ts @@ -1,3 +1,4 @@ +import '../types/fxa-common-password-list/index.d.ts' import commonPasswordList from 'fxa-common-password-list' export { commonPasswordList } From 048c97071fdb986482343d0009fa082115b39673 Mon Sep 17 00:00:00 2001 From: sliptype Date: Wed, 31 Jan 2024 11:23:02 -0800 Subject: [PATCH 59/64] Delete scripts --- packages/convert-exports.js | 844 ----------------------------------- packages/convert-imports.js | 25 -- packages/get-type-exports.js | 25 -- 3 files changed, 894 deletions(-) delete mode 100644 packages/convert-exports.js delete mode 100644 packages/convert-imports.js delete mode 100644 packages/get-type-exports.js diff --git a/packages/convert-exports.js b/packages/convert-exports.js deleted file mode 100644 index 6d7b2b191f8..00000000000 --- a/packages/convert-exports.js +++ /dev/null @@ -1,844 +0,0 @@ -const glob = require('glob') -const fs = require('fs') - -var getDirectories = function (callback) { - glob('./mobile/src/**/*', callback) -} - -const DIRECTORY = 'store' -const EXPORTS = [ - 'accountReducer', - 'accountActions', - 'accountSelectors', - 'accountSagas', - 'averageColorReducer', - 'averageColorActions', - 'averageColorSelectors', - 'buyCryptoReducer', - 'buyCryptoActions', - 'buyCryptoSagas', - 'buyUSDCReducer', - 'buyUSDCActions', - 'buyUSDCSelectors', - 'buyUSDCSagas', - 'getUSDCUserBank', - 'getBuyUSDCRemoteConfig', - 'BuyUSDCStage', - 'BuyUSDCErrorCode', - 'BuyUSDCError', - 'cacheCollectionsActions', - 'cacheCollectionsReducer', - 'cacheCollectionsSelectors', - 'cacheTracksActions', - 'cacheTracksReducer', - 'cacheTracksSelectors', - 'cacheUsersActions', - 'cacheUsersReducer', - 'cacheActions', - 'CIDCache', - 'cacheConfig', - 'cacheReducer', - 'cacheSelectors', - 'processAndCacheUsers', - 'reformatUser', - 'PlaylistOperations', - 'reformatCollection', - 'cacheUsersSelectors', - 'castSagas', - 'castSelectors', - 'castReducer', - 'castActions', - 'CAST_METHOD', - 'challengesSelectors', - 'changePasswordSelectors', - 'changePasswordReducer', - 'changePasswordActions', - 'ChangePasswordPageStep', - 'lineupActions', - 'lineupReducer', - 'lineupSelectors', - 'LineupBaseActions', - 'lineupRegistry', - 'notificationsReducer', - 'notificationsActions', - 'notificationsSelectors', - 'NotificationType', - 'PushNotificationType', - 'Entity', - 'Achievement', - 'trendingUndergroundLineupPageReducer', - 'trendingUndergroundPageLineupSelectors', - 'trendingUndergroundPageLineupActions', - 'trendingUndergroundPageReducer', - 'trendingPlaylistsPageLineupReducer', - 'trendingPlaylistsPageLineupSelectors', - 'trendingPlaylistsPageLineupActions', - 'trendingPlaylistsPageReducer', - 'trendingPageLineupReducer', - 'trendingPageLineupSelectors', - 'trendingPageLineupActions', - 'trendingPageReducer', - 'trendingPageActions', - 'trendingPageSelectors', - 'trackPageLineupReducer', - 'trackPageLineupActions', - 'trackPageReducer', - 'trackPageActions', - 'trackPageSelectors', - 'tokenDashboardPageSelectors', - 'tokenDashboardPageReducer', - 'tokenDashboardPageActions', - 'smartCollectionPageSelectors', - 'smartCollectionPageReducer', - 'smartCollectionPageActions', - 'settingsPageSelectors', - 'settingsPageReducer', - 'settingsPageInitialState', - 'settingsPageActions', - 'searchResultsPageTracksLineupReducer', - 'searchResultsPageTracksLineupActions', - 'searchResultsPageActions', - 'searchResultsPageSelectors', - 'searchResultsPageReducer', - 'savedPageTracksLineupReducer', - 'savedPageTracksLineupActions', - 'savedPageActions', - 'savedPageSelectors', - 'persistedSavePageReducer', - 'remixesPageLineupReducer', - 'remixesPageLineupInitialState', - 'remixesPageLineupActions', - 'remixesPageReducer', - 'remixesPageActions', - 'remixesPageSelectors', - 'aiPageLineupReducer', - 'aiPageLineupInitialState', - 'aiPageLineupActions', - 'aiPageReducer', - 'aiPageActions', - 'aiPageSelectors', - 'profilePageFeedLineupReducer', - 'profilePageFeedLineupActions', - 'profilePageTracksLineupReducer', - 'profilePageTracksLineupActions', - 'profilePageActions', - 'profilePageSelectors', - 'profilePageReducer', - 'historyPageTracksLineupReducer', - 'historyPageTracksLineupActions', - 'historyPageSelectors', - 'historyPageReducer', - 'feedPageLineupReducer', - 'feedPageLineupActions', - 'feedPageSelectors', - 'feedPageActions', - 'feedPageReducer', - 'explorePageCollectionsSelectors', - 'explorePageCollectionsReducer', - 'explorePageCollectionsActions', - 'explorePageSelectors', - 'explorePageReducer', - 'explorePageActions', - 'collectionPageLineupReducer', - 'collectionPageLineupActions', - 'collectionPageSelectors', - 'collectionPageActions', - 'collectionPageReducer', - 'audioRewardsPageSelectors', - 'audioRewardsPageReducer', - 'audioRewardsPageActions', - 'audioTransactionsPageSelectors', - 'audioTransactionsPageReducer', - 'audioTransactionsPageActions', - 'premiumTracksPageLineupReducer', - 'premiumTracksPageLineupSelectors', - 'premiumTracksPageLineupActions', - 'BrowserNotificationSetting', - 'PushNotificationSetting', - 'EmailFrequency', - 'emailFrequency', - 'Cast', - 'SearchKind', - 'LibraryCategory', - 'isLibraryCategory', - 'SavedPageTabs', - 'calculateNewLibraryCategories', - 'FollowType', - 'CollectionSortMode', - 'TracksSortMode', - 'ProfilePageTabs', - 'ProfilePageTabRoute', - 'getTabForRoute', - 'ExplorePageTabs', - 'ExploreCollectionsVariant', - 'HCaptchaStatus', - 'ClaimStatus', - 'deactivateAccountReducer', - 'deactivateAccountActions', - 'deactivateAccountSelectors', - 'chatReducer', - 'chatActions', - 'chatSelectors', - 'chatSagas', - 'chatMiddleware', - 'makeChatId', - 'ChatPermissionAction', - 'ChatWebsocketError', - 'playlistLibraryReducer', - 'playlistLibraryActions', - 'playlistLibraryHelpers', - 'playlistLibrarySelectors', - 'queueReducer', - 'queueActions', - 'initialQueueState', - 'queueSelectors', - 'RepeatMode', - 'QueueSource', - 'reachabilityActions', - 'reachabilityReducer', - 'reachabilitySelectors', - 'reachabilitySagas', - 'recoveryEmailReducer', - 'recoveryEmailActions', - 'recoveryEmailSelectors', - 'remoteConfigSagas', - 'remoteConfigSelectors', - 'remoteConfigActions', - 'remoteConfigReducer', - 'remoteConfigInitialState', - 'signOutReducer', - 'signOutActions', - 'collectionsSocialActions', - 'tracksSocialActions', - 'usersSocialActions', - 'solanaSelectors', - 'solanaReducer', - 'solanaActions', - 'solanaSagas', - 'stemsUploadActions', - 'stemsUploadReducer', - 'stemsUploadSelectors', - 'tippingSelectors', - 'tippingReducer', - 'tippingActions', - 'walletSelectors', - 'walletReducer', - 'walletActions', - 'badgeTiers', - 'getVerifiedForUser', - 'getWeiBalanceForUser', - 'makeGetTierAndVerifiedForUser', - 'getTierAndNumberForBalance', - 'getTierNumber', - 'getUserBalance', - 'getTierForUser', - 'addToCollectionUISelectors', - 'addToCollectionUIActions', - 'addToCollectionUIReducer', - 'relatedArtistsUISelectors', - 'relatedArtistsUIReducer', - 'relatedArtistsUIActions', - 'relatedArtistsSagas', - 'collectibleDetailsUISelectors', - 'collectibleDetailsUIReducer', - 'collectibleDetailsUIActions', - 'deletePlaylistConfirmationModalUISelectors', - 'deletePlaylistConfirmationModalUIReducer', - 'deletePlaylistConfirmationModalUIActions', - 'deletePlaylistConfirmationModalUISagas', - 'duplicateAddConfirmationModalUISelectors', - 'duplicateAddConfirmationModalUIReducer', - 'duplicateAddConfirmationModalUIActions', - 'duplicateAddConfirmationModalUISagas', - 'mobileOverflowMenuUISelectors', - 'mobileOverflowMenuUIReducer', - 'mobileOverflowMenuUIActions', - 'mobileOverflowMenuUISagas', - 'nowPlayingUISelectors', - 'nowPlayingUIReducer', - 'nowPlayingUIActions', - 'publishPlaylistConfirmationModalUISelectors', - 'publishPlaylistConfirmationModalUIReducer', - 'publishPlaylistConfirmationModalUIActions', - 'publishPlaylistConfirmationModalUISagas', - 'reactionsUIReducer', - 'reactionsUIActions', - 'reactionsUISelectors', - 'shareModalUIReducer', - 'shareModalUIActions', - 'shareModalUISelectors', - 'shareModalUISagas', - 'stripeModalUIReducer', - 'stripeModalUIActions', - 'stripeModalUISelectors', - 'stripeModalUISagas', - 'coinflowModalUIReducer', - 'coinflowModalUIActions', - 'vipDiscordModalReducer', - 'vipDiscordModalActions', - 'vipDiscordModalSelectors', - 'vipDiscordModalSagas', - 'shareSoundToTiktokModalReducer', - 'shareSoundToTiktokModalActions', - 'shareSoundToTiktokModalSelectors', - 'themeReducer', - 'themeActions', - 'themeSelectors', - 'toastReducer', - 'toastActions', - 'toastSelectors', - 'toastSagas', - 'buyAudioReducer', - 'buyAudioActions', - 'buyAudioSelectors', - 'uploadConfirmationModalUISelectors', - 'uploadConfirmationModalUIReducer', - 'uploadConfirmationModalUIActions', - 'uploadConfirmationModalUISagas', - 'publishTrackConfirmationModalUISelectors', - 'publishTrackConfirmationModalUIReducer', - 'publishTrackConfirmationModalUIActions', - 'publishTrackConfirmationModalUISagas', - 'withdrawUSDCReducer', - 'withdrawUSDCActions', - 'withdrawUSDCSelectors', - 'transactionDetailsReducer', - 'transactionDetailsActions', - 'transactionDetailsSelectors', - 'searchUsersModalReducer', - 'searchUsersModalActions', - 'searchUsersModalSelectors', - 'searchUsersModalSagas', - 'OverflowAction', - 'OverflowSource', - 'modalsSelectors', - 'modalsActions', - 'modalsReducer', - 'modalsSagas', - 'useCreateChatModal', - 'createChatModalActions', - 'createChatModalReducer', - 'useCoinflowOnrampModal', - 'coinflowOnrampModalActions', - 'coinflowOnrampModalReducer', - 'useCoinflowWithdrawModal', - 'coinflowWithdrawModalActions', - 'coinflowWithdrawModalReducer', - 'useLeavingAudiusModal', - 'leavingAudiusModalReducer', - 'useInboxUnavailableModal', - 'inboxUnavailableModalActions', - 'inboxUnavailableModalReducer', - 'useUSDCPurchaseDetailsModal', - 'usdcPurchaseDetailsModalReducer', - 'useUSDCTransactionDetailsModal', - 'usdcTransactionDetailsModalReducer', - 'WithdrawUSDCModalPages', - 'useWithdrawUSDCModal', - 'withdrawUSDCModalReducer', - 'withdrawUSDCModalActions', - 'useEditPlaylistModal', - 'editPlaylistModalActions', - 'editPlaylistModalReducer', - 'editTrackModalSelectors', - 'useEditTrackModal', - 'editTrackModalActions', - 'editTrackModalReducer', - 'usePremiumContentPurchaseModal', - 'premiumContentPurchaseModalReducer', - 'useUSDCManualTransferModal', - 'usdcManualTransferModalReducer', - 'useAddFundsModal', - 'addFundsModalReducer', - 'reactionOrder', - 'reactionsMap', - 'getReactionFromRawValue', - 'StripeSessionCreationError', - 'ShareSoundToTiktokModalStatus', - 'OnRampProvider', - 'PurchaseInfoErrorType', - 'BuyAudioStage', - 'TOKEN_LISTING_MAP', - 'CoinflowWithdrawState', - 'WithdrawMethod', - 'TransactionType', - 'TransactionMethod', - 'TransactionMetadataType', - 'userListActions', - 'UserListSagaFactory', - 'userListSelectors', - 'topSupportersUserListActions', - 'topSupportersUserListSelectors', - 'supportingUserListActions', - 'supportingUserListSelectors', - 'repostsUserListActions', - 'repostsUserListSelectors', - 'notificationsUserListActions', - 'notificationsUserListSelectors', - 'notificationsUserListReducer', - 'mutualsUserListActions', - 'mutualsUserListSelectors', - 'mutualsUserListReducer', - 'followingUserListActions', - 'followingUserListSelectors', - 'followersUserListActions', - 'followersUserListSelectors', - 'favoritesUserListActions', - 'favoritesUserListSelectors', - 'relatedArtistsUserListActions', - 'relatedArtistsUserListSelectors', - 'UserListReducerFactory', - 'TOP_SUPPORTERS_USER_LIST_TAG', - 'SUPPORTING_USER_LIST_TAG', - 'RepostType', - 'REPOSTS_USER_LIST_TAG', - 'NOTIFICATIONS_USER_LIST_TAG', - 'MUTUALS_USER_LIST_TAG', - 'FOLLOWING_USER_LIST_TAG', - 'FOLLOWERS_USER_LIST_TAG', - 'FAVORITES_USER_LIST_TAG', - 'RELATED_ARTISTS_USER_LIST_TAG', - 'reducers', - 'sagas', - 'getContext', - 'playerReducer', - 'playerActions', - 'initialPlayerState', - 'playerSelectors', - 'playerSagas', - 'PLAYBACK_RATE_LS_KEY', - 'playbackRateValueMap', - 'playbackPositionReducer', - 'playbackPositionActions', - 'playbackPositionSelectors', - 'playbackPositionSagas', - 'LEGACY_PLAYBACK_POSITION_LS_KEY', - 'PLAYBACK_POSITION_LS_KEY', - 'musicConfettiSelectors', - 'musicConfettiReducer', - 'musicConfettiActions', - 'uploadReducer', - 'uploadActions', - 'uploadSelectors', - 'UploadType', - 'ProgressStatus', - 'remixSettingsSelectors', - 'remixSettingsReducer', - 'remixSettingsActions', - 'gatedContentReducer', - 'gatedContentActions', - 'gatedContentSelectors', - 'gatedContentSagas', - 'purchaseContentReducer', - 'purchaseContentActions', - 'purchaseContentSelectors', - 'purchaseContentSagas', - 'ContentType', - 'PurchaseContentStage', - 'PurchaseContentPage', - 'PurchaseErrorCode', - 'PurchaseContentError', - 'zeroBalance', - 'isContentPurchaseInProgress', - 'getPurchaseSummaryValues', - 'getBalanceNeeded', - 'collectiblesReducer', - 'collectiblesActions', - 'collectiblesSelectors', - 'playlistUpdatesActions', - 'playlistUpdatesReducer', - 'playlistUpdatesSelectors', - 'playlistUpdatesSagas', - 'savedCollectionsReducer', - 'savedCollectionsActions', - 'savedCollectionsSelectors', - 'confirmerActions', - 'confirmerReducer', - 'confirmerSelectors', - 'confirmerSagas', - 'confirmTransaction', - 'AccountCollection', - 'TwitterAccountPayload', - 'InstagramAccountPayload', - 'TikTokAccountPayload', - 'InstagramProfile', - 'TwitterProfile', - 'TikTokProfile', - 'BuyCryptoConfig', - 'BuyCryptoViaSolLocalStorageState', - 'PurchaseInfo', - 'AddSuccededAction', - 'AddEntriesAction', - 'CacheType', - 'SetCacheConfigAction', - 'EnhancedCollection', - 'EnhancedCollectionTrack', - 'CollectionsCacheState', - 'Image', - 'EditPlaylistValues', - 'TracksCacheState', - 'Metadata', - 'UsersCacheState', - 'CastMethod', - 'ChangePasswordState', - 'ConfirmationOptions', - 'ConfirmerState', - 'RequestConfirmationError', - 'MusicConfettiState', - 'TrackEntity', - 'CollectionEntity', - 'EntityType', - 'BaseNotification', - 'DiscoveryBaseNotification', - 'DiscoveryAction', - 'DiscoveryAnnouncementNotificationAction', - 'DiscoveryFollowNotificationAction', - 'DiscoverySaveNotificationAction', - 'DiscoverySaveOfRepostNotificationAction', - 'DiscoveryRepostNotificationAction', - 'DiscoveryRepostOfRepostNotificationAction', - 'DiscoveryTastemakerNotificationAction', - 'DiscoveryTipSendNotificationAction', - 'DiscoveryTipReceiveNotificationAction', - 'DiscoveryAddTrackToPlaylistNotificationAction', - 'DiscoveryMilestoneFollowNotificationAction', - 'DiscoveryMilestoneTrackNotificationAction', - 'DiscoveryMilestonePlaylistNotificationAction', - 'DiscoveryRemixNotificationAction', - 'DiscoveryCosignNotificationAction', - 'DiscoverySupporterRankUpNotificationAction', - 'DiscoverySupportingRankUpNotificationAction', - 'DiscoverySupporterDethronedNotificationAction', - 'DiscoveryReactionNotificationAction', - 'DiscoveryChallengeRewardNotificationAction', - 'DiscoveryTierChangeNotificationAction', - 'DiscoveryCreateTrackNotificationAction', - 'DiscoveryCreatePlaylistNotificationAction', - 'DiscoveryUSDCPurchaseNotificationAction', - 'TrendingRange', - 'DiscoveryTrendingNotificationAction', - 'DiscoveryAnnouncementNotification', - 'DiscoveryFollowNotification', - 'DiscoverySaveNotification', - 'DiscoveryRepostNotification', - 'DiscoveryTastemakerNotification', - 'DiscoveryAddTrackToPlaylistNotification', - 'DiscoveryTipSendNotification', - 'DiscoveryTipReceiveNotification', - 'DiscoveryRemixNotification', - 'DiscoveryCosignNotification', - 'DiscoverySupporterRankUpNotification', - 'DiscoverySupportingRankUpNotification', - 'DiscoverySupporterDethronedNotification', - 'DiscoveryReactionNotification', - 'DiscoveryChallengeRewardNotification', - 'DiscoveryTierChangeNotification', - 'DiscoveryCreateNotification', - 'DiscoveryUSDCPurchaseBuyerNotification', - 'DiscoveryUSDCPurchaseSellerNotification', - 'DiscoveryTrendingPlaylistNotification', - 'DiscoveryTrendingNotification', - 'DiscoveryTrendingUndergroundNotification', - 'DiscoveryMilestoneNotification', - 'DiscoveryRepostOfRepostNotification', - 'DiscoverySaveOfRepostNotification', - 'DiscoveryNotification', - 'AnnouncementNotification', - 'UserSubscriptionNotification', - 'FollowNotification', - 'FollowPushNotification', - 'RepostNotification', - 'RepostPushNotification', - 'RepostOfRepostNotification', - 'RepostOfRepostPushNotification', - 'FavoriteOfRepostNotification', - 'FavoriteOfRepostPushNotification', - 'FavoriteNotification', - 'FavoritePushNotification', - 'MilestoneNotification', - 'MilestoneFollowPushNotification', - 'MilestoneListenPushNotification', - 'MilestoneRepostPushNotification', - 'MilestoneFavoritePushNotification', - 'RemixCreateNotification', - 'RemixCreatePushNotification', - 'RemixCosignNotification', - 'RemixCosignPushNotification', - 'TrendingPlaylistNotification', - 'TrendingTrackNotification', - 'TrendingUndergroundNotification', - 'TastemakerNotification', - 'ChallengeRewardNotification', - 'TierChangeNotification', - 'ReactionNotification', - 'ReactionPushNotification', - 'TipReceiveNotification', - 'TipReceivePushNotification', - 'TipSendNotification', - 'TipSendPushNotification', - 'SupporterRankUpNotification', - 'SupporterRankUpPushNotification', - 'SupportingRankUpNotification', - 'SupportingRankUpPushNotification', - 'SupporterDethronedNotification', - 'AddTrackToPlaylistNotification', - 'AddTrackToPlaylistPushNotification', - 'USDCPurchaseSellerNotification', - 'USDCPurchaseBuyerNotification', - 'Notification', - 'IdentityNotification', - 'NotificationsState', - 'AddNotificationsAction', - 'UpdateNotificationsAction', - 'FetchNotificationsAction', - 'FetchNotificationsFailedAction', - 'MessagePushNotification', - 'MessageReactionPushNotification', - 'AiPageState', - 'FetchAiUserAction', - 'TrendingRewardsModalType', - 'ChallengeRewardsModalType', - 'ClaimState', - 'AudioRewardsClaim', - 'UndisbursedUserChallenge', - 'ChatMessageTileProps', - 'CollectionTrack', - 'CollectionsPageState', - 'CollectionsPageType', - 'CollectionPageTrackRecord', - 'DeactivateAccountState', - 'ErrorState', - 'CollectionsState', - 'GetExplore', - 'ExploreContent', - 'FeedPageState', - 'HistoryPageState', - 'ProfilePageFollow', - 'ProfileState', - 'ProfilePageState', - 'ProfileUser', - 'LibraryCategoryType', - 'SavedPageState', - 'SavedPageTrack', - 'TrackRecord', - 'SavedPageCollection', - 'FetchSearchPageResultsAction', - 'FetchSearchPageResultsSuceededAction', - 'FetchSearchPageResultsFailedAction', - 'FetchSearchPageTagsSucceededAction', - 'FetchSearchPageTagsFailedAction', - 'FetchSearchPageTagsAction', - 'SearchPageActions', - 'SearchPageState', - 'ToggleNotificationSetting', - 'TogglePushNotificationSetting', - 'TogglePushNotificationSettingFailed', - 'RequestPushNotificationPermissions', - 'UpdateEmailFrequency', - 'GetNotificationSettings', - 'GetNotificationSettingsFailed', - 'SetNotificationSettings', - 'GetPushNotificationSettings', - 'GetPushNotificationSettingsFailed', - 'SetPushNotificationSettings', - 'SetBrowserNotificationPermission', - 'SetBrowserNotificationEnabled', - 'SetBrowserNotificationSettingsOn', - 'SetBrowserNotificationSettingsOff', - 'BrowserPushNotificationFailed', - 'SetAiAttribution', - 'SettingActions', - 'Notifications', - 'PushNotifications', - 'SettingsPageState', - 'SmartCollectionState', - 'ConnectWalletsState', - 'TokenDashboardPageModalState', - 'CanReceiveWAudio', - 'AssociatedWallet', - 'AssociatedWallets', - 'ConfirmRemoveWalletAction', - 'InputSendDataAction', - 'AssociatedWalletsState', - 'TokenDashboardState', - 'TrackPageState', - 'TrendingPageState', - 'PlaybackStatus', - 'PlaybackPositionInfo', - 'PlaybackPositionState', - 'PlayerState', - 'PlaybackRate', - 'PlaylistLibraryState', - 'UpdatePayload', - 'ReorderAction', - 'AddToFolderAction', - 'PlaylistUpdate', - 'PlaylistUpdateState', - 'PlaylistUpdatesReceivedAction', - 'UpdatedPlaylistViewedAction', - 'PurchaseContentErrorCode', - 'Queueable', - 'QueueItem', - 'ReachabilityState', - 'RecoveryEmailState', - 'CommonState', - 'RemixSettingsState', - 'RemoteConfigState', - 'StateWithRemoteConfig', - 'CollectionListState', - 'SavedCollectionsState', - 'CollectionType', - 'CommonStoreContext', - 'TippingSendStatus', - 'SupportersMapForUser', - 'SupportersMap', - 'SupportingMapForUser', - 'SupportingMap', - 'TippingState', - 'RefreshSupportPayloadAction', - 'AddToCollectionState', - 'AddToPlaylistState', - 'JupiterTokenListing', - 'JupiterTokenSymbol', - 'AmountObject', - 'CollectibleDetailsState', - 'OpenPayload', - 'DeletePlaylistConfirmationModalState', - 'OpenPayload', - 'DuplicateAddConfirmationModalState', - 'OpenOverflowMenuPayload', - 'OverflowActionCallbacks', - 'MobileOverflowModalState', - 'AddFundsModalState', - 'CoinflowPurchaseMetadata', - 'CoinflowOnrampModalState', - 'CoinflowWithdrawModalState', - 'CreateChatModalState', - 'BaseModalState', - 'FocusableFields', - 'EditPlaylistModalState', - 'EditTrackModalState', - 'InboxUnavailableModalState', - 'LeavingAudiusModalState', - 'PremiumContentPurchaseModalState', - 'Modals', - 'BasicModalsState', - 'StatefulModalsState', - 'ModalsState', - 'TrackModalOpenedActionPayload', - 'TrackModalClosedActionPayload', - 'USDCManualTransferModalState', - 'USDCPurchaseDetailsModalState', - 'USDCTransactionDetailsModalState', - 'WithdrawUSDCModalState', - 'NowPlayingState', - 'OpenPayload', - 'PublishPlaylistConfirmationModalState', - 'OpenPayload', - 'PublishTrackConfirmationState', - 'PublishTrackConfirmationModalState', - 'ReactionsState', - 'ReactionTypes', - 'RelatedArtists', - 'RelatedArtistsState', - 'SearchUsersModalState', - 'ShareType', - 'ShareContent', - 'ShareModalState', - 'ShareModalRequestOpenAction', - 'ShareModalOpenAction', - 'ShareSoundToTiktokModalTrack', - 'ShareSoundToTikTokModalState', - 'ShareSoundToTiktokModalAuthenticatedPayload', - 'ShareSoundToTiktokModalRequestOpenPayload', - 'ShareSoundToTiktokModalOpenPayload', - 'ShareSoundToTiktokModalSetStatusPayload', - 'StripeSessionStatus', - 'StripeFixedTransactionDetails', - 'StripeTransactionDetails', - 'StripeQuoteDetails', - 'StripeSessionData', - 'StripeDestinationCurrencyType', - 'StripeModalState', - 'StripeSessionCreationErrorResponseData', - 'ThemeState', - 'SetThemeAction', - 'SetSystemAppearanceAction', - 'ToastType', - 'Toast', - 'ToastState', - 'ToastAction', - 'AddToastAction', - 'DissmissToastAction', - 'ManualClearToastAction', - 'InAppAudioPurchaseMetadata', - 'TransactionDetails', - 'TransactionDetailsState', - 'OpenPayload', - 'UploadConfirmationState', - 'UploadConfirmationModalState', - 'VipDiscordModalState', - 'NativeFile', - 'UploadTrack', - 'ExtendedTrackMetadata', - 'ExtendedCollectionMetadata', - 'Progress', - 'ProgressState', - 'UploadState', - 'FavoritesOwnState', - 'FavoritesPageState', - 'FollowersOwnState', - 'FollowersPageState', - 'FollowingOwnState', - 'FollowingPageState', - 'MutualsOwnState', - 'MutualsPageState', - 'NotificationUsersPageOwnState', - 'NotificationUsersPageState', - 'RelatedArtistsOwnState', - 'RelatedArtistsPageState', - 'RepostsOwnState', - 'RepostsPageState', - 'SupportingOwnState', - 'SupportingPageState', - 'TopSupportersOwnState', - 'TopSupportersPageState', - 'UserListStoreState', - 'FetchUserIdsSaga', - 'BadgeTierInfo' -] - -getDirectories(async function (err, res) { - res - .filter((path) => path.match(/\/[^\/]+\.(ts|tsx|js|jsx)$/)) - .forEach((path) => { - const content = fs.readFileSync(path, { encoding: 'utf8', flag: 'r' }) - - let matches = [] - let newContent = content - EXPORTS.forEach((exportName) => { - let regex = new RegExp( - `(import[^{]*{[^}]* )(${exportName}( as [^,]*)*[, \\n])([^}]*}\\s*from '@audius/common')` - ) - - let match = content.match(regex)?.[2] - - if (match) { - matches.push(match.replace(',', '')) - - // Delete old import - newContent = newContent.replace(regex, '$1$4') - } - }) - - // Add new imports - if (matches.length) { - console.log('matches', matches) - const matchesList = matches.join(', ') - newContent = `import { ${matchesList} } from '@audius/common/${DIRECTORY}' - ${newContent}` - - fs.writeFileSync(path, newContent) - } - }) -}) diff --git a/packages/convert-imports.js b/packages/convert-imports.js deleted file mode 100644 index d1fc01e1d66..00000000000 --- a/packages/convert-imports.js +++ /dev/null @@ -1,25 +0,0 @@ -const glob = require('glob') -const fs = require('fs') - -var getDirectories = function (callback) { - glob('./common/src/**/*', callback) -} - -getDirectories(async function (err, res) { - res - .filter((path) => path.match(/\/[^\/]+\.(ts|tsx|js|jsx)$/)) - .forEach((path) => { - const content = fs.readFileSync(path, { encoding: 'utf8', flag: 'r' }) - - let regex = new RegExp( - `(from ')(audius-query|assets|hooks|models|schemas|services|store|utils)([^']*')`, - 'gm' - ) - - let newContent = content.replace(regex, (...args) => { - return `${args[1]}~/${args[2]}${args[3]}` - }) - - fs.writeFileSync(path, newContent) - }) -}) diff --git a/packages/get-type-exports.js b/packages/get-type-exports.js deleted file mode 100644 index 6c771588ffc..00000000000 --- a/packages/get-type-exports.js +++ /dev/null @@ -1,25 +0,0 @@ -const glob = require('glob') -const fs = require('fs') - -var getDirectories = function (callback) { - glob('./common/dist/store/**/*', callback) -} - -getDirectories(async function (err, res) { - let exports = [] - res - .filter((path) => path.match(/\/[^\/]+\.(d.ts)$/)) - .forEach((path) => { - const content = fs.readFileSync(path, { encoding: 'utf8', flag: 'r' }) - - let regex = new RegExp('export (type|interface) ([^ ]+)', 'gm') - - let match - while ((match = regex.exec(content)) !== null) { - const exportName = match[2] - exports.push(exportName) - } - }) - - console.dir(exports, { maxArrayLength: null }) -}) From 4aae77fee67301e2283453f211cd68726c07cfc0 Mon Sep 17 00:00:00 2001 From: sliptype Date: Wed, 31 Jan 2024 11:38:05 -0800 Subject: [PATCH 60/64] Revert vite downgrade --- package-lock.json | 2 +- packages/web/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index afcd392a9f7..9eec162d8e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -146950,7 +146950,7 @@ "typescript": "5.0.4", "typescript-plugin-css-modules": "^3.4.0", "url": "^0.11.0", - "vite": "^4.2.2", + "vite": "4.5.0", "vite-plugin-glslify": "2.0.2", "vite-plugin-svgr": "4.1.0", "vitest": "0.34.6" diff --git a/packages/web/package.json b/packages/web/package.json index 39afc3a7c9a..a42fc424982 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -269,7 +269,7 @@ "typescript": "5.0.4", "typescript-plugin-css-modules": "^3.4.0", "url": "^0.11.0", - "vite": "^4.2.2", + "vite": "4.5.0", "vite-plugin-glslify": "2.0.2", "vite-plugin-svgr": "4.1.0", "vitest": "0.34.6" From ca258ca96031e9ca4a479f33e15a01d03d19c084 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Wed, 31 Jan 2024 11:24:38 -0800 Subject: [PATCH 61/64] Fix helpers test --- packages/common/src/store/playlist-library/helpers.test.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/common/src/store/playlist-library/helpers.test.ts b/packages/common/src/store/playlist-library/helpers.test.ts index 27c08056df1..1aea69b781b 100644 --- a/packages/common/src/store/playlist-library/helpers.test.ts +++ b/packages/common/src/store/playlist-library/helpers.test.ts @@ -1,5 +1,8 @@ -import { PlaylistLibrary, PlaylistLibraryFolder } from 'models/PlaylistLibrary' -import { SmartCollectionVariant } from 'models/SmartCollectionVariant' +import { + PlaylistLibrary, + PlaylistLibraryFolder +} from '~/models/PlaylistLibrary' +import { SmartCollectionVariant } from '~/models/SmartCollectionVariant' import { addFolderToLibrary, From f38a64ce777c3964dc74f0973ff5d92d4f556f94 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Wed, 31 Jan 2024 11:54:35 -0800 Subject: [PATCH 62/64] Fix circular dependencies --- .../src/store/average-color/selectors.ts | 34 ++++++++++++++++++ .../common/src/store/average-color/slice.ts | 35 ------------------- .../src/store/ui/buy-audio/constants.ts | 2 ++ .../common/src/store/ui/buy-audio/types.ts | 4 --- packages/common/src/store/ui/index.ts | 4 +-- .../ui/modals/create-chat-modal/index.ts | 9 +---- .../common/src/store/ui/modals/createModal.ts | 7 ++-- packages/common/src/store/ui/modals/types.ts | 14 ++++++-- .../src/store/ui/reactions/selectors.ts | 7 ++++ .../common/src/store/ui/reactions/slice.ts | 6 ---- 10 files changed, 60 insertions(+), 62 deletions(-) create mode 100644 packages/common/src/store/average-color/selectors.ts create mode 100644 packages/common/src/store/ui/reactions/selectors.ts diff --git a/packages/common/src/store/average-color/selectors.ts b/packages/common/src/store/average-color/selectors.ts new file mode 100644 index 00000000000..c77470e628c --- /dev/null +++ b/packages/common/src/store/average-color/selectors.ts @@ -0,0 +1,34 @@ +import { CID, Color, Track } from '~/models' +import { Nullable } from '~/utils' + +import { CommonState } from '../reducers' + +export const getAverageColor = ( + state: CommonState, + { multihash }: { multihash: Nullable } +): Nullable => + (multihash && state.ui.averageColor.averageColor[multihash]) || null + +export const getAverageColorByTrack = ( + state: CommonState, + { track }: { track: Nullable } +): Nullable => { + const multihash = track?.cover_art_sizes ?? track?.cover_art + if (!multihash) return null + return state.ui.averageColor.averageColor[multihash] ?? null +} + +export const getDominantColorsByTrack = ( + state: CommonState, + { track }: { track: Nullable } +): Nullable => { + const multihash = track?.cover_art_sizes ?? track?.cover_art + if (!multihash) return null + return state.ui.averageColor.dominantColors[multihash] ?? null +} + +export const selectors = { + getAverageColor, + getAverageColorByTrack, + getDominantColorsByTrack +} diff --git a/packages/common/src/store/average-color/slice.ts b/packages/common/src/store/average-color/slice.ts index ec38ffdd916..986caa99239 100644 --- a/packages/common/src/store/average-color/slice.ts +++ b/packages/common/src/store/average-color/slice.ts @@ -1,11 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' -import { Nullable } from '~/utils/typeUtils' - import { Color } from '../../models/Color' -import { CID } from '../../models/Identifiers' -import { Track } from '../../models/Track' -import { CommonState } from '../commonStore' const initialState: { averageColor: { [multihash: string]: Color } @@ -44,34 +39,4 @@ export const { setAverageColor, setDominantColors } = slice.actions export const actions = slice.actions -export const getAverageColor = ( - state: CommonState, - { multihash }: { multihash: Nullable } -): Nullable => - (multihash && state.ui.averageColor.averageColor[multihash]) || null - -export const getAverageColorByTrack = ( - state: CommonState, - { track }: { track: Nullable } -): Nullable => { - const multihash = track?.cover_art_sizes ?? track?.cover_art - if (!multihash) return null - return state.ui.averageColor.averageColor[multihash] ?? null -} - -export const getDominantColorsByTrack = ( - state: CommonState, - { track }: { track: Nullable } -): Nullable => { - const multihash = track?.cover_art_sizes ?? track?.cover_art - if (!multihash) return null - return state.ui.averageColor.dominantColors[multihash] ?? null -} - -export const selectors = { - getAverageColor, - getAverageColorByTrack, - getDominantColorsByTrack -} - export default slice.reducer diff --git a/packages/common/src/store/ui/buy-audio/constants.ts b/packages/common/src/store/ui/buy-audio/constants.ts index eccffe5d8ed..7a97fb4804d 100644 --- a/packages/common/src/store/ui/buy-audio/constants.ts +++ b/packages/common/src/store/ui/buy-audio/constants.ts @@ -32,3 +32,5 @@ export const TOKEN_LISTING_MAP: Record = { 'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v/logo.png' } } + +export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP diff --git a/packages/common/src/store/ui/buy-audio/types.ts b/packages/common/src/store/ui/buy-audio/types.ts index d6993cdbffc..286599d1010 100644 --- a/packages/common/src/store/ui/buy-audio/types.ts +++ b/packages/common/src/store/ui/buy-audio/types.ts @@ -1,5 +1,3 @@ -import { TOKEN_LISTING_MAP } from './constants' - /** * From Jupiter API documentation: * https://docs.jup.ag/jupiter-core/jupiter-sdk/v2/full-guide @@ -20,8 +18,6 @@ export enum OnRampProvider { UNKNOWN = 'unknown' } -export type JupiterTokenSymbol = keyof typeof TOKEN_LISTING_MAP - export enum PurchaseInfoErrorType { MAX_AUDIO_EXCEEDED = 'max_audio_exceeded', MIN_AUDIO_EXCEEDED = 'min_audio_exceeded', diff --git a/packages/common/src/store/ui/index.ts b/packages/common/src/store/ui/index.ts index 8b8e1b26174..d49661beec0 100644 --- a/packages/common/src/store/ui/index.ts +++ b/packages/common/src/store/ui/index.ts @@ -57,9 +57,9 @@ export * from './publish-playlist-confirmation-modal/types' export { default as reactionsUIReducer, - actions as reactionsUIActions, - selectors as reactionsUISelectors + actions as reactionsUIActions } from './reactions/slice' +export { selectors as reactionsUISelectors } from './reactions/selectors' export * from './reactions/types' export * from './reactions/utils' diff --git a/packages/common/src/store/ui/modals/create-chat-modal/index.ts b/packages/common/src/store/ui/modals/create-chat-modal/index.ts index 305692cbf12..19e2179a420 100644 --- a/packages/common/src/store/ui/modals/create-chat-modal/index.ts +++ b/packages/common/src/store/ui/modals/create-chat-modal/index.ts @@ -1,12 +1,5 @@ -import { Action } from '@reduxjs/toolkit' - import { createModal } from '../createModal' - -export type CreateChatModalState = { - defaultUserList?: 'followers' | 'chats' - presetMessage?: string - onCancelAction?: Action -} +import { CreateChatModalState } from '../types' const createChatModal = createModal({ reducerPath: 'CreateChatModal', diff --git a/packages/common/src/store/ui/modals/createModal.ts b/packages/common/src/store/ui/modals/createModal.ts index 2d18826a5c1..3a832386b9b 100644 --- a/packages/common/src/store/ui/modals/createModal.ts +++ b/packages/common/src/store/ui/modals/createModal.ts @@ -4,13 +4,10 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { useDispatch, useSelector } from 'react-redux' import { ModalSource } from '~/models/Analytics' -import { CommonState } from '~/store/index' +import { CommonState } from '~/store' import { actions } from './parentSlice' - -export type BaseModalState = { - isOpen: boolean | 'closing' -} +import { BaseModalState } from './types' type BaseCreateModalConfig = { reducerPath: string diff --git a/packages/common/src/store/ui/modals/types.ts b/packages/common/src/store/ui/modals/types.ts index 52ccd349aca..9b40a619b5f 100644 --- a/packages/common/src/store/ui/modals/types.ts +++ b/packages/common/src/store/ui/modals/types.ts @@ -1,10 +1,10 @@ +import { Action } from '@reduxjs/toolkit' + import { ModalSource } from '~/models/Analytics' import { AddFundsModalState } from './add-funds-modal' import { CoinflowOnrampModalState } from './coinflow-onramp-modal' import { CoinflowWithdrawModalState } from './coinflow-withdraw-modal' -import { CreateChatModalState } from './create-chat-modal' -import { BaseModalState } from './createModal' import { EditPlaylistModalState } from './edit-playlist-modal' import { EditTrackModalState } from './edit-track-modal' import { InboxUnavailableModalState } from './inbox-unavailable-modal' @@ -16,6 +16,16 @@ import { USDCTransactionDetailsModalState } from './usdc-transaction-details-mod import { WaitForDownloadModalState } from './wait-for-download-modal' import { WithdrawUSDCModalState } from './withdraw-usdc-modal' +export type BaseModalState = { + isOpen: boolean | 'closing' +} + +export type CreateChatModalState = { + defaultUserList?: 'followers' | 'chats' + presetMessage?: string + onCancelAction?: Action +} + export type Modals = | 'TiersExplainer' | 'TrendingRewardsExplainer' diff --git a/packages/common/src/store/ui/reactions/selectors.ts b/packages/common/src/store/ui/reactions/selectors.ts new file mode 100644 index 00000000000..095863aef86 --- /dev/null +++ b/packages/common/src/store/ui/reactions/selectors.ts @@ -0,0 +1,7 @@ +import { CommonState } from '~/store/reducers' + +export const makeGetReactionForSignature = + (signature: string) => (state: CommonState) => + state.ui.reactions.reactionsForEntityMap[signature] + +export const selectors = { makeGetReactionForSignature } diff --git a/packages/common/src/store/ui/reactions/slice.ts b/packages/common/src/store/ui/reactions/slice.ts index ac60234441f..c70f544c345 100644 --- a/packages/common/src/store/ui/reactions/slice.ts +++ b/packages/common/src/store/ui/reactions/slice.ts @@ -1,7 +1,6 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { Nullable } from '../../../utils/typeUtils' -import { CommonState } from '../../commonStore' import { ReactionTypes } from './types' @@ -48,10 +47,6 @@ const slice = createSlice({ } }) -export const makeGetReactionForSignature = - (signature: string) => (state: CommonState) => - state.ui.reactions.reactionsForEntityMap[signature] - export const { setLocalReactionValues, writeReactionValue, @@ -60,4 +55,3 @@ export const { export const actions = slice.actions export default slice.reducer -export const selectors = { makeGetReactionForSignature } From a897c65aa558481641948e50fdf4d8537a66b962 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Wed, 31 Jan 2024 12:01:22 -0800 Subject: [PATCH 63/64] Fix tests --- packages/common/jest.config.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/common/jest.config.ts b/packages/common/jest.config.ts index 348ede88a08..9fbda1eab7e 100644 --- a/packages/common/jest.config.ts +++ b/packages/common/jest.config.ts @@ -1,3 +1,6 @@ export default { - moduleDirectories: ['node_modules', 'src'] + moduleDirectories: ['node_modules', 'src'], + moduleNameMapper: { + '^~/(.*)$': '/src/$1' + } } From b9fc853d2e246100e9efd3f860c2e6a2358b3a93 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Wed, 31 Jan 2024 13:25:09 -0800 Subject: [PATCH 64/64] Fix stuff --- packages/common/src/store/average-color/index.ts | 4 ++-- packages/common/src/store/ui/modals/reducers.ts | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/common/src/store/average-color/index.ts b/packages/common/src/store/average-color/index.ts index 97c61ab91fe..cf2c9a3f564 100644 --- a/packages/common/src/store/average-color/index.ts +++ b/packages/common/src/store/average-color/index.ts @@ -1,5 +1,5 @@ export { default as averageColorReducer, - actions as averageColorActions, - selectors as averageColorSelectors + actions as averageColorActions } from './slice' +export { selectors as averageColorSelectors } from './selectors' diff --git a/packages/common/src/store/ui/modals/reducers.ts b/packages/common/src/store/ui/modals/reducers.ts index 10d80981f20..064557b3d90 100644 --- a/packages/common/src/store/ui/modals/reducers.ts +++ b/packages/common/src/store/ui/modals/reducers.ts @@ -4,14 +4,13 @@ import { addFundsModalReducer } from './add-funds-modal' import { coinflowOnrampModalReducer } from './coinflow-onramp-modal' import { coinflowWithdrawModalReducer } from './coinflow-withdraw-modal' import { createChatModalReducer } from './create-chat-modal' -import { BaseModalState } from './createModal' import { editPlaylistModalReducer } from './edit-playlist-modal' import { editTrackModalReducer } from './edit-track-modal' import { inboxUnavailableModalReducer } from './inbox-unavailable-modal' import { leavingAudiusModalReducer } from './leaving-audius-modal' import parentReducer, { initialState } from './parentSlice' import { premiumContentPurchaseModalReducer } from './premium-content-purchase-modal' -import { Modals, ModalsState } from './types' +import { BaseModalState, Modals, ModalsState } from './types' import { usdcManualTransferModalReducer } from './usdc-manual-transfer-modal' import { usdcPurchaseDetailsModalReducer } from './usdc-purchase-details-modal' import { usdcTransactionDetailsModalReducer } from './usdc-transaction-details-modal'