diff --git a/JoyboyCommunity/src/assets/icons.tsx b/JoyboyCommunity/src/assets/icons.tsx index f9563c98..d5c8be17 100644 --- a/JoyboyCommunity/src/assets/icons.tsx +++ b/JoyboyCommunity/src/assets/icons.tsx @@ -107,29 +107,10 @@ export const UserIcon: React.FC = (props) => ( ); -export const CopyIcon: React.FC = (props) => ( - - - - -); -export const Exit: React.FC = (props) => ( + +export const ExitIcon: React.FC = (props) => ( = (props) => ( ); -export const Gallery: React.FC = (props) => ( - - - - - - -); - -export const GifIcon: React.FC = (props) => ( - - - - -); -export const Line: React.FC = (props) => ( +export const LineIcon: React.FC = (props) => ( = (props)=> ( ); -export const SendButton: React.FC = (props)=> ( - - - - -); +// export const SendButton: React.FC = (props)=> ( +// +// +// +// +// ); export const Update: React.FC = (props) => ( @@ -328,7 +253,7 @@ export const Warning: React.FC = (props) => ( /> ) -======= +; export const CopyIcon: React.FC = (props) => { return ( diff --git a/JoyboyCommunity/src/components/modal/index.tsx b/JoyboyCommunity/src/components/modal/index.tsx index d0da2bcf..58a1e7d0 100644 --- a/JoyboyCommunity/src/components/modal/index.tsx +++ b/JoyboyCommunity/src/components/modal/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {Portal} from 'react-native-portalize'; -import { Line } from '../../assets/icons'; +import { LineIcon } from '../../assets/icons'; import { ButtonText, Container, @@ -32,7 +32,7 @@ const Modal: React.FC = ({name, buttons, icon, description, vi - + {icon} {name} {description} diff --git a/JoyboyCommunity/src/screens/CreatePost/index.tsx b/JoyboyCommunity/src/screens/CreatePost/index.tsx index 7f87b5a4..1f5e82f1 100644 --- a/JoyboyCommunity/src/screens/CreatePost/index.tsx +++ b/JoyboyCommunity/src/screens/CreatePost/index.tsx @@ -14,7 +14,7 @@ import { SendbuttonContainer, TitleContainer, } from './styled'; -import { CopyIcon, Gallery, GifIcon, ProfileIcon, SendButton } from '../../assets/icons'; +import { CopyIcon, GalleryIcon, GifIcon, ProfileIcon, SendIcon } from '../../assets/icons'; export const CreatePost: React.FC = () => { const navigation = useNavigation(); @@ -88,11 +88,11 @@ export const CreatePost: React.FC = () => { - + - + diff --git a/JoyboyCommunity/src/screens/DialogPage/index.tsx b/JoyboyCommunity/src/screens/DialogPage/index.tsx index b8f9998d..6c7e2014 100644 --- a/JoyboyCommunity/src/screens/DialogPage/index.tsx +++ b/JoyboyCommunity/src/screens/DialogPage/index.tsx @@ -1,6 +1,6 @@ import React, {useState} from 'react'; import {Button, Pressable, View} from 'react-native'; -import {Exit, NotificationIcon, Update, Warning} from '../../assets/icons'; +import {ExitIcon, NotificationIcon, Update, Warning} from '../../assets/icons'; import {Divider} from '../../components'; import Modal from '../../components/modal'; import {Container, Logo} from './styled'; @@ -57,7 +57,7 @@ export const DialogPage: React.FC = () => { {label: 'Logout', type: 'primary', onPress: () => toggleModal(null)}, {label: 'Cancel', type: 'secondary', onPress: () => toggleModal(null)}, ]} - icon={} + icon={} description="Are you sure you want to logout?" visible={true} /> diff --git a/JoyboyCommunity/yarn.lock b/JoyboyCommunity/yarn.lock index ae3a48ee..cb2c7a18 100644 --- a/JoyboyCommunity/yarn.lock +++ b/JoyboyCommunity/yarn.lock @@ -1385,11 +1385,6 @@ resolved "https://registry.npmjs.org/@noble/ciphers/-/ciphers-0.2.0.tgz" integrity sha512-6YBxJDAapHSdd3bLDv6x2wRPwq4QFMUaB3HvljNBUTThDd12eSm7/3F+2lnfzx2jvM+S6Nsy0jEt9QbPqSwqRw== -"@noble/ciphers@^0.5.1": - version "0.5.3" - resolved "https://registry.npmjs.org/@noble/ciphers/-/ciphers-0.5.3.tgz" - integrity sha512-B0+6IIHiqEs3BPMT0hcRmHvEj2QHOLu+uwt+tqDDeVd0oyVzh7BPrDcPjRnV1PV/5LaknXJJQvOuRGR0zQJz+w== - "@noble/curves@1.1.0", "@noble/curves@~1.1.0": version "1.1.0" resolved "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz" @@ -1397,13 +1392,6 @@ dependencies: "@noble/hashes" "1.3.1" -"@noble/curves@1.2.0": - version "1.2.0" - resolved "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz" - integrity sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw== - dependencies: - "@noble/hashes" "1.3.2" - "@noble/curves@^1.4.0": version "1.4.0" resolved "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz" @@ -1416,11 +1404,6 @@ resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz" integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA== -"@noble/hashes@1.3.2": - version "1.3.2" - resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz" - integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ== - "@noble/hashes@1.4.0", "@noble/hashes@^1.3.1": version "1.4.0" resolved "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz" @@ -1457,9 +1440,9 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@nostr-dev-kit/ndk@^2.8.1": +"@nostr-dev-kit/ndk@^2.8.2": version "2.8.2" - resolved "https://registry.npmjs.org/@nostr-dev-kit/ndk/-/ndk-2.8.2.tgz" + resolved "https://registry.npmjs.org/@nostr-dev-kit/ndk/-/ndk-2.8.2.tgz#6d024b90dddbaae2b4cf9548f2bb4357fc87bdd8" integrity sha512-+dOEyuYvO5/MoI5iTi8C5HifmvfeEvpybNesluVYyu+o+koFdfc+WSYH050V8+9KlOgx8nOZAaqXnHz0KY1gBA== dependencies: "@noble/curves" "^1.4.0" @@ -6157,25 +6140,6 @@ nostr-tools@^1.15.0: "@scure/bip32" "1.3.1" "@scure/bip39" "1.2.1" -nostr-tools@^2.5.2: - version "2.7.0" - resolved "https://registry.npmjs.org/nostr-tools/-/nostr-tools-2.7.0.tgz#5c125300465e8d418198e40ed51f3a4563bdb4a7" - integrity sha512-jJoL2J1CBiKDxaXZww27nY/Wsuxzx7AULxmGKFce4sskDu1tohNyfnzYQ8BvDyvkstU8kNZUAXPL32tre33uig== - dependencies: - "@noble/ciphers" "^0.5.1" - "@noble/curves" "1.2.0" - "@noble/hashes" "1.3.1" - "@scure/base" "1.1.1" - "@scure/bip32" "1.3.1" - "@scure/bip39" "1.2.1" - optionalDependencies: - nostr-wasm v0.1.0 - -nostr-wasm@v0.1.0: - version "0.1.0" - resolved "https://registry.npmjs.org/nostr-wasm/-/nostr-wasm-0.1.0.tgz" - integrity sha512-78BTryCLcLYv96ONU8Ws3Q1JzjlAt+43pWQhIl86xZmWeegYCNLPml7yQ+gG3vR6V5h4XGj+TxO+SS5dsThQIA== - npm-package-arg@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-7.0.0.tgz"