staging => main

.env.example

@@ -1,6 +1,7 @@
 EXPO_PUBLIC_BASE_RPC_URL=https://mainnet.base.org
 EXPO_PUBLIC_BUNDLER_RPC_URL=https://public.pimlico.io/v2/1/rpc
-EXPO_PUBLIC_API_URL=https://api.useliquid.xyz
+EXPO_PUBLIC_API_URL=https://development.useliquid.xyz
 EXPO_PUBLIC_API_KEY=
 EXPO_PUBLIC_PRIVY_APP_ID=
-EXPO_PUBLIC_PRIVY_CLIENT_ID=
+EXPO_PUBLIC_PRIVY_CLIENT_ID=
+EXPO_PUBLIC_PIMILCO_API_KEY=

README.md

@@ -11,7 +11,7 @@ This is an [Expo](https://expo.dev) project created with [`create-expo-app`](htt
 2. Install dependencies:
 
    ```bash
-   yarn i
+   yarn install
    ```
 
 3. Setup your `.env` file based on `.env.example`. Make sure you have a valid Liquid API key.

app.json

@@ -14,26 +14,22 @@
     },
     "ios": {
       "supportsTablet": true,
-      "bundleIdentifier": "com.liquid.supermigrate",
+      "bundleIdentifier": "xyz.useliquid.liquid",
       "buildNumber": "1",
       "infoPlist": {
         "NSFaceIDUsageDescription": "This app uses Face ID to sign in with Passkeys."
       },
       "config": {
         "usesNonExemptEncryption": false
       },
-      "associatedDomains": [
-        "webcredentials:api.useliquid.xyz?mode=developer",
-        "webcredentials:api.useliquid.xyz",
-        "webcredentials:development.useliquid.xyz"
-      ]
+      "associatedDomains": ["webcredentials:api.useliquid.xyz", "webcredentials:development.useliquid.xyz"]
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/images/liquid-adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
-      "package": "com.liquid.supermigrate"
+      "package": "xyz.useliquid.liquid"
     },
     "web": {
       "bundler": "metro",
@@ -70,4 +66,4 @@
     },
     "owner": "supermigrate"
   }
-}
+}

app/(liquidity-actions)/_layout.tsx

@@ -4,7 +4,7 @@ import { StatusBar } from 'expo-status-bar';
 const LiquidityActionsStack = () => {
   return (
     <>
-      <StatusBar style="inverted" />
+      <StatusBar style="dark" />
 
       <Stack screenOptions={{ headerShown: false }}>
         <Stack.Screen name="add" />

app/(onboarding)/_layout.tsx

@@ -1,5 +1,5 @@
 import { useState, useEffect, useRef } from 'react';
-import { StyleSheet, Dimensions, Platform, View, StatusBar as RNStatusBar } from 'react-native';
+import { StyleSheet, Dimensions, Platform, View, StatusBar as RNStatusBar, Pressable } from 'react-native';
 import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs';
 import { StatusBar } from 'expo-status-bar';
 
@@ -56,6 +56,17 @@ export default function OnboardingTabLayout() {
     }
   };
 
+  const navigateToPreviousScreen = () => {
+    switch (pathname) {
+      case '/step2':
+        router.push('/(onboarding)/step1');
+        break;
+      case '/step3':
+        router.push('/(onboarding)/step2');
+        break;
+    }
+  };
+
   useEffect(() => {
     if (!isPaused) {
       intervalRef.current = setInterval(() => {
@@ -86,7 +97,7 @@ export default function OnboardingTabLayout() {
 
   return (
     <>
-      <StatusBar style="light" />
+      <StatusBar style="dark" />
       <View style={styles.indicator}>
         <LQDOnboardingIndicator
           timer={timer}
@@ -130,6 +141,23 @@ export default function OnboardingTabLayout() {
         />
       </Tab.Navigator>
 
+      <Pressable
+        onPress={() => {
+          if (currentStep > 0) {
+            navigateToPreviousScreen();
+          }
+        }}
+        style={styles.prev}
+      />
+      <Pressable
+        onPress={() => {
+          if (currentStep < 2) {
+            navigateToNextScreen();
+          }
+        }}
+        style={styles.next}
+      />
+
       <View style={styles.action}>
         <LQDButton onPress={() => router.replace('/(signup)')} title="Let's go!" />
       </View>
@@ -155,4 +183,18 @@ const styles = StyleSheet.create({
     paddingBottom: Platform.OS === 'ios' ? 33 : 16,
     width: Dimensions.get('window').width,
   },
+  prev: {
+    flex: 1,
+    position: 'absolute',
+    height: Dimensions.get('window').height,
+    left: 0,
+    width: 65,
+  },
+  next: {
+    flex: 1,
+    position: 'absolute',
+    height: Dimensions.get('window').height,
+    right: 0,
+    width: 65,
+  },
 });

app/(onboarding)/step1.tsx

@@ -13,7 +13,7 @@ const Step1 = () => {
       firstArc={arc}
       secondArc={arc1}
       title="DeFi made easy"
-      subtitle="Deposit Liquidity on Aerodrome pools in 3 seconds"
+      subtitle="Earn more with your money, securely"
       containerStyle={{ backgroundColor: '#4691FE' }}
       imageStyle={{ left: 6 }}
       firstArcStyle={styles.firstArc}

app/(portfolio)/_layout.tsx

@@ -0,0 +1,24 @@
+import { Stack } from 'expo-router';
+import { LQDStackHeader } from '@/components';
+
+const PortfolioStack = () => {
+  return (
+    <Stack
+      screenOptions={{
+        header: (props) => <LQDStackHeader {...props} style={{ paddingTop: 34 }} />,
+        headerShown: true,
+      }}
+    >
+      <Stack.Screen
+        name="index"
+        options={{
+          header: (props) => <LQDStackHeader {...props} style={{ paddingTop: 60 }} hasTitle />,
+          headerShown: true,
+          headerTitle: 'Portfolio',
+        }}
+      />
+    </Stack>
+  );
+};
+
+export default PortfolioStack;

app/(portfolio)/index.tsx

@@ -0,0 +1,5 @@
+import { Portfolio } from '@/screens';
+
+const PortfolioScreen = () => <Portfolio />;
+
+export default PortfolioScreen;

app/(settings)/index.tsx

@@ -0,0 +1,7 @@
+import Settings from '@/screens/settings';
+
+const Settingscreen = () => {
+  return <Settings />;
+};
+
+export default Settingscreen;

app/(settings)/legal-privacy.tsx

@@ -0,0 +1,20 @@
+import { StyleSheet, Text, View } from 'react-native';
+
+const LegalAndPrivacy = () => {
+  return (
+    <View style={styles.container}>
+      <Text>Legal and Privacy</Text>
+    </View>
+  );
+};
+
+export default LegalAndPrivacy;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#fff',
+  },
+});

app/(settings)/support.tsx

@@ -0,0 +1,20 @@
+import { StyleSheet, Text, View } from 'react-native';
+
+const Support = () => {
+  return (
+    <View style={styles.container}>
+      <Text>Support</Text>
+    </View>
+  );
+};
+
+export default Support;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#fff',
+  },
+});

app/(strategy)/_layout.tsx

@@ -0,0 +1,41 @@
+import { Stack } from 'expo-router';
+import { LQDStackHeader } from '@/components';
+
+const StrategyStack = () => {
+  return (
+    <Stack
+      screenOptions={{
+        header: (props) => <LQDStackHeader {...props} style={{ paddingTop: 60 }} hasTitle />,
+        headerTitle: 'Create Strategy',
+      }}
+    >
+      <Stack.Screen
+        name="new-action-strategy"
+        options={{
+          header: (props) => <LQDStackHeader {...props} style={{ paddingTop: 60 }} hasTitle leftIcon="close" />,
+          headerTitle: 'New Action',
+          headerShown: true,
+          presentation: 'fullScreenModal',
+          animation: 'slide_from_bottom',
+        }}
+      />
+
+      <Stack.Screen
+        name="preview-strategy"
+        options={{
+          header: (props) => <LQDStackHeader {...props} style={{ paddingTop: 60 }} hasTitle />,
+          headerTitle: 'Preview and publish',
+          headerShown: true,
+        }}
+      />
+      <Stack.Screen
+        name="details"
+        options={{
+          headerShown: false,
+        }}
+      />
+    </Stack>
+  );
+};
+
+export default StrategyStack;

app/(strategy)/create-strategy.tsx

@@ -0,0 +1,5 @@
+import { CreateStrategy } from '@/screens';
+
+const CreateStrategyScreen = () => <CreateStrategy />;
+
+export default CreateStrategyScreen;

app/(strategy)/details/[id].tsx

@@ -0,0 +1,10 @@
+import { StrategyDetail } from '@/screens';
+import { useLocalSearchParams } from 'expo-router';
+
+const StrategyDetailScreen = () => {
+  const { id } = useLocalSearchParams();
+
+  return <StrategyDetail strategyId={id as string} />;
+};
+
+export default StrategyDetailScreen;

app/(strategy)/details/_layout.tsx

@@ -0,0 +1,19 @@
+import { Stack } from 'expo-router';
+
+import { LQDStackHeader } from '@/components';
+
+const StrategyDetailLayout = () => {
+  return (
+    <>
+      <Stack
+        screenOptions={{
+          header: (props) => <LQDStackHeader {...props} style={{ paddingTop: 60 }} hasTitle />,
+          headerTitle: 'Strategy',
+          headerShown: true,
+        }}
+      ></Stack>
+    </>
+  );
+};
+
+export default StrategyDetailLayout;

app/(strategy)/new-action-strategy.tsx

@@ -0,0 +1,5 @@
+import { NewActionStrategy } from '@/screens';
+
+const NewActionScreen = () => <NewActionStrategy />;
+
+export default NewActionScreen;

app/(strategy)/preview-strategy.tsx

@@ -0,0 +1,5 @@
+import { PreviewStrategy } from '@/screens';
+
+const PreviewStrategyScreen = () => <PreviewStrategy />;
+
+export default PreviewStrategyScreen;