update build numbers (#1441)

* update build numbers * fix UI issue * Add Nano to secret generation properly [skip ci] * remove to utc from expiration time
cake-tech · May 10, 2024 · 678dc3b · 678dc3b
1 parent cfe4401
commit 678dc3b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/cw_tron/lib/tron_client.dart b/cw_tron/lib/tron_client.dart
@@ -208,7 +208,7 @@ class TronClient {
         TransactionContract(type: contract.contractType, parameter: parameter);
 
     // Set the transaction expiration time (maximum 24 hours)
-    final expireTime = DateTime.now().toUtc().add(const Duration(hours: 24));
+    final expireTime = DateTime.now().add(const Duration(hours: 24));
 
     // Create a raw transaction
     TransactionRaw rawTransaction = TransactionRaw(
@@ -369,7 +369,7 @@ class TronClient {
         TransactionContract(type: contract.contractType, parameter: parameter);
 
     // Set the transaction expiration time (maximum 24 hours)
-    final expireTime = DateTime.now().toUtc().add(const Duration(hours: 24));
+    final expireTime = DateTime.now().add(const Duration(hours: 24));
 
     // Create a raw transaction
     TransactionRaw rawTransaction = TransactionRaw(

diff --git a/lib/src/screens/dashboard/pages/balance_page.dart b/lib/src/screens/dashboard/pages/balance_page.dart
@@ -69,14 +69,14 @@ class BalancePage extends StatelessWidget {
                       ),
                       labelColor:
                           Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
-                      dividerColor:
-                          Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                      dividerColor: Colors.transparent,
                       indicatorColor:
                           Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
                       unselectedLabelColor: Theme.of(context)
                           .extension<DashboardPageTheme>()!
                           .pageTitleTextColor
                           .withOpacity(0.5),
+                      tabAlignment: TabAlignment.start,
                       tabs: [
                         Tab(text: 'My Crypto'),
                         Tab(text: 'My NFTs'),
@@ -351,7 +351,7 @@ class BalanceRowWidget extends StatelessWidget {
                           style: TextStyle(
                               fontSize: 16,
                               fontFamily: 'Lato',
-                             fontWeight: FontWeight.w500,
+                              fontWeight: FontWeight.w500,
                               color: Theme.of(context).extension<BalancePageTheme>()!.textColor,
                               height: 1)),
                     ],

diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-               BuildableName = "Monero.com.app"
+               BuildableName = "Cake Wallet.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "Monero.com.app"
+            BuildableName = "Cake Wallet.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -54,7 +54,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "Monero.com.app"
+            BuildableName = "Cake Wallet.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -71,7 +71,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "Monero.com.app"
+            BuildableName = "Cake Wallet.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>

diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
@@ -16,14 +16,14 @@ APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
 MONERO_COM_VERSION="1.13.0"
-MONERO_COM_BUILD_NUMBER=85
+MONERO_COM_BUILD_NUMBER=86
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.16.0"
-CAKEWALLET_BUILD_NUMBER=208
+CAKEWALLET_BUILD_NUMBER=209
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"

diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
@@ -14,12 +14,12 @@ APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
 MONERO_COM_VERSION="1.13.0"
-MONERO_COM_BUILD_NUMBER=83
+MONERO_COM_BUILD_NUMBER=84
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.16.0"
-CAKEWALLET_BUILD_NUMBER=234
+CAKEWALLET_BUILD_NUMBER=236
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"

diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
@@ -17,12 +17,12 @@ fi
 
 MONERO_COM_NAME="Monero.com"
 MONERO_COM_VERSION="1.3.0"
-MONERO_COM_BUILD_NUMBER=17
+MONERO_COM_BUILD_NUMBER=18
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="1.9.0"
-CAKEWALLET_BUILD_NUMBER=69
+CAKEWALLET_BUILD_NUMBER=70
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then

diff --git a/tool/import_secrets_config.dart b/tool/import_secrets_config.dart
@@ -13,6 +13,9 @@ const solanaOutputPath = 'cw_solana/lib/.secrets.g.dart';
 
 const tronConfigPath = 'tool/.tron-secrets-config.json';
 const tronOutputPath = 'cw_tron/lib/.secrets.g.dart';
+
+const nanoConfigPath = 'tool/.nano-secrets-config.json';
+const nanoOutputPath = 'cw_nano/lib/.secrets.g.dart';
 Future<void> main(List<String> args) async => importSecretsConfig();
 
 Future<void> importSecretsConfig() async {
@@ -37,6 +40,11 @@ Future<void> importSecretsConfig() async {
   final tronOutput =
       tronInput.keys.fold('', (String acc, String val) => acc + generateConst(val, tronInput));
 
+  final nanoOutputFile = File(nanoOutputPath);
+  final nanoInput = json.decode(File(nanoConfigPath).readAsStringSync()) as Map<String, dynamic>;
+  final nanoOutput =
+      nanoInput.keys.fold('', (String acc, String val) => acc + generateConst(val, nanoInput));
+
   if (outputFile.existsSync()) {
     await outputFile.delete();
   }
@@ -60,4 +68,10 @@ Future<void> importSecretsConfig() async {
   }
 
   await tronOutputFile.writeAsString(tronOutput);
+
+  if (nanoOutputFile.existsSync()) {
+    await nanoOutputFile.delete();
+  }
+
+  await nanoOutputFile.writeAsString(nanoOutput);
 }