From 6c1b15eb6487627b1b9f65380bd5aefba35390ed Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:07:33 +0100 Subject: [PATCH 1/5] chore(wallet-mobile): bump version v5.0.0 --- apps/wallet-mobile/android/app/build.gradle | 4 ++-- apps/wallet-mobile/ios/nightly.plist | 4 ++-- apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj | 8 ++++---- apps/wallet-mobile/ios/yoroi/Info.plist | 4 ++-- apps/wallet-mobile/ios/yoroiTests/Info.plist | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle index df5d618f3b..7962bfcc90 100644 --- a/apps/wallet-mobile/android/app/build.gradle +++ b/apps/wallet-mobile/android/app/build.gradle @@ -108,8 +108,8 @@ android { applicationId "com.emurgo" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 711 - versionName "4.28.3" + versionCode 722 + versionName "5.0.0" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist index 8514a5dad1..fa2ecf1ae4 100644 --- a/apps/wallet-mobile/ios/nightly.plist +++ b/apps/wallet-mobile/ios/nightly.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.28.3 + 5.0.0 CFBundleSignature ???? CFBundleVersion - 598 + 609 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj index ee9f754781..c0365d0efa 100644 --- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj +++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj @@ -839,7 +839,7 @@ CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 598; + CURRENT_PROJECT_VERSION = 609; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -884,7 +884,7 @@ CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 598; + CURRENT_PROJECT_VERSION = 609; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.production"; @@ -1079,7 +1079,7 @@ CODE_SIGN_ENTITLEMENTS = nightly.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 598; + CURRENT_PROJECT_VERSION = 609; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1124,7 +1124,7 @@ CODE_SIGN_ENTITLEMENTS = nightly.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 598; + CURRENT_PROJECT_VERSION = 609; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.nightly"; diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist index ecd612f1e2..62130ccf45 100644 --- a/apps/wallet-mobile/ios/yoroi/Info.plist +++ b/apps/wallet-mobile/ios/yoroi/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.28.3 + 5.0.0 CFBundleSignature ???? CFBundleURLTypes @@ -34,7 +34,7 @@ CFBundleVersion - 598 + 609 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist index 398f20ca78..30af8019d6 100644 --- a/apps/wallet-mobile/ios/yoroiTests/Info.plist +++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 4.28.3 + 5.0.0 CFBundleSignature ???? CFBundleVersion - 598 + 609 From 30f654a975f44087e50423d76752624d0b5c42a3 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Mon, 7 Oct 2024 13:10:30 +0000 Subject: [PATCH 2/5] chore(release): nightly --- apps/wallet-mobile/android/app/build.gradle | 2 +- apps/wallet-mobile/ios/nightly.plist | 2 +- apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj | 8 ++++---- apps/wallet-mobile/ios/yoroi/Info.plist | 2 +- apps/wallet-mobile/ios/yoroiTests/Info.plist | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle index 7962bfcc90..e17bac61df 100644 --- a/apps/wallet-mobile/android/app/build.gradle +++ b/apps/wallet-mobile/android/app/build.gradle @@ -108,7 +108,7 @@ android { applicationId "com.emurgo" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 722 + versionCode 723 versionName "5.0.0" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist index fa2ecf1ae4..bfb97418cb 100644 --- a/apps/wallet-mobile/ios/nightly.plist +++ b/apps/wallet-mobile/ios/nightly.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 609 + 610 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj index c0365d0efa..2069522357 100644 --- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj +++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj @@ -839,7 +839,7 @@ CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 609; + CURRENT_PROJECT_VERSION = 610; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -884,7 +884,7 @@ CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 609; + CURRENT_PROJECT_VERSION = 610; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.production"; @@ -1079,7 +1079,7 @@ CODE_SIGN_ENTITLEMENTS = nightly.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 609; + CURRENT_PROJECT_VERSION = 610; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1124,7 +1124,7 @@ CODE_SIGN_ENTITLEMENTS = nightly.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 609; + CURRENT_PROJECT_VERSION = 610; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.nightly"; diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist index 62130ccf45..3f660bb24f 100644 --- a/apps/wallet-mobile/ios/yoroi/Info.plist +++ b/apps/wallet-mobile/ios/yoroi/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 609 + 610 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist index 30af8019d6..0b7db96fc6 100644 --- a/apps/wallet-mobile/ios/yoroiTests/Info.plist +++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 609 + 610 From db95b6583da0242ac62ce56d92f9bfb2e4a269f2 Mon Sep 17 00:00:00 2001 From: banklesss <105349292+banklesss@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:43:58 +0200 Subject: [PATCH 3/5] Update apps/wallet-mobile/src/components/Info/Info.tsx Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Signed-off-by: banklesss <105349292+banklesss@users.noreply.github.com> --- apps/wallet-mobile/src/components/Info/Info.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/wallet-mobile/src/components/Info/Info.tsx b/apps/wallet-mobile/src/components/Info/Info.tsx index 3dafd5e45e..b4272cc14e 100644 --- a/apps/wallet-mobile/src/components/Info/Info.tsx +++ b/apps/wallet-mobile/src/components/Info/Info.tsx @@ -8,7 +8,6 @@ import {Space} from '../Space/Space' type Props = { content: ReactNode iconSize?: number - blue?: boolean } export const Info = ({content, iconSize = 30}: Props) => { From 0a469028725d36e5de71ef8f3657612859be55f3 Mon Sep 17 00:00:00 2001 From: banklesss <105349292+banklesss@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:44:07 +0200 Subject: [PATCH 4/5] Update apps/wallet-mobile/src/components/Warning/Warning.tsx Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Signed-off-by: banklesss <105349292+banklesss@users.noreply.github.com> --- apps/wallet-mobile/src/components/Warning/Warning.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/wallet-mobile/src/components/Warning/Warning.tsx b/apps/wallet-mobile/src/components/Warning/Warning.tsx index 31751d5bb9..ce1a959985 100644 --- a/apps/wallet-mobile/src/components/Warning/Warning.tsx +++ b/apps/wallet-mobile/src/components/Warning/Warning.tsx @@ -8,7 +8,6 @@ import {Space} from '../Space/Space' type Props = { content: ReactNode iconSize?: number - blue?: boolean } export const Warning = ({content, iconSize = 30}: Props) => { From 37ee230bba4bb9e424023ccd8e34d947a61cbc86 Mon Sep 17 00:00:00 2001 From: Javier Bueno Date: Thu, 10 Oct 2024 12:03:17 +0200 Subject: [PATCH 5/5] CR: update --- .../useCases/ReviewTxScreen/Overview/OverviewTab.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx index 98fdb62c30..eed42fd24a 100644 --- a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx +++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/Overview/OverviewTab.tsx @@ -297,10 +297,7 @@ const ReceiverTokensSectionMultiReceiver = () => { - +