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: update instance card #83

Merged
merged 2 commits into from
Jan 30, 2023
Merged

fix: update instance card #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5955a04
feat: handle button manage dashboard
nekaartajaya Jan 30, 2023
042a229
feat: update deregister modal
nekaartajaya Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/molecules/CardInstance/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,11 @@ export default function CardInstance(props: CardInstanceInterface) {
onClick={handleExpand}
label={`${expand ? 'Hide' : 'View'} Staked Assets`}
/>
<Button onClick={null} label={'Manage Dashboard'} primary />
<Button
onClick={onClick}
label={'Manage Dashboard'}
primary
/>
</div>
</div>
</>
Expand Down
33 changes: 20 additions & 13 deletions src/components/molecules/Staked/Deregister.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,32 @@ export const Deregister = () => {
>
<div className="min-h-[200px] mt-6">
<div className="text-base text-darkGray text-justify mb-5">
By De-Registering your Instance:
<p className="mb-4">
Please make sure you have enough $MYRIA to cover the
De-Registration gas fees.
</p>
<p className="mb-4">
Please carefully consider the following before deciding to unstake
your $MYRIA tokens:
</p>
<ol className="list-decimal pl-4 my-4 gap-y-4">
<li className="mb-3">
The federated social media you have registered with will be
delisted from the official list.
<li className="mb-4">
De-Registering your Instance will remove it from the official
Myriad Federation List, and it will not be eligible for future
rewards.
</li>
<li className="mb-3">
You will get your staked $MYRIA back after 24 hours.
<li className="mb-4">
Your previously staked $MYRIA tokens will be returned to you
after a 24 hours lock period.
</li>
<li className="mb-3">
You will need to claim your reward manually.
<li className="mb-4">
You will still be able to claim your Instance’s unclaimed
rewards.
</li>
<li className="mb-3">
You can still claim the remaining rewards even after
de-registering your instance.
<li className="mb-4">
Claiming unclaimed rewards must be done manually.
</li>
</ol>
Make sure you have enough $MYRIA to pay for the gas fee. Please
consider this carefully before deciding to unstake your $MYRIA.
</div>
<div className="mb-5">
<Gasfee amount="0.0001" />
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/Instance/InstanceList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const InstanceList: React.FC<InstanceListProps> = ({
return (
<CardInstance
key={server.id}
// onClick={handleSignIn(server)}
onClick={handleSignIn(server)}
serverName={server?.detail?.name ?? 'Unknown Instance'}
serverDetail={`by ${addressFormatter({
text: accountId,
Expand Down