Merge pull request #863 from Concordium/cis2-ios

iOS wallet CIS2 support
Concordium · Oct 9, 2023 · cb296d1 · cb296d1
2 parents 634ac2c + c79f814
commit cb296d1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/source/mainnet/net/concepts/concepts-transactions.rst b/source/mainnet/net/concepts/concepts-transactions.rst
@@ -42,7 +42,8 @@ You can make transactions using either the Desktop Wallet, the |mw-gen2|, |mw-ge
 +----------------------------+---------------+----------------+-------------------+---------------+-------------------+
 
 - |bw|: supports send CCD, receive CCD, connect to dApps, baker management, delegation.
-- |mw-gen1| and |mw-gen2|: supports send CCD, receive CCD, shield CCD and unshield CCD, baker management, delegation.
+- |mw-gen2|: supports send CCD, receive CCD, shield CCD and unshield CCD, baker management, delegation, connect to dApps, add and manage tokens.
+- |mw-gen1|: supports send CCD, receive CCD, shield CCD and unshield CCD, baker management, delegation
 - Desktop Wallet: supports all transaction types (except smart contract transactions).
 - Concordium Client: supports all transaction types.
 
@@ -80,7 +81,7 @@ The |mw-gen1| is a digital smartphone wallet that enables you to create and mana
 The |mw-gen2|
 ------------------
 
-The |mw-gen2| is a second generation digital smartphone wallet that enables you to create and manage your Concordium identities and accounts, to create simple and shielded transactions, bake and delegate, and to export and import your accounts and identities.
+The |mw-gen2| is a second generation digital smartphone wallet that enables you to create and manage your Concordium identities and accounts, to create simple and shielded transactions, bake and delegate, add and manage tokens, connect to dApps, and to export and import your accounts and identities.
 
 The |bw|
 ----------------

diff --git a/source/mainnet/net/guides/deciding-wallet.rst b/source/mainnet/net/guides/deciding-wallet.rst
@@ -74,7 +74,9 @@ Concordium strongly recommends that you make a backup of your wallet if you are
 What are the requirements for each wallet?
 ==========================================
 
-- |mw-gen1| or |mw-gen2|: you’ll need an iPhone running iOS 13 or later or an Android phone running Android 8 or later.
+- |mw-gen1|: you’ll need an iPhone running iOS 13 or later or an Android phone running Android 8 or later.
+
+- |mw-gen2|: you’ll need an iPhone running iOS 15 or later or an Android phone running Android 8 or later.
 
 - |bw|: you'll need a device running one of the supported Chromium internet browsers (Chrome, Opera, Brave, Edge) with the |bw| extension installed.
 

diff --git a/source/mainnet/net/guides/tokens.rst b/source/mainnet/net/guides/tokens.rst
@@ -5,7 +5,7 @@
 Tokens in the wallet
 ========================
 
-You can add, inspect, and send tokens in the |bw| and |mw-gen2| for Android devices.
+You can add, inspect, and send tokens in the |bw| and |mw-gen2|.
 
 .. dropdown:: |bw|
 
@@ -118,6 +118,10 @@ You can add, inspect, and send tokens in the |bw| and |mw-gen2| for Android devi
 
     .. dropdown:: Send tokens
 
+        .. Note::
+
+            It is not possible to send tokens in the |mw-gen2| for iOS.
+
         To access send, either:
 
         - Tap Send |send| on an account in the Accounts overview.

diff --git a/source/mainnet/net/release-notes/release-notes-lp.rst b/source/mainnet/net/release-notes/release-notes-lp.rst
@@ -19,17 +19,21 @@ Wallets
 |mw-gen2| for iOS
 -----------------
 
-    July 31, 2023
+    September 9, 2023
 
-        Version 1.1.1 includes bug fixes and an improvement for the upcoming protocol update.
+        Version 1.2.0 includes support to manage fungible and non-fungible tokens. This includes adding, inspecting, and removing tokens.
 
-        - Ensured compatibility with the upcoming protocol update (P6)
+    .. dropdown:: Previous releases
 
-        - Fixed issue with DTS identities that contain non-ASCII characters.
+        .. dropdown:: |mw-gen2| 1.1.1 - July 31, 2023
 
-        - WalletConnect: Display balances in proper CCD format in the account selection view.
+            Version 1.1.1 includes bug fixes and an improvement for the upcoming protocol update.
 
-    .. dropdown:: Previous releases
+            - Ensured compatibility with the upcoming protocol update (P6)
+
+            - Fixed issue with DTS identities that contain non-ASCII characters.
+
+            - WalletConnect: Display balances in proper CCD format in the account selection view.
 
         .. dropdown:: |mw-gen2| 1.1.0 - July 17, 2023