Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

txs: add pending tx indicator #5529

Merged
merged 6 commits into from
Mar 19, 2024
Merged

txs: add pending tx indicator #5529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46fbea7
txs: add pending tx indicator
skylarbarrera Mar 18, 2024
9feaf5c
tweaks
benisgold Mar 18, 2024
160d78b
fix
skylarbarrera Mar 18, 2024
7c249d0
move out of comp
skylarbarrera Mar 18, 2024
4a6976f
fix flash
benisgold Mar 19, 2024
eaaf5c1
rm bg color (i was wrong)
benisgold Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/hooks/usePendingTransactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ export default function usePendingTransactions() {

return {
getPendingTransactionByHash,
pendingTransactions,
};
}
72 changes: 57 additions & 15 deletions src/navigation/SwipeNavigator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
import { BlurView } from '@react-native-community/blur';
import { createMaterialTopTabNavigator, MaterialTopTabNavigationEventMap } from '@react-navigation/material-top-tabs';
import { MaterialTopTabDescriptorMap } from '@react-navigation/material-top-tabs/lib/typescript/src/types';
import { NavigationHelpers, ParamListBase, RouteProp } from '@react-navigation/native';
import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react';
import { InteractionManager, View } from 'react-native';
import Animated, { Easing, interpolate, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
import { LIGHT_SEPARATOR_COLOR } from '@/__swaps__/screens/Swap/constants';
import { ButtonPressAnimation } from '@/components/animations';
import { TabBarIcon } from '@/components/icons/TabBarIcon';
import { FlexItem } from '@/components/layout';
import { TestnetToast } from '@/components/toasts';
import { useExperimentalFlag, DAPP_BROWSER, POINTS } from '@/config';
import { Box, Columns, Stack, globalColors, useForegroundColor } from '@/design-system';
import { DAPP_BROWSER, POINTS, useExperimentalFlag } from '@/config';
import { Box, Columns, globalColors, Stack, useForegroundColor, Text, AccentColorProvider, Cover, Inset } from '@/design-system';
import { IS_ANDROID, IS_IOS, IS_TEST } from '@/env';
import { web3Provider } from '@/handlers/web3';
import { isUsingButtonNavigation } from '@/helpers/statusBarHelper';
import { useAccountAccentColor, useAccountSettings, useCoinListEdited, useDimensions } from '@/hooks';
import { useAccountAccentColor, useAccountSettings, useCoinListEdited, useDimensions, usePendingTransactions } from '@/hooks';
import { useRemoteConfig } from '@/model/remoteConfig';
import RecyclerListViewScrollToTopProvider, {
useRecyclerListViewScrollToTopContext,
} from '@/navigation/RecyclerListViewScrollToTopContext';
import WalletScreen from '@/screens/WalletScreen';
import DappBrowserScreen from '@/screens/dapp-browser/DappBrowserScreen';
import { discoverOpenSearchFnRef } from '@/screens/discover/components/DiscoverSearchContainer';
import PointsScreen from '@/screens/points/PointsScreen';
import { LIGHT_SEPARATOR_COLOR } from '@/__swaps__/screens/Swap/constants';
import WalletScreen from '@/screens/WalletScreen';
import { useTheme } from '@/theme';
import { deviceUtils } from '@/utils';
import { BlurView } from '@react-native-community/blur';
import { createMaterialTopTabNavigator, MaterialTopTabNavigationEventMap } from '@react-navigation/material-top-tabs';
import { MaterialTopTabDescriptorMap } from '@react-navigation/material-top-tabs/lib/typescript/src/types';
import { NavigationHelpers, ParamListBase, RouteProp } from '@react-navigation/native';
import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
import { InteractionManager, View } from 'react-native';
import Animated, { Easing, interpolate, SharedValue, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';

import ProfileScreen from '../screens/ProfileScreen';
import { AnimatedSpinner } from '@/__swaps__/components/animations/AnimatedSpinner';
import DiscoverScreen, { discoverScrollToTopFnRef } from '../screens/discover/DiscoverScreen';
import ProfileScreen from '../screens/ProfileScreen';
import Routes from './routesNames';
import { ScrollPositionContext } from './ScrollPositionContext';
import SectionListScrollToTopProvider, { useSectionListScrollToTopContext } from './SectionListScrollToTopContext';
import Routes from './routesNames';

export const TAB_BAR_HEIGHT = getTabBarHeight();

Expand All @@ -52,6 +53,38 @@ const fadeConfig = { duration: 300, easing: Easing.bezier(0.22, 1, 0.36, 1) };

const Swipe = createMaterialTopTabNavigator();

// eslint-disable-next-line react/display-name
const ActivityTabIcon = React.memo(
({
accentColor,
tabBarIcon,
index,
reanimatedPosition,
}: {
accentColor: string;
tabBarIcon: string;
index: number;
reanimatedPosition: SharedValue<number>;
}) => {
const { pendingTransactions } = usePendingTransactions();

return pendingTransactions.length > 0 ? (
<Box width={{ custom: 32 }} height={{ custom: 32 }} alignItems="center" justifyContent="center">
<AnimatedSpinner isLoading={true} color={accentColor} size={28} />
<Cover>
<Box width="full" height="full" padding={{ custom: 7 }} alignItems="center" justifyContent="center">
<Text color={{ custom: accentColor }} size="13pt" weight="heavy" align="center">
{pendingTransactions.length}
</Text>
</Box>
</Cover>
</Box>
) : (
<TabBarIcon accentColor={accentColor} icon={tabBarIcon} index={index} reanimatedPosition={reanimatedPosition} />
);
}
);

interface TabBarProps {
descriptors: MaterialTopTabDescriptorMap;
jumpTo: (key: string) => void;
Expand Down Expand Up @@ -225,7 +258,16 @@ const TabBar = ({ descriptors, jumpTo, navigation, state }: TabBarProps) => {
>
<Stack alignHorizontal="center">
<Box alignItems="center" borderRadius={20} height="36px" justifyContent="center">
<TabBarIcon accentColor={accentColor} icon={tabBarIcon} index={index} reanimatedPosition={reanimatedPosition} />
{tabBarIcon === 'tabActivity' ? (
<ActivityTabIcon
accentColor={accentColor}
tabBarIcon={tabBarIcon}
index={index}
reanimatedPosition={reanimatedPosition}
/>
) : (
<TabBarIcon accentColor={accentColor} icon={tabBarIcon} index={index} reanimatedPosition={reanimatedPosition} />
)}
</Box>
</Stack>
</ButtonPressAnimation>
Expand Down