Applying Code Review

JoyboyCommunity/src/app/App.tsx

@@ -1,12 +1,14 @@
 import '@walletconnect/react-native-compat';
 
+import {starknetChainId, useNetwork} from '@starknet-react/core';
 import * as Font from 'expo-font';
 import * as SplashScreen from 'expo-splash-screen';
 import {useCallback, useEffect, useState} from 'react';
 import {View} from 'react-native';
 
+import {CHAIN_ID} from '../constants/env';
 import {useTips} from '../hooks';
-import {useToast} from '../hooks/modals';
+import {useDialog, useToast} from '../hooks/modals';
 import {Router} from './Router';
 
 SplashScreen.preventAutoHideAsync();
@@ -18,6 +20,28 @@ export default function App() {
  const tips = useTips();
  const {showToast} = useToast();
 
+ const {showDialog, hideDialog} = useDialog();
+
+ const {chain} = useNetwork();
+
+ useEffect(() => {
+ debugger;
+ const chainId = chain.id ? starknetChainId(chain.id) : undefined;
+
+ if (chainId) {
+ if (chainId !== CHAIN_ID) {
+ showDialog({
+ title: 'Wrong Network',
+ description:
+ 'Joyboy currently only supports the Starknet Sepolia network. Please switch to the Sepolia network to continue.',
+ buttons: [],
+ });
+ } else {
+ hideDialog();
+ }
+ }
+ }, [chain.id]);
+
  useEffect(() => {
  (async () => {
  try {

JoyboyCommunity/src/modules/TipModal/index.tsx

@@ -1,13 +1,12 @@
 import {NDKEvent} from '@nostr-dev-kit/ndk';
-import {mainnet, sepolia} from '@starknet-react/chains';
 import {useAccount} from '@starknet-react/core';
-import {forwardRef, useEffect, useState} from 'react';
+import {forwardRef, useState} from 'react';
 import {View} from 'react-native';
 import {CallData, uint256} from 'starknet';
 
 import {Avatar, Button, Input, Modalize, Picker, Text} from '../../components';
 import {ESCROW_ADDRESSES} from '../../constants/contracts';
-import {CHAIN_ID, NETWORK_NAME} from '../../constants/env';
+import {CHAIN_ID} from '../../constants/env';
 import {DEFAULT_TIMELOCK, Entrypoint} from '../../constants/misc';
 import {TOKENS, TokenSymbol} from '../../constants/tokens';
 import {useProfile, useStyles, useWaitConnection} from '../../hooks';
@@ -46,26 +45,6 @@ export const TipModal = forwardRef<Modalize, TipModalProps>(
 
  const {showDialog, hideDialog} = useDialog();
 
- useEffect(() => {
- const handleChainIdChange = () => {
- const chainId = account.chainId;
- const currentChainId = NETWORK_NAME === 'SN_MAIN' ? mainnet.id : sepolia.id;
-
- if (chainId === currentChainId) {
- hideDialog();
- } else if (chainId) {
- showDialog({
- title: 'Wrong Network',
- description:
- 'Joyboy currently only supports the Starknet Sepolia network. Please switch to the Sepolia network to continue.',
- buttons: [],
- });
- }
- };
-
- handleChainIdChange();
- }, [account.chainId, hideDialog, showDialog]);
-
  const isActive = !!amount && !!token;
 
  const onTipPress = async () => {