Merge pull request #72 from novasamatech/fix/gift-claim

Fix: gift claim

src/common/chainRegistry/ConnectionProvider.ts

@@ -1,6 +1,6 @@
+import { useRef, useState } from 'react';
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { ProviderInterface } from '@polkadot/rpc-provider/types';
-import { useRef, useState } from 'react';
 
 import {
   ConnectionRequest,

src/common/providers/telegramProvider.tsx

@@ -19,7 +19,6 @@ export const TelegramProvider = ({ children }: PropsWithChildren) => {
       app.ready();
       setWebApp(app);
       app.setHeaderColor('#f2f2f7');
-      app.enableClosingConfirmation();
       app.expand();
     }
   }, []);

src/common/telegram/useMainButton.ts

@@ -25,6 +25,7 @@ export const useMainButton = () => {
   const addMainButton = useCallback(
     (event: VoidFunction, text: string = 'Continue') => {
       reset();
+      window?.Telegram?.WebApp?.enableClosingConfirmation();
 
       mainButton.setText(text);
       mainButton.show();
@@ -36,6 +37,7 @@ export const useMainButton = () => {
 
   const hideMainButton = useCallback(() => {
     mainButton.hide();
+    window?.Telegram?.WebApp?.disableClosingConfirmation();
     reset();
   }, []);
 

src/common/utils/gift.ts

@@ -33,6 +33,7 @@ export const getGiftInfo = async (
   getAssetBySymbol: (symbol: string) => Promise<ChainAsset>,
 ): Promise<{ chainAddress: string; chain: ChainAsset; giftAddress: string; keyring: KeyringPair }> => {
   const [seed, symbol] = (startParam as string).split('_');
+
   const chain = await getAssetBySymbol(symbol);
   const chainAddress = encodeAddress(publicKey as string, chain.chain.addressPrefix);
   const keyring = getKeyringPairFromSeed(seed);

src/pages/_app.tsx

@@ -3,6 +3,7 @@ import { NextPage } from 'next';
 import Head from 'next/head';
 import { ReactElement, ReactNode, useEffect, useState } from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
+import { cryptoWaitReady } from '@polkadot/util-crypto';
 import { NextUIProvider } from '@nextui-org/react';
 import { Manrope } from 'next/font/google';
 
@@ -25,7 +26,9 @@ type AppPropsWithLayout = AppProps & {
 
 const App = ({ Component, pageProps }: AppPropsWithLayout) => {
   const [render, setRender] = useState(false);
-  useEffect(() => setRender(true), []);
+  useEffect(() => {
+    cryptoWaitReady().then(() => setRender(true));
+  }, []);
   const getLayout = Component.getLayout || ((page) => page);
 
   return (

src/screens/gifts/GiftPage.tsx

@@ -24,7 +24,7 @@ export default function GiftPage() {
     BackButton?.show();
     hideMainButton();
 
-    const callback = async () => {
+    const callback = () => {
       navigate(Paths.DASHBOARD);
     };
     BackButton?.onClick(callback);