From b7bb6df419c916283b8478ec3f28baa313c38b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Aaron?= <rene@twentyuno.net>
Date: Fri, 6 Sep 2024 11:17:30 +0200
Subject: [PATCH 1/3] fix: config

---
 app.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app.json b/app.json
index d1c4f13..1bd4fd2 100644
--- a/app.json
+++ b/app.json
@@ -46,8 +46,7 @@
       "bundleIdentifier": "com.getalby.mobile",
       "config": {
         "usesNonExemptEncryption": false
-      },
-      "buildNumber":
+      }
     },
     "android": {
       "package": "com.getalby.mobile",

From f5cafc8e9dc0eabda7921bd99a3a374dbda28da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Aaron?= <rene@twentyuno.net>
Date: Fri, 6 Sep 2024 11:18:27 +0200
Subject: [PATCH 2/3] fix: add keyboard submit type

---
 pages/receive/Receive.tsx                           | 1 +
 pages/send/LNURLPay.tsx                             | 1 +
 pages/send/Send.tsx                                 | 1 +
 pages/settings/FiatCurrency.tsx                     | 1 +
 pages/settings/address-book/NewAddressBookEntry.tsx | 2 ++
 pages/settings/wallets/LightningAddress.tsx         | 1 +
 pages/settings/wallets/NewWallet.tsx                | 1 +
 pages/settings/wallets/RenameWallet.tsx             | 1 +
 8 files changed, 9 insertions(+)

diff --git a/pages/receive/Receive.tsx b/pages/receive/Receive.tsx
index c8f4c7e..9454d14 100644
--- a/pages/receive/Receive.tsx
+++ b/pages/receive/Receive.tsx
@@ -290,6 +290,7 @@ export function Receive() {
                   placeholder="No description"
                   value={comment}
                   onChangeText={setComment}
+                  returnKeyType="done"
                 />
               </View>
             </View>
diff --git a/pages/send/LNURLPay.tsx b/pages/send/LNURLPay.tsx
index 1eb036e..21f1a92 100644
--- a/pages/send/LNURLPay.tsx
+++ b/pages/send/LNURLPay.tsx
@@ -66,6 +66,7 @@ export function LNURLPay() {
                 placeholder="Enter an optional comment"
                 value={comment}
                 onChangeText={setComment}
+                returnKeyType="done"
               />
             </View>
             <View>
diff --git a/pages/send/Send.tsx b/pages/send/Send.tsx
index c2a1f02..58a1c6e 100644
--- a/pages/send/Send.tsx
+++ b/pages/send/Send.tsx
@@ -172,6 +172,7 @@ export function Send() {
                     onChangeText={setKeyboardText}
                     inputMode="email"
                     autoFocus
+                    returnKeyType="done"
                   // aria-errormessage="inputError"
                   />
                 </View>
diff --git a/pages/settings/FiatCurrency.tsx b/pages/settings/FiatCurrency.tsx
index 894cdd3..13c9289 100644
--- a/pages/settings/FiatCurrency.tsx
+++ b/pages/settings/FiatCurrency.tsx
@@ -29,6 +29,7 @@ export function FiatCurrency() {
             placeholder="USD"
             value={fiatCurrency}
             onChangeText={setFiatCurrency}
+            returnKeyType="done"
           // aria-errormessage="inputError"
           />
         </View>
diff --git a/pages/settings/address-book/NewAddressBookEntry.tsx b/pages/settings/address-book/NewAddressBookEntry.tsx
index 5eb2495..77518c0 100644
--- a/pages/settings/address-book/NewAddressBookEntry.tsx
+++ b/pages/settings/address-book/NewAddressBookEntry.tsx
@@ -34,6 +34,7 @@ export function NewAddressBookEntry() {
             value={name}
             onChangeText={setName}
             aria-labelledbyledBy="name"
+            returnKeyType="done"
           // aria-errormessage="inputError"
           />
           <Label
@@ -49,6 +50,7 @@ export function NewAddressBookEntry() {
             placeholder="hello@getalby.com"
             onChangeText={setLightningAddress}
             aria-labelledbyledBy="lightningAddress"
+            returnKeyType="done"
           // aria-errormessage="inputError"
           />
         </View>
diff --git a/pages/settings/wallets/LightningAddress.tsx b/pages/settings/wallets/LightningAddress.tsx
index 2baa794..94c18ce 100644
--- a/pages/settings/wallets/LightningAddress.tsx
+++ b/pages/settings/wallets/LightningAddress.tsx
@@ -36,6 +36,7 @@ export function LightningAddress() {
               placeholder="hello@getalby.com"
               value={lightningAddress}
               onChangeText={setLightningAddress}
+              returnKeyType="done"
             // aria-errormessage="inputError"
             />
           </View>
diff --git a/pages/settings/wallets/NewWallet.tsx b/pages/settings/wallets/NewWallet.tsx
index ccd3367..ac99912 100644
--- a/pages/settings/wallets/NewWallet.tsx
+++ b/pages/settings/wallets/NewWallet.tsx
@@ -32,6 +32,7 @@ export function NewWallet() {
             onChangeText={setName}
             aria-labelledbyledBy="name"
             placeholder="Enter a name for your wallet"
+            returnKeyType="done"
           // aria-errormessage="inputError"
           />
         </View>
diff --git a/pages/settings/wallets/RenameWallet.tsx b/pages/settings/wallets/RenameWallet.tsx
index 7cd8684..6d7133e 100644
--- a/pages/settings/wallets/RenameWallet.tsx
+++ b/pages/settings/wallets/RenameWallet.tsx
@@ -33,6 +33,7 @@ export function RenameWallet() {
             placeholder={DEFAULT_WALLET_NAME}
             value={walletName}
             onChangeText={setWalletName}
+            returnKeyType="done"
           // aria-errormessage="inputError"
           />
         </View>

From de7bddc3a2e61f3ddf7a8d237db515337e43bab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Aaron?= <rene@twentyuno.net>
Date: Fri, 6 Sep 2024 11:19:13 +0200
Subject: [PATCH 3/3] fix: use cross-platform selectionColor instead of
 android-only cursorColor

---
 components/DualCurrencyInput.tsx | 3 ++-
 components/ui/input.tsx          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/DualCurrencyInput.tsx b/components/DualCurrencyInput.tsx
index d954e32..b18958d 100644
--- a/components/DualCurrencyInput.tsx
+++ b/components/DualCurrencyInput.tsx
@@ -52,11 +52,12 @@ export function DualCurrencyInput({
         placeholder="0"
         keyboardType="number-pad"
         value={inputMode === "sats" ? amount : fiatAmount}
-        cursorColor={CURSOR_COLOR}
+        selectionColor={CURSOR_COLOR}
         onChangeText={onChangeText}
         aria-labelledbyledBy="amount"
         style={styles.amountInput}
         autoFocus={autoFocus}
+        returnKeyType="done"
       // aria-errormessage="inputError"
       />
       <Pressable onPress={toggleInputMode}>
diff --git a/components/ui/input.tsx b/components/ui/input.tsx
index 2cb0f2d..0ed66bc 100644
--- a/components/ui/input.tsx
+++ b/components/ui/input.tsx
@@ -16,7 +16,7 @@ const Input = React.forwardRef<
         props.editable === false && 'opacity-50 web:cursor-not-allowed',
         className
       )}
-      cursorColor={CURSOR_COLOR}
+      selectionColor={CURSOR_COLOR}
       placeholderClassName={cn('text-muted-foreground', placeholderClassName)}
       {...props}
     />