Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: send flow polishing #5161

Merged
merged 5 commits into from Nov 8, 2022
Merged

fix: send flow polishing #5161

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26c8e65
fix: spacing on send form
nicole-obrien Nov 8, 2022
d18905d
fix: text on send button
nicole-obrien Nov 8, 2022
d7e8604
fix: update action button locales on send flow
nicole-obrien Nov 8, 2022
cadf273
Update packages/shared/locales/en.json
nicole-obrien Nov 8, 2022
b031c88
Merge branch 'stardust-develop' into fix/send-flow-polishing
nicole-obrien Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/desktop/components/SendButton.svelte
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
</script>

<OnboardingButton
primaryText={localize('general.sendFunds')}
secondaryText={localize('general.sendTokensToAddress')}
primaryText={localize('general.sendAssets')}
secondaryText={localize('general.sendAssetToAddress')}
onClick={onSendClick}
/>
2 changes: 1 addition & 1 deletion packages/shared/components/popups/send/SendConfirmationPopup.svelte
View file
Open in desktop
Expand Up @@ -247,7 +247,7 @@
{/if}

<Button classes="w-full" onClick={onConfirm} disabled={isTransferring} isBusy={isTransferring}>
{localize('actions.confirm')}
{localize('actions.send')}
</Button>
</popup-buttons>
</send-confirmation-popup>
8 changes: 4 additions & 4 deletions packages/shared/components/popups/send/SendFormPopup.svelte
View file
Open in desktop
Expand Up @@ -119,10 +119,10 @@
<Text type={TextType.h3} fontWeight={FontWeight.semibold} classes="text-left">
{localize('popups.transaction.title')}
</Text>
{#if ownsNfts}
<Tabs bind:activeTab {tabs} />
{/if}
<send-form-inputs class="flex flex-col space-y-4">
{#if ownsNfts}
<Tabs bind:activeTab {tabs} />
{/if}
{#if activeTab === SendForm.SendToken}
<AssetAmountInput bind:this={assetAmountInput} bind:asset bind:rawAmount bind:unit />
{:else}
Expand Down Expand Up @@ -150,7 +150,7 @@
{localize('actions.cancel')}
</Button>
<Button classes="w-full" onClick={onContinue}>
{localize('actions.send')}
{localize('actions.next')}
</Button>
</popup-buttons>
</send-form-popup>
4 changes: 2 additions & 2 deletions packages/shared/locales/en.json
View file
Open in desktop
Expand Up @@ -1138,8 +1138,8 @@
"sendPayment": "Send Payment",
"moveFunds": "Internal Transfer",
"sendTo": "Send To",
"sendFunds": "Send funds",
"sendTokensToAddress": "Send tokens to an address",
"sendAssets": "Send assets",
"sendAssetToAddress": "Send asset to an address or wallet",
nicole-obrien marked this conversation as resolved.
Show resolved Hide resolved
"sendToAddress": "Send to address",
"sendToken": "Send token",
"sendNft": "Send NFT",
Expand Down