From 7733ecc56b4a9b29278e993c0fd96a4bba7a6c9f Mon Sep 17 00:00:00 2001
From: MarkNerdi <105642810+MarkNerdi@users.noreply.github.com>
Date: Mon, 7 Nov 2022 15:49:54 +0100
Subject: [PATCH] enhancement: nft send form improvements (#5157)

* enhancement: hide nft tab if wallet owns no nft

* fix: fix title on send confirmation

* enhancement: remove nft preview on send form

* enhancement: remove shimmer EVM from network list

* chore: remove shimmer evm

* fix: fix send popups titles
---
 .../popups/send/SendConfirmationPopup.svelte  |  3 +--
 .../popups/send/SendFormPopup.svelte          | 20 ++++++++-----------
 .../constants/network-address.constant.ts     |  4 ++--
 .../network/enums/destination-network.enum.ts |  2 +-
 packages/shared/locales/en.json               |  3 +--
 5 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/packages/shared/components/popups/send/SendConfirmationPopup.svelte b/packages/shared/components/popups/send/SendConfirmationPopup.svelte
index f64f5c9a08c..85cce4938d2 100644
--- a/packages/shared/components/popups/send/SendConfirmationPopup.svelte
+++ b/packages/shared/components/popups/send/SendConfirmationPopup.svelte
@@ -44,7 +44,6 @@
 
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
     export let disableBack = false
-    export let tokenSend = false
 
     let { recipient, expirationDate, giftStorageDeposit, surplus, disableChangeExpiration, disableToggleGift } =
         get(newTransactionDetails)
@@ -181,7 +180,7 @@
 
 <send-confirmation-popup class="w-full h-full space-y-6 flex flex-auto flex-col flex-shrink-0">
     <Text type={TextType.h3} fontWeight={FontWeight.semibold} classes="text-left"
-        >{localize(tokenSend ? 'popups.transaction.title' : 'popups.sendNft.confirmationTitle')}</Text
+        >{localize('popups.transaction.title')}</Text
     >
     <div class="w-full flex-col space-y-2">
         {#if transactionDetails.type === NewTransactionType.TokenTransfer}
diff --git a/packages/shared/components/popups/send/SendFormPopup.svelte b/packages/shared/components/popups/send/SendFormPopup.svelte
index aa306f4b448..cae3f6dc408 100644
--- a/packages/shared/components/popups/send/SendFormPopup.svelte
+++ b/packages/shared/components/popups/send/SendFormPopup.svelte
@@ -9,18 +9,11 @@
         NewTransactionType,
         setNewTransactionDetails,
     } from '@core/wallet'
-    import {
-        RecipientInput,
-        AssetAmountInput,
-        OptionalInput,
-        NetworkInput,
-        NftInput,
-        NftMediaSize,
-        NftMediaContainer,
-    } from 'shared/components'
+    import { RecipientInput, AssetAmountInput, OptionalInput, NetworkInput, NftInput } from 'shared/components'
     import { DestinationNetwork } from '@core/network'
     import { getByteLengthOfString } from '@core/utils'
     import { get } from 'svelte/store'
+    import { selectedAccount } from '@core/account'
 
     enum SendForm {
         SendToken = 'general.sendToken',
@@ -54,6 +47,8 @@
     let activeTab: SendForm =
         transactionDetails.type === NewTransactionType.TokenTransfer ? SendForm.SendToken : SendForm.SendNft
 
+    $: ownsNfts = $selectedAccount.balances.nfts.length > 0
+
     function getTransactionDetails(): NewTransactionDetails {
         if (activeTab === SendForm.SendToken) {
             return {
@@ -122,14 +117,15 @@
 
 <send-form-popup class="w-full h-full space-y-6 flex flex-auto flex-col flex-shrink-0">
     <Text type={TextType.h3} fontWeight={FontWeight.semibold} classes="text-left">
-        {localize('general.sendAsset')}
+        {localize('popups.transaction.title')}
     </Text>
-    <Tabs bind:activeTab {tabs} />
+    {#if ownsNfts}
+        <Tabs bind:activeTab {tabs} />
+    {/if}
     <send-form-inputs class="flex flex-col space-y-4">
         {#if activeTab === SendForm.SendToken}
             <AssetAmountInput bind:this={assetAmountInput} bind:asset bind:rawAmount bind:unit />
         {:else}
-            <NftMediaContainer {nftId} size={NftMediaSize.Medium} />
             <NftInput bind:nftId />
         {/if}
         <NetworkInput bind:network />
diff --git a/packages/shared/lib/core/network/constants/network-address.constant.ts b/packages/shared/lib/core/network/constants/network-address.constant.ts
index 5f76210c756..4785a3baf01 100644
--- a/packages/shared/lib/core/network/constants/network-address.constant.ts
+++ b/packages/shared/lib/core/network/constants/network-address.constant.ts
@@ -3,10 +3,10 @@ import { DestinationNetwork, NetworkType } from '../enums'
 export const NETWORK_ADDRESS: Readonly<{ [key in NetworkType]?: { [key in DestinationNetwork]?: string } }> = {
     [NetworkType.Mainnet]: {
         [DestinationNetwork.Shimmer]: '-',
-        [DestinationNetwork.ShimmerEvm]: 'TO_DO',
+        // [DestinationNetwork.ShimmerEvm]: 'TO_DO',
     },
     [NetworkType.Devnet]: {
         [DestinationNetwork.Shimmer]: '-',
-        [DestinationNetwork.ShimmerEvm]: 'rms1qrut5ajyfrtgjs325kd9chwfwyyy2z3fewy4vgy0vvdtf2pr8prg5u3zwjn',
+        // [DestinationNetwork.ShimmerEvm]: 'rms1qrut5ajyfrtgjs325kd9chwfwyyy2z3fewy4vgy0vvdtf2pr8prg5u3zwjn',
     },
 }
diff --git a/packages/shared/lib/core/network/enums/destination-network.enum.ts b/packages/shared/lib/core/network/enums/destination-network.enum.ts
index e330ad186b1..3310d2cdaaf 100644
--- a/packages/shared/lib/core/network/enums/destination-network.enum.ts
+++ b/packages/shared/lib/core/network/enums/destination-network.enum.ts
@@ -1,4 +1,4 @@
 export enum DestinationNetwork {
     Shimmer = 'Shimmer',
-    ShimmerEvm = 'Shimmer EVM',
+    // ShimmerEvm = 'Shimmer EVM',
 }
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
index 88f3ac94a77..26f6bbf9748 100644
--- a/packages/shared/locales/en.json
+++ b/packages/shared/locales/en.json
@@ -726,7 +726,7 @@
             "userPath": "User Path"
         },
         "transaction": {
-            "title": "Confirm transaction",
+            "title": "Send asset",
             "body": "You’re about to send {amount} to",
             "surplusIncluded": "This transaction contains a surplus amount. Please double check this is the amount you want to send.",
             "sendingFromStakedAccount": "You are sending a transfer from a wallet that is currently being staked. This may unstake your tokens. Feel free to send the transfer but you may need to restake your remaining tokens afterwards.",
@@ -1141,7 +1141,6 @@
         "sendFunds": "Send funds",
         "sendTokensToAddress": "Send tokens to an address",
         "sendToAddress": "Send to address",
-        "sendAsset": "Send asset",
         "sendToken": "Send token",
         "sendNft": "Send NFT",
         "sendNftToAddress": "Send NFT to an address",