Merge branch 'main' into Protocol-8-changes

Author: TinaKT

source/mainnet/conf.py

@@ -632,5 +632,7 @@
     "docs/network/guides/concordium-client" : "/en/mainnet/tools/concordium-client.html",
     "tutorials/piggy-bank/wCCD-frontend-set-up" : "/en/mainnet/tutorials/piggy-bank/frontend.html",
     "net/resources/bw-licenses" : "/en/mainnet/docs/guides/cryptox-terms.html",
-    "net/guides/legal" : "/en/mainnet/docs/guides/cryptox-terms.html"
+    "net/guides/legal" : "/en/mainnet/docs/guides/cryptox-terms.html",
+    "net/guides/export-key" : "/en/mainnet/docs/guides/export-key.html",
+    "smart-contracts/guides/on-chain-index" : "/en/mainnet/docs/smart-contracts/introduction.html"
     }

source/mainnet/docs/browser-wallet/setup-browser-wallet.rst

@@ -33,11 +33,21 @@ Get started
 
    #. Click on the puzzle icon. Click **Concordium Wallet** to start the extension.
 
-   #. Create a six-digit passcode or use a full password.
+   #. Click **Get started** on the welcome page.
+
+      .. image:: ../images/browser-wallet/new/welcome_page.png
+            :alt: Welcome screen
+            :width: 50%
+
+   #. Create a six-digit passcode or use a full password. Click **Continue**.
+
+      .. image:: ../images/browser-wallet/new/create_passcode.png
+            :alt: screen for setting up passcode
+            :width: 50%
 
    #. Choose whether you are creating a new wallet or :ref:`recovering an existing one<recover-wallet>`.
 
-      .. image:: ../images/browser-wallet/wallet-choice.png
+      .. image:: ../images/browser-wallet/new/create_restore.png
             :alt: screen with option to create or restore
             :width: 50%
 
@@ -55,11 +65,21 @@ Get started
 
    #. Click on the Concordium icon to start the extension.
 
+   #. Click **Get started** on the welcome page.
+
+      .. image:: ../images/browser-wallet/new/welcome_page.png
+            :alt: Welcome screen
+            :width: 50%
+
    #. Create a six-digit passcode or use a full password.
 
+      .. image:: ../images/browser-wallet/new/create_passcode.png
+            :alt: screen for setting up passcode
+            :width: 50%
+
    #. Choose whether you are creating a new wallet or :ref:`recovering an existing one<recover-wallet>`.
 
-      .. image:: ../images/browser-wallet/wallet-choice.png
+      .. image:: ../images/browser-wallet/new/create_restore.png
             :alt: screen with option to create or restore
             :width: 50%
 
@@ -75,11 +95,21 @@ Get started
 
    #. Click on the cube icon in your Opera toolbar. Click **Concordium Wallet** to start the extension.
 
+   #. Click **Get started** on the welcome page.
+
+      .. image:: ../images/browser-wallet/new/welcome_page.png
+            :alt: Welcome screen
+            :width: 50%
+
    #. Create a six-digit passcode or use a full password.
 
+      .. image:: ../images/browser-wallet/new/create_passcode.png
+            :alt: screen for setting up passcode
+            :width: 50%
+
    #. Choose whether you are creating a new wallet or :ref:`recovering an existing one<recover-wallet>`.
 
-      .. image:: ../images/browser-wallet/wallet-choice.png
+      .. image:: ../images/browser-wallet/new/create_restore.png
             :alt: screen with option to create or restore
             :width: 50%
 
@@ -93,11 +123,21 @@ Get started
 
    #. Click on the puzzle icon. Click **Concordium Wallet** to start the extension.
 
+   #. Click **Get started** on the welcome page.
+
+      .. image:: ../images/browser-wallet/new/welcome_page.png
+            :alt: Welcome screen
+            :width: 50%
+
    #. Create a six-digit passcode or use a full password.
 
+      .. image:: ../images/browser-wallet/new/create_passcode.png
+            :alt: screen for setting up passcode
+            :width: 50%
+
    #. Choose whether you are creating a new wallet or :ref:`recovering an existing one<recover-wallet>`.
 
-      .. image:: ../images/browser-wallet/wallet-choice.png
+      .. image:: ../images/browser-wallet/new/create_restore.png
             :alt: screen with option to create or restore
             :width: 50%
 
@@ -106,9 +146,9 @@ Recovery phrase setup
 
 If you are creating a new wallet, you must set up a :term:`secret recovery phrase`. This is a 24 word phrase that stores your private keys, identities, and accounts. You must write down and confirm your recovery phrase. It is important to keep this secret recovery phrase in a safe location in case you need to recover your wallet on a new device.
 
-#. Once you click on **Create** you are shown the 24 word secret recovery phrase. Write it down and click **Continue**.
+#. When you click **Create**, the 24 word secret recovery phrase is shown. Write it down and click **Continue**.
 
-   .. image:: ../images/browser-wallet/recovery-phrase.png
+   .. image:: ../images/browser-wallet/new/recovery.png
             :alt: screen with recovery phrase and continue option
             :width: 50%
 
@@ -130,38 +170,75 @@ Having set up your passcode, you must then submit a request for an identity.
 Create an account
 =================
 
-#. To switch to the accounts page, click |hamburger-bw| and select **Accounts**.
+#. When you have no accounts, the main page will show *No accounts*. Click **Create account** to create your first account.
 
-#. Click the Accounts drop-down. Then click **Add new**.
+   .. image:: ../images/browser-wallet/new/create_account.png
+            :alt: screen with option for creating account
+            :width: 50%
 
-#. Select the Identity to use for the account. Click **Add account**.
+#. Select the Identity to use for the account and click **Create account**.
 
 Basic navigation
 ================
 
-Click |hamburger-bw| to change between pages.
+Main page
+---------
+The main page shows your account information and a menu accessible from the top-right corner. The page layout includes:
+
+#. An account selector in the top left that lets you switch between accounts, showing the current account's address and a dropdown arrow.
 
-.. image:: ../images/browser-wallet/page-menu.png
-      :alt: menu at top of window with drop-down expanded to show options
-      :width: 50%
+#. Your total CCD balance.
 
-Transactions overview
+#. Four quick action buttons: **Receive**, **Send**, **Earn**, and **Activity**.
+
+#. A list of your tokens with their balances.
+
+#. Option to manage your token list at the bottom.
+
+   .. image:: ../images/browser-wallet/new/main_page.png
+            :alt: menu at top of window with drop-down expanded to show options
+            :width: 50%
+
+Menu
+----
+Clicking the menu button |menu| in the top-right corner opens a page with additional features:
+
+#. **Identities**: Manage your identities
+#. **Accounts**: View and manage accounts
+#. **Seed phrase**: Access your recovery phrase
+#. **Passcode**: Security settings
+#. **Web3 ID**: Web3 identity features
+#. **Earn**: Staking and rewards
+#. **Network**: Network settings
+#. **About**: App information
+#. **Restore**: Recovery options
+#. **Old UI**: Previous interface version
+#. **NFT**: NFT management
+
+The menu can be closed by clicking the **X** in the top-right corner to return to the main page.
+
+.. image:: ../images/browser-wallet/new/menu_screen.png
+         :alt: screen with option for creating account
+         :width: 50%
+
+
+View account activity
 ---------------------
 
-In the Accounts page, click |log| to see an overview of the transactions. If you want to see details for the transaction, click on the transaction.
+#. Select the account from the account selector in the top left of the main page.
+#. Click |activity|
+#. For transaction details, click on any specific transaction in the list.
 
 Find and share your account address
 -----------------------------------
 
-#. Go to the **Accounts** page.
-
-#. On the account you want to find the address to tap |receive|.
-
+#. Select the account from the account selector in the top left of the main page.
+#. Click |new_receive|
 #. Share your address:
 
-    - You can let someone scan your QR code if they have the |mw-gen1| or |mw-gen2| installed.
+    - You can let someone scan your QR code if they have the |mw-gen1| installed.
 
-    - You can tap **COPY** to copy the address and then paste it somewhere of your own choosing.
+    - You can click **Copy Address** to copy the address and then paste it wherever needed.
 
 .. _switch-network:
 
@@ -174,16 +251,26 @@ You can use the wallet on both Mainnet and Testnet without the need for a separa
 
     Accounts and identities are NOT shared between mainnet and testnet.
 
-#. Click on the Concordium logo and select **Wallet Settings**.
+#. Click |menu| to open the menu page.
 
-#. Click **Network settings**.
+#. Click **Network**.
 
 #. Select the Network you want to connect to: Mainnet or Testnet. Note that the color of the user interface items in Mainnet is blue and the color of the user interface items in Testnet is green.
 
-Light/dark mode toggle
-----------------------
+Switch between old and new UI
+-----------------------------
+You can switch between the old and the new wallet interface.
+
+To access the old interface:
+
+#. Click |menu| to open the menu page.
+#. Click **Old UI**.
+
+To return to the new interface:
+
+#. Go to Wallet settings in the old interface.
+#. Click **Wallet X**.
 
-At the bottom of the Wallet settings page you can toggle between light and dark mode.
 
 .. |gear| image:: ../images/browser-wallet/account-settings.png
              :alt: gear wheel
@@ -201,6 +288,18 @@ At the bottom of the Wallet settings page you can toggle between light and dark
              :alt: button with qr code
              :width: 50px
 
+.. |menu| image:: ../images/browser-wallet/new/menu_button.png
+             :alt: button for opening menu
+             :width: 50px
+
+.. |activity| image:: ../images/browser-wallet/new/activity_button.png
+             :alt: button for viewing wallet activities
+             :width: 50px
+
+.. |new_receive| image:: ../images/browser-wallet/new/receive_button.png
+             :alt: button for viewing qr code
+             :width: 50px
+
 Remove the |bw|
 ===============
 

source/mainnet/docs/guides/change-account-name.rst

@@ -25,6 +25,15 @@ Change account name
     .. image:: ../images/desktop-wallet/dw-edit-account-name.png
         :alt: dark account balance area with edit button highlighted
 
+.. dropdown:: |bw|
+
+    #. Go to the Accounts page.
+
+    #. Click the Edit button next to the account name you want to change.
+
+    #. Edit the name and click Save.
+
+
 .. |hamburger| image:: ../images/hamburger.png
              :alt: Three horizontal lines
              :width: 20px

source/mainnet/docs/guides/change-identity-name.rst

@@ -20,11 +20,11 @@ Change identity name
 
 .. dropdown:: |bw|
 
-    #. Click the hamburger menu |hamburger| and select **ID cards**. If you have more than one ID card, select the ID card you want to edit in the ID cards drop-down.
+    #. Open the menu and select ID Cards. If you have more than one identity, select the ID card you want to edit.
 
-    #. Click |edit| next to the identity name.
+    #. Click **Edit Name** next to the identity name.
 
-    #. Change the name and click |save|.
+    #. Change the name and click **Save**.
 
 .. |hamburger| image:: ../images/hamburger.png
              :alt: Three horizontal lines

source/mainnet/docs/guides/create-account.rst

@@ -5,10 +5,10 @@
 Create an account
 =================
 
-If you are using Desktop Wallet, when you created your :term:`identity`, it came with an :term:`initial account`. The initial account is a special account that the :term:`identity provider` submits
+Desktop Wallet users: When you created your :term:`identity`, it came with an :term:`initial account`. The initial account is a special account that the :term:`identity provider` submits
 to the chain. When you already have an identity, you can create more :term:`accounts<account>` with that identity yourself.
 
-If you are using |bw| or |cryptox|, no initial account was created when you created your :term:`identity`. You create all :term:`accounts<account>` related to your identities.
+|bw| and |cryptox| users: No initial account was created when you created your :term:`identity`. You create all :term:`accounts<account>` related to your identities.
 
 To learn more about identities and accounts, see :ref:`Identities <reference-id-accounts>` and :ref:`Accounts <managing_accounts>`.
 
@@ -102,17 +102,18 @@ To learn more about identities and accounts, see :ref:`Identities <reference-id-
 
 .. dropdown:: |bw|
 
-    #. To switch to the accounts page, click |hamburger-bw| and select Accounts. If you do not have any accounts, you can click **Create account** and skip to step 3. If you do not have any identity to create an account, you can click **Create new identity**. For information about the identity creation process, see :ref:`Create an identity<create-initial-account>`.
+    Go to the Accounts page ( select **Accounts** in the menu).
 
-        .. image:: ../images/browser-wallet/acct-page-no-acct.png
-            :width: 25%
+    If you do not have any accounts, click **Create account**.
 
-        .. image:: ../images/browser-wallet/acct-page-no-id.png
-            :width: 25%
+    If you do not have an identity, click **Create new identity**.
 
-    #. Click the Accounts drop-down. Then click **Add new**.
+    If you already have an account and want to create more accounts:
+
+    #. Click on the **+**.
+    #. Click on the identity you want to use to create the account.
+    #. Click **Create account**.
 
-    #. Select the identity to use to create the account. Click **Create new account**.
 
 .. toctree::
    :hidden:

source/mainnet/docs/guides/create-identity.rst

@@ -5,7 +5,11 @@
 Create an identity
 ==================
 
-Before you can start using a Wallet and submit transactions to the blockchain, you need an identity issued by an identity provider, and, in the case of Desktop Wallet, an initial account issued by the identity provider. The identity provider submits the initial account to the chain and knows the identity of the owner of the initial account, but not of any other accounts that you create. For |bw| and |cryptox| an initial account is not submitted by the identity provider.
+Before you can start using a Wallet and submit transactions to the blockchain, you need an identity issued by an identity provider.
+
+For Desktop Wallet, the identity provider also issues an initial account and submits it to the chain. The identity provider knows the identity of the owner of this initial account, but not of any other accounts that you create.
+
+For |bw| and |cryptox|, an initial account is not submitted by the identity provider.
 
 To learn more about identities and accounts, see :ref:`Identities <reference-id-accounts>` and :ref:`Accounts <managing_accounts>`.
 
@@ -84,17 +88,16 @@ To learn more about identities and accounts, see :ref:`Identities <reference-id-
 
 .. dropdown:: |bw|
 
-   You can submit requests for additional :term:`identities<identity>` in the |bw|. You do this from the **ID cards** page. If you are not in the ID cards page, click |hamburger-bw| to select it. If you do not have any identities, you can click **Request identity**.
+   Identities are managed from the ID Cards page. To access this page, open the menu and select **ID Cards**.
 
-   .. image:: ../images/browser-wallet/id-page-no-id.png
-      :width: 25%
+   If you don't have any identities yet, you can click **Request Identity**.
 
-   #. Click the ID cards drop-down.
+   If you want to submit a request for an additional identity, click on the **+** in the upper right corner.
 
-   #. Click **Request new**.
 
-      .. image:: ../images/browser-wallet/id-cards-new.png
-         :width: 25%
+   .. image:: ../images/browser-wallet/new/request_identity.png
+      :width: 50%
+
 
    #. Select a third-party identity provider from the list. An external web page opens in your default web browser.
 
@@ -119,3 +122,4 @@ To learn more about identities and accounts, see :ref:`Identities <reference-id-
 .. |hamburger-bw| image:: ../images/browser-wallet/hamburger-menu.png
                     :width: 20px
                     :alt: three horizontal lines
+