Merge pull request #3 from zkdice-xyz/dev

fix build issues
strkfarm · Mar 31, 2024 · c3fdc60 · c3fdc60
2 parents 43a5f29 + 24a9e72
commit c3fdc60
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/next.config.mjs b/next.config.mjs
@@ -6,14 +6,14 @@ const nextConfig = {
             exclude: ['error', 'warn'],
         },
     },
-    async rewrites() {
-        return [
-          {
-            source: '/rpc-api',
-            destination: 'https://rpc.nethermind.io/mainnet-juno?apikey=t1HPjhplOyEQpxqVMhpwLGuwmOlbXN0XivWUiPAxIBs0kHVK',
-          },
-        ]
-    },
+    // async rewrites() {
+    //     return [
+    //       {
+    //         source: '/rpc-api',
+    //         destination: 'https://rpc.nethermind.io/mainnet-juno?apikey=t1HPjhplOyEQpxqVMhpwLGuwmOlbXN0XivWUiPAxIBs0kHVK',
+    //       },
+    //     ]
+    // },
 };
 
 export default nextConfig;
diff --git a/src/app/strategy/page.tsx b/src/app/strategy/page.tsx
@@ -43,6 +43,8 @@ export default function Strategy() {
     mixpanel.track('Strategy page open', {name: searchParams.get('name')})
   }, [])
 
+  const colSpan1: any = {base: '5', md: '3'}
+  const colSpan2: any = {base: '5', md: '2'}
   return (
     <Container maxWidth={'1000px'} margin={'0 auto'} padding='30px 10px' fontFamily={"sans-serif"}>
         <Flex marginBottom={'10px'}>
@@ -51,7 +53,7 @@ export default function Strategy() {
         </Flex>
         {strategy && <VStack width={'100%'}>
           <Grid width={'100%'} templateColumns='repeat(5, 1fr)' gap={2}>
-            <GridItem display='flex' colSpan={{base: '5', md: '3'}}>
+            <GridItem display='flex' colSpan={colSpan1}>
               <Card width='100%' padding={'15px'} color='white' bg='highlight'>
                 <Box display={{base: 'block', md: 'flex'}}>
                   <Box width={{base: '100%', md: '70%'}} float={'left'}>
@@ -79,7 +81,7 @@ export default function Strategy() {
                 </Box>
               </Card>
             </GridItem>
-            <GridItem display='flex' colSpan={{base: '5', md: '2'}}>
+            <GridItem display='flex' colSpan={colSpan2}>
               <Card width='100%' padding={'15px'} color='white' bg='highlight'>
               <Tabs position="relative" variant='unstyled' width={'100%'}>
                 <TabList>

diff --git a/src/app/template.tsx b/src/app/template.tsx
@@ -98,7 +98,7 @@ export default function Template({ children }: { children: React.ReactNode }) {
     const chains = [sepolia];
     const provider = jsonRpcProvider({
       rpc: (chain) => {
-        let args: RpcProviderOptions = {nodeUrl: 'http://localhost:3000/rpc-api', chainId: constants.StarknetChainId.SN_MAIN };
+        let args: RpcProviderOptions = {nodeUrl: 'https://rpc.nethermind.io/mainnet-juno?apikey=t1HPjhplOyEQpxqVMhpwLGuwmOlbXN0XivWUiPAxIBs0kHVK', chainId: constants.StarknetChainId.SN_MAIN };
         return args;
       }
     });

diff --git a/src/components/Deposit.tsx b/src/components/Deposit.tsx
@@ -36,8 +36,8 @@ export default function Deposit(props: DepositProps) {
         console.log('hookkkAmount', amount.toEtherStr(), calls)
     }, [amount, calls])
 
-    function getBalanceComponent(token: TokenInfo) {
-        const { balance, isLoading, isError} = useERC20Balance(token); 
+    function BalanceComponent(props: {token: TokenInfo}) {
+        const { balance, isLoading, isError} = useERC20Balance(props.token); 
         return <Box color={'light_grey'} textAlign={'right'}>
             <Text>Available balance: </Text>
             <LoadingWrap isLoading={isLoading} isError={isError} 
@@ -49,7 +49,7 @@ export default function Deposit(props: DepositProps) {
                     boxSize: '15px'
                 }}
             >
-                <b style={{marginLeft: '5px'}}>{balance.toEtherToFixedDecimals(token.displayDecimals)}</b>
+                <b style={{marginLeft: '5px'}}>{balance.toEtherToFixedDecimals(props.token.displayDecimals)}</b>
             </LoadingWrap>
         </Box>
     }
@@ -77,7 +77,7 @@ export default function Deposit(props: DepositProps) {
                 </Menu>
             </GridItem>
             <GridItem colSpan={3}>
-                {getBalanceComponent(selectedMarket)}
+                <BalanceComponent token={selectedMarket}/>
             </GridItem>
         </Grid>
 

diff --git a/src/strategies/simple.stable.strat.ts b/src/strategies/simple.stable.strat.ts
@@ -27,7 +27,7 @@ export class SimpleStableStrategy extends IStrategy {
 
     constructor() {
         const rewardTokens = [{logo: CONSTANTS.LOGOS.STRK}, {logo: CONSTANTS.LOGOS.USDC}, {logo: CONSTANTS.LOGOS.USDT}];
-        super('SSStrt', "Loop stable-coins to maximize yield", rewardTokens);
+        super('SSStrt', "Loop stable-coins to maximize yield", rewardTokens, []);
 
         this.steps = [{
             name: "Deposit to best pool",