From b7518b673c9cb3c9b282d6c5c48d6d5fdaa2cd0a Mon Sep 17 00:00:00 2001 From: Paul Puey Date: Fri, 19 Jan 2024 10:24:00 -0800 Subject: [PATCH 1/4] Fix incorrect sign for negative price change --- .../__snapshots__/TransactionDetailsScene.test.tsx.snap | 2 +- src/components/ui4/AssetChangeTextUi4.tsx | 6 +++--- src/theme/variables/edgeDark.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/__tests__/scenes/__snapshots__/TransactionDetailsScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/TransactionDetailsScene.test.tsx.snap index a021b0a4ee0..d22290f6d00 100644 --- a/src/__tests__/scenes/__snapshots__/TransactionDetailsScene.test.tsx.snap +++ b/src/__tests__/scenes/__snapshots__/TransactionDetailsScene.test.tsx.snap @@ -2701,7 +2701,7 @@ exports[`TransactionDetailsScene should render with negative nativeAmount and fi "includeFontPadding": false, }, { - "color": "#888888", + "color": "#D9E3ED", }, null, ] diff --git a/src/components/ui4/AssetChangeTextUi4.tsx b/src/components/ui4/AssetChangeTextUi4.tsx index 3bd83448018..e741e5c859c 100644 --- a/src/components/ui4/AssetChangeTextUi4.tsx +++ b/src/components/ui4/AssetChangeTextUi4.tsx @@ -46,11 +46,11 @@ const getPercentDeltaString = (assetToFiatRate: string, assetToYestFiatRate: str const yesterdayDelta = sub(assetToFiatRate, yesterdayExchangeRate) // Avoid divide by zero if there's no exchange rate from yesterday - const yesterdayDeltaPct = zeroString(yesterdayExchangeRate) ? '0' : abs(div(yesterdayDelta, yesterdayExchangeRate, DECIMAL_PRECISION)) + const yesterdayDeltaPct = zeroString(yesterdayExchangeRate) ? '0' : div(yesterdayDelta, yesterdayExchangeRate, DECIMAL_PRECISION) let percentString // Prepend a < sign if a nonzero delta rounds to zero - if (!zeroString(yesterdayDeltaPct) && lt(yesterdayDeltaPct, '0.001')) { + if (!zeroString(yesterdayDeltaPct) && lt(abs(yesterdayDeltaPct), '0.001')) { percentString = `<${toPercentString(0.0001, { maxPrecision: 2, intlOpts: { noGrouping: true } })}` } else { percentString = toPercentString(yesterdayDeltaPct, { maxPrecision: 2, intlOpts: { noGrouping: true } }) @@ -61,7 +61,7 @@ const getPercentDeltaString = (assetToFiatRate: string, assetToYestFiatRate: str if (gt(yesterdayDeltaPct, '0')) { return { percentString: `+${percentString}`, deltaColorStyle: theme.positiveText } } else if (lt(yesterdayDeltaPct, '0')) { - return { percentString: `-${percentString}`, deltaColorStyle: theme.negativeText } + return { percentString: `${percentString}`, deltaColorStyle: theme.negativeText } } else { return { percentString, deltaColorStyle: theme.negativeText } } diff --git a/src/theme/variables/edgeDark.ts b/src/theme/variables/edgeDark.ts index 7dacefb2770..5520bd4a477 100644 --- a/src/theme/variables/edgeDark.ts +++ b/src/theme/variables/edgeDark.ts @@ -202,7 +202,7 @@ export const edgeDark: Theme = { secondaryText: palette.skyBlue, warningText: palette.accentOrange, positiveText: palette.accentGreen, - negativeText: palette.gray, + negativeText: palette.lightGray, dangerText: palette.accentRed, textLink: palette.edgeMint, deactivatedText: palette.gray, From ca9f800c738cb3875d55535f1cc1b452e0495378 Mon Sep 17 00:00:00 2001 From: Paul Puey Date: Fri, 19 Jan 2024 13:25:15 -0800 Subject: [PATCH 2/4] Fix showing all recipient addresses in tx details --- src/components/scenes/TransactionDetailsScene.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/scenes/TransactionDetailsScene.tsx b/src/components/scenes/TransactionDetailsScene.tsx index 82a7f6f9c1b..25791fb0b17 100644 --- a/src/components/scenes/TransactionDetailsScene.tsx +++ b/src/components/scenes/TransactionDetailsScene.tsx @@ -382,7 +382,7 @@ const TransactionDetailsComponent = (props: Props) => { {recipientsAddresses === '' ? null : ( - + )} From fdf469657a882b3ae111a88b4d1e696c45542f15 Mon Sep 17 00:00:00 2001 From: Paul Puey Date: Fri, 19 Jan 2024 15:17:17 -0800 Subject: [PATCH 3/4] Remove ios options from EdgeAnim Just use the disableType instead --- src/components/common/EdgeAnim.tsx | 8 +++----- src/components/scenes/GettingStartedScene.tsx | 10 ++++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/common/EdgeAnim.tsx b/src/components/common/EdgeAnim.tsx index 526431ff16e..fb4e756ca22 100644 --- a/src/components/common/EdgeAnim.tsx +++ b/src/components/common/EdgeAnim.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { Platform, ViewProps } from 'react-native' +import { ViewProps } from 'react-native' import Animated, { AnimateProps, ComplexAnimationBuilder, @@ -47,8 +47,6 @@ interface Props extends AnimateProps { enter?: Anim exit?: Anim - /** only animate on ios */ - ios?: boolean visible?: boolean } @@ -93,12 +91,12 @@ const getAnimBuilder = (anim?: Anim) => { return builder } -export const EdgeAnim = ({ children, disableType, enter, exit, ios = false, visible = true, ...rest }: Props): JSX.Element | null => { +export const EdgeAnim = ({ children, disableType, enter, exit, visible = true, ...rest }: Props): JSX.Element | null => { if (!visible) return null const entering = getAnimBuilder(enter) const exiting = getAnimBuilder(exit) - if (disableType === 'anim' || (ios && Platform.OS !== 'ios')) { + if (disableType === 'anim') { return {children} } diff --git a/src/components/scenes/GettingStartedScene.tsx b/src/components/scenes/GettingStartedScene.tsx index c24b8734814..904f60089b5 100644 --- a/src/components/scenes/GettingStartedScene.tsx +++ b/src/components/scenes/GettingStartedScene.tsx @@ -1,7 +1,7 @@ import { CreateAccountType, InitialRouteName } from 'edge-login-ui-rn' import * as React from 'react' import { useEffect } from 'react' -import { Image, Pressable, Text, View } from 'react-native' +import { Image, Platform, Pressable, Text, View } from 'react-native' import { ScrollView, TouchableOpacity } from 'react-native-gesture-handler' import Animated, { Extrapolation, @@ -171,6 +171,8 @@ export const GettingStartedScene = (props: Props) => { } }, [isLoggedIn, localUsers, navigation]) + const disableType = Platform.OS === 'android' ? 'view' : undefined + return ( @@ -211,7 +213,7 @@ export const GettingStartedScene = (props: Props) => { ) })} - + {Array.from({ length: paginationCount + (isFinalSwipeEnabled ? 0 : 1) }).map((_, index) => ( handlePressIndicator(index)}> @@ -235,10 +237,10 @@ export const GettingStartedScene = (props: Props) => { })} - + - + From 44016ba39ea715ed70d69cb8e73e1fd525621235 Mon Sep 17 00:00:00 2001 From: Paul Puey Date: Sat, 20 Jan 2024 22:52:57 -0800 Subject: [PATCH 4/4] Do not show asset card while searching Also add animation for when it pops open --- src/components/scenes/TransactionListScene.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/scenes/TransactionListScene.tsx b/src/components/scenes/TransactionListScene.tsx index 31b93cdeb55..58692e72fb1 100644 --- a/src/components/scenes/TransactionListScene.tsx +++ b/src/components/scenes/TransactionListScene.tsx @@ -199,9 +199,11 @@ function TransactionListComponent(props: Props) { onSearchingChange={setIsSearching} onSearchTextChange={setSearchText} /> - {assetStatuses.length > 0 + {assetStatuses.length > 0 && !isSearching ? assetStatuses.map(assetStatus => ( - + + + )) : null}