ambrosus · EvgeniyJB · Dec 17, 2024 · Dec 16, 2024 · Dec 16, 2024 · Dec 17, 2024
diff --git a/app.config.js b/app.config.js
@@ -19,7 +19,7 @@ module.exports = {
       config: {
         usesNonExemptEncryption: false
       },
-      bundleIdentifier: 'io.test.airdao',
+      bundleIdentifier: 'io.airdao.app',
       googleServicesFile: './firebase/GoogleService-Info.plist',
       infoPlist: {
         UIBackgroundModes: ['fetch', 'remote-notification'],
@@ -37,13 +37,13 @@ module.exports = {
         foregroundImage: './assets/adaptive-icon.png',
         backgroundColor: '#ffffff'
       },
-      package: 'io.test.airdao',
+      package: 'io.airdao.app',
       permissions: [
         'android.permission.CAMERA',
         'android.permission.RECORD_AUDIO'
       ],
       playStoreUrl:
-        'https://play.google.com/store/apps/details?id=io.test.airdao.app',
+        'https://play.google.com/store/apps/details?id=io.airdao.app.app',
       googleServicesFile: './firebase/google-services.json'
     },
     notification: {

diff --git a/src/api/harbor/abi/harbor-unstake-log-abi.ts b/src/api/harbor/abi/harbor-unstake-log-abi.ts
@@ -0,0 +1,33 @@
+export const UNSTAKE_LOG_ABI = [
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: 'address',
+        name: 'account',
+        type: 'address'
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'amount',
+        type: 'uint256'
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'unlockTime',
+        type: 'uint256'
+      },
+      {
+        indexed: false,
+        internalType: 'uint256',
+        name: 'creationTime',
+        type: 'uint256'
+      }
+    ],
+    name: 'UnstakeLocked',
+    type: 'event'
+  }
+];
diff --git a/src/api/harbor/harbor-service.ts b/src/api/harbor/harbor-service.ts
@@ -4,6 +4,8 @@ import { RawRecord } from '@nozbe/watermelondb';
 import Config from '@constants/config';
 import { HARBOR_ABI } from '@api/harbor/abi/harbor';
 import { Cache, CacheKey } from '@lib/cache';
+import { UNSTAKE_LOG_ABI } from '@api/harbor/abi/harbor-unstake-log-abi';
+import { ILogs } from '@entities/harbor/model/types';
 
 function calculateAPR(interestNumber: number, interestPeriodNumber: number) {
   const r = interestNumber / 1000000000;
@@ -124,6 +126,62 @@ const getClaimAmount = async (address: string) => {
   }
 };
 
+const getWithdrawalRequests = async (address: string) => {
+  try {
+    const contract = new ethers.Contract(
+      Config.LIQUID_STAKING_ADDRESS,
+      UNSTAKE_LOG_ABI,
+      provider
+    );
+    const filter = contract.filters.UnstakeLocked(address);
+    const rawWithdrawalsList = await contract.queryFilter(filter);
+    const withdrawalsList: ILogs[] = [];
+
+    const formatData = (date: Date) =>
+      date
+        .toLocaleString('en-GB', {
+          day: '2-digit',
+          month: '2-digit',
+          year: 'numeric',
+          hour: '2-digit',
+          minute: '2-digit',
+          hour12: false
+        })
+        .replace(',', '');
+
+    for (let i = 0; i < rawWithdrawalsList.length; i++) {
+      const currEvent: any = rawWithdrawalsList[i];
+
+      const requestDateTime = new Date(
+        Number(currEvent.args.creationTime) * 1000
+      );
+      const formattedRequestDateTime = formatData(requestDateTime);
+
+      const unlockDateTime = new Date(Number(currEvent.args.unlockTime) * 1000);
+      const formattedUnlockDateTime = formatData(unlockDateTime);
+
+      const status = unlockDateTime < new Date() ? 'Success' : 'Pending';
+
+      const amount = BigNumber.from(currEvent.args.amount);
+
+      // add event to the beginning of the list to sort it from newest to oldest
+      withdrawalsList.unshift({
+        amount,
+        tokenAddress: currEvent.address,
+        requestData: formattedRequestDateTime,
+        unlockData: formattedUnlockDateTime,
+        status
+      });
+    }
+
+    return withdrawalsList.filter(
+      (item) => item.tokenAddress === Config.LIQUID_STAKING_ADDRESS
+    );
+  } catch (e) {
+    throw e;
+  }
+};
+
 const processStake = async (
   wallet: RawRecord | undefined,
   value: BigNumber
@@ -208,6 +266,7 @@ export const harborService = {
   getUnStakeLockTime,
   getTier,
   getClaimAmount,
+  getWithdrawalRequests,
   processStake,
   processWithdraw,
   processClaimReward

diff --git a/src/components/modular/AnimatedTabsV2/styles.ts b/src/components/modular/AnimatedTabsV2/styles.ts
@@ -13,7 +13,7 @@ export const styles = StyleSheet.create({
   tabHeader: {
     fontFamily: 'Inter_700Bold',
     color: COLORS.midnight,
-    fontSize: 16,
+    fontSize: scale(16),
     marginLeft: scale(8)
   },
   tabContainer: {

diff --git a/src/components/templates/InputWithoutTokenSelect/index.tsx b/src/components/templates/InputWithoutTokenSelect/index.tsx
@@ -159,7 +159,7 @@ export const InputWithoutTokenSelect = forwardRef<
         <View style={[styles.wrapper, inputError ? styles.errorWrap : {}]}>
           {label && (
             <Text
-              fontSize={14}
+              fontSize={scale(14)}
               fontFamily="Inter_500Medium"
               color={COLORS.neutral800}
             >
@@ -199,9 +199,9 @@ export const InputWithoutTokenSelect = forwardRef<
             </Pressable>
           </View>
           <Row justifyContent="space-between" alignItems="center">
-            <Text fontSize={12}>
+            <Text fontSize={scale(12)}>
               {t('common.balance')}:{' '}
-              <Text fontSize={12} color={COLORS.neutral900}>
+              <Text fontSize={scale(12)} color={COLORS.neutral900}>
                 {NumberUtils.formatNumber(
                   +NumberUtils.limitDecimalCount(
                     token.balance.formattedBalance,
@@ -215,15 +215,15 @@ export const InputWithoutTokenSelect = forwardRef<
               <Button style={styles.button} onPress={onPressMaxAmount}>
                 <Text
                   fontFamily="Inter_600SemiBold"
-                  fontSize={12}
+                  fontSize={scale(12)}
                   color={COLORS.brand600}
                 >
                   {t('bridge.preview.button.max')}
                 </Text>
               </Button>
             ) : (
               <View>
-                <Text fontSize={12} color={COLORS.error500}>
+                <Text fontSize={scale(12)} color={COLORS.error500}>
                   {inputError}
                 </Text>
               </View>
@@ -252,13 +252,13 @@ export const InputWithoutTokenSelect = forwardRef<
               <Row alignItems="center">
                 <TokenLogo token={exchange.token} />
                 <Spacer horizontal value={scale(8)} />
-                <Text fontSize={14} color={COLORS.neutral900}>
+                <Text fontSize={scale(14)} color={COLORS.neutral900}>
                   {exchange.token}
                 </Text>
               </Row>
               <Text
                 color={exchange.value ? COLORS.neutral900 : COLORS.neutral400}
-                fontSize={14}
+                fontSize={scale(14)}
               >
                 {+exchange?.value > 0 ? exchange.value : 0}
               </Text>

diff --git a/src/entities/harbor/model/harbor-store.ts b/src/entities/harbor/model/harbor-store.ts
@@ -9,11 +9,13 @@ import { harborService } from '@api/harbor/harbor-service';
 export const useHarborStore = create<HarborStoreModel>((set) => ({
   data: DEFAULT_DATA,
   loading: false,
+  withdrawListLoader: false,
   activeAmbTier: REWARD_TIERS_LIST.amb[0],
   activeBondTier: REWARD_TIERS_LIST.bond[2],
   bondAmount: '0',
   ambAmount: '0',
   claimAmount: BigNumber.from(0),
+  withdrawalList: [],
   getClaimAmount: async (address: string) => {
     set({ claimAmount: await harborService.getClaimAmount(address) });
   },
@@ -24,6 +26,18 @@ export const useHarborStore = create<HarborStoreModel>((set) => ({
   setActiveAmbTier: (activeAmbTier: TierRewardItem) => set({ activeAmbTier }),
   setActiveBondTier: (activeBondTier: TierRewardItem) =>
     set({ activeBondTier }),
+  updateWithdrawList: async (address: string) => {
+    try {
+      set({ withdrawListLoader: true });
+      const withdrawalList = await harborService.getWithdrawalRequests(address);
+      set({ withdrawalList });
+    } finally {
+      set({ withdrawListLoader: false });
+    }
+  },
+  clearWithdrawList: async () => {
+    set({ withdrawalList: [] });
+  },
   updateAll: async (address: string) => {
     try {
       set({ loading: true });

diff --git a/src/entities/harbor/model/types.ts b/src/entities/harbor/model/types.ts
@@ -28,13 +28,24 @@ export interface TierRewardList {
   amb: TierRewardItem[];
   bond: TierRewardItem[];
 }
+export interface ILogs {
+  amount: BigNumber;
+  tokenAddress: string;
+  requestData: string;
+  unlockData: string;
+  status: string;
+}
 
 export interface HarborStoreModel {
   data: HarborDataModel;
+  withdrawalList: ILogs[];
+  withdrawListLoader: boolean;
   activeAmbTier: TierRewardItem;
   setActiveAmbTier: (payload: TierRewardItem) => void;
   activeBondTier: TierRewardItem;
   claimAmount: BigNumber;
+  updateWithdrawList: (payload: string) => void;
+  clearWithdrawList: () => void;
   getClaimAmount: (payload: string) => void;
   setActiveBondTier: (payload: TierRewardItem) => void;
   bondAmount: string;

diff --git a/src/features/harbor/components/base/preview-modules/error-template/index.tsx b/src/features/harbor/components/base/preview-modules/error-template/index.tsx
@@ -23,7 +23,7 @@ export const ErrorTemplate = ({ onClose }: PreviewFormModel) => {
         <Spacer value={scale(12)} />
         <Text
           color={COLORS.neutral900}
-          fontSize={24}
+          fontSize={scale(24)}
           fontFamily="Inter_700Bold"
         >
           {t('common.status.failed')}

diff --git a/src/features/harbor/components/base/preview-modules/form-template/index.tsx b/src/features/harbor/components/base/preview-modules/form-template/index.tsx
@@ -41,27 +41,27 @@ export const FormTemplate = ({
         {!!item?.name && (
           <Text
             fontFamily={'Inter_500Medium'}
-            fontSize={14}
+            fontSize={scale(14)}
             color={COLORS.neutral600}
           >
             {t(item.name)}
           </Text>
         )}
         <Row>
           <Text
-            fontSize={14}
+            fontSize={scale(14)}
             color={COLORS.neutral900}
             style={item?.textStyle || {}}
           >
             {item.value}{' '}
           </Text>
           {!!item.timeSymbol && (
-            <Text fontSize={14} color={COLORS.neutral900}>
+            <Text fontSize={scale(14)} color={COLORS.neutral900}>
               {t(item.timeSymbol)}
             </Text>
           )}
           {!!item.symbol && (
-            <Text fontSize={14} color={COLORS.neutral900}>
+            <Text fontSize={scale(14)} color={COLORS.neutral900}>
               {item.symbol}
             </Text>
           )}

diff --git a/src/features/harbor/components/base/preview-modules/success-template/copy-hash/index.tsx b/src/features/harbor/components/base/preview-modules/success-template/copy-hash/index.tsx
@@ -8,6 +8,7 @@ import { StringUtils } from '@utils/string';
 import { COLORS } from '@constants/colors';
 import { contentBox } from '@components/styles';
 import { Toast, ToastPosition, ToastType } from '@components/modular';
+import { scale } from '@utils/scaling';
 
 interface CopyHashModel {
   hash: string;
@@ -28,8 +29,9 @@ export const CopyHash = ({ hash }: CopyHashModel) => {
     <Pressable onPress={onTxPress}>
       <Row style={contentBox}>
         <GlobeIcon color={COLORS.neutral600} />
-        <Text>{t('common.transaction')}</Text>
+        <Text fontSize={scale(12)}>{t('common.transaction')}</Text>
         <Text
+          fontSize={scale(12)}
           style={{
             textDecorationLine: 'underline',
             color: COLORS.neutral900

diff --git a/src/features/harbor/components/base/preview-modules/success-template/index.tsx b/src/features/harbor/components/base/preview-modules/success-template/index.tsx
@@ -60,11 +60,11 @@ export const SuccessTemplate = ({
     return (
       <View style={{ paddingVertical: scale(6) }}>
         <Row justifyContent="space-between">
-          <Text fontSize={14} color={COLORS.neutral900}>
+          <Text fontSize={scale(14)} color={COLORS.neutral900}>
             {t(item.name)}
           </Text>
           <Text
-            fontSize={14}
+            fontSize={scale(14)}
             color={COLORS.neutral900}
             style={item.textStyle || {}}
           >
@@ -94,15 +94,15 @@ export const SuccessTemplate = ({
       )}
       <Spacer value={scale(12)} />
       <PrimaryButton onPress={onPreviewClose}>
-        <Text fontSize={14} color={COLORS.neutral0}>
+        <Text fontSize={scale(14)} color={COLORS.neutral0}>
           {t('kosmos.button.close')}
         </Text>
       </PrimaryButton>
       {isWithdrawModal && (
         <>
           <Spacer value={scale(12)} />
           <SecondaryButton onPress={goToMyRequests}>
-            <Text fontSize={14} color={COLORS.neutral900}>
+            <Text fontSize={scale(14)} color={COLORS.neutral900}>
               {t('harbor.requests.header')}
             </Text>
           </SecondaryButton>

diff --git a/src/features/harbor/components/base/preview-modules/success-template/success-title/index.tsx b/src/features/harbor/components/base/preview-modules/success-template/success-title/index.tsx
@@ -26,7 +26,7 @@ export const SuccessTitle = ({
         <Spacer value={scale(8)} />
         <Text
           fontFamily="Inter_600SemiBold"
-          fontSize={14}
+          fontSize={scale(14)}
           color={COLORS.neutral900}
           align="center"
           style={titleData.textStyle || {}}
@@ -40,7 +40,7 @@ export const SuccessTitle = ({
             <Text
               fontFamily="Inter_700Bold"
               color={COLORS.neutral900}
-              fontSize={24}
+              fontSize={scale(24)}
             >
               {' '}
               {titleData.value} {titleData.symbol}

diff --git a/src/features/harbor/components/base/stake-info-container/index.tsx b/src/features/harbor/components/base/stake-info-container/index.tsx
@@ -62,7 +62,7 @@ export const StakeInfoContainer = ({
               </Text>
             </Row>
             <View style={{ alignItems: 'flex-end' }}>
-              <Text fontSize={12}>{t('harbor.staked.amount')}</Text>
+              <Text fontSize={scale(12)}>{t('harbor.staked.amount')}</Text>
               <Spacer value={scale(8)} />
               <Text style={styles.topText} color={COLORS.neutral900}>
                 {NumberUtils.limitDecimalCount(formatEther(userStaked), 2)}