diff --git a/app/_layout.tsx b/app/_layout.tsx index be7150c..30db87f 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -125,5 +125,3 @@ function useConnectionChecker() { } }, [error?.message]); } - -global.React = React; diff --git a/components/Alert.tsx b/components/Alert.tsx index a85acea..669a9ee 100644 --- a/components/Alert.tsx +++ b/components/Alert.tsx @@ -37,7 +37,7 @@ function Alert({ title, description, type, icon: Icon, className }: Props) { )} > - + {title} {description} diff --git a/components/Icons.tsx b/components/Icons.tsx index 6c2458a..67f34a2 100644 --- a/components/Icons.tsx +++ b/components/Icons.tsx @@ -1,6 +1,5 @@ import { PopiconsCircleExclamationLine as AlertCircleIcon, - PopiconsAtomSolid as AtomIcon, PopiconsBitcoinSolid as BitcoinIcon, PopiconsAddressBookSolid as BookUserIcon, PopiconsCameraWebOffSolid as CameraOffIcon, @@ -13,6 +12,7 @@ import { PopiconsCircleInfoLine as HelpCircleIcon, PopiconsArrowDownLine as MoveDownIcon, PopiconsArrowUpLine as MoveUpIcon, + PopiconsLifebuoySolid as OnboardingIcon, PopiconsClipboardTextSolid as PasteIcon, PopiconsReloadLine as RefreshIcon, PopiconsReloadSolid as ResetIcon, @@ -24,6 +24,7 @@ import { PopiconsBinSolid as TrashIcon, PopiconsTriangleExclamationLine as TriangleAlertIcon, PopiconsWalletHorizontalOpenSolid as WalletIcon, + PopiconsDownloadSolid as WithdrawIcon, PopiconsCircleXLine as XCircleIcon, PopiconsXSolid as XIcon, PopiconsBoltSolid as ZapIcon, @@ -44,7 +45,6 @@ function interopIcon(icon: React.FunctionComponent) { } interopIcon(AlertCircleIcon); -interopIcon(AtomIcon); interopIcon(BitcoinIcon); interopIcon(BookUserIcon); interopIcon(CameraOffIcon); @@ -57,6 +57,7 @@ interopIcon(FingerprintIcon); interopIcon(HelpCircleIcon); interopIcon(MoveDownIcon); interopIcon(MoveUpIcon); +interopIcon(OnboardingIcon); interopIcon(PasteIcon); interopIcon(RefreshIcon); interopIcon(ResetIcon); @@ -68,13 +69,13 @@ interopIcon(ThemeIcon); interopIcon(TrashIcon); interopIcon(TriangleAlertIcon); interopIcon(WalletIcon); +interopIcon(WithdrawIcon); interopIcon(XCircleIcon); interopIcon(XIcon); interopIcon(ZapIcon); export { AlertCircleIcon, - AtomIcon, BitcoinIcon, BookUserIcon, CameraOffIcon, @@ -87,6 +88,7 @@ export { HelpCircleIcon, MoveDownIcon, MoveUpIcon, + OnboardingIcon, PasteIcon, RefreshIcon, ResetIcon, @@ -98,6 +100,7 @@ export { TrashIcon, TriangleAlertIcon, WalletIcon, + WithdrawIcon, XCircleIcon, XIcon, ZapIcon, diff --git a/package.json b/package.json index 4137c40..3e91781 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "dependencies": { "@getalby/lightning-tools": "^5.1.1", "@getalby/sdk": "^3.8.2", - "@popicons/react-native": "^0.0.16", + "@popicons/react-native": "^0.0.20", "@react-native-async-storage/async-storage": "1.23.1", "@rn-primitives/dialog": "^1.0.3", "@rn-primitives/portal": "^1.0.3", @@ -49,7 +49,6 @@ "expo-secure-store": "~14.0.0", "expo-status-bar": "~2.0.0", "lottie-react-native": "7.1.0", - "lucide-react-native": "^0.376.0", "message-port-polyfill": "^0.2.0", "nativewind": "^4.0.1", "react": "18.3.1", diff --git a/pages/Home.tsx b/pages/Home.tsx index 0c431d3..e0c2262 100644 --- a/pages/Home.tsx +++ b/pages/Home.tsx @@ -21,7 +21,6 @@ import AlbyBanner from "~/components/AlbyBanner"; import LargeArrowDown from "~/components/icons/LargeArrowDown"; import LargeArrowUp from "~/components/icons/LargeArrowUp"; import Screen from "~/components/Screen"; -import { Button } from "~/components/ui/button"; import { Skeleton } from "~/components/ui/skeleton"; import { useGetFiatAmount } from "~/hooks/useGetFiatAmount"; @@ -132,16 +131,11 @@ export function Home() { - + diff --git a/pages/receive/Receive.tsx b/pages/receive/Receive.tsx index 00d4385..08b0b37 100644 --- a/pages/receive/Receive.tsx +++ b/pages/receive/Receive.tsx @@ -6,7 +6,7 @@ import { Image, Share, TouchableOpacity, View } from "react-native"; import Toast from "react-native-toast-message"; import DismissableKeyboardView from "~/components/DismissableKeyboardView"; import { DualCurrencyInput } from "~/components/DualCurrencyInput"; -import { CopyIcon, ExportIcon, ShareIcon, ZapIcon } from "~/components/Icons"; +import { CopyIcon, ShareIcon, WithdrawIcon, ZapIcon } from "~/components/Icons"; import Loading from "~/components/Loading"; import QRCode from "~/components/QRCode"; import Screen from "~/components/Screen"; @@ -209,7 +209,7 @@ export function Receive() { router.push("/withdraw"); }} > - + Withdraw @@ -298,7 +298,7 @@ export function Receive() { router.push("/withdraw"); }} > - + Withdraw )} diff --git a/pages/settings/Settings.tsx b/pages/settings/Settings.tsx index 29e29d4..b9c36b0 100644 --- a/pages/settings/Settings.tsx +++ b/pages/settings/Settings.tsx @@ -1,9 +1,9 @@ import { Link, router } from "expo-router"; import { Alert, TouchableOpacity, View } from "react-native"; import { - AtomIcon, BitcoinIcon, FingerprintIcon, + OnboardingIcon, ResetIcon, SignOutIcon, ThemeIcon, @@ -103,7 +103,7 @@ export function Settings() { useAppStore.getState().setOnboarded(false); }} > - + Open Onboarding diff --git a/yarn.lock b/yarn.lock index 6fa3074..3ed274e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1633,10 +1633,10 @@ resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31" integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA== -"@popicons/react-native@^0.0.16": - version "0.0.16" - resolved "https://registry.yarnpkg.com/@popicons/react-native/-/react-native-0.0.16.tgz#a16d3592709fef87c389822df9a96029d1d71910" - integrity sha512-eO+Tf9ovQVx6hxjmTby4nU3t1pVzvigxb5mO1BtCNl52Z9PkSOid+9pDsu9LWmfJBV6h7KP+H9CDyM10nBDd5A== +"@popicons/react-native@^0.0.20": + version "0.0.20" + resolved "https://registry.yarnpkg.com/@popicons/react-native/-/react-native-0.0.20.tgz#0bb9d84f63a8057e918c86a8f809e101b95eb35b" + integrity sha512-oBTQ6DNBA4NGEnODr/IhGujcDVZPgKB0uXNYEkrg9znsCYN/CZC1CTyoKnQzQSnmsZj/7+JLFd0TpUD7v1DCug== "@radix-ui/primitive@1.1.0": version "1.1.0" @@ -6590,11 +6590,6 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -lucide-react-native@^0.376.0: - version "0.376.0" - resolved "https://registry.yarnpkg.com/lucide-react-native/-/lucide-react-native-0.376.0.tgz#e66640581eb290911956e64cf11bc62d791f64b8" - integrity sha512-Mo+w+cCkVpy8AeMQk9si8oLomaCsOsPi4WHR9oFm9YHz3I9nFvVdiMIUNvuWLSL5dPD1i+AVzn0ahpNFviEPlQ== - make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"