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.

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

Update app btns & QR code #3681

Merged
merged 15 commits into from
Dec 10, 2024

Conversation

amiraabouhadid
Copy link
Contributor

@amiraabouhadid amiraabouhadid commented Nov 25, 2024

Changes

  • added white icons in light mode
  • extracted qr and playstore btns in a component
  • used component in deposit dialog and in profile manager

Related Issues

#3648

Tested Scenarios

  • in light and dark mode do the following:
    - clicked on playstore and app store btns, see that they redirect to correct threefold connect play store and app store pages respectively
    - open up threefold connect app, go to wallet, send page, scan qr code see that it adds correct twin id

Checklist

  • Screenshots/Video attached (needed for UI changes)
    image
    image

@amiraabouhadid amiraabouhadid changed the base branch from development to development_2.7 November 25, 2024 17:57
@amiraabouhadid amiraabouhadid marked this pull request as ready for review November 25, 2024 18:00
@amiraabouhadid amiraabouhadid changed the title Update app btns Update app btns & QR code Nov 25, 2024
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

i don't think this image is the best option, to avoid that can we have both in dark ?
as in the prfile manager
image

@amiraabouhadid amiraabouhadid requested a review from 0oM4R November 27, 2024 06:29
Copy link
Contributor

@0oM4R 0oM4R left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

execuse my ocd but i think we should make both of them on same size

@amiraabouhadid amiraabouhadid marked this pull request as draft December 2, 2024 09:35
@amiraabouhadid amiraabouhadid marked this pull request as draft December 2, 2024 09:35
@amiraabouhadid amiraabouhadid marked this pull request as ready for review December 2, 2024 11:01
@@ -94,6 +94,8 @@ const props = defineProps({
openDepositDialog: Boolean,
twinId: Number,
});
const qrHeader = `<b> OR </b>
<p class="mb-3">Use ThreeFold Connect to scan this QRcode:</p>`;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think the best practice is to use slot,

@amiraabouhadid amiraabouhadid requested a review from 0oM4R December 2, 2024 15:50
Copy link
Contributor

@0oM4R 0oM4R left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great work
i notice that we changed the style

</template>
<script setup lang="ts">
const props = defineProps({
qr: String,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! we can use this component to have the login QR code as well!

Comment on lines 391 to 393
Scan the QR code using
<a class="app-link" :href="manual.tf_connect_app" target="_blank"> ThreeFold Connect </a>
to fund your account
</p>
<QrcodeGenerator
:data="'TFT:' + bridge + '?message=twin_' + profileManager.profile.twinId + '&sender=me&amount=100'"
/>
<div class="d-flex justify-center my-4">
<a
v-for="app in apps"
:key="app.alt"
:style="{ cursor: 'pointer', width: '9rem' }"
class="app-btn mr-2"
:title="app.alt"
v-html="app.src"
:href="app.url"
target="_blank"
/>
</div>
<a class="app-link" :href="manual.tf_connect_app" target="_blank">Threefold Connect</a> to fund your
account.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please wrap those lines with a p tag

Comment on lines 192 to 194
Scan the QR code using
<a class="app-link" :href="manual.tf_connect_app" target="_blank">Threefold Connect</a> to fund your
account.</QRPlayStore
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please wrap this text with p tag as well

@amiraabouhadid amiraabouhadid requested a review from 0oM4R December 10, 2024 06:50
@@ -1,6 +1,6 @@
<template>
<div class="d-flex flex-column text-center align-center">
<slot></slot>
<p><slot></slot></p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we wrapping the slot itself? we should put the tag element on the slot content right ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's the same

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my idea was if we need to reuse this component with another content inside the slot whatever the content is will be inside a p tag, anyways thank you and great work

@amiraabouhadid amiraabouhadid merged commit aa4ef9d into development_2.7 Dec 10, 2024
10 checks passed
@amiraabouhadid amiraabouhadid deleted the development_2.7_fix_google_play_btn branch December 10, 2024 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants