Lightning start + Fix UI and hooks launchpad + redeploy launchpad (#48)

* add lightning view + polyfills * sidebar mainstack fix * fix hook buy and sell + redeploy launchpad * fix user card in feed to not appear * add comment in used input for calculation of buy/sell * fix typo
AFK-AlignedFamKernel · Aug 22, 2024 · 2ce3030 · 2ce3030
1 parent de78fee
commit 2ce3030
Show file tree

Hide file tree

Showing 23 changed files with 512 additions and 116 deletions.
diff --git a/apps/mobile/applyGlobalPolyfills.ts b/apps/mobile/applyGlobalPolyfills.ts
@@ -0,0 +1,13 @@
+
+const TextEncodingPolyfill = require("text-encoding");
+import "react-native-url-polyfill/auto";
+import "react-native-get-random-values";
+
+const applyGlobalPolyfills = () => {
+  Object.assign(global, {
+    TextEncoder: TextEncodingPolyfill.TextEncoder,
+    TextDecoder: TextEncodingPolyfill.TextDecoder,
+  });
+};
+
+applyGlobalPolyfills();
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
@@ -83,7 +83,13 @@
     "starknet": "6.9.0",
     "starknetkit": "^1.1.9",
     "zustand": "^4.5.2",
-    "common":"workspace:*"
+    "common":"workspace:*",
+    "@getalby/lightning-tools": "^5.0.3",
+    "@getalby/bitcoin-connect-react": "^3.5.3",
+    "@getalby/sdk": "^3.6.1",
+    "react-native-webview-crypto": "^0.0.25",
+    "text-encoding": "^0.7.0",
+    "@webbtc/webln-types": "^2.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

diff --git a/apps/mobile/src/app/Router.tsx b/apps/mobile/src/app/Router.tsx
@@ -30,6 +30,7 @@ import {Profile} from '../screens/Profile';
 import {Search} from '../screens/Search';
 import {Settings} from '../screens/Settings';
 import {Tips} from '../screens/Tips';
+import {LightningNetworkScreen} from '../screens/Lightning';
 import {ThemedStyleSheet} from '../styles';
 import {AuthStackParams, HomeBottomStackParams, MainStackParams, RootStackParams} from '../types';
 import {retrievePublicKey} from '../utils/storage';
@@ -193,7 +194,7 @@ const AuthNavigator: React.FC = () => {
         overlayColor: isDesktop ? 'transparent' : theme.theme.colors.background, // Make sure overlay settings are correct
         // swipeEdgeWidth: 0
         drawerStyle: {
-          width: '25%', // Adjust width or other styling as necessary
+          width: '20%', // Adjust width or other styling as necessary
         },
       })}
     >
@@ -230,7 +231,9 @@ const MainNavigator: React.FC = () => {
         overlayColor: isDesktop ? 'transparent' : theme.theme.colors.background, // Make sure overlay settings are correct
         // swipeEdgeWidth: 0
         drawerStyle: {
-          width: 200, // Adjust width or other styling as necessary
+          // maxWidth:270,
+          // width: '15%', // Adjust width or other styling as necessary
+          width: 250, // Adjust width or other styling as necessary
         },
       })}
     >
@@ -255,6 +258,7 @@ const MainNavigator: React.FC = () => {
       <DrawerStack.Screen name="LaunchDetail" component={LaunchDetail} />
       <DrawerStack.Screen name="Auth" component={AuthNavigator} />
       <DrawerStack.Screen name="Login" component={Login} />
+      <DrawerStack.Screen name="Lightning" component={LightningNetworkScreen} />
     </DrawerStack.Navigator>
   );
 };

diff --git a/apps/mobile/src/hooks/launchpad/useBuyCoinByQuoteAmount.ts b/apps/mobile/src/hooks/launchpad/useBuyCoinByQuoteAmount.ts
@@ -1,16 +1,16 @@
-import {useNetwork} from '@starknet-react/core';
+import { useNetwork } from '@starknet-react/core';
 // import { LAUNCHPAD_ADDRESS} from '../../constants/contracts';
-import {LAUNCHPAD_ADDRESS} from 'common';
-import {AccountInterface, CallData, constants, RpcProvider} from 'starknet';
+import { LAUNCHPAD_ADDRESS } from 'common';
+import { AccountInterface, CallData, constants, RpcProvider } from 'starknet';
 
-import {TokenQuoteBuyKeys} from '../../types/keys';
-import {feltToAddress, formatFloatToUint256} from '../../utils/format';
-import {prepareAndConnectContract} from './useDataCoins';
+import { TokenQuoteBuyKeys } from '../../types/keys';
+import { feltToAddress, formatFloatToUint256 } from '../../utils/format';
+import { prepareAndConnectContract , prepareTokenAndConnectContract} from '../../utils/starknet';
 
 export const useBuyCoinByQuoteAmount = () => {
   const chain = useNetwork();
   const chainId = chain?.chain?.id;
-  const provider = new RpcProvider({nodeUrl: process.env.EXPO_PUBLIC_PROVIDER_URL});
+  const provider = new RpcProvider({ nodeUrl: process.env.EXPO_PUBLIC_PROVIDER_URL });
   const handleBuyCoins = async (
     account: AccountInterface,
     coin_address: string,
@@ -24,15 +24,17 @@ export const useBuyCoinByQuoteAmount = () => {
       contractAddress ?? LAUNCHPAD_ADDRESS[constants.StarknetChainId.SN_SEPOLIA];
     console.log('addressContract', addressContract);
     console.log('read asset');
-    const asset = await prepareAndConnectContract(
-      provider,
-      feltToAddress(BigInt(tokenQuote?.token_address)),
-      // tokenQuote?.token_address?.toString(),
-      account,
-    );
-    console.log('read launchpad_contract');
+    console.log(' feltToAddress(BigInt(tokenQuote?.token_address)', feltToAddress(BigInt(tokenQuote?.token_address)));
+    // const asset = await prepareAndConnectContract(
+    //   provider,
+    //   feltToAddress(BigInt(tokenQuote?.token_address)),
+    //   // tokenQuote?.token_address?.toString(),
+    //   account,
+    // );
+    // console.log('read launchpad_contract');
 
-    const launchpad_contract = await prepareAndConnectContract(provider, addressContract);
+    const quote_address_token=feltToAddress(BigInt(tokenQuote?.token_address));
+    // const launchpad_contract = await prepareAndConnectContract(provider, addressContract);
     // const launchpad_contract = await prepareAndConnectContract(provider, addressContract, account);
 
     console.log('amount', amount);
@@ -47,7 +49,7 @@ export const useBuyCoinByQuoteAmount = () => {
     console.log('buyCoinParams', buyCoinParams);
 
     const approveCall = {
-      contractAddress: asset?.address,
+      contractAddress: quote_address_token,
       entrypoint: 'approve',
       calldata: CallData.compile({
         address: addressContract,
@@ -69,5 +71,5 @@ export const useBuyCoinByQuoteAmount = () => {
     const wait_tx = await account?.waitForTransaction(tx?.transaction_hash);
   };
 
-  return {handleBuyCoins};
+  return { handleBuyCoins };
 };
diff --git a/apps/mobile/src/hooks/launchpad/useDataCoins.ts b/apps/mobile/src/hooks/launchpad/useDataCoins.ts
@@ -4,6 +4,8 @@ import {LAUNCHPAD_ADDRESS} from 'common';
 import {AccountInterface, constants, Contract, ProviderInterface, RpcProvider} from 'starknet';
 
 import {CHAIN_ID} from '../../constants/env';
+
+
 /** @TODO determine paymaster master specs to send the TX */
 export const prepareAndConnectContract = async (
   provider: ProviderInterface,
@@ -16,15 +18,16 @@ export const prepareAndConnectContract = async (
 
   const {abi: testAbi} = await provider.getClassAt(contractAddress);
   if (testAbi === undefined) {
+    console.log("no abi")
     throw new Error('no abi.');
   }
   const contract = new Contract(testAbi, contractAddress, provider);
   console.log('contract', contract);
 
-  // Connect account with the contract
-  if (account) {
-    contract.connect(account);
-  }
+  // // Connect account with the contract
+  // if (account) {
+  //   contract.connect(account);
+  // }
   return contract;
 };
 

diff --git a/apps/mobile/src/hooks/launchpad/useSellCoin.ts b/apps/mobile/src/hooks/launchpad/useSellCoin.ts
@@ -10,7 +10,6 @@ export const useSellCoin = () => {
   const chain = useNetwork();
   const rpcProvider = useProvider();
   const chainId = chain?.chain?.id;
-  // const provider = rpcProvider?.provider ?? new RpcProvider();
   const provider = rpcProvider?.provider ?? new RpcProvider();
 
   const handleSellCoins = async (
@@ -30,7 +29,7 @@ export const useSellCoin = () => {
     // );
 
     let amountUint256 = formatFloatToUint256(amount);
-    amountUint256 = uint256.bnToUint256(BigInt('0x' + amount));
+    // amountUint256 = uint256.bnToUint256(BigInt('0x' + amount));
 
     const sellKeysParams = {
       user_address, // token address

diff --git a/apps/mobile/src/modules/Layout/auth-sidebar/index.tsx b/apps/mobile/src/modules/Layout/auth-sidebar/index.tsx
@@ -28,7 +28,7 @@ const AuthSidebar = ({navigation}: SidebarInterface) => {
 
       <View style={styles.container}>
         <Text style={styles.textItem}>Connect or create an Account</Text>
-        <Text style={styles.textItem}>Acces the AFK app</Text>
+        <Text style={styles.textItem}>Access the AFK app</Text>
       </View>
 
       <View style={styles.container}>

diff --git a/apps/mobile/src/modules/Layout/sidebar/index.tsx b/apps/mobile/src/modules/Layout/sidebar/index.tsx
@@ -1,10 +1,10 @@
 // import { useAuth } from '../../../store/auth';
 import {useAuth, useNostrContext} from 'afk_nostr_sdk';
-import React, {useEffect} from 'react';
+import React, {useEffect, useMemo} from 'react';
 import {Pressable, Text, View} from 'react-native';
 
 import {Icon} from '../../../components/Icon';
-import {useStyles, useTheme} from '../../../hooks';
+import {useStyles, useTheme, useWindowDimensions} from '../../../hooks';
 import stylesheet from './styles';
 
 interface SidebarInterface {
@@ -49,6 +49,15 @@ const Sidebar = ({navigation}: SidebarInterface) => {
     return unsubscribe;
   }, [navigation]);
 
+  const dimensions = useWindowDimensions();
+  const isDesktop = useMemo(() => {
+    return dimensions.width >= 1024;
+  }, [dimensions]); // Adjust based on your breakpoint for desktop
+
+  // if(!isDesktop) {
+  //   return;
+  // }
+
   return (
     <View style={styles.sidebar}>
       <Text style={styles.sidebarText}>AFK</Text>
@@ -90,8 +99,8 @@ const Sidebar = ({navigation}: SidebarInterface) => {
       </Pressable>
 
       <Pressable onPress={handleDefiScreen} style={styles.item}>
-        <Icon name="CoinIcon" size={24} />
-        <Text style={styles.textItem}>Onramp & DeFI</Text>
+        <Icon name="CoinIcon" size={24} style={{backgroundColor: theme.theme.colors.background}} />
+        <Text style={styles.textItem}>DeFi</Text>
       </Pressable>
 
       {publicKey && (