merge fix

Author: bogdandobritoiu

bitrise.yml

@@ -965,6 +965,8 @@ workflows:
         - abi: x86_64
         - profile: pixel_7_pro
         - custom_command_flags: -no-snapshot -noaudio -no-window
+        - ram_size: 4096
+        - heap_size: 576
     - wait-for-android-emulator@1: {}
     - script-runner@0:
         title: Appium Android testing

packages/core-mobile/app/contexts/DelegationContext.tsx

@@ -17,10 +17,12 @@ type TransactionHash = string
 
 export type Delegate = ({
   steps,
+  startDate,
   endDate,
   nodeId
 }: {
   steps: Step[]
+  startDate: Date
   endDate: Date
   nodeId: string
 }) => Promise<TransactionHash>

packages/core-mobile/app/hooks/earn/useDelegation.ts

@@ -108,7 +108,7 @@ export const useDelegation = (): {
 
   const delegate: Delegate = useCallback(
     // eslint-disable-next-line @typescript-eslint/no-shadow
-    async ({ steps, endDate, nodeId }) => {
+    async ({ steps, startDate, endDate, nodeId }) => {
       if (activeAccount === undefined) {
         throw new Error('No active account')
       }
@@ -136,11 +136,19 @@ export const useDelegation = (): {
             // otherwise, the transaction will fail with a "Start date must be in future" error
             const delegateStartDate = new Date(Date.now() + 1 * 60 * 1000)
 
+            // get the difference in milliseconds between the original start date and the fresh start date
+            const differenceInMilliseconds =
+              delegateStartDate.getTime() - startDate.getTime()
+            // add the difference in milliseconds to the original end date, so the duration is the same as the original
+            const delegateEndDate = new Date(
+              endDate.getTime() + differenceInMilliseconds
+            )
+
             txHash = await EarnService.issueAddDelegatorTransaction({
               walletId: activeWallet.id,
               walletType: activeWallet.type,
               activeAccount,
-              endDate,
+              endDate: delegateEndDate,
               isDevMode: isDeveloperMode,
               nodeId,
               stakeAmountNanoAvax: step.amount,

packages/core-mobile/app/hooks/earn/useIssueDelegation.ts

@@ -15,10 +15,12 @@ export const useIssueDelegation = ({
 }): {
   issueDelegation: ({
     nodeId,
+    startDate,
     endDate,
     recomputeSteps
   }: {
     nodeId: string
+    startDate: Date
     endDate: Date
     recomputeSteps?: boolean
   }) => Promise<void>
@@ -28,24 +30,28 @@ export const useIssueDelegation = ({
   const mutationFn = useCallback(
     async ({
       nodeId,
+      startDate,
       endDate,
       recomputeSteps = false
     }: {
       nodeId: string
+      startDate: Date
       endDate: Date
       recomputeSteps?: boolean
     }) => {
       if (recomputeSteps) {
         const newSteps = await compute(stakeAmount.toSubUnit())
         return delegate({
           steps: newSteps,
+          startDate,
           endDate,
           nodeId
         })
       }
 
       return delegate({
         steps,
+        startDate,
         endDate,
         nodeId
       })

packages/core-mobile/app/new/features/portfolio/assets/components/TokenListView.tsx

@@ -91,6 +91,7 @@ export const TokenListView = ({
                 {tokenNameForDisplay}
               </Text>
               <MaskedText
+                testID={`list_token_balance__${index}`}
                 shouldMask={isPrivacyModeEnabled}
                 maskWidth={55}
                 sx={{ lineHeight: 16, flex: 1 }}

packages/core-mobile/app/new/features/portfolio/screens/PortfolioScreen.tsx

@@ -34,7 +34,6 @@ import { DeFiScreen } from 'features/portfolio/defi/components/DeFiScreen'
 import { useAccountPerformanceSummary } from 'features/portfolio/hooks/useAccountPerformanceSummary'
 import { useBalanceTotalInCurrencyForAccount } from 'features/portfolio/hooks/useBalanceTotalInCurrencyForAccount'
 import { useBalanceTotalPriceChangeForAccount } from 'features/portfolio/hooks/useBalanceTotalPriceChangeForAccount'
-import { useIsAccountBalanceAccurate } from 'features/portfolio/hooks/useIsAccountBalanceAccurate'
 import { useIsBalanceLoadedForAccount } from 'features/portfolio/hooks/useIsBalanceLoadedForAccount'
 import { useSendSelectedToken } from 'features/send/store'
 import { useNavigateToSwap } from 'features/swap/hooks/useNavigateToSwap'
@@ -67,6 +66,7 @@ import { selectSelectedCurrency } from 'store/settings/currency'
 import { selectIsPrivacyModeEnabled } from 'store/settings/securityPrivacy'
 import { selectActiveWallet, selectWallets } from 'store/wallet/slice'
 import { useFocusedSelector } from 'utils/performance/useFocusedSelector'
+import { useIsAllBalancesInaccurateForAccount } from '../hooks/useIsAllBalancesInaccurateForAccount'
 import { useIsLoadingBalancesForAccount } from '../hooks/useIsLoadingBalancesForAccount'
 import { useIsRefetchingBalancesForAccount } from '../hooks/useIsRefetchingBalancesForAccount'
 
@@ -122,21 +122,22 @@ const PortfolioHomeScreen = (): JSX.Element => {
   const isBalanceLoaded = useIsBalanceLoadedForAccount(activeAccount)
   const isLoadingBalances = useIsLoadingBalancesForAccount(activeAccount)
   const isLoading = isRefetchingBalance || !isBalanceLoaded
+  const allBalancesInaccurate =
+    useIsAllBalancesInaccurateForAccount(activeAccount)
   const activeWallet = useSelector(selectActiveWallet)
   const wallets = useSelector(selectWallets)
   const walletsCount = Object.keys(wallets).length
-  const balanceAccurate = useIsAccountBalanceAccurate(activeAccount)
   const selectedCurrency = useSelector(selectSelectedCurrency)
   const { formatCurrency } = useFormatCurrency()
   const formattedBalance = useMemo(() => {
     // CP-10570: Balances should never show $0.00
-    return !balanceAccurate || balanceTotalInCurrency === 0
+    return allBalancesInaccurate || balanceTotalInCurrency === 0
       ? UNKNOWN_AMOUNT
       : formatCurrency({
           amount: balanceTotalInCurrency,
           withoutCurrencySuffix: true
         })
-  }, [balanceAccurate, balanceTotalInCurrency, formatCurrency])
+  }, [allBalancesInaccurate, balanceTotalInCurrency, formatCurrency])
 
   const { percentChange24h, valueChange24h, indicatorStatus } =
     useAccountPerformanceSummary(activeAccount)
@@ -317,7 +318,9 @@ const PortfolioHomeScreen = (): JSX.Element => {
                     : undefined
                 }
                 errorMessage={
-                  balanceAccurate ? undefined : 'Unable to load all balances'
+                  allBalancesInaccurate
+                    ? 'Unable to load all balances'
+                    : undefined
                 }
                 onErrorPress={handleErrorPress}
                 isLoading={isLoading && balanceTotalInCurrency === 0}
@@ -357,7 +360,7 @@ const PortfolioHomeScreen = (): JSX.Element => {
     valueChange24h,
     indicatorStatus,
     percentChange24h,
-    balanceAccurate,
+    allBalancesInaccurate,
     handleErrorPress,
     isLoading,
     balanceTotalInCurrency,

packages/core-mobile/app/new/routes/(signedIn)/(modals)/accountSettings/account.tsx

@@ -1,11 +1,11 @@
-import { BalanceHeader, View } from '@avalabs/k2-alpine'
+import { BalanceHeader, showAlert, View } from '@avalabs/k2-alpine'
 import { ScrollScreen } from 'common/components/ScrollScreen'
 import { useFormatCurrency } from 'common/hooks/useFormatCurrency'
 import { UNKNOWN_AMOUNT } from 'consts/amount'
 import { useLocalSearchParams, useRouter } from 'expo-router'
 import { AccountAddresses } from 'features/accountSettings/components/accountAddresses'
 import { AccountButtons } from 'features/accountSettings/components/AccountButtons'
-import React, { useMemo } from 'react'
+import React, { useCallback, useMemo } from 'react'
 import { useSelector } from 'react-redux'
 import { selectAccountById } from 'store/account'
 import { selectIsDeveloperMode } from 'store/settings/advanced'
@@ -17,8 +17,8 @@ import { CoreAccountType } from '@avalabs/types'
 import { WalletType } from 'services/wallet/types'
 import { useIsLoadingBalancesForAccount } from 'features/portfolio/hooks/useIsLoadingBalancesForAccount'
 import { useIsRefetchingBalancesForAccount } from 'features/portfolio/hooks/useIsRefetchingBalancesForAccount'
-import { useIsAccountBalanceAccurate } from 'features/portfolio/hooks/useIsAccountBalanceAccurate'
 import { useBalanceTotalInCurrencyForAccount } from 'features/portfolio/hooks/useBalanceTotalInCurrencyForAccount'
+import { useIsAllBalancesInaccurateForAccount } from 'features/portfolio/hooks/useIsAllBalancesInaccurateForAccount'
 
 const AccountScreen = (): JSX.Element => {
   const router = useRouter()
@@ -33,18 +33,18 @@ const AccountScreen = (): JSX.Element => {
     account
   })
   const isLoading = isBalanceLoading || isRefetchingBalance
-  const balanceAccurate = useIsAccountBalanceAccurate(account)
+  const allBalancesInaccurate = useIsAllBalancesInaccurateForAccount(account)
   const selectedCurrency = useSelector(selectSelectedCurrency)
   const { formatCurrency } = useFormatCurrency()
   const formattedBalance = useMemo(() => {
     // CP-10570: Balances should never show $0.00
-    return !balanceAccurate || balanceTotalInCurrency === 0
+    return allBalancesInaccurate || balanceTotalInCurrency === 0
       ? UNKNOWN_AMOUNT
       : formatCurrency({
           amount: balanceTotalInCurrency,
           withoutCurrencySuffix: true
         })
-  }, [balanceAccurate, balanceTotalInCurrency, formatCurrency])
+  }, [allBalancesInaccurate, balanceTotalInCurrency, formatCurrency])
 
   const isPrivateKeyAvailable = useMemo(
     () =>
@@ -54,6 +54,15 @@ const AccountScreen = (): JSX.Element => {
     [account?.type, wallet?.type]
   )
 
+  const handleErrorPress = useCallback(() => {
+    showAlert({
+      title: 'Unable to load balances',
+      description:
+        'This total may be incomplete since Core was unable to load all of the balances across each network.',
+      buttons: [{ text: 'Dismiss' }]
+    })
+  }, [])
+
   const handleShowPrivateKey = (): void => {
     if (!account) {
       return
@@ -80,8 +89,9 @@ const AccountScreen = (): JSX.Element => {
         formattedBalance={formattedBalance}
         currency={selectedCurrency}
         errorMessage={
-          balanceAccurate ? undefined : 'Unable to load account balance'
+          allBalancesInaccurate ? 'Unable to load all balances' : undefined
         }
+        onErrorPress={handleErrorPress}
         isLoading={isLoading}
         isPrivacyModeEnabled={isPrivacyModeEnabled}
         isDeveloperModeEnabled={isDeveloperMode}

packages/core-mobile/app/new/routes/(signedIn)/(modals)/addStake/confirm.tsx

@@ -82,7 +82,7 @@ const StakeConfirmScreen = (): JSX.Element => {
     }
     return 0
   }, [validator?.endTime])
-  const { validatedStakingEndTime, validatedStakingDuration } =
+  const { minStartTime, validatedStakingEndTime, validatedStakingDuration } =
     useValidateStakingEndTime(stakeEndTimeInMilliseconds, validatorEndTimeUnix)
 
   const localValidatedStakingEndTime = useMemo(() => {
@@ -299,11 +299,12 @@ const StakeConfirmScreen = (): JSX.Element => {
 
       issueDelegation({
         nodeId: validator.nodeID,
+        startDate: minStartTime,
         endDate: validatedStakingEndTime,
         recomputeSteps
       })
     },
-    [issueDelegation, validatedStakingEndTime, validator]
+    [issueDelegation, minStartTime, validatedStakingEndTime, validator]
   )
 
   usePreventScreenRemoval(isIssueDelegationPending)

packages/core-mobile/e2e-appium/pages/commonEls.page.ts

@@ -383,7 +383,11 @@ class CommonElsPage {
 
   async dismissBottomSheet(element = this.grabber) {
     await actions.waitFor(element, 20000)
-    await actions.dragAndDrop(this.grabber, [0, 1500])
+    while (await actions.getVisible(element)) {
+      await actions.dragAndDrop(element, [0, 1500])
+      await actions.delay(1000)
+    }
+    console.log('Dismissed bottom sheet')
   }
 
   async visibleDropdown(name: string, isVisible = true) {

packages/core-mobile/e2e-appium/specs/portfolioTab/assets/assetsFilterSortView.spec.ts

@@ -64,6 +64,8 @@ describe('Portfolio tab', () => {
 
       previousAmount = currentAmount
     }
+
+    await commonElsPage.selectDropdown('sort', 'High to low balance')
   })
 
   it('Assets - view assets by grid and list', async () => {