From fccee88c11ef65a60aa686a982ee7bcc72c5f804 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Mon, 7 Nov 2022 14:00:43 +0100 Subject: [PATCH 1/6] enhancement: hide nft tab if wallet owns no nft --- .../shared/components/popups/send/SendFormPopup.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/shared/components/popups/send/SendFormPopup.svelte b/packages/shared/components/popups/send/SendFormPopup.svelte index aa306f4b448..361430aecf4 100644 --- a/packages/shared/components/popups/send/SendFormPopup.svelte +++ b/packages/shared/components/popups/send/SendFormPopup.svelte @@ -21,6 +21,7 @@ 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 +55,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 { @@ -124,7 +127,9 @@ {localize('general.sendAsset')} - + {#if ownsNfts} + + {/if} {#if activeTab === SendForm.SendToken} From a7f76ec2620fb81b0e075f78ef1f0f8fdc9fa642 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Mon, 7 Nov 2022 14:02:25 +0100 Subject: [PATCH 2/6] fix: fix title on send confirmation --- .../shared/components/popups/send/SendConfirmationPopup.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 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 = async () => {} export let disableBack = false - export let tokenSend = false let { recipient, expirationDate, giftStorageDeposit, surplus, disableChangeExpiration, disableToggleGift } = get(newTransactionDetails) @@ -181,7 +180,7 @@ {localize(tokenSend ? 'popups.transaction.title' : 'popups.sendNft.confirmationTitle')}{localize('popups.transaction.title')}
{#if transactionDetails.type === NewTransactionType.TokenTransfer} From 0de224881a2249dc3ec48791b4f0fa5958b39e7f Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Mon, 7 Nov 2022 14:11:27 +0100 Subject: [PATCH 3/6] enhancement: remove nft preview on send form --- .../components/popups/send/SendFormPopup.svelte | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/shared/components/popups/send/SendFormPopup.svelte b/packages/shared/components/popups/send/SendFormPopup.svelte index 361430aecf4..a29260344f1 100644 --- a/packages/shared/components/popups/send/SendFormPopup.svelte +++ b/packages/shared/components/popups/send/SendFormPopup.svelte @@ -9,15 +9,7 @@ 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' @@ -134,7 +126,6 @@ {#if activeTab === SendForm.SendToken} {:else} - {/if} From 513aefa8948b899e80bd58aec37f1fb23db0aca8 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Mon, 7 Nov 2022 14:27:23 +0100 Subject: [PATCH 4/6] enhancement: remove shimmer EVM from network list --- .../shared/lib/core/network/enums/destination-network.enum.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', } From 2a0b2ceb9a790c2bb164a0161b555e319de8ba2b Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Mon, 7 Nov 2022 14:42:00 +0100 Subject: [PATCH 5/6] chore: remove shimmer evm --- .../lib/core/network/constants/network-address.constant.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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', }, } From ad54322c40e4fef2016ed1ac1765dbf5ffc636c2 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Mon, 7 Nov 2022 15:39:55 +0100 Subject: [PATCH 6/6] fix: fix send popups titles --- packages/shared/components/popups/send/SendFormPopup.svelte | 2 +- packages/shared/locales/en.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/shared/components/popups/send/SendFormPopup.svelte b/packages/shared/components/popups/send/SendFormPopup.svelte index a29260344f1..cae3f6dc408 100644 --- a/packages/shared/components/popups/send/SendFormPopup.svelte +++ b/packages/shared/components/popups/send/SendFormPopup.svelte @@ -117,7 +117,7 @@ - {localize('general.sendAsset')} + {localize('popups.transaction.title')} {#if ownsNfts} 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",