Skip to content

Commit

Permalink
Merge pull request #9 from claudebarde/staging
Browse files Browse the repository at this point in the history
Fixed UI bug in SendToken page
  • Loading branch information
claudebarde authored Jul 4, 2021
2 parents 0f71205 + 79c4676 commit 6e91631
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
4 changes: 3 additions & 1 deletion src/lib/Investments/Investments.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@
</button>
</div>
<div>
<button class="button investments">Harvest all</button>
<!--
<button class="button investments">Harvest all</button>
-->
</div>
</div>
<div class="row header">
Expand Down
12 changes: 7 additions & 5 deletions src/lib/Investments/Row.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,13 @@
{/if}
</div>
<div>
<ManagePlenty
contractAddress={data.address[$store.network]}
alias={data.alias}
id={data.id}
/>
<!--
<ManagePlenty
contractAddress={data.address[$store.network]}
alias={data.alias}
id={data.id}
/>
-->
</div>
{:else if platform === "crunchy"}
<!-- CRUNCHY FARMS have a zero balance but data in the info array -->
Expand Down
7 changes: 3 additions & 4 deletions src/lib/Tools/SendToken.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import { validateAddress } from "@taquito/utils";
import store from "../../store";
import Modal from "../Modal/Modal.svelte";
import FeeDisclaimer from "../Modal/FeeDisclaimer.svelte";
import { fetchAddressFromTezosDomain } from "../../utils";
export let tokenSymbol;
Expand Down Expand Up @@ -178,17 +177,17 @@
<div>{recipient}</div>
</div>
<div slot="modal-footer" class="modal-footer">
<FeeDisclaimer />
<div />
<div class="buttons">
<button
class="button default"
class="button main"
on:click={() => {
openSendConfirmation = false;
}}
>
Close
</button>
<button class="button default" on:click={confirm}> Confirm </button>
<button class="button main" on:click={confirm}> Confirm </button>
</div>
</div>
</Modal>
Expand Down
2 changes: 2 additions & 0 deletions src/lib/Tools/Settings.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
{/each}
</datalist>
</div>
<!--
<div>Allow contribution</div>
<FeeDisclaimer />
<div>Allow Push Notifications</div>
Expand Down Expand Up @@ -108,6 +109,7 @@
<option value="https://teznode.letzbake.com/">LetzBake!</option>
</datalist>
</div>
-->
</div>
</div>
<div slot="modal-footer" class="modal-footer">
Expand Down

0 comments on commit 6e91631

Please sign in to comment.