From eb453564eefd8b788eec536f5e1a4c25e9f787f2 Mon Sep 17 00:00:00 2001 From: thomarnauld Date: Sat, 20 Jan 2024 08:50:47 +0000 Subject: [PATCH] fix: box children centered well fix: box childreen centered well and git conflit resolved fix: lint and yarn.lock --- .../NetworkSelector/NetworkSelectorMenu.tsx | 2 +- packages/components/TopMenu/TopMenuBox.tsx | 6 +- packages/components/boxes/TertiaryBox.tsx | 7 +- .../fileUploader/FileUploader.web.tsx | 4 +- .../components/inputs/TextInputCustom.tsx | 2 +- .../socialFeed/NewsFeed/NewsFeedInput.tsx | 7 +- yarn.lock | 482 +++++++++--------- 7 files changed, 263 insertions(+), 247 deletions(-) diff --git a/packages/components/NetworkSelector/NetworkSelectorMenu.tsx b/packages/components/NetworkSelector/NetworkSelectorMenu.tsx index 3bf9db8fec..4c8db15dd2 100644 --- a/packages/components/NetworkSelector/NetworkSelectorMenu.tsx +++ b/packages/components/NetworkSelector/NetworkSelectorMenu.tsx @@ -81,7 +81,7 @@ export const NetworkSelectorMenu: FC<{ style, { paddingHorizontal: layout.spacing_x2, - paddingTop: layout.spacing_x2, + paddingVertical: layout.spacing_x2, backgroundColor: neutral17, alignItems: "flex-start", width: 172, diff --git a/packages/components/TopMenu/TopMenuBox.tsx b/packages/components/TopMenu/TopMenuBox.tsx index 235466a043..2a1286cb14 100644 --- a/packages/components/TopMenu/TopMenuBox.tsx +++ b/packages/components/TopMenu/TopMenuBox.tsx @@ -31,13 +31,11 @@ export const TopMenuBox: FC<{ return ( ; -}> = ({ style, children }) => { + notched?: boolean; +}> = ({ style, children, notched = true }) => { return ( {children} diff --git a/packages/components/fileUploader/FileUploader.web.tsx b/packages/components/fileUploader/FileUploader.web.tsx index 571574580f..3b85be5a89 100644 --- a/packages/components/fileUploader/FileUploader.web.tsx +++ b/packages/components/fileUploader/FileUploader.web.tsx @@ -33,8 +33,8 @@ export const FileUploader: FC = ({ const handleFiles = async (files: File[]) => { const _files = multiple ? files : [files[0]]; - let supportedFiles = [...files].filter( - (file) => mimeTypes?.includes(file.type), + let supportedFiles = [...files].filter((file) => + mimeTypes?.includes(file.type), ); if (maxUpload && supportedFiles.length) { diff --git a/packages/components/inputs/TextInputCustom.tsx b/packages/components/inputs/TextInputCustom.tsx index af0267f135..efc3c381f9 100644 --- a/packages/components/inputs/TextInputCustom.tsx +++ b/packages/components/inputs/TextInputCustom.tsx @@ -60,7 +60,7 @@ export interface TextInputCustomProps onPressChildren?: () => void; placeHolder?: string; squaresBackgroundColor?: string; - style?: StyleProp; + style?: StyleProp; textInputStyle?: StyleProp; onPressEnter?: () => void; currency?: Currency; diff --git a/packages/components/socialFeed/NewsFeed/NewsFeedInput.tsx b/packages/components/socialFeed/NewsFeed/NewsFeedInput.tsx index 53761bc659..3287427481 100644 --- a/packages/components/socialFeed/NewsFeed/NewsFeedInput.tsx +++ b/packages/components/socialFeed/NewsFeed/NewsFeedInput.tsx @@ -508,12 +508,7 @@ export const NewsFeedInput = React.forwardRef< > {viewWidth < BREAKPOINT_S && } - + =16.14.0" react-native: ">=0.69.0" react-native-svg: ">=13.0.0" - checksum: 78ad63a6ae43d8e2ee91d1d4803e06033c645e21675373f1ae4414fdd4d136e5e4bbc87b475e6f92ad93287b25c9b37e5239bdd3845187bc7030f4f9c2893ff0 + checksum: 3fa9064c94a1d135558218a9464f4359c65223519e0c2fd3d9d83fdfd47fd35e7d7abc69f4f960bf752330eb6f496febfc9ca384a0d213d792296d2cb8b77922 languageName: node linkType: hard @@ -18225,9 +18245,9 @@ __metadata: version: 1.3.0 resolution: "react-native-svg-transformer@npm:1.3.0" dependencies: - "@svgr/core": ^8.0.0 - "@svgr/plugin-jsx": ^8.0.1 - "@svgr/plugin-svgo": ^8.0.1 + "@svgr/core": ^8.1.0 + "@svgr/plugin-jsx": ^8.1.0 + "@svgr/plugin-svgo": ^8.1.0 path-dirname: ^1.0.2 peerDependencies: react-native: ">=0.59.0" @@ -18268,8 +18288,8 @@ __metadata: linkType: hard "react-native-vector-icons@npm:^10.0.2": - version: 10.0.2 - resolution: "react-native-vector-icons@npm:10.0.2" + version: 10.0.3 + resolution: "react-native-vector-icons@npm:10.0.3" dependencies: prop-types: ^15.7.2 yargs: ^16.1.1 @@ -18278,7 +18298,7 @@ __metadata: fa5-upgrade: bin/fa5-upgrade.sh fa6-upgrade: bin/fa6-upgrade.sh generate-icon: bin/generate-icon.js - checksum: 4ea424fa98c25cdf3e33c590f6e370e0ce0762051a139beb425410eba6e87627e2a68963a025db27130a94d28fbe44299c30471d62555af1654c8c6e4918afb6 + checksum: 77f22804b0217b4b21e8f4baaee6d33d09429bf55a31e07347fb5ab0af395b0d9adc0cbc3abd46f689ccaf07b953dc909eba95213bce7e03b562801fe4fd0768 languageName: node linkType: hard @@ -18567,9 +18587,9 @@ __metadata: linkType: hard "regenerator-runtime@npm:^0.14.0": - version: 0.14.0 - resolution: "regenerator-runtime@npm:0.14.0" - checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3 + version: 0.14.1 + resolution: "regenerator-runtime@npm:0.14.1" + checksum: 9f57c93277b5585d3c83b0cf76be47b473ae8c6d9142a46ce8b0291a04bb2cf902059f0f8445dcabb3fb7378e5fe4bb4ea1e008876343d42e46d3b484534ce38 languageName: node linkType: hard @@ -19000,8 +19020,8 @@ __metadata: linkType: hard "rpc-websockets@npm:^7.5.1": - version: 7.6.2 - resolution: "rpc-websockets@npm:7.6.2" + version: 7.9.0 + resolution: "rpc-websockets@npm:7.9.0" dependencies: "@babel/runtime": ^7.17.2 bufferutil: ^4.0.1 @@ -19014,7 +19034,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: fa82613df99fd0a19a02f87c002808bc39fc0c040a17decf9ea6710bd22e21db507ac98edc335739ca0636cdf84459eaed69576e2c0c08fc12c65233c981318f + checksum: c3ddd79ea7cf63b7a6a8d32356c7f9b363e41f26a6a8bbe889f9d2c5267811d492e194340fbad1a21ecfa457d5d1f253af3357a94d0118f66fcdea1fd9236adc languageName: node linkType: hard @@ -20924,15 +20944,15 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:^3.14.2, tsconfig-paths@npm:^3.9.0": - version: 3.14.2 - resolution: "tsconfig-paths@npm:3.14.2" +"tsconfig-paths@npm:^3.15.0, tsconfig-paths@npm:^3.9.0": + version: 3.15.0 + resolution: "tsconfig-paths@npm:3.15.0" dependencies: "@types/json5": ^0.0.29 json5: ^1.0.2 minimist: ^1.2.6 strip-bom: ^3.0.0 - checksum: a6162eaa1aed680537f93621b82399c7856afd10ec299867b13a0675e981acac4e0ec00896860480efc59fc10fd0b16fdc928c0b885865b52be62cadac692447 + checksum: 59f35407a390d9482b320451f52a411a256a130ff0e7543d18c6f20afab29ac19fbe55c360a93d6476213cc335a4d76ce90f67df54c4e9037f7d240920832201 languageName: node linkType: hard @@ -21141,12 +21161,12 @@ __metadata: linkType: hard "typescript@npm:^5.2.2": - version: 5.2.2 - resolution: "typescript@npm:5.2.2" + version: 5.3.3 + resolution: "typescript@npm:5.3.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c + checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2 languageName: node linkType: hard @@ -21161,12 +21181,12 @@ __metadata: linkType: hard "typescript@patch:typescript@^5.2.2#~builtin": - version: 5.2.2 - resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=85af82" + version: 5.3.3 + resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin::version=5.3.3&hash=85af82" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554 + checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610 languageName: node linkType: hard @@ -22353,9 +22373,9 @@ __metadata: linkType: hard "whatwg-fetch@npm:^3.0.0": - version: 3.6.19 - resolution: "whatwg-fetch@npm:3.6.19" - checksum: 2896bc9ca867ea514392c73e2a272f65d5c4916248fe0837a9df5b1b92f247047bc76cf7c29c28a01ac6c5fb4314021d2718958c8a08292a96d56f72b2f56806 + version: 3.6.20 + resolution: "whatwg-fetch@npm:3.6.20" + checksum: c58851ea2c4efe5c2235f13450f426824cf0253c1d45da28f45900290ae602a20aff2ab43346f16ec58917d5562e159cd691efa368354b2e82918c2146a519c5 languageName: node linkType: hard