diff --git a/RELEASE b/RELEASE
index cd199d7c2e8..30cbf44bcdf 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,11 +1,7 @@
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!
-- Better loading states in the transaction details sheets
+- Faster loading of your NFTs on the NFT Tab
- 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
\ No newline at end of file
diff --git a/VERSION b/VERSION
index ab5218495e7..fefab4e35ed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-mobile/1.34.1
\ No newline at end of file
+extension/1.4.1
\ No newline at end of file
diff --git a/apps/extension/src/manifest.json b/apps/extension/src/manifest.json
index 9dc866075c8..8be99fbcfa9 100644
--- a/apps/extension/src/manifest.json
+++ b/apps/extension/src/manifest.json
@@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "Uniswap Extension",
"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",
"icons": {
"16": "assets/icon16.png",
diff --git a/apps/mobile/android/app/build.gradle b/apps/mobile/android/app/build.gradle
index f28d644d743..39224d4db9b 100644
--- a/apps/mobile/android/app/build.gradle
+++ b/apps/mobile/android/app/build.gradle
@@ -137,17 +137,17 @@ android {
dev {
isDefault(true)
applicationIdSuffix ".dev"
- versionName "1.34.1"
+ versionName "1.34"
dimension "variant"
}
beta {
applicationIdSuffix ".beta"
- versionName "1.34.1"
+ versionName "1.33"
dimension "variant"
}
prod {
dimension "variant"
- versionName "1.34.1"
+ versionName "1.33"
}
}
diff --git a/apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj b/apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj
index d7da677bcd9..ce942e7b29b 100644
--- a/apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj
+++ b/apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj
@@ -2189,7 +2189,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2242,7 +2242,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore;
@@ -2295,7 +2295,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore;
@@ -2348,7 +2348,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore;
@@ -2386,7 +2386,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2422,7 +2422,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests;
@@ -2457,7 +2457,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests;
@@ -2492,7 +2492,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests;
@@ -2539,7 +2539,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2585,7 +2585,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.widgets;
@@ -2631,7 +2631,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.widgets;
@@ -2677,7 +2677,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.widgets;
@@ -2719,7 +2719,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2762,7 +2762,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.WidgetIntentExtension;
@@ -2805,7 +2805,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.WidgetIntentExtension;
@@ -2848,7 +2848,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.WidgetIntentExtension;
@@ -2884,7 +2884,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@@ -2922,7 +2922,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@@ -3100,7 +3100,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -3144,7 +3144,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.OneSignalNotificationServiceExtension;
@@ -3244,7 +3244,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@@ -3315,7 +3315,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.OneSignalNotificationServiceExtension;
@@ -3415,7 +3415,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@@ -3486,7 +3486,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.34.1;
+ MARKETING_VERSION = 1.34;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.OneSignalNotificationServiceExtension;
diff --git a/apps/mobile/src/components/Requests/WalletConnectModals.tsx b/apps/mobile/src/components/Requests/WalletConnectModals.tsx
index e650783a4be..d5c0e91d2ee 100644
--- a/apps/mobile/src/components/Requests/WalletConnectModals.tsx
+++ b/apps/mobile/src/components/Requests/WalletConnectModals.tsx
@@ -97,7 +97,7 @@ export function WalletConnectModals(): JSX.Element {
dispatch(removeRequest({ requestInternalId: currRequest.internalId, account: currRequest.account }))
}
>
-
+ {' '}
) : null}
diff --git a/packages/uniswap/src/components/TokenSelector/TokenSelectorList.tsx b/packages/uniswap/src/components/TokenSelector/TokenSelectorList.tsx
index c6457077802..dad4becdba3 100644
--- a/packages/uniswap/src/components/TokenSelector/TokenSelectorList.tsx
+++ b/packages/uniswap/src/components/TokenSelector/TokenSelectorList.tsx
@@ -1,6 +1,6 @@
import { memo, useCallback, useEffect, useRef } from 'react'
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 { BaseCard } from 'uniswap/src/components/BaseCard/BaseCard'
import { TokenOptionItem } from 'uniswap/src/components/TokenSelector/TokenOptionItem'
@@ -220,7 +220,7 @@ function _TokenSelectorList({
-
+
}
diff --git a/packages/uniswap/src/features/transactions/types/transactionDetails.ts b/packages/uniswap/src/features/transactions/types/transactionDetails.ts
index f022380796a..e13ec86b781 100644
--- a/packages/uniswap/src/features/transactions/types/transactionDetails.ts
+++ b/packages/uniswap/src/features/transactions/types/transactionDetails.ts
@@ -40,8 +40,8 @@ export type TransactionListQueryResponse = NonNullable<
>[0]
/**
- * Marks if a transaction was initiated natively within app, or from external source.
- * External transactions are initiated from dapps, WC, uwulink, etc.
+ * Marks if a transaction was initiated natively within app, or from external source.
+ * External transactions are initiated from dapps, WC, uwulink, etc.
*/
export enum TransactionOriginType {
Internal = 'internal',
@@ -52,7 +52,7 @@ interface BaseTransactionDetails extends TransactionId {
from: Address
transactionOriginType: TransactionOriginType
-
+
// Specific info for the tx type
typeInfo: TransactionTypeInfo
@@ -296,7 +296,7 @@ export interface OnRampTransactionInfo extends BaseTransactionInfo {
id: string
destinationTokenSymbol: string
destinationTokenAddress: string
- destinationTokenAmount?: number
+ destinationTokenAmount: number
serviceProvider: ServiceProviderInfo
// Fees are in units of the sourceCurrency for purchases,
// and in units of the destinationToken for transfers
@@ -308,7 +308,7 @@ export interface OnRampTransactionInfo extends BaseTransactionInfo {
export interface OnRampPurchaseInfo extends OnRampTransactionInfo {
type: TransactionType.OnRampPurchase
sourceCurrency: string
- sourceAmount?: number
+ sourceAmount: number
}
export interface OnRampTransferInfo extends OnRampTransactionInfo {
diff --git a/packages/uniswap/src/i18n/locales/translations/ko-KR.json b/packages/uniswap/src/i18n/locales/translations/ko-KR.json
index f511de7ffab..afa833f57e3 100644
--- a/packages/uniswap/src/i18n/locales/translations/ko-KR.json
+++ b/packages/uniswap/src/i18n/locales/translations/ko-KR.json
@@ -9,7 +9,7 @@
"account.cloud.error.backup.message": "권한 부족, 승인 중단 또는 클라우드 오류로 인해 백업을 가져오지 못했습니다.",
"account.cloud.error.backup.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.message.android": "이 기기에서 Google 드라이브를 활성화한 상태로 Google 계정에 로그인했는지 확인한 후 다시 시도해 주세요.",
"account.cloud.error.unavailable.message.ios": "이 기기에서 iCloud Drive가 활성화된 Apple ID로 로그인했는지 확인한 후 다시 시도하십시오.",
diff --git a/packages/wallet/src/components/accounts/AddressDisplay.tsx b/packages/wallet/src/components/accounts/AddressDisplay.tsx
index 8155008c2c0..e34e2326f17 100644
--- a/packages/wallet/src/components/accounts/AddressDisplay.tsx
+++ b/packages/wallet/src/components/accounts/AddressDisplay.tsx
@@ -43,6 +43,9 @@ type AddressDisplayProps = {
gapBetweenLines?: SpaceTokens
showViewOnlyLabel?: boolean
showViewOnlyBadge?: boolean
+
+ // TODO WALL-4545 Added flag to disable forced width causing trouble in other screens
+ disableForcedWidth?: boolean
}
type CopyButtonWrapperProps = {
@@ -89,6 +92,7 @@ export function AddressDisplay({
notificationsBadgeContainer,
includeUnitagSuffix = false,
gapBetweenLines = '$none',
+ disableForcedWidth = false,
}: AddressDisplayProps): JSX.Element {
const { t } = useTranslation()
const dispatch = useDispatch()
@@ -150,6 +154,7 @@ export function AddressDisplay({
{name}
{isUnitag && includeUnitagSuffix && (
diff --git a/packages/wallet/src/features/portfolio/AnimatedNumber.tsx b/packages/wallet/src/features/portfolio/AnimatedNumber.tsx
index b549f1dca5b..b3b3587ffd3 100644
--- a/packages/wallet/src/features/portfolio/AnimatedNumber.tsx
+++ b/packages/wallet/src/features/portfolio/AnimatedNumber.tsx
@@ -251,7 +251,7 @@ export const TopAndBottomGradient = (): JSX.Element => {
const SCREEN_WIDTH_BUFFER = 50
// Used for initial layout larger than all screen sizes
-const MAX_DEVICE_WIDTH = 1000
+const MAX_DEVICE_WIDTH = isWeb ? undefined : 1000
type AnimatedNumberProps = {
loadingPlaceholderText: string
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/OnRampTransferSummaryItem.tsx b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/OnRampTransferSummaryItem.tsx
index 9e25b39b197..30f8e4a4f13 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/OnRampTransferSummaryItem.tsx
+++ b/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/OnRampTransferSummaryItem.tsx
@@ -34,7 +34,7 @@ export function OnRampTransferSummaryItem({
const formatFiatTokenPrice = (purchaseInfo: OnRampPurchaseInfo): string => {
try {
return formatNumberOrString({
- value: purchaseInfo.sourceAmount,
+ value: purchaseInfo.sourceAmount > 0 ? purchaseInfo.sourceAmount : undefined,
type: NumberType.FiatTokenPrice,
currencyCode: purchaseInfo.sourceCurrency,
})
diff --git a/packages/wallet/src/features/transactions/send/SendReviewDetails.tsx b/packages/wallet/src/features/transactions/send/SendReviewDetails.tsx
index 018c7c6625d..d75cb1e59bd 100644
--- a/packages/wallet/src/features/transactions/send/SendReviewDetails.tsx
+++ b/packages/wallet/src/features/transactions/send/SendReviewDetails.tsx
@@ -254,6 +254,7 @@ export function SendReviewDetails({
{t('common.wallet.label')}