From 8777904fabe7e84099a19823a863170d08a3bfb0 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Tue, 24 Sep 2024 17:53:44 +0200
Subject: [PATCH] fix: design review

---
 .../members/+page.svelte                      | 50 ++++++++++---------
 .../members/edit.svelte                       |  2 +-
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
index da1733c63..520bdd64e 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -25,6 +25,7 @@
     import { getRoleLabel, upgradeURL } from '$lib/stores/billing';
     import { BillingPlan } from '$lib/constants';
     import { isCloud } from '$lib/system';
+    import { Button } from '$lib/elements/forms';
 
     export let data: PageData;
 
@@ -93,7 +94,7 @@
                                                     >Pro plan</span>
                                             {/if}
                                         </p>
-                                        {#if $organization?.billingPlan != BillingPlan.FREE}
+                                        {#if $organization?.billingPlan !== BillingPlan.FREE}
                                             <p>
                                                 Owner, Developer <span
                                                     class="inline-tag u-normal u-x-small"
@@ -101,26 +102,28 @@
                                                 >, Editor, Analyst, Billing.
                                             </p>
                                             <p class="">
-                                                <a
-                                                    class="link"
+                                                <Button
+                                                    link
                                                     href="http://appwrite.io/docs/roles"
-                                                    target="_blank"
-                                                    rel="noopener noreferrer">Learn more</a> about roles.
+                                                    external>Learn more</Button> about roles.
                                             </p>
                                         {:else}
                                             <p>
                                                 Owner, <span class="u-color-text-disabled"
                                                     >Developer, Editor, Analyst.</span>
                                             </p>
-                                            <p class="u-flex u-main-end u-cross-center u-gap-12">
-                                                <a
-                                                    class="button is-text"
+                                            <div
+                                                class="u-flex u-main-end u-cross-center u-gap-12 u-margin-block-start-16">
+                                                <Button
+                                                    text
                                                     href="http://appwrite.io/docs/roles"
-                                                    target="_blank"
-                                                    rel="noopener noreferrer">Learn more</a>
-                                                <a class="button is-secondary" href={$upgradeURL}
-                                                    >Upgrade plan</a>
-                                            </p>
+                                                    external>
+                                                    Learn more
+                                                </Button>
+                                                <Button secondary href={$upgradeURL}>
+                                                    Upgrade plan
+                                                </Button>
+                                            </div>
                                         {/if}
                                     {:else}
                                         <p>
@@ -132,17 +135,18 @@
                                             Upgrade to Cloud to assign new roles to members or ask
                                             us about our entriprise self hosted offering.
                                         </p>
-                                        <p class="u-flex u-main-end u-cross-center u-gap-12">
-                                            <a
-                                                class="button is-text"
+                                        <div
+                                            class="u-flex u-main-end u-cross-center u-gap-12 u-margin-block-start-16">
+                                            <Button
+                                                text
                                                 href="http://appwrite.io/docs/roles"
-                                                target="_blank"
-                                                rel="noopener noreferrer">Learn more</a>
-                                            <a
-                                                class="button is-secondary"
-                                                href="https://cloud.appwrite.io"
-                                                >Upgrade to Cloud</a>
-                                        </p>
+                                                external>
+                                                Learn more
+                                            </Button>
+                                            <Button secondary href="https://cloud.appwrite.io">
+                                                Upgrade to Cloud
+                                            </Button>
+                                        </div>
                                     {/if}
                                 </div>
                             </svelte:fragment>
diff --git a/src/routes/(console)/organization-[organization]/members/edit.svelte b/src/routes/(console)/organization-[organization]/members/edit.svelte
index 57b2e0da8..687404c74 100644
--- a/src/routes/(console)/organization-[organization]/members/edit.svelte
+++ b/src/routes/(console)/organization-[organization]/members/edit.svelte
@@ -57,7 +57,7 @@
             showEdit = false;
             addNotification({
                 type: 'success',
-                message: `Role updated`
+                message: `Role has been updated`
             });
             trackEvent(Submit.MembershipUpdate);
             dispatch('updated', membership);