diff --git a/apps/mobile/app/(app)/(tabs)/settings.tsx b/apps/mobile/app/(app)/(tabs)/settings.tsx
index 35af9c25..71aa9188 100644
--- a/apps/mobile/app/(app)/(tabs)/settings.tsx
+++ b/apps/mobile/app/(app)/(tabs)/settings.tsx
@@ -82,7 +82,7 @@ export default function SettingsScreen() {
{t(i18n)`General`}
-
+
diff --git a/apps/mobile/components/auth/auth-social.tsx b/apps/mobile/components/auth/auth-social.tsx
index 80ca4fd8..9461f604 100644
--- a/apps/mobile/components/auth/auth-social.tsx
+++ b/apps/mobile/components/auth/auth-social.tsx
@@ -1,4 +1,4 @@
-import { useCreateUserMutation } from '@/mutations/user'
+import { createUser } from '@/mutations/user'
import { useOAuth } from '@clerk/clerk-expo'
import { t } from '@lingui/macro'
import { useLingui } from '@lingui/react'
@@ -16,7 +16,6 @@ type AuthSocialProps = {
export function AuthSocial({ label, icon: Icon, strategy }: AuthSocialProps) {
const { startOAuthFlow } = useOAuth({ strategy })
- const { mutateAsync: createUser } = useCreateUserMutation()
const onPress = async () => {
try {
@@ -25,10 +24,14 @@ export function AuthSocial({ label, icon: Icon, strategy }: AuthSocialProps) {
if (createdSessionId) {
setActive?.({ session: createdSessionId })
if (signUp?.createdUserId) {
- setTimeout(async () => await createUser({
- email: signUp.emailAddress!,
- name: signUp.firstName ?? '',
- }), 1000)
+ setTimeout(
+ async () =>
+ await createUser({
+ email: signUp.emailAddress!,
+ name: signUp.firstName ?? '',
+ }),
+ 1000,
+ )
}
} else {
// Use signIn or signUp for next steps such as MFA
diff --git a/apps/mobile/components/common/add-new-button.tsx b/apps/mobile/components/common/add-new-button.tsx
new file mode 100644
index 00000000..d3ff8593
--- /dev/null
+++ b/apps/mobile/components/common/add-new-button.tsx
@@ -0,0 +1,26 @@
+import { cn } from "@/lib/utils"
+import { PlusCircleIcon } from "lucide-react-native"
+import { Button } from "../ui/button"
+import { Text } from "../ui/text"
+
+type AddNewButtonProps = {
+ label: string
+ className?: string
+ onPress?: () => void
+}
+
+export function AddNewButton(
+ { label, className, onPress }: AddNewButtonProps,
+) {
+ return (
+
+ )
+}
\ No newline at end of file
diff --git a/apps/mobile/components/common/back-button.tsx b/apps/mobile/components/common/back-button.tsx
new file mode 100644
index 00000000..9d72bb18
--- /dev/null
+++ b/apps/mobile/components/common/back-button.tsx
@@ -0,0 +1,15 @@
+import { useRouter } from "expo-router";
+import { ArrowLeftIcon } from "lucide-react-native";
+import { Button } from "../ui/button";
+
+export function BackButton() {
+ const router = useRouter()
+ if (!router.canGoBack) {
+ return null
+ }
+ return (
+
+ )
+}
\ No newline at end of file
diff --git a/apps/mobile/components/common/currency-sheet.tsx b/apps/mobile/components/common/currency-sheet.tsx
new file mode 100644
index 00000000..6b216866
--- /dev/null
+++ b/apps/mobile/components/common/currency-sheet.tsx
@@ -0,0 +1,59 @@
+import { currencies } from "@6pm/currency";
+import { BottomSheetFlatList, BottomSheetTextInput } from "@gorhom/bottom-sheet";
+import { t } from "@lingui/macro";
+import { useLingui } from "@lingui/react";
+import { SearchIcon } from "lucide-react-native";
+import { useState } from "react";
+import { View } from "react-native";
+import { Text } from "../ui/text";
+import { MenuItem } from "./menu-item";
+
+type CurrencySheetListProps = {
+ onSelect: (currency: typeof currencies[number]) => void;
+ value: string;
+}
+
+export function CurrencySheetList({ onSelect, value }: CurrencySheetListProps) {
+ const { i18n } = useLingui()
+ const [searchValue, setSearchValue] = useState('')
+
+ const filteredCurrencies = currencies.filter((currency) => {
+ const search = searchValue.toLowerCase()
+ return currency.name.toLowerCase().includes(search) || currency.code.toLowerCase().includes(search)
+ })
+
+ return (
+ i.code}
+ contentContainerClassName="pb-8"
+ stickyHeaderIndices={[0]}
+ keyboardShouldPersistTaps="handled"
+ keyboardDismissMode="on-drag"
+ ListHeaderComponent={
+
+
+
+
+ }
+ renderItem={({ item }) => (
+