Merge pull request #379 from getAlby/chore/revert-toast

chore: revert adding toastify-react-native

Author: im-adithya

app/_layout.tsx

@@ -14,8 +14,8 @@ import { swrConfiguration } from "lib/swr";
 import * as React from "react";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { SafeAreaView } from "react-native-safe-area-context";
+import Toast from "react-native-toast-message";
 import { SWRConfig } from "swr";
-import ToastManager from "toastify-react-native";
 import { toastConfig } from "~/components/ToastConfig";
 import { NotificationProvider } from "~/context/Notification";
 import { UserInactivityProvider } from "~/context/UserInactivity";
@@ -125,12 +125,11 @@ export default Sentry.wrap(function RootLayout() {
                     <Slot />
                   </SessionProvider>
                 </UserInactivityProvider>
-                <ToastManager
+                <Toast
                   config={toastConfig}
                   position="bottom"
                   bottomOffset={140}
                   topOffset={140}
-                  useModal={false}
                 />
               </BottomSheetModalProvider>
             </GestureHandlerRootView>

components/CreateInvoice.tsx

@@ -3,7 +3,7 @@ import * as Clipboard from "expo-clipboard";
 import { router } from "expo-router";
 import React from "react";
 import { Share, View } from "react-native";
-import { Toast } from "toastify-react-native";
+import Toast from "react-native-toast-message";
 import DismissableKeyboardView from "~/components/DismissableKeyboardView";
 import { DualCurrencyInput } from "~/components/DualCurrencyInput";
 import { CopyIcon, ShareIcon } from "~/components/Icons";

components/ToastConfig.tsx

@@ -1,11 +1,12 @@
 import { Link } from "expo-router";
 import { View } from "react-native";
+import { type ToastConfig } from "react-native-toast-message";
 import { CheckCircleIcon, XCircleIcon } from "~/components/Icons";
 import { Button } from "./ui/button";
 import { Text } from "./ui/text";
 
-export const toastConfig = {
-  success: ({ text1, text2 }: { text1: string; text2: string }) => (
+export const toastConfig: ToastConfig = {
+  success: ({ text1, text2 }) => (
     <View className="bg-foreground rounded-xl px-6 py-3 mx-6">
       <View className="flex flex-row gap-2 justify-center items-center">
         <CheckCircleIcon className="text-background" width={16} height={16} />
@@ -14,7 +15,7 @@ export const toastConfig = {
       {text2 && <Text className="text-background text-center">{text2}</Text>}
     </View>
   ),
-  info: ({ text1, text2 }: { text1: string; text2: string }) => (
+  info: ({ text1, text2, hide }) => (
     <View className="bg-yellow-500 rounded-full px-6 py-3 mx-6">
       <View className="flex flex-row gap-2 justify-center items-center">
         <XCircleIcon className="text-background" width={16} height={16} />
@@ -23,7 +24,7 @@ export const toastConfig = {
       {text2 && <Text className="text-background text-center">{text2}</Text>}
     </View>
   ),
-  error: ({ text1, text2 }: { text1: string; text2: string }) => (
+  error: ({ text1, text2, hide }) => (
     <View className="bg-destructive rounded-xl px-6 py-3 mx-6">
       <View className="flex flex-row gap-2 justify-center items-center">
         <XCircleIcon className="text-background" width={16} height={16} />
@@ -32,7 +33,7 @@ export const toastConfig = {
       {text2 && <Text className="text-background text-center">{text2}</Text>}
     </View>
   ),
-  connectionError: ({ text1 }: { text1: string }) => {
+  connectionError: ({ text1, text2, hide }) => {
     return (
       <View className="bg-foreground rounded-xl px-6 py-3 mx-6 flex flex-col gap-2">
         <View className="flex flex-row gap-2 justify-center items-center">

components/WalletSwitcher.tsx

@@ -6,7 +6,7 @@ import {
 } from "@gorhom/bottom-sheet";
 import React, { useCallback, useMemo, useRef } from "react";
 import { FlatList, TouchableOpacity, View } from "react-native";
-import { Toast } from "toastify-react-native";
+import Toast from "react-native-toast-message";
 import { ChevronDownIcon, WalletIcon } from "~/components/Icons";
 import { Text } from "~/components/ui/text";
 import { DEFAULT_WALLET_NAME } from "~/lib/constants";

lib/errorToast.ts

@@ -1,4 +1,4 @@
-import { Toast } from "toastify-react-native";
+import Toast from "react-native-toast-message";
 
 export function errorToast(error: Error | unknown) {
   Toast.show({

package.json

@@ -76,13 +76,13 @@
     "react-native-safe-area-context": "^5.6.1",
     "react-native-screens": "~4.16.0",
     "react-native-svg": "15.12.1",
+    "react-native-toast-message": "^2.3.3",
     "react-native-url-polyfill": "^2.0.0",
     "react-native-webview": "13.15.0",
     "react-native-worklets": "0.5.1",
     "swr": "^2.2.5",
     "tailwind-merge": "^2.3.0",
     "text-encoding": "^0.7.0",
-    "toastify-react-native": "^7.2.3",
     "yarn": "^1.22.22",
     "zustand": "^5.0.6"
   },

pages/Transaction.tsx

@@ -6,7 +6,7 @@ import { Link, useLocalSearchParams } from "expo-router";
 import { nip19 } from "nostr-tools";
 import React from "react";
 import { Pressable, ScrollView, TouchableOpacity, View } from "react-native";
-import { Toast } from "toastify-react-native";
+import Toast from "react-native-toast-message";
 import { LinkIcon } from "~/components/Icons";
 import AcceptedTransactionIcon from "~/components/icons/AcceptedTransaction";
 import FailedTransactionIcon from "~/components/icons/FailedTransaction";

pages/receive/Receive.tsx

@@ -2,7 +2,7 @@ import * as Clipboard from "expo-clipboard";
 import { router } from "expo-router";
 import React from "react";
 import { Share, TouchableOpacity, View } from "react-native";
-import { Toast } from "toastify-react-native";
+import Toast from "react-native-toast-message";
 import { CreateInvoice } from "~/components/CreateInvoice";
 import { AddressIcon, EditIcon, ScanIcon, ShareIcon } from "~/components/Icons";
 import RedeemIcon from "~/components/icons/RedeemIcon";

pages/send/LNURLPay.tsx

@@ -1,7 +1,7 @@
 import { router, useLocalSearchParams } from "expo-router";
 import React, { useEffect } from "react";
 import { View } from "react-native";
-import { Toast } from "toastify-react-native";
+import Toast from "react-native-toast-message";
 import DismissableKeyboardView from "~/components/DismissableKeyboardView";
 import { DualCurrencyInput } from "~/components/DualCurrencyInput";
 import Loading from "~/components/Loading";

pages/settings/FiatCurrency.tsx

@@ -1,7 +1,7 @@
 import { router } from "expo-router";
 import React, { useEffect, useState } from "react";
 import { FlatList, TouchableOpacity, View } from "react-native";
-import { Toast } from "toastify-react-native";
+import Toast from "react-native-toast-message";
 import { CountryFlag } from "~/components/Flag";
 import Loading from "~/components/Loading";
 import Screen from "~/components/Screen";