From e01cef5df7380c22a1b9fe8ececadd53f7020d79 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 3 Apr 2023 20:27:46 -0600
Subject: [PATCH] desktop token receive view update

---
 .../wallet_view/desktop_token_view.dart            |  5 +++++
 .../wallet_view/sub_widgets/desktop_receive.dart   | 14 ++++++++++----
 .../wallet_view/sub_widgets/my_wallet.dart         |  3 +++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart
index 70f319cf1..d268474d3 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart
@@ -175,6 +175,11 @@ class _DesktopTokenViewState extends ConsumerState<DesktopTokenView> {
                     width: 450,
                     child: MyWallet(
                       walletId: widget.walletId,
+                      contractAddress: ref.watch(
+                        tokenServiceProvider.select(
+                          (value) => value!.tokenContract.address,
+                        ),
+                      ),
                     ),
                   ),
                   const SizedBox(
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
index 064c31a08..5ac5bafce 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
@@ -7,13 +7,13 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:stackwallet/notifications/show_flush_bar.dart';
 import 'package:stackwallet/pages/receive_view/generate_receiving_uri_qr_code_view.dart';
+import 'package:stackwallet/pages/token_view/token_view.dart';
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/route_generator.dart';
 import 'package:stackwallet/utilities/assets.dart';
 import 'package:stackwallet/utilities/clipboard_interface.dart';
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
-import 'package:stackwallet/utilities/enums/flush_bar_type.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
 import 'package:stackwallet/utilities/util.dart';
@@ -28,10 +28,12 @@ class DesktopReceive extends ConsumerStatefulWidget {
   const DesktopReceive({
     Key? key,
     required this.walletId,
+    this.contractAddress,
     this.clipboard = const ClipboardWrapper(),
   }) : super(key: key);
 
   final String walletId;
+  final String? contractAddress;
   final ClipboardInterface clipboard;
 
   @override
@@ -149,7 +151,11 @@ class _DesktopReceiveState extends ConsumerState<DesktopReceive> {
                     Row(
                       children: [
                         Text(
-                          "Your ${coin.ticker} address",
+                          "Your ${widget.contractAddress == null ? coin.ticker : ref.watch(
+                              tokenServiceProvider.select(
+                                (value) => value!.tokenContract.symbol,
+                              ),
+                            )} address",
                           style: STextStyles.itemSubtitle(context),
                         ),
                         const Spacer(),
@@ -199,11 +205,11 @@ class _DesktopReceiveState extends ConsumerState<DesktopReceive> {
             ),
           ),
         ),
-        if (coin != Coin.epicCash)
+        if (coin != Coin.epicCash && coin != Coin.ethereum)
           const SizedBox(
             height: 20,
           ),
-        if (coin != Coin.epicCash)
+        if (coin != Coin.epicCash && coin != Coin.ethereum)
           SecondaryButton(
             buttonHeight: ButtonHeight.l,
             onPressed: generateNewAddress,
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/my_wallet.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/my_wallet.dart
index 6813d42cc..25eb715e4 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/my_wallet.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/my_wallet.dart
@@ -10,9 +10,11 @@ class MyWallet extends StatefulWidget {
   const MyWallet({
     Key? key,
     required this.walletId,
+    this.contractAddress,
   }) : super(key: key);
 
   final String walletId;
+  final String? contractAddress;
 
   @override
   State<MyWallet> createState() => _MyWalletState();
@@ -76,6 +78,7 @@ class _MyWalletState extends State<MyWallet> {
               padding: const EdgeInsets.all(20),
               child: DesktopReceive(
                 walletId: widget.walletId,
+                contractAddress: widget.contractAddress,
               ),
             ),
             crossFadeState: _selectedIndex == 0