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.

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

chore: bump expo version #204

Merged
merged 8 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
"splash": {
"image": "./assets/splash.png",
"resizeMode": "cover",
"backgroundColor": "#0F0C40"
"backgroundColor": "#0B0930"
},
"newArchEnabled": true,
"assetBundlePatterns": ["**/*"],
"plugins": [
[
Expand Down
13 changes: 8 additions & 5 deletions app/_layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { Theme, ThemeProvider } from "@react-navigation/native";
import {
DarkTheme,
DefaultTheme,
Theme,
ThemeProvider,
} from "@react-navigation/native";
import { PortalHost } from "@rn-primitives/portal";
import * as Font from "expo-font";
import { Slot, SplashScreen } from "expo-router";
Expand All @@ -7,7 +12,6 @@ import { swrConfiguration } from "lib/swr";
import * as React from "react";
import { SafeAreaView } from "react-native";
import Toast from "react-native-toast-message";
import PolyfillCrypto from "react-native-webview-crypto";
import { SWRConfig } from "swr";
import { toastConfig } from "~/components/ToastConfig";
import { UserInactivityProvider } from "~/context/UserInactivity";
Expand All @@ -20,11 +24,11 @@ import { useAppStore } from "~/lib/state/appStore";
import { useColorScheme } from "~/lib/useColorScheme";

const LIGHT_THEME: Theme = {
dark: false,
...DefaultTheme,
colors: NAV_THEME.light,
};
const DARK_THEME: Theme = {
dark: true,
...DarkTheme,
colors: NAV_THEME.dark,
};

Expand Down Expand Up @@ -91,7 +95,6 @@ export default function RootLayout() {
<SWRConfig value={swrConfiguration}>
<ThemeProvider value={isDarkColorScheme ? DARK_THEME : LIGHT_THEME}>
<StatusBar style={isDarkColorScheme ? "light" : "dark"} />
<PolyfillCrypto />
<SafeAreaView className="w-full h-full bg-background">
<UserInactivityProvider>
<SessionProvider>
Expand Down
4 changes: 2 additions & 2 deletions components/Screen.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { HeaderButtonProps } from "@react-navigation/native-stack/src/types";
import { NativeStackHeaderRightProps } from "@react-navigation/native-stack/src/types";
import { Stack } from "expo-router";
import { StackAnimationTypes } from "react-native-screens";

type ScreenProps = {
title: string;
right?: (props: HeaderButtonProps) => React.ReactNode;
right?: (props: NativeStackHeaderRightProps) => React.ReactNode;
animation?: StackAnimationTypes;
};

Expand Down
1 change: 1 addition & 0 deletions lib/applyGlobalPolyfills.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import "message-port-polyfill";
import "react-native-get-random-values";
import "react-native-url-polyfill/auto";
const TextEncodingPolyfill = require("text-encoding");
Expand Down
58 changes: 28 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"test:ci": "jest"
},
"dependencies": {
"@getalby/lightning-tools": "^5.0.3",
"@getalby/sdk": "^3.7.1",
"@getalby/lightning-tools": "^5.1.0",
"@getalby/sdk": "^3.8.1",
"@react-native-async-storage/async-storage": "1.23.1",
"@rn-primitives/dialog": "^1.0.3",
"@rn-primitives/portal": "^1.0.3",
Expand All @@ -35,56 +35,54 @@
"buffer": "^6.0.3",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.10",
"expo": "~51.0.34",
"expo-camera": "~15.0.16",
"expo-clipboard": "~6.0.3",
"expo-constants": "~16.0.2",
"expo-font": "~12.0.10",
"expo-linear-gradient": "~13.0.2",
"expo-linking": "~6.3.1",
"expo-local-authentication": "~14.0.1",
"expo-router": "^3.5.23",
"expo-secure-store": "^13.0.2",
"expo-status-bar": "~1.12.1",
"lottie-react-native": "6.7.0",
"expo": "~52.0.14",
"expo-camera": "~16.0.8",
"expo-clipboard": "~7.0.0",
"expo-constants": "~17.0.3",
"expo-font": "~13.0.1",
"expo-linear-gradient": "~14.0.1",
"expo-linking": "~7.0.3",
"expo-local-authentication": "~15.0.1",
"expo-router": "~4.0.11",
"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.2.0",
"react-dom": "18.2.0",
"react-native": "0.74.5",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-native": "0.76.3",
"react-native-get-random-values": "^1.9.0",
"react-native-qrcode-svg": "^6.3.1",
"react-native-reanimated": "~3.10.1",
"react-native-safe-area-context": "4.10.5",
"react-native-screens": "3.31.1",
"react-native-svg": "15.2.0",
"react-native-reanimated": "~3.16.1",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "~4.1.0",
"react-native-svg": "15.8.0",
"react-native-toast-message": "^2.2.0",
"react-native-url-polyfill": "^2.0.0",
"react-native-webview": "13.8.6",
"react-native-webview-crypto": "^0.0.26",
"react-native-webview": "^13.12.2",
"swr": "^2.2.5",
"tailwind-merge": "^2.3.0",
"text-encoding": "^0.7.0",
"zustand": "^4.5.2"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/core": "^7.26.0",
"@babel/preset-typescript": "^7.24.7",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/react-native": "^12.7.2",
"@types/crypto-js": "^4.2.2",
"@types/jest": "^29.5.13",
"@types/react": "~18.2.45",
"@types/react": "~18.3.12",
"eslint": "^8.57.0",
"eslint-config-expo": "^7.1.2",
"eslint-config-expo": "~8.0.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"jest": "^29.7.0",
"jest-expo": "^51.0.4",
"jest-expo": "~52.0.2",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.3",
"typescript": "~5.3.3"
Expand Down
5 changes: 2 additions & 3 deletions pages/Transaction.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Nip47Transaction } from "@getalby/sdk/dist/NWCClient";
import Hex from "crypto-js/enc-hex";
import Utf8 from "crypto-js/enc-utf8";
import { hexToBytes } from "@noble/hashes/utils";
import dayjs from "dayjs";
import * as Clipboard from "expo-clipboard";
import { useLocalSearchParams } from "expo-router";
Expand Down Expand Up @@ -49,7 +48,7 @@ export function Transaction() {
)?.find((record) => record.type === 7629169);
if (tlvRecord) {
parsedBoostagram = JSON.parse(
Utf8.stringify(Hex.parse(tlvRecord.value)),
new TextDecoder().decode(hexToBytes(tlvRecord.value)),
);
}
} catch (e) {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"~/*": ["*"]
}
},
"include": ["**/*.ts", "**/*.tsx"]
"include": ["**/*.ts", "**/*.tsx", "nativewind-env.d.ts"]
}
Loading
Loading