Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: screen header buttons #242

Merged
merged 2 commits into from
Dec 30, 2024
+21 −16
Merged

fix: screen header buttons #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eca2d15
fix: screen header right buttons
im-adithya Dec 30, 2024
f068acb
chore: add touchable opacity to show transactions button
im-adithya Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions pages/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,13 @@ export function Home() {
<Screen
title=""
right={() => (
<Link href="/settings" asChild>
<TouchableOpacity>
<SettingsIcon className="text-muted-foreground" />
</TouchableOpacity>
</Link>
<TouchableOpacity
onPressIn={() => {
router.push("/settings");
}}
>
<SettingsIcon className="text-muted-foreground" />
</TouchableOpacity>
)}
/>
<View className="h-full flex p-6">
Expand Down Expand Up @@ -145,12 +147,14 @@ export function Home() {
</View>
</ScrollView>
<View className="flex items-center justify-center">
<Link href="/transactions">
<ChevronUpIcon
className="text-muted-foreground"
width={32}
height={32}
/>
<Link href="/transactions" asChild>
<TouchableOpacity>
<ChevronUpIcon
className="text-muted-foreground"
width={32}
height={32}
/>
</TouchableOpacity>
</Link>
</View>
<View className="flex flex-row gap-6 mt-10">
Expand Down
2 changes: 1 addition & 1 deletion pages/Transactions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export function Transactions() {
animation="slide_from_bottom"
right={() => (
<Pressable
onPress={() => {
onPressIn={() => {
router.back();
}}
>
Expand Down
1 change: 1 addition & 0 deletions pages/send/PaymentSuccess.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { openURL } from "expo-linking";
import { router, useLocalSearchParams } from "expo-router";
import { LNURLPaymentSuccessAction } from "lib/lnurl";
import React from "react";
import { ScrollView, View } from "react-native";
import { Tick } from "~/animations/Tick";
import { Receiver } from "~/components/Receiver";
Expand Down
8 changes: 4 additions & 4 deletions pages/settings/wallets/SetupWallet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as Clipboard from "expo-clipboard";
import { router, useLocalSearchParams } from "expo-router";
import { useAppStore } from "lib/state/appStore";
import React from "react";
import { Pressable, TouchableOpacity, View } from "react-native";
import { TouchableOpacity, View } from "react-native";
import Toast from "react-native-toast-message";
import Alert from "~/components/Alert";
import DismissableKeyboardView from "~/components/DismissableKeyboardView";
Expand Down Expand Up @@ -153,8 +153,8 @@ export function SetupWallet() {
title="Setup Wallet Connection"
right={() =>
walletIdWithConnection !== -1 ? (
<Pressable
onPress={() => {
<TouchableOpacity
onPressIn={() => {
useAppStore
.getState()
.setSelectedWalletId(walletIdWithConnection);
Expand All @@ -165,7 +165,7 @@ export function SetupWallet() {
}}
>
<XIcon className="text-foreground" />
</Pressable>
</TouchableOpacity>
) : (
<Dialog>
<DialogTrigger asChild>
Expand Down
Loading