Merge branch 'october'

TalaoDAO · Aug 26, 2024 · be636a2 · be636a2
2 parents f9a4fb8 + 37b62cf
commit be636a2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/lib/app/shared/models/blockchain_network/etherlink_network.dart b/lib/app/shared/models/blockchain_network/etherlink_network.dart
@@ -42,7 +42,7 @@ class EtherlinkNetwork extends EthereumNetwork {
         chain: 'etherlink-testnet',
         chainId: 128123,
         rpcNodeUrl: 'https://node.ghostnet.etherlink.com',
-        title: 'Etherlink Testnet (Ghostnet)',
+        title: 'Etherlink Testnet',
         subTitle: 'This network is used to test protocol upgrades'
             ' (do not use it unless you are a developer).',
       );

diff --git a/lib/app/shared/widget/wallet_logo.dart b/lib/app/shared/widget/wallet_logo.dart
@@ -41,7 +41,7 @@ class WalletLogo extends StatelessWidget {
 
             final generalOptions = profileModel.profileSetting.generalOptions;
             image = isLightTheme
-                ? generalOptions.companyLogoLight
+                ? generalOptions.companyLogoLight ?? generalOptions.companyLogo
                 : generalOptions.companyLogo;
 
           case ProfileType.diipv2point1:

diff --git a/lib/dashboard/profile/cubit/profile_cubit.dart b/lib/dashboard/profile/cubit/profile_cubit.dart
@@ -536,7 +536,7 @@ class ProfileCubit extends Cubit<ProfileState> {
 
     ///company Logo Light
 
-    if (isURL(companyLogoLight)) {
+    if (companyLogoLight != null && isURL(companyLogoLight)) {
       try {
         final http.Response response =
             await http.get(Uri.parse(companyLogoLight));

diff --git a/lib/dashboard/profile/models/profile_setting.dart b/lib/dashboard/profile/models/profile_setting.dart
@@ -348,7 +348,6 @@ class GeneralOptions extends Equatable {
     required this.companyName,
     required this.companyWebsite,
     required this.companyLogo,
-    required this.companyLogoLight,
     required this.tagLine,
     this.splashScreenTitle,
     required this.profileName,
@@ -357,6 +356,7 @@ class GeneralOptions extends Equatable {
     required this.profileId,
     required this.customerPlan,
     this.primaryColor,
+    this.companyLogoLight,
   });
 
   factory GeneralOptions.fromJson(Map<String, dynamic> json) =>
@@ -367,7 +367,6 @@ class GeneralOptions extends Equatable {
         companyName: '',
         companyWebsite: '',
         companyLogo: '',
-        companyLogoLight: '',
         tagLine: '',
         splashScreenTitle: '',
         profileName: '',
@@ -382,7 +381,7 @@ class GeneralOptions extends Equatable {
   final String companyName;
   final String companyWebsite;
   final String companyLogo;
-  final String companyLogoLight;
+  final String? companyLogoLight;
   final String tagLine;
   final String? splashScreenTitle;
   final String profileName;