forked from cerc-io/laconic-wallet
Fix spinner not showing up on starting wallet (#102)
* Fix spinner not showing up on starting wallet * Remove unnecessary dependancies
This commit is contained in:
parent
670d6f4a54
commit
e98dac7a5b
@ -75,7 +75,7 @@ const App = (): React.JSX.Element => {
|
|||||||
case NETWORK_METHODS.GET_NETWORKS:
|
case NETWORK_METHODS.GET_NETWORKS:
|
||||||
const retrievedNetworks = await retrieveNetworksData();
|
const retrievedNetworks = await retrieveNetworksData();
|
||||||
const currentNetworkId = networksData.find(
|
const currentNetworkId = networksData.find(
|
||||||
networkData => networkData.networkId === selectedNetwork.networkId,
|
networkData => networkData.networkId === selectedNetwork!.networkId,
|
||||||
)?.networkId;
|
)?.networkId;
|
||||||
|
|
||||||
const formattedResponse = formatJsonRpcResult(id, {
|
const formattedResponse = formatJsonRpcResult(id, {
|
||||||
|
@ -54,7 +54,7 @@ const Accounts = ({ currentIndex, updateIndex }: AccountsProps) => {
|
|||||||
optionalNamespaces,
|
optionalNamespaces,
|
||||||
requiredNamespaces,
|
requiredNamespaces,
|
||||||
networksData,
|
networksData,
|
||||||
selectedNetwork,
|
selectedNetwork!,
|
||||||
accounts,
|
accounts,
|
||||||
currentIndex,
|
currentIndex,
|
||||||
);
|
);
|
||||||
@ -145,7 +145,7 @@ const Accounts = ({ currentIndex, updateIndex }: AccountsProps) => {
|
|||||||
mode="contained"
|
mode="contained"
|
||||||
onPress={() => {
|
onPress={() => {
|
||||||
setHdDialog(true);
|
setHdDialog(true);
|
||||||
setPathCode(`m/44'/${selectedNetwork.coinType}'/`);
|
setPathCode(`m/44'/${selectedNetwork!.coinType}'/`);
|
||||||
}}>
|
}}>
|
||||||
Add Account from HD path
|
Add Account from HD path
|
||||||
</Button>
|
</Button>
|
||||||
|
@ -20,7 +20,7 @@ const NetworkDropdown = ({ updateNetwork }: NetworkDropdownProps) => {
|
|||||||
return (
|
return (
|
||||||
<View style={styles.networkDropdown}>
|
<View style={styles.networkDropdown}>
|
||||||
<List.Accordion
|
<List.Accordion
|
||||||
title={selectedNetwork.networkName}
|
title={selectedNetwork!.networkName}
|
||||||
expanded={expanded}
|
expanded={expanded}
|
||||||
onPress={() => setExpanded(!expanded)}>
|
onPress={() => setExpanded(!expanded)}>
|
||||||
{networksData.map(networkData => (
|
{networksData.map(networkData => (
|
||||||
|
@ -100,7 +100,7 @@ const PairingModal = ({
|
|||||||
optionalNamespaces,
|
optionalNamespaces,
|
||||||
requiredNamespaces,
|
requiredNamespaces,
|
||||||
networksData,
|
networksData,
|
||||||
selectedNetwork,
|
selectedNetwork!,
|
||||||
accounts,
|
accounts,
|
||||||
currentIndex,
|
currentIndex,
|
||||||
);
|
);
|
||||||
|
@ -11,8 +11,10 @@ const NetworksContext = createContext<{
|
|||||||
setNetworksData: React.Dispatch<React.SetStateAction<NetworksDataState[]>>;
|
setNetworksData: React.Dispatch<React.SetStateAction<NetworksDataState[]>>;
|
||||||
networkType: string;
|
networkType: string;
|
||||||
setNetworkType: (networkType: string) => void;
|
setNetworkType: (networkType: string) => void;
|
||||||
selectedNetwork: NetworksDataState;
|
selectedNetwork?: NetworksDataState;
|
||||||
setSelectedNetwork: React.Dispatch<React.SetStateAction<NetworksDataState>>;
|
setSelectedNetwork: React.Dispatch<
|
||||||
|
React.SetStateAction<NetworksDataState | undefined>
|
||||||
|
>;
|
||||||
}>({
|
}>({
|
||||||
currentIndex: 0,
|
currentIndex: 0,
|
||||||
setCurrentIndex: () => {},
|
setCurrentIndex: () => {},
|
||||||
@ -33,9 +35,7 @@ const NetworksProvider = ({ children }: { children: any }) => {
|
|||||||
const [networksData, setNetworksData] = useState<NetworksDataState[]>([]);
|
const [networksData, setNetworksData] = useState<NetworksDataState[]>([]);
|
||||||
const [currentIndex, setCurrentIndex] = useState<number>(0);
|
const [currentIndex, setCurrentIndex] = useState<number>(0);
|
||||||
const [networkType, setNetworkType] = useState<string>(EIP155);
|
const [networkType, setNetworkType] = useState<string>(EIP155);
|
||||||
const [selectedNetwork, setSelectedNetwork] = useState<NetworksDataState>(
|
const [selectedNetwork, setSelectedNetwork] = useState<NetworksDataState>();
|
||||||
{} as NetworksDataState,
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchData = async () => {
|
const fetchData = async () => {
|
||||||
|
@ -85,7 +85,7 @@ const AddNetwork = () => {
|
|||||||
setValue('networkName', ethChainDetails.name);
|
setValue('networkName', ethChainDetails.name);
|
||||||
setValue('rpcUrl', ethChainDetails.rpc[0]);
|
setValue('rpcUrl', ethChainDetails.rpc[0]);
|
||||||
setValue('blockExplorerUrl', ethChainDetails.explorers?.[0].url || '');
|
setValue('blockExplorerUrl', ethChainDetails.explorers?.[0].url || '');
|
||||||
setValue('coinType', String(ethChainDetails.slip44));
|
setValue('coinType', String(ethChainDetails.slip44 ?? '60'));
|
||||||
setValue('currencySymbol', ethChainDetails.nativeCurrency.symbol);
|
setValue('currencySymbol', ethChainDetails.nativeCurrency.symbol);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -99,7 +99,7 @@ const AddNetwork = () => {
|
|||||||
setValue('rpcUrl', cosmosChainDetails.apis?.rpc?.[0]?.address || '');
|
setValue('rpcUrl', cosmosChainDetails.apis?.rpc?.[0]?.address || '');
|
||||||
setValue('blockExplorerUrl', cosmosChainDetails.explorers?.[0].url || '');
|
setValue('blockExplorerUrl', cosmosChainDetails.explorers?.[0].url || '');
|
||||||
setValue('addressPrefix', cosmosChainDetails.bech32_prefix);
|
setValue('addressPrefix', cosmosChainDetails.bech32_prefix);
|
||||||
setValue('coinType', String(cosmosChainDetails.slip44));
|
setValue('coinType', String(cosmosChainDetails.slip44 ?? '118'));
|
||||||
setValue('nativeDenom', cosmosChainDetails.fees?.fee_tokens[0].denom || '');
|
setValue('nativeDenom', cosmosChainDetails.fees?.fee_tokens[0].denom || '');
|
||||||
}, CHAINID_DEBOUNCE_DELAY);
|
}, CHAINID_DEBOUNCE_DELAY);
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ import { useNetworks } from '../context/NetworksContext';
|
|||||||
type SignRequestProps = NativeStackScreenProps<StackParamsList, 'SignRequest'>;
|
type SignRequestProps = NativeStackScreenProps<StackParamsList, 'SignRequest'>;
|
||||||
|
|
||||||
const SignRequest = ({ route }: SignRequestProps) => {
|
const SignRequest = ({ route }: SignRequestProps) => {
|
||||||
const { networksData, selectedNetwork } = useNetworks();
|
const { networksData } = useNetworks();
|
||||||
|
|
||||||
const requestSession = route.params.requestSessionData;
|
const requestSession = route.params.requestSessionData;
|
||||||
const requestName = requestSession?.peer?.metadata?.name;
|
const requestName = requestSession?.peer?.metadata?.name;
|
||||||
@ -146,7 +146,7 @@ const SignRequest = ({ route }: SignRequestProps) => {
|
|||||||
route.params.address,
|
route.params.address,
|
||||||
route.params.message,
|
route.params.message,
|
||||||
);
|
);
|
||||||
}, [retrieveData, sanitizePath, route, networksData, selectedNetwork]);
|
}, [retrieveData, sanitizePath, route, networksData]);
|
||||||
|
|
||||||
const handleWalletConnectRequest = async () => {
|
const handleWalletConnectRequest = async () => {
|
||||||
const { requestEvent } = route.params || {};
|
const { requestEvent } = route.params || {};
|
||||||
|
Loading…
Reference in New Issue
Block a user