Merge branch 'master' into mainnet

phoenix-ios/phoenix-ios/AppDelegate.swift

@@ -11,6 +11,7 @@ fileprivate var log = LoggerFactory.shared.logger(filename, .trace)
 fileprivate var log = LoggerFactory.shared.logger(filename, .warning)
 #endif
 
+let CONTACTS_ENABLED = false
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {

phoenix-ios/phoenix-ios/Assets.xcassets/user_round.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "user-round.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

phoenix-ios/phoenix-ios/Assets.xcassets/user_round_symbol.symbolset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "user-round.SFSymbol.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

phoenix-ios/phoenix-ios/Localizable.xcstrings

@@ -1081,6 +1081,9 @@
         }
       }
     },
+    "(Lightning offer)" : {
+      "comment" : "Type of text being copied"
+    },
     "(Phoenix can be running in the background.)" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -1548,6 +1551,9 @@
           }
         }
       }
+    },
+    "**This Bolt12 payment request is the Lightning equivalent to a Bitcoin address.**\n\nUnlike traditional Lightning invoices, it does not expire and can be reused.\n\nShare it widely : for donations, tips, or to get paid by your friends.\n\n🛟 **Who supports Bolt12?**\n\nFor the moment, few services support Bolt12. If a service rejects this invoice, let them know they're missing out!\n\n🪫 **Restrictions**\n\nYour phone must be turned on and connected to the internet to receive a payment. Also enabling TOR in Phoenix may cause issues." : {
+
     },
     "#%lld: %@" : {
       "localizations" : {
@@ -4753,6 +4759,9 @@
           }
         }
       }
+    },
+    "Add contact" : {
+
     },
     "add liquidity" : {
       "localizations" : {
@@ -5045,6 +5054,9 @@
           }
         }
       }
+    },
+    "Address Book" : {
+
     },
     "address type" : {
       "comment" : "Label in DetailsView_IncomingPayment",
@@ -6676,6 +6688,9 @@
           }
         }
       }
+    },
+    "Attach a message" : {
+
     },
     "Attention: if the Bitcoin mempool feerate is high, incoming LN payments requiring an on-chain operation could be expensive." : {
       "localizations" : {
@@ -7544,6 +7559,7 @@
     },
     "Base amount: (amountBitcoin), ≈(amountFiat)" : {
       "comment" : "VoiceOver label: PaymentSummaryView",
+      "extractionState" : "stale",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
@@ -7582,6 +7598,9 @@
           }
         }
       }
+    },
+    "Be careful with messages from unknown sources" : {
+
     },
     "Below the expected fee. Some payments may be rejected." : {
       "localizations" : {
@@ -9821,6 +9840,9 @@
           }
         }
       }
+    },
+    "Clear image" : {
+
     },
     "Clear textfield" : {
       "localizations" : {
@@ -11386,6 +11408,9 @@
           }
         }
       }
+    },
+    "Contact Image" : {
+
     },
     "Contact support if needed." : {
       "localizations" : {
@@ -11426,6 +11451,9 @@
           }
         }
       }
+    },
+    "Contacts" : {
+
     },
     "continue to next step" : {
       "comment" : "VoiceOver hint",
@@ -12147,6 +12175,12 @@
           }
         }
       }
+    },
+    "Could not retrieve payment details within a reasonable time. The recipient may be offline or unreachable." : {
+
+    },
+    "Could not retrieve payment details. Received invalid response from node." : {
+
     },
     "Create new wallet" : {
       "localizations" : {
@@ -13054,6 +13088,12 @@
           }
         }
       }
+    },
+    "Delete contact" : {
+
+    },
+    "Delete contact?" : {
+
     },
     "Delete payment" : {
       "localizations" : {
@@ -14959,6 +14999,9 @@
           }
         }
       }
+    },
+    "Edit contact" : {
+
     },
     "Edit Info" : {
       "comment" : "Navigation bar title",
@@ -15352,6 +15395,9 @@
           }
         }
       }
+    },
+    "Enable if you don't want Bolt12 recipients to know that payments come from your wallet." : {
+
     },
     "Enable notifications in the Notification Center" : {
       "localizations" : {
@@ -17429,6 +17475,9 @@
           }
         }
       }
+    },
+    "Fetching invoice..." : {
+
     },
     "Fetching Lightning URL" : {
       "comment" : "Progress title",
@@ -19110,6 +19159,9 @@
           }
         }
       }
+    },
+    "How to use" : {
+
     },
     "I have saved my recovery phrase somewhere safe." : {
       "localizations" : {
@@ -22126,6 +22178,9 @@
           }
         }
       }
+    },
+    "Learn more" : {
+
     },
     "Learn more from our [blog post](https://acinq.co/blog/phoenix-splicing-update)." : {
       "localizations" : {
@@ -22642,6 +22697,7 @@
       }
     },
     "Lightning invoice" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
@@ -22682,6 +22738,7 @@
       }
     },
     "Lightning Invoice" : {
+      "comment" : "Secondary title",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
@@ -22760,6 +22817,12 @@
           }
         }
       }
+    },
+    "Lightning Offer" : {
+      "comment" : "Secondary title"
+    },
+    "Lightning Offers" : {
+
     },
     "Lightning payments are fast and best suited for smaller payments." : {
       "localizations" : {
@@ -22841,6 +22904,9 @@
           }
         }
       }
+    },
+    "Lightning QR code" : {
+
     },
     "Link" : {
       "comment" : "lnurl-auth: login button title",
@@ -25189,6 +25255,9 @@
           }
         }
       }
+    },
+    "NEW" : {
+
     },
     "New Channel (auto-created)" : {
       "localizations" : {
@@ -26063,6 +26132,9 @@
           }
         }
       }
+    },
+    "Offer:" : {
+
     },
     "Offline" : {
       "comment" : "Connection state\nConnection status",
@@ -27579,6 +27651,7 @@
       }
     },
     "payment description" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
@@ -30079,6 +30152,9 @@
           }
         }
       }
+    },
+    "Random payer key" : {
+
     },
     "Random server" : {
       "comment" : "Connection info",
@@ -31923,6 +31999,7 @@
       }
     },
     "Scan withdraw" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
@@ -32082,6 +32159,9 @@
           }
         }
       }
+    },
+    "Select image" : {
+
     },
     "select miner fee when sending on-chain" : {
       "localizations" : {
@@ -34085,6 +34165,9 @@
           }
         }
       }
+    },
+    "Show one-time invoice" : {
+
     },
     "Show only in-flight payments" : {
       "localizations" : {
@@ -34743,6 +34826,9 @@
           }
         }
       }
+    },
+    "Show reusable QR" : {
+
     },
     "Sign into iCloud to backup your payments" : {
       "localizations" : {
@@ -35871,6 +35957,9 @@
           }
         }
       }
+    },
+    "Take photo" : {
+
     },
     "Tap for more info" : {
       "localizations" : {
@@ -40696,6 +40785,9 @@
           }
         }
       }
+    },
+    "Unknown offer error" : {
+
     },
     "Unknown reason" : {
       "localizations" : {