ci(release): publish latest release

parent 86b62c23
We are back with some new new updates! Here’s the latest: We are back with some new new updates! Here’s the latest:
Improved Send Flow: We’ve revamped our Send feature with a UI refresh!
Other changes:
- Faster wallet imports when importing a recovery phrase! - Faster wallet imports when importing a recovery phrase!
- Better loading states in the transaction details sheets - Faster loading of your NFTs on the NFT Tab
- Added toasts when hiding and unhiding NFTs - Added toasts when hiding and unhiding NFTs
- Removed the hold to swap feature - Better loading states in the transaction details sheets
- Various bug fixes and performance improvements - Various bug fixes and performance improvements
\ No newline at end of file
mobile/1.34.1 extension/1.4.1
\ No newline at end of file \ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"manifest_version": 3, "manifest_version": 3,
"name": "Uniswap Extension", "name": "Uniswap Extension",
"description": "The Uniswap Extension is a self-custody crypto wallet that's built for swapping.", "description": "The Uniswap Extension is a self-custody crypto wallet that's built for swapping.",
"version": "1.4.0", "version": "1.4.1",
"minimum_chrome_version": "116", "minimum_chrome_version": "116",
"icons": { "icons": {
"16": "assets/icon16.png", "16": "assets/icon16.png",
......
...@@ -137,17 +137,17 @@ android { ...@@ -137,17 +137,17 @@ android {
dev { dev {
isDefault(true) isDefault(true)
applicationIdSuffix ".dev" applicationIdSuffix ".dev"
versionName "1.34.1" versionName "1.34"
dimension "variant" dimension "variant"
} }
beta { beta {
applicationIdSuffix ".beta" applicationIdSuffix ".beta"
versionName "1.34.1" versionName "1.33"
dimension "variant" dimension "variant"
} }
prod { prod {
dimension "variant" dimension "variant"
versionName "1.34.1" versionName "1.33"
} }
} }
......
...@@ -2189,7 +2189,7 @@ ...@@ -2189,7 +2189,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
...@@ -2242,7 +2242,7 @@ ...@@ -2242,7 +2242,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore; PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore;
...@@ -2295,7 +2295,7 @@ ...@@ -2295,7 +2295,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore; PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore;
...@@ -2348,7 +2348,7 @@ ...@@ -2348,7 +2348,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore; PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore;
...@@ -2386,7 +2386,7 @@ ...@@ -2386,7 +2386,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0; IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
...@@ -2422,7 +2422,7 @@ ...@@ -2422,7 +2422,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0; IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests; PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests;
...@@ -2457,7 +2457,7 @@ ...@@ -2457,7 +2457,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0; IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests; PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests;
...@@ -2492,7 +2492,7 @@ ...@@ -2492,7 +2492,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11; GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0; IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests; PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests;
...@@ -2539,7 +2539,7 @@ ...@@ -2539,7 +2539,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
...@@ -2585,7 +2585,7 @@ ...@@ -2585,7 +2585,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.widgets; PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.widgets;
...@@ -2631,7 +2631,7 @@ ...@@ -2631,7 +2631,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.widgets; PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.widgets;
...@@ -2677,7 +2677,7 @@ ...@@ -2677,7 +2677,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.widgets; PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.widgets;
...@@ -2719,7 +2719,7 @@ ...@@ -2719,7 +2719,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
...@@ -2762,7 +2762,7 @@ ...@@ -2762,7 +2762,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.WidgetIntentExtension; PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.WidgetIntentExtension;
...@@ -2805,7 +2805,7 @@ ...@@ -2805,7 +2805,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.WidgetIntentExtension; PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.WidgetIntentExtension;
...@@ -2848,7 +2848,7 @@ ...@@ -2848,7 +2848,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.WidgetIntentExtension; PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.WidgetIntentExtension;
...@@ -2884,7 +2884,7 @@ ...@@ -2884,7 +2884,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
...@@ -2922,7 +2922,7 @@ ...@@ -2922,7 +2922,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
...@@ -3100,7 +3100,7 @@ ...@@ -3100,7 +3100,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
...@@ -3144,7 +3144,7 @@ ...@@ -3144,7 +3144,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.OneSignalNotificationServiceExtension; PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.OneSignalNotificationServiceExtension;
...@@ -3244,7 +3244,7 @@ ...@@ -3244,7 +3244,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
...@@ -3315,7 +3315,7 @@ ...@@ -3315,7 +3315,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.OneSignalNotificationServiceExtension; PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.OneSignalNotificationServiceExtension;
...@@ -3415,7 +3415,7 @@ ...@@ -3415,7 +3415,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
...@@ -3486,7 +3486,7 @@ ...@@ -3486,7 +3486,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.34.1; MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.OneSignalNotificationServiceExtension; PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.OneSignalNotificationServiceExtension;
......
...@@ -97,7 +97,7 @@ export function WalletConnectModals(): JSX.Element { ...@@ -97,7 +97,7 @@ export function WalletConnectModals(): JSX.Element {
dispatch(removeRequest({ requestInternalId: currRequest.internalId, account: currRequest.account })) dispatch(removeRequest({ requestInternalId: currRequest.internalId, account: currRequest.account }))
} }
> >
<RequestModal currRequest={currRequest} /> <RequestModal currRequest={currRequest} />{' '}
</ErrorBoundary> </ErrorBoundary>
) : null} ) : null}
</> </>
......
import { memo, useCallback, useEffect, useRef } from 'react' import { memo, useCallback, useEffect, useRef } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { AnimateTransition, Flex, Loader, Skeleton, Text } from 'ui/src' import { AnimateTransition, Flex, Loader, Skeleton, Text, isWeb } from 'ui/src'
import { fonts } from 'ui/src/theme' import { fonts } from 'ui/src/theme'
import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard' import { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
import { TokenOptionItem } from 'uniswap/src/components/TokenSelector/TokenOptionItem' import { TokenOptionItem } from 'uniswap/src/components/TokenSelector/TokenOptionItem'
...@@ -220,7 +220,7 @@ function _TokenSelectorList({ ...@@ -220,7 +220,7 @@ function _TokenSelectorList({
<Loader.Box height={fonts.subheading2.lineHeight} /> <Loader.Box height={fonts.subheading2.lineHeight} />
</Skeleton> </Skeleton>
</Flex> </Flex>
<Loader.Token gap="$none" repeat={15} /> <Loader.Token gap={isWeb ?? '$none'} repeat={15} />
</Flex> </Flex>
<TokenSectionBaseList <TokenSectionBaseList
ListEmptyComponent={emptyElement || <EmptyResults />} ListEmptyComponent={emptyElement || <EmptyResults />}
......
...@@ -40,8 +40,8 @@ export type TransactionListQueryResponse = NonNullable< ...@@ -40,8 +40,8 @@ export type TransactionListQueryResponse = NonNullable<
>[0] >[0]
/** /**
* Marks if a transaction was initiated natively within app, or from external source. * Marks if a transaction was initiated natively within app, or from external source.
* External transactions are initiated from dapps, WC, uwulink, etc. * External transactions are initiated from dapps, WC, uwulink, etc.
*/ */
export enum TransactionOriginType { export enum TransactionOriginType {
Internal = 'internal', Internal = 'internal',
...@@ -52,7 +52,7 @@ interface BaseTransactionDetails extends TransactionId { ...@@ -52,7 +52,7 @@ interface BaseTransactionDetails extends TransactionId {
from: Address from: Address
transactionOriginType: TransactionOriginType transactionOriginType: TransactionOriginType
// Specific info for the tx type // Specific info for the tx type
typeInfo: TransactionTypeInfo typeInfo: TransactionTypeInfo
...@@ -296,7 +296,7 @@ export interface OnRampTransactionInfo extends BaseTransactionInfo { ...@@ -296,7 +296,7 @@ export interface OnRampTransactionInfo extends BaseTransactionInfo {
id: string id: string
destinationTokenSymbol: string destinationTokenSymbol: string
destinationTokenAddress: string destinationTokenAddress: string
destinationTokenAmount?: number destinationTokenAmount: number
serviceProvider: ServiceProviderInfo serviceProvider: ServiceProviderInfo
// Fees are in units of the sourceCurrency for purchases, // Fees are in units of the sourceCurrency for purchases,
// and in units of the destinationToken for transfers // and in units of the destinationToken for transfers
...@@ -308,7 +308,7 @@ export interface OnRampTransactionInfo extends BaseTransactionInfo { ...@@ -308,7 +308,7 @@ export interface OnRampTransactionInfo extends BaseTransactionInfo {
export interface OnRampPurchaseInfo extends OnRampTransactionInfo { export interface OnRampPurchaseInfo extends OnRampTransactionInfo {
type: TransactionType.OnRampPurchase type: TransactionType.OnRampPurchase
sourceCurrency: string sourceCurrency: string
sourceAmount?: number sourceAmount: number
} }
export interface OnRampTransferInfo extends OnRampTransactionInfo { export interface OnRampTransferInfo extends OnRampTransactionInfo {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"account.cloud.error.backup.message": "권한 부족, 승인 중단 또는 클라우드 오류로 인해 백업을 가져오지 못했습니다.", "account.cloud.error.backup.message": "권한 부족, 승인 중단 또는 클라우드 오류로 인해 백업을 가져오지 못했습니다.",
"account.cloud.error.backup.title": "백업을 가져오는 중 오류가 발생했습니다.", "account.cloud.error.backup.title": "백업을 가져오는 중 오류가 발생했습니다.",
"account.cloud.error.password.title": "유효하지 않은 비밀번호. 다시 시도해 주세요.", "account.cloud.error.password.title": "유효하지 않은 비밀번호. 다시 시도해 주세요.",
"account.cloud.error.unavailable.button.cancel": "지금은 아님", "account.cloud.error.unavailable.button.cancel": "나중에",
"account.cloud.error.unavailable.button.settings": "설정으로 바로 가기", "account.cloud.error.unavailable.button.settings": "설정으로 바로 가기",
"account.cloud.error.unavailable.message.android": "이 기기에서 Google 드라이브를 활성화한 상태로 Google 계정에 로그인했는지 확인한 후 다시 시도해 주세요.", "account.cloud.error.unavailable.message.android": "이 기기에서 Google 드라이브를 활성화한 상태로 Google 계정에 로그인했는지 확인한 후 다시 시도해 주세요.",
"account.cloud.error.unavailable.message.ios": "이 기기에서 iCloud Drive가 활성화된 Apple ID로 로그인했는지 확인한 후 다시 시도하십시오.", "account.cloud.error.unavailable.message.ios": "이 기기에서 iCloud Drive가 활성화된 Apple ID로 로그인했는지 확인한 후 다시 시도하십시오.",
......
...@@ -43,6 +43,9 @@ type AddressDisplayProps = { ...@@ -43,6 +43,9 @@ type AddressDisplayProps = {
gapBetweenLines?: SpaceTokens gapBetweenLines?: SpaceTokens
showViewOnlyLabel?: boolean showViewOnlyLabel?: boolean
showViewOnlyBadge?: boolean showViewOnlyBadge?: boolean
// TODO WALL-4545 Added flag to disable forced width causing trouble in other screens
disableForcedWidth?: boolean
} }
type CopyButtonWrapperProps = { type CopyButtonWrapperProps = {
...@@ -89,6 +92,7 @@ export function AddressDisplay({ ...@@ -89,6 +92,7 @@ export function AddressDisplay({
notificationsBadgeContainer, notificationsBadgeContainer,
includeUnitagSuffix = false, includeUnitagSuffix = false,
gapBetweenLines = '$none', gapBetweenLines = '$none',
disableForcedWidth = false,
}: AddressDisplayProps): JSX.Element { }: AddressDisplayProps): JSX.Element {
const { t } = useTranslation() const { t } = useTranslation()
const dispatch = useDispatch() const dispatch = useDispatch()
...@@ -150,6 +154,7 @@ export function AddressDisplay({ ...@@ -150,6 +154,7 @@ export function AddressDisplay({
<CopyButtonWrapper onPress={showCopy && !showAddressAsSubtitle ? onPressCopyAddress : undefined}> <CopyButtonWrapper onPress={showCopy && !showAddressAsSubtitle ? onPressCopyAddress : undefined}>
<Flex centered row gap="$spacing12"> <Flex centered row gap="$spacing12">
<DisplayNameText <DisplayNameText
disableForcedWidth={disableForcedWidth}
displayName={displayName} displayName={displayName}
forcedWidth={wrapperWidth} forcedWidth={wrapperWidth}
gap="$spacing4" gap="$spacing4"
......
...@@ -10,6 +10,7 @@ type DisplayNameProps = { ...@@ -10,6 +10,7 @@ type DisplayNameProps = {
textProps?: TextProps textProps?: TextProps
includeUnitagSuffix?: boolean includeUnitagSuffix?: boolean
forcedWidth?: number forcedWidth?: number
disableForcedWidth?: boolean
} & FlexProps } & FlexProps
export function DisplayNameText({ export function DisplayNameText({
...@@ -18,6 +19,7 @@ export function DisplayNameText({ ...@@ -18,6 +19,7 @@ export function DisplayNameText({
textProps, textProps,
includeUnitagSuffix, includeUnitagSuffix,
forcedWidth, forcedWidth,
disableForcedWidth,
...rest ...rest
}: DisplayNameProps): JSX.Element { }: DisplayNameProps): JSX.Element {
const isUnitag = displayName?.type === DisplayNameType.Unitag const isUnitag = displayName?.type === DisplayNameType.Unitag
...@@ -32,7 +34,7 @@ export function DisplayNameText({ ...@@ -32,7 +34,7 @@ export function DisplayNameText({
flexShrink={1} flexShrink={1}
numberOfLines={1} numberOfLines={1}
overflow="hidden" overflow="hidden"
width={isUnitag ? undefined : forcedWidth} width={isUnitag || disableForcedWidth ? undefined : forcedWidth}
> >
{name} {name}
{isUnitag && includeUnitagSuffix && ( {isUnitag && includeUnitagSuffix && (
......
...@@ -251,7 +251,7 @@ export const TopAndBottomGradient = (): JSX.Element => { ...@@ -251,7 +251,7 @@ export const TopAndBottomGradient = (): JSX.Element => {
const SCREEN_WIDTH_BUFFER = 50 const SCREEN_WIDTH_BUFFER = 50
// Used for initial layout larger than all screen sizes // Used for initial layout larger than all screen sizes
const MAX_DEVICE_WIDTH = 1000 const MAX_DEVICE_WIDTH = isWeb ? undefined : 1000
type AnimatedNumberProps = { type AnimatedNumberProps = {
loadingPlaceholderText: string loadingPlaceholderText: string
......
...@@ -34,7 +34,7 @@ export function OnRampTransferSummaryItem({ ...@@ -34,7 +34,7 @@ export function OnRampTransferSummaryItem({
const formatFiatTokenPrice = (purchaseInfo: OnRampPurchaseInfo): string => { const formatFiatTokenPrice = (purchaseInfo: OnRampPurchaseInfo): string => {
try { try {
return formatNumberOrString({ return formatNumberOrString({
value: purchaseInfo.sourceAmount, value: purchaseInfo.sourceAmount > 0 ? purchaseInfo.sourceAmount : undefined,
type: NumberType.FiatTokenPrice, type: NumberType.FiatTokenPrice,
currencyCode: purchaseInfo.sourceCurrency, currencyCode: purchaseInfo.sourceCurrency,
}) })
......
...@@ -254,6 +254,7 @@ export function SendReviewDetails({ ...@@ -254,6 +254,7 @@ export function SendReviewDetails({
{t('common.wallet.label')} {t('common.wallet.label')}
</Text> </Text>
<AddressDisplay <AddressDisplay
disableForcedWidth
address={account.address} address={account.address}
hideAddressInSubtitle={true} hideAddressInSubtitle={true}
horizontalGap="$spacing4" horizontalGap="$spacing4"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment